Skip to content

Commit dcef1db

Browse files
author
Jamie Curnow
committed
Fix err when ttl is negative duration
1 parent ef5d415 commit dcef1db

File tree

1 file changed

+7
-9
lines changed

1 file changed

+7
-9
lines changed

pkg/migrator/migrate.go

Lines changed: 7 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -47,9 +47,10 @@ func DoMigration(sourceClient, destinationClient *redis.Client, keyFilter, keyPr
4747
// read from source
4848
typeCmd := sourceClient.Type(helpers.Ctx, sourceKey)
4949
keyType := typeCmd.Val()
50-
5150
ttl := sourceClient.TTL(helpers.Ctx, sourceKey).Val()
5251

52+
logger.Trace("Key '%s' type '%s' ttl: %v destination: '%s'", sourceKey, keyType, ttl, destinationKey)
53+
5354
switch keyType {
5455
case "string":
5556
copyString(sourceClient, destinationClient, sourceKey, destinationKey, ttl)
@@ -71,7 +72,12 @@ func DoMigration(sourceClient, destinationClient *redis.Client, keyFilter, keyPr
7172

7273
func copyString(sourceClient, destinationClient *redis.Client, sourceKey, destinationKey string, ttl time.Duration) {
7374
val, err := sourceClient.Get(helpers.Ctx, sourceKey).Result()
75+
logger.Trace("Key '%s' val '%v'", sourceKey, val)
7476
if err == nil {
77+
// Small hack for situations where duration is negative, causing syntax error
78+
if ttl < 1 {
79+
ttl = 0
80+
}
7581
if setErr := destinationClient.Set(helpers.Ctx, destinationKey, val, ttl).Err(); setErr != nil {
7682
logger.Error("Could not set '%s' on destination: %s", destinationKey, setErr.Error())
7783
}
@@ -120,14 +126,6 @@ func copyHash(sourceClient, destinationClient *redis.Client, sourceKey, destinat
120126
}
121127

122128
func copyList(sourceClient, destinationClient *redis.Client, sourceKey, destinationKey string) {
123-
// populate test
124-
/*
125-
for x := int64(0); x < 3333; x++ {
126-
sourceClient.RPush(helpers.Ctx, sourceKey, fmt.Sprintf("example %v", x)).Result()
127-
}
128-
logger.Trace("added lots of examples for '%s'", sourceKey)
129-
*/
130-
131129
itemsPerPage := float64(1000)
132130
itemCount, err := sourceClient.LLen(helpers.Ctx, sourceKey).Result()
133131
if err == nil {

0 commit comments

Comments
 (0)