Add InlineData flag

cmd/xl-storage-format-v2.go

@@ -196,6 +196,7 @@ type xlFlags uint8
 const (
 	xlFlagFreeVersion xlFlags = 1 << iota
 	xlFlagUsesDataDir
+	xlFlagInlineData
 )
 
 // checkXL2V1 will check if the metadata has correct header and is a known major version.
@@ -266,6 +267,9 @@ func (j *xlMetaV2Version) header() xlMetaV2VersionHeader {
 	if j.Type == ObjectType && j.ObjectV2.UsesDataDir() {
 		flags |= xlFlagUsesDataDir
 	}
+	if j.Type == ObjectType && j.ObjectV2.InlineData() {
+		flags |= xlFlagInlineData
+	}
 	return xlMetaV2VersionHeader{
 		Type:      j.Type,
 		ModTime:   j.getModTime().UnixNano(),
@@ -274,14 +278,24 @@ func (j *xlMetaV2Version) header() xlMetaV2VersionHeader {
 	}
 }
 
+// FreeVersion returns true if x represents a free-version, false otherwise.
 func (x xlMetaV2VersionHeader) FreeVersion() bool {
 	return x.Flags&xlFlagFreeVersion != 0
 }
 
+// UsesDataDir returns true if this object version uses its data directory for
+// its contents and false otherwise.
 func (x xlMetaV2VersionHeader) UsesDataDir() bool {
 	return x.Flags&xlFlagUsesDataDir != 0
 }
 
+// InlineData returns whether inline data has been set.
+// Note that false does not mean there is no inline data,
+// only that it is unlikely.
+func (x xlMetaV2VersionHeader) InlineData() bool {
+	return x.Flags&xlFlagInlineData != 0
+}
+
 // getModTime will return the ModTime of the underlying version.
 func (j xlMetaV2Version) getModTime() time.Time {
 	switch j.Type {
@@ -363,6 +377,14 @@ func (j xlMetaV2Object) UsesDataDir() bool {
 	return isRestoredObjectOnDisk(j.MetaUser)
 }
 
+// InlineData returns whether inline data has been set.
+// Note that false does not mean there is no inline data,
+// only that it is unlikely.
+func (j xlMetaV2Object) InlineData() bool {
+	_, ok := j.MetaSys[ReservedMetadataPrefixLower+"inline-data"]
+	return ok
+}
+
 func (j *xlMetaV2Object) SetTransition(fi FileInfo) {
 	j.MetaSys[ReservedMetadataPrefixLower+TransitionStatus] = []byte(fi.TransitionStatus)
 	j.MetaSys[ReservedMetadataPrefixLower+TransitionedObjectName] = []byte(fi.TransitionedObjName)

cmd/xl-storage-format-v2_test.go

@@ -353,7 +353,6 @@ func TestDeleteVersionWithSharedDataDir(t *testing.T) {
 	for i, tc := range testCases {
 		_, version, err := xl.findVersion(uuid.MustParse(tc.versionID))
 		failOnErr(i+1, err)
-		//t.Log("idx:", idx, "modtime:", version.getModTime(), [16]byte(uuid.MustParse(tc.versionID)), version.getVersionID())
 		if got := xl.SharedDataDirCount(version.getVersionID(), version.ObjectV2.DataDir); got != tc.shares {
 			t.Fatalf("Test %d: For %#v, expected sharers of data directory %d got %d", i+1, version.ObjectV2.VersionID, tc.shares, got)
 		}