remove defaul

indeedeng · Mar 16, 2024 · ee1506f · ee1506f
1 parent bd4c00f
commit ee1506f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/integ/locking_test.go b/integ/locking_test.go
@@ -66,7 +66,7 @@ func doTestLockingWorkflow(t *testing.T, backendType service.BackendType, config
 	_, closeFunc2 := startIwfServiceByConfig(IwfServiceTestConfig{
 		BackendType:                      backendType,
 		DisableFailAtMemoIncompatibility: true,
-		OptimizationVersion:              ptr.Any(config2.OptimizationVersionNone),
+		OptimizationVersion:              ptr.Any(config2.OptimizationVersionV1),
 	})
 	defer closeFunc2()
 

diff --git a/integ/persistence_test.go b/integ/persistence_test.go
@@ -3,6 +3,7 @@ package integ
 import (
 	"context"
 	"fmt"
+	config2 "github.com/indeedeng/iwf/service/common/config"
 	"github.com/indeedeng/iwf/service/common/ptr"
 	"github.com/indeedeng/iwf/service/common/timeparser"
 	"log"
@@ -105,8 +106,9 @@ func doTestPersistenceWorkflow(
 	defer closeFunc1()
 
 	uclient, closeFunc2 := startIwfServiceByConfig(IwfServiceTestConfig{
-		BackendType:    backendType,
-		MemoEncryption: memoEncryption,
+		BackendType:         backendType,
+		MemoEncryption:      memoEncryption,
+		OptimizationVersion: ptr.Any(config2.OptimizationVersionV1),
 	})
 	defer closeFunc2()
 

diff --git a/service/api/service.go b/service/api/service.go
@@ -56,13 +56,8 @@ func (s *serviceImpl) ApiV1WorkflowStartPost(
 ) (wresp *iwfidl.WorkflowStartResponse, retError *errors.ErrorAndStatus) {
 	defer func() { log.CapturePanic(recover(), s.logger, &retError) }()
 
-	optimizationVersion := config.DefaultOptimizationVersion
-	if s.config.Api.OptimizationVersion != nil {
-		optimizationVersion = *s.config.Api.OptimizationVersion
-	}
-
 	var sysSAs map[string]interface{}
-	if config.IsVersioningOptimized(optimizationVersion) {
+	if config.IsVersioningOptimized(s.config.Api.OptimizationVersion) {
 		sysSAs = map[string]interface{}{
 			service.SearchAttributeIwfWorkflowType: req.IwfWorkflowType,
 			service.SearchAttributeGlobalVersion:   versions.MaxOfAllVersions,
@@ -131,7 +126,7 @@ func (s *serviceImpl) ApiV1WorkflowStartPost(
 		Config:                             workflowConfig,
 		UseMemoForDataAttributes:           useMemo,
 		WaitForCompletionStateExecutionIds: req.GetWaitForCompletionStateExecutionIds(),
-		OptimizationVersion:                optimizationVersion,
+		OptimizationVersion:                s.config.Api.OptimizationVersion,
 	}
 
 	runId, err := s.client.StartInterpreterWorkflow(ctx, workflowOptions, input)

diff --git a/service/common/config/config.go b/service/common/config/config.go
@@ -92,14 +92,14 @@ type (
 )
 
 const (
+	// OptimizationVersionNone is not doing any optimization. This is the default optimization version
 	OptimizationVersionNone = 0
 	// OptimizationVersionV1 is for optimizing the workflow actions(version marker, upsertSearchAttribute)
-	OptimizationVersionV1      = 1
-	DefaultOptimizationVersion = OptimizationVersionV1
+	OptimizationVersionV1 = 1
 )
 
-func IsVersioningOptimized(version int) bool {
-	return version >= OptimizationVersionV1
+func IsVersioningOptimized(version *int) bool {
+	return version != nil && *version >= OptimizationVersionV1
 }
 
 var DefaultWorkflowConfig = &iwfidl.WorkflowConfig{

diff --git a/service/interfaces.go b/service/interfaces.go
@@ -30,7 +30,7 @@ type (
 
 		ContinueAsNewInput *ContinueAsNewInput `json:"continueAsNewInput,omitempty"`
 
-		OptimizationVersion int `json:"optmn,omitempty"`
+		OptimizationVersion *int `json:"optmn,omitempty"`
 	}
 
 	ContinueAsNewInput struct {