check err inline

pingcap · Jan 6, 2023 · 1a4491c · 1a4491c
1 parent 26080e8
commit 1a4491c
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/cdc/processor/sourcemanager/engine/mounted_iter.go b/cdc/processor/sourcemanager/engine/mounted_iter.go
@@ -49,20 +49,20 @@ func (i *MountedEventIter) Next(ctx context.Context) (event *model.PolymorphicEv
 	// There are no events in mounting. Fetch more events and mounting them.
 	// The batch size is determined by `maxBatchSize`.
 	if i.nextToEmit >= len(i.rawEvents) {
-		err = i.readBatch(ctx)
-		if err != nil {
+		if err = i.readBatch(ctx); err != nil {
 			return
 		}
 	}
 
 	// Check whether there are events in mounting or not.
 	if i.nextToEmit < len(i.rawEvents) {
 		idx := i.nextToEmit
-		if err = i.rawEvents[idx].event.WaitFinished(ctx); err == nil {
-			event = i.rawEvents[idx].event
-			txnFinished = i.rawEvents[idx].txnFinished
-			i.nextToEmit += 1
+		if err = i.rawEvents[idx].event.WaitFinished(ctx); err != nil {
+			return
 		}
+		event = i.rawEvents[idx].event
+		txnFinished = i.rawEvents[idx].txnFinished
+		i.nextToEmit += 1
 	}
 	return
 }