Accept ExecutionTuple in SegmentedIndex constructor

Resolves grafana/k6#1863 (comment)
APITeamLimited · Jun 21, 2021 · 01a82de · 01a82de
1 parent b528304
commit 01a82de
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 15 deletions.
diff --git a/lib/execution_segment.go b/lib/execution_segment.go
@@ -741,8 +741,9 @@ type SegmentedIndex struct ***REMOVED***
 ***REMOVED***
 
 // NewSegmentedIndex returns a pointer to a new SegmentedIndex instance,
-// given a starting index, LCD and offsets as returned by GetStripedOffsets().
-func NewSegmentedIndex(start, lcd int64, offsets []int64) *SegmentedIndex ***REMOVED***
+// given an ExecutionTuple.
+func NewSegmentedIndex(et *ExecutionTuple) *SegmentedIndex ***REMOVED***
+	start, offsets, lcd := et.GetStripedOffsets()
 	return &SegmentedIndex***REMOVED***start: start, lcd: lcd, offsets: offsets***REMOVED***
 ***REMOVED***
 

diff --git a/lib/executor/base_executor.go b/lib/executor/base_executor.go
@@ -49,8 +49,7 @@ type BaseExecutor struct ***REMOVED***
 
 // NewBaseExecutor returns an initialized BaseExecutor
 func NewBaseExecutor(config lib.ExecutorConfig, es *lib.ExecutionState, logger *logrus.Entry) *BaseExecutor ***REMOVED***
-	start, offsets, lcd := es.ExecutionTuple.GetStripedOffsets()
-	segIdx := lib.NewSegmentedIndex(start, lcd, offsets)
+	segIdx := lib.NewSegmentedIndex(es.ExecutionTuple)
 	return &BaseExecutor***REMOVED***
 		config:         config,
 		executionState: es,

diff --git a/lib/executor/constant_arrival_rate.go b/lib/executor/constant_arrival_rate.go
@@ -196,8 +196,7 @@ func (car *ConstantArrivalRate) Init(ctx context.Context) error ***REMOVED***
 	// with no work, as determined by their config's HasWork() method.
 	et, err := car.BaseExecutor.executionState.ExecutionTuple.GetNewExecutionTupleFromValue(car.config.MaxVUs.Int64)
 	car.et = et
-	start, offsets, lcd := et.GetStripedOffsets()
-	car.iterSegIndex = lib.NewSegmentedIndex(start, lcd, offsets)
+	car.iterSegIndex = lib.NewSegmentedIndex(et)
 
 	return err
 ***REMOVED***

diff --git a/lib/executor/ramping_arrival_rate.go b/lib/executor/ramping_arrival_rate.go
@@ -187,8 +187,7 @@ func (varr *RampingArrivalRate) Init(ctx context.Context) error ***REMOVED***
 	// with no work, as determined by their config's HasWork() method.
 	et, err := varr.BaseExecutor.executionState.ExecutionTuple.GetNewExecutionTupleFromValue(varr.config.MaxVUs.Int64)
 	varr.et = et
-	start, offsets, lcd := et.GetStripedOffsets()
-	varr.iterSegIndex = lib.NewSegmentedIndex(start, lcd, offsets)
+	varr.iterSegIndex = lib.NewSegmentedIndex(et)
 
 	return err //nolint: wrapcheck
 ***REMOVED***

diff --git a/lib/executor/ramping_vus.go b/lib/executor/ramping_vus.go
@@ -187,11 +187,10 @@ func (vlvc RampingVUsConfig) Validate() []error ***REMOVED***
 // More information: https://github.com/k6io/k6/issues/997#issuecomment-484416866
 func (vlvc RampingVUsConfig) getRawExecutionSteps(et *lib.ExecutionTuple, zeroEnd bool) []lib.ExecutionStep ***REMOVED***
 	var (
-		timeTillEnd         time.Duration
-		fromVUs             = vlvc.StartVUs.Int64
-		start, offsets, lcd = et.GetStripedOffsets()
-		steps               = make([]lib.ExecutionStep, 0, vlvc.precalculateTheRequiredSteps(et, zeroEnd))
-		index               = lib.NewSegmentedIndex(start, lcd, offsets)
+		timeTillEnd time.Duration
+		fromVUs     = vlvc.StartVUs.Int64
+		steps       = make([]lib.ExecutionStep, 0, vlvc.precalculateTheRequiredSteps(et, zeroEnd))
+		index       = lib.NewSegmentedIndex(et)
 	)
 
 	// Reserve the scaled StartVUs at the beginning

diff --git a/lib/executor/shared_iterations.go b/lib/executor/shared_iterations.go
@@ -176,8 +176,7 @@ func (si *SharedIterations) Init(ctx context.Context) error ***REMOVED***
 	// with no work, as determined by their config's HasWork() method.
 	et, err := si.BaseExecutor.executionState.ExecutionTuple.GetNewExecutionTupleFromValue(si.config.VUs.Int64)
 	si.et = et
-	start, offsets, lcd := et.GetStripedOffsets()
-	si.iterSegIndex = lib.NewSegmentedIndex(start, lcd, offsets)
+	si.iterSegIndex = lib.NewSegmentedIndex(et)
 
 	return err
 ***REMOVED***