greg/bdberl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Gregory Burd 2011-12-03 09:51:44 -05:00
commit 9021359752
2 changed files with 8 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
c_src/bdberl_drv.c
View file

@ -1169,6 +1169,8 @@ static int open_database(const char* name, DBTYPE type, unsigned int flags, Port
} }
} }
flags |= DB_AUTO_COMMIT;
// Attempt to open our database // Attempt to open our database
DBGCMD(data, "db->open(%p, 0, '%s', 0, %x, %08x, 0);", db, name, type, flags); DBGCMD(data, "db->open(%p, 0, '%s', 0, %x, %08x, 0);", db, name, type, flags);
rc = db->open(db, 0, name, 0, type, flags, 0); rc = db->open(db, 0, name, 0, type, flags, 0);

7
src/bdberl.erl
View file

@ -1374,7 +1374,12 @@ cursor_get(Key) ->
not_found | {ok, db_key(), db_value()} | db_error(). not_found | {ok, db_key(), db_value()} | db_error().
cursor_get(Key, Opts) -> cursor_get(Key, Opts) ->
{KeyLen, KeyBin} = to_binary(Key), case Key of
undefined ->
{KeyLen, KeyBin} = {0, <<>>};
_ ->
{KeyLen, KeyBin} = to_binary(Key)
end,
Flags = process_flags(Opts), Flags = process_flags(Opts),
Cmd = <<Flags:32/native, KeyLen:32/native, KeyBin/bytes>>, Cmd = <<Flags:32/native, KeyLen:32/native, KeyBin/bytes>>,
<<Result:32/signed-native>> = erlang:port_control(get_port(), ?CMD_CURSOR_GET, Cmd), <<Result:32/signed-native>> = erlang:port_control(get_port(), ?CMD_CURSOR_GET, Cmd),