Merge branch 'master' into xbowen_visibility_single_manager_unit_test01

uber · Apr 2, 2024 · 8daa448 · 8daa448
2 parents 34c617e + c56c124
commit 8daa448
Show file tree

Hide file tree

Showing 4 changed files with 1,124 additions and 20 deletions.
diff --git a/common/persistence/nosql/nosqlplugin/cassandra/db.go b/common/persistence/nosql/nosqlplugin/cassandra/db.go
@@ -21,6 +21,7 @@
 package cassandra
 
 import (
+	"github.com/uber/cadence/common/clock"
 	"github.com/uber/cadence/common/config"
 	"github.com/uber/cadence/common/log"
 	"github.com/uber/cadence/common/log/tag"
@@ -36,6 +37,7 @@ type cdb struct {
 	session gocql.Session
 	cfg     *config.NoSQL
 	dc      *persistence.DynamicConfiguration
+	timeSrc clock.TimeSource
 }
 
 var _ nosqlplugin.DB = (*cdb)(nil)
@@ -51,6 +53,12 @@ func dbWithClient(client gocql.Client) cassandraDBOption {
 	}
 }
 
+func dbWithTimeSource(timeSrc clock.TimeSource) cassandraDBOption {
+	return func(db *cdb) {
+		db.timeSrc = timeSrc
+	}
+}
+
 // newCassandraDBFromSession returns a DB from a session
 func newCassandraDBFromSession(
 	cfg *config.NoSQL,
@@ -64,6 +72,7 @@ func newCassandraDBFromSession(
 		logger:  logger,
 		cfg:     cfg,
 		dc:      dc,
+		timeSrc: clock.NewRealTimeSource(),
 	}
 
 	for _, opt := range opts {

diff --git a/common/persistence/nosql/nosqlplugin/cassandra/tasks.go b/common/persistence/nosql/nosqlplugin/cassandra/tasks.go
@@ -181,7 +181,7 @@ func (db *cdb) UpdateTaskListWithTTL(
 		row.TaskListType,
 		row.AckLevel,
 		row.TaskListKind,
-		time.Now(),
+		db.timeSrc.Now(),
 		row.DomainID,
 		row.TaskListName,
 		row.TaskListType,