*: make IsVirtualGeneratedColumn more readable (#47203)

ddl/column.go

@@ -1396,7 +1396,7 @@ func (w *updateColumnWorker) calcChecksums() []uint32 {
 			w.checksumBuffer.Cols = w.checksumBuffer.Cols[:0]
 		}
 		for _, col := range w.table.DeletableCols() {
-			if col.ID == id || (col.IsGenerated() && !col.GeneratedStored) {
+			if col.ID == id || (col.IsVirtualGenerated()) {
 				continue
 			}
 			d := w.rowMap[col.ID]
@@ -1958,14 +1958,6 @@ func generateOriginDefaultValue(col *model.ColumnInfo, ctx sessionctx.Context) (
 	return odValue, nil
 }
 
-// isVirtualGeneratedColumn checks the column if it is virtual.
-func isVirtualGeneratedColumn(col *model.ColumnInfo) bool {
-	if col.IsGenerated() && !col.GeneratedStored {
-		return true
-	}
-	return false
-}
-
 func indexInfoContains(idxID int64, idxInfos []*model.IndexInfo) bool {
 	for _, idxInfo := range idxInfos {
 		if idxID == idxInfo.ID {

ddl/ddl_api.go

@@ -4903,7 +4903,7 @@ func checkTableDefCompatible(source *model.TableInfo, target *model.TableInfo) e
 	// Col compatible check
 	for i, sourceCol := range source.Cols() {
 		targetCol := target.Cols()[i]
-		if isVirtualGeneratedColumn(sourceCol) != isVirtualGeneratedColumn(targetCol) {
+		if sourceCol.IsVirtualGenerated() != targetCol.IsVirtualGenerated() {
 			return dbterror.ErrUnsupportedOnGeneratedColumn.GenWithStackByArgs("Exchanging partitions for non-generated columns")
 		}
 		// It should strictyle compare expressions for generated columns

expression/expression.go

@@ -993,7 +993,7 @@ func ColumnInfos2ColumnsAndNames(ctx sessionctx.Context, dbName, tblName model.C
 	}()
 	ctx.GetSessionVars().StmtCtx.IgnoreTruncate.Store(true)
 	for i, col := range colInfos {
-		if col.IsGenerated() && !col.GeneratedStored {
+		if col.IsVirtualGenerated() {
 			expr, err := generatedexpr.ParseExpression(col.GeneratedExprString)
 			if err != nil {
 				return nil, nil, errors.Trace(err)

parser/model/model.go

@@ -129,6 +129,11 @@ type ColumnInfo struct {
 	Version uint64 `json:"version"`
 }
 
+// IsVirtualGenerated checks the column if it is virtual.
+func (c *ColumnInfo) IsVirtualGenerated() bool {
+	return c.IsGenerated() && !c.GeneratedStored
+}
+
 // Clone clones ColumnInfo.
 func (c *ColumnInfo) Clone() *ColumnInfo {
 	if c == nil {

planner/core/find_best_task.go

@@ -2096,7 +2096,7 @@ func (ds *DataSource) convertToTableScan(prop *property.PhysicalProperty, candid
 	}
 	if ts.StoreType == kv.TiFlash {
 		for _, col := range ts.Columns {
-			if col.IsGenerated() && !col.GeneratedStored {
+			if col.IsVirtualGenerated() {
 				col.AddFlag(mysql.GeneratedColumnFlag)
 			}
 		}

planner/core/planbuilder.go

@@ -2099,7 +2099,7 @@ func getColsInfo(tn *ast.TableName) (indicesInfo []*model.IndexInfo, colsInfo []
 	tbl := tn.TableInfo
 	for _, col := range tbl.Columns {
 		// The virtual column will not store any data in TiKV, so it should be ignored when collect statistics
-		if col.IsGenerated() && !col.GeneratedStored {
+		if col.IsVirtualGenerated() {
 			continue
 		}
 		if mysql.HasPriKeyFlag(col.GetFlag()) && tbl.HasClusteredIndex() {

server/err/BUILD.bazel

@@ -1,16 +1,5 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
-go_library(
-    name = "error",
-    srcs = ["error.go"],
-    importpath = "github.com/pingcap/tidb/server/error",
-    visibility = ["//visibility:public"],
-    deps = [
-        "//errno",
-        "//util/dbterror",
-    ],
-)
-
 go_library(
     name = "err",
     srcs = ["error.go"],

statistics/handle/globalstats/global_stats.go

@@ -88,7 +88,7 @@ func MergePartitionStats2GlobalStats(
 	if len(histIDs) == 0 {
 		for _, col := range globalTableInfo.Columns {
 			// The virtual generated column stats can not be merged to the global stats.
-			if col.IsGenerated() && !col.GeneratedStored {
+			if col.IsVirtualGenerated() {
 				continue
 			}
 			histIDs = append(histIDs, col.ID)

table/tables/tables.go

@@ -1249,7 +1249,7 @@ func DecodeRawRowData(ctx sessionctx.Context, meta *model.TableInfo, h kv.Handle
 			v[i] = ri
 			continue
 		}
-		if col.IsGenerated() && !col.GeneratedStored {
+		if col.IsVirtualGenerated() {
 			continue
 		}
 		if col.ChangeStateInfo != nil {
@@ -1948,18 +1948,15 @@ func CanSkip(info *model.TableInfo, col *table.Column, value *types.Datum) bool
 	if col.GetDefaultValue() == nil && value.IsNull() && col.GetOriginDefaultValue() == nil {
 		return true
 	}
-	if col.IsGenerated() && !col.GeneratedStored {
+	if col.IsVirtualGenerated() {
 		return true
 	}
 	return false
 }
 
 // canSkipUpdateBinlog checks whether the column can be skipped or not.
 func (t *TableCommon) canSkipUpdateBinlog(col *table.Column, value types.Datum) bool {
-	if col.IsGenerated() && !col.GeneratedStored {
-		return true
-	}
-	return false
+	return col.IsVirtualGenerated()
 }
 
 // FindIndexByColName returns a public table index containing only one column named `name`.

testkit/testsetup/BUILD.bazel

@@ -1,17 +1,5 @@
 load("@io_bazel_rules_go//go:def.bzl", "go_library")
 
-go_library(
-    name = "testbridge",
-    srcs = ["bridge.go"],
-    importpath = "github.com/pingcap/tidb/util/testbridge",
-    visibility = ["//visibility:public"],
-    deps = [
-        "@com_github_pingcap_log//:log",
-        "@org_uber_go_zap//:zap",
-        "@org_uber_go_zap//zapcore",
-    ],
-)
-
 go_library(
     name = "testsetup",
     srcs = ["bridge.go"],