Whoops, skip segments that are before the FirstIndex of a module, not…

… the reverse.
streamingfast · Jul 3, 2023 · ed46cb3 · ed46cb3
1 parent 72ad2e5
commit ed46cb3
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/orchestrator/stage/squash.go b/orchestrator/stage/squash.go
@@ -25,7 +25,7 @@ func (s *Stages) multiSquash(stage *Stage, mergeUnit Unit) error {
 
 	// Launch parallel jobs to merge all stages' stores.
 	for _, modState := range stage.moduleStates {
-		if modState.segmenter.FirstIndex() < mergeUnit.Segment {
+		if mergeUnit.Segment < modState.segmenter.FirstIndex() {
 			continue
 		}
 
@@ -50,6 +50,7 @@ func (s *Stages) multiSquash(stage *Stage, mergeUnit Unit) error {
 // We keep the cache of the latest FullKV store, to speed up things
 // if they are linear
 func (s *Stages) singleSquash(stage *Stage, modState *ModuleState, mergeUnit Unit) error {
+	fmt.Println("running singleSquash", mergeUnit)
 	metrics := mergeMetrics{}
 	metrics.start = time.Now()
 

diff --git a/test/integration_test.go b/test/integration_test.go
@@ -373,7 +373,7 @@ func TestOneStoreOneMap(t *testing.T) {
 	for idx, test := range tests {
 		t.Run(test.name, func(t *testing.T) {
 			if idx < 2 {
-				// FIXME: remove this skipp
+				// FIXME: remove this skip
 				t.Skip("skipped")
 			}