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.

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

Go: Add ZDiffStore command #3034

Merged
merged 4 commits into from
Feb 3, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
40 changes: 40 additions & 0 deletions go/api/base_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -7265,3 +7265,43 @@ func (client *baseClient) ZDiffWithScores(keys []string) (map[string]float64, er
}
return handleStringDoubleMapResponse(result)
}

// Calculates the difference between the first sorted set and all the successive sorted sets at
// `keys` and stores the difference as a sorted set to `destination`,
// overwriting it if it already exists. Non-existent keys are treated as empty sets.
//
// Note: When in cluster mode, `destination` and all `keys` must map to the same hash slot.
//
// Available for Valkey 6.2 and above.
//
// See [valkey.io] for details.
//
// Parameters:
//
// destination - The key for the resulting sorted set.
// keys - The keys of the sorted sets to compare.
//
// Return value:
//
// The number of members in the resulting sorted set stored at `destination`.
//
// Example:
//
// membersScores1 := map[string]float64{"one": 1.0, "two": 2.0, "three": 3.0}
// membersScores2 := map[string]float64{"two": 2.0}
// zAddResult1, err := client.ZAdd("key1", membersScores1)
// zAddResult2, err := client.ZAdd("key2", membersScores2)
// zDiffStoreResult, err := client.ZDiffStore("key4", []string{"key1", "key2"})
// fmt.Println(zDiffStoreResult) // Output: 2
//
// [valkey.io]: https://valkey.io/commands/zdiffstore/
func (client *baseClient) ZDiffStore(destination string, keys []string) (int64, error) {
result, err := client.executeCommand(
C.ZDiffStore,
append([]string{destination, strconv.Itoa(len(keys))}, keys...),
)
if err != nil {
return defaultIntResponse, err
}
return handleIntResponse(result)
}
2 changes: 2 additions & 0 deletions go/api/sorted_set_commands.go
Original file line number Diff line number Diff line change
Expand Up @@ -86,4 +86,6 @@ type SortedSetCommands interface {
ZInter(keys options.KeyArray) ([]string, error)

ZInterWithScores(options *options.ZInterOptions) (map[string]float64, error)

ZDiffStore(destination string, keys []string) (int64, error)
}
216 changes: 146 additions & 70 deletions go/integTest/shared_commands_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7807,76 +7807,6 @@ func (suite *GlideTestSuite) TestBitFieldRO_MultipleGets() {
})
}

func (suite *GlideTestSuite) TestZDiff() {
suite.runWithDefaultClients(func(client api.BaseClient) {
suite.SkipIfServerVersionLowerThanBy("6.2.0")
t := suite.T()
key1 := "{testKey}:1-" + uuid.NewString()
key2 := "{testKey}:2-" + uuid.NewString()
key3 := "{testKey}:3-" + uuid.NewString()
nonExistentKey := "{testKey}:4-" + uuid.NewString()

membersScores1 := map[string]float64{
"one": 1.0,
"two": 2.0,
"three": 3.0,
}

membersScores2 := map[string]float64{
"two": 2.0,
}

membersScores3 := map[string]float64{
"one": 1.0,
"two": 2.0,
"three": 3.0,
"four": 4.0,
}

zAddResult1, err := client.ZAdd(key1, membersScores1)
assert.NoError(t, err)
assert.Equal(t, int64(3), zAddResult1)
zAddResult2, err := client.ZAdd(key2, membersScores2)
assert.NoError(t, err)
assert.Equal(t, int64(1), zAddResult2)
zAddResult3, err := client.ZAdd(key3, membersScores3)
assert.NoError(t, err)
assert.Equal(t, int64(4), zAddResult3)

zDiffResult, err := client.ZDiff([]string{key1, key2})
assert.NoError(t, err)
assert.Equal(t, []string{"one", "three"}, zDiffResult)
zDiffResult, err = client.ZDiff([]string{key1, key3})
assert.NoError(t, err)
assert.Equal(t, []string{}, zDiffResult)
zDiffResult, err = client.ZDiff([]string{nonExistentKey, key3})
assert.NoError(t, err)
assert.Equal(t, []string{}, zDiffResult)

zDiffResultWithScores, err := client.ZDiffWithScores([]string{key1, key2})
assert.NoError(t, err)
assert.Equal(t, map[string]float64{"one": 1.0, "three": 3.0}, zDiffResultWithScores)
zDiffResultWithScores, err = client.ZDiffWithScores([]string{key1, key3})
assert.NoError(t, err)
assert.Equal(t, map[string]float64{}, zDiffResultWithScores)
zDiffResultWithScores, err = client.ZDiffWithScores([]string{nonExistentKey, key3})
assert.NoError(t, err)
assert.Equal(t, map[string]float64{}, zDiffResultWithScores)

// Key exists, but it is not a set
setResult, _ := client.Set(nonExistentKey, "bar")
assert.Equal(t, setResult, "OK")

_, err = client.ZDiff([]string{nonExistentKey, key2})
assert.NotNil(t, err)
assert.IsType(t, &errors.RequestError{}, err)

_, err = client.ZDiffWithScores([]string{nonExistentKey, key2})
assert.NotNil(t, err)
assert.IsType(t, &errors.RequestError{}, err)
})
}

