Skip to content

Commit e44423e

Browse files
romangeromange
committed
chore: reduce boilerplate by removing redundant function declarations
Signed-off-by: Roman Gershman <[email protected]>
1 parent 697b442 commit e44423e

File tree

4 files changed

+78
-141
lines changed

4 files changed

+78
-141
lines changed

‎src/server/string_family.cc‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ class SetCmd {
112112
bool explicit_journal_; // call RecordJournal (auto journaling disabled)
113113
};
114114

115-
size_t SetRange(std::string* value, size_t start, std::string_view range) {
115+
size_t SetRangeInternal(std::string* value, size_t start, std::string_view range) {
116116
value->resize(max(value->size(), start + range.size()));
117117
memcpy(value->data() + start, range.data(), range.size());
118118
return value->size();
@@ -157,15 +157,15 @@ OpResult<TResultOrT<size_t>> OpSetRange(const OpArgs& op_args, string_view key,
157157
return {op_args.shard->tiered_storage()->Modify<size_t>(
158158
op_args.db_cntx.db_index, key, res.it->second,
159159
[start = start, range = string(range)](std::string* s) {
160-
return SetRange(s, start, range);
160+
return SetRangeInternal(s, start, range);
161161
})};
162162
} else {
163163
string value;
164164

165165
if (!res.is_new)
166166
value = res.it->second.ToString();
167167

168-
size_t len = SetRange(&value, start, range);
168+
size_t len = SetRangeInternal(&value, start, range);
169169
res.it->second.SetValue(value);
170170
return {len};
171171
}
@@ -984,7 +984,7 @@ OpStatus SetCmd::CachePrevIfNeeded(const SetCmd::SetParams& params, DbSlice::Ite
984984
return OpStatus::OK;
985985
}
986986

987-
void StringFamily::Set(CmdArgList args, const CommandContext& cmnd_cntx) {
987+
void CmdSet(CmdArgList args, const CommandContext& cmnd_cntx) {
988988
facade::CmdArgParser parser{args};
989989

990990
auto [key, value] = parser.Next<string_view, string_view>();
@@ -1092,7 +1092,7 @@ void StringFamily::Set(CmdArgList args, const CommandContext& cmnd_cntx) {
10921092
}
10931093

10941094
/// (P)SETEX key seconds (milliseconds) value
1095-
void StringFamily::SetExGeneric(CmdArgList args, const CommandContext& cmd_cntx) {
1095+
void CmdSetExGeneric(CmdArgList args, const CommandContext& cmd_cntx) {
10961096
string_view cmd_name = cmd_cntx.cid->name();
10971097

10981098
CmdArgParser parser{args};
@@ -1122,7 +1122,7 @@ void StringFamily::SetExGeneric(CmdArgList args, const CommandContext& cmd_cntx)
11221122
builder->SendError(SetGeneric(sparams, key, value, cmd_cntx));
11231123
}
11241124

1125-
void StringFamily::SetNx(CmdArgList args, const CommandContext& cmnd_cntx) {
1125+
void CmdSetNx(CmdArgList args, const CommandContext& cmnd_cntx) {
11261126
string_view key = ArgS(args, 0);
11271127
string_view value = ArgS(args, 1);
11281128

@@ -1142,7 +1142,7 @@ void StringFamily::SetNx(CmdArgList args, const CommandContext& cmnd_cntx) {
11421142
}
11431143
}
11441144

1145-
void StringFamily::Get(CmdArgList args, const CommandContext& cmnd_cntx) {
1145+
void CmdGet(CmdArgList args, const CommandContext& cmnd_cntx) {
11461146
auto cb = [key = ArgS(args, 0)](Transaction* tx, EngineShard* es) -> OpResult<StringResult> {
11471147
auto it_res = tx->GetDbSlice(es->shard_id()).FindReadOnly(tx->GetDbContext(), key, OBJ_STRING);
11481148
if (!it_res.ok())
@@ -1154,7 +1154,7 @@ void StringFamily::Get(CmdArgList args, const CommandContext& cmnd_cntx) {
11541154
GetReplies{cmnd_cntx.rb}.Send(cmnd_cntx.tx->ScheduleSingleHopT(cb));
11551155
}
11561156

1157-
void StringFamily::GetDel(CmdArgList args, const CommandContext& cmnd_cntx) {
1157+
void CmdGetDel(CmdArgList args, const CommandContext& cmnd_cntx) {
11581158
auto cb = [key = ArgS(args, 0)](Transaction* tx, EngineShard* es) -> OpResult<StringResult> {
11591159
auto& db_slice = tx->GetDbSlice(es->shard_id());
11601160
auto it_res = db_slice.FindMutable(tx->GetDbContext(), key, OBJ_STRING);
@@ -1169,7 +1169,7 @@ void StringFamily::GetDel(CmdArgList args, const CommandContext& cmnd_cntx) {
11691169
GetReplies{cmnd_cntx.rb}.Send(cmnd_cntx.tx->ScheduleSingleHopT(cb));
11701170
}
11711171

1172-
void StringFamily::GetSet(CmdArgList args, const CommandContext& cmnd_cntx) {
1172+
void CmdGetSet(CmdArgList args, const CommandContext& cmnd_cntx) {
11731173
string_view key = ArgS(args, 0);
11741174
string_view value = ArgS(args, 1);
11751175

@@ -1182,15 +1182,15 @@ void StringFamily::GetSet(CmdArgList args, const CommandContext& cmnd_cntx) {
11821182
GetReplies{cmnd_cntx.rb}.Send(std::move(prev));
11831183
}
11841184

1185-
void StringFamily::Append(CmdArgList args, const CommandContext& cmnd_cntx) {
1185+
void CmdAppend(CmdArgList args, const CommandContext& cmnd_cntx) {
11861186
ExtendGeneric(args, false, cmnd_cntx.tx, cmnd_cntx.rb);
11871187
}
11881188

1189-
void StringFamily::Prepend(CmdArgList args, const CommandContext& cmnd_cntx) {
1189+
void CmdPrepend(CmdArgList args, const CommandContext& cmnd_cntx) {
11901190
ExtendGeneric(args, true, cmnd_cntx.tx, cmnd_cntx.rb);
11911191
}
11921192

1193-
void StringFamily::GetEx(CmdArgList args, const CommandContext& cmnd_cntx) {
1193+
void CmdGetEx(CmdArgList args, const CommandContext& cmnd_cntx) {
11941194
CmdArgParser parser{args};
11951195
string_view key = parser.Next();
11961196

@@ -1258,12 +1258,12 @@ void StringFamily::GetEx(CmdArgList args, const CommandContext& cmnd_cntx) {
12581258
GetReplies{cmnd_cntx.rb}.Send(cmnd_cntx.tx->ScheduleSingleHopT(cb));
12591259
}
12601260

1261-
void StringFamily::Incr(CmdArgList args, const CommandContext& cmnd_cntx) {
1261+
void CmdIncr(CmdArgList args, const CommandContext& cmnd_cntx) {
12621262
string_view key = ArgS(args, 0);
12631263
return IncrByGeneric(key, 1, cmnd_cntx.tx, cmnd_cntx.rb);
12641264
}
12651265

1266-
void StringFamily::IncrBy(CmdArgList args, const CommandContext& cmnd_cntx) {
1266+
void CmdIncrBy(CmdArgList args, const CommandContext& cmnd_cntx) {
12671267
string_view key = ArgS(args, 0);
12681268
string_view sval = ArgS(args, 1);
12691269
int64_t val;
@@ -1274,7 +1274,7 @@ void StringFamily::IncrBy(CmdArgList args, const CommandContext& cmnd_cntx) {
12741274
return IncrByGeneric(key, val, cmnd_cntx.tx, cmnd_cntx.rb);
12751275
}
12761276

1277-
void StringFamily::IncrByFloat(CmdArgList args, const CommandContext& cmnd_cntx) {
1277+
void CmdIncrByFloat(CmdArgList args, const CommandContext& cmnd_cntx) {
12781278
string_view key = ArgS(args, 0);
12791279
string_view sval = ArgS(args, 1);
12801280
double val;
@@ -1298,12 +1298,12 @@ void StringFamily::IncrByFloat(CmdArgList args, const CommandContext& cmnd_cntx)
12981298
rb->SendDouble(result.value());
12991299
}
13001300

1301-
void StringFamily::Decr(CmdArgList args, const CommandContext& cmnd_cntx) {
1301+
void CmdDecr(CmdArgList args, const CommandContext& cmnd_cntx) {
13021302
string_view key = ArgS(args, 0);
13031303
return IncrByGeneric(key, -1, cmnd_cntx.tx, cmnd_cntx.rb);
13041304
}
13051305

1306-
void StringFamily::DecrBy(CmdArgList args, const CommandContext& cmnd_cntx) {
1306+
void CmdDecrBy(CmdArgList args, const CommandContext& cmnd_cntx) {
13071307
string_view key = ArgS(args, 0);
13081308
string_view sval = ArgS(args, 1);
13091309
int64_t val;
@@ -1340,7 +1340,7 @@ void ReorderShardResults(absl::Span<MGetResponse> mget_resp, const Transaction*
13401340
}
13411341
}
13421342

1343-
void StringFamily::MGet(CmdArgList args, const CommandContext& cmnd_cntx) {
1343+
void CmdMGet(CmdArgList args, const CommandContext& cmnd_cntx) {
13441344
DCHECK_GE(args.size(), 1U);
13451345

13461346
uint8_t fetch_mask = 0;
@@ -1398,7 +1398,7 @@ void StringFamily::MGet(CmdArgList args, const CommandContext& cmnd_cntx) {
13981398
}
13991399
}
14001400

1401-
void StringFamily::MSet(CmdArgList args, const CommandContext& cmnd_cntx) {
1401+
void CmdMSet(CmdArgList args, const CommandContext& cmnd_cntx) {
14021402
if (VLOG_IS_ON(2)) {
14031403
string str;
14041404
for (size_t i = 1; i < args.size(); ++i) {
@@ -1425,7 +1425,7 @@ void StringFamily::MSet(CmdArgList args, const CommandContext& cmnd_cntx) {
14251425
}
14261426
}
14271427

1428-
void StringFamily::MSetNx(CmdArgList args, const CommandContext& cmnd_cntx) {
1428+
void CmdMSetNx(CmdArgList args, const CommandContext& cmnd_cntx) {
14291429
atomic_bool exists{false};
14301430

14311431
auto cb = [&](Transaction* t, EngineShard* es) {
@@ -1462,14 +1462,14 @@ void StringFamily::MSetNx(CmdArgList args, const CommandContext& cmnd_cntx) {
14621462
cmnd_cntx.rb->SendLong(to_skip || (*result != OpStatus::OK) ? 0 : 1);
14631463
}
14641464

1465-
void StringFamily::StrLen(CmdArgList args, const CommandContext& cmnd_cntx) {
1465+
void CmdStrLen(CmdArgList args, const CommandContext& cmnd_cntx) {
14661466
auto cb = [key = ArgS(args, 0)](Transaction* t, EngineShard* shard) {
14671467
return OpStrLen(t->GetOpArgs(shard), key);
14681468
};
14691469
GetReplies{cmnd_cntx.rb}.Send(cmnd_cntx.tx->ScheduleSingleHopT(cb));
14701470
}
14711471

1472-
void StringFamily::GetRange(CmdArgList args, const CommandContext& cmnd_cntx) {
1472+
void CmdGetRange(CmdArgList args, const CommandContext& cmnd_cntx) {
14731473
CmdArgParser parser(args);
14741474
auto [key, start, end] = parser.Next<string_view, int32_t, int32_t>();
14751475

@@ -1484,7 +1484,7 @@ void StringFamily::GetRange(CmdArgList args, const CommandContext& cmnd_cntx) {
14841484
GetReplies{cmnd_cntx.rb}.Send(cmnd_cntx.tx->ScheduleSingleHopT(cb));
14851485
}
14861486

1487-
void StringFamily::SetRange(CmdArgList args, const CommandContext& cmnd_cntx) {
1487+
void CmdSetRange(CmdArgList args, const CommandContext& cmnd_cntx) {
14881488
CmdArgParser parser(args);
14891489
auto [key, start, value] = parser.Next<string_view, int32_t, string_view>();
14901490
auto* builder = cmnd_cntx.rb;
@@ -1520,7 +1520,7 @@ void StringFamily::SetRange(CmdArgList args, const CommandContext& cmnd_cntx) {
15201520
* 5. The number of seconds until the limit will reset to its maximum capacity.
15211521
* Equivalent to X-RateLimit-Reset.
15221522
*/
1523-
void StringFamily::ClThrottle(CmdArgList args, const CommandContext& cmnd_cntx) {
1523+
void CmdClThrottle(CmdArgList args, const CommandContext& cmnd_cntx) {
15241524
constexpr uint64_t kSecondToNanoSecond = 1000000000;
15251525
const string_view key = ArgS(args, 0);
15261526

@@ -1627,7 +1627,7 @@ void StringFamily::ClThrottle(CmdArgList args, const CommandContext& cmnd_cntx)
16271627

16281628
// Implements the memcache GAT command. The expected input is
16291629
// GAT <expiry-in-seconds> key [keys...]
1630-
void StringFamily::GAT(CmdArgList args, const CommandContext& cmnd_cntx) {
1630+
void CmdGAT(CmdArgList args, const CommandContext& cmnd_cntx) {
16311631
DCHECK_GE(args.size(), 1U);
16321632

16331633
auto* builder = cmnd_cntx.rb;
@@ -1680,7 +1680,7 @@ void StringFamily::GAT(CmdArgList args, const CommandContext& cmnd_cntx) {
16801680
rb->SendGetEnd();
16811681
}
16821682

1683-
#define HFUNC(x) SetHandler(&StringFamily::x)
1683+
#define HFUNC(x) SetHandler(&Cmd##x)
16841684

16851685
void StringFamily::Register(CommandRegistry* registry) {
16861686
constexpr uint32_t kMSetMask =

‎src/server/string_family.h‎

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -18,35 +18,6 @@ class CommandRegistry;
1818
class StringFamily {
1919
public:
2020
static void Register(CommandRegistry* registry);
21-
22-
private:
23-
using SinkReplyBuilder = facade::SinkReplyBuilder;
24-
using CmdArgList = facade::CmdArgList;
25-
26-
static void Append(CmdArgList args, const CommandContext& cmnd_cntx);
27-
static void Decr(CmdArgList args, const CommandContext& cmnd_cntx);
28-
static void DecrBy(CmdArgList args, const CommandContext& cmnd_cntx);
29-
static void Get(CmdArgList args, const CommandContext& cmnd_cntx);
30-
static void GetDel(CmdArgList args, const CommandContext& cmnd_cntx);
31-
static void GetRange(CmdArgList args, const CommandContext& cmnd_cntx);
32-
static void GetSet(CmdArgList args, const CommandContext& cmnd_cntx);
33-
static void GetEx(CmdArgList args, const CommandContext& cmnd_cntx);
34-
static void Incr(CmdArgList args, const CommandContext& cmnd_cntx);
35-
static void IncrBy(CmdArgList args, const CommandContext& cmnd_cntx);
36-
static void IncrByFloat(CmdArgList args, const CommandContext& cmnd_cntx);
37-
static void MGet(CmdArgList args, const CommandContext& cmnd_cntx);
38-
static void MSet(CmdArgList args, const CommandContext& cmnd_cntx);
39-
static void MSetNx(CmdArgList args, const CommandContext& cmnd_cntx);
40-
41-
static void Set(CmdArgList args, const CommandContext& cmnd_cntx);
42-
static void SetNx(CmdArgList args, const CommandContext& cmnd_cntx);
43-
static void SetRange(CmdArgList args, const CommandContext& cmnd_cntx);
44-
static void SetExGeneric(CmdArgList args, const CommandContext& cmnd_cntx);
45-
static void StrLen(CmdArgList args, const CommandContext& cmnd_cntx);
46-
static void Prepend(CmdArgList args, const CommandContext& cmnd_cntx);
47-
48-
static void ClThrottle(CmdArgList args, const CommandContext& cmnd_cntx);
49-
static void GAT(CmdArgList args, const CommandContext& cmnd_cntx);
5021
};
5122

5223
} // namespace dfly

0 commit comments

Comments
 (0)