diff options
| author | Etienne Petrel <etienne.petrel@mongodb.com> | 2023-02-13 21:33:07 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2023-02-14 03:28:52 +0000 |
| commit | eed4b7b0723024d11e0bf1323c01da793a0d82d9 (patch) | |
| tree | a6e39e2d34e6c64293533a8b237c27d07940171f | |
| parent | 31c588da81046b5ce855048c5b2840ddde54e6f5 (diff) | |
| download | mongo-eed4b7b0723024d11e0bf1323c01da793a0d82d9.tar.gz | |
Import wiredtiger: de4e9ae0b5c52c680ba9a86cb62b621f8f92e7c2 from branch mongodb-master
ref: cb132beb37..de4e9ae0b5
for: 7.0.0-rc0
WT-10536 Fix statistic check cache_hs_key_truncate_onpage_removal in test_hs32.py
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/history/hs_rec.c | 2 | ||||
| -rwxr-xr-x | src/third_party/wiredtiger/test/suite/test_hs32.py | 6 |
3 files changed, 6 insertions, 4 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index a9a85d0abbd..25bf2f94e2b 100644 --- a/src/third_party/wiredtiger/import.data +++ b/src/third_party/wiredtiger/import.data @@ -2,5 +2,5 @@ "vendor": "wiredtiger", "github": "wiredtiger/wiredtiger.git", "branch": "mongodb-master", - "commit": "cb132beb37743fd2e6b237ef006371b1ac26bf45" + "commit": "de4e9ae0b5c52c680ba9a86cb62b621f8f92e7c2" } diff --git a/src/third_party/wiredtiger/src/history/hs_rec.c b/src/third_party/wiredtiger/src/history/hs_rec.c index f1a0b1a8686..4bf502425d9 100644 --- a/src/third_party/wiredtiger/src/history/hs_rec.c +++ b/src/third_party/wiredtiger/src/history/hs_rec.c @@ -548,6 +548,8 @@ __wt_hs_insert_updates(WT_SESSION_IMPL *session, WT_RECONCILE *r, WT_MULTI *mult WT_ERR( __wt_hs_delete_key(session, hs_cursor, btree->id, key, false, error_on_ts_ordering)); + WT_STAT_CONN_DATA_INCR(session, cache_hs_key_truncate); + /* Reset the update without a timestamp if it is the last update in the chain. */ if (oldest_upd == no_ts_upd) no_ts_upd = NULL; diff --git a/src/third_party/wiredtiger/test/suite/test_hs32.py b/src/third_party/wiredtiger/test/suite/test_hs32.py index 41219e6c5bf..b703f755eeb 100755 --- a/src/third_party/wiredtiger/test/suite/test_hs32.py +++ b/src/third_party/wiredtiger/test/suite/test_hs32.py @@ -33,7 +33,7 @@ from wiredtiger import stat # test_hs32.py # Ensure that updates without timestamps clear the history store records. class test_hs32(wttest.WiredTigerTestCase): - conn_config = 'cache_size=50MB,statistics=(all)' + conn_config = 'cache_size=500MB,statistics=(all)' format_values = [ ('column', dict(key_format='r', value_format='S')), ('column-fix', dict(key_format='r', value_format='8t')), @@ -152,5 +152,5 @@ class test_hs32(wttest.WiredTigerTestCase): self.assertEqual(cursor[self.create_key(i)], value1) if self.update_type == 'deletion': - hs_truncate = self.get_stat(stat.conn.cache_hs_key_truncate_onpage_removal) - self.assertGreater(hs_truncate, 0) + cache_hs_key_truncate = self.get_stat(stat.conn.cache_hs_key_truncate) + self.assertGreater(cache_hs_key_truncate, 0) |