|
|
@ -1774,7 +1774,7 @@ mdb_cursor_set(MDB_cursor *cursor, MDB_val *key, MDB_val *data, |
|
|
|
top = CURSOR_TOP(cursor); |
|
|
|
top = CURSOR_TOP(cursor); |
|
|
|
leaf = mdb_search_node(cursor->mc_txn, cursor->mc_dbi, mpp.mp_page, key, exactp, &top->mp_ki); |
|
|
|
leaf = mdb_search_node(cursor->mc_txn, cursor->mc_dbi, mpp.mp_page, key, exactp, &top->mp_ki); |
|
|
|
if (exactp != NULL && !*exactp) { |
|
|
|
if (exactp != NULL && !*exactp) { |
|
|
|
/* MDB_CURSOR_EXACT specified and not an exact match. */ |
|
|
|
/* MDB_SET specified and not an exact match. */ |
|
|
|
return ENOENT; |
|
|
|
return ENOENT; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -1863,13 +1863,13 @@ mdb_cursor_get(MDB_cursor *cursor, MDB_val *key, MDB_val *data, |
|
|
|
assert(cursor); |
|
|
|
assert(cursor); |
|
|
|
|
|
|
|
|
|
|
|
switch (op) { |
|
|
|
switch (op) { |
|
|
|
case MDB_CURSOR: |
|
|
|
case MDB_SET: |
|
|
|
case MDB_CURSOR_EXACT: |
|
|
|
case MDB_SET_RANGE: |
|
|
|
while (CURSOR_TOP(cursor) != NULL) |
|
|
|
while (CURSOR_TOP(cursor) != NULL) |
|
|
|
cursor_pop_page(cursor); |
|
|
|
cursor_pop_page(cursor); |
|
|
|
if (key == NULL || key->mv_size == 0 || key->mv_size > MAXKEYSIZE) { |
|
|
|
if (key == NULL || key->mv_size == 0 || key->mv_size > MAXKEYSIZE) { |
|
|
|
rc = EINVAL; |
|
|
|
rc = EINVAL; |
|
|
|
} else if (op == MDB_CURSOR_EXACT) |
|
|
|
} else if (op == MDB_SET) |
|
|
|
rc = mdb_cursor_set(cursor, key, data, &exact); |
|
|
|
rc = mdb_cursor_set(cursor, key, data, &exact); |
|
|
|
else |
|
|
|
else |
|
|
|
rc = mdb_cursor_set(cursor, key, data, NULL); |
|
|
|
rc = mdb_cursor_set(cursor, key, data, NULL); |
|
|
|