summaryrefslogtreecommitdiff
path: root/ext/datasources/helium
diff options
context:
space:
mode:
authorKeith Bostic <keith@wiredtiger.com>2014-11-10 07:23:36 -0500
committerKeith Bostic <keith@wiredtiger.com>2014-11-10 07:23:36 -0500
commit1a4b5e09502483b08bb92ee7c965700f749d3dae (patch)
treeaae0f216e5f047b83bbcf952f81d3d51844b3e59 /ext/datasources/helium
parent8db7a6a0ffe88a562c4e1853f505322058f0b4d3 (diff)
downloadmongo-1a4b5e09502483b08bb92ee7c965700f749d3dae.tar.gz
Add the additional arguments for the custom collator support.
Diffstat (limited to 'ext/datasources/helium')
-rw-r--r--ext/datasources/helium/helium.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/ext/datasources/helium/helium.c b/ext/datasources/helium/helium.c
index 8ca57699834..4191163f20b 100644
--- a/ext/datasources/helium/helium.c
+++ b/ext/datasources/helium/helium.c
@@ -1242,7 +1242,8 @@ cache_clean:
a.size = (uint32_t)r->key_len;
b.data = cursor->t2.v; /* b is the cache */
b.size = (uint32_t)cursor->t2.len;
- if ((ret = wtext->collate(wtext, session, &a, &b, &cmp)) != 0)
+ if ((ret = wtext->collate(
+ wtext, session, NULL, &a, &b, &cmp)) != 0)
return (ret);
if (f == he_next) {
@@ -2106,7 +2107,7 @@ helium_session_open_cursor(WT_DATA_SOURCE *wtds, WT_SESSION *session,
WT_CURSOR *wtcursor;
WT_EXTENSION_API *wtext;
WT_SOURCE *ws;
- int locked, ret, tret;
+ int locked, own, ret, tret;
char *value;
*new_cursor = NULL;
@@ -2136,7 +2137,8 @@ helium_session_open_cursor(WT_DATA_SOURCE *wtds, WT_SESSION *session,
"overwrite configuration: %s", wtext->strerror(ret));
cursor->config_overwrite = v.val != 0;
- if ((ret = wtext->collator_config(wtext, session, config)) != 0)
+ if ((ret = wtext->collator_config(
+ wtext, session, uri, config, NULL, &own)) != 0)
EMSG_ERR(wtext, session, ret,
"collator configuration: %s", wtext->strerror(ret));