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

Make vcard processing parallel #3315

Merged
merged 1 commit into from
Oct 4, 2021
Merged

Make vcard processing parallel #3315

merged 1 commit into from
Oct 4, 2021

Conversation

NelsonVides
Copy link
Collaborator

Also, don't lose the accumulators.

@mongoose-im

This comment has been minimized.

@codecov
Copy link

codecov bot commented Oct 1, 2021

Codecov Report

Merging #3315 (cee024b) into master (40f1728) will decrease coverage by 0.55%.
The diff coverage is 87.50%.

❗ Current head cee024b differs from pull request most recent head 3a293d1. Consider uploading reports for the commit 3a293d1 to get more accurate results
Impacted file tree graph

@@            Coverage Diff             @@
##           master    #3315      +/-   ##
==========================================
- Coverage   80.72%   80.17%   -0.56%     
==========================================
  Files         397      398       +1     
  Lines       32439    32613     +174     
==========================================
- Hits        26185    26146      -39     
- Misses       6254     6467     +213     
Impacted Files Coverage Δ
src/mod_vcard.erl 77.93% <87.50%> (-0.08%) ⬇️
src/event_pusher/mod_event_pusher.erl 65.00% <0.00%> (-22.50%) ⬇️
src/mod_roster_riak.erl 81.53% <0.00%> (-15.39%) ⬇️
src/event_pusher/mod_event_pusher_sns.erl 84.21% <0.00%> (-5.27%) ⬇️
src/pubsub/mod_pubsub_cache_rdbms.erl 88.23% <0.00%> (-2.95%) ⬇️
...c/global_distrib/mod_global_distrib_server_mgr.erl 74.57% <0.00%> (-2.26%) ⬇️
src/config/mongoose_config_parser.erl 90.58% <0.00%> (-2.19%) ⬇️
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%) ⬇️
src/domain/mongoose_domain_loader.erl 77.35% <0.00%> (-1.89%) ⬇️
... and 15 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 09204c1...3a293d1. Read the comment docs.

src/mod_vcard.erl Outdated Show resolved Hide resolved
@mongoose-im

This comment has been minimized.

@mongoose-im
Copy link
Collaborator

mongoose-im commented Oct 4, 2021

small_tests_24 / small_tests / cee024b
Reports root / small


internal_mnesia_24 / internal_mnesia / cee024b
Reports root/ big
OK: 1589 / Failed: 0 / User-skipped: 296 / Auto-skipped: 0


small_tests_23 / small_tests / cee024b
Reports root / small


dynamic_domains_24 / pgsql_mnesia / cee024b
Reports root/ big
OK: 2700 / Failed: 1 / User-skipped: 184 / Auto-skipped: 0

service_domain_db_SUITE:db:db_keeps_syncing_after_cluster_join
{error,{test_case_failed,{[<<"example1.com">>,<<"example2.com">>,
               <<"example3.com">>],
              [<<"example1.com">>,<<"example2.com">>,
               <<"example3.com">>,<<"example4.com">>]}}}

Report log


ldap_mnesia_24 / ldap_mnesia / cee024b
Reports root/ big
OK: 1486 / Failed: 0 / User-skipped: 399 / Auto-skipped: 0


dynamic_domains_23 / pgsql_mnesia / cee024b
Reports root/ big
OK: 2701 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


ldap_mnesia_23 / ldap_mnesia / cee024b
Reports root/ big
OK: 1486 / Failed: 0 / User-skipped: 399 / Auto-skipped: 0


pgsql_mnesia_24 / pgsql_mnesia / cee024b
Reports root/ big
OK: 3069 / Failed: 1 / User-skipped: 211 / Auto-skipped: 0

