Skip to content

Commit 61680f3

Browse files
vmihailencovmihailenco
committed
Tweak API
1 parent 7b7f9d6 commit 61680f3

File tree

4 files changed

+35
-28
lines changed

4 files changed

+35
-28
lines changed

‎commands.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -807,16 +807,17 @@ type SetArgs struct {
807807
// SetArgs supports all the options that the SET command supports.
808808
// It is the alternative to the Set function when you want
809809
// to have more control over the options.
810-
func (c cmdable) SetArgs(ctx context.Context, key string, value interface{}, a *SetArgs) *StatusCmd {
810+
func (c cmdable) SetArgs(ctx context.Context, key string, value interface{}, a SetArgs) *StatusCmd {
811811
args := []interface{}{"set", key, value}
812812

813813
if a.KeepTTL {
814814
args = append(args, "keepttl")
815815
}
816816

817-
if !a.ExpireAt.IsZero() && !a.KeepTTL {
817+
if !a.ExpireAt.IsZero() {
818818
args = append(args, "exat", a.ExpireAt.Unix())
819-
} else if a.TTL > 0 && !a.KeepTTL {
819+
}
820+
if a.TTL > 0 {
820821
if usePrecise(a.TTL) {
821822
args = append(args, "px", formatMs(ctx, a.TTL))
822823
} else {

‎commands_test.go

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1161,7 +1161,7 @@ var _ = Describe("Commands", func() {
11611161
})
11621162

11631163
It("should SetWithArgs with TTL", func() {
1164-
args := &redis.SetArgs{
1164+
args := redis.SetArgs{
11651165
TTL: 500 * time.Millisecond,
11661166
}
11671167
err := client.SetArgs(ctx, "key", "hello", args).Err()
@@ -1178,7 +1178,7 @@ var _ = Describe("Commands", func() {
11781178

11791179
It("should SetWithArgs with expiration date", func() {
11801180
expireAt := time.Now().AddDate(1, 1, 1)
1181-
args := &redis.SetArgs{
1181+
args := redis.SetArgs{
11821182
ExpireAt: expireAt,
11831183
}
11841184
err := client.SetArgs(ctx, "key", "hello", args).Err()
@@ -1196,7 +1196,7 @@ var _ = Describe("Commands", func() {
11961196
})
11971197

11981198
It("should SetWithArgs with negative expiration date", func() {
1199-
args := &redis.SetArgs{
1199+
args := redis.SetArgs{
12001200
ExpireAt: time.Now().AddDate(-3, 1, 1),
12011201
}
12021202
// redis accepts a timestamp less than the current date
@@ -1211,15 +1211,15 @@ var _ = Describe("Commands", func() {
12111211

12121212
It("should SetWithArgs with keepttl", func() {
12131213
// Set with ttl
1214-
argsWithTTL := &redis.SetArgs{
1214+
argsWithTTL := redis.SetArgs{
12151215
TTL: 5 * time.Second,
12161216
}
12171217
set := client.SetArgs(ctx, "key", "hello", argsWithTTL)
12181218
Expect(set.Err()).NotTo(HaveOccurred())
12191219
Expect(set.Result()).To(Equal("OK"))
12201220

12211221
// Set with keepttl
1222-
argsWithKeepTTL := &redis.SetArgs{
1222+
argsWithKeepTTL := redis.SetArgs{
12231223
KeepTTL: true,
12241224
}
12251225
set = client.SetArgs(ctx, "key", "hello", argsWithKeepTTL)
@@ -1236,7 +1236,7 @@ var _ = Describe("Commands", func() {
12361236
err := client.Set(ctx, "key", "hello", 0).Err()
12371237
Expect(err).NotTo(HaveOccurred())
12381238

1239-
args := &redis.SetArgs{
1239+
args := redis.SetArgs{
12401240
Mode: "nx",
12411241
}
12421242
val, err := client.SetArgs(ctx, "key", "hello", args).Result()
@@ -1245,7 +1245,7 @@ var _ = Describe("Commands", func() {
12451245
})
12461246

12471247
It("should SetWithArgs with NX mode and key does not exist", func() {
1248-
args := &redis.SetArgs{
1248+
args := redis.SetArgs{
12491249
Mode: "nx",
12501250
}
12511251
val, err := client.SetArgs(ctx, "key", "hello", args).Result()
@@ -1254,7 +1254,7 @@ var _ = Describe("Commands", func() {
12541254
})
12551255

12561256
It("should SetWithArgs with NX mode and GET option", func() {
1257-
args := &redis.SetArgs{
1257+
args := redis.SetArgs{
12581258
Mode: "nx",
12591259
Get: true,
12601260
}
@@ -1264,7 +1264,7 @@ var _ = Describe("Commands", func() {
12641264
})
12651265

12661266
It("should SetWithArgs with expiration, NX mode, and key does not exist", func() {
1267-
args := &redis.SetArgs{
1267+
args := redis.SetArgs{
12681268
TTL: 500 * time.Millisecond,
12691269
Mode: "nx",
12701270
}
@@ -1281,7 +1281,7 @@ var _ = Describe("Commands", func() {
12811281
e := client.Set(ctx, "key", "hello", 0)
12821282
Expect(e.Err()).NotTo(HaveOccurred())
12831283

1284-
args := &redis.SetArgs{
1284+
args := redis.SetArgs{
12851285
TTL: 500 * time.Millisecond,
12861286
Mode: "nx",
12871287
}
@@ -1291,7 +1291,7 @@ var _ = Describe("Commands", func() {
12911291
})
12921292

12931293
It("should SetWithArgs with expiration, NX mode, and GET option", func() {
1294-
args := &redis.SetArgs{
1294+
args := redis.SetArgs{
12951295
TTL: 500 * time.Millisecond,
12961296
Mode: "nx",
12971297
Get: true,
@@ -1302,7 +1302,7 @@ var _ = Describe("Commands", func() {
13021302
})
13031303

13041304
It("should SetWithArgs with XX mode and key does not exist", func() {
1305-
args := &redis.SetArgs{
1305+
args := redis.SetArgs{
13061306
Mode: "xx",
13071307
}
13081308
val, err := client.SetArgs(ctx, "key", "world", args).Result()
@@ -1314,7 +1314,7 @@ var _ = Describe("Commands", func() {
13141314
e := client.Set(ctx, "key", "hello", 0).Err()
13151315
Expect(e).NotTo(HaveOccurred())
13161316

1317-
args := &redis.SetArgs{
1317+
args := redis.SetArgs{
13181318
Mode: "xx",
13191319
}
13201320
val, err := client.SetArgs(ctx, "key", "world", args).Result()
@@ -1326,7 +1326,7 @@ var _ = Describe("Commands", func() {
13261326
e := client.Set(ctx, "key", "hello", 0).Err()
13271327
Expect(e).NotTo(HaveOccurred())
13281328

1329-
args := &redis.SetArgs{
1329+
args := redis.SetArgs{
13301330
Mode: "xx",
13311331
Get: true,
13321332
}
@@ -1336,7 +1336,7 @@ var _ = Describe("Commands", func() {
13361336
})
13371337

13381338
It("should SetWithArgs with XX mode and GET option, and key does not exist", func() {
1339-
args := &redis.SetArgs{
1339+
args := redis.SetArgs{
13401340
Mode: "xx",
13411341
Get: true,
13421342
}
@@ -1347,7 +1347,7 @@ var _ = Describe("Commands", func() {
13471347
})
13481348

13491349
It("should SetWithArgs with expiration, XX mode, GET option, and key does not exist", func() {
1350-
args := &redis.SetArgs{
1350+
args := redis.SetArgs{
13511351
TTL: 500 * time.Millisecond,
13521352
Mode: "xx",
13531353
Get: true,
@@ -1362,7 +1362,7 @@ var _ = Describe("Commands", func() {
13621362
e := client.Set(ctx, "key", "hello", 0)
13631363
Expect(e.Err()).NotTo(HaveOccurred())
13641364

1365-
args := &redis.SetArgs{
1365+
args := redis.SetArgs{
13661366
TTL: 500 * time.Millisecond,
13671367
Mode: "xx",
13681368
Get: true,
@@ -1378,7 +1378,7 @@ var _ = Describe("Commands", func() {
13781378
})
13791379

13801380
It("should SetWithArgs with Get and key does not exist yet", func() {
1381-
args := &redis.SetArgs{
1381+
args := redis.SetArgs{
13821382
Get: true,
13831383
}
13841384

@@ -1391,7 +1391,7 @@ var _ = Describe("Commands", func() {
13911391
e := client.Set(ctx, "key", "hello", 0)
13921392
Expect(e.Err()).NotTo(HaveOccurred())
13931393

1394-
args := &redis.SetArgs{
1394+
args := redis.SetArgs{
13951395
Get: true,
13961396
}
13971397

‎go.mod

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,4 +8,6 @@ require (
88
github.com/onsi/ginkgo v1.15.0
99
github.com/onsi/gomega v1.10.5
1010
go.opentelemetry.io/otel v0.17.0
11+
go.opentelemetry.io/otel/metric v0.17.0
12+
go.opentelemetry.io/otel/trace v0.17.0
1113
)

‎go.sum

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,17 @@ github.com/onsi/gomega v1.10.5/go.mod h1:gza4q3jKQJijlu05nKWRCW/GavJumGt8aNRxWg7
3434
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
3535
github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
3636
github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
37-
github.com/stretchr/testify v1.6.1 h1:hDPOHmpOpP40lSULcqw7IrRb/u7w6RpDC9399XyoNd0=
38-
github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
37+
github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
38+
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
3939
github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
40-
go.opentelemetry.io/otel v0.16.0 h1:uIWEbdeb4vpKPGITLsRVUS44L5oDbDUCZxn8lkxhmgw=
41-
go.opentelemetry.io/otel v0.16.0/go.mod h1:e4GKElweB8W2gWUqbghw0B8t5MCTccc9212eNHnOHwA=
40+
go.opentelemetry.io/otel v0.17.0 h1:6MKOu8WY4hmfpQ4oQn34u6rYhnf2sWf1LXYO/UFm71U=
41+
go.opentelemetry.io/otel v0.17.0/go.mod h1:Oqtdxmf7UtEvL037ohlgnaYa1h7GtMh0NcSd9eqkC9s=
42+
go.opentelemetry.io/otel/metric v0.17.0 h1:t+5EioN8YFXQ2EH+1j6FHCKMUj+57zIDSnSGr/mWuug=
43+
go.opentelemetry.io/otel/metric v0.17.0/go.mod h1:hUz9lH1rNXyEwWAhIWCMFWKhYtpASgSnObJFnU26dJ0=
44+
go.opentelemetry.io/otel/oteltest v0.17.0 h1:TyAihUowTDLqb4+m5ePAsR71xPJaTBJl4KDArIdi9k4=
45+
go.opentelemetry.io/otel/oteltest v0.17.0/go.mod h1:JT/LGFxPwpN+nlsTiinSYjdIx3hZIGqHCpChcIZmdoE=
46+
go.opentelemetry.io/otel/trace v0.17.0 h1:SBOj64/GAOyWzs5F680yW1ITIfJkm6cJWL2YAvuL9xY=
47+
go.opentelemetry.io/otel/trace v0.17.0/go.mod h1:bIujpqg6ZL6xUTubIUgziI1jSaUPthmabA/ygf/6Cfg=
4248
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
4349
golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
4450
golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
@@ -60,7 +66,6 @@ golang.org/x/sys v0.0.0-20190904154756-749cb33beabd/go.mod h1:h1NjWce9XRLGQEsW7w
6066
golang.org/x/sys v0.0.0-20191005200804-aed5e4c7ecf9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
6167
golang.org/x/sys v0.0.0-20191120155948-bd437916bb0e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
6268
golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
63-
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f h1:+Nyd8tzPX9R7BWHguqsrbFdRx3WQ/1ib8I44HXV5yTA=
6469
golang.org/x/sys v0.0.0-20200930185726-fdedc70b468f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
6570
golang.org/x/sys v0.0.0-20210112080510-489259a85091 h1:DMyOG0U+gKfu8JZzg2UQe9MeaC1X+xQWlAKcRnjxjCw=
6671
golang.org/x/sys v0.0.0-20210112080510-489259a85091/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -72,7 +77,6 @@ golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtn
7277
golang.org/x/tools v0.0.0-20201224043029-2b0845dc783e/go.mod h1:emZCQorbCU4vsT4fOWvOPXz4eW1wZW4PmDk9uLelYpA=
7378
golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
7479
golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
75-
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
7680
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
7781
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
7882
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

0 commit comments

Comments
 (0)