Skip to content

Commit 97ee265

Browse files
committed
fix: remove rocksdb.cur-size-all-mem-tables from tests, because it apparently behaves differently in different environments
1 parent 4e77791 commit 97ee265

1 file changed

Lines changed: 6 additions & 47 deletions

File tree

rocksdb/tests/test_db.py

Lines changed: 6 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -742,17 +742,9 @@ def test_flush(self):
742742
self.db.put(b"a", b"1")
743743
self.db.put(b"b", b"2")
744744

745-
# Verify data is in memtable (memtable size > 0)
746-
memtable_size_before = int(self.db.get_property(b'rocksdb.cur-size-all-mem-tables'))
747-
self.assertGreater(memtable_size_before, 0)
748-
749745
# Flush with default parameters (all column families, wait=True)
750746
self.db.flush()
751747

752-
# Verify memtable size decreased after flush
753-
memtable_size_after = int(self.db.get_property(b'rocksdb.cur-size-all-mem-tables'))
754-
self.assertLess(memtable_size_after, memtable_size_before)
755-
756748
# Verify flush created SST files at level 0
757749
final_l0_files = int(self.db.get_property(b'rocksdb.num-files-at-level0'))
758750
self.assertGreater(final_l0_files, initial_l0_files)
@@ -775,25 +767,9 @@ def test_flush_all_column_families(self):
775767
self.db.put((self.cf_a, b"a_key"), b"a_value")
776768
self.db.put((self.cf_b, b"b_key"), b"b_value")
777769

778-
# Check memtable sizes before flush
779-
memtable_default_before = int(self.db.get_property(b'rocksdb.cur-size-all-mem-tables'))
780-
memtable_cf_a_before = int(self.db.get_property(b'rocksdb.cur-size-all-mem-tables', self.cf_a))
781-
memtable_cf_b_before = int(self.db.get_property(b'rocksdb.cur-size-all-mem-tables', self.cf_b))
782-
self.assertGreater(memtable_default_before, 0)
783-
self.assertGreater(memtable_cf_a_before, 0)
784-
self.assertGreater(memtable_cf_b_before, 0)
785-
786770
# Flush all column families (default behavior)
787771
self.db.flush()
788772

789-
# Verify memtable sizes decreased after flush
790-
memtable_default_after = int(self.db.get_property(b'rocksdb.cur-size-all-mem-tables'))
791-
memtable_cf_a_after = int(self.db.get_property(b'rocksdb.cur-size-all-mem-tables', self.cf_a))
792-
memtable_cf_b_after = int(self.db.get_property(b'rocksdb.cur-size-all-mem-tables', self.cf_b))
793-
self.assertLess(memtable_default_after, memtable_default_before)
794-
self.assertLess(memtable_cf_a_after, memtable_cf_a_before)
795-
self.assertLess(memtable_cf_b_after, memtable_cf_b_before)
796-
797773
# Verify all column families were flushed (SST files created)
798774
final_default_l0 = int(self.db.get_property(b'rocksdb.num-files-at-level0'))
799775
final_cf_a_l0 = int(self.db.get_property(b'rocksdb.num-files-at-level0', self.cf_a))
@@ -812,21 +788,9 @@ def test_flush_single_column_family(self):
812788
self.db.put((self.cf_a, b"a_key"), b"a_value")
813789
self.db.put((self.cf_b, b"b_key"), b"b_value")
814790

815-
# Check memtable sizes before flush
816-
memtable_cf_a_before = int(self.db.get_property(b'rocksdb.cur-size-all-mem-tables', self.cf_a))
817-
memtable_cf_b_before = int(self.db.get_property(b'rocksdb.cur-size-all-mem-tables', self.cf_b))
818-
self.assertGreater(memtable_cf_a_before, 0)
819-
self.assertGreater(memtable_cf_b_before, 0)
820-
821791
# Flush only cf_a
822792
self.db.flush(column_families=self.cf_a)
823793

824-
# Verify memtable size decreased for cf_a but not for cf_b
825-
memtable_cf_a_after = int(self.db.get_property(b'rocksdb.cur-size-all-mem-tables', self.cf_a))
826-
memtable_cf_b_after = int(self.db.get_property(b'rocksdb.cur-size-all-mem-tables', self.cf_b))
827-
self.assertLess(memtable_cf_a_after, memtable_cf_a_before)
828-
self.assertEqual(memtable_cf_b_after, memtable_cf_b_before) # cf_b memtable unchanged
829-
830794
# Verify only cf_a was flushed (SST files created)
831795
final_cf_a_l0 = int(self.db.get_property(b'rocksdb.num-files-at-level0', self.cf_a))
832796
final_cf_b_l0 = int(self.db.get_property(b'rocksdb.num-files-at-level0', self.cf_b))
@@ -843,20 +807,15 @@ def test_flush_multiple_column_families(self):
843807
self.db.put((self.cf_a, b"a_key"), b"a_value")
844808
self.db.put((self.cf_b, b"b_key"), b"b_value")
845809

846-
# Check memtable sizes before flush
847-
memtable_cf_a_before = int(self.db.get_property(b'rocksdb.cur-size-all-mem-tables', self.cf_a))
848-
memtable_cf_b_before = int(self.db.get_property(b'rocksdb.cur-size-all-mem-tables', self.cf_b))
849-
self.assertGreater(memtable_cf_a_before, 0)
850-
self.assertGreater(memtable_cf_b_before, 0)
851-
852810
# Flush both cf_a and cf_b
853811
self.db.flush(column_families=[self.cf_a, self.cf_b])
854812

855-
# Verify memtable sizes decreased for both
856-
memtable_cf_a_after = int(self.db.get_property(b'rocksdb.cur-size-all-mem-tables', self.cf_a))
857-
memtable_cf_b_after = int(self.db.get_property(b'rocksdb.cur-size-all-mem-tables', self.cf_b))
858-
self.assertLess(memtable_cf_a_after, memtable_cf_a_before)
859-
self.assertLess(memtable_cf_b_after, memtable_cf_b_before)
813+
# Verify both were flushed (SST files created)
814+
final_cf_a_l0 = int(self.db.get_property(b'rocksdb.num-files-at-level0', self.cf_a))
815+
final_cf_b_l0 = int(self.db.get_property(b'rocksdb.num-files-at-level0', self.cf_b))
816+
817+
self.assertGreater(final_cf_a_l0, initial_cf_a_l0)
818+
self.assertGreater(final_cf_b_l0, initial_cf_b_l0)
860819

861820
# Verify both were flushed (SST files created)
862821
final_cf_a_l0 = int(self.db.get_property(b'rocksdb.num-files-at-level0', self.cf_a))

0 commit comments

Comments
 (0)