Skip to content

Add MigrateWithOptions to handle multiple keys and copy/replace #2687

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+51 −6
Open

Add MigrateWithOptions to handle multiple keys and copy/replace #2687

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 39 additions & 6 deletions commands.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ type Cmdable interface {
ExpireLT(ctx context.Context, key string, expiration time.Duration) *BoolCmd
Keys(ctx context.Context, pattern string) *StringSliceCmd
Migrate(ctx context.Context, host, port, key string, db int, timeout time.Duration) *StatusCmd
MigrateWithOptions(ctx context.Context, host, port string, keys []string, db int, timeout time.Duration, copy, replace bool) *StatusCmd
Move(ctx context.Context, key string, db int) *BoolCmd
ObjectRefCount(ctx context.Context, key string) *IntCmd
ObjectEncoding(ctx context.Context, key string) *StringCmd
Expand Down Expand Up @@ -762,15 +763,47 @@ func (c cmdable) Keys(ctx context.Context, pattern string) *StringSliceCmd {
}

func (c cmdable) Migrate(ctx context.Context, host, port, key string, db int, timeout time.Duration) *StatusCmd {
cmd := NewStatusCmd(
ctx,
return c.migrate(ctx, host, port, []string{key}, db, timeout, false, false)
}

func (c cmdable) MigrateWithOptions(ctx context.Context, host, port string, keys []string, db int, timeout time.Duration, copy, replace bool) *StatusCmd {
return c.migrate(ctx, host, port, keys, db, timeout, copy, replace)
}

func (c cmdable) migrate(ctx context.Context, host, port string, keys []string, db int, timeout time.Duration, copy, replace bool) *StatusCmd {
args := []interface{}{
"migrate",
host,
port,
key,
db,
formatMs(ctx, timeout),
)
}
copyReplaceArgs := []interface{}{}
if copy {
copyReplaceArgs = append(copyReplaceArgs, "copy")
}
if replace {
copyReplaceArgs = append(copyReplaceArgs, "replace")
}

if len(keys) == 1 {
args = append(args, []interface{}{
keys[0],
db,
formatMs(ctx, timeout),
}...)
args = append(args, copyReplaceArgs...)
} else {
args = append(args, []interface{}{
"",
db,
formatMs(ctx, timeout),
}...)
args = append(args, copyReplaceArgs...)
args = append(args, "keys")
for _, key := range keys {
args = append(args, key)
}
}
cmd := NewStatusCmd(ctx, args...)
cmd.setReadTimeout(timeout)
_ = c(ctx, cmd)
return cmd
Expand Down
12 changes: 12 additions & 0 deletions commands_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,18 @@ var _ = Describe("Commands", func() {
Expect(migrate.Err()).NotTo(HaveOccurred())
Expect(migrate.Val()).To(Equal("NOKEY"))

migrate = client.MigrateWithOptions(ctx, "localhost", redisSecondaryPort, []string{"key"}, 0, 0, false, true)
Expect(migrate.Err()).NotTo(HaveOccurred())
Expect(migrate.Val()).To(Equal("NOKEY"))

migrate = client.MigrateWithOptions(ctx, "localhost", redisSecondaryPort, []string{"key"}, 0, 0, true, true)
Expect(migrate.Err()).NotTo(HaveOccurred())
Expect(migrate.Val()).To(Equal("NOKEY"))

migrate = client.MigrateWithOptions(ctx, "localhost", redisSecondaryPort, []string{"key1", "key2"}, 0, 0, false, false)
Expect(migrate.Err()).NotTo(HaveOccurred())
Expect(migrate.Val()).To(Equal("NOKEY"))

set := client.Set(ctx, "key", "hello", 0)
Expect(set.Err()).NotTo(HaveOccurred())
Expect(set.Val()).To(Equal("OK"))
Expand Down