From 7b854d4f8874b07edcd407aa9ac3ae985a9b8f1d Mon Sep 17 00:00:00 2001 From: Etienne Petrel Date: Mon, 6 Jun 2022 23:45:49 +0000 Subject: Import wiredtiger: 62e6483f2ea902710408ffb75efd91ae6085ff9e from branch mongodb-master ref: 25d147c06f..62e6483f2e for: 6.1.0-rc0 WT-9343 Creating a new API end macro to increment a statistic on error --- src/third_party/wiredtiger/src/cursor/cur_std.c | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) (limited to 'src/third_party/wiredtiger/src/cursor/cur_std.c') diff --git a/src/third_party/wiredtiger/src/cursor/cur_std.c b/src/third_party/wiredtiger/src/cursor/cur_std.c index 9053d60dd0f..43fd9fb7cc8 100644 --- a/src/third_party/wiredtiger/src/cursor/cur_std.c +++ b/src/third_party/wiredtiger/src/cursor/cur_std.c @@ -407,7 +407,7 @@ __wt_cursor_get_keyv(WT_CURSOR *cursor, uint64_t flags, va_list ap) } err: - API_END_RET(session, ret); + API_END_RET_STAT(session, ret, cursor_get_key); } /* @@ -546,7 +546,7 @@ __wt_cursor_get_valuev(WT_CURSOR *cursor, va_list ap) ret = __wt_struct_unpackv(session, cursor->value.data, cursor->value.size, fmt, ap); err: - API_END_RET(session, ret); + API_END_RET_STAT(session, ret, cursor_get_value); } /* @@ -677,7 +677,8 @@ __wt_cursor_cache(WT_CURSOR *cursor, WT_DATA_HANDLE *dhandle) WT_STAT_CONN_INCR_ATOMIC(session, cursor_cached_count); WT_STAT_DATA_DECR(session, cursor_open_count); F_SET(cursor, WT_CURSTD_CACHED); - return (ret); + + API_RET_STAT(session, ret, cursor_cache); } /* @@ -952,7 +953,7 @@ __wt_cursor_equals(WT_CURSOR *cursor, WT_CURSOR *other, int *equalp) *equalp = (cmp == 0) ? 1 : 0; err: - API_END_RET(session, ret); + API_END_RET_STAT(session, ret, cursor_equals); } /* @@ -992,7 +993,7 @@ __cursor_modify(WT_CURSOR *cursor, WT_MODIFY *entries, int nentries) ret = cursor->update(cursor); err: - API_END_RET(session, ret); + API_END_RET_STAT(session, ret, cursor_modify); } /* @@ -1112,7 +1113,7 @@ __wt_cursor_reconfigure(WT_CURSOR *cursor, const char *config) WT_ERR(__cursor_config_debug(cursor, cfg)); err: - API_END_RET(session, ret); + API_END_RET_STAT(session, ret, cursor_reconfigure); } /* @@ -1156,7 +1157,7 @@ err: __wt_scr_free(session, &key); if (ret != 0) WT_TRET(cursor->reset(cursor)); - API_END_RET(session, ret); + API_END_RET_STAT(session, ret, cursor_largest_key); } /* @@ -1269,7 +1270,7 @@ __wt_cursor_bound(WT_CURSOR *cursor, const char *config) } } err: - API_END_RET(session, ret); + API_END_RET_STAT(session, ret, cursor_bound); } /* -- cgit v1.2.1