Skip to content

Commit

Permalink
more TTL -> Ttl renames
Browse files Browse the repository at this point in the history
  • Loading branch information
pgautier404 committed Mar 1, 2023
1 parent b8b4da2 commit 648b9f6
Show file tree
Hide file tree
Showing 14 changed files with 19 additions and 19 deletions.
2 changes: 1 addition & 1 deletion momento/dictionary_increment.go
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ func (r *DictionaryIncrementRequest) initGrpcRequest(client scsDataClient) error
}

var ttl uint64
if ttl, err = prepareTTL(r, client.defaultTtl); err != nil {
if ttl, err = prepareTtl(r, client.defaultTtl); err != nil {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion momento/dictionary_set_fields.go
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ func (r *DictionarySetFieldsRequest) initGrpcRequest(client scsDataClient) error
}

var ttl uint64
if ttl, err = prepareTTL(r, client.defaultTtl); err != nil {
if ttl, err = prepareTtl(r, client.defaultTtl); err != nil {
return err
}

Expand Down
4 changes: 2 additions & 2 deletions momento/dictionary_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -708,7 +708,7 @@ var _ = Describe("Dictionary methods", func() {
Field: String("myField3"),
Value: String("myValue3"),
Ttl: utils.CollectionTtl{
Ttl: sharedContext.DefaultTTL + time.Second*60,
Ttl: sharedContext.DefaultTtl + time.Second*60,
RefreshTtl: false,
},
}),
Expand All @@ -732,7 +732,7 @@ var _ = Describe("Dictionary methods", func() {
Field: String("myField3"),
Value: String("myValue3"),
Ttl: utils.CollectionTtl{
Ttl: sharedContext.DefaultTTL + time.Second*60,
Ttl: sharedContext.DefaultTtl + time.Second*60,
RefreshTtl: true,
},
}),
Expand Down
2 changes: 1 addition & 1 deletion momento/list_concatenate_back.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func (r *ListConcatenateBackRequest) initGrpcRequest(client scsDataClient) error
}

var ttl uint64
if ttl, err = prepareTTL(r, client.defaultTtl); err != nil {
if ttl, err = prepareTtl(r, client.defaultTtl); err != nil {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion momento/list_concatenate_front.go
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ func (r *ListConcatenateFrontRequest) initGrpcRequest(client scsDataClient) erro
}

var ttl uint64
if ttl, err = prepareTTL(r, client.defaultTtl); err != nil {
if ttl, err = prepareTtl(r, client.defaultTtl); err != nil {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion momento/list_push_back.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func (r *ListPushBackRequest) initGrpcRequest(client scsDataClient) error {
}

var ttl uint64
if ttl, err = prepareTTL(r, client.defaultTtl); err != nil {
if ttl, err = prepareTtl(r, client.defaultTtl); err != nil {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion momento/list_push_front.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ func (r *ListPushFrontRequest) initGrpcRequest(client scsDataClient) error {
}

var ttl uint64
if ttl, err = prepareTTL(r, client.defaultTtl); err != nil {
if ttl, err = prepareTtl(r, client.defaultTtl); err != nil {
return err
}

Expand Down
4 changes: 2 additions & 2 deletions momento/requester.go
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ type hasElements interface {
elements() map[string]Value
}

type hasTTL interface {
type hasTtl interface {
ttl() time.Duration
}

Expand Down Expand Up @@ -181,7 +181,7 @@ func prepareElements(r hasElements) (map[string][]byte, error) {
return retMap, nil
}

func prepareTTL(r hasTTL, defaultTtl time.Duration) (uint64, error) {
func prepareTtl(r hasTtl, defaultTtl time.Duration) (uint64, error) {
ttl := r.ttl()
if r.ttl() == time.Duration(0) {
ttl = defaultTtl
Expand Down
2 changes: 1 addition & 1 deletion momento/scalar_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ var _ = Describe("Scalar methods", func() {
CacheName: sharedContext.CacheName,
Key: key,
Value: value,
TTL: sharedContext.DefaultTtl * 2,
Ttl: sharedContext.DefaultTtl * 2,
}),
).To(BeAssignableToTypeOf(&SetSuccess{}))

Expand Down
6 changes: 3 additions & 3 deletions momento/set.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ type SetRequest struct {
Value Value
// Optional Time to live in cache in seconds.
// If not provided, then default TTL for the cache client instance is used.
TTL time.Duration
Ttl time.Duration

grpcRequest *pb.XSetRequest
grpcResponse *pb.XSetResponse
Expand All @@ -41,7 +41,7 @@ func (r *SetRequest) key() Key { return r.Key }

func (r *SetRequest) value() Value { return r.Value }

func (r *SetRequest) ttl() time.Duration { return r.TTL }
func (r *SetRequest) ttl() time.Duration { return r.Ttl }

func (r *SetRequest) requestName() string { return "Set" }

Expand All @@ -59,7 +59,7 @@ func (r *SetRequest) initGrpcRequest(client scsDataClient) error {
}

var ttl uint64
if ttl, err = prepareTTL(r, client.defaultTtl); err != nil {
if ttl, err = prepareTtl(r, client.defaultTtl); err != nil {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion momento/set_add_elements.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func (r *SetAddElementsRequest) initGrpcRequest(client scsDataClient) error {
}

var ttl uint64
if ttl, err = prepareTTL(r, client.defaultTtl); err != nil {
if ttl, err = prepareTtl(r, client.defaultTtl); err != nil {
return err
}

Expand Down
4 changes: 2 additions & 2 deletions momento/set_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -365,7 +365,7 @@ var _ = Describe("Set methods", func() {
SetName: sharedContext.CollectionName,
Element: String("hello"),
Ttl: utils.CollectionTtl{
Ttl: sharedContext.DefaultTTL + time.Second*60,
Ttl: sharedContext.DefaultTtl + time.Second*60,
RefreshTtl: true,
},
}),
Expand Down Expand Up @@ -395,7 +395,7 @@ var _ = Describe("Set methods", func() {
SetName: sharedContext.CollectionName,
Element: String("hello"),
Ttl: utils.CollectionTtl{
Ttl: sharedContext.DefaultTTL + 1*time.Second,
Ttl: sharedContext.DefaultTtl + 1*time.Second,
RefreshTtl: false,
},
}),
Expand Down
2 changes: 1 addition & 1 deletion momento/sorted_set_increment_score.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func (r *SortedSetIncrementScoreRequest) initGrpcRequest(client scsDataClient) e
}

var ttlMillis uint64
if ttlMillis, err = prepareTTL(r, client.defaultTtl); err != nil {
if ttlMillis, err = prepareTtl(r, client.defaultTtl); err != nil {
return err
}

Expand Down
2 changes: 1 addition & 1 deletion momento/sorted_set_put.go
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ func (r *SortedSetPutRequest) initGrpcRequest(client scsDataClient) error {
}

var ttlMills uint64
if ttlMills, err = prepareTTL(r, client.defaultTtl); err != nil {
if ttlMills, err = prepareTtl(r, client.defaultTtl); err != nil {
return err
}

Expand Down

0 comments on commit 648b9f6

Please sign in to comment.