diff --git a/db/dbformat.cc b/db/dbformat.cc index ae9f1b30fcf2b5fe8ca0c07f02864a7190c9ebc5..6717341d0128b60f586f5b709b4f07b767a334ba 100644 --- a/db/dbformat.cc +++ b/db/dbformat.cc @@ -26,7 +26,7 @@ namespace ROCKSDB_NAMESPACE { // and the value type is embedded as the low 8 bits in the sequence // number in internal keys, we need to use the highest-numbered // ValueType, not the lowest). -const ValueType kValueTypeForSeek = kTypeDeletionWithTimestamp; +const ValueType kValueTypeForSeek = kTypeWideColumnEntity; const ValueType kValueTypeForSeekForPrev = kTypeDeletion; const std::string kDisableUserTimestamp(""); @@ -46,6 +46,8 @@ EntryType GetEntryType(ValueType value_type) { return kEntryRangeDeletion; case kTypeBlobIndex: return kEntryBlobIndex; + case kTypeWideColumnEntity: + return kEntryWideColumnEntity; default: return kEntryOther; } diff --git a/db/dbformat.h b/db/dbformat.h index dd5eee50b03256fc9bbc26d98ff05b36c5e8fec7..cdd0285b68e177d58dae7a71f8e094cfdfacaf3b 100644 --- a/db/dbformat.h +++ b/db/dbformat.h @@ -66,7 +66,9 @@ enum ValueType : unsigned char { kTypeBeginUnprepareXID = 0x13, // WAL only. kTypeDeletionWithTimestamp = 0x14, kTypeCommitXIDAndTimestamp = 0x15, // WAL only - kMaxValue = 0x7F // Not used for storing records. + kTypeWideColumnEntity = 0x16, + kTypeColumnFamilyWideColumnEntity = 0x17, // WAL only + kMaxValue = 0x7F // Not used for storing records. }; // Defined in dbformat.cc @@ -76,8 +78,8 @@ extern const ValueType kValueTypeForSeekForPrev; // Checks whether a type is an inline value type // (i.e. a type used in memtable skiplist and sst file datablock). inline bool IsValueType(ValueType t) { - return t <= kTypeMerge || t == kTypeSingleDeletion || t == kTypeBlobIndex || - kTypeDeletionWithTimestamp == t; + return t <= kTypeMerge || kTypeSingleDeletion == t || kTypeBlobIndex == t || + kTypeDeletionWithTimestamp == t || kTypeWideColumnEntity == t; } // Checks whether a type is from user operation diff --git a/include/rocksdb/types.h b/include/rocksdb/types.h index 20cff59b80fd030f6af49975fca60201d39793cd..421abf3cd4cce13af70df1052314d4e7950a464d 100644 --- a/include/rocksdb/types.h +++ b/include/rocksdb/types.h @@ -58,6 +58,7 @@ enum EntryType { kEntryRangeDeletion, kEntryBlobIndex, kEntryDeleteWithTimestamp, + kEntryWideColumnEntity, kEntryOther, };