summaryrefslogtreecommitdiff
path: root/src/cursor
diff options
context:
space:
mode:
Diffstat (limited to 'src/cursor')
-rw-r--r--src/cursor/cur_bulk.c10
-rw-r--r--src/cursor/cur_ds.c43
-rw-r--r--src/cursor/cur_file.c4
-rw-r--r--src/cursor/cur_log.c8
-rw-r--r--src/cursor/cur_stat.c2
-rw-r--r--src/cursor/cur_std.c4
-rw-r--r--src/cursor/cur_table.c2
7 files changed, 36 insertions, 37 deletions
diff --git a/src/cursor/cur_bulk.c b/src/cursor/cur_bulk.c
index d1a53057650..68611e30ff1 100644
--- a/src/cursor/cur_bulk.c
+++ b/src/cursor/cur_bulk.c
@@ -49,7 +49,7 @@ __curbulk_insert_fix(WT_CURSOR *cursor)
* until the bulk cursor is closed.
*/
CURSOR_API_CALL(cursor, session, insert, btree);
- WT_STAT_FAST_DATA_INCR(session, cursor_insert_bulk);
+ WT_STAT_DATA_INCR(session, cursor_insert_bulk);
/*
* If the "append" flag was configured, the application doesn't have to
@@ -99,7 +99,7 @@ __curbulk_insert_fix_bitmap(WT_CURSOR *cursor)
* until the bulk cursor is closed.
*/
CURSOR_API_CALL(cursor, session, insert, btree);
- WT_STAT_FAST_DATA_INCR(session, cursor_insert_bulk);
+ WT_STAT_DATA_INCR(session, cursor_insert_bulk);
WT_CURSOR_CHECKVALUE(cursor);
@@ -131,7 +131,7 @@ __curbulk_insert_var(WT_CURSOR *cursor)
* until the bulk cursor is closed.
*/
CURSOR_API_CALL(cursor, session, insert, btree);
- WT_STAT_FAST_DATA_INCR(session, cursor_insert_bulk);
+ WT_STAT_DATA_INCR(session, cursor_insert_bulk);
/*
* If the "append" flag was configured, the application doesn't have to
@@ -239,7 +239,7 @@ __curbulk_insert_row(WT_CURSOR *cursor)
* until the bulk cursor is closed.
*/
CURSOR_API_CALL(cursor, session, insert, btree);
- WT_STAT_FAST_DATA_INCR(session, cursor_insert_bulk);
+ WT_STAT_DATA_INCR(session, cursor_insert_bulk);
WT_CURSOR_CHECKKEY(cursor);
WT_CURSOR_CHECKVALUE(cursor);
@@ -286,7 +286,7 @@ __curbulk_insert_row_skip_check(WT_CURSOR *cursor)
* until the bulk cursor is closed.
*/
CURSOR_API_CALL(cursor, session, insert, btree);
- WT_STAT_FAST_DATA_INCR(session, cursor_insert_bulk);
+ WT_STAT_DATA_INCR(session, cursor_insert_bulk);
WT_CURSOR_CHECKKEY(cursor);
WT_CURSOR_CHECKVALUE(cursor);
diff --git a/src/cursor/cur_ds.c b/src/cursor/cur_ds.c
index 8d4b7a9384b..458e0f1b1f0 100644
--- a/src/cursor/cur_ds.c
+++ b/src/cursor/cur_ds.c
@@ -184,12 +184,12 @@ __curds_next(WT_CURSOR *cursor)
CURSOR_API_CALL(cursor, session, next, NULL);
- WT_STAT_FAST_CONN_INCR(session, cursor_next);
- WT_STAT_FAST_DATA_INCR(session, cursor_next);
+ WT_STAT_CONN_INCR(session, cursor_next);
+ WT_STAT_DATA_INCR(session, cursor_next);
WT_ERR(__curds_txn_enter(session));
- F_CLR(cursor, WT_CURSTD_KEY_SET | WT_CURSTD_VALUE_SET);
+ F_CLR(cursor, WT_CURSTD_KEY_SET | WT_CURSTD_VALUE_SET);
ret = __curds_cursor_resolve(cursor, source->next(source));
err: __curds_txn_leave(session);
@@ -212,12 +212,12 @@ __curds_prev(WT_CURSOR *cursor)
CURSOR_API_CALL(cursor, session, prev, NULL);
- WT_STAT_FAST_CONN_INCR(session, cursor_prev);
- WT_STAT_FAST_DATA_INCR(session, cursor_prev);
+ WT_STAT_CONN_INCR(session, cursor_prev);
+ WT_STAT_DATA_INCR(session, cursor_prev);
WT_ERR(__curds_txn_enter(session));
- F_CLR(cursor, WT_CURSTD_KEY_SET | WT_CURSTD_VALUE_SET);
+ F_CLR(cursor, WT_CURSTD_KEY_SET | WT_CURSTD_VALUE_SET);
ret = __curds_cursor_resolve(cursor, source->prev(source));
err: __curds_txn_leave(session);
@@ -239,8 +239,8 @@ __curds_reset(WT_CURSOR *cursor)
CURSOR_API_CALL(cursor, session, reset, NULL);
- WT_STAT_FAST_CONN_INCR(session, cursor_reset);
- WT_STAT_FAST_DATA_INCR(session, cursor_reset);
+ WT_STAT_CONN_INCR(session, cursor_reset);
+ WT_STAT_DATA_INCR(session, cursor_reset);
WT_ERR(source->reset(source));
@@ -264,8 +264,8 @@ __curds_search(WT_CURSOR *cursor)
CURSOR_API_CALL(cursor, session, search, NULL);
- WT_STAT_FAST_CONN_INCR(session, cursor_search);
- WT_STAT_FAST_DATA_INCR(session, cursor_search);
+ WT_STAT_CONN_INCR(session, cursor_search);
+ WT_STAT_DATA_INCR(session, cursor_search);
WT_ERR(__curds_txn_enter(session));
@@ -292,8 +292,8 @@ __curds_search_near(WT_CURSOR *cursor, int *exact)
CURSOR_API_CALL(cursor, session, search_near, NULL);
- WT_STAT_FAST_CONN_INCR(session, cursor_search_near);
- WT_STAT_FAST_DATA_INCR(session, cursor_search_near);
+ WT_STAT_CONN_INCR(session, cursor_search_near);
+ WT_STAT_DATA_INCR(session, cursor_search_near);
WT_ERR(__curds_txn_enter(session));
@@ -323,9 +323,9 @@ __curds_insert(WT_CURSOR *cursor)
WT_ERR(__curds_txn_enter(session));
- WT_STAT_FAST_CONN_INCR(session, cursor_insert);
- WT_STAT_FAST_DATA_INCR(session, cursor_insert);
- WT_STAT_FAST_DATA_INCRV(session,
+ WT_STAT_CONN_INCR(session, cursor_insert);
+ WT_STAT_DATA_INCR(session, cursor_insert);
+ WT_STAT_DATA_INCRV(session,
cursor_insert_bytes, cursor->key.size + cursor->value.size);
if (!F_ISSET(cursor, WT_CURSTD_APPEND))
@@ -354,10 +354,9 @@ __curds_update(WT_CURSOR *cursor)
CURSOR_UPDATE_API_CALL(cursor, session, update, NULL);
- WT_STAT_FAST_CONN_INCR(session, cursor_update);
- WT_STAT_FAST_DATA_INCR(session, cursor_update);
- WT_STAT_FAST_DATA_INCRV(
- session, cursor_update_bytes, cursor->value.size);
+ WT_STAT_CONN_INCR(session, cursor_update);
+ WT_STAT_DATA_INCR(session, cursor_update);
+ WT_STAT_DATA_INCRV(session, cursor_update_bytes, cursor->value.size);
WT_ERR(__curds_txn_enter(session));
@@ -386,9 +385,9 @@ __curds_remove(WT_CURSOR *cursor)
CURSOR_REMOVE_API_CALL(cursor, session, NULL);
- WT_STAT_FAST_CONN_INCR(session, cursor_remove);
- WT_STAT_FAST_DATA_INCR(session, cursor_remove);
- WT_STAT_FAST_DATA_INCRV(session, cursor_remove_bytes, cursor->key.size);
+ WT_STAT_CONN_INCR(session, cursor_remove);
+ WT_STAT_DATA_INCR(session, cursor_remove);
+ WT_STAT_DATA_INCRV(session, cursor_remove_bytes, cursor->key.size);
WT_ERR(__curds_txn_enter(session));
diff --git a/src/cursor/cur_file.c b/src/cursor/cur_file.c
index 8e7bd4bbea5..e304cf7b775 100644
--- a/src/cursor/cur_file.c
+++ b/src/cursor/cur_file.c
@@ -488,8 +488,8 @@ __curfile_create(WT_SESSION_IMPL *session,
WT_ERR(__wt_cursor_init(
cursor, cursor->internal_uri, owner, cfg, cursorp));
- WT_STAT_FAST_CONN_INCR(session, cursor_create);
- WT_STAT_FAST_DATA_INCR(session, cursor_create);
+ WT_STAT_CONN_INCR(session, cursor_create);
+ WT_STAT_DATA_INCR(session, cursor_create);
if (0) {
err: WT_TRET(__curfile_close(cursor));
diff --git a/src/cursor/cur_log.c b/src/cursor/cur_log.c
index 76f31b417a6..21a7f674c68 100644
--- a/src/cursor/cur_log.c
+++ b/src/cursor/cur_log.c
@@ -246,8 +246,8 @@ __curlog_next(WT_CURSOR *cursor)
}
WT_ASSERT(session, cl->logrec->data != NULL);
WT_ERR(__curlog_kv(session, cursor));
- WT_STAT_FAST_CONN_INCR(session, cursor_next);
- WT_STAT_FAST_DATA_INCR(session, cursor_next);
+ WT_STAT_CONN_INCR(session, cursor_next);
+ WT_STAT_DATA_INCR(session, cursor_next);
err: API_END_RET(session, ret);
@@ -282,8 +282,8 @@ __curlog_search(WT_CURSOR *cursor)
ret = WT_NOTFOUND;
WT_ERR(ret);
WT_ERR(__curlog_kv(session, cursor));
- WT_STAT_FAST_CONN_INCR(session, cursor_search);
- WT_STAT_FAST_DATA_INCR(session, cursor_search);
+ WT_STAT_CONN_INCR(session, cursor_search);
+ WT_STAT_DATA_INCR(session, cursor_search);
err: API_END_RET(session, ret);
}
diff --git a/src/cursor/cur_stat.c b/src/cursor/cur_stat.c
index 5c9159a4c0b..700cc366ff0 100644
--- a/src/cursor/cur_stat.c
+++ b/src/cursor/cur_stat.c
@@ -599,7 +599,7 @@ __wt_curstat_open(WT_SESSION_IMPL *session,
* Statistics cursor configuration: must match (and defaults to), the
* database configuration.
*/
- if (FLD_ISSET(conn->stat_flags, WT_CONN_STAT_NONE))
+ if (!WT_STAT_ENABLED(session))
goto config_err;
if ((ret = __wt_config_gets(session, cfg, "statistics", &cval)) == 0) {
if ((ret = __wt_config_subgets(
diff --git a/src/cursor/cur_std.c b/src/cursor/cur_std.c
index bf7280f796b..6264de89df9 100644
--- a/src/cursor/cur_std.c
+++ b/src/cursor/cur_std.c
@@ -547,7 +547,7 @@ __wt_cursor_close(WT_CURSOR *cursor)
TAILQ_REMOVE(&session->cursors, cursor, q);
(void)__wt_atomic_sub32(&S2C(session)->open_cursor_count, 1);
- WT_STAT_FAST_DATA_DECR(session, session_cursor_open);
+ WT_STAT_DATA_DECR(session, session_cursor_open);
}
__wt_buf_free(session, &cursor->key);
@@ -763,7 +763,7 @@ __wt_cursor_init(WT_CURSOR *cursor,
F_SET(cursor, WT_CURSTD_OPEN);
(void)__wt_atomic_add32(&S2C(session)->open_cursor_count, 1);
- WT_STAT_FAST_DATA_INCR(session, session_cursor_open);
+ WT_STAT_DATA_INCR(session, session_cursor_open);
*cursorp = (cdump != NULL) ? cdump : cursor;
return (0);
diff --git a/src/cursor/cur_table.c b/src/cursor/cur_table.c
index 0498c89fcbe..1b93b27f564 100644
--- a/src/cursor/cur_table.c
+++ b/src/cursor/cur_table.c
@@ -646,7 +646,7 @@ __wt_table_range_truncate(WT_CURSOR_TABLE *start, WT_CURSOR_TABLE *stop)
/* Open any indices. */
WT_RET(__curtable_open_indices(ctable));
WT_RET(__wt_scr_alloc(session, 128, &key));
- WT_STAT_FAST_DATA_INCR(session, cursor_truncate);
+ WT_STAT_DATA_INCR(session, cursor_truncate);
/*
* Step through the cursor range, removing the index entries.
View Lorry Controller Status