Merge remote-tracking branch 'upstream/master' into add-index-checkpo…

…int-v2

Makefile

@@ -334,8 +334,9 @@ mock_s3iface:
 	@mockgen -package mock github.com/aws/aws-sdk-go/service/s3/s3iface S3API > br/pkg/mock/s3iface.go
 
 mock_lightning:
-	@mockgen -package mock -mock_names AbstractBackend=MockBackend github.com/pingcap/tidb/br/pkg/lightning/backend AbstractBackend,EngineWriter,TargetInfoGetter > br/pkg/mock/backend.go
+	@mockgen -package mock github.com/pingcap/tidb/br/pkg/lightning/backend Backend,EngineWriter,TargetInfoGetter,ChunkFlushStatus > br/pkg/mock/backend.go
 	@mockgen -package mock github.com/pingcap/tidb/br/pkg/lightning/backend/encode Encoder,EncodingBuilder,Rows,Row > br/pkg/mock/encode.go
+	@mockgen -package mocklocal github.com/pingcap/tidb/br/pkg/lightning/backend/local DiskUsage > br/pkg/mock/mocklocal/local.go
 
 # There is no FreeBSD environment for GitHub actions. So cross-compile on Linux
 # but that doesn't work with CGO_ENABLED=1, so disable cgo. The reason to have

br/pkg/gluetidb/BUILD.bazel

@@ -33,12 +33,14 @@ go_test(
     embed = [":gluetidb"],
     flaky = True,
     deps = [
+        "//br/pkg/glue",
         "//ddl",
         "//kv",
         "//meta",
         "//parser/model",
         "//sessionctx",
         "//testkit",
+        "//types",
         "@com_github_pingcap_failpoint//:failpoint",
         "@com_github_stretchr_testify//require",
     ],

br/pkg/gluetidb/glue.go

@@ -176,6 +176,12 @@ func (gs *tidbSession) ExecuteInternal(ctx context.Context, sql string, args ...
 	if err != nil {
 		return errors.Trace(err)
 	}
+	defer func() {
+		vars := gs.se.GetSessionVars()
+		vars.TxnCtxMu.Lock()
+		vars.TxnCtx.InfoSchema = nil
+		vars.TxnCtxMu.Unlock()
+	}()
 	// Some of SQLs (like ADMIN RECOVER INDEX) may lazily take effect
 	// when we polling the result set.
 	// At least call `next` once for triggering theirs side effect.

br/pkg/gluetidb/glue_test.go

@@ -20,12 +20,14 @@ import (
 	"testing"
 
 	"github.com/pingcap/failpoint"
+	"github.com/pingcap/tidb/br/pkg/glue"
 	"github.com/pingcap/tidb/ddl"
 	"github.com/pingcap/tidb/kv"
 	"github.com/pingcap/tidb/meta"
 	"github.com/pingcap/tidb/parser/model"
 	"github.com/pingcap/tidb/sessionctx"
 	"github.com/pingcap/tidb/testkit"
+	"github.com/pingcap/tidb/types"
 	"github.com/stretchr/testify/require"
 )
 
@@ -206,3 +208,63 @@ func TestSplitBatchCreateTableFailWithEntryTooLarge(t *testing.T) {
 
 	require.NoError(t, failpoint.Disable("github.com/pingcap/tidb/ddl/RestoreBatchCreateTableEntryTooLarge"))
 }
+
+func TestTheSessionIsoation(t *testing.T) {
+	req := require.New(t)
+	store, _ := testkit.CreateMockStoreAndDomain(t)
+	ctx := context.Background()
+
+	g := Glue{}
+	session, err := g.CreateSession(store)
+	req.NoError(err)
+
+	req.NoError(session.ExecuteInternal(ctx, "use test;"))
+	infos := []*model.TableInfo{}
+	infos = append(infos, &model.TableInfo{
+		Name: model.NewCIStr("tables_1"),
+		Columns: []*model.ColumnInfo{
+			{Name: model.NewCIStr("foo"), FieldType: *types.NewFieldType(types.KindBinaryLiteral), State: model.StatePublic},
+		},
+	})
+	infos = append(infos, &model.TableInfo{
+		Name: model.NewCIStr("tables_2"),
+		PlacementPolicyRef: &model.PolicyRefInfo{
+			Name: model.NewCIStr("threereplication"),
+		},
+		Columns: []*model.ColumnInfo{
+			{Name: model.NewCIStr("foo"), FieldType: *types.NewFieldType(types.KindBinaryLiteral), State: model.StatePublic},
+		},
+	})
+	infos = append(infos, &model.TableInfo{
+		Name: model.NewCIStr("tables_3"),
+		PlacementPolicyRef: &model.PolicyRefInfo{
+			Name: model.NewCIStr("fivereplication"),
+		},
+		Columns: []*model.ColumnInfo{
+			{Name: model.NewCIStr("foo"), FieldType: *types.NewFieldType(types.KindBinaryLiteral), State: model.StatePublic},
+		},
+	})
+	polices := []*model.PolicyInfo{
+		{
+			PlacementSettings: &model.PlacementSettings{
+				Followers: 4,
+			},
+			Name: model.NewCIStr("fivereplication"),
+		},
+		{
+			PlacementSettings: &model.PlacementSettings{
+				Followers: 2,
+			},
+			Name: model.NewCIStr("threereplication"),
+		},
+	}
+	for _, pinfo := range polices {
+		before := session.(*tidbSession).se.GetInfoSchema().SchemaMetaVersion()
+		req.NoError(session.CreatePlacementPolicy(ctx, pinfo))
+		after := session.(*tidbSession).se.GetInfoSchema().SchemaMetaVersion()
+		req.Greater(after, before)
+	}
+	req.NoError(session.(glue.BatchCreateTableSession).CreateTables(ctx, map[string][]*model.TableInfo{
+		"test": infos,
+	}))
+}

br/pkg/lightning/backend/BUILD.bazel

@@ -16,7 +16,6 @@ go_library(
         "@com_github_google_uuid//:uuid",
         "@com_github_pingcap_errors//:errors",
         "@com_github_pingcap_failpoint//:failpoint",
-        "@org_golang_x_exp//slices",
         "@org_uber_go_zap//:zap",
     ],
 )