Skip to content

Commit d1ceae7

Browse files
jengelhjengelh
committed
exmdb: rename {save,get}_change_indices EXRPCs
Substitute group -> index. References: GXL-624
1 parent 34a7c2b commit d1ceae7

File tree

10 files changed

+30
-30
lines changed

10 files changed

+30
-30
lines changed

‎doc/exmdb.html‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -761,7 +761,7 @@
761761
</tr>
762762
<tr>
763763
<td class="file">message.cpp:1134</td>
764-
<td class="func">get_change_indices</td>
764+
<td class="func">get_change_pgrp</td>
765765
<td class="yel">r</td>
766766
<td class="grn">x</td>
767767
<td class="grn">x</td>
@@ -911,7 +911,7 @@
911911
</tr>
912912
<tr>
913913
<td class="file">message.cpp:1088</td>
914-
<td class="func">save_change_indices</td>
914+
<td class="func">save_change_pgrp</td>
915915
<td class="red">w</td>
916916
<td class="grn">x</td>
917917
<td class="grn">x</td>

‎exch/emsmdb/common_util.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1482,7 +1482,7 @@ BOOL common_util_save_message_ics(logon_object *plogon,
14821482
ugrp_tags.emplace_back(tag);
14831483
}
14841484
}
1485-
return exmdb_client->save_change_indices(dir, message_id,
1485+
return exmdb_client->save_change_pgrp(dir, message_id,
14861486
change_num, groups, ugrp_tags);
14871487
} catch (const std::bad_alloc &) {
14881488
mlog(LV_ERR, "E-2904: ENOMEM");

‎exch/emsmdb/icsdownctx_object.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -913,7 +913,7 @@ static BOOL icsdownctx_object_write_message_change(icsdownctx_object *pctx,
913913
} else {
914914
if (!pctx->pstate->pseen->get_repl_first_max(1, &last_cn))
915915
return false;
916-
if (!exmdb_client->get_change_indices(dir,
916+
if (!exmdb_client->get_change_pgrp(dir,
917917
message_id, last_cn, &groups, &ugrp_tags))
918918
return FALSE;
919919
if (groups.empty() && ugrp_tags.empty()) {

‎exch/emsmdb/message_object.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -486,7 +486,7 @@ ec_error_t message_object::save() try
486486
if (!contains(groups, tmp_index))
487487
groups.emplace_back(tmp_index);
488488
}
489-
if (!exmdb_client->save_change_indices(dir, pmessage->message_id,
489+
if (!exmdb_client->save_change_pgrp(dir, pmessage->message_id,
490490
pmessage->change_num, groups, ugrp_tags))
491491
return ecRpcFailed;
492492
proptag_array_clear(pmessage->pchanged_proptags);
@@ -497,7 +497,7 @@ ec_error_t message_object::save() try
497497
SAVE_FULL_CHANGE:
498498
proptag_array_clear(pmessage->pchanged_proptags);
499499
proptag_array_clear(pmessage->premoved_proptags);
500-
if (!exmdb_client->save_change_indices(dir,
500+
if (!exmdb_client->save_change_pgrp(dir,
501501
pmessage->message_id, pmessage->change_num, {}, {}))
502502
return ecRpcFailed;
503503
/* trigger the rule evaluation under public mode

‎exch/exmdb/message.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1142,7 +1142,7 @@ BOOL exmdb_server::set_pgm_id(const char *dir, uint64_t message_id, uint32_t map
11421142
}
11431143

11441144
/* if count of indices and ungroup_proptags are both 0 means full change */
1145-
BOOL exmdb_server::save_change_indices(const char *dir, uint64_t message_id,
1145+
BOOL exmdb_server::save_change_pgrp(const char *dir, uint64_t message_id,
11461146
uint64_t cn, const std::vector<uint32_t> &groups,
11471147
const std::vector<proptag_t> &ugrp_tags) try
11481148
{
@@ -1187,7 +1187,7 @@ BOOL exmdb_server::save_change_indices(const char *dir, uint64_t message_id,
11871187
}
11881188

11891189
/* if count of indices and ungroup_proptags are both 0 means full change */
1190-
BOOL exmdb_server::get_change_indices(const char *dir, uint64_t message_id,
1190+
BOOL exmdb_server::get_change_pgrp(const char *dir, uint64_t message_id,
11911191
uint64_t cn, std::vector<uint32_t> *groups,
11921192
std::vector<gromox::proptag_t> *ugrp_tags)
11931193
{

‎exch/exmdb/names.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -105,8 +105,8 @@ static constexpr const char *exmdb_rpc_names[] = {
105105
E(mark_modified),
106106
E(get_pgm_id),
107107
E(set_pgm_id),
108-
E(save_change_indices),
109-
E(get_change_indices),
108+
E(save_change_pgrp),
109+
E(get_change_pgrp),
110110
E(try_mark_submit),
111111
E(clear_submit),
112112
E(link_message),

‎exch/zcore/message_object.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -394,7 +394,7 @@ ec_error_t message_object::save() try
394394
if (!contains(groups, tmp_index))
395395
groups.emplace_back(tmp_index);
396396
}
397-
if (!exmdb_client->save_change_indices(dir, pmessage->message_id,
397+
if (!exmdb_client->save_change_pgrp(dir, pmessage->message_id,
398398
pmessage->change_num, groups, ugrp_tags))
399399
return ecError;
400400
proptag_array_clear(pmessage->pchanged_proptags);
@@ -405,7 +405,7 @@ ec_error_t message_object::save() try
405405
SAVE_FULL_CHANGE:
406406
proptag_array_clear(pmessage->pchanged_proptags);
407407
proptag_array_clear(pmessage->premoved_proptags);
408-
if (!exmdb_client->save_change_indices(dir, pmessage->message_id,
408+
if (!exmdb_client->save_change_pgrp(dir, pmessage->message_id,
409409
pmessage->change_num, {}, {}))
410410
return ecError;
411411
/* trigger the rule evaluation under public mode

‎include/gromox/exmdb_idef.hpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -102,8 +102,8 @@ EXMIDL(allocate_message_id, (const char *dir, uint64_t folder_id, IDLOUT uint64_
102102
EXMIDL(allocate_cn, (const char *dir, IDLOUT uint64_t *cn))
103103
EXMIDL(get_pgm_id, (const char *dir, uint64_t message_id, IDLOUT uint32_t *map_id))
104104
EXMIDL(set_pgm_id, (const char *dir, uint64_t message_id, uint32_t map_id))
105-
EXMIDL(save_change_indices, (const char *dir, uint64_t message_id, uint64_t cn, const std::vector<uint32_t> &groups, const std::vector<gromox::proptag_t> &ugrp_tags))
106-
EXMIDL(get_change_indices, (const char *dir, uint64_t message_id, uint64_t cn, IDLOUT std::vector<uint32_t> *groups, std::vector<gromox::proptag_t> *ugrp_tags))
105+
EXMIDL(save_change_pgrp, (const char *dir, uint64_t message_id, uint64_t cn, const std::vector<uint32_t> &groups, const std::vector<gromox::proptag_t> &ugrp_tags))
106+
EXMIDL(get_change_pgrp, (const char *dir, uint64_t message_id, uint64_t cn, IDLOUT std::vector<uint32_t> *groups, std::vector<gromox::proptag_t> *ugrp_tags))
107107
EXMIDL(mark_modified, (const char *dir, uint64_t message_id))
108108
EXMIDL(try_mark_submit, (const char *dir, uint64_t message_id, IDLOUT BOOL *b_marked))
109109
EXMIDL(clear_submit, (const char *dir, uint64_t message_id, BOOL b_unsent))

‎include/gromox/exmdb_rpc.hpp‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,8 +122,8 @@ enum class exmdb_callid : uint8_t {
122122
mark_modified = 0x5d,
123123
get_pgm_id = 0x5e,
124124
set_pgm_id = 0x5f,
125-
save_change_indices = 0x60,
126-
get_change_indices = 0x61,
125+
save_change_pgrp = 0x60,
126+
get_change_pgrp = 0x61,
127127
try_mark_submit = 0x62,
128128
clear_submit = 0x63,
129129
link_message = 0x64,
@@ -689,14 +689,14 @@ struct exreq_set_pgm_id final : public exreq {
689689
uint32_t map_id = 0;
690690
};
691691

692-
struct exreq_save_change_indices final : public exreq {
692+
struct exreq_save_change_pgrp final : public exreq {
693693
uint64_t message_id;
694694
uint64_t cn;
695695
std::vector<uint32_t> groups;
696696
std::vector<gromox::proptag_t> ugrp_tags;
697697
};
698698

699-
struct exreq_get_change_indices final : public exreq {
699+
struct exreq_get_change_pgrp final : public exreq {
700700
uint64_t message_id;
701701
uint64_t cn;
702702
};
@@ -1249,7 +1249,7 @@ struct exresp_get_pgm_id final : public exresp {
12491249
uint32_t map_id = 0;
12501250
};
12511251

1252-
struct exresp_get_change_indices final : public exresp {
1252+
struct exresp_get_change_pgrp final : public exresp {
12531253
std::vector<uint32_t> groups;
12541254
std::vector<gromox::proptag_t> ugrp_tags;
12551255
};
@@ -1371,7 +1371,7 @@ using exresp_empty_message_instance_attachments = exresp;
13711371
using exresp_set_message_instance_conflict = exresp;
13721372
using exresp_remove_message_properties = exresp;
13731373
using exresp_set_pgm_id = exresp;
1374-
using exresp_save_change_indices = exresp;
1374+
using exresp_save_change_pgrp = exresp;
13751375
using exresp_remove_store_properties = exresp;
13761376
using exresp_mark_modified = exresp;
13771377
using exresp_clear_submit = exresp;

‎lib/exmdb_ext.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1592,29 +1592,29 @@ static pack_result exmdb_push(EXT_PUSH &x, const exreq_set_pgm_id &d)
15921592
return x.p_uint32(d.map_id);
15931593
}
15941594

1595-
static pack_result exmdb_pull(EXT_PULL &x, exreq_save_change_indices &d)
1595+
static pack_result exmdb_pull(EXT_PULL &x, exreq_save_change_pgrp &d)
15961596
{
15971597
TRY(x.g_uint64(&d.message_id));
15981598
TRY(x.g_uint64(&d.cn));
15991599
TRY(x.g_uint32_a(&d.groups));
16001600
return x.g_proptag_a(&d.ugrp_tags);
16011601
}
16021602

1603-
static pack_result exmdb_push(EXT_PUSH &x, const exreq_save_change_indices &d)
1603+
static pack_result exmdb_push(EXT_PUSH &x, const exreq_save_change_pgrp &d)
16041604
{
16051605
TRY(x.p_uint64(d.message_id));
16061606
TRY(x.p_uint64(d.cn));
16071607
TRY(x.p_uint32_a(d.groups));
16081608
return x.p_proptag_a(d.ugrp_tags);
16091609
}
16101610

1611-
static pack_result exmdb_pull(EXT_PULL &x, exreq_get_change_indices &d)
1611+
static pack_result exmdb_pull(EXT_PULL &x, exreq_get_change_pgrp &d)
16121612
{
16131613
TRY(x.g_uint64(&d.message_id));
16141614
return x.g_uint64(&d.cn);
16151615
}
16161616

1617-
static pack_result exmdb_push(EXT_PUSH &x, const exreq_get_change_indices &d)
1617+
static pack_result exmdb_push(EXT_PUSH &x, const exreq_get_change_pgrp &d)
16181618
{
16191619
TRY(x.p_uint64(d.message_id));
16201620
return x.p_uint64(d.cn);
@@ -2378,8 +2378,8 @@ static pack_result exmdb_push(EXT_PUSH &x, const exreq_set_maintenance &d)
23782378
E(allocate_message_id) \
23792379
E(get_pgm_id) \
23802380
E(set_pgm_id) \
2381-
E(save_change_indices) \
2382-
E(get_change_indices) \
2381+
E(save_change_pgrp) \
2382+
E(get_change_pgrp) \
23832383
E(mark_modified) \
23842384
E(try_mark_submit) \
23852385
E(clear_submit) \
@@ -3440,13 +3440,13 @@ static pack_result exmdb_push(EXT_PUSH &x, const exresp_get_pgm_id &d)
34403440
return x.p_uint32(d.map_id);
34413441
}
34423442

3443-
static pack_result exmdb_pull(EXT_PULL &x, exresp_get_change_indices &d)
3443+
static pack_result exmdb_pull(EXT_PULL &x, exresp_get_change_pgrp &d)
34443444
{
34453445
TRY(x.g_proptag_a(&d.groups));
34463446
return x.g_proptag_a(&d.ugrp_tags);
34473447
}
34483448

3449-
static pack_result exmdb_push(EXT_PUSH &x, const exresp_get_change_indices &d)
3449+
static pack_result exmdb_push(EXT_PUSH &x, const exresp_get_change_pgrp &d)
34503450
{
34513451
TRY(x.p_proptag_a(d.groups));
34523452
return x.p_proptag_a(d.ugrp_tags);
@@ -3734,7 +3734,7 @@ static pack_result exmdb_push(EXT_PUSH &x, const exresp_purge_softdelete &d)
37343734
E(set_message_instance_conflict) \
37353735
E(remove_message_properties) \
37363736
E(set_pgm_id) \
3737-
E(save_change_indices) \
3737+
E(save_change_pgrp) \
37383738
E(mark_modified) \
37393739
E(clear_submit) \
37403740
E(unlink_message) \
@@ -3838,7 +3838,7 @@ static pack_result exmdb_push(EXT_PUSH &x, const exresp_purge_softdelete &d)
38383838
E(allocate_message_id) \
38393839
E(allocate_cn) \
38403840
E(get_pgm_id) \
3841-
E(get_change_indices) \
3841+
E(get_change_pgrp) \
38423842
E(try_mark_submit) \
38433843
E(link_message) \
38443844
E(get_message_timer) \

0 commit comments

Comments
 (0)