summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKeith Bostic <keith.bostic@mongodb.com>2017-03-24 11:24:02 -0400
committerGitHub <noreply@github.com>2017-03-24 11:24:02 -0400
commite552b240c997dba9434cd3d2d5b563bec7df5b96 (patch)
tree65854e2e302935c0dda9aa2335c0c72b87f3e29b
parentaba8062d15b6a255542e68b5266fcb61aaa2838c (diff)
downloadmongo-e552b240c997dba9434cd3d2d5b563bec7df5b96.tar.gz
WT-98 Update the current cursor value without a search
Revert "Change LSM WT_CURSOR.{compare,insert,update,remove} to accept an internal key instead of copying the key into WiredTiger-owned memory (in other words, replace WT_CURSOR_NEEDKEY calls with WT_CURSOR_CHECKKEY)." This reverts commit af2c787.
-rw-r--r--src/lsm/lsm_cursor.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/lsm/lsm_cursor.c b/src/lsm/lsm_cursor.c
index 0de39b38370..52265f02e62 100644
--- a/src/lsm/lsm_cursor.c
+++ b/src/lsm/lsm_cursor.c
@@ -844,8 +844,8 @@ __clsm_compare(WT_CURSOR *a, WT_CURSOR *b, int *cmpp)
WT_ERR_MSG(session, EINVAL,
"comparison method cursors must reference the same object");
- WT_CURSOR_CHECKKEY(a);
- WT_CURSOR_CHECKKEY(b);
+ WT_CURSOR_NEEDKEY(a);
+ WT_CURSOR_NEEDKEY(b);
WT_ERR(__wt_compare(
session, alsm->lsm_tree->collator, &a->key, &b->key, cmpp));
@@ -1521,7 +1521,7 @@ __clsm_insert(WT_CURSOR *cursor)
clsm = (WT_CURSOR_LSM *)cursor;
CURSOR_UPDATE_API_CALL(cursor, session, insert, NULL);
- WT_CURSOR_CHECKKEY(cursor);
+ WT_CURSOR_NEEDKEY(cursor);
WT_CURSOR_NEEDVALUE(cursor);
WT_ERR(__clsm_enter(clsm, false, true));
@@ -1565,7 +1565,7 @@ __clsm_update(WT_CURSOR *cursor)
clsm = (WT_CURSOR_LSM *)cursor;
CURSOR_UPDATE_API_CALL(cursor, session, update, NULL);
- WT_CURSOR_CHECKKEY(cursor);
+ WT_CURSOR_NEEDKEY(cursor);
WT_CURSOR_NEEDVALUE(cursor);
WT_ERR(__clsm_enter(clsm, false, true));
@@ -1612,7 +1612,7 @@ __clsm_remove(WT_CURSOR *cursor)
positioned = F_ISSET(cursor, WT_CURSTD_KEY_INT);
CURSOR_REMOVE_API_CALL(cursor, session, NULL);
- WT_CURSOR_CHECKKEY(cursor);
+ WT_CURSOR_NEEDKEY(cursor);
WT_CURSOR_NOVALUE(cursor);
WT_ERR(__clsm_enter(clsm, false, true));