Skip to content
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.

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

Remove ejabberd_rdbms and mongoose_rdbms_type #3392

Merged
merged 1 commit into from
Nov 9, 2021

Conversation

gustawlippa
Copy link
Contributor

@gustawlippa gustawlippa commented Nov 9, 2021

Get rid of ejabberd_rdbms because all it did was compile mongoose_rdbms_type. In turn, all it did was get an option from the config.

The functionality is left as it was. From what I understand, one can (in theory) use ODBC with different databases, so maybe the rdbms_server_type option is needed, but it could at least be moved from the general section to the RDBMS pool options. This could be done after dynamically compiled modules are merged.

@codecov
Copy link

codecov bot commented Nov 9, 2021

Codecov Report

Merging #3392 (49157c4) into without-dynamic-backend-modules (6ce5112) will decrease coverage by 0.03%.
The diff coverage is 100.00%.

Impacted file tree graph

@@                         Coverage Diff                         @@
##           without-dynamic-backend-modules    #3392      +/-   ##
===================================================================
- Coverage                            80.90%   80.87%   -0.04%     
===================================================================
  Files                                  415      414       -1     
  Lines                                32654    32647       -7     
===================================================================
- Hits                                 26419    26402      -17     
- Misses                                6235     6245      +10     
Impacted Files Coverage Δ
src/ejabberd_app.erl 93.40% <ø> (-0.08%) ⬇️
src/pubsub/mod_pubsub_db_rdbms.erl 95.34% <100.00%> (ø)
src/rdbms/mongoose_rdbms.erl 60.95% <100.00%> (+0.47%) ⬆️
src/rdbms/rdbms_queries.erl 90.90% <100.00%> (ø)
src/vcard/mod_vcard_rdbms.erl 75.79% <100.00%> (ø)
src/elasticsearch/mongoose_elasticsearch.erl 76.92% <0.00%> (-7.70%) ⬇️
...c/global_distrib/mod_global_distrib_server_mgr.erl 74.57% <0.00%> (-2.83%) ⬇️
src/http_upload/mod_http_upload.erl 94.62% <0.00%> (-2.16%) ⬇️
src/mam/mod_mam_muc_rdbms_arch.erl 94.94% <0.00%> (-2.03%) ⬇️
src/logger/mongoose_json_formatter.erl 84.00% <0.00%> (-2.00%) ⬇️
... and 9 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update d856ba0...49157c4. Read the comment docs.

@mongoose-im
Copy link
Collaborator

mongoose-im commented Nov 9, 2021

small_tests_24 / small_tests / 714bbe7
Reports root / small


dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / 714bbe7
Reports root


mssql_mnesia_24 / odbc_mssql_mnesia / 714bbe7
Reports root/ big
OK: 0 / Failed: 0 / User-skipped: 0 / Auto-skipped: 1696

adhoc_SUITE:error_in_suite
{error,'amp_big_SUITE:all/0 failed'}

Report log

gdpr_SUITE:error_in_suite
{error,'inbox_SUITE:all/0 failed'}

Report log

gdpr_SUITE:error_in_suite
{error,'inbox_extensions_SUITE:all/0 failed'}

Report log

login_SUITE:error_in_suite
{error,'mam_SUITE:groups/0 failed'}

Report log


internal_mnesia_24 / internal_mnesia / 714bbe7
Reports root/ big
OK: 1589 / Failed: 0 / User-skipped: 297 / Auto-skipped: 0


small_tests_23 / small_tests / 714bbe7
Reports root / small


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 714bbe7
Reports root/ big
OK: 2702 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / 714bbe7
Reports root/ big
OK: 2702 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


ldap_mnesia_24 / ldap_mnesia / 714bbe7
Reports root/ big
OK: 1486 / Failed: 0 / User-skipped: 400 / Auto-skipped: 0


ldap_mnesia_23 / ldap_mnesia / 714bbe7
Reports root/ big
OK: 1486 / Failed: 0 / User-skipped: 400 / Auto-skipped: 0


dynamic_domains_mysql_redis_24 / mysql_redis / 714bbe7
Reports root/ big
OK: 2685 / Failed: 0 / User-skipped: 201 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / 714bbe7
Reports root/ big
OK: 3070 / Failed: 1 / User-skipped: 211 / Auto-skipped: 0

amp_big_SUITE:offline:offline_failure:notify_deliver_to_unknown_domain_test
{error,
  {timeout_when_waiting_for_stanza,
    [{escalus_client,wait_for_stanza,
       [{client,
          <<"alicE_notify_deliver_to_unknown_domain_test_82.122947@localhost/res1">>,
          escalus_tcp,<0.7195.0>,
          [{event_manager,<0.6942.0>},
           {server,<<"localhost">>},
           {username,
             <<"alicE_notify_deliver_to_unknown_domain_test_82.122947">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.6942.0>},
            {server,<<"localhost">>},
            {username,
              <<"alicE_notify_deliver_to_unknown_domain_test_82.122947">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,
             <<"alicE_notify_deliver_to_unknown_domain_test_82.122947">>},
           {server,<<"localhost">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,
             <<"alicE_notify_deliver_to_unknown_domain_test_82.122947">>},
           {server,<<"localhost">>},
           {password,<<"matygrysa">>},
           {stream_id,<<"378cfc328d3636c9">>}]},
        5000],
       [{file,
          "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
        {line,136}]},
     {amp_big_SUITE,client_receives_generic_error,3,
       [{file,"/home/circleci/app/big_tests/tests/amp_big_SUITE.erl"},
        {line,796}]},
     {amp_big_S...

Report log


elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / 714bbe7
Reports root/ big
OK: 1862 / Failed: 0 / User-skipped: 323 / Auto-skipped: 0


pgsql_mnesia_23 / pgsql_mnesia / 714bbe7
Reports root/ big
OK: 3071 / Failed: 0 / User-skipped: 211 / Auto-skipped: 0


mysql_redis_24 / mysql_redis / 714bbe7
Reports root/ big
OK: 3060 / Failed: 1 / User-skipped: 228 / Auto-skipped: 0

mam_SUITE:rdbms_prefs_cases:messages_filtered_when_prefs_default_policy_is_never
{error,{test_case_failed,"ASSERT EQUAL\n\tExpected []\n\tValue [ok,ok]\n"}}

Report log


riak_mnesia_24 / riak_mnesia / 714bbe7
Reports root/ big
OK: 1734 / Failed: 1 / User-skipped: 326 / Auto-skipped: 0

rest_client_SUITE:muc:messages_can_be_paginated_in_room
{error,
  {{assertion_failed,assert,is_chat_message,
     [<<"537dd05a">>],
     {xmlel,<<"message">>,
       [{<<"to">>,<<"1636-456414-367480@muclight.localhost">>},
        {<<"type">>,<<"chat">>}],
       [{xmlel,<<"body">>,[],[{xmlcdata,<<"44c9e087">>}]}]},
     "<message to='1636-456414-367480@muclight.localhost' type='chat'><body>44c9e087</body></message>"},
   [{escalus_new_assert,assert_true,2,
      [{file,
         "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_new_assert.erl"},
       {line,84}]},
    {rest_client_SUITE,assert_room_messages,2,
      [{file,"/home/circleci/app/big_tests/tests/rest_client_SUITE.erl"},
       {line,772}]},
    {rest_client_SUITE,'-messages_can_be_paginated_in_room/1-fun-0-',3,
      [{file,"/home/circleci/app/big_tests/tests/rest_client_SUITE.erl"},
       {line,538}]},
    {escalus_story,story,4,
      [{file,
         "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
       {line,72}]},
    {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1783}]},
    {test_server,run_test_case_eval1,6,
      [{file,"test_server.erl"},{line,1292}]},
    {test_server,run_test_case_eval,9,
      [{file,"test_server.erl"},{line,1224}]}]}}

Report log

@mongoose-im
Copy link
Collaborator

mongoose-im commented Nov 9, 2021

small_tests_24 / small_tests / 49157c4
Reports root / small


internal_mnesia_24 / internal_mnesia / 49157c4
Reports root/ big
OK: 1589 / Failed: 0 / User-skipped: 297 / Auto-skipped: 0


small_tests_23 / small_tests / 49157c4
Reports root / small


ldap_mnesia_24 / ldap_mnesia / 49157c4
Reports root/ big
OK: 1486 / Failed: 0 / User-skipped: 400 / Auto-skipped: 0


dynamic_domains_pgsql_mnesia_23 / pgsql_mnesia / 49157c4
Reports root/ big
OK: 2702 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


ldap_mnesia_23 / ldap_mnesia / 49157c4
Reports root/ big
OK: 1486 / Failed: 0 / User-skipped: 400 / Auto-skipped: 0


dynamic_domains_mysql_redis_24 / mysql_redis / 49157c4
Reports root/ big
OK: 2691 / Failed: 1 / User-skipped: 201 / Auto-skipped: 0

mam_SUITE:rdbms_async_cache_prefs_cases:messages_filtered_when_prefs_default_policy_is_roster
{error,{test_case_failed,"ASSERT EQUAL\n\tExpected []\n\tValue [ok]\n"}}

Report log


dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 49157c4
Reports root/ big
OK: 2702 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


dynamic_domains_mssql_mnesia_24 / odbc_mssql_mnesia / 49157c4
Reports root/ big
OK: 2702 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


mysql_redis_24 / mysql_redis / 49157c4
Reports root/ big
OK: 3054 / Failed: 0 / User-skipped: 228 / Auto-skipped: 0


elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / 49157c4
Reports root/ big
OK: 1862 / Failed: 0 / User-skipped: 323 / Auto-skipped: 0


mssql_mnesia_24 / odbc_mssql_mnesia / 49157c4
Reports root/ big
OK: 3071 / Failed: 0 / User-skipped: 211 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / 49157c4
Reports root/ big
OK: 3071 / Failed: 0 / User-skipped: 211 / Auto-skipped: 0


pgsql_mnesia_23 / pgsql_mnesia / 49157c4
Reports root/ big
OK: 3071 / Failed: 0 / User-skipped: 211 / Auto-skipped: 0


riak_mnesia_24 / riak_mnesia / 49157c4
Reports root/ big
OK: 1709 / Failed: 0 / User-skipped: 326 / Auto-skipped: 0

Copy link
Collaborator

@NelsonVides NelsonVides left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Loving it 👍🏽

@NelsonVides NelsonVides merged commit 07e01df into without-dynamic-backend-modules Nov 9, 2021
@NelsonVides NelsonVides deleted the wdbm-ejabberd_rdbms branch November 9, 2021 11:44
@Premwoik Premwoik modified the milestones: 5.1.0, 5.0.0 May 25, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants