c2s/features optimisations #4094

NelsonVides · 2023-08-11T09:41:05Z

A couple of small code shuffles, to make parameters simpler and having the c2s_data state in the features hook.

codecov · 2023-08-11T09:50:03Z

Codecov Report

Patch coverage: 93.75% and project coverage change: +0.01% 🎉

Comparison is base (4704292) 83.84% compared to head (73bda74) 83.85%.
Report is 7 commits behind head on master.

Additional details and impacted files

@@            Coverage Diff             @@
##           master    #4094      +/-   ##
==========================================
+ Coverage   83.84%   83.85%   +0.01%     
==========================================
  Files         551      551              
  Lines       33557    33567      +10     
==========================================
+ Hits        28135    28149      +14     
+ Misses       5422     5418       -4

Files Changed	Coverage Δ
src/hooks/mongoose_hooks.erl	`94.92% <ø> (-0.02%)`	⬇️
src/c2s/mongoose_c2s.erl	`87.52% <84.61%> (+0.02%)`	⬆️
src/c2s/mongoose_c2s_stanzas.erl	`96.36% <100.00%> (+0.80%)`	⬆️

... and 10 files with indirect coverage changes

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

src/c2s/mongoose_c2s.erl

Unify parameters in c2s_stanzas around auth

mongoose-im · 2023-08-14T10:20:41Z

small_tests_24 / small_tests / 73bda74
Reports root / small

elasticsearch_and_cassandra_25 / elasticsearch_and_cassandra_mnesia / 73bda74
Reports root/ big
OK: 369 / Failed: 0 / User-skipped: 38 / Auto-skipped: 0

small_tests_25_arm64 / small_tests / 73bda74
Reports root / small

small_tests_25 / small_tests / 73bda74
Reports root / small

ldap_mnesia_24 / ldap_mnesia / 73bda74
Reports root/ big
OK: 2270 / Failed: 0 / User-skipped: 831 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_24 / pgsql_mnesia / 73bda74
Reports root/ big
OK: 4233 / Failed: 0 / User-skipped: 84 / Auto-skipped: 0

mam_SUITE:rdbms_async_pool_muc_all:muc06:muc_message_with_stanzaid

{failed,
  {mam_SUITE,end_per_testcase,
    {'EXIT',
      {{room_archive_size,0,[{times,200,1}],ok},
       [{mongoose_helper,do_wait_until,2,
          [{file,
             "/home/circleci/project/big_tests/tests/mongoose_helper.erl"},
           {line,358}]},
        {mam_helper,wait_for_room_archive_size,3,
          [{file,
             "/home/circleci/project/big_tests/tests/mam_helper.erl"},
           {line,789}]},
        {mam_helper,clean_room_archive,1,
          [{file,
             "/home/circleci/project/big_tests/tests/mam_helper.erl"},
           {line,733}]},
        {mam_helper,destroy_room,1,
          [{file,
             "/home/circleci/project/big_tests/tests/mam_helper.erl"},
           {line,726}]},
        {mam_SUITE,end_per_testcase,2,
          [{file,
             "/home/circleci/project/big_tests/tests/mam_SUITE.erl"},
           {line,954}]},
        {test_server,do_end_per_testcase,4,
          [{file,"test_server.erl"},{line,1627}]},
        {test_server,run_test_case_eval1,6,
          [{file,"test_server.erl"},{line,1335}]},
        {test_server,run_test_case_eval,9,
          [{file,"test_server.erl"},{line,1224}]}]}}}}

Report log

dynamic_domains_mysql_redis_25 / mysql_redis / 73bda74
Reports root/ big
OK: 4201 / Failed: 0 / User-skipped: 116 / Auto-skipped: 0

ldap_mnesia_25 / ldap_mnesia / 73bda74
Reports root/ big
OK: 2270 / Failed: 0 / User-skipped: 831 / Auto-skipped: 0

dynamic_domains_pgsql_mnesia_25 / pgsql_mnesia / 73bda74
Reports root/ big
OK: 4233 / Failed: 0 / User-skipped: 84 / Auto-skipped: 0

pgsql_mnesia_24 / pgsql_mnesia / 73bda74
Reports root/ big
OK: 4618 / Failed: 0 / User-skipped: 91 / Auto-skipped: 0

dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 73bda74
Reports root/ big
OK: 4227 / Failed: 3 / User-skipped: 87 / Auto-skipped: 0

mam_SUITE:rdbms_mnesia_prefs_cases:run_set_and_get_prefs_cases

