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

fix: delete sharding command #1469

Merged
merged 3 commits into from
May 9, 2023
Merged

fix: delete sharding command #1469

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7d97a58
delete_sharding_commod
chejinge May 9, 2023
e0ff0fe
delete_command
chejinge May 9, 2023
2138a54
delete_sharding_command
chejinge May 9, 2023
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
98 changes: 0 additions & 98 deletions include/pika_cluster.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,102 +45,4 @@ class PkClusterInfoCmd : public Cmd {
bool ParseInfoSlotSubCmd();
bool ParseInfoTableSubCmd();
};

class SlotParentCmd : public Cmd {
public:
SlotParentCmd(const std::string& name, int arity, uint16_t flag) : Cmd(name, arity, flag) {}

protected:
std::set<uint32_t> slots_;
std::set<PartitionInfo> p_infos_;
virtual void DoInitial();
virtual void Clear() {
slots_.clear();
p_infos_.clear();
table_name_.clear();
}
};

class PkClusterAddSlotsCmd : public SlotParentCmd {
public:
PkClusterAddSlotsCmd(const std::string& name, int arity, uint16_t flag) : SlotParentCmd(name, arity, flag) {}
virtual void Split(std::shared_ptr<Partition> partition, const HintKeys& hint_keys){};
virtual void Merge(){};
virtual Cmd* Clone() override { return new PkClusterAddSlotsCmd(*this); }
virtual void Do(std::shared_ptr<Partition> partition = nullptr);

private:
virtual void DoInitial() override;
Status AddSlotsSanityCheck();
};

class PkClusterDelSlotsCmd : public SlotParentCmd {
public:
PkClusterDelSlotsCmd(const std::string& name, int32_t arity, uint16_t flag) : SlotParentCmd(name, arity, flag) {}
virtual void Do(std::shared_ptr<Partition> partition = nullptr);
virtual void Split(std::shared_ptr<Partition> partition, const HintKeys& hint_keys){};
virtual void Merge(){};
virtual Cmd* Clone() override { return new PkClusterDelSlotsCmd(*this); }

private:
virtual void DoInitial() override;
Status RemoveSlotsSanityCheck();
};

class PkClusterSlotsSlaveofCmd : public Cmd {
public:
PkClusterSlotsSlaveofCmd(const std::string& name, int arity, uint16_t flag) : Cmd(name, arity, flag) {}
virtual void Do(std::shared_ptr<Partition> partition = nullptr);
virtual void Split(std::shared_ptr<Partition> partition, const HintKeys& hint_keys){};
virtual void Merge(){};
virtual Cmd* Clone() override { return new PkClusterSlotsSlaveofCmd(*this); }

private:
std::string ip_;
int64_t port_ = -1;
std::set<uint32_t> slots_;
bool force_sync_;
bool is_none_;
virtual void DoInitial() override;
virtual void Clear() {
ip_.clear();
port_ = 0;
slots_.clear();
force_sync_ = false;
is_none_ = false;
table_name_.clear();
}
};

class PkClusterAddTableCmd : public Cmd {
public:
PkClusterAddTableCmd(const std::string& name, int arity, uint16_t flag) : Cmd(name, arity, flag), slot_num_(0) {}
virtual void Split(std::shared_ptr<Partition> partition, const HintKeys& hint_keys){};
virtual void Merge(){};
Cmd* Clone() override { return new PkClusterAddTableCmd(*this); }
virtual void Do(std::shared_ptr<Partition> partition = nullptr);

private:
int64_t slot_num_ = 0;
void DoInitial() override;
Status AddTableSanityCheck();
void Clear() override {
slot_num_ = 0;
table_name_.clear();
}
};

class PkClusterDelTableCmd : public PkClusterDelSlotsCmd {
public:
PkClusterDelTableCmd(const std::string& name, int arity, uint16_t flag) : PkClusterDelSlotsCmd(name, arity, flag) {}
virtual void Split(std::shared_ptr<Partition> partition, const HintKeys& hint_keys){};
virtual void Merge(){};
Cmd* Clone() override { return new PkClusterDelTableCmd(*this); }
virtual void Do(std::shared_ptr<Partition> partition = nullptr);

private:
void DoInitial() override;
Status DelTableSanityCheck(const std::string& table_name);
};

#endif // PIKA_CLUSTER_H_
5 changes: 0 additions & 5 deletions include/pika_command.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,11 +210,6 @@ const std::string kCmdNameSlotsMgrtTagOne = "slotsmgrttagone";

// Cluster
const std::string kCmdNamePkClusterInfo = "pkclusterinfo";
const std::string kCmdNamePkClusterAddSlots = "pkclusteraddslots";
const std::string kCmdNamePkClusterDelSlots = "pkclusterdelslots";
const std::string kCmdNamePkClusterSlotsSlaveof = "pkclusterslotsslaveof";
const std::string kCmdNamePkClusterAddTable = "pkclusteraddtable";
const std::string kCmdNamePkClusterDelTable = "pkclusterdeltable";

const std::string kClusterPrefix = "pkcluster";
typedef net::RedisCmdArgsType PikaCmdArgsType;
Expand Down
Loading