diff options
| author | Keith Bostic <keith@wiredtiger.com> | 2016-01-19 09:59:03 -0500 |
|---|---|---|
| committer | Keith Bostic <keith@wiredtiger.com> | 2016-01-19 09:59:03 -0500 |
| commit | 2fbec8cc81071ee83694b3aad8dd2947567f66cf (patch) | |
| tree | 23f24e6138b62c115ed8fc0e93229b43cc4eb692 /src/session | |
| parent | 208aff090a7d1b953f6695aa9387e42eadb193f6 (diff) | |
| parent | 027d079c3c31f4da56319c42e17bb0ac468e2ace (diff) | |
| download | mongo-2fbec8cc81071ee83694b3aad8dd2947567f66cf.tar.gz | |
Merge branch 'develop' into wt-2287-rebalance
Diffstat (limited to 'src/session')
| -rw-r--r-- | src/session/session_api.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/src/session/session_api.c b/src/session/session_api.c index 805f6cb330e..cf398730839 100644 --- a/src/session/session_api.c +++ b/src/session/session_api.c @@ -674,6 +674,7 @@ static int __session_join(WT_SESSION *wt_session, WT_CURSOR *join_cursor, WT_CURSOR *ref_cursor, const char *config) { + WT_CURSOR *firstcg; WT_CONFIG_ITEM cval; WT_CURSOR_INDEX *cindex; WT_CURSOR_JOIN *cjoin; @@ -687,6 +688,7 @@ __session_join(WT_SESSION *wt_session, WT_CURSOR *join_cursor, uint8_t flags, range; count = 0; + firstcg = NULL; session = (WT_SESSION_IMPL *)wt_session; SESSION_API_CALL(session, join, config, cfg); table = NULL; @@ -698,15 +700,18 @@ __session_join(WT_SESSION *wt_session, WT_CURSOR *join_cursor, cindex = (WT_CURSOR_INDEX *)ref_cursor; idx = cindex->index; table = cindex->table; - WT_CURSOR_CHECKKEY(ref_cursor); + firstcg = cindex->cg_cursors[0]; } else if (WT_PREFIX_MATCH(ref_cursor->uri, "table:")) { idx = NULL; ctable = (WT_CURSOR_TABLE *)ref_cursor; table = ctable->table; - WT_CURSOR_CHECKKEY(ctable->cg_cursors[0]); + firstcg = ctable->cg_cursors[0]; } else WT_ERR_MSG(session, EINVAL, "not an index or table cursor"); + if (!F_ISSET(firstcg, WT_CURSTD_KEY_SET)) + WT_ERR_MSG(session, EINVAL, + "requires reference cursor be positioned"); cjoin = (WT_CURSOR_JOIN *)join_cursor; if (cjoin->table != table) WT_ERR_MSG(session, EINVAL, |