Initial support for OTP 26 (#395)
* Initial support for OTP 26 * Extend timeout in test
This commit is contained in:
parent
3d3d284805
commit
7509191466
19 changed files with 273 additions and 258 deletions
|
@ -120,12 +120,11 @@
|
|||
ink_removelogs/2,
|
||||
ink_getjournalsqn/1]).
|
||||
|
||||
-export([build_dummy_journal/0,
|
||||
clean_testdir/1,
|
||||
filepath/2,
|
||||
filepath/3]).
|
||||
-export([filepath/2, filepath/3]).
|
||||
|
||||
-include_lib("eunit/include/eunit.hrl").
|
||||
-ifdef(TEST).
|
||||
-export([build_dummy_journal/0, clean_testdir/1]).
|
||||
-endif.
|
||||
|
||||
-define(MANIFEST_FP, "journal_manifest").
|
||||
-define(FILES_FP, "journal_files").
|
||||
|
@ -155,7 +154,7 @@
|
|||
|
||||
-type inker_options() :: #inker_options{}.
|
||||
-type ink_state() :: #state{}.
|
||||
-type registered_snapshot() :: {pid(), os:timestamp(), integer()}.
|
||||
-type registered_snapshot() :: {pid(), erlang:timestamp(), integer()}.
|
||||
-type filterserver() :: pid()|list(tuple()).
|
||||
-type filterfun() ::
|
||||
fun((filterserver(), leveled_codec:ledger_key(), leveled_codec:sqn()) ->
|
||||
|
@ -385,17 +384,6 @@ ink_compactjournal(Pid, Bookie, _Timeout) ->
|
|||
CheckerFilterFun},
|
||||
infinity).
|
||||
|
||||
%% Allows the Checker to be overriden in test, use something other than a
|
||||
%% penciller
|
||||
ink_compactjournal(Pid, Checker, InitiateFun, CloseFun, FilterFun, _Timeout) ->
|
||||
gen_server:call(Pid,
|
||||
{compact,
|
||||
Checker,
|
||||
InitiateFun,
|
||||
CloseFun,
|
||||
FilterFun},
|
||||
infinity).
|
||||
|
||||
-spec ink_clerkcomplete(pid(), list(), list()) -> ok.
|
||||
%% @doc
|
||||
%% Used by a clerk to state that a compaction process is over, only change
|
||||
|
@ -1277,6 +1265,14 @@ wrap_checkfilterfun(CheckFilterFun) ->
|
|||
|
||||
-ifdef(TEST).
|
||||
|
||||
-include_lib("eunit/include/eunit.hrl").
|
||||
|
||||
%% Allows the Checker to be overriden in test, use something other than a
|
||||
%% penciller
|
||||
ink_compactjournal(Pid, Checker, InitiateFun, CloseFun, FilterFun, _Timeout) ->
|
||||
gen_server:call(
|
||||
Pid, {compact, Checker, InitiateFun, CloseFun, FilterFun}, infinity).
|
||||
|
||||
create_value_for_journal(Obj, Comp) ->
|
||||
leveled_codec:create_value_for_journal(Obj, Comp, native).
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue