Skip to content

Commit 3fadba6

Browse files
authored
Revert "chore!: rename table name in table_kv based wal (#868)" (#873)
This reverts commit 4a73fac.
1 parent 4a73fac commit 3fadba6

File tree

2 files changed

+24
-24
lines changed

2 files changed

+24
-24
lines changed

wal/src/table_kv_impl/encoding.rs

+16-16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright 2022-2023 CeresDB Project Authors. Licensed under Apache-2.0.
1+
// Copyright 2022 CeresDB Project Authors. Licensed under Apache-2.0.
22

33
//! Constants and utils for encoding.
44
@@ -74,7 +74,7 @@ pub fn format_permanent_bucket_key(namespace: &str) -> String {
7474

7575
#[inline]
7676
pub fn format_table_unit_meta_name(namespace: &str, shard_id: usize) -> String {
77-
format!("{namespace}_meta_{shard_id:0>6}")
77+
format!("table_unit_meta_{namespace}_{shard_id:0>6}")
7878
}
7979

8080
#[inline]
@@ -91,7 +91,7 @@ pub fn format_timed_wal_name(
9191
Some(v) => v,
9292
};
9393
Ok(format!(
94-
"{}_data_{}_{:0>6}",
94+
"wal_{}_{}_{:0>6}",
9595
namespace,
9696
dt.format(WAL_SHARD_TIMESTAMP_FORMAT),
9797
shard_id
@@ -100,7 +100,7 @@ pub fn format_timed_wal_name(
100100

101101
#[inline]
102102
pub fn format_permanent_wal_name(namespace: &str, shard_id: usize) -> String {
103-
format!("{namespace}_data_permanent_{shard_id:0>6}")
103+
format!("wal_{namespace}_permanent_{shard_id:0>6}")
104104
}
105105

106106
#[inline]
@@ -143,52 +143,52 @@ mod tests {
143143
fn test_format_table_unit_meta() {
144144
let ns = "abcdef";
145145
let name = format_table_unit_meta_name(ns, 0);
146-
assert_eq!("abcdef_meta_000000", name);
146+
assert_eq!("table_unit_meta_abcdef_000000", name);
147147

148148
let name = format_table_unit_meta_name(ns, 124);
149-
assert_eq!("abcdef_meta_000124", name);
149+
assert_eq!("table_unit_meta_abcdef_000124", name);
150150

151151
let name = format_table_unit_meta_name(ns, 999999);
152-
assert_eq!("abcdef_meta_999999", name);
152+
assert_eq!("table_unit_meta_abcdef_999999", name);
153153

154154
let name = format_table_unit_meta_name(ns, 1234567);
155-
assert_eq!("abcdef_meta_1234567", name);
155+
assert_eq!("table_unit_meta_abcdef_1234567", name);
156156
}
157157

158158
#[test]
159159
fn test_format_permanent_wal_name() {
160160
let ns = "mywal";
161161
let name = format_permanent_wal_name(ns, 0);
162-
assert_eq!("mywal_data_permanent_000000", name);
162+
assert_eq!("wal_mywal_permanent_000000", name);
163163

164164
let name = format_permanent_wal_name(ns, 124);
165-
assert_eq!("mywal_data_permanent_000124", name);
165+
assert_eq!("wal_mywal_permanent_000124", name);
166166

167167
let name = format_permanent_wal_name(ns, 999999);
168-
assert_eq!("mywal_data_permanent_999999", name);
168+
assert_eq!("wal_mywal_permanent_999999", name);
169169

170170
let name = format_permanent_wal_name(ns, 1234567);
171-
assert_eq!("mywal_data_permanent_1234567", name);
171+
assert_eq!("wal_mywal_permanent_1234567", name);
172172
}
173173

174174
#[test]
175175
fn test_format_timed_wal_name() {
176176
let ns = "mywal";
177177

178178
let name = format_timed_wal_name(ns, Timestamp::ZERO, 0).unwrap();
179-
assert_eq!("mywal_data_19700101000000_000000", name);
179+
assert_eq!("wal_mywal_19700101000000_000000", name);
180180

181181
// gmt time 2022-03-28T00:00:00
182182
let ts = Timestamp::new(1648425600000);
183183

184184
let name = format_timed_wal_name(ns, ts, 124).unwrap();
185-
assert_eq!("mywal_data_20220328000000_000124", name);
185+
assert_eq!("wal_mywal_20220328000000_000124", name);
186186

187187
let name = format_timed_wal_name(ns, ts, 999999).unwrap();
188-
assert_eq!("mywal_data_20220328000000_999999", name);
188+
assert_eq!("wal_mywal_20220328000000_999999", name);
189189

190190
let name = format_timed_wal_name(ns, ts, 1234567).unwrap();
191-
assert_eq!("mywal_data_20220328000000_1234567", name);
191+
assert_eq!("wal_mywal_20220328000000_1234567", name);
192192
}
193193

194194
#[test]

wal/src/table_kv_impl/namespace.rs

+8-8
Original file line numberDiff line numberDiff line change
@@ -1544,10 +1544,10 @@ mod tests {
15441544
let bucket = Bucket::new("test", entry).unwrap();
15451545
assert_eq!(4, bucket.wal_shard_names.len());
15461546
let expect_names = [
1547-
"test_data_20220328000000_000000",
1548-
"test_data_20220328000000_000001",
1549-
"test_data_20220328000000_000002",
1550-
"test_data_20220328000000_000003",
1547+
"wal_test_20220328000000_000000",
1548+
"wal_test_20220328000000_000001",
1549+
"wal_test_20220328000000_000002",
1550+
"wal_test_20220328000000_000003",
15511551
];
15521552
assert_eq!(&expect_names[..], &bucket.wal_shard_names[..]);
15531553
}
@@ -1560,10 +1560,10 @@ mod tests {
15601560
let bucket = Bucket::new("test", entry).unwrap();
15611561
assert_eq!(4, bucket.wal_shard_names.len());
15621562
let expect_names = [
1563-
"test_data_permanent_000000",
1564-
"test_data_permanent_000001",
1565-
"test_data_permanent_000002",
1566-
"test_data_permanent_000003",
1563+
"wal_test_permanent_000000",
1564+
"wal_test_permanent_000001",
1565+
"wal_test_permanent_000002",
1566+
"wal_test_permanent_000003",
15671567
];
15681568
assert_eq!(&expect_names[..], &bucket.wal_shard_names[..]);
15691569
}

0 commit comments

Comments
 (0)