Skip to content

Commit 41ce4da

Browse files
committed
CQ: Remove ability to change shared store index module
It will always use the ETS index. This change lets us do optimisations that would otherwise not be possible, including 81b2c39. A small functional change is included in this commit: we now always use ets:update_counter to update the ref_count, instead of a mix of update_{counter,fields}. When upgrading to 4.0, the index will be rebuilt for all users that were using a custom index module.
1 parent d45fbc3 commit 41ce4da

File tree

9 files changed

+156
-321
lines changed

9 files changed

+156
-321
lines changed

deps/rabbit/BUILD.bazel

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,6 @@ _APP_ENV = """[
3939
{vm_memory_calculation_strategy, rss},
4040
{memory_monitor_interval, 2500},
4141
{disk_free_limit, 50000000}, %% 50MB
42-
{msg_store_index_module, rabbit_msg_store_ets_index},
4342
{backing_queue_module, rabbit_variable_queue},
4443
%% 0 ("no limit") would make a better default, but that
4544
%% breaks the QPid Java client

deps/rabbit/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ define PROJECT_ENV
1919
{vm_memory_calculation_strategy, rss},
2020
{memory_monitor_interval, 2500},
2121
{disk_free_limit, 50000000}, %% 50MB
22-
{msg_store_index_module, rabbit_msg_store_ets_index},
2322
{backing_queue_module, rabbit_variable_queue},
2423
%% 0 ("no limit") would make a better default, but that
2524
%% breaks the QPid Java client

deps/rabbit/app.bzl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,6 @@ def all_beam_files(name = "all_beam_files"):
170170
"src/rabbit_mirror_queue_misc.erl",
171171
"src/rabbit_mnesia.erl",
172172
"src/rabbit_msg_store.erl",
173-
"src/rabbit_msg_store_ets_index.erl",
174173
"src/rabbit_msg_store_gc.erl",
175174
"src/rabbit_networking.erl",
176175
"src/rabbit_networking_store.erl",
@@ -431,7 +430,6 @@ def all_test_beam_files(name = "all_test_beam_files"):
431430
"src/rabbit_mirror_queue_misc.erl",
432431
"src/rabbit_mnesia.erl",
433432
"src/rabbit_msg_store.erl",
434-
"src/rabbit_msg_store_ets_index.erl",
435433
"src/rabbit_msg_store_gc.erl",
436434
"src/rabbit_networking.erl",
437435
"src/rabbit_networking_store.erl",
@@ -711,7 +709,6 @@ def all_srcs(name = "all_srcs"):
711709
"src/rabbit_mirror_queue_misc.erl",
712710
"src/rabbit_mnesia.erl",
713711
"src/rabbit_msg_store.erl",
714-
"src/rabbit_msg_store_ets_index.erl",
715712
"src/rabbit_msg_store_gc.erl",
716713
"src/rabbit_networking.erl",
717714
"src/rabbit_networking_store.erl",

deps/rabbit/src/rabbit_msg_store.erl

Lines changed: 155 additions & 134 deletions
Large diffs are not rendered by default.

deps/rabbit/src/rabbit_msg_store_ets_index.erl

Lines changed: 0 additions & 87 deletions
This file was deleted.

deps/rabbit/test/backing_queue_SUITE.erl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ end_per_suite(Config) ->
9191
init_per_group(Group, Config) ->
9292
case lists:member({group, Group}, all()) of
9393
true ->
94-
ClusterSize = 2,
94+
ClusterSize = 1,
9595
Config1 = rabbit_ct_helpers:set_config(Config, [
9696
{rmq_nodename_suffix, Group},
9797
{rmq_nodes_count, ClusterSize}

deps/rabbit_common/app.bzl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ def all_beam_files(name = "all_beam_files"):
5959
"src/rabbit_json.erl",
6060
"src/rabbit_log.erl",
6161
"src/rabbit_misc.erl",
62-
"src/rabbit_msg_store_index.erl",
6362
"src/rabbit_net.erl",
6463
"src/rabbit_nodes_common.erl",
6564
"src/rabbit_numerical.erl",
@@ -155,7 +154,6 @@ def all_test_beam_files(name = "all_test_beam_files"):
155154
"src/rabbit_json.erl",
156155
"src/rabbit_log.erl",
157156
"src/rabbit_misc.erl",
158-
"src/rabbit_msg_store_index.erl",
159157
"src/rabbit_net.erl",
160158
"src/rabbit_nodes_common.erl",
161159
"src/rabbit_numerical.erl",
@@ -246,7 +244,6 @@ def all_srcs(name = "all_srcs"):
246244
"src/rabbit_json.erl",
247245
"src/rabbit_log.erl",
248246
"src/rabbit_misc.erl",
249-
"src/rabbit_msg_store_index.erl",
250247
"src/rabbit_net.erl",
251248
"src/rabbit_nodes_common.erl",
252249
"src/rabbit_numerical.erl",

deps/rabbit_common/src/rabbit_msg_store_index.erl

Lines changed: 0 additions & 89 deletions
This file was deleted.

moduleindex.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,6 @@ rabbit:
686686
- rabbit_mirror_queue_misc
687687
- rabbit_mnesia
688688
- rabbit_msg_store
689-
- rabbit_msg_store_ets_index
690689
- rabbit_msg_store_gc
691690
- rabbit_networking
692691
- rabbit_networking_store
@@ -802,7 +801,6 @@ rabbit_common:
802801
- rabbit_json
803802
- rabbit_log
804803
- rabbit_misc
805-
- rabbit_msg_store_index
806804
- rabbit_net
807805
- rabbit_nodes_common
808806
- rabbit_numerical

0 commit comments

Comments
 (0)