cleanup

Signed-off-by: Bugen Zhao <i@bugenzhao.com>
risingwavelabs · Oct 24, 2022 · d62294c · d62294c
1 parent 9797e93
commit d62294c
Showing 1 changed file with 11 additions and 66 deletions.
diff --git a/src/storage/hummock_test/src/snapshot_tests.rs b/src/storage/hummock_test/src/snapshot_tests.rs
@@ -268,36 +268,11 @@ async fn test_snapshot_range_scan_inner(enable_sync: bool, enable_commit: bool)
         };
     }
 
-    assert_count_range_scan!(
-        hummock_storage,
-        (Bound::Included(key!(2)), Bound::Included(key!(3))),
-        2,
-        epoch
-    );
-    assert_count_range_scan!(
-        hummock_storage,
-        (Bound::Included(key!(2)), Bound::Excluded(key!(3))),
-        1,
-        epoch
-    );
-    assert_count_range_scan!(
-        hummock_storage,
-        (Bound::Included(key!(2)), Bound::Unbounded),
-        3,
-        epoch
-    );
-    assert_count_range_scan!(
-        hummock_storage,
-        (Bound::Unbounded, Bound::Included(key!(3))),
-        3,
-        epoch
-    );
-    assert_count_range_scan!(
-        hummock_storage,
-        (Bound::Unbounded, Bound::Excluded(key!(3))),
-        2,
-        epoch
-    );
+    assert_count_range_scan!(hummock_storage, key!(2)..=key!(3), 2, epoch);
+    assert_count_range_scan!(hummock_storage, key!(2)..key!(3), 1, epoch);
+    assert_count_range_scan!(hummock_storage, key!(2).., 3, epoch);
+    assert_count_range_scan!(hummock_storage, ..=key!(3), 3, epoch);
+    assert_count_range_scan!(hummock_storage, ..key!(3), 2, epoch);
     assert_count_range_scan!(hummock_storage, .., 4, epoch);
 }
 
@@ -394,44 +369,14 @@ async fn test_snapshot_backward_range_scan_inner(enable_sync: bool, enable_commi
         };
     }
 
-    assert_count_backward_range_scan!(
-        hummock_storage,
-        (Bound::Included(key!(3)), Bound::Included(key!(2))),
-        2,
-        epoch
-    );
-    assert_count_backward_range_scan!(
-        hummock_storage,
-        (Bound::Included(key!(3)), Bound::Excluded(key!(2))),
-        1,
-        epoch
-    );
-    assert_count_backward_range_scan!(
-        hummock_storage,
-        (Bound::Included(key!(3)), Bound::Excluded(key!(1))),
-        2,
-        epoch
-    );
-    assert_count_backward_range_scan!(
-        hummock_storage,
-        (Bound::Included(key!(3)), Bound::Included(key!(1))),
-        3,
-        epoch
-    );
-    assert_count_backward_range_scan!(
-        hummock_storage,
-        (Bound::Included(key!(3)), Bound::Excluded(key!(0))),
-        3,
-        epoch
-    );
+    assert_count_backward_range_scan!(hummock_storage, key!(3)..=key!(2), 2, epoch);
+    assert_count_backward_range_scan!(hummock_storage, key!(3)..key!(2), 1, epoch);
+    assert_count_backward_range_scan!(hummock_storage, key!(3)..key!(1), 2, epoch);
+    assert_count_backward_range_scan!(hummock_storage, key!(3)..=key!(1), 3, epoch);
+    assert_count_backward_range_scan!(hummock_storage, key!(3)..key!(0), 3, epoch);
     assert_count_backward_range_scan!(hummock_storage, .., 6, epoch);
     assert_count_backward_range_scan!(hummock_storage, .., 8, epoch + 1);
-    assert_count_backward_range_scan!(
-        hummock_storage,
-        (Bound::Included(key!(7)), Bound::Excluded(key!(2))),
-        5,
-        epoch + 1
-    );
+    assert_count_backward_range_scan!(hummock_storage, key!(7)..key!(2), 5, epoch + 1);
 }
 
 #[tokio::test]