diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2022-09-12 15:53:47 +1000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-09-12 07:08:09 +0000 |
| commit | 3f3405c428c35c02da37018f2539cdfb109f5c22 (patch) | |
| tree | 06bdbfe908907b7b182eaa79726397afa0e2c8c3 | |
| parent | 310dd9f04ad50187706ae5e839a68171b356dbf0 (diff) | |
| download | mongo-3f3405c428c35c02da37018f2539cdfb109f5c22.tar.gz | |
Import wiredtiger: 5d5e6c936b4325283c510597068c329ba0d299b3 from branch mongodb-master
ref: 2a3bf2949e..5d5e6c936b
for: 6.2.0-rc0
WT-9845 Fix key handling in test/format mirror page dumps (#8255)
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/test/format/util.c | 13 |
2 files changed, 13 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index 69b5e894dac..ebfb0322ee3 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": "2a3bf2949e4e75dab96fc0e8fb1c1fd67eb243c3" + "commit": "5d5e6c936b4325283c510597068c329ba0d299b3" } diff --git a/src/third_party/wiredtiger/test/format/util.c b/src/third_party/wiredtiger/test/format/util.c index 98042e83004..89c9afccb7b 100644 --- a/src/third_party/wiredtiger/test/format/util.c +++ b/src/third_party/wiredtiger/test/format/util.c @@ -305,6 +305,7 @@ table_dump_page( testutil_check(__wt_snprintf(cfg, sizeof(cfg), "checkpoint=%s", checkpoint)); wt_wrap_open_cursor(session, tbl->uri, checkpoint == NULL ? NULL : cfg, &cursor); + switch (tbl->type) { case FIX: case VAR: @@ -314,14 +315,24 @@ table_dump_page( key_gen_init(&key); key_gen(tbl, &key, keyno); cursor->set_key(cursor, &key); - key_gen_teardown(&key); break; } + ret = cursor->search_near(cursor, &exactp); if (ret == 0) cursor_dump_page(cursor, tag); else fprintf(stderr, "%s: Not dumping (error %d from search_near)\n", tag, ret); + + switch (tbl->type) { + case FIX: + case VAR: + break; + case ROW: + key_gen_teardown(&key); + break; + } + testutil_check(cursor->close(cursor)); } |