fix CR

horaedb/metric_engine/src/sst.rs

@@ -15,9 +15,6 @@
 // specific language governing permissions and limitations
 // under the License.
 
-use crate::types::ObjectStoreRef;
-
 pub struct SSTable {
-    pub sst_id: u64,
-    pub storage: ObjectStoreRef,
+    pub id: u64,
 }

horaedb/metric_engine/src/storage.rs

@@ -25,28 +25,31 @@ use crate::{
     Result,
 };
 
-pub struct CompactContext {}
-pub struct WriteContext {}
-pub struct ScanContext {}
+pub struct WriteRequest {
+    batch: RecordBatch,
+}
+
+pub struct ScanRequest {
+    range: TimeRange,
+    predicates: Vec<Predicate>,
+    /// `None` means all columns.
+    projections: Option<Vec<usize>>,
+}
+
+pub struct CompactRequest {}
 
 /// Time-aware merge storage interface.
 #[async_trait]
 pub trait TimeMergeStorage {
     fn schema(&self) -> Result<&Schema>;
 
-    async fn write(&self, ctx: &WriteContext, batch: RecordBatch) -> Result<()>;
+    async fn write(&self, req: WriteRequest) -> Result<()>;
 
     /// Implementation shoule ensure that the returned stream is sorted by time,
     /// from old to latest.
-    async fn scan(
-        &self,
-        ctx: &ScanContext,
-        range: TimeRange,
-        predicates: Vec<Predicate>,
-        projections: Vec<usize>,
-    ) -> Result<SendableRecordBatchStream>;
+    async fn scan(&self, req: ScanRequest) -> Result<SendableRecordBatchStream>;
 
-    async fn compact(&self, ctx: &CompactContext) -> Result<()>;
+    async fn compact(&self, req: CompactRequest) -> Result<()>;
 }
 
 /// TMStorage implementation using cloud object storage.
@@ -76,21 +79,15 @@ impl TimeMergeStorage for CloudObjectStorage {
         todo!()
     }
 
-    async fn write(&self, ctx: &WriteContext, batch: RecordBatch) -> Result<()> {
+    async fn write(&self, req: WriteRequest) -> Result<()> {
         todo!()
     }
 
-    async fn scan(
-        &self,
-        ctx: &ScanContext,
-        range: TimeRange,
-        predicates: Vec<Predicate>,
-        projections: Vec<usize>,
-    ) -> Result<SendableRecordBatchStream> {
+    async fn scan(&self, req: ScanRequest) -> Result<SendableRecordBatchStream> {
         todo!()
     }
 
-    async fn compact(&self, ctx: &CompactContext) -> Result<()> {
+    async fn compact(&self, req: CompactRequest) -> Result<()> {
         todo!()
     }
 }

horaedb/metric_engine/src/types.rs

@@ -33,16 +33,15 @@ pub enum Value {
 pub enum Predicate {
     Equal(String, Value),
     NotEqual(String, Value),
-    RegexMatch(String, Value),
-    NotRegexMatch(String, Value),
+    RegexMatch(String, Vec<u8>),
+    NotRegexMatch(String, Vec<u8>),
 }
 
 pub type TimeRange = Range<i64>;
 
 pub type ObjectStoreRef = Arc<dyn ObjectStore>;
 
 /// Trait for types that stream [arrow::record_batch::RecordBatch]
-// TODO: how to attach TSID hint to RecordBatch?
 pub trait RecordBatchStream: Stream<Item = Result<RecordBatch>> {
     fn schema(&self) -> &Schema;
 }