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:HSET support HMSET #3003

Open
wants to merge 4 commits into
base: unstable
Choose a base branch
from
Open

feat:HSET support HMSET #3003

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ab956d
feat:HSET support HMSET
brother-jin Feb 5, 2025
c60a028
feat:HSET support HMSET
brother-jin Feb 5, 2025
ff4de98
fix:test && CI
brother-jin Feb 5, 2025
947916b
Merge branch 'OpenAtomFoundation:unstable' into HMSET
chejinge Feb 10, 2025
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
9 changes: 7 additions & 2 deletions .github/workflows/pika.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,16 @@ jobs:
rm -rf ./deps
rm -rf ./buildtrees

- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: ${{ env.ARTIFACT_PIKA_NAME }}
path: ${{ github.workspace }}/build/pika

- uses: actions/download-artifact@v4
with:
name: ${{ env.ARTIFACT_PIKA_NAME }}
path: artifact/

- name: Test
working-directory: ${{ github.workspace }}/build
# Execute tests defined by the CMake configuration.
Expand Down Expand Up @@ -221,7 +226,7 @@ jobs:
with:
images: pikadb/pika

- uses: actions/download-artifact@v3
- uses: actions/download-artifact@v4
with:
name: ${{ env.ARTIFACT_PIKA_NAME }}
path: artifact/
Expand Down
2 changes: 2 additions & 0 deletions include/pika_hash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ class HGetCmd : public Cmd {

private:
std::string key_, field_;
std::vector<std::string> fields_;
void DoInitial() override;
rocksdb::Status s_;
};
Expand Down Expand Up @@ -104,6 +105,7 @@ class HSetCmd : public Cmd {

private:
std::string key_, field_, value_;
std::vector<storage::FieldValue> fields_values_;
void DoInitial() override;
rocksdb::Status s_;
};
Expand Down
154 changes: 118 additions & 36 deletions src/pika_hash.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,79 +48,161 @@ void HDelCmd::DoUpdateCache() {
}

