In-memory Engine: implement range load (tikv#16500)

ref tikv#16141 implement range load Signed-off-by: SpadeA-Tang <[email protected]>
DevinLee147 · Feb 27, 2024 · 867c3cb · 867c3cb
1 parent 3c302cb
commit 867c3cb
Show file tree

Hide file tree

Showing 15 changed files with 747 additions and 117 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/components/engine_traits/src/range_cache_engine.rs b/components/engine_traits/src/range_cache_engine.rs
@@ -5,7 +5,7 @@ use std::{cmp, fmt::Debug};
 use keys::{enc_end_key, enc_start_key};
 use kvproto::metapb;
 
-use crate::{Iterable, Snapshot, WriteBatchExt};
+use crate::{Iterable, KvEngine, Snapshot, WriteBatchExt};
 
 /// RangeCacheEngine works as a range cache caching some ranges (in Memory or
 /// NVME for instance) to improve the read performance.
@@ -19,6 +19,9 @@ pub trait RangeCacheEngine:
     // Sequence number is shared between RangeCacheEngine and disk KvEnigne to
     // provide atomic write
     fn snapshot(&self, range: CacheRange, read_ts: u64, seq_num: u64) -> Option<Self::Snapshot>;
+
+    type DiskEngine: KvEngine;
+    fn set_disk_engine(&mut self, disk_engine: Self::DiskEngine);
 }
 
 #[derive(Clone, Debug, PartialEq, Eq)]

diff --git a/components/hybrid_engine/src/engine.rs b/components/hybrid_engine/src/engine.rs
@@ -192,7 +192,7 @@ mod tests {
         {
             let mut core = memory_engine.core().write().unwrap();
             core.mut_range_manager().set_range_readable(&range, true);
-            core.mut_range_manager().set_safe_ts(&range, 10);
+            core.mut_range_manager().set_safe_point(&range, 10);
         }
 
         let hybrid_engine = HybridEngine::new(disk_engine, memory_engine.clone());

diff --git a/components/hybrid_engine/src/write_batch.rs b/components/hybrid_engine/src/write_batch.rs
@@ -148,7 +148,7 @@ mod tests {
                     let mut core = memory_engine.core().write().unwrap();
                     core.mut_range_manager()
                         .set_range_readable(&range_clone, true);
-                    core.mut_range_manager().set_safe_ts(&range_clone, 5);
+                    core.mut_range_manager().set_safe_point(&range_clone, 5);
                 }
             })
             .unwrap();
@@ -185,7 +185,7 @@ mod tests {
                 {
                     let mut core = memory_engine.core().write().unwrap();
                     core.mut_range_manager().set_range_readable(&range, true);
-                    core.mut_range_manager().set_safe_ts(&range, 10);
+                    core.mut_range_manager().set_safe_point(&range, 10);
                 }
             })
             .unwrap();

diff --git a/components/raftstore/src/store/worker/read.rs b/components/raftstore/src/store/worker/read.rs
@@ -2541,7 +2541,7 @@ mod tests {
         {
             let mut core = memory_engine.core().write().unwrap();
             core.mut_range_manager().set_range_readable(&range, true);
-            core.mut_range_manager().set_safe_ts(&range, 1);
+            core.mut_range_manager().set_safe_point(&range, 1);
         }
         let kv = (&[DATA_PREFIX, b'a'], b"b");
         reader.kv_engine.put(kv.0, kv.1).unwrap();
@@ -2589,7 +2589,7 @@ mod tests {
         {
             let mut core = memory_engine.core().write().unwrap();
             core.mut_range_manager().set_range_readable(&range, true);
-            core.mut_range_manager().set_safe_ts(&range, 10);
+            core.mut_range_manager().set_safe_point(&range, 10);
         }
 
         let mut snap_ctx = SnapshotContext {

diff --git a/components/region_cache_memory_engine/Cargo.toml b/components/region_cache_memory_engine/Cargo.toml
@@ -21,3 +21,8 @@ slog-global = { workspace = true }
 slog = { workspace = true }
 engine_rocks = { workspace = true }
 fail = "0.5"
+yatp = { workspace = true }
+
+[dev-dependencies]
+keys = { workspace = true }
+tempfile = "3.0"