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.

Sign up for GitHub

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

feat: reimplement cmds flushdb & flushall #205

Merged
merged 13 commits into from
May 6, 2024
Merged

feat: reimplement cmds flushdb & flushall #205

Changes from 11 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
b5ee802
handle conflicts
super-Pan66 Feb 21, 2024
ef8fcba
resolve conflict & use blackwindow interface
super-Pan66 Jan 12, 2024
317cfd0
code format
super-Pan66 Jan 12, 2024
97a562e
fix: revert a mistakenly deleted code
super-Pan66 Jan 12, 2024
082d9be
feat: reimplement cmd flushdb & flushall
super-Pan66 Mar 13, 2024
53f01ff
resolve conflicts
super-Pan66 Apr 28, 2024
e5eee15
style: rename variable
super-Pan66 Mar 21, 2024
3a1adcb
fix: use write lock interface
super-Pan66 Mar 23, 2024
22b56e7
style: code format
super-Pan66 Mar 23, 2024
5b531a3
resolve conflicts
super-Pan66 Apr 29, 2024
5b84c43
code format
super-Pan66 Apr 29, 2024
c0754ac
Merge branch 'unstable' into dev
AlexStocks May 6, 2024
603e4c0
Update cmd_admin.cc
AlexStocks May 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
84 changes: 63 additions & 21 deletions src/cmd_admin.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,9 @@
*/

#include "cmd_admin.h"
#include "db.h"
#include "pikiwidb.h"
#include "pstd/env.h"
#include "store.h"

namespace pikiwidb {
Expand Down Expand Up @@ -43,38 +45,78 @@ void CmdConfigSet::DoCmd(PClient* client) {
}

FlushdbCmd::FlushdbCmd(const std::string& name, int16_t arity)
: BaseCmd(name, arity, kCmdFlagsAdmin | kCmdFlagsWrite, kAclCategoryWrite | kAclCategoryAdmin) {}
: BaseCmd(name, arity, kCmdFlagsExclusive | kCmdFlagsAdmin | kCmdFlagsWrite,
kAclCategoryWrite | kAclCategoryAdmin) {}

bool FlushdbCmd::DoInitial(PClient* client) { return true; }

void FlushdbCmd::DoCmd(PClient* client) {
// PSTORE.dirty_ += PSTORE.DBSize();
// PSTORE.ClearCurrentDB();
// Propagate(PSTORE.GetDB(), std::vector<PString>{"flushdb"});
client->AppendString("flushdb cmd in development");
int currentDBIndex = client->GetCurrentDB();
PSTORE.GetBackend(currentDBIndex).get()->Lock();
PSTORE.GetBackend(currentDBIndex)->GetStorage().reset();

std::string db_path = g_config.db_path.ToString() + std::to_string(currentDBIndex);
std::string path_temp = db_path;
path_temp.append("_deleting/");
pstd::RenameFile(db_path, path_temp);

PSTORE.GetBackend(currentDBIndex)->GetStorage() = std::make_unique<storage::Storage>();
storage::StorageOptions storage_options;
storage_options.options = g_config.GetRocksDBOptions();
auto cap = storage_options.db_instance_num * kColumnNum * storage_options.options.write_buffer_size *
storage_options.options.max_write_buffer_number;
storage_options.options.write_buffer_manager = std::make_shared<rocksdb::WriteBufferManager>(cap);

storage_options.table_options = g_config.GetRocksDBBlockBasedTableOptions();

storage_options.small_compaction_threshold = g_config.small_compaction_threshold.load();
storage_options.small_compaction_duration_threshold = g_config.small_compaction_duration_threshold.load();
storage_options.db_instance_num = g_config.db_instance_num;
storage_options.db_id = currentDBIndex;

storage::Status s = PSTORE.GetBackend(currentDBIndex)->GetStorage()->Open(storage_options, db_path.data());
assert(s.ok());
pstd::DeleteDir(path_temp);
PSTORE.GetBackend(currentDBIndex).get()->UnLock();
client->SetRes(CmdRes::kOK);
}

FlushallCmd::FlushallCmd(const std::string& name, int16_t arity)
: BaseCmd(name, arity, kCmdFlagsAdmin | kCmdFlagsWrite, kAclCategoryWrite | kAclCategoryAdmin) {}
: BaseCmd(name, arity, kCmdFlagsExclusive | kCmdFlagsAdmin | kCmdFlagsWrite,
kAclCategoryWrite | kAclCategoryAdmin) {}

bool FlushallCmd::DoInitial(PClient* client) { return true; }

void FlushallCmd::DoCmd(PClient* client) {
// int currentDB = PSTORE.GetDB();
// std::vector<PString> param{"flushall"};
// DEFER {
// PSTORE.SelectDB(currentDB);
// Propagate(-1, param);
// PSTORE.ResetDB();
// };
//
// for (int dbno = 0; true; ++dbno) {
// if (PSTORE.SelectDB(dbno) == -1) {
// break;
// }
// PSTORE.dirty_ += PSTORE.DBSize();
// }
client->AppendString("flushall' cmd in development");
for (size_t i = 0; i < g_config.databases; ++i) {
PSTORE.GetBackend(i).get()->Lock();
PSTORE.GetBackend(i)->GetStorage().reset();

std::string db_path = g_config.db_path.ToString() + std::to_string(i);
std::string path_temp = db_path;
path_temp.append("_deleting/");
pstd::RenameFile(db_path, path_temp);

PSTORE.GetBackend(i)->GetStorage() = std::make_unique<storage::Storage>();
storage::StorageOptions storage_options;
storage_options.options = g_config.GetRocksDBOptions();
auto cap = storage_options.db_instance_num * kColumnNum * storage_options.options.write_buffer_size *
storage_options.options.max_write_buffer_number;
storage_options.options.write_buffer_manager = std::make_shared<rocksdb::WriteBufferManager>(cap);

storage_options.table_options = g_config.GetRocksDBBlockBasedTableOptions();

storage_options.small_compaction_threshold = g_config.small_compaction_threshold.load();
storage_options.small_compaction_duration_threshold = g_config.small_compaction_duration_threshold.load();
storage_options.db_instance_num = g_config.db_instance_num;
storage_options.db_id = static_cast<int>(i);

storage::Status s = PSTORE.GetBackend(i)->GetStorage()->Open(storage_options, db_path.data());
assert(s.ok());
pstd::DeleteDir(path_temp);
PSTORE.GetBackend(i).get()->UnLock();
}
client->SetRes(CmdRes::kOK);
}

SelectCmd::SelectCmd(const std::string& name, int16_t arity)
Expand Down
Loading