mirrors/dragonfly
1
0
Fork 0
mirror of https://github.com/dragonflydb/dragonfly.git synced 2025-05-11 18:35:46 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

Some bug fixes.

Browse source 
closes #19 and closes #20.
This commit is contained in:
Roman Gershman 2022-04-08 06:53:22 +03:00
parent 5ef63f41d2
commit 49781e8daf
3 changed files with 13 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/server/dragonfly_test.cc
View file

@ -114,6 +114,10 @@ TEST_F(DflyEngineTest, MultiEmpty) {
ASSERT_THAT(resp[0], ArrLen(0)); ASSERT_THAT(resp[0], ArrLen(0));
ASSERT_FALSE(service_->IsShardSetLocked()); ASSERT_FALSE(service_->IsShardSetLocked());
Run({"multi"});
ASSERT_THAT(Run({"ping", "foo"}), RespEq("QUEUED"));
EXPECT_THAT(Run({"exec"}), ElementsAre("foo"));
} }
TEST_F(DflyEngineTest, MultiSeq) { TEST_F(DflyEngineTest, MultiSeq) {
@ -178,6 +182,12 @@ TEST_F(DflyEngineTest, MultiConsistent) {
ASSERT_FALSE(service_->IsShardSetLocked()); ASSERT_FALSE(service_->IsShardSetLocked());
} }
TEST_F(DflyEngineTest, MultiWeirdCommands) {
Run({"multi"});
ASSERT_THAT(Run({"eval", "return 42", "0"}), RespEq("QUEUED"));
EXPECT_THAT(Run({"exec"}), ElementsAre(IntArg(42)));
}
TEST_F(DflyEngineTest, MultiRename) { TEST_F(DflyEngineTest, MultiRename) {
RespVec resp = Run({"multi"}); RespVec resp = Run({"multi"});
ASSERT_THAT(resp, RespEq("OK")); ASSERT_THAT(resp, RespEq("OK"));

2
src/server/main_service.cc
View file

@ -853,7 +853,9 @@ void Service::Exec(CmdArgList args, ConnectionContext* cntx) {
cntx->transaction->SetExecCmd(scmd.descr); cntx->transaction->SetExecCmd(scmd.descr);
CmdArgList cmd_arg_list{str_list.data(), str_list.size()}; CmdArgList cmd_arg_list{str_list.data(), str_list.size()};
if (IsTransactional(scmd.descr)) {
cntx->transaction->InitByArgs(cntx->conn_state.db_index, cmd_arg_list); cntx->transaction->InitByArgs(cntx->conn_state.db_index, cmd_arg_list);
}
scmd.descr->Invoke(cmd_arg_list, cntx); scmd.descr->Invoke(cmd_arg_list, cntx);
if (rb->GetError()) if (rb->GetError())
break; break;

1
src/server/transaction.cc
View file

@ -975,7 +975,6 @@ bool Transaction::CancelInShard(EngineShard* shard) {
// runs in engine-shard thread. // runs in engine-shard thread.
ArgSlice Transaction::ShardArgsInShard(ShardId sid) const { ArgSlice Transaction::ShardArgsInShard(ShardId sid) const {
DCHECK(!args_.empty()); DCHECK(!args_.empty());
DCHECK_NOTNULL(EngineShard::tlocal());
// We can read unique_shard_cnt_ only because ShardArgsInShard is called after IsArmedInShard // We can read unique_shard_cnt_ only because ShardArgsInShard is called after IsArmedInShard
// barrier. // barrier.