fix integration test

pingcap · Nov 18, 2022 · abdf626 · abdf626
1 parent ecd5eba
commit abdf626
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/ddl/backfilling.go b/ddl/backfilling.go
@@ -349,6 +349,11 @@ func (w *backfillWorker) run(d *ddlCtx, bf backfiller, job *model.Job) {
 		w.batchCnt = int(variable.GetDDLReorgBatchSize())
 		result := w.handleBackfillTask(d, task, bf)
 		w.resultCh <- result
+		if result.err != nil {
+			logutil.BgLogger().Info("[ddl] backfill worker exit on error",
+				zap.Stringer("type", w.tp), zap.Int("workerID", w.id), zap.Error(result.err))
+			return
+		}
 	}
 }
 

diff --git a/ddl/index_cop.go b/ddl/index_cop.go
@@ -80,6 +80,10 @@ func newCopContext(tblInfo *model.TableInfo, idxInfo *model.IndexInfo, sessCtx s
 	fieldTps := make([]*types.FieldType, 0, len(idxInfo.Columns))
 	for _, idxCol := range idxInfo.Columns {
 		c := tblInfo.Columns[idxCol.Offset]
+		if c.IsGenerated() && !c.GeneratedStored {
+			// TODO(tangenta): support reading virtual generated columns.
+			return nil
+		}
 		colInfos = append(colInfos, c)
 		fieldTps = append(fieldTps, &c.FieldType)
 	}