summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Newson <rnewson@apache.org>2020-08-04 21:28:58 +0100
committerRobert Newson <rnewson@apache.org>2020-08-04 21:28:58 +0100
commit44564eb7ef9ba2051c96520d8180d39fb35f2e1d (patch)
tree48afe7eb6a7312e072dcfa308e079d5fb64d473b
parent22d857d77b24adc989dc53b5554d95b926277401 (diff)
downloadcouchdb-prototype/fdb-layer-ebtree-collate-validate.tar.gz
Validate the result from collate_funprototype/fdb-layer-ebtree-collate-validate
-rw-r--r--src/ebtree/src/ebtree.erl13
1 files changed, 12 insertions, 1 deletions
diff --git a/src/ebtree/src/ebtree.erl b/src/ebtree/src/ebtree.erl
index bae0ff310..36d3c47ef 100644
--- a/src/ebtree/src/ebtree.erl
+++ b/src/ebtree/src/ebtree.erl
@@ -918,7 +918,13 @@ collate(#tree{} = _Tree, _A, ?MAX) ->
collate(#tree{} = Tree, A, B) ->
#tree{collate_fun = CollateFun} = Tree,
- CollateFun(A, B).
+ Result = CollateFun(A, B),
+ case lists:member(Result, [lt, eq, gt]) of
+ true ->
+ Result;
+ false ->
+ throw(invalid_collation_result)
+ end.
collate(#tree{} = Tree, A, B, Allowed) ->
@@ -1090,6 +1096,11 @@ collation_fun_test_() ->
].
+collate_validation_test() ->
+ Tree = #tree{collate_fun = fun(_A, _B) -> foo end},
+ ?assertThrow(invalid_collation_result, collate(Tree, 1, 2)).
+
+
lookup_test() ->
Db = erlfdb_util:get_test_db([empty]),
Tree = open(Db, <<1,2,3>>, 4),