Skip to content

Commit d10b7cd

Browse files
marvin-j97marvin-j97
committed
fmt
1 parent 0b84e78 commit d10b7cd

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

57 files changed

+827
-300
lines changed

‎tests/blob_compression.rs‎

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,19 @@ fn blob_tree_compression() -> lsm_tree::Result<()> {
99
let folder = tempfile::tempdir()?;
1010
let path = folder.path();
1111

12-
let tree = lsm_tree::Config::new(path, SequenceNumberCounter::default(), SequenceNumberCounter::default())
13-
.with_kv_separation(Some(
14-
KvSeparationOptions::default()
15-
.compression(lsm_tree::CompressionType::Lz4)
16-
.separation_threshold(1)
17-
.staleness_threshold(0.0000001)
18-
.age_cutoff(1.0),
19-
))
20-
.open()?;
12+
let tree = lsm_tree::Config::new(
13+
path,
14+
SequenceNumberCounter::default(),
15+
SequenceNumberCounter::default(),
16+
)
17+
.with_kv_separation(Some(
18+
KvSeparationOptions::default()
19+
.compression(lsm_tree::CompressionType::Lz4)
20+
.separation_threshold(1)
21+
.staleness_threshold(0.0000001)
22+
.age_cutoff(1.0),
23+
))
24+
.open()?;
2125

2226
let big_value = b"abc".repeat(50);
2327

‎tests/blob_fifo_limit.rs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@ fn blob_tree_fifo_limit() -> lsm_tree::Result<()> {
77
let folder = get_tmp_folder();
88
let path = folder.path();
99

10-
let tree = lsm_tree::Config::new(path, SequenceNumberCounter::default(), SequenceNumberCounter::default())
11-
.with_kv_separation(Some(KvSeparationOptions::default().separation_threshold(1)))
12-
.open()?;
10+
let tree = lsm_tree::Config::new(
11+
path,
12+
SequenceNumberCounter::default(),
13+
SequenceNumberCounter::default(),
14+
)
15+
.with_kv_separation(Some(KvSeparationOptions::default().separation_threshold(1)))
16+
.open()?;
1317

1418
let compaction = Arc::new(lsm_tree::compaction::Fifo::new(10, None));
1519

‎tests/blob_file_full_file_checksum.rs‎

Lines changed: 28 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,13 @@ fn blob_file_full_file_checksum() -> lsm_tree::Result<()> {
77
let folder = get_tmp_folder();
88

99
{
10-
let tree = Config::new(&folder, SequenceNumberCounter::default(), SequenceNumberCounter::default())
11-
.with_kv_separation(Some(KvSeparationOptions::default().separation_threshold(1)))
12-
.open()?;
10+
let tree = Config::new(
11+
&folder,
12+
SequenceNumberCounter::default(),
13+
SequenceNumberCounter::default(),
14+
)
15+
.with_kv_separation(Some(KvSeparationOptions::default().separation_threshold(1)))
16+
.open()?;
1317

1418
for key in ('a'..='z').map(|c| c.to_string()) {
1519
let value = nanoid::nanoid!();
@@ -29,9 +33,13 @@ fn blob_file_full_file_checksum() -> lsm_tree::Result<()> {
2933
}
3034

3135
{
32-
let tree = Config::new(&folder, SequenceNumberCounter::default(), SequenceNumberCounter::default())
33-
.with_kv_separation(Some(KvSeparationOptions::default().separation_threshold(1)))
34-
.open()?;
36+
let tree = Config::new(
37+
&folder,
38+
SequenceNumberCounter::default(),
39+
SequenceNumberCounter::default(),
40+
)
41+
.with_kv_separation(Some(KvSeparationOptions::default().separation_threshold(1)))
42+
.open()?;
3543

3644
let version = tree.current_version();
3745
let blob_file = version.blob_files.iter().next().unwrap();
@@ -52,9 +60,13 @@ fn blob_file_full_file_detect_corruption() -> lsm_tree::Result<()> {
5260
let folder = get_tmp_folder();
5361

5462
{
55-
let tree = Config::new(&folder, SequenceNumberCounter::default(), SequenceNumberCounter::default())
56-
.with_kv_separation(Some(KvSeparationOptions::default().separation_threshold(1)))
57-
.open()?;
63+
let tree = Config::new(
64+
&folder,
65+
SequenceNumberCounter::default(),
66+
SequenceNumberCounter::default(),
67+
)
68+
.with_kv_separation(Some(KvSeparationOptions::default().separation_threshold(1)))
69+
.open()?;
5870

5971
for key in ('a'..='z').map(|c| c.to_string()) {
6072
let value = nanoid::nanoid!();
@@ -74,9 +86,13 @@ fn blob_file_full_file_detect_corruption() -> lsm_tree::Result<()> {
7486
}
7587

7688
{
77-
let tree = Config::new(&folder, SequenceNumberCounter::default(), SequenceNumberCounter::default())
78-
.with_kv_separation(Some(KvSeparationOptions::default().separation_threshold(1)))
79-
.open()?;
89+
let tree = Config::new(
90+
&folder,
91+
SequenceNumberCounter::default(),
92+
SequenceNumberCounter::default(),
93+
)
94+
.with_kv_separation(Some(KvSeparationOptions::default().separation_threshold(1)))
95+
.open()?;
8096

8197
let version = tree.current_version();
8298
let blob_file = version.blob_files.iter().next().unwrap();

‎tests/blob_flush_gc_stats.rs‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,13 @@ fn blob_tree_flush_gc_stats() -> lsm_tree::Result<()> {
1010
let new_big_value = b"winter!".repeat(128_000);
1111

1212
{
13-
let tree = lsm_tree::Config::new(path, SequenceNumberCounter::default(), SequenceNumberCounter::default())
14-
.with_kv_separation(Some(Default::default()))
15-
.open()?;
13+
let tree = lsm_tree::Config::new(
14+
path,
15+
SequenceNumberCounter::default(),
16+
SequenceNumberCounter::default(),
17+
)
18+
.with_kv_separation(Some(Default::default()))
19+
.open()?;
1620

1721
assert!(tree.get("big", SeqNo::MAX)?.is_none());
1822
tree.insert("big", &big_value, 0);
@@ -40,9 +44,13 @@ fn blob_tree_flush_gc_stats_tombstone() -> lsm_tree::Result<()> {
4044
let big_value = b"neptune!".repeat(128_000);
4145

4246
{
43-
let tree = lsm_tree::Config::new(path, SequenceNumberCounter::default(), SequenceNumberCounter::default())
44-
.with_kv_separation(Some(Default::default()))
45-
.open()?;
47+
let tree = lsm_tree::Config::new(
48+
path,
49+
SequenceNumberCounter::default(),
50+
SequenceNumberCounter::default(),
51+
)
52+
.with_kv_separation(Some(Default::default()))
53+
.open()?;
4654

4755
assert!(tree.get("big", SeqNo::MAX)?.is_none());
4856
tree.insert("big", &big_value, 0);

‎tests/blob_ingest.rs‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,15 @@ fn blob_ingest_gc_stats() -> lsm_tree::Result<()> {
1313
let new_big_value = b"winter!".repeat(128_000);
1414

1515
{
16-
let tree = lsm_tree::Config::new(path, SequenceNumberCounter::default(), SequenceNumberCounter::default())
17-
.with_kv_separation(Some(
18-
KvSeparationOptions::default().compression(lsm_tree::CompressionType::None),
19-
))
20-
.open()?;
16+
let tree = lsm_tree::Config::new(
17+
path,
18+
SequenceNumberCounter::default(),
19+
SequenceNumberCounter::default(),
20+
)
21+
.with_kv_separation(Some(
22+
KvSeparationOptions::default().compression(lsm_tree::CompressionType::None),
23+
))
24+
.open()?;
2125

2226
let mut ingestion = tree.ingestion()?;
2327
ingestion.write("big", &big_value)?;

‎tests/blob_ingest_relink.rs‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,15 @@ fn blob_tree_ingest_relink() -> lsm_tree::Result<()> {
99
let big_value = b"neptune!".repeat(128_000);
1010

1111
{
12-
let tree = lsm_tree::Config::new(path, SequenceNumberCounter::default(), SequenceNumberCounter::default())
13-
.with_kv_separation(Some(
14-
KvSeparationOptions::default().compression(lsm_tree::CompressionType::None),
15-
))
16-
.open()?;
12+
let tree = lsm_tree::Config::new(
13+
path,
14+
SequenceNumberCounter::default(),
15+
SequenceNumberCounter::default(),
16+
)
17+
.with_kv_separation(Some(
18+
KvSeparationOptions::default().compression(lsm_tree::CompressionType::None),
19+
))
20+
.open()?;
1721

1822
let mut ingestion = tree.ingestion()?;
1923
ingestion.write("big", &big_value)?;

‎tests/blob_major_compact_drop_dead_files.rs‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,15 @@ fn blob_tree_major_compact_drop_dead_files() -> lsm_tree::Result<()> {
1313
let new_big_value = b"winter!".repeat(128_000);
1414

1515
{
16-
let tree = lsm_tree::Config::new(path, SequenceNumberCounter::default(), SequenceNumberCounter::default())
17-
.with_kv_separation(Some(
18-
KvSeparationOptions::default().compression(lsm_tree::CompressionType::None),
19-
))
20-
.open()?;
16+
let tree = lsm_tree::Config::new(
17+
path,
18+
SequenceNumberCounter::default(),
19+
SequenceNumberCounter::default(),
20+
)
21+
.with_kv_separation(Some(
22+
KvSeparationOptions::default().compression(lsm_tree::CompressionType::None),
23+
))
24+
.open()?;
2125

2226
assert!(tree.get("big", SeqNo::MAX)?.is_none());
2327

‎tests/blob_major_compact_gc_stats.rs‎

Lines changed: 27 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,15 @@ fn blob_tree_major_compact_gc_stats() -> lsm_tree::Result<()> {
1313
let new_big_value = b"winter!".repeat(128_000);
1414

1515
{
16-
let tree = lsm_tree::Config::new(path, SequenceNumberCounter::default(), SequenceNumberCounter::default())
17-
.with_kv_separation(Some(
18-
KvSeparationOptions::default().compression(lsm_tree::CompressionType::None),
19-
))
20-
.open()?;
16+
let tree = lsm_tree::Config::new(
17+
path,
18+
SequenceNumberCounter::default(),
19+
SequenceNumberCounter::default(),
20+
)
21+
.with_kv_separation(Some(
22+
KvSeparationOptions::default().compression(lsm_tree::CompressionType::None),
23+
))
24+
.open()?;
2125

2226
assert!(tree.get("big", SeqNo::MAX)?.is_none());
2327
tree.insert("big", &big_value, 0);
@@ -65,11 +69,15 @@ fn blob_tree_major_compact_gc_stats_2() -> lsm_tree::Result<()> {
6569
let big_value = b"neptune!".repeat(128_000);
6670

6771
{
68-
let tree = lsm_tree::Config::new(path, SequenceNumberCounter::default(), SequenceNumberCounter::default())
69-
.with_kv_separation(Some(
70-
KvSeparationOptions::default().compression(lsm_tree::CompressionType::None),
71-
))
72-
.open()?;
72+
let tree = lsm_tree::Config::new(
73+
path,
74+
SequenceNumberCounter::default(),
75+
SequenceNumberCounter::default(),
76+
)
77+
.with_kv_separation(Some(
78+
KvSeparationOptions::default().compression(lsm_tree::CompressionType::None),
79+
))
80+
.open()?;
7381

7482
assert!(tree.get("big", SeqNo::MAX)?.is_none());
7583
tree.insert("big", &big_value, 0);
@@ -116,11 +124,15 @@ fn blob_tree_major_compact_gc_stats_tombstone() -> lsm_tree::Result<()> {
116124
let big_value = b"neptune!".repeat(128_000);
117125

118126
{
119-
let tree = lsm_tree::Config::new(path, SequenceNumberCounter::default(), SequenceNumberCounter::default())
120-
.with_kv_separation(Some(
121-
KvSeparationOptions::default().compression(lsm_tree::CompressionType::None),
122-
))
123-
.open()?;
127+
let tree = lsm_tree::Config::new(
128+
path,
129+
SequenceNumberCounter::default(),
130+
SequenceNumberCounter::default(),
131+
)
132+
.with_kv_separation(Some(
133+
KvSeparationOptions::default().compression(lsm_tree::CompressionType::None),
134+
))
135+
.open()?;
124136

125137
assert!(tree.get("big", SeqNo::MAX)?.is_none());
126138
tree.insert("big", &big_value, 0);

‎tests/blob_major_compact_relink.rs‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,15 @@ fn blob_tree_major_compact_relink() -> lsm_tree::Result<()> {
99
let big_value = b"neptune!".repeat(128_000);
1010

1111
{
12-
let tree = lsm_tree::Config::new(path, SequenceNumberCounter::default(), SequenceNumberCounter::default())
13-
.with_kv_separation(Some(
14-
KvSeparationOptions::default().compression(lsm_tree::CompressionType::None),
15-
))
16-
.open()?;
12+
let tree = lsm_tree::Config::new(
13+
path,
14+
SequenceNumberCounter::default(),
15+
SequenceNumberCounter::default(),
16+
)
17+
.with_kv_separation(Some(
18+
KvSeparationOptions::default().compression(lsm_tree::CompressionType::None),
19+
))
20+
.open()?;
1721

1822
assert!(tree.get("big", SeqNo::MAX)?.is_none());
1923
tree.insert("big", &big_value, 0);

‎tests/blob_major_compact_relocation.rs‎

Lines changed: 33 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,17 @@ fn blob_tree_major_compact_relocation_simple() -> lsm_tree::Result<()> {
1313
let new_big_value = b"winter!".repeat(128_000);
1414

1515
{
16-
let tree = lsm_tree::Config::new(path, SequenceNumberCounter::default(), SequenceNumberCounter::default())
17-
.with_kv_separation(Some(
18-
KvSeparationOptions::default()
19-
.compression(lsm_tree::CompressionType::None)
20-
.age_cutoff(1.0),
21-
))
22-
.open()?;
16+
let tree = lsm_tree::Config::new(
17+
path,
18+
SequenceNumberCounter::default(),
19+
SequenceNumberCounter::default(),
20+
)
21+
.with_kv_separation(Some(
22+
KvSeparationOptions::default()
23+
.compression(lsm_tree::CompressionType::None)
24+
.age_cutoff(1.0),
25+
))
26+
.open()?;
2327

2428
assert!(tree.get("big", SeqNo::MAX)?.is_none());
2529
tree.insert("big", &big_value, 0);
@@ -104,13 +108,17 @@ fn blob_tree_major_compact_relocation_repeated_key() -> lsm_tree::Result<()> {
104108
let very_big_value = b"winter!".repeat(128_000);
105109

106110
{
107-
let tree = lsm_tree::Config::new(path, SequenceNumberCounter::default(), SequenceNumberCounter::default())
108-
.with_kv_separation(Some(
109-
KvSeparationOptions::default()
110-
.compression(lsm_tree::CompressionType::None)
111-
.age_cutoff(1.0),
112-
))
113-
.open()?;
111+
let tree = lsm_tree::Config::new(
112+
path,
113+
SequenceNumberCounter::default(),
114+
SequenceNumberCounter::default(),
115+
)
116+
.with_kv_separation(Some(
117+
KvSeparationOptions::default()
118+
.compression(lsm_tree::CompressionType::None)
119+
.age_cutoff(1.0),
120+
))
121+
.open()?;
114122

115123
assert!(tree.get("big", SeqNo::MAX)?.is_none());
116124
tree.insert("a", &big_value, 0);
@@ -213,13 +221,17 @@ fn blob_tree_major_compact_relocation_interleaved() -> lsm_tree::Result<()> {
213221
let big_value = b"neptune!".repeat(2_000);
214222

215223
{
216-
let tree = lsm_tree::Config::new(path, SequenceNumberCounter::default(), SequenceNumberCounter::default())
217-
.with_kv_separation(Some(
218-
KvSeparationOptions::default()
219-
.compression(lsm_tree::CompressionType::None)
220-
.age_cutoff(1.0),
221-
))
222-
.open()?;
224+
let tree = lsm_tree::Config::new(
225+
path,
226+
SequenceNumberCounter::default(),
227+
SequenceNumberCounter::default(),
228+
)
229+
.with_kv_separation(Some(
230+
KvSeparationOptions::default()
231+
.compression(lsm_tree::CompressionType::None)
232+
.age_cutoff(1.0),
233+
))
234+
.open()?;
223235

224236
assert!(tree.get("big", SeqNo::MAX)?.is_none());
225237
tree.insert("a", b"smol", 0);

0 commit comments

Comments
 (0)