func (suite *GlideTestSuite) TestZInter() {
suite.SkipIfServerVersionLowerThanBy("6.2.0")
suite.runWithDefaultClients(func(client api.BaseClient) {
Expand Down Expand Up @@ -7975,3 +7905,149 @@ func (suite *GlideTestSuite) TestZInter() {
assert.IsType(suite.T(), &errors.RequestError{}, err)
})
}

func (suite *GlideTestSuite) TestZDiff() {
suite.runWithDefaultClients(func(client api.BaseClient) {
suite.SkipIfServerVersionLowerThanBy("6.2.0")
t := suite.T()
key1 := "{testKey}:1-" + uuid.NewString()
key2 := "{testKey}:2-" + uuid.NewString()
key3 := "{testKey}:3-" + uuid.NewString()
nonExistentKey := "{testKey}:4-" + uuid.NewString()

membersScores1 := map[string]float64{
"one": 1.0,
"two": 2.0,
"three": 3.0,
}

membersScores2 := map[string]float64{
"two": 2.0,
}

membersScores3 := map[string]float64{
"one": 1.0,
"two": 2.0,
"three": 3.0,
"four": 4.0,
}

zAddResult1, err := client.ZAdd(key1, membersScores1)
assert.NoError(t, err)
assert.Equal(t, int64(3), zAddResult1)
zAddResult2, err := client.ZAdd(key2, membersScores2)
assert.NoError(t, err)
assert.Equal(t, int64(1), zAddResult2)
zAddResult3, err := client.ZAdd(key3, membersScores3)
assert.NoError(t, err)
assert.Equal(t, int64(4), zAddResult3)

zDiffResult, err := client.ZDiff([]string{key1, key2})
assert.NoError(t, err)
assert.Equal(t, []string{"one", "three"}, zDiffResult)
zDiffResult, err = client.ZDiff([]string{key1, key3})
assert.NoError(t, err)
assert.Equal(t, []string{}, zDiffResult)
zDiffResult, err = client.ZDiff([]string{nonExistentKey, key3})
assert.NoError(t, err)
assert.Equal(t, []string{}, zDiffResult)

zDiffResultWithScores, err := client.ZDiffWithScores([]string{key1, key2})
assert.NoError(t, err)
assert.Equal(t, map[string]float64{"one": 1.0, "three": 3.0}, zDiffResultWithScores)
zDiffResultWithScores, err = client.ZDiffWithScores([]string{key1, key3})
assert.NoError(t, err)
assert.Equal(t, map[string]float64{}, zDiffResultWithScores)
zDiffResultWithScores, err = client.ZDiffWithScores([]string{nonExistentKey, key3})
assert.NoError(t, err)
assert.Equal(t, map[string]float64{}, zDiffResultWithScores)

// Key exists, but it is not a set
setResult, _ := client.Set(nonExistentKey, "bar")
assert.Equal(t, setResult, "OK")

_, err = client.ZDiff([]string{nonExistentKey, key2})
assert.NotNil(t, err)
assert.IsType(t, &errors.RequestError{}, err)

_, err = client.ZDiffWithScores([]string{nonExistentKey, key2})
assert.NotNil(t, err)
assert.IsType(t, &errors.RequestError{}, err)
})
}

func (suite *GlideTestSuite) TestZDiffStore() {
suite.runWithDefaultClients(func(client api.BaseClient) {
suite.SkipIfServerVersionLowerThanBy("6.2.0")
t := suite.T()
key1 := "{testKey}:1-" + uuid.NewString()
key2 := "{testKey}:2-" + uuid.NewString()
key3 := "{testKey}:3-" + uuid.NewString()
key4 := "{testKey}:4-" + uuid.NewString()
key5 := "{testKey}:5-" + uuid.NewString()

membersScores1 := map[string]float64{
"one": 1.0,
"two": 2.0,
"three": 3.0,
}

membersScores2 := map[string]float64{
"two": 2.0,
}

membersScores3 := map[string]float64{
"one": 1.0,
"two": 2.0,
"three": 3.0,
"four": 4.0,
}

zAddResult1, err := client.ZAdd(key1, membersScores1)
assert.NoError(t, err)
assert.Equal(t, int64(3), zAddResult1)
zAddResult2, err := client.ZAdd(key2, membersScores2)
assert.NoError(t, err)
assert.Equal(t, int64(1), zAddResult2)
zAddResult3, err := client.ZAdd(key3, membersScores3)
assert.NoError(t, err)
assert.Equal(t, int64(4), zAddResult3)

zDiffStoreResult, err := client.ZDiffStore(key4, []string{key1, key2})
assert.NoError(t, err)
assert.Equal(t, zDiffStoreResult, int64(2))
zRangeWithScoreResult, err := client.ZRangeWithScores(key4, options.NewRangeByIndexQuery(0, -1))
assert.NoError(t, err)
assert.Equal(t, map[string]float64{"one": 1.0, "three": 3.0}, zRangeWithScoreResult)

zDiffStoreResult, err = client.ZDiffStore(key4, []string{key3, key2, key1})
assert.NoError(t, err)
assert.Equal(t, zDiffStoreResult, int64(1))
zRangeWithScoreResult, err = client.ZRangeWithScores(key4, options.NewRangeByIndexQuery(0, -1))
assert.NoError(t, err)
assert.Equal(t, map[string]float64{"four": 4.0}, zRangeWithScoreResult)

zDiffStoreResult, err = client.ZDiffStore(key4, []string{key1, key3})
assert.NoError(t, err)
assert.Equal(t, zDiffStoreResult, int64(0))
zRangeWithScoreResult, err = client.ZRangeWithScores(key4, options.NewRangeByIndexQuery(0, -1))
assert.NoError(t, err)
assert.Equal(t, map[string]float64{}, zRangeWithScoreResult)

// Non-Existing key
zDiffStoreResult, err = client.ZDiffStore(key4, []string{key5, key1})
assert.NoError(t, err)
assert.Equal(t, zDiffStoreResult, int64(0))
zRangeWithScoreResult, err = client.ZRangeWithScores(key4, options.NewRangeByIndexQuery(0, -1))
assert.NoError(t, err)
assert.Equal(t, map[string]float64{}, zRangeWithScoreResult)

// Key exists, but it is not a set
setResult, err := client.Set(key5, "bar")
assert.NoError(t, err)
assert.Equal(t, setResult, "OK")
_, err = client.ZDiffStore(key4, []string{key5, key1})
assert.NotNil(t, err)
assert.IsType(t, &errors.RequestError{}, err)
})
}
Loading