Skip to content

Removed rs_migration code, tests, and logic that relies on it. #730

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
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Removed rs_migration code, tests, and logic that relies on it. #730

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
eadd61d
Removed rs_migration code, tests, and logic that relies on it.
fadushin Mar 7, 2017
5623696
Removed vestige of riak_search
fadushin Mar 10, 2017
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
2 changes: 0 additions & 2 deletions include/yokozuna.hrl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -220,8 +220,6 @@
%% microseconds.
-define(YZ_TIME_ELAPSED(StartTime), timer:now_diff(os:timestamp(), StartTime)).

-define(RS_SVC, riak_search).

-define(SOLR_HOST_CONTEXT, "/internal_solr").

%%%===================================================================
Expand Down
291 changes: 0 additions & 291 deletions riak_test/yz_rs_migration_test.erl
View file
Open in desktop

This file was deleted.

17 changes: 1 addition & 16 deletions src/yz_app.erl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,9 +122,6 @@ initialize_atoms() ->
maybe_setup(false) ->
ok;
maybe_setup(true) ->
Ring = yz_misc:get_ring(raw),
RSEnabled = yz_rs_migration:is_riak_search_enabled(),
yz_rs_migration:strip_rs_hooks(RSEnabled, Ring),
Routes = yz_wm_search:routes() ++ yz_wm_extract:routes() ++
yz_wm_index:routes() ++ yz_wm_schema:routes(),
ok = yz_events:add_guarded_handler(yz_events, []),
Expand All @@ -141,20 +138,8 @@ maybe_setup(true) ->
ok = yz_schema:setup_schema_bucket(),
ok = set_ibrowse_config(),
yz_misc:add_routes(Routes),
maybe_register_pb(RSEnabled),
ok.

%% @doc Conditionally register PB service IFF Riak Search is not
%% enabled.
-spec maybe_register_pb(boolean()) -> ok.
maybe_register_pb(true) ->
lager:info("Not registering Yokozuna protocol buffer services"
" because Riak Search is enabled as well"),
ok;
maybe_register_pb(false) ->
ok = riak_api_pb_service:register(?QUERY_SERVICES),
ok = riak_api_pb_service:register(?ADMIN_SERVICES).

%% @private
%%
%% @doc Determine if direct stats are being used or not. If not setup
Expand All @@ -177,4 +162,4 @@ set_ibrowse_config() ->
?YZ_CONFIG_IBROWSE_MAX_PIPELINE_SIZE,
?YZ_CONFIG_IBROWSE_MAX_PIPELINE_SIZE_DEFAULT)}
],
yz_solr:set_ibrowse_config(Config).
yz_solr:set_ibrowse_config(Config).
Loading