simplify

arenadata · Nov 2, 2024 · 248dad2 · 248dad2
1 parent faabf0e
commit 248dad2
Showing 1 changed file with 7 additions and 13 deletions.
diff --git a/restore/data.go b/restore/data.go
@@ -76,7 +76,7 @@ func CopyTableIn(queryContext context.Context, connectionPool *dbconn.DBConn, ta
 	return rowsLoaded, nil
 }
 
-func restoreSingleTableData(queryContext context.Context, fpInfo *filepath.FilePathInfo, entry toc.CoordinatorDataEntry, tableName string, whichConn int) (error, error) {
+func restoreSingleTableData(queryContext context.Context, cancel context.CancelFunc, fpInfo *filepath.FilePathInfo, entry toc.CoordinatorDataEntry, tableName string, whichConn int) error {
 	origSize, destSize, resizeCluster, batches := GetResizeClusterInfo()
 
 	var numRowsRestored int64
@@ -108,7 +108,8 @@ func restoreSingleTableData(queryContext context.Context, fpInfo *filepath.FileP
 			agentErr := utils.CheckAgentErrorsOnSegments(globalCluster, globalFPInfo)
 			if agentErr != nil {
 				gplog.Error(agentErr.Error())
-				return nil, agentErr
+				cancel()
+				return agentErr
 			}
 		}
 
@@ -122,7 +123,7 @@ func restoreSingleTableData(queryContext context.Context, fpInfo *filepath.FileP
 					utils.CreateSkipFileOnSegments(fmt.Sprintf("%d", entry.Oid), tableName, globalCluster, globalFPInfo)
 				}
 			}
-			return copyErr, nil
+			return copyErr
 		}
 		numRowsRestored += partialRowsRestored
 	}
@@ -140,7 +141,7 @@ func restoreSingleTableData(queryContext context.Context, fpInfo *filepath.FileP
 	err := CheckRowsRestored(numRowsRestored, numRowsBackedUp, tableName)
 	if err != nil {
 		gplog.Error(err.Error())
-		return err, nil
+		return err
 	}
 
 	if resizeCluster || entry.DistByEnum {
@@ -158,7 +159,7 @@ func restoreSingleTableData(queryContext context.Context, fpInfo *filepath.FileP
 		}
 	}
 
-	return nil, nil
+	return nil
 }
 
 func ExpandReplicatedTable(origSize int, tableName string, whichConn int) error {
@@ -295,7 +296,6 @@ func restoreDataFromTimestamp(fpInfo filepath.FilePathInfo, dataEntries []toc.Co
 				}
 				// Truncate table before restore, if needed
 				var err error
-				var agentErr error
 				if MustGetFlagBool(options.INCREMENTAL) || MustGetFlagBool(options.TRUNCATE_TABLE) {
 					gplog.Verbose("Truncating table %s prior to restoring data", tableName)
 					_, err := connectionPool.Exec(`TRUNCATE `+tableName, whichConn)
@@ -304,13 +304,7 @@ func restoreDataFromTimestamp(fpInfo filepath.FilePathInfo, dataEntries []toc.Co
 					}
 				}
 				if err == nil {
-					err, agentErr = restoreSingleTableData(ctx, &fpInfo, entry, tableName, whichConn)
-					if agentErr != nil {
-						atomic.AddInt32(&numErrors, 1)
-						dataProgressBar.(*pb.ProgressBar).NotPrint = true
-						cancel()
-						return
-					}
+					err = restoreSingleTableData(ctx, cancel, &fpInfo, entry, tableName, whichConn)
 				}
 
 				if err != nil {