accounts_SUITE:utilities:users_number_estimate:count_users_estimate
{error,{{assert,[{module,accounts_SUITE},
         {line,386},
         {expression,"is_integer ( Count ) andalso Count >= 0"},
         {expected,true},
         {value,false}]},
    [{accounts_SUITE,count_users_estimate,1,
             [{file,"/home/circleci/app/big_tests/tests/accounts_SUITE.erl"},
              {line,386}]},
     {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


elasticsearch_and_cassandra_24 / elasticsearch_and_cassandra_mnesia / cee024b
Reports root/ big
OK: 1862 / Failed: 0 / User-skipped: 322 / Auto-skipped: 0


mssql_mnesia_24 / odbc_mssql_mnesia / cee024b
Reports root/ big
OK: 3070 / Failed: 0 / User-skipped: 211 / Auto-skipped: 0


pgsql_mnesia_23 / pgsql_mnesia / cee024b
Reports root/ big
OK: 3069 / Failed: 1 / User-skipped: 211 / Auto-skipped: 0

accounts_SUITE:utilities:users_number_estimate:count_users_estimate
{error,{{assert,[{module,accounts_SUITE},
         {line,386},
         {expression,"is_integer ( Count ) andalso Count >= 0"},
         {expected,true},
         {value,false}]},
    [{accounts_SUITE,'-count_users_estimate/1-fun-0-',1,
             [{file,"/home/circleci/app/big_tests/tests/accounts_SUITE.erl"},
              {line,386}]},
     {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1784}]},
     {test_server,run_test_case_eval1,6,
            [{file,"test_server.erl"},{line,1293}]},
     {test_server,run_test_case_eval,9,
            [{file,"test_server.erl"},{line,1225}]}]}}

Report log


mysql_redis_24 / mysql_redis / cee024b
Reports root/ big
OK: 3053 / Failed: 0 / User-skipped: 228 / Auto-skipped: 0


riak_mnesia_24 / riak_mnesia / cee024b
Reports root/ big
OK: 1709 / Failed: 0 / User-skipped: 325 / Auto-skipped: 0

@mongoose-im
Copy link
Collaborator

mongoose-im commented Oct 4, 2021

small_tests_24 / small_tests / 3a293d1
Reports root / small


internal_mnesia_24 / internal_mnesia / 3a293d1
Reports root/ big
OK: 1588 / Failed: 1 / User-skipped: 297 / Auto-skipped: 0

amp_big_SUITE:offline:offline_success:drop_deliver_to_offline_user_test
{error,
  {test_case_failed,
    {has_stanzas_but_shouldnt,
      {client,
        <<"alicE_drop_deliver_to_offline_user_test_5.212917@localhost/res1">>,
        escalus_tcp,<0.4138.0>,
        [{event_manager,<0.4064.0>},
         {server,<<"localhost">>},
         {username,
           <<"alicE_drop_deliver_to_offline_user_test_5.212917">>},
         {resource,<<"res1">>}],
        [{event_client,
           [{event_manager,<0.4064.0>},
            {server,<<"localhost">>},
            {username,
              <<"alicE_drop_deliver_to_offline_user_test_5.212917">>},
            {resource,<<"res1">>}]},
         {resource,<<"res1">>},
         {username,
           <<"alicE_drop_deliver_to_offline_user_test_5.212917">>},
         {server,<<"localhost">>},
         {host,<<"localhost">>},
         {port,5222},
         {auth,{escalus_auth,auth_plain}},
         {wspath,undefined},
         {username,
           <<"alicE_drop_deliver_to_offline_user_test_5.212917">>},
         {server,<<"localhost">>},
         {password,<<"matygrysa">>},
         {stream_id,<<"9e419cb123f27c29">>}]},
      [{xmlel,<<"stream:error">>,[],
         [{xmlel,<<"conflict">>,
            [{<<"xmlns">>,
            <<"urn:ietf:params:xml:ns:xmpp-streams">>}],
            []},
          {xmlel,<<"text">>,
            [{<<"xml:lang">>,<<"en">>},
             {<<"xmlns">>,
            <<"urn:ietf:params:xml:ns:xmpp-streams">>}],
            [{xmlcdata,<<"Replaced by new connection">>}]}]},
       {xmlst...

Report log


small_tests_23 / small_tests / 3a293d1
Reports root / small


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


dynamic_domains_23 / pgsql_mnesia / 3a293d1
Reports root/ big
OK: 2702 / Failed: 0 / User-skipped: 184 / Auto-skipped: 0


dynamic_domains_24 / pgsql_mnesia / 3a293d1
Reports root/ big
OK: 2710 / Failed: 1 / User-skipped: 184 / Auto-skipped: 0

connect_SUITE:just_tls:feature_order:auth_bind_compression_session
{error,
  {{badmatch,
     {error,
       {connection_step_failed,
         {{escalus_session,maybe_use_compression},
          {client,
            <<"secure_joe_auth_bind_compression_session_26.697542@domain.example.com/escalus-default-resource">>,
            escalus_tcp,<0.13507.0>,undefined,
            [{username,
               <<"secure_joe_auth_bind_compression_session_26.697542">>},
             {server,<<"domain.example.com">>},
             {host,<<"localhost">>},
             {password,<<"break_me">>},
             {compression,<<"zlib">>},
             {starttls,required},
             {stream_id,<<"159e8fe413294ffc">>},
             {resource,<<"escalus-default-resource">>}]},
          [{compression,[<<"zlib">>]},
           {starttls,false},
           {stream_management,true},
           {advanced_message_processing,true},
           {client_state_indication,false},
           {sasl_mechanisms,[<<"SCRAM-SHA-256">>,<<"PLAIN">>]},
           {caps,undefined}]},
         {timeout,stream_start}}}},
   [{connect_SUITE,auth_bind_compression_session,1,
      [{file,"/home/circleci/app/big_tests/tests/connect_SUITE.erl"},
       {line,527}]},
    {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


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


ldap_mnesia_23 / ldap_mnesia / 3a293d1
Reports root/ big
OK: 1490 / Failed: 1 / User-skipped: 400 / Auto-skipped: 0

s2s_SUITE:node1_tls_optional_node2_tls_required_trusted_with_cachain:simple_message
{error,
  {timeout_when_waiting_for_stanza,
    [{escalus_client,wait_for_stanza,
       [{client,<<"alicE_simple_message_64.733165@localhost/res1">>,
          escalus_tcp,<0.8101.1>,
          [{event_manager,<0.8096.1>},
           {server,<<"localhost">>},
           {username,<<"alicE_simple_message_64.733165">>},
           {resource,<<"res1">>}],
          [{event_client,
             [{event_manager,<0.8096.1>},
            {server,<<"localhost">>},
            {username,<<"alicE_simple_message_64.733165">>},
            {resource,<<"res1">>}]},
           {resource,<<"res1">>},
           {username,<<"alicE_simple_message_64.733165">>},
           {server,<<"localhost">>},
           {host,<<"localhost">>},
           {port,5222},
           {auth,{escalus_auth,auth_plain}},
           {wspath,undefined},
           {username,<<"alicE_simple_message_64.733165">>},
           {server,<<"localhost">>},
           {password,<<"matygrysa">>},
           {stream_id,<<"f9f39050569402e7">>}]},
        10000],
       [{file,
          "/home/circleci/app/big_tests/_build/default/lib/escalus/src/escalus_client.erl"},
        {line,136}]},
     {s2s_SUITE,'-simple_message/1-fun-0-',2,
       [{file,"/home/circleci/app/big_tests/tests/s2s_SUITE.erl"},
        {line,131}]},
     {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"}...

Report log


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


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


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


mysql_redis_24 / mysql_redis / 3a293d1
Reports root/ big
OK: 3071 / Failed: 2 / User-skipped: 228 / Auto-skipped: 0

mam_SUITE:rdbms_prefs_cases:prefs_set_request
{error,{test_case_failed,"ASSERT EQUAL\n\tExpected {prefs_result_iq,<<\"roster\">>,\n                  [<<\"romeo@montague.net\">>],\n                  [<<\"montague@montague.net\">>]}\n\tValue {prefs_result_iq,<<\"always\">>,\n                 [<<\"romeo@montague.net\">>],\n                 [<<\"montague@montague.net\">>]}\n"}}

Report log

pep_SUITE:pep_tests:unsubscribe_after_presence_unsubscription
{error,
  {{badmatch,
     [{xmlel,<<"message">>,
        [{<<"from">>,
        <<"alice_unsubscribe_after_presence_unsubscription_72.38768@localhost">>},
         {<<"to">>,
        <<"bob_unsubscribe_after_presence_unsubscription_72.38768@localhost/res1">>},
         {<<"type">>,<<"headline">>}],
        [{xmlel,<<"event">>,
           [{<<"xmlns">>,
           <<"http://jabber.org/protocol/pubsub#event">>}],
           [{xmlel,<<"items">>,
            [{<<"node">>,<<"cwSKj79pDc/aaw6v1HGULg==">>}],
            [{xmlel,<<"item">>,
               [{<<"id">>,<<"salmon">>}],
               [{xmlel,<<"entry">>,
                  [{<<"xmlns">>,
                  <<"http://www.w3.org/2005/Atom">>}],
                  []}]}]}]},
         {xmlel,<<"headers">>,
           [{<<"xmlns">>,<<"http://jabber.org/protocol/shim">>}],
           []}]}]},
   [{pep_SUITE,'-unsubscribe_after_presence_unsubscription/1-fun-0-',2,
      [{file,"/home/circleci/app/big_tests/tests/pep_SUITE.erl"},
       {line,384}]},
    {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


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


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

Copy link
Contributor

@arcusfelis arcusfelis left a comment

Choose a reason for hiding this comment

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

looks good

@vkatsuba vkatsuba merged commit 49ea0a8 into master Oct 4, 2021
@vkatsuba vkatsuba deleted the vcard/parallel branch October 4, 2021 13:14
@Premwoik Premwoik added this to the 5.0.0 milestone Oct 5, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants