diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2022-01-11 16:21:51 +1100 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-01-11 05:52:01 +0000 |
| commit | 4a0b7921abfab63d93383f8eb6a29ead6fc07d98 (patch) | |
| tree | 93d7ba94949f0ef72a350c122f9fb2c14967a9d4 | |
| parent | b7c54a96577a1d5cd888d58679995d940e8888d5 (diff) | |
| download | mongo-4a0b7921abfab63d93383f8eb6a29ead6fc07d98.tar.gz | |
Import wiredtiger: 461b911f9e91e24dad5785dad6bb78eabd3a395f from branch mongodb-5.2
ref: 0e2a0ee55e..461b911f9e
for: 5.2.0-rc5
WT-8616 Btree walk functions can ignore the caller's "skip function"
| -rw-r--r-- | src/third_party/wiredtiger/import.data | 2 | ||||
| -rw-r--r-- | src/third_party/wiredtiger/src/btree/bt_walk.c | 5 |
2 files changed, 5 insertions, 2 deletions
diff --git a/src/third_party/wiredtiger/import.data b/src/third_party/wiredtiger/import.data index acf1356d5df..4c75cc0019a 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-5.2", - "commit": "0e2a0ee55ec84aeced65e6f8d6fa494c88c69ac3" + "commit": "461b911f9e91e24dad5785dad6bb78eabd3a395f" } diff --git a/src/third_party/wiredtiger/src/btree/bt_walk.c b/src/third_party/wiredtiger/src/btree/bt_walk.c index 5edecbb967e..2d0bf1df6da 100644 --- a/src/third_party/wiredtiger/src/btree/bt_walk.c +++ b/src/third_party/wiredtiger/src/btree/bt_walk.c @@ -438,7 +438,10 @@ descend: if (skip) break; empty_internal = false; - } else if (skip_func != NULL) { + } + + /* See if our caller wants to skip this page. */ + if (skip_func != NULL) { WT_ERR(skip_func(session, ref, func_cookie, &skip)); if (skip) break; |