diff options
| author | Robert Newson <rnewson@apache.org> | 2020-07-26 16:56:34 +0100 |
|---|---|---|
| committer | Robert Newson <rnewson@apache.org> | 2020-07-26 16:56:34 +0100 |
| commit | 6a83e06a60274263d8681f85fd95ccd264ac1c0c (patch) | |
| tree | d28831266da7f6cc1f6aab8a1bb9338c9a848a34 | |
| parent | 0c7c77eb59d626505cf6ec4162e1053837bc3593 (diff) | |
| download | couchdb-6a83e06a60274263d8681f85fd95ccd264ac1c0c.tar.gz | |
Remove unnecessary collate_raw function
(this was too cute not to steal from davisp)
| -rw-r--r-- | src/ebtree/src/ebtree.erl | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/ebtree/src/ebtree.erl b/src/ebtree/src/ebtree.erl index f08e1e9be..74dee4b56 100644 --- a/src/ebtree/src/ebtree.erl +++ b/src/ebtree/src/ebtree.erl @@ -80,7 +80,7 @@ open(Db, Prefix, Order) -> -spec open(term(), binary(), pos_integer(), list()) -> #tree{}. open(Db, Prefix, Order, Options) when is_binary(Prefix), is_integer(Order), Order > 2, Order rem 2 == 0 -> ReduceFun = proplists:get_value(reduce_fun, Options, fun reduce_noop/2), - CollateFun = proplists:get_value(collate_fun, Options, fun collate_raw/2), + CollateFun = proplists:get_value(collate_fun, Options, fun erlang:'=<'/2), EncodeFun = proplists:get_value(encode_fun, Options, fun encode_erlang/3), Tree = #tree{ @@ -962,9 +962,6 @@ usort_members(#tree{} = Tree, List) -> lists:usort(CollateWrapper, List). -collate_raw(K1, K2) -> - K1 =< K2. - %% encoding function encode_erlang(encode, _Key, Value) -> @@ -1066,7 +1063,7 @@ reduce_stats(Rs, true) -> collation_fun_test_() -> - Tree = #tree{collate_fun = fun collate_raw/2}, + Tree = #tree{collate_fun = fun erlang:'=<'/2}, [ ?_test(?assert(greater_than(Tree, 4, 3))), ?_test(?assertNot(greater_than(Tree, 3, 4))), |