diff options
| author | Luke Chen <luke.chen@mongodb.com> | 2020-06-19 17:39:55 +1000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-06-19 08:07:24 +0000 |
| commit | c940cf76a67b4fa511515e97ebc3a7588be08b4f (patch) | |
| tree | c197775901871607672476671d749c59e1523a23 /src/third_party/wiredtiger/src/cursor/cur_std.c | |
| parent | a10fe7ccfd6f11a90df725c60ceea6bcb4762a59 (diff) | |
| download | mongo-c940cf76a67b4fa511515e97ebc3a7588be08b4f.tar.gz | |
Import wiredtiger: 3b4a927265fc81dc4ab8895c5451a7ec9582c1d3 from branch mongodb-4.4
ref: 3998a1f701..3b4a927265
for: 4.4.0-rc11
WT-6349 Don't clean the globally visible on-disk tombstones as part of checkpoint
WT-6351 Fix race between threads to update condition variable's previous wait value
WT-6388 Fix-up out-of-order updates in the history store
WT-6397 Reduce visibility restrictions for reading tombstone information from history store's update list
WT-6428 Fixes for checkpoint retention
WT-6429 Fix memory leak in rollback to stable
WT-6438 Fix rollback error due to cache pressure
WT-6441 Add stats to indicate how many times the history store is search happened during a normal search call
Diffstat (limited to 'src/third_party/wiredtiger/src/cursor/cur_std.c')
| -rw-r--r-- | src/third_party/wiredtiger/src/cursor/cur_std.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/third_party/wiredtiger/src/cursor/cur_std.c b/src/third_party/wiredtiger/src/cursor/cur_std.c index 7985720c70a..fb68d4681a6 100644 --- a/src/third_party/wiredtiger/src/cursor/cur_std.c +++ b/src/third_party/wiredtiger/src/cursor/cur_std.c @@ -379,7 +379,7 @@ __wt_cursor_get_keyv(WT_CURSOR *cursor, uint32_t flags, va_list ap) WT_ERR(__wt_cursor_kv_not_set(cursor, true)); /* Force an allocated copy when using cursor copy debug. */ - if (F_ISSET(S2C(session), WT_CONN_DEBUG_CURSOR_COPY)) + if (FLD_ISSET(S2C(session)->debug_flags, WT_CONN_DEBUG_CURSOR_COPY)) WT_ERR(__wt_buf_grow(session, &cursor->key, cursor->key.size)); if (WT_CURSOR_RECNO(cursor)) { @@ -484,7 +484,7 @@ err: * memory in the meantime, free it. */ if (tmp.mem != NULL) { - if (buf->mem == NULL && !F_ISSET(S2C(session), WT_CONN_DEBUG_CURSOR_COPY)) { + if (buf->mem == NULL && !FLD_ISSET(S2C(session)->debug_flags, WT_CONN_DEBUG_CURSOR_COPY)) { buf->mem = tmp.mem; buf->memsize = tmp.memsize; F_SET(cursor, WT_CURSTD_DEBUG_COPY_KEY); @@ -528,7 +528,7 @@ __wt_cursor_get_valuev(WT_CURSOR *cursor, va_list ap) WT_ERR(__wt_cursor_kv_not_set(cursor, false)); /* Force an allocated copy when using cursor copy debug. */ - if (F_ISSET(S2C(session), WT_CONN_DEBUG_CURSOR_COPY)) + if (FLD_ISSET(S2C(session)->debug_flags, WT_CONN_DEBUG_CURSOR_COPY)) WT_ERR(__wt_buf_grow(session, &cursor->value, cursor->value.size)); /* Fast path some common cases. */ @@ -624,7 +624,7 @@ err: * memory in the meantime, free it. */ if (tmp.mem != NULL) { - if (buf->mem == NULL && !F_ISSET(S2C(session), WT_CONN_DEBUG_CURSOR_COPY)) { + if (buf->mem == NULL && !FLD_ISSET(S2C(session)->debug_flags, WT_CONN_DEBUG_CURSOR_COPY)) { buf->mem = tmp.mem; buf->memsize = tmp.memsize; F_SET(cursor, WT_CURSTD_DEBUG_COPY_VALUE); |