From 7ef65f4fcc5008bf3fdd89cfceff1ffa55f1a595 Mon Sep 17 00:00:00 2001 From: David Hows Date: Wed, 19 Aug 2015 14:06:30 +1000 Subject: WT-2046 - Change wording of counter --- dist/stat_data.py | 4 ++-- src/include/wiredtiger.in | 4 ++-- src/support/stat.c | 20 ++++++++++---------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/dist/stat_data.py b/dist/stat_data.py index fb955f732fe..70e1d32843c 100644 --- a/dist/stat_data.py +++ b/dist/stat_data.py @@ -333,7 +333,7 @@ connection_stats = [ CursorStat('cursor_prev', 'cursor prev calls'), CursorStat('cursor_remove', 'cursor remove calls'), CursorStat('cursor_reset', 'cursor reset calls'), - CursorStat('cursor_restart', 'number operations restarted'), + CursorStat('cursor_restart', 'cursor restarted searches'), CursorStat('cursor_search', 'cursor search calls'), CursorStat('cursor_search_near', 'cursor search near calls'), CursorStat('cursor_update', 'cursor update calls'), @@ -374,7 +374,7 @@ dsrc_stats = [ CursorStat('cursor_remove', 'remove calls'), CursorStat('cursor_remove_bytes', 'cursor-remove key bytes removed'), CursorStat('cursor_reset', 'reset calls'), - CursorStat('cursor_restart', 'number operations restarted'), + CursorStat('cursor_restart', 'restarted searches'), CursorStat('cursor_search', 'search calls'), CursorStat('cursor_search_near', 'search near calls'), CursorStat('cursor_update', 'update calls'), diff --git a/src/include/wiredtiger.in b/src/include/wiredtiger.in index 74d1ef44801..fa874e548bf 100644 --- a/src/include/wiredtiger.in +++ b/src/include/wiredtiger.in @@ -3664,7 +3664,7 @@ extern int wiredtiger_extension_terminate(WT_CONNECTION *connection); #define WT_STAT_CONN_CURSOR_REMOVE 1059 /*! cursor: cursor reset calls */ #define WT_STAT_CONN_CURSOR_RESET 1060 -/*! cursor: number operations restarted */ +/*! cursor: cursor restarted searches */ #define WT_STAT_CONN_CURSOR_RESTART 1061 /*! cursor: cursor search calls */ #define WT_STAT_CONN_CURSOR_SEARCH 1062 @@ -3969,7 +3969,7 @@ extern int wiredtiger_extension_terminate(WT_CONNECTION *connection); #define WT_STAT_DSRC_CURSOR_REMOVE_BYTES 2063 /*! cursor: reset calls */ #define WT_STAT_DSRC_CURSOR_RESET 2064 -/*! cursor: number operations restarted */ +/*! cursor: restarted searches */ #define WT_STAT_DSRC_CURSOR_RESTART 2065 /*! cursor: search calls */ #define WT_STAT_DSRC_CURSOR_SEARCH 2066 diff --git a/src/support/stat.c b/src/support/stat.c index ecaf6e54604..0c827a12222 100644 --- a/src/support/stat.c +++ b/src/support/stat.c @@ -68,7 +68,7 @@ static const char * const __stats_dsrc_desc[] = { "cursor: remove calls", "cursor: cursor-remove key bytes removed", "cursor: reset calls", - "cursor: number operations restarted", + "cursor: restarted searches", "cursor: search calls", "cursor: search near calls", "cursor: update calls", @@ -178,10 +178,10 @@ __wt_stat_dsrc_clear_single(WT_DSRC_STATS *stats) stats->cursor_update_bytes = 0; stats->cursor_insert = 0; stats->cursor_next = 0; - stats->cursor_restart = 0; stats->cursor_prev = 0; stats->cursor_remove = 0; stats->cursor_reset = 0; + stats->cursor_restart = 0; stats->cursor_search = 0; stats->cursor_search_near = 0; stats->cursor_update = 0; @@ -335,14 +335,14 @@ __wt_stat_dsrc_aggregate_single( from->cursor_insert; to->cursor_next += from->cursor_next; - to->cursor_restart += - from->cursor_restart; to->cursor_prev += from->cursor_prev; to->cursor_remove += from->cursor_remove; to->cursor_reset += from->cursor_reset; + to->cursor_restart += + from->cursor_restart; to->cursor_search += from->cursor_search; to->cursor_search_near += @@ -526,14 +526,14 @@ __wt_stat_dsrc_aggregate( (int64_t)WT_STAT_READ(from, cursor_insert); to->cursor_next += (int64_t)WT_STAT_READ(from, cursor_next); - to->cursor_restart += - (int64_t)WT_STAT_READ(from, cursor_restart); to->cursor_prev += (int64_t)WT_STAT_READ(from, cursor_prev); to->cursor_remove += (int64_t)WT_STAT_READ(from, cursor_remove); to->cursor_reset += (int64_t)WT_STAT_READ(from, cursor_reset); + to->cursor_restart += + (int64_t)WT_STAT_READ(from, cursor_restart); to->cursor_search += (int64_t)WT_STAT_READ(from, cursor_search); to->cursor_search_near += @@ -662,7 +662,7 @@ static const char * const __stats_connection_desc[] = { "cursor: cursor prev calls", "cursor: cursor remove calls", "cursor: cursor reset calls", - "cursor: number operations restarted", + "cursor: cursor restarted searches", "cursor: cursor search calls", "cursor: cursor search near calls", "cursor: cursor update calls", @@ -843,10 +843,10 @@ __wt_stat_connection_clear_single(WT_CONNECTION_STATS *stats) stats->cursor_prev = 0; stats->cursor_remove = 0; stats->cursor_reset = 0; + stats->cursor_restart = 0; stats->cursor_search = 0; stats->cursor_search_near = 0; stats->cursor_update = 0; - stats->cursor_restart = 0; /* not clearing dh_conn_handle_count */ stats->dh_sweep_ref = 0; stats->dh_sweep_close = 0; @@ -1072,14 +1072,14 @@ __wt_stat_connection_aggregate( (int64_t)WT_STAT_READ(from, cursor_remove); to->cursor_reset += (int64_t)WT_STAT_READ(from, cursor_reset); + to->cursor_restart += + (int64_t)WT_STAT_READ(from, cursor_restart); to->cursor_search += (int64_t)WT_STAT_READ(from, cursor_search); to->cursor_search_near += (int64_t)WT_STAT_READ(from, cursor_search_near); to->cursor_update += (int64_t)WT_STAT_READ(from, cursor_update); - to->cursor_restart += - (int64_t)WT_STAT_READ(from, cursor_restart); to->dh_conn_handle_count += (int64_t)WT_STAT_READ(from, dh_conn_handle_count); to->dh_sweep_ref += -- cgit v1.2.1