diff --git a/rebar.config b/rebar.config index a4b0b44..202c8a4 100644 --- a/rebar.config +++ b/rebar.config @@ -4,7 +4,7 @@ {deps, [ {sext, "1.8.0"}, - {rocksdb, {git, "https://gitlab.com/seanhinde/erlang-rocksdb.git", {ref,"9ae37839"}}}, + {rocksdb, {git, "https://gitlab.com/barrel-db/erlang-rocksdb.git", {tag,"1.8.0"}}}, {hut, "1.4.0"} ]}. diff --git a/rebar.lock b/rebar.lock index 0807887..3b9e82e 100644 --- a/rebar.lock +++ b/rebar.lock @@ -1,8 +1,8 @@ {"1.2.0", [{<<"hut">>,{pkg,<<"hut">>,<<"1.4.0">>},0}, {<<"rocksdb">>, - {git,"https://gitlab.com/seanhinde/erlang-rocksdb.git", - {ref,"9ae378391ffc94200bde24efcd7a4921eba688d0"}}, + {git,"https://gitlab.com/barrel-db/erlang-rocksdb.git", + {ref,"fced5f637de7991c5948e28414ba3790b0476c4b"}}, 0}, {<<"sext">>,{pkg,<<"sext">>,<<"1.8.0">>},0}]}. [ diff --git a/src/mrdb.erl b/src/mrdb.erl index 99a2a81..5e49702 100644 --- a/src/mrdb.erl +++ b/src/mrdb.erl @@ -1546,8 +1546,9 @@ rdb_iterator(R) -> rdb_iterator(R, []). rdb_iterator(R, Opts) -> rdb_iterator_(R, read_opts(R, Opts)). -rdb_iterator_(#{db_ref := DbRef, cf_handle := CfH, activity := #{type := tx, handle := TxH}}, ROpts) -> - rocksdb:transaction_iterator(DbRef, TxH, CfH, ROpts); +rdb_iterator_(#{cf_handle := CfH, activity := #{type := tx, handle := TxH}}, ROpts) -> + %% Note: versions before 1.8.0 expected DbRef as first argument + rocksdb:transaction_iterator(TxH, CfH, ROpts); rdb_iterator_(#{db_ref := DbRef, cf_handle := CfH}, ROpts) -> rocksdb:iterator(DbRef, CfH, ROpts).