Skip to content

Commit

Permalink
Whitespace fixes from PR #157
Browse files Browse the repository at this point in the history
  • Loading branch information
Joe DeVivo committed Mar 27, 2014
1 parent ca9965f commit abd7952
Show file tree
Hide file tree
Showing 2 changed files with 27 additions and 25 deletions.
50 changes: 26 additions & 24 deletions priv/bitcask.schema
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,9 @@
always -> always;
never -> never;
window ->
Start = cuttlefish:conf_get("bitcask.merge.window.start", Conf, undefined),
End = cuttlefish:conf_get("bitcask.merge.window.end", Conf, undefined),
{Start, End};
Start = cuttlefish:conf_get("bitcask.merge.window.start", Conf, undefined),
End = cuttlefish:conf_get("bitcask.merge.window.end", Conf, undefined),
{Start, End};
_Default -> always
end
end}.
Expand Down Expand Up @@ -165,9 +165,9 @@
%% directory, Bitcask will attempt to merge files.
%%
%% Default is: 512MB
{mapping, "bitcask.merge.triggers.dead_bytes",
"bitcask.dead_bytes_merge_trigger",
[
{mapping,
"bitcask.merge.triggers.dead_bytes",
"bitcask.dead_bytes_merge_trigger", [
{datatype, bytesize},
hidden,
{default, "512MB"}
Expand All @@ -182,9 +182,9 @@
%% merged, decreasing the value will cause more files to be merged.
%%
%% Default is: `40`
{mapping, "bitcask.merge.thresholds.fragmentation",
"bitcask.frag_threshold",
[
{mapping,
"bitcask.merge.thresholds.fragmentation",
"bitcask.frag_threshold", [
{datatype, integer},
hidden,
{default, 40},
Expand All @@ -197,7 +197,8 @@
%% will cause more files to be merged.
%%
%% Default is: 128MB
{mapping, "bitcask.merge.thresholds.dead_bytes",
{mapping,
"bitcask.merge.thresholds.dead_bytes",
"bitcask.dead_bytes_threshold", [
{datatype, bytesize},
hidden,
Expand All @@ -210,7 +211,8 @@
%% merged, decreasing the value will cause _fewer_ files to be merged.
%%
%% Default is: 10MB
{mapping, "bitcask.merge.thresholds.small_file",
{mapping,
"bitcask.merge.thresholds.small_file",
"bitcask.small_file_threshold", [
{datatype, bytesize},
hidden,
Expand All @@ -230,13 +232,13 @@

{translation, "bitcask.max_fold_age",
fun(Conf) ->
case cuttlefish:conf_get("bitcask.fold.max_age", Conf) of
unlimited -> -1;
I when is_integer(I) ->
%% app.config expects microseconds
I * 1000;
_ -> -1 %% The default, for safety
end
case cuttlefish:conf_get("bitcask.fold.max_age", Conf) of
unlimited -> -1;
I when is_integer(I) ->
%% app.config expects microseconds
I * 1000;
_ -> -1 %% The default, for safety
end
end
}.

Expand All @@ -250,9 +252,9 @@
{translation, "bitcask.max_fold_puts",
fun(Conf) ->
case cuttlefish:conf_get("bitcask.fold.max_puts", Conf) of
unlimited -> -1;
I when is_integer(I) -> I;
_ -> 0 %% default catch
unlimited -> -1;
I when is_integer(I) -> I;
_ -> 0 %% default catch
end
end
}.
Expand Down Expand Up @@ -292,9 +294,9 @@
{translation, "bitcask.require_hint_crc",
fun(Conf) ->
case cuttlefish:conf_get("bitcask.hintfile_checksums", Conf) of
strict -> true;
allow_missing -> false;
_ -> true
strict -> true;
allow_missing -> false;
_ -> true
end
end}.

Expand Down
2 changes: 1 addition & 1 deletion priv/bitcask_multi.schema
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
%% -*- erlang -*-

%%%% bitcask
%%%% bitcask multi

%% @see bitcask.data_root
{mapping, "multi_backend.$name.bitcask.data_root", "riak_kv.multi_backend", [
Expand Down

0 comments on commit abd7952

Please sign in to comment.