Address a few linter errors (#3780)

* Remove unreachable code * Rename variables and identifiers that shadow import names
temporalio · Jan 11, 2023 · c5254f3 · c5254f3
1 parent bb4ec7f
commit c5254f3
Show file tree

Hide file tree

Showing 9 changed files with 30 additions and 34 deletions.
diff --git a/common/namespace/handler.go b/common/namespace/handler.go
@@ -954,6 +954,4 @@ func validateStateUpdate(existingNamespace *persistence.GetNamespaceResponse, ns
 	default:
 		return ErrInvalidNamespaceStateUpdate
 	}
-
-	return nil
 }
diff --git a/host/query_workflow_test.go b/host/query_workflow_test.go
@@ -105,8 +105,6 @@ func (s *clientIntegrationSuite) TestQueryWorkflow_Consistent_PiggybackQuery() {
 				}).Get(ctx, nil)
 			}
 		}
-
-		return receivedMsgs, nil
 	}
 
 	s.worker.RegisterWorkflow(workflowFn)

diff --git a/service/history/queues/convert_test.go b/service/history/queues/convert_test.go
@@ -65,7 +65,7 @@ func (s *convertSuite) TestConvertPredicate_Empty() {
 }
 
 func (s *convertSuite) TestConvertPredicate_And() {
-	predicates := []tasks.Predicate{
+	testCases := []tasks.Predicate{
 		predicates.And(
 			predicates.Universal[tasks.Task](),
 			predicates.Empty[tasks.Task](),
@@ -102,13 +102,13 @@ func (s *convertSuite) TestConvertPredicate_And() {
 		),
 	}
 
-	for _, predicate := range predicates {
+	for _, predicate := range testCases {
 		s.Equal(predicate, FromPersistencePredicate(ToPersistencePredicate(predicate)))
 	}
 }
 
 func (s *convertSuite) TestConvertPredicate_Or() {
-	predicates := []tasks.Predicate{
+	testCases := []tasks.Predicate{
 		predicates.Or(
 			predicates.Universal[tasks.Task](),
 			predicates.Empty[tasks.Task](),
@@ -145,13 +145,13 @@ func (s *convertSuite) TestConvertPredicate_Or() {
 		),
 	}
 
-	for _, predicate := range predicates {
+	for _, predicate := range testCases {
 		s.Equal(predicate, FromPersistencePredicate(ToPersistencePredicate(predicate)))
 	}
 }
 
 func (s *convertSuite) TestConvertPredicate_Not() {
-	predicates := []tasks.Predicate{
+	testCases := []tasks.Predicate{
 		predicates.Not(predicates.Universal[tasks.Task]()),
 		predicates.Not(predicates.Empty[tasks.Task]()),
 		predicates.Not(predicates.And[tasks.Task](
@@ -169,25 +169,25 @@ func (s *convertSuite) TestConvertPredicate_Not() {
 		})),
 	}
 
-	for _, predicate := range predicates {
+	for _, predicate := range testCases {
 		s.Equal(predicate, FromPersistencePredicate(ToPersistencePredicate(predicate)))
 	}
 }
 
 func (s *convertSuite) TestConvertPredicate_NamespaceID() {
-	predicates := []tasks.Predicate{
+	testCases := []tasks.Predicate{
 		tasks.NewNamespacePredicate(nil),
 		tasks.NewNamespacePredicate([]string{}),
 		tasks.NewNamespacePredicate([]string{uuid.New(), uuid.New(), uuid.New()}),
 	}
 
-	for _, predicate := range predicates {
+	for _, predicate := range testCases {
 		s.Equal(predicate, FromPersistencePredicate(ToPersistencePredicate(predicate)))
 	}
 }
 
 func (s *convertSuite) TestConvertPredicate_TaskType() {
-	predicates := []tasks.Predicate{
+	testCases := []tasks.Predicate{
 		tasks.NewTypePredicate(nil),
 		tasks.NewTypePredicate([]enumsspb.TaskType{}),
 		tasks.NewTypePredicate([]enumsspb.TaskType{
@@ -197,7 +197,7 @@ func (s *convertSuite) TestConvertPredicate_TaskType() {
 		}),
 	}
 
-	for _, predicate := range predicates {
+	for _, predicate := range testCases {
 		s.Equal(predicate, FromPersistencePredicate(ToPersistencePredicate(predicate)))
 	}
 }

diff --git a/service/history/queues/executable.go b/service/history/queues/executable.go
@@ -172,10 +172,10 @@ func (e *executableImpl) Execute() (retErr error) {
 		return nil
 	}
 
-	namespaceName, _ := e.namespaceRegistry.GetNamespaceName(namespace.ID(e.GetNamespaceID()))
+	ns, _ := e.namespaceRegistry.GetNamespaceName(namespace.ID(e.GetNamespaceID()))
 	ctx := headers.SetCallerInfo(
 		metrics.AddMetricsContext(context.Background()),
-		headers.NewBackgroundCallerInfo(namespaceName.String()),
+		headers.NewBackgroundCallerInfo(ns.String()),
 	)
 
 	var panicErr error
@@ -476,15 +476,15 @@ func (e *executableImpl) rescheduleTime(
 		return e.timeSource.Now().Add(dependencyTaskNotCompletedReschedulePolicy.ComputeNextDelay(0, attempt))
 	}
 
-	backoff := reschedulePolicy.ComputeNextDelay(0, attempt)
+	backoffDuration := reschedulePolicy.ComputeNextDelay(0, attempt)
 	if common.IsResourceExhausted(err) {
 		// try a different reschedule policy to slow down retry
 		// upon resource exhausted error and pick the longer backoff
 		// duration
-		backoff = util.Max(backoff, taskResourceExhuastedReschedulePolicy.ComputeNextDelay(0, e.resourceExhaustedCount))
+		backoffDuration = util.Max(backoffDuration, taskResourceExhuastedReschedulePolicy.ComputeNextDelay(0, e.resourceExhaustedCount))
 	}
 
-	return e.timeSource.Now().Add(backoff)
+	return e.timeSource.Now().Add(backoffDuration)
 }
 
 func (e *executableImpl) updatePriority() {

diff --git a/service/history/queues/queue_base.go b/service/history/queues/queue_base.go
@@ -41,7 +41,7 @@ import (
 	"go.temporal.io/server/common/persistence"
 	"go.temporal.io/server/common/predicates"
 	"go.temporal.io/server/common/quotas"
-	"go.temporal.io/server/service/history/shard"
+	hshard "go.temporal.io/server/service/history/shard"
 	"go.temporal.io/server/service/history/tasks"
 )
 
@@ -75,7 +75,7 @@ type (
 	}
 
 	queueBase struct {
-		shard shard.Context
+		shard hshard.Context
 
 		status     int32
 		shutdownCh chan struct{}
@@ -120,7 +120,7 @@ type (
 )
 
 func newQueueBase(
-	shard shard.Context,
+	shard hshard.Context,
 	category tasks.Category,
 	paginationFnProvider PaginationFnProvider,
 	scheduler Scheduler,

diff --git a/service/history/queues/queue_immediate.go b/service/history/queues/queue_immediate.go
@@ -36,7 +36,7 @@ import (
 	"go.temporal.io/server/common/metrics"
 	"go.temporal.io/server/common/persistence"
 	"go.temporal.io/server/common/quotas"
-	"go.temporal.io/server/service/history/shard"
+	hshard "go.temporal.io/server/service/history/shard"
 	"go.temporal.io/server/service/history/tasks"
 )
 
@@ -51,7 +51,7 @@ type (
 )
 
 func NewImmediateQueue(
-	shard shard.Context,
+	shard hshard.Context,
 	category tasks.Category,
 	scheduler Scheduler,
 	rescheduler Rescheduler,

diff --git a/service/history/queues/queue_scheduled.go b/service/history/queues/queue_scheduled.go
@@ -39,7 +39,7 @@ import (
 	"go.temporal.io/server/common/persistence"
 	"go.temporal.io/server/common/quotas"
 	"go.temporal.io/server/common/timer"
-	"go.temporal.io/server/service/history/shard"
+	hshard "go.temporal.io/server/service/history/shard"
 	"go.temporal.io/server/service/history/tasks"
 )
 
@@ -63,7 +63,7 @@ const (
 )
 
 func NewScheduledQueue(
-	shard shard.Context,
+	shard hshard.Context,
 	category tasks.Category,
 	scheduler Scheduler,
 	rescheduler Rescheduler,

diff --git a/service/history/queues/scheduler.go b/service/history/queues/scheduler.go
@@ -117,10 +117,10 @@ func NewNamespacePriorityScheduler(
 		namespaceWeights := options.ActiveNamespaceWeights
 		namespaceName := namespace.EmptyName
 
-		namespace, err := namespaceRegistry.GetNamespaceByID(namespace.ID(key.NamespaceID))
+		ns, err := namespaceRegistry.GetNamespaceByID(namespace.ID(key.NamespaceID))
 		if err == nil {
-			namespaceName = namespace.Name()
-			if !namespace.ActiveInCluster(currentClusterName) {
+			namespaceName = ns.Name()
+			if !ns.ActiveInCluster(currentClusterName) {
 				namespaceWeights = options.StandbyNamespaceWeights
 			}
 		} else {

diff --git a/service/history/shard/context_impl.go b/service/history/shard/context_impl.go
@@ -47,7 +47,7 @@ import (
 	"go.temporal.io/server/common"
 	"go.temporal.io/server/common/archiver"
 	"go.temporal.io/server/common/backoff"
-	"go.temporal.io/server/common/clock"
+	cclock "go.temporal.io/server/common/clock"
 	"go.temporal.io/server/common/cluster"
 	"go.temporal.io/server/common/convert"
 	"go.temporal.io/server/common/definition"
@@ -108,7 +108,7 @@ type (
 		clientBean              client.Bean
 		historyClient           historyservice.HistoryServiceClient
 		payloadSerializer       serialization.Serializer
-		timeSource              clock.TimeSource
+		timeSource              cclock.TimeSource
 		namespaceRegistry       namespace.Registry
 		saProvider              searchattribute.Provider
 		saMapper                searchattribute.Mapper
@@ -1281,7 +1281,7 @@ func (s *ContextImpl) updateShardInfoLocked() error {
 	}
 
 	var err error
-	now := clock.NewRealTimeSource().Now()
+	now := cclock.NewRealTimeSource().Now()
 	if s.lastUpdated.Add(s.config.ShardUpdateMinInterval()).After(now) {
 		return nil
 	}
@@ -2078,7 +2078,7 @@ func newContext(
 	historyClient historyservice.HistoryServiceClient,
 	metricsHandler metrics.Handler,
 	payloadSerializer serialization.Serializer,
-	timeSource clock.TimeSource,
+	timeSource cclock.TimeSource,
 	namespaceRegistry namespace.Registry,
 	saProvider searchattribute.Provider,
 	saMapper searchattribute.Mapper,
@@ -2180,7 +2180,7 @@ func (s *ContextImpl) GetMetricsHandler() metrics.Handler {
 	return s.metricsHandler
 }
 
-func (s *ContextImpl) GetTimeSource() clock.TimeSource {
+func (s *ContextImpl) GetTimeSource() cclock.TimeSource {
 	return s.timeSource
 }