chore(cubestore): RocksSecondaryIndexValue - support HashAndTTLExtended (#7011)

Author: ovr

rust/cubestore/cubestore/src/cachestore/cache_item.rs

@@ -140,6 +140,14 @@ impl RocksSecondaryIndex<CacheItem, CacheItemIndexKey> for CacheItemRocksIndex {
         }
     }
 
+    fn raw_value_size(&self, row: &CacheItem) -> u32 {
+        if let Ok(size) = u32::try_from(row.value.len()) {
+            size
+        } else {
+            u32::MAX
+        }
+    }
+
     fn key_to_bytes(&self, key: &CacheItemIndexKey) -> Vec<u8> {
         match key {
             CacheItemIndexKey::ByPrefix(s) | CacheItemIndexKey::ByPath(s) => s.as_bytes().to_vec(),
@@ -157,6 +165,15 @@ impl RocksSecondaryIndex<CacheItem, CacheItemIndexKey> for CacheItemRocksIndex {
         true
     }
 
+    fn store_ttl_extended_info(&self) -> bool {
+        match self {
+            // Right now, it's disabled due to compatibility reasons
+            // TODO(ovr): Enable after migration
+            CacheItemRocksIndex::ByPath => false,
+            CacheItemRocksIndex::ByPrefix => false,
+        }
+    }
+
     fn get_expire(&self, row: &CacheItem) -> Option<DateTime<Utc>> {
         row.get_expire().clone()
     }

rust/cubestore/cubestore/src/cachestore/compaction.rs

@@ -1,4 +1,6 @@
-use crate::metastore::{IndexId, RocksSecondaryIndexValue, RowKey, SecondaryIndexInfo};
+use crate::metastore::{
+    IndexId, RocksSecondaryIndexValue, RocksSecondaryIndexValueVersion, RowKey, SecondaryIndexInfo,
+};
 use crate::TableId;
 
 use chrono::{DateTime, Utc};
@@ -123,8 +125,12 @@ impl MetaStoreCacheCompactionFilter {
         match RocksSecondaryIndexValue::from_bytes(value, index_info.value_version) {
             Err(err) => {
                 // Index was migrated from old format to the new version, but compaction didnt remove it
-                if index_info.value_version == 2
-                    && RocksSecondaryIndexValue::from_bytes(value, 1).is_ok()
+                if index_info.value_version == RocksSecondaryIndexValueVersion::WithTTLSupport
+                    && RocksSecondaryIndexValue::from_bytes(
+                        value,
+                        RocksSecondaryIndexValueVersion::OnlyHash,
+                    )
+                    .is_ok()
                 {
                     CompactionDecision::Remove
                 } else {
@@ -137,7 +143,10 @@ impl MetaStoreCacheCompactionFilter {
                 }
             }
             Ok(RocksSecondaryIndexValue::Hash(_)) => CompactionDecision::Keep,
-            Ok(RocksSecondaryIndexValue::HashAndTTL(_, expire)) => {
+            Ok(
+                RocksSecondaryIndexValue::HashAndTTL(_, expire)
+                | RocksSecondaryIndexValue::HashAndTTLExtended(_, expire, _),
+            ) => {
                 if let Some(expire) = expire {
                     if expire <= self.current {
                         self.removed += 1;
@@ -386,7 +395,9 @@ mod tests {
 
         // Indexes with TTL use new format (v2) for indexes, but index migration doesnt skip
         // compaction for old rows
-        let index_value = RocksSecondaryIndexValue::Hash("kek".as_bytes()).to_bytes(1);
+        let index_value = RocksSecondaryIndexValue::Hash("kek".as_bytes())
+            .to_bytes(RocksSecondaryIndexValueVersion::OnlyHash)
+            .unwrap();
 
         match filter.filter(1, &key.to_bytes(), &index_value) {
             Decision::Remove => (),

rust/cubestore/cubestore/src/metastore/mod.rs

@@ -152,7 +152,7 @@ macro_rules! base_rocks_secondary_index {
                 crate::metastore::RocksSecondaryIndex::get_id(self)
             }
 
-            fn value_version(&self) -> u32 {
+            fn value_version(&self) -> crate::metastore::RocksSecondaryIndexValueVersion {
                 crate::metastore::RocksSecondaryIndex::value_version(self)
             }
 
@@ -168,6 +168,10 @@ macro_rules! base_rocks_secondary_index {
                 RocksSecondaryIndex::is_ttl(self)
             }
 
+            fn store_ttl_extended_info(&self) -> bool {
+                RocksSecondaryIndex::store_ttl_extended_info(self)
+            }
+
             fn get_expire(&self, row: &$table) -> Option<chrono::DateTime<chrono::Utc>> {
                 RocksSecondaryIndex::get_expire(self, row)
             }