Skip to content

Put a cap on list objects v1 #1271

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
kuenishi wants to merge 1 commit into
base: 2.1
Choose a base branch
from
Open

Put a cap on list objects v1 #1271

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion include/list_objects.hrl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,4 +101,3 @@
-define(MIN_KEYS_TO_CACHE, 2000).
-define(MAX_CACHE_BYTES, 104857600). % 100MB
-define(KEY_LIST_MULTIPLIER, 1.1).
-define(FOLD_OBJECTS_FOR_LIST_KEYS, true).
37 changes: 0 additions & 37 deletions riak_test/tests/list_objects_test.erl
View file
Open in desktop

This file was deleted.

7 changes: 2 additions & 5 deletions src/riak_cs_config.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,9 +127,6 @@ warnings() ->
?MAYBE_WARN(anonymous_user_creation(),
"`anonymous_user_creation` is set as true. Set this as false"
" when this CS nodes is populated as public service."),
?MAYBE_WARN(not gc_paginated_indexes(),
"`gc_paginated_indexes` is set as false. "
" This will be removed at next major version."),
ok.

%% ===================================================================
Expand Down Expand Up @@ -232,10 +229,10 @@ policy_module() ->

%% @doc paginated 2i is supported after Riak 1.4
%% When using Riak CS `>= 1.5' with Riak `=< 1.3' (it rarely happens)
%% this should be set as false at app.config.
%% this should be set as false at app.config. Deprecated in 2.1.
-spec gc_paginated_indexes() -> atom().
gc_paginated_indexes() ->
get_env(riak_cs, gc_paginated_indexes, true).
true.

-spec response_module() -> atom().
response_module() ->
Expand Down
3 changes: 1 addition & 2 deletions src/riak_cs_list_objects_utils.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -228,8 +228,7 @@ set_key_list_multiplier(Multiplier) ->

-spec fold_objects_for_list_keys() -> boolean().
fold_objects_for_list_keys() ->
riak_cs_config:get_env(riak_cs, fold_objects_for_list_keys,
?FOLD_OBJECTS_FOR_LIST_KEYS).
true.

-spec fold_objects_timeout() -> non_neg_integer().
fold_objects_timeout() ->
Expand Down