chore: let's use Option<String> in index

Author: ovr

rust/cubestore/cubestore/src/cachestore/queue_item.rs

@@ -412,7 +412,7 @@ pub enum QueueItemIndexKey {
     ByPath(String),
     ByPrefixAndStatus(String, QueueItemStatus),
     ByPrefix(String),
-    ByExternalId(String),
+    ByExternalId(Option<String>),
 }
 
 base_rocks_secondary_index!(QueueItem, QueueItemRocksIndex);
@@ -429,7 +429,7 @@ impl RocksSecondaryIndex<QueueItem, QueueItemIndexKey> for QueueItemRocksIndex {
                 QueueItemIndexKey::ByPrefix(row.get_prefix().clone().unwrap_or("".to_string()))
             }
             QueueItemRocksIndex::ByExternalId => {
-                QueueItemIndexKey::ByExternalId(row.get_external_id().clone().unwrap_or_default())
+                QueueItemIndexKey::ByExternalId(row.get_external_id().clone())
             }
         }
     }
@@ -438,7 +438,9 @@ impl RocksSecondaryIndex<QueueItem, QueueItemIndexKey> for QueueItemRocksIndex {
         match key {
             QueueItemIndexKey::ByPath(s) => s.as_bytes().to_vec(),
             QueueItemIndexKey::ByPrefix(s) => s.as_bytes().to_vec(),
-            QueueItemIndexKey::ByExternalId(s) => s.as_bytes().to_vec(),
+            QueueItemIndexKey::ByExternalId(s) => {
+                s.as_deref().unwrap_or("__null__").as_bytes().to_vec()
+            }
             QueueItemIndexKey::ByPrefixAndStatus(prefix, s) => {
                 let mut r = Vec::with_capacity(prefix.len() + 1);
                 r.extend_from_slice(&prefix.as_bytes());
@@ -486,7 +488,7 @@ impl RocksSecondaryIndex<QueueItem, QueueItemIndexKey> for QueueItemRocksIndex {
 
     fn should_index_row(&self, row: &QueueItem) -> bool {
         match self {
-            QueueItemRocksIndex::ByExternalId => row.external_id.is_some(),
+            Self::ByExternalId => row.external_id.is_some(),
             _ => true,
         }
     }

rust/cubestore/cubestore/src/cachestore/queue_result.rs

@@ -1,4 +1,5 @@
-use crate::cachestore::QueueKey;
+use crate::cachestore::queue_item::QueueItemRocksIndex;
+use crate::cachestore::{QueueItem, QueueKey};
 use crate::metastore::{
     BaseRocksTable, IdRow, IndexId, RocksEntity, RocksSecondaryIndex, RocksTable, TableId,
     TableInfo,
@@ -111,7 +112,7 @@ rocks_table_new!(QueueResult, QueueResultRocksTable, TableId::QueueResults, {
 #[derive(Hash, Clone, Debug)]
 pub enum QueueResultIndexKey {
     ByPath(String),
-    ByExternalId(String),
+    ByExternalId(Option<String>),
 }
 
 base_rocks_secondary_index!(QueueResult, QueueResultRocksIndex);
@@ -121,15 +122,17 @@ impl RocksSecondaryIndex<QueueResult, QueueResultIndexKey> for QueueResultRocksI
         match self {
             QueueResultRocksIndex::ByPath => QueueResultIndexKey::ByPath(row.get_path().clone()),
             QueueResultRocksIndex::ByExternalId => {
-                QueueResultIndexKey::ByExternalId(row.get_external_id().clone().unwrap_or_default())
+                QueueResultIndexKey::ByExternalId(row.get_external_id().clone())
             }
         }
     }
 
     fn key_to_bytes(&self, key: &QueueResultIndexKey) -> Vec<u8> {
         match key {
             QueueResultIndexKey::ByPath(s) => s.as_bytes().to_vec(),
-            QueueResultIndexKey::ByExternalId(s) => s.as_bytes().to_vec(),
+            QueueResultIndexKey::ByExternalId(s) => {
+                s.as_deref().unwrap_or("__null__").as_bytes().to_vec()
+            }
         }
     }
 
@@ -161,7 +164,7 @@ impl RocksSecondaryIndex<QueueResult, QueueResultIndexKey> for QueueResultRocksI
 
     fn should_index_row(&self, row: &QueueResult) -> bool {
         match self {
-            QueueResultRocksIndex::ByExternalId => row.external_id.is_some(),
+            Self::ByExternalId => row.external_id.is_some(),
             _ => true,
         }
     }