Skip to content

Commit a8d3e9f

Browse files
authored
refactor(meta-service): simplify StateMachineApi (#18366)
1 parent 74e9ea6 commit a8d3e9f

13 files changed

+178
-256
lines changed

src/meta/raft-store/src/leveled_store/db_exporter.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ impl<'a> DBExporter<'a> {
9292

9393
// expire index
9494

95-
let strm = MapView(self.db).expire_map().range(..).await?;
95+
let strm = MapView(self.db).as_expire_map().range(..).await?;
9696
let expire_strm = strm.try_filter_map(|(exp_k, marked)| {
9797
// Tombstone will be converted to None and be ignored.
9898
let exp_val = ExpireValue::from_marked(marked);
@@ -102,7 +102,7 @@ impl<'a> DBExporter<'a> {
102102

103103
// kv
104104

105-
let strm = MapView(self.db).user_map().range(..).await?;
105+
let strm = MapView(self.db).as_user_map().range(..).await?;
106106
let kv_strm = strm.try_filter_map(|(user_key, seq_marked)| {
107107
// Tombstone will be converted to None and be ignored.
108108
let seqv: Option<SeqV<_>> = seq_marked.into();

src/meta/raft-store/src/leveled_store/db_map_api_ro_test.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ async fn test_db_map_api_ro() -> anyhow::Result<()> {
6868
// Test kv map
6969

7070
let binding = MapView(&db);
71-
let smap = binding.user_map();
71+
let smap = binding.as_user_map();
7272
assert_eq!(
7373
SeqMarked::new_normal(4, (Some(KVMeta::new(Some(15))), b("a1"))),
7474
smap.get(&user_key("a")).await?
@@ -102,7 +102,7 @@ async fn test_db_map_api_ro() -> anyhow::Result<()> {
102102
// Test expire index
103103

104104
let binding = MapView(&db);
105-
let emap = binding.expire_map();
105+
let emap = binding.as_expire_map();
106106

107107
assert_eq!(
108108
SeqMarked::new_normal(4, s("a")),

src/meta/raft-store/src/leveled_store/immutable.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ impl Immutable {
122122
impl MapApiRO<UserKey> for Immutable {
123123
async fn get(&self, key: &UserKey) -> Result<SeqMarked<MetaValue>, io::Error> {
124124
// get() is just delegated
125-
self.as_ref().user_map().get(key).await
125+
self.as_ref().as_user_map().get(key).await
126126
}
127127

128128
async fn range<R>(&self, range: R) -> Result<KVResultStream<UserKey>, io::Error>
@@ -136,7 +136,7 @@ impl MapApiRO<UserKey> for Immutable {
136136
impl MapApiRO<ExpireKey> for Immutable {
137137
async fn get(&self, key: &ExpireKey) -> Result<SeqMarkedOf<ExpireKey>, io::Error> {
138138
// get() is just delegated
139-
self.as_ref().expire_map().get(key).await
139+
self.as_ref().as_expire_map().get(key).await
140140
}
141141

142142
async fn range<R>(&self, range: R) -> Result<KVResultStream<ExpireKey>, io::Error>

src/meta/raft-store/src/leveled_store/level.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ impl MapApi<UserKey> for Level {
131131
SeqMarked::new_tombstone(seq)
132132
};
133133

134-
let prev = (*self).user_map().get(&key).await?;
134+
let prev = (*self).as_user_map().get(&key).await?;
135135
self.kv.insert(key, marked.clone());
136136
Ok((prev, marked))
137137
}
@@ -184,7 +184,7 @@ impl MapApi<ExpireKey> for Level {
184184
SeqMarked::new_tombstone(seq)
185185
};
186186

187-
let prev = (*self).expire_map().get(&key).await?;
187+
let prev = (*self).as_expire_map().get(&key).await?;
188188
self.expire.insert(key, marked.clone());
189189
Ok((prev, marked))
190190
}

src/meta/raft-store/src/leveled_store/leveled_map/compacting_data.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,12 @@ impl<'a> CompactingData<'a> {
7171
let mut data = newest.new_level();
7272

7373
// Copy all expire data and keep tombstone.
74-
let strm = (*immutable_levels).expire_map().range(..).await?;
74+
let strm = (*immutable_levels).as_expire_map().range(..).await?;
7575
let bt = strm.try_collect().await?;
7676
data.replace_expire(bt);
7777

7878
// Copy all kv data and keep tombstone.
79-
let strm = (*immutable_levels).user_map().range(..).await?;
79+
let strm = (*immutable_levels).as_user_map().range(..).await?;
8080
let bt = strm.try_collect().await?;
8181
data.replace_kv(bt);
8282

@@ -110,7 +110,7 @@ impl<'a> CompactingData<'a> {
110110

111111
// expire index: prefix `exp-/`.
112112

113-
let strm = (*self.immutable_levels).expire_map().range(..).await?;
113+
let strm = (*self.immutable_levels).as_expire_map().range(..).await?;
114114
let expire_strm = strm.map(|item: Result<(ExpireKey, SeqMarked<String>), io::Error>| {
115115
let (expire_key, marked_string) = item?;
116116

@@ -120,7 +120,7 @@ impl<'a> CompactingData<'a> {
120120

121121
// kv: prefix: `kv--/`
122122

123-
let strm = (*self.immutable_levels).user_map().range(..).await?;
123+
let strm = (*self.immutable_levels).as_user_map().range(..).await?;
124124
let kv_strm = strm.map(|item: Result<MapKV<UserKey>, io::Error>| {
125125
let (k, v) = item?;
126126

0 commit comments

Comments
 (0)