diff options
| author | Robert Newson <rnewson@apache.org> | 2018-08-27 16:11:43 +0100 |
|---|---|---|
| committer | Robert Newson <rnewson@apache.org> | 2018-08-27 16:41:21 +0100 |
| commit | bc0379543afa0fd6378d9a2ef8f055b3ba38cf61 (patch) | |
| tree | 9b5c717e514ba0ce8431d8925de3d9bb4848ffa0 | |
| parent | ee7e70087d234ae11f641f4d6217aaedc2cf09f4 (diff) | |
| download | couchdb-improve-dbcreate-validation.tar.gz | |
Improve validation of database creation parametersimprove-dbcreate-validation
| -rw-r--r-- | src/mem3/src/mem3.erl | 2 | ||||
| -rw-r--r-- | src/mem3/src/mem3_util.erl | 15 |
2 files changed, 12 insertions, 5 deletions
diff --git a/src/mem3/src/mem3.erl b/src/mem3/src/mem3.erl index 0e5eabfe3..7033faf4b 100644 --- a/src/mem3/src/mem3.erl +++ b/src/mem3/src/mem3.erl @@ -190,7 +190,7 @@ choose_shards(DbName, Nodes, Options) -> if N =:= 0 -> erlang:error(no_nodes_in_zone); true -> ok end, - Q = mem3_util:to_integer(couch_util:get_value(q, Options, + Q = mem3_util:q_val(couch_util:get_value(q, Options, config:get("cluster", "q", "8"))), %% rotate to a random entry in the nodelist for even distribution {A, B} = lists:split(crypto:rand_uniform(1,length(Nodes)+1), Nodes), diff --git a/src/mem3/src/mem3_util.erl b/src/mem3/src/mem3_util.erl index 0b69d790d..254a6dfa6 100644 --- a/src/mem3/src/mem3_util.erl +++ b/src/mem3/src/mem3_util.erl @@ -13,7 +13,7 @@ -module(mem3_util). -export([hash/1, name_shard/2, create_partition_map/5, build_shards/2, - n_val/2, to_atom/1, to_integer/1, write_db_doc/1, delete_db_doc/1, + n_val/2, q_val/1, to_atom/1, to_integer/1, write_db_doc/1, delete_db_doc/1, shard_info/1, ensure_exists/1, open_db_doc/1]). -export([is_deleted/1, rotate_list/2]). @@ -52,15 +52,15 @@ make_name(DbName, [B,E], Suffix) -> create_partition_map(DbName, N, Q, Nodes) -> create_partition_map(DbName, N, Q, Nodes, ""). -create_partition_map(DbName, N, Q, Nodes, Suffix) -> +create_partition_map(DbName, N, Q, Nodes, Suffix) when Q > 0 -> UniqueShards = make_key_ranges((?RINGTOP) div Q, 0, []), Shards0 = lists:flatten([lists:duplicate(N, S) || S <- UniqueShards]), Shards1 = attach_nodes(Shards0, [], Nodes, []), [name_shard(S#shard{dbname=DbName}, Suffix) || S <- Shards1]. -make_key_ranges(_, CurrentPos, Acc) when CurrentPos >= ?RINGTOP -> +make_key_ranges(I, CurrentPos, Acc) when I > 0, CurrentPos >= ?RINGTOP -> Acc; -make_key_ranges(Increment, Start, Acc) -> +make_key_ranges(Increment, Start, Acc) when Increment > 0 -> case Start + 2*Increment of X when X > ?RINGTOP -> End = ?RINGTOP - 1; @@ -217,6 +217,13 @@ n_val(N, _) when N < 1 -> n_val(N, _) -> N. +q_val(Q) when is_list(Q) -> + q_val(list_to_integer(Q)); +q_val(Q) when Q > 0 -> + Q; +q_val(_) -> + throw({error, invalid_q_value}). + shard_info(DbName) -> [{n, mem3:n(DbName)}, {q, length(mem3:shards(DbName)) div mem3:n(DbName)}]. |