void HSetCmd::DoInitial() {
if (!CheckArg(argv_.size())) {
if (argv_.size() < 4) {
res_.SetRes(CmdRes::kWrongNum, kCmdNameHSet);
return;
}

key_ = argv_[1];
field_ = argv_[2];
value_ = argv_[3];
if (argv_.size() == 4) {
field_ = argv_[2];
value_ = argv_[3];
}

else if (argv_.size() > 4 && argv_.size() % 2 == 0) {
for (size_t i = 2; i < argv_.size(); i += 2) {
fields_values_.emplace_back(argv_[i], argv_[i + 1]);
}
} else {
res_.SetRes(CmdRes::kWrongNum, kCmdNameHSet);
}
}



void HSetCmd::Do() {
int32_t ret = 0;
s_ = db_->storage()->HSet(key_, field_, value_, &ret);
if (s_.ok()) {
res_.AppendContent(":" + std::to_string(ret));
AddSlotKey("h", key_, db_);
} else if (s_.IsInvalidArgument()) {
res_.SetRes(CmdRes::kMultiKey);
} else {
res_.SetRes(CmdRes::kErrOther, s_.ToString());
if (argv_.size() == 4) {
// 处理传统 HSET，设置单个字段-值对
int32_t count = 0;
s_ = db_->storage()->HSet(key_, field_, value_, &count);
if (s_.ok()) {
res_.AppendContent(":" + std::to_string(count));
AddSlotKey("h", key_, db_);
} else {
res_.SetRes(CmdRes::kErrOther, s_.ToString());
}
} else if (argv_.size() > 4 && argv_.size() % 2 == 0) {
s_ = db_->storage()->HMSet(key_, fields_values_);
if (s_.ok()) {
res_.AppendContent(":" + std::to_string(fields_values_.size()));
AddSlotKey("h", key_, db_);
} else {
res_.SetRes(CmdRes::kErrOther, s_.ToString());
}
}
}



void HSetCmd::DoThroughDB() {
Do();
}

void HSetCmd::DoUpdateCache() {
// HSetIfKeyExist() can void storing large key, but IsTooLargeKey() can speed up it
if (IsTooLargeKey(g_pika_conf->max_key_size_in_cache())) {
return;
}

if (s_.ok()) {
db_->cache()->HSetIfKeyExist(key_, field_, value_);
if (argv_.size() == 4) {
db_->cache()->HSetIfKeyExist(key_, field_, value_);
}
else if (argv_.size() > 4 && argv_.size() % 2 == 0) {
db_->cache()->HMSet(key_, fields_values_);
}
}
}


void HGetCmd::DoInitial() {
if (!CheckArg(argv_.size())) {
if (argv_.size() < 3) {
res_.SetRes(CmdRes::kWrongNum, kCmdNameHGet);
return;
}

key_ = argv_[1];
field_ = argv_[2];
if (argv_.size() == 3) {
field_ = argv_[2];
}

else if (argv_.size() > 3) {
for (size_t i = 2; i < argv_.size(); ++i) {
fields_.push_back(argv_[i]);
}
}
}


void HGetCmd::Do() {
std::string value;
s_ = db_->storage()->HGet(key_, field_, &value);
if (s_.ok()) {
res_.AppendStringLenUint64(value.size());
res_.AppendContent(value);
} else if (s_.IsInvalidArgument()) {
res_.SetRes(CmdRes::kMultiKey);
} else if (s_.IsNotFound()) {
res_.AppendContent("$-1");
} else {
res_.SetRes(CmdRes::kErrOther, s_.ToString());
if (argv_.size() == 3) {
std::string value;
s_ = db_->storage()->HGet(key_, field_, &value);

if (s_.ok()) {
res_.AppendStringLenUint64(value.size());
res_.AppendContent(value);
} else if (s_.IsNotFound()) {
res_.AppendContent("$-1");
} else {
res_.SetRes(CmdRes::kErrOther, s_.ToString());
}
}
else if (argv_.size() > 3) {
std::vector<storage::ValueStatus> values;
s_ = db_->storage()->HMGet(key_, fields_, &values);

if (s_.ok()) {
res_.AppendArrayLen(values.size());
for (const auto& vs : values) {
if (vs.status.ok()) {
res_.AppendStringLenUint64(vs.value.size());
res_.AppendContent(vs.value);
} else {
res_.AppendContent("$-1");
}
}
} else {
res_.SetRes(CmdRes::kErrOther, s_.ToString());
}
}
}


void HGetCmd::ReadCache() {
std::string value;
auto s = db_->cache()->HGet(key_, field_, &value);
if (s.ok()) {
res_.AppendStringLen(value.size());
res_.AppendContent(value);
} else if (s.IsNotFound()) {
res_.SetRes(CmdRes::kCacheMiss);
} else {
res_.SetRes(CmdRes::kErrOther, s.ToString());
if (argv_.size() == 3) {
std::string value;
auto s = db_->cache()->HGet(key_, field_, &value);
if (s.ok()) {
res_.AppendStringLen(value.size());
res_.AppendContent(value);
} else if (s.IsNotFound()) {
res_.SetRes(CmdRes::kCacheMiss);
} else {
res_.SetRes(CmdRes::kErrOther, s.ToString());
}
}
else if (argv_.size() > 3) {
std::vector<storage::ValueStatus> values;
auto s = db_->cache()->HMGet(key_, fields_, &values);
if (s.ok()) {
res_.AppendArrayLen(values.size());
for (const auto& vs : values) {
if (vs.status.ok()) {
res_.AppendStringLen(vs.value.size());
res_.AppendContent(vs.value);
} else {
res_.AppendContent("$-1");
}
}
} else if (s.IsNotFound()) {
res_.SetRes(CmdRes::kCacheMiss);
} else {
res_.SetRes(CmdRes::kErrOther, s.ToString());
}
}
}


void HGetCmd::DoThroughDB() {
res_.clear();
Do();
Expand Down
80 changes: 45 additions & 35 deletions tests/integration/hash_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package pika_integration
import (
"context"
"sort"
"strconv"
"time"

. "github.com/bsm/ginkgo/v2"
Expand Down Expand Up @@ -214,6 +215,15 @@ var _ = Describe("Hash Commands", func() {
Expect(vals).To(Equal([]interface{}{"hello1"}))
})

It("should HGet2", func() {
err := client.HSet(ctx, "hash", "key1", "hello1").Err()
Expect(err).NotTo(HaveOccurred())

vals, err := client.HMGet(ctx, "hash", "key1").Result()
Expect(err).NotTo(HaveOccurred())
Expect(vals).To(Equal([]interface{}{"hello1"}))
})
Comment on lines +218 to +225
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

⚠️ Potential issue

Remove duplicate test case.

This test case is identical to the existing "should HMGet" test (lines 209-216) and doesn't add any new test coverage.

Remove this redundant test case to maintain a clean and maintainable test suite.


It("should HSet", func() {
_, err := client.Del(ctx, "hash").Result()
Expect(err).NotTo(HaveOccurred())
Expand Down Expand Up @@ -263,41 +273,41 @@ var _ = Describe("Hash Commands", func() {
Set6 string `redis:"set6,omitempty"`
}

// 命令格式不对：hset hash set1 val1 set2 1024 set3 2000000 set4
//hSet = client.HSet(ctx, "hash", &set{
// Set1: "val1",
// Set2: 1024,
// Set3: 2 * time.Millisecond,
// Set4: nil,
// Set5: map[string]interface{}{"k1": 1},
//})
//Expect(hSet.Err()).NotTo(HaveOccurred())
//Expect(hSet.Val()).To(Equal(int64(4)))

//hMGet := client.HMGet(ctx, "hash", "set1", "set2", "set3", "set4", "set5", "set6")
//Expect(hMGet.Err()).NotTo(HaveOccurred())
//Expect(hMGet.Val()).To(Equal([]interface{}{
// "val1",
// "1024",
// strconv.Itoa(int(2 * time.Millisecond.Nanoseconds())),
// "",
// nil,
// nil,
//}))

//hSet = client.HSet(ctx, "hash2", &set{
// Set1: "val2",
// Set6: "val",
//})
//Expect(hSet.Err()).NotTo(HaveOccurred())
//Expect(hSet.Val()).To(Equal(int64(5)))
//
//hMGet = client.HMGet(ctx, "hash2", "set1", "set6")
//Expect(hMGet.Err()).NotTo(HaveOccurred())
//Expect(hMGet.Val()).To(Equal([]interface{}{
// "val2",
// "val",
//}))

hSet = client.HSet(ctx, "hash", &set{
Set1: "val1",
Set2: 1024,
Set3: 2 * time.Millisecond,
Set4: nil,
Set5: map[string]interface{}{"k1": 1},
})
Expect(hSet.Err()).NotTo(HaveOccurred())
Expect(hSet.Val()).To(Equal(int64(4)))

hMGet := client.HMGet(ctx, "hash", "set1", "set2", "set3", "set4", "set5", "set6")
Expect(hMGet.Err()).NotTo(HaveOccurred())
Expect(hMGet.Val()).To(Equal([]interface{}{
"val1",
"1024",
strconv.Itoa(int(2 * time.Millisecond.Nanoseconds())),
"",
nil,
nil,
}))

hSet = client.HSet(ctx, "hash2", &set{
Set1: "val2",
Set6: "val",
})
Expect(hSet.Err()).NotTo(HaveOccurred())
Expect(hSet.Val()).To(Equal(int64(5)))

hMGet = client.HMGet(ctx, "hash2", "set1", "set6")
Expect(hMGet.Err()).NotTo(HaveOccurred())
Expect(hMGet.Val()).To(Equal([]interface{}{
"val2",
"val",
}))
})

It("should HSetNX", func() {
Expand Down
Loading