diff options
author | ILYA Khlopotov <iilyak@apache.org> | 2018-07-11 09:05:01 -0700 |
---|---|---|
committer | ILYA Khlopotov <iilyak@apache.org> | 2018-08-07 13:22:11 -0700 |
commit | 0fefc859eb9c18120064317da61a30adaeac5f92 (patch) | |
tree | 6f682f23988ee4296d63f07e11e1dc9b027dd49d | |
parent | 54b2eaac0094c035a6855af3f1e1e0db07b02f93 (diff) | |
download | couchdb-0fefc859eb9c18120064317da61a30adaeac5f92.tar.gz |
Rename 'module' data provider to 'static_module'
-rw-r--r-- | src/couch_epi/src/couch_epi_data.erl | 6 | ||||
-rw-r--r-- | src/couch_epi/src/couch_epi_sup.erl | 4 | ||||
-rw-r--r-- | src/couch_epi/test/couch_epi_tests.erl | 12 |
3 files changed, 11 insertions, 11 deletions
diff --git a/src/couch_epi/src/couch_epi_data.erl b/src/couch_epi/src/couch_epi_data.erl index bbed828bb..3567edf23 100644 --- a/src/couch_epi/src/couch_epi_data.erl +++ b/src/couch_epi/src/couch_epi_data.erl @@ -102,9 +102,9 @@ definitions({file, FilePath}) -> {error, Reason} -> {error, {FilePath, Reason}} end; -definitions({module, Module}) when is_atom(Module) -> - definitions({module, [Module]}); -definitions({module, Modules}) -> +definitions({static_module, Module}) when is_atom(Module) -> + definitions({static_module, [Module]}); +definitions({static_module, Modules}) -> Data = lists:append([M:data() || M <- Modules]), Hash = couch_epi_functions_gen:hash(Modules), {ok, Hash, Data}. diff --git a/src/couch_epi/src/couch_epi_sup.erl b/src/couch_epi/src/couch_epi_sup.erl index 31f27d752..fbf5736be 100644 --- a/src/couch_epi/src/couch_epi_sup.erl +++ b/src/couch_epi/src/couch_epi_sup.erl @@ -121,7 +121,7 @@ modules(#couch_epi_spec{kind = services, value = Module}) -> [Module]; modules(#couch_epi_spec{kind = data_providers, value = Value}) -> case Value of - {module, Module} -> [Module]; + {static_module, Module} -> [Module]; _ -> [] end; modules(#couch_epi_spec{kind = data_subscriptions, behaviour = Module}) -> @@ -159,7 +159,7 @@ services() -> data_providers() -> [ - {{test_app, descriptions}, {module, ?MODULE}, [{interval, 100}]} + {{test_app, descriptions}, {static_module, ?MODULE}, [{interval, 100}]} ]. data_subscriptions() -> diff --git a/src/couch_epi/test/couch_epi_tests.erl b/src/couch_epi/test/couch_epi_tests.erl index 79122d75a..00e1a50d7 100644 --- a/src/couch_epi/test/couch_epi_tests.erl +++ b/src/couch_epi/test/couch_epi_tests.erl @@ -175,7 +175,7 @@ setup(data_file) -> handle = couch_epi:get_handle(Key), kv = KV, pid = Pid}; -setup(data_module) -> +setup(static_data_module) -> error_logger:tty(false), Key = {test_app, descriptions}, @@ -183,7 +183,7 @@ setup(data_module) -> ok = generate_module(provider, ?DATA_MODULE1(provider)), KV = start_state_storage(), - ok = start_epi([{provider_epi, plugin_module([KV, {module, provider}])}]), + ok = start_epi([{provider_epi, plugin_module([KV, {static_module, provider}])}]), Pid = whereis(couch_epi:get_handle(Key)), Handle = couch_epi:get_handle(Key), @@ -244,7 +244,7 @@ epi_config_update_test_() -> ], Cases = [ data_file, - data_module, + static_data_module, functions ], { @@ -264,7 +264,7 @@ epi_data_source_test_() -> ], Cases = [ data_file, - data_module + static_data_module ], { "epi data API tests", @@ -305,7 +305,7 @@ epi_providers_order_test_() -> epi_reload_test_() -> Cases = [ data_file, - data_module, + static_data_module, functions ], Funs = [ @@ -565,7 +565,7 @@ update(Case, #ctx{pid = Pid, modules = Modules} = Ctx) -> update_definitions(data_file, #ctx{file = File}) -> {ok, _} = file:copy(?DATA_FILE2, File), ok; -update_definitions(data_module, #ctx{}) -> +update_definitions(static_data_module, #ctx{}) -> ok = generate_module(provider, ?DATA_MODULE2(provider)); update_definitions(functions, #ctx{}) -> ok = generate_module(provider1, ?MODULE2(provider1)). |