{error,
  {thrown,
    {timeout,
      [{escalus_connection,receive_stanza,2,
         [{file,
            "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_connection.erl"},
          {line,303}]},
       {mam_helper,run_set_and_get_prefs_case,4,
         [{file,
            "/home/circleci/project/big_tests/tests/mam_helper.erl"},
          {line,1277}]},
       {mam_SUITE,'-run_set_and_get_prefs_cases/1-lc$^0/1-0-',4,
         [{file,
            "/home/circleci/project/big_tests/tests/mam_SUITE.erl"},
          {line,3000}]},
       {escalus_story,story,4,
         [{file,
            "/home/circleci/project/big_tests/_build/default/lib/escalus/src/escalus_story.erl"},
          {line,72}]},
       {test_server,ts_tc,3,[{file,"test_server.erl"},{line,1782}]},
       {test_server,run_test_case_eval1,6,
         [{file,"test_server.erl"},{line,1291}]},
       {test_server,run_test_case_eval,9,
         [{file,"test_server.erl"},{line,1223}]}]}}}

Report log

mam_SUITE:rdbms_mnesia_prefs_cases:messages_filtered_when_prefs_default_policy_is_roster

{error,
  {{assertion_failed,assert,is_iq_result,
     [{xmlel,<<"iq">>,
        [{<<"type">>,<<"set">>},
         {<<"id">>,<<"9461a9bb2b872efa07868d48f3d71da1">>}],
        [{xmlel,<<"prefs">>,
           [{<<"xmlns">>,<<"urn:xmpp:mam:1">>},
          {<<"default">>,<<"roster">>}],
           [{xmlel,<<"always">>,[],[]},{xmlel,<<"never">>,[],[]}]}]}],
     {xmlel,<<"iq">>,
       [{<<"from">>,
         <<"alice_messages_filtered_when_prefs_default_policy_is_roster_2095@domain.example.com">>},
        {<<"to">>,
         <<"alice_messages_filtered_when_prefs_default_policy_is_roster_2095@domain.example.com/res1">>},
        {<<"id">>,<<"push9c0c71585d62a0fb">>},
        {<<"type">>,<<"set">>}],
       [{xmlel,<<"query">>,
          [{<<"xmlns">>,<<"jabber:iq:roster">>}],
          [{xmlel,<<"item">>,
             [{<<"subscription">>,<<"both">>},
            {<<"jid">>,
             <<"bob_messages_filtered_when_prefs_default_policy_is_roster_2095@domain.example.com">>}],
             []}]}]},
     "<iq from='alice_messages_filtered_when_prefs_default_policy_is_roster_2095@domain.example.com' to='alice_messages_filtered_when_prefs_default_policy_is_roster_2095@domain.example.com/res1' id='push9c0c71585d62a0fb' type='set'><query xmlns='jabber:iq:roster'><item subscription='both' jid='bob_messages_filtered_when_prefs_default_policy_is_roster_2095@domain.example.com'/></query></iq>"},
   [{escalus_new_assert,assert_true,2,
      [{file,
         "/home/circleci/project/big_test...

Report log

mam_SUITE:rdbms_mnesia_prefs_cases:messages_filtered_when_prefs_default_policy_is_always

{error,
  {{assertion_failed,assert,is_iq_result,
     [{xmlel,<<"iq">>,
        [{<<"type">>,<<"set">>},
         {<<"id">>,<<"7700b9ad864ffa4a3413ac23dde39436">>}],
        [{xmlel,<<"prefs">>,
           [{<<"xmlns">>,<<"urn:xmpp:mam:1">>},
          {<<"default">>,<<"always">>}],
           [{xmlel,<<"always">>,[],[]},{xmlel,<<"never">>,[],[]}]}]}],
     {xmlel,<<"iq">>,
       [{<<"from">>,
         <<"alice_messages_filtered_when_prefs_default_policy_is_always_2093@domain.example.com">>},
        {<<"to">>,
         <<"alice_messages_filtered_when_prefs_default_policy_is_always_2093@domain.example.com/res1">>},
        {<<"id">>,<<"pushf14354dc43b8d9f2">>},
        {<<"type">>,<<"set">>}],
       [{xmlel,<<"query">>,
          [{<<"xmlns">>,<<"jabber:iq:roster">>}],
          [{xmlel,<<"item">>,
             [{<<"subscription">>,<<"both">>},
            {<<"jid">>,
             <<"bob_messages_filtered_when_prefs_default_policy_is_always_2093@domain.example.com">>}],
             []}]}]},
     "<iq from='alice_messages_filtered_when_prefs_default_policy_is_always_2093@domain.example.com' to='alice_messages_filtered_when_prefs_default_policy_is_always_2093@domain.example.com/res1' id='pushf14354dc43b8d9f2' type='set'><query xmlns='jabber:iq:roster'><item subscription='both' jid='bob_messages_filtered_when_prefs_default_policy_is_always_2093@domain.example.com'/></query></iq>"},
   [{escalus_new_assert,assert_true,2,
      [{file,
         "/home/circleci/project/big_test...

Report log

mysql_redis_25 / mysql_redis / 73bda74
Reports root/ big
OK: 4598 / Failed: 0 / User-skipped: 111 / Auto-skipped: 0

pgsql_cets_25 / pgsql_cets / 73bda74
Reports root/ big
OK: 4588 / Failed: 0 / User-skipped: 121 / Auto-skipped: 0

mam_SUITE:rdbms_async_pool_muc_all:muc06:muc_message_with_stanzaid

{failed,
  {mam_SUITE,end_per_testcase,
    {'EXIT',
      {{room_archive_size,0,[{times,200,1}],ok},
       [{mongoose_helper,do_wait_until,2,
          [{file,
             "/home/circleci/project/big_tests/tests/mongoose_helper.erl"},
           {line,358}]},
        {mam_helper,wait_for_room_archive_size,3,
          [{file,
             "/home/circleci/project/big_tests/tests/mam_helper.erl"},
           {line,789}]},
        {mam_helper,clean_room_archive,1,
          [{file,
             "/home/circleci/project/big_tests/tests/mam_helper.erl"},
           {line,733}]},
        {mam_helper,destroy_room,1,
          [{file,
             "/home/circleci/project/big_tests/tests/mam_helper.erl"},
           {line,726}]},
        {mam_SUITE,end_per_testcase,2,
          [{file,
             "/home/circleci/project/big_tests/tests/mam_SUITE.erl"},
           {line,954}]},
        {test_server,do_end_per_testcase,4,
          [{file,"test_server.erl"},{line,1626}]},
        {test_server,run_test_case_eval1,6,
          [{file,"test_server.erl"},{line,1334}]},
        {test_server,run_test_case_eval,9,
          [{file,"test_server.erl"},{line,1223}]}]}}}}

Report log

internal_mnesia_25 / internal_mnesia / 73bda74
Reports root/ big
OK: 2416 / Failed: 0 / User-skipped: 685 / Auto-skipped: 0

mssql_mnesia_25 / odbc_mssql_mnesia / 73bda74
Reports root/ big
OK: 4615 / Failed: 0 / User-skipped: 94 / Auto-skipped: 0

pgsql_mnesia_25 / pgsql_mnesia / 73bda74
Reports root/ big
OK: 4618 / Failed: 0 / User-skipped: 91 / Auto-skipped: 0

dynamic_domains_mssql_mnesia_25 / odbc_mssql_mnesia / 73bda74
Reports root/ big
OK: 4230 / Failed: 0 / User-skipped: 87 / Auto-skipped: 0

arcusfelis

ok

arcusfelis

ok

This comment was marked as outdated.

Sign in to view

NelsonVides force-pushed the c2s/features branch 2 times, most recently from af35176 to 0c0ab93 Compare August 11, 2023 10:11

This comment was marked as outdated.

Sign in to view

arcusfelis reviewed Aug 11, 2023

View reviewed changes

src/c2s/mongoose_c2s.erl Outdated Show resolved Hide resolved

NelsonVides mentioned this pull request Aug 11, 2023

C2s/fixes #4095

Merged

NelsonVides changed the base branch from master to c2s/fixes August 11, 2023 16:07

Base automatically changed from c2s/fixes to master August 12, 2023 10:07

NelsonVides force-pushed the c2s/features branch from 0c0ab93 to 0799c14 Compare August 14, 2023 07:24

This comment was marked as outdated.

Sign in to view

NelsonVides requested a review from arcusfelis August 14, 2023 08:17

Give access to the c2s_data to feature stanzas

9633264

Unify parameters in c2s_stanzas around auth

NelsonVides force-pushed the c2s/features branch from 0799c14 to c8a7703 Compare August 14, 2023 08:20

This comment was marked as outdated.

Sign in to view

NelsonVides marked this pull request as ready for review August 14, 2023 09:23

Move around c2s socket sending

73bda74

NelsonVides force-pushed the c2s/features branch from c8a7703 to 73bda74 Compare August 14, 2023 10:11

arcusfelis reviewed Aug 14, 2023

View reviewed changes

arcusfelis approved these changes Aug 14, 2023

View reviewed changes

arcusfelis merged commit dec621e into master Aug 14, 2023
4 checks passed

arcusfelis deleted the c2s/features branch August 14, 2023 12:29

chrzaszcz added this to the 6.2.0 milestone Dec 11, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

c2s/features optimisations #4094

c2s/features optimisations #4094

NelsonVides commented Aug 11, 2023 •

edited

Loading

This comment was marked as outdated.

codecov bot commented Aug 11, 2023 •

edited

Loading

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

mongoose-im commented Aug 14, 2023 •

edited

Loading

arcusfelis left a comment

arcusfelis left a comment

c2s/features optimisations #4094

c2s/features optimisations #4094

Conversation

NelsonVides commented Aug 11, 2023 • edited Loading

This comment was marked as outdated.

codecov bot commented Aug 11, 2023 • edited Loading

Codecov Report

This comment was marked as outdated.

This comment was marked as outdated.

This comment was marked as outdated.

mongoose-im commented Aug 14, 2023 • edited Loading

arcusfelis left a comment

Choose a reason for hiding this comment

arcusfelis left a comment

Choose a reason for hiding this comment

NelsonVides commented Aug 11, 2023 •

edited

Loading

codecov bot commented Aug 11, 2023 •

edited

Loading

mongoose-im commented Aug 14, 2023 •

edited

Loading