Don't send 0 batch id, don't replay empty deltas

PeerDB-io · Dec 7, 2023 · c592ca9 · c592ca9
1 parent ee99926
commit c592ca9
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 18 deletions.
diff --git a/flow/workflows/normalize_flow.go b/flow/workflows/normalize_flow.go
@@ -112,7 +112,6 @@ func NormalizeFlowWorkflow(
 				HeartbeatTimeout:    5 * time.Minute,
 			})
 
-			// execute StartFlow on the peers to start the flow
 			startNormalizeInput := &protos.StartNormalizeInput{
 				FlowConnectionConfigs: cfg,
 			}

diff --git a/flow/workflows/sync_flow.go b/flow/workflows/sync_flow.go
@@ -83,25 +83,29 @@ func (s *SyncFlowExecution) executeSyncFlow(
 		return nil, fmt.Errorf("failed to flow: %w", err)
 	}
 
-	replayTableSchemaDeltaCtx := workflow.WithActivityOptions(ctx, workflow.ActivityOptions{
-		StartToCloseTimeout: 30 * time.Minute,
-	})
-	replayTableSchemaInput := &protos.ReplayTableSchemaDeltaInput{
-		FlowConnectionConfigs: config,
-		TableSchemaDeltas:     syncRes.TableSchemaDeltas,
-	}
-
-	fReplayTableSchemaDelta := workflow.ExecuteActivity(replayTableSchemaDeltaCtx,
-		flowable.ReplayTableSchemaDeltas, replayTableSchemaInput)
-	if err := fReplayTableSchemaDelta.Get(replayTableSchemaDeltaCtx, nil); err != nil {
-		return nil, fmt.Errorf("failed to replay schema delta: %w", err)
+	if syncRes.CurrentSyncBatchID != 0 {
+		if len(syncRes.TableSchemaDeltas) != 0 {
+			replayTableSchemaDeltaCtx := workflow.WithActivityOptions(ctx, workflow.ActivityOptions{
+				StartToCloseTimeout: 30 * time.Minute,
+			})
+			replayTableSchemaInput := &protos.ReplayTableSchemaDeltaInput{
+				FlowConnectionConfigs: config,
+				TableSchemaDeltas:     syncRes.TableSchemaDeltas,
+			}
+
+			fReplayTableSchemaDelta := workflow.ExecuteActivity(replayTableSchemaDeltaCtx,
+				flowable.ReplayTableSchemaDeltas, replayTableSchemaInput)
+			if err := fReplayTableSchemaDelta.Get(replayTableSchemaDeltaCtx, nil); err != nil {
+				return nil, fmt.Errorf("failed to replay schema delta: %w", err)
+			}
+		}
+
+		workflow.SignalExternalWorkflow(ctx, normFlowId, normFlowRunId, "SchemaDelta", &model.NormalizeSyncSignal{
+			CurrentSyncBatchID: syncRes.CurrentSyncBatchID,
+			TableSchemaDeltas:  syncRes.TableSchemaDeltas,
+		})
 	}
 
-	workflow.SignalExternalWorkflow(ctx, normFlowId, normFlowRunId, "SchemaDelta", &model.NormalizeSyncSignal{
-		CurrentSyncBatchID: syncRes.CurrentSyncBatchID,
-		TableSchemaDeltas:  syncRes.TableSchemaDeltas,
-	})
-
 	return syncRes, nil
 }