diff options
author | Michael Cahill <michael.cahill@wiredtiger.com> | 2013-08-02 09:50:46 +1000 |
---|---|---|
committer | Don Anderson <dda@ddanderson.com> | 2013-08-09 16:30:53 -0400 |
commit | 903a32efd397eb2a24882cd3340ac5fe7bfa8a2f (patch) | |
tree | 76809421ca2e06e7eee1bc58eb1acfb5096834d9 | |
parent | b4b2a91c394b9d9d63bd280b3ed27e4fad1e9d2e (diff) | |
download | mongo-903a32efd397eb2a24882cd3340ac5fe7bfa8a2f.tar.gz |
Rename cursor flags KEY/VALUE_INT/EXT to clarify that they track whether the key/value points into the tree or out of the tree.
-rw-r--r-- | src/cursor/cur_backup.c | 2 | ||||
-rw-r--r-- | src/cursor/cur_ds.c | 8 | ||||
-rw-r--r-- | src/cursor/cur_file.c | 18 | ||||
-rw-r--r-- | src/cursor/cur_index.c | 8 | ||||
-rw-r--r-- | src/cursor/cur_stat.c | 10 | ||||
-rw-r--r-- | src/cursor/cur_std.c | 8 | ||||
-rw-r--r-- | src/cursor/cur_table.c | 12 | ||||
-rw-r--r-- | src/include/cursor.h | 12 | ||||
-rw-r--r-- | src/include/wiredtiger.in | 12 | ||||
-rw-r--r-- | src/lsm/lsm_cursor.c | 14 |
10 files changed, 52 insertions, 52 deletions
diff --git a/src/cursor/cur_backup.c b/src/cursor/cur_backup.c index 61b62d00bfe..beb36a8efc2 100644 --- a/src/cursor/cur_backup.c +++ b/src/cursor/cur_backup.c @@ -41,7 +41,7 @@ __curbackup_next(WT_CURSOR *cursor) cb->iface.key.size = WT_STORE_SIZE(strlen(cb->list[cb->next].name) + 1); ++cb->next; - F_SET(cursor, WT_CURSTD_KEY_RET); + F_SET(cursor, WT_CURSTD_KEY_INT); err: API_END(session); return (ret); diff --git a/src/cursor/cur_ds.c b/src/cursor/cur_ds.c index 6c325e23137..5ea7b5eada6 100644 --- a/src/cursor/cur_ds.c +++ b/src/cursor/cur_ds.c @@ -17,8 +17,8 @@ __curds_key_get(WT_CURSOR *cursor) cursor->recno = cursor->data_source->recno; cursor->key.data = cursor->data_source->key.data; cursor->key.size = cursor->data_source->key.size; - F_CLR(cursor, WT_CURSTD_KEY_APP); - F_SET(cursor, WT_CURSTD_KEY_RET); + F_CLR(cursor, WT_CURSTD_KEY_EXT); + F_SET(cursor, WT_CURSTD_KEY_INT); } /* @@ -30,8 +30,8 @@ __curds_value_get(WT_CURSOR *cursor) { cursor->value.data = cursor->data_source->value.data; cursor->value.size = cursor->data_source->value.size; - F_CLR(cursor, WT_CURSTD_VALUE_APP); - F_SET(cursor, WT_CURSTD_VALUE_RET); + F_CLR(cursor, WT_CURSTD_VALUE_EXT); + F_SET(cursor, WT_CURSTD_VALUE_INT); } /* diff --git a/src/cursor/cur_file.c b/src/cursor/cur_file.c index 3f2fab6795d..ee95480e134 100644 --- a/src/cursor/cur_file.c +++ b/src/cursor/cur_file.c @@ -19,21 +19,21 @@ uint32_t __key_size = (cursor)->key.size; \ uint32_t __value_size = (cursor)->value.size; \ if (((ret) = (f)) == 0) { \ - F_CLR(cursor, WT_CURSTD_KEY_APP | WT_CURSTD_VALUE_APP); \ - F_SET(cursor, WT_CURSTD_KEY_RET | WT_CURSTD_VALUE_RET); \ + F_CLR(cursor, WT_CURSTD_KEY_EXT | WT_CURSTD_VALUE_EXT); \ + F_SET(cursor, WT_CURSTD_KEY_INT | WT_CURSTD_VALUE_INT); \ } else if ((ret) == WT_NOTFOUND) \ F_CLR(cursor, WT_CURSTD_KEY_SET | WT_CURSTD_VALUE_SET); \ else { \ - if (F_ISSET(cursor, WT_CURSTD_KEY_APP)) { \ + if (F_ISSET(cursor, WT_CURSTD_KEY_EXT)) { \ (cursor)->recno = __recno; \ (cursor)->key.data = __key_data; \ (cursor)->key.size = __key_size; \ } \ - if (F_ISSET(cursor, WT_CURSTD_VALUE_APP)) { \ + if (F_ISSET(cursor, WT_CURSTD_VALUE_EXT)) { \ (cursor)->value.data = __value_data; \ (cursor)->value.size = __value_size; \ } \ - F_CLR(cursor, WT_CURSTD_KEY_RET | WT_CURSTD_VALUE_RET); \ + F_CLR(cursor, WT_CURSTD_KEY_INT | WT_CURSTD_VALUE_INT); \ } \ } while (0) @@ -85,7 +85,7 @@ __curfile_next(WT_CURSOR *cursor) F_CLR(cursor, WT_CURSTD_KEY_SET | WT_CURSTD_VALUE_SET); if ((ret = __wt_btcur_next(cbt, 0)) == 0) - F_SET(cursor, WT_CURSTD_KEY_RET | WT_CURSTD_VALUE_RET); + F_SET(cursor, WT_CURSTD_KEY_INT | WT_CURSTD_VALUE_INT); err: API_END(session); return (ret); @@ -108,7 +108,7 @@ __curfile_next_random(WT_CURSOR *cursor) F_CLR(cursor, WT_CURSTD_KEY_SET | WT_CURSTD_VALUE_SET); if ((ret = __wt_btcur_next_random(cbt)) == 0) - F_SET(cursor, WT_CURSTD_KEY_RET | WT_CURSTD_VALUE_RET); + F_SET(cursor, WT_CURSTD_KEY_INT | WT_CURSTD_VALUE_INT); err: API_END(session); return (ret); @@ -130,7 +130,7 @@ __curfile_prev(WT_CURSOR *cursor) F_CLR(cursor, WT_CURSTD_KEY_SET | WT_CURSTD_VALUE_SET); if ((ret = __wt_btcur_prev(cbt, 0)) == 0) - F_SET(cursor, WT_CURSTD_KEY_RET | WT_CURSTD_VALUE_RET); + F_SET(cursor, WT_CURSTD_KEY_INT | WT_CURSTD_VALUE_INT); err: API_END(session); return (ret); @@ -271,7 +271,7 @@ __curfile_remove(WT_CURSOR *cursor) * After a successful remove, copy the key: the value is not available. */ if (ret == 0) { - if (F_ISSET(cursor, WT_CURSTD_KEY_RET) && + if (F_ISSET(cursor, WT_CURSTD_KEY_INT) && !WT_DATA_IN_ITEM(&(cursor)->key)) WT_ERR(__wt_buf_set(session, &cursor->key, cursor->key.data, cursor->key.size)); diff --git a/src/cursor/cur_index.c b/src/cursor/cur_index.c index fb8b70a48b9..34987898ccf 100644 --- a/src/cursor/cur_index.c +++ b/src/cursor/cur_index.c @@ -100,11 +100,11 @@ __curindex_move(WT_CURSOR_INDEX *cindex) (*cp)->key.size = first->key.size; (*cp)->recno = first->recno; } - F_SET(*cp, WT_CURSTD_KEY_APP); + F_SET(*cp, WT_CURSTD_KEY_EXT); WT_RET((*cp)->search(*cp)); } - F_SET(&cindex->iface, WT_CURSTD_KEY_RET | WT_CURSTD_VALUE_RET); + F_SET(&cindex->iface, WT_CURSTD_KEY_INT | WT_CURSTD_VALUE_INT); return (0); } @@ -225,7 +225,7 @@ __curindex_search(WT_CURSOR *cursor) WT_ERR(__curindex_move(cindex)); if (0) { -err: F_CLR(cursor, WT_CURSTD_KEY_RET | WT_CURSTD_VALUE_RET); +err: F_CLR(cursor, WT_CURSTD_KEY_INT | WT_CURSTD_VALUE_INT); } API_END(session); @@ -249,7 +249,7 @@ __curindex_search_near(WT_CURSOR *cursor, int *exact) if ((ret = cindex->child->search_near(cindex->child, exact)) == 0) ret = __curindex_move(cindex); else - F_CLR(cursor, WT_CURSTD_KEY_RET | WT_CURSTD_VALUE_RET); + F_CLR(cursor, WT_CURSTD_KEY_INT | WT_CURSTD_VALUE_INT); err: API_END(session); return (ret); diff --git a/src/cursor/cur_stat.c b/src/cursor/cur_stat.c index 313c9c0c689..fa10e301b93 100644 --- a/src/cursor/cur_stat.c +++ b/src/cursor/cur_stat.c @@ -145,7 +145,7 @@ __curstat_set_key(WT_CURSOR *cursor, ...) va_end(ap); if ((cursor->saved_err = ret) == 0) - F_SET(cursor, WT_CURSTD_KEY_APP); + F_SET(cursor, WT_CURSTD_KEY_EXT); err: API_END(session); } @@ -187,7 +187,7 @@ __curstat_next(WT_CURSOR *cursor) } cst->v = cst->stats_first[cst->key].v; WT_ERR(__curstat_print_value(session, cst->v, &cst->pv)); - F_SET(cursor, WT_CURSTD_KEY_RET | WT_CURSTD_VALUE_RET); + F_SET(cursor, WT_CURSTD_KEY_INT | WT_CURSTD_VALUE_INT); err: API_END(session); return (ret); @@ -214,13 +214,13 @@ __curstat_prev(WT_CURSOR *cursor) } else if (cst->key > 0) --cst->key; else { - F_CLR(cursor, WT_CURSTD_KEY_RET | WT_CURSTD_VALUE_RET); + F_CLR(cursor, WT_CURSTD_KEY_INT | WT_CURSTD_VALUE_INT); WT_ERR(WT_NOTFOUND); } cst->v = cst->stats_first[cst->key].v; WT_ERR(__curstat_print_value(session, cst->v, &cst->pv)); - F_SET(cursor, WT_CURSTD_KEY_RET | WT_CURSTD_VALUE_RET); + F_SET(cursor, WT_CURSTD_KEY_INT | WT_CURSTD_VALUE_INT); err: API_END(session); return (ret); @@ -269,7 +269,7 @@ __curstat_search(WT_CURSOR *cursor) cst->v = cst->stats_first[cst->key].v; WT_ERR(__curstat_print_value(session, cst->v, &cst->pv)); - F_SET(cursor, WT_CURSTD_KEY_RET | WT_CURSTD_VALUE_RET); + F_SET(cursor, WT_CURSTD_KEY_INT | WT_CURSTD_VALUE_INT); err: API_END(session); return (ret); diff --git a/src/cursor/cur_std.c b/src/cursor/cur_std.c index 3b95ace7724..2e645768aa8 100644 --- a/src/cursor/cur_std.c +++ b/src/cursor/cur_std.c @@ -155,7 +155,7 @@ __wt_cursor_get_keyv(WT_CURSOR *cursor, uint32_t flags, va_list ap) const char *fmt; CURSOR_API_CALL(cursor, session, get_key, NULL); - if (!F_ISSET(cursor, WT_CURSTD_KEY_APP | WT_CURSTD_KEY_RET)) + if (!F_ISSET(cursor, WT_CURSTD_KEY_EXT | WT_CURSTD_KEY_INT)) WT_ERR(__wt_cursor_kv_not_set(cursor, 1)); if (WT_CURSOR_RECNO(cursor)) { @@ -249,7 +249,7 @@ __wt_cursor_set_keyv(WT_CURSOR *cursor, uint32_t flags, va_list ap) "Key size (%" PRIu64 ") out of range", (uint64_t)sz); cursor->saved_err = 0; cursor->key.size = WT_STORE_SIZE(sz); - F_SET(cursor, WT_CURSTD_KEY_APP); + F_SET(cursor, WT_CURSTD_KEY_EXT); if (0) { err: cursor->saved_err = ret; } @@ -272,7 +272,7 @@ __wt_cursor_get_value(WT_CURSOR *cursor, ...) CURSOR_API_CALL(cursor, session, get_value, NULL); - if (!F_ISSET(cursor, WT_CURSTD_VALUE_APP | WT_CURSTD_VALUE_RET)) + if (!F_ISSET(cursor, WT_CURSTD_VALUE_EXT | WT_CURSTD_VALUE_INT)) WT_ERR(__wt_cursor_kv_not_set(cursor, 0)); va_start(ap, cursor); @@ -340,7 +340,7 @@ __wt_cursor_set_value(WT_CURSOR *cursor, ...) WT_ERR(__wt_struct_packv(session, buf->mem, sz, cursor->value_format, ap)); } - F_SET(cursor, WT_CURSTD_VALUE_APP); + F_SET(cursor, WT_CURSTD_VALUE_EXT); cursor->value.size = WT_STORE_SIZE(sz); if (0) { diff --git a/src/cursor/cur_table.c b/src/cursor/cur_table.c index 4d40cb2e7ca..c1eb58c4b48 100644 --- a/src/cursor/cur_table.c +++ b/src/cursor/cur_table.c @@ -34,8 +34,8 @@ static int __curtable_update(WT_CURSOR *cursor); (*__cp)->value.data = ""; \ (*__cp)->value.size = 1; \ } \ - F_SET(*__cp, WT_CURSTD_KEY_APP | \ - WT_CURSTD_VALUE_APP); \ + F_SET(*__cp, WT_CURSTD_KEY_EXT | \ + WT_CURSTD_VALUE_EXT); \ WT_ERR((*__cp)->f(*__cp)); \ } \ } while (0) @@ -128,7 +128,7 @@ __wt_curtable_set_key(WT_CURSOR *cursor, ...) (*cp)->recno = primary->recno; (*cp)->key.data = primary->key.data; (*cp)->key.size = primary->key.size; - F_SET(*cp, WT_CURSTD_KEY_APP); + F_SET(*cp, WT_CURSTD_KEY_EXT); } } @@ -166,7 +166,7 @@ __wt_curtable_set_value(WT_CURSOR *cursor, ...) for (i = 0, cp = ctable->cg_cursors; i < WT_COLGROUPS(ctable->table); i++, cp++) if (ret == 0) - F_SET(*cp, WT_CURSTD_VALUE_APP); + F_SET(*cp, WT_CURSTD_VALUE_EXT); else { (*cp)->saved_err = ret; F_CLR(*cp, WT_CURSTD_VALUE_SET); @@ -250,7 +250,7 @@ __curtable_next_random(WT_CURSOR *cursor) (*cp)->key.data = primary->key.data; (*cp)->key.size = primary->key.size; (*cp)->recno = primary->recno; - F_SET(*cp, WT_CURSTD_KEY_APP); + F_SET(*cp, WT_CURSTD_KEY_EXT); WT_ERR((*cp)->search(*cp)); } @@ -376,7 +376,7 @@ __curtable_insert(WT_CURSOR *cursor) * for overwrite cursors, but for now we just reset the * flags. */ - F_SET(primary, WT_CURSTD_KEY_APP | WT_CURSTD_VALUE_APP); + F_SET(primary, WT_CURSTD_KEY_EXT | WT_CURSTD_VALUE_EXT); ret = __curtable_update(cursor); } goto err; diff --git a/src/include/cursor.h b/src/include/cursor.h index 2a794fabb78..ab46e901b0f 100644 --- a/src/include/cursor.h +++ b/src/include/cursor.h @@ -260,27 +260,27 @@ struct __wt_cursor_table { #define WT_CURSOR_RECNO(cursor) (strcmp((cursor)->key_format, "r") == 0) #define WT_CURSOR_NEEDKEY(cursor) do { \ - if (F_ISSET(cursor, WT_CURSTD_KEY_RET)) { \ + if (F_ISSET(cursor, WT_CURSTD_KEY_INT)) { \ if (!WT_DATA_IN_ITEM(&(cursor)->key)) \ WT_ERR(__wt_buf_set( \ (WT_SESSION_IMPL *)(cursor)->session, \ &(cursor)->key, \ (cursor)->key.data, (cursor)->key.size)); \ - F_CLR(cursor, WT_CURSTD_KEY_RET); \ - F_SET(cursor, WT_CURSTD_KEY_APP); \ + F_CLR(cursor, WT_CURSTD_KEY_INT); \ + F_SET(cursor, WT_CURSTD_KEY_EXT); \ } \ if (!F_ISSET(cursor, WT_CURSTD_KEY_SET)) \ WT_ERR(__wt_cursor_kv_not_set(cursor, 1)); \ } while (0) #define WT_CURSOR_NEEDVALUE(cursor) do { \ - if (F_ISSET(cursor, WT_CURSTD_VALUE_RET)) { \ + if (F_ISSET(cursor, WT_CURSTD_VALUE_INT)) { \ if (WT_DATA_IN_ITEM(&(cursor)->value)) \ WT_ERR(__wt_buf_set( \ (WT_SESSION_IMPL *)(cursor)->session, \ &(cursor)->value, \ (cursor)->value.data, (cursor)->value.size));\ - F_CLR(cursor, WT_CURSTD_VALUE_RET); \ - F_SET(cursor, WT_CURSTD_VALUE_APP); \ + F_CLR(cursor, WT_CURSTD_VALUE_INT); \ + F_SET(cursor, WT_CURSTD_VALUE_EXT); \ } \ if (!F_ISSET(cursor, WT_CURSTD_VALUE_SET)) \ WT_ERR(__wt_cursor_kv_not_set(cursor, 0)); \ diff --git a/src/include/wiredtiger.in b/src/include/wiredtiger.in index 870f5968867..b81cb966947 100644 --- a/src/include/wiredtiger.in +++ b/src/include/wiredtiger.in @@ -428,15 +428,15 @@ struct __wt_cursor { #define WT_CURSTD_APPEND 0x0001 #define WT_CURSTD_DUMP_HEX 0x0002 #define WT_CURSTD_DUMP_PRINT 0x0004 -#define WT_CURSTD_KEY_APP 0x0008 -#define WT_CURSTD_KEY_RET 0x0010 -#define WT_CURSTD_KEY_SET (WT_CURSTD_KEY_APP | WT_CURSTD_KEY_RET) +#define WT_CURSTD_KEY_EXT 0x0008 /* Key points out of the tree. */ +#define WT_CURSTD_KEY_INT 0x0010 /* Key points into the tree. */ +#define WT_CURSTD_KEY_SET (WT_CURSTD_KEY_EXT | WT_CURSTD_KEY_INT) #define WT_CURSTD_OPEN 0x0020 #define WT_CURSTD_OVERWRITE 0x0040 #define WT_CURSTD_RAW 0x0080 -#define WT_CURSTD_VALUE_APP 0x0100 -#define WT_CURSTD_VALUE_RET 0x0200 -#define WT_CURSTD_VALUE_SET (WT_CURSTD_VALUE_APP | WT_CURSTD_VALUE_RET) +#define WT_CURSTD_VALUE_EXT 0x0100 /* Value points out of the tree. */ +#define WT_CURSTD_VALUE_INT 0x0200 /* Value points into the tree. */ +#define WT_CURSTD_VALUE_SET (WT_CURSTD_VALUE_EXT | WT_CURSTD_VALUE_INT) uint32_t flags; #endif }; diff --git a/src/lsm/lsm_cursor.c b/src/lsm/lsm_cursor.c index 512884fbf31..467fd6dc83c 100644 --- a/src/lsm/lsm_cursor.c +++ b/src/lsm/lsm_cursor.c @@ -141,7 +141,7 @@ __clsm_open_cursors( F_SET(clsm, WT_CLSM_OPEN_READ); /* Copy the key, so we don't lose the cursor position. */ - if (F_ISSET(c, WT_CURSTD_KEY_RET) && c->key.data != c->key.mem) + if (F_ISSET(c, WT_CURSTD_KEY_INT) && c->key.data != c->key.mem) WT_RET(__wt_buf_set( session, &c->key, c->key.data, c->key.size)); @@ -336,8 +336,8 @@ __clsm_get_current( WT_RET(current->get_value(current, &c->value)); if ((*deletedp = __clsm_deleted(clsm, &c->value)) == 0) { - F_CLR(c, WT_CURSTD_KEY_APP | WT_CURSTD_VALUE_APP); - F_SET(c, WT_CURSTD_KEY_RET | WT_CURSTD_VALUE_RET); + F_CLR(c, WT_CURSTD_KEY_EXT | WT_CURSTD_VALUE_EXT); + F_SET(c, WT_CURSTD_KEY_INT | WT_CURSTD_VALUE_INT); } else F_CLR(c, WT_CURSTD_KEY_SET | WT_CURSTD_VALUE_SET); @@ -647,8 +647,8 @@ __clsm_search(WT_CURSOR *cursor) done: err: API_END(session); if (ret == 0) { - F_CLR(cursor, WT_CURSTD_KEY_APP | WT_CURSTD_VALUE_APP); - F_SET(cursor, WT_CURSTD_KEY_RET | WT_CURSTD_VALUE_RET); + F_CLR(cursor, WT_CURSTD_KEY_EXT | WT_CURSTD_VALUE_EXT); + F_SET(cursor, WT_CURSTD_KEY_INT | WT_CURSTD_VALUE_INT); } else { F_CLR(cursor, WT_CURSTD_KEY_SET | WT_CURSTD_VALUE_SET); clsm->current = NULL; @@ -814,8 +814,8 @@ err: API_END(session); WT_TRET(larger->reset(larger)); if (ret == 0) { - F_CLR(cursor, WT_CURSTD_KEY_APP | WT_CURSTD_VALUE_APP); - F_SET(cursor, WT_CURSTD_KEY_RET | WT_CURSTD_VALUE_RET); + F_CLR(cursor, WT_CURSTD_KEY_EXT | WT_CURSTD_VALUE_EXT); + F_SET(cursor, WT_CURSTD_KEY_INT | WT_CURSTD_VALUE_INT); } else { F_CLR(cursor, WT_CURSTD_KEY_SET | WT_CURSTD_VALUE_SET); clsm->current = NULL; |