umgeher/leveled
0
Fork 0
Code Issues Pull requests Releases Activity Actions

Merge remote-tracking branch 'origin/OTP16' into OTP16

Browse source 
# Conflicts:
#	src/leveled_cdb.erl
This commit is contained in:
martinsumner 2016-11-27 00:18:20 +00:00
commit b0a515553f
3 changed files with 13 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

9
priv/leveled.schema Normal file
View file

@ -0,0 +1,9 @@
%% -*- erlang -*-
%%%% leveled
%% @doc A path under which bitcask data files will be stored.
{mapping, "leveled.data_root", "leveled.data_root", [
{default, "$(platform_data_dir)/leveled"},
{datatype, directory}
]}.

1
src/leveled_cdb.erl
View file

@ -230,6 +230,7 @@ starting({open_writer, Filename}, _From, State) ->
leveled_log:log("CDB01", [Filename]), leveled_log:log("CDB01", [Filename]),
{LastPosition, HashTree, LastKey} = open_active_file(Filename), {LastPosition, HashTree, LastKey} = open_active_file(Filename),
WriteOps = set_writeops(State#state.sync_strategy), WriteOps = set_writeops(State#state.sync_strategy),
leveled_log:log("CDB13", [WriteOps]),
{ok, Handle} = file:open(Filename, WriteOps), {ok, Handle} = file:open(Filename, WriteOps),
{reply, ok, writer, State#state{handle=Handle, {reply, ok, writer, State#state{handle=Handle,
last_position=LastPosition, last_position=LastPosition,

4
src/leveled_log.erl
View file

@ -256,7 +256,9 @@
{"CDB11", {"CDB11",
{info, "CRC check failed due to size"}}, {info, "CRC check failed due to size"}},
{"CDB12", {"CDB12",
{inof, "HashTree written"}} {info, "HashTree written"}},
{"CDB13",
{info, "Write options of ~w"}}
])). ])).