[couchdb] branch remove-ken-limit created (now 410f1d9e8)

[va...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a change to branch remove-ken-limit
in repository https://gitbox.apache.org/repos/asf/couchdb.git


      at 410f1d9e8 Remove limit parameter from ken

This branch includes the following new commits:

     new 410f1d9e8 Remove limit parameter from ken

The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.

[couchdb] 01/01: Remove limit parameter from ken

[va...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

vatamane pushed a commit to branch remove-ken-limit
in repository https://gitbox.apache.org/repos/asf/couchdb.git

commit 410f1d9e87b6ec41baf476056cebe79a28e27c1d
Author: Nick Vatamaniuc <va...@gmail.com>
AuthorDate: Sun Apr 16 21:50:43 2023 -0400

    Remove limit parameter from ken
    
    It's not used anymore.
    
    In a test where it was used to test config persistence, replace it with
    `set_delay`.
---
 src/ken/src/ken_server.erl       | 13 +------------
 src/ken/test/ken_server_test.erl | 10 +++-------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/src/ken/src/ken_server.erl b/src/ken/src/ken_server.erl
index 9f869b379..3fb8d9031 100644
--- a/src/ken/src/ken_server.erl
+++ b/src/ken/src/ken_server.erl
@@ -25,7 +25,6 @@
 -export([add_all_shards/1]).
 -export([set_batch_size/1]).
 -export([set_delay/1]).
--export([set_limit/1]).
 -export([set_prune_interval/1]).
 
 % exports for spawn
@@ -44,7 +43,6 @@
 -record(state, {
     q = queue:new(),
     dbworker = nil,
-    limit = 20,
     delay = 5000,
     batch_size = 1,
     prune_interval = 60000,
@@ -103,12 +101,6 @@ set_batch_size(BS) when is_integer(BS), BS > 0 ->
 set_delay(Delay) when is_integer(Delay), Delay >= 0 ->
     gen_server:call(?MODULE, {set_delay, Delay}).
 
-%% @doc Changes the configured value for a limit.
-%% Returns previous value.
--spec set_limit(pos_integer()) -> pos_integer().
-set_limit(Limit) when is_integer(Limit), Limit > 0 ->
-    gen_server:call(?MODULE, {set_limit, Limit}).
-
 %% @doc Changes the configured value for a prune interval.
 %% Returns previous value.
 -spec set_prune_interval(pos_integer()) -> pos_integer().
@@ -122,8 +114,7 @@ init(_) ->
     ets:new(ken_pending, [named_table]),
     ets:new(ken_resubmit, [named_table]),
     ets:new(ken_workers, [named_table, public, {keypos, #job.name}]),
-    Limit = list_to_integer(config("limit", "20")),
-    {ok, #state{pruned_last = erlang:monotonic_time(), limit = Limit}}.
+    {ok, #state{pruned_last = erlang:monotonic_time()}}.
 
 terminate(_Reason, _State) ->
     ok.
@@ -132,8 +123,6 @@ handle_call({set_batch_size, BS}, _From, #state{batch_size = Old} = State) ->
     {reply, Old, State#state{batch_size = BS}, 0};
 handle_call({set_delay, Delay}, _From, #state{delay = Old} = State) ->
     {reply, Old, State#state{delay = Delay}, 0};
-handle_call({set_limit, Limit}, _From, #state{limit = Old} = State) ->
-    {reply, Old, State#state{limit = Limit}, 0};
 handle_call({set_prune_interval, Interval}, _From, State) ->
     Old = State#state.prune_interval,
     {reply, Old, State#state{prune_interval = Interval}, 0};
diff --git a/src/ken/test/ken_server_test.erl b/src/ken/test/ken_server_test.erl
index 090c5570a..ba2f12da8 100644
--- a/src/ken/test/ken_server_test.erl
+++ b/src/ken/test/ken_server_test.erl
@@ -14,12 +14,10 @@
 
 -include_lib("eunit/include/eunit.hrl").
 
-%% hardcoded defaults: limit: 20; batch: 1; delay: 5000; prune: 60000
+%% hardcoded defaults: batch: 1; delay: 5000; prune: 60000
 default_test_() ->
     {inorder,
         {setup, fun setup_default/0, fun teardown/1, [
-            set_builder("returns default", set_limit, 12, 20),
-            set_builder("keeps set", set_limit, 6, 12),
             set_builder("returns default", set_batch_size, 3, 1),
             set_builder("keeps set", set_batch_size, 6, 3),
             set_builder("returns default", set_delay, 7000, 5000),
@@ -31,8 +29,6 @@ default_test_() ->
 exception_test_() ->
     {inorder,
         {foreach, fun setup_default/0, fun teardown/1, [
-            exception_builder("exception on zero", set_limit, 0),
-            exception_builder("exception on negative", set_limit, -12),
             exception_builder("exception on zero", set_batch_size, 0),
             exception_builder("exception on negative", set_batch_size, -12),
             set_builder("no exception on zero", set_delay, 0, 5000),
@@ -44,8 +40,8 @@ exception_test_() ->
 config_test_() ->
     {inorder,
         {setup, fun setup_config/0, fun teardown/1, [
-            set_builder("reads config", set_limit, 24, 42),
-            set_builder("keeps set", set_limit, 6, 24)
+            set_builder("reads config", set_delay, 5099, 5000),
+            set_builder("keeps set", set_delay, 5042, 5099)
         ]}}.
 
 setup_default() ->