This is an automated cherry-pick of pingcap#64097

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>

Author: 0xPoe

pkg/ddl/notifier/testkit_test.go

@@ -57,6 +57,11 @@ const (
 	MetricSchemaDBID int64 = SystemSchemaIDFlag | 20000
 )
 
+// IsMemSchemaID checks whether schemaID is memory schema ID.
+func IsMemSchemaID(schemaID int64) bool {
+	return schemaID&SystemSchemaIDFlag != 0
+}
+
 const (
 	minStep            = 30000
 	maxStep            = 2000000

pkg/infoschema/infoschema_v2.go

@@ -22,6 +22,7 @@ go_test(
         "//pkg/sessiontxn",
         "//pkg/testkit",
         "//pkg/testkit/testdata",
+        "//pkg/testkit/testfailpoint",
         "//pkg/testkit/testmain",
         "//pkg/testkit/testsetup",
         "//pkg/util/hint",

pkg/meta/autoid/autoid.go

@@ -30,6 +30,7 @@ import (
 	"github.com/pingcap/tidb/pkg/sessiontxn"
 	"github.com/pingcap/tidb/pkg/testkit"
 	"github.com/pingcap/tidb/pkg/testkit/testdata"
+	"github.com/pingcap/tidb/pkg/testkit/testfailpoint"
 	"github.com/pingcap/tidb/pkg/util/hint"
 	"github.com/stretchr/testify/require"
 )
@@ -77,6 +78,25 @@ func TestDAGPlanBuilderSimpleCase(t *testing.T) {
 	}
 }
 
+<<<<<<< HEAD
+=======
+func TestDAGPlanBuilderSimpleCase(t *testing.T) {
+	testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/statistics/handle/SkipSystemTableCheck", `return(true)`)
+	if kerneltype.IsNextGen() {
+		t.Skip("Please run the TestDAGPlanBuilderSimpleCaseForNextGen")
+	}
+	testkit.RunTestUnderCascades(t, testDAGPlanBuilderSimpleCase)
+}
+
+func TestDAGPlanBuilderSimpleCaseForNextGen(t *testing.T) {
+	testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/statistics/handle/SkipSystemTableCheck", `return(true)`)
+	if kerneltype.IsClassic() {
+		t.Skip("Please run the TestDAGPlanBuilderSimpleCase")
+	}
+	testkit.RunTestUnderCascades(t, testDAGPlanBuilderSimpleCase)
+}
+
+>>>>>>> 9f3ae48f30b (statistics: ignore system tables in stats cache (#64097))
 func TestDAGPlanBuilderJoin(t *testing.T) {
 	store := testkit.CreateMockStore(t)
 

pkg/planner/core/casetest/dag/BUILD.bazel

@@ -2095,7 +2095,10 @@ func TestTiDBUpgradeToVer176(t *testing.T) {
 	ver, err = getBootstrapVersion(seV175)
 	require.NoError(t, err)
 	require.Less(t, int64(ver175), ver)
-	MustExec(t, seV175, "SELECT * from mysql.tidb_global_task_history")
+	// Avoid reusing the old session when checking the new table.
+	// Otherwise it may access the previous domain, which has already been closed.
+	newSession := CreateSessionAndSetID(t, store)
+	MustExec(t, newSession, "SELECT * from mysql.tidb_global_task_history")
 	dom.Close()
 }
 
@@ -2125,7 +2128,10 @@ func TestTiDBUpgradeToVer177(t *testing.T) {
 	ver, err = getBootstrapVersion(seV176)
 	require.NoError(t, err)
 	require.Less(t, int64(ver176), ver)
-	MustExec(t, seV176, "SELECT * from mysql.dist_framework_meta")
+	// Avoid reusing the old session when checking the new table.
+	// Otherwise it may access the previous domain, which has already been closed.
+	newSession := CreateSessionAndSetID(t, store)
+	MustExec(t, newSession, "SELECT * from mysql.dist_framework_meta")
 	dom.Close()
 }
 

pkg/planner/core/casetest/dag/dag_test.go

@@ -0,0 +1,57 @@
+load("@io_bazel_rules_go//go:def.bzl", "go_library", "go_test")
+
+go_library(
+    name = "syssession",
+    srcs = [
+        "pool.go",
+        "session.go",
+        "session_test_util.go",
+    ],
+    importpath = "github.com/pingcap/tidb/pkg/session/syssession",
+    visibility = ["//visibility:public"],
+    deps = [
+        "//pkg/domain/infosync",
+        "//pkg/kv",
+        "//pkg/parser/ast",
+        "//pkg/planner/core/resolve",
+        "//pkg/sessionctx",
+        "//pkg/util/chunk",
+        "//pkg/util/intest",
+        "//pkg/util/logutil",
+        "//pkg/util/sqlexec",
+        "@com_github_pingcap_errors//:errors",
+        "@com_github_pingcap_failpoint//:failpoint",
+        "@org_uber_go_zap//:zap",
+    ],
+)
+
+go_test(
+    name = "syssession_test",
+    timeout = "short",
+    srcs = [
+        "main_test.go",
+        "pool_test.go",
+        "session_integration_test.go",
+        "session_test.go",
+    ],
+    embed = [":syssession"],
+    flaky = True,
+    shard_count = 21,
+    deps = [
+        "//pkg/kv",
+        "//pkg/parser/ast",
+        "//pkg/planner/core/resolve",
+        "//pkg/session/sessmgr",
+        "//pkg/sessionctx",
+        "//pkg/sessiontxn",
+        "//pkg/testkit",
+        "//pkg/testkit/testfailpoint",
+        "//pkg/testkit/testsetup",
+        "//pkg/util/chunk",
+        "//pkg/util/sqlexec",
+        "@com_github_pingcap_errors//:errors",
+        "@com_github_stretchr_testify//mock",
+        "@com_github_stretchr_testify//require",
+        "@org_uber_go_goleak//:goleak",
+    ],
+)

pkg/session/bootstrap_test.go

@@ -0,0 +1,230 @@
+// Copyright 2025 PingCAP, Inc.
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package syssession_test
+
+import (
+	"context"
+	"testing"
+
+	"github.com/pingcap/errors"
+	"github.com/pingcap/tidb/pkg/kv"
+	"github.com/pingcap/tidb/pkg/session/syssession"
+	"github.com/pingcap/tidb/pkg/sessionctx"
+	"github.com/pingcap/tidb/pkg/sessiontxn"
+	"github.com/pingcap/tidb/pkg/testkit"
+	"github.com/pingcap/tidb/pkg/testkit/testfailpoint"
+	"github.com/stretchr/testify/require"
+)
+
+func TestDomainAdvancedSessionPoolInternalSessionRegistry(t *testing.T) {
+	_, do := testkit.CreateMockStoreAndDomain(t)
+	p := do.AdvancedSysSessionPool()
+	require.NotNil(t, p)
+
+	sessManager := do.InfoSyncer().GetSessionManager()
+
+	// test session manager registry when put back
+	// We test for more than one times to cover the case that the session is in the pool.
+	var sctx sessionctx.Context
+	var se *syssession.Session
+	for range 2 {
+		sctx = nil
+		se = nil
+		require.NoError(t, p.WithSession(func(session *syssession.Session) error {
+			require.Nil(t, se)
+			se = session
+			require.True(t, session.IsOwner())
+			return session.WithSessionContext(func(ctx sessionctx.Context) error {
+				require.Nil(t, sctx)
+				sctx = ctx
+				require.True(t, sessManager.ContainsInternalSession(ctx))
+				return nil
+			})
+		}))
+		require.NotNil(t, se)
+		require.False(t, se.IsInternalClosed())
+		require.False(t, se.IsOwner())
+		require.NotNil(t, sctx)
+		require.False(t, sessManager.ContainsInternalSession(sctx))
+	}
+
+	// test session manager registry when close session
+	sctx = nil
+	se, err := p.Get()
+	require.NoError(t, err)
+	require.NoError(t, se.WithSessionContext(func(ctx sessionctx.Context) error {
+		sctx = ctx
+		return nil
+	}))
+	require.NotNil(t, sctx)
+	require.True(t, sessManager.ContainsInternalSession(sctx))
+	se.Close()
+	require.False(t, sessManager.ContainsInternalSession(sctx))
+}
+
+func TestDomainAdvancedSessionPoolPutBackDirtySession(t *testing.T) {
+	testfailpoint.Enable(t, "github.com/pingcap/tidb/pkg/statistics/handle/SkipSystemTableCheck", `return(true)`)
+	store, do := testkit.CreateMockStoreAndDomain(t)
+	p := do.AdvancedSysSessionPool()
+	require.NotNil(t, p)
+
+	tk := testkit.NewTestKit(t, store)
+	tk.MustExec("use test")
+	tk.MustExec("create table t1(a int)")
+	tk.MustExec("insert into t1 values(1), (2), (3), (4), (5)")
+
+	ctx := kv.WithInternalSourceType(context.Background(), kv.InternalTxnOthers)
+	cases := []struct {
+		name               string
+		withSession        func(*syssession.Session) error
+		withSessionContext func(sessionctx.Context) error
+	}{
+		{
+			name: "put back closed one",
+			withSession: func(session *syssession.Session) error {
+				session.Close()
+				return nil
+			},
+		},
+		{
+			name: "return error for withSession",
+			withSession: func(session *syssession.Session) error {
+				return errors.New("err1")
+			},
+		},
+		{
+			name: "return error for withSessionContext",
+			withSessionContext: func(sctx sessionctx.Context) error {
+				return errors.New("err2")
+			},
+		},
+		{
+			name: "resultSetNotClose",
+			withSession: func(session *syssession.Session) error {
+				_, err := session.ExecuteInternal(ctx, "select * from test.t1")
+				require.NoError(t, err)
+				return nil
+			},
+		},
+		{
+			name: "optimisticTxnNotClose",
+			withSession: func(session *syssession.Session) error {
+				_, err := session.ExecuteInternal(ctx, "begin optimistic")
+				require.NoError(t, err)
+				return nil
+			},
+		},
+		{
+			name: "pessimisticTxnNotClose",
+			withSession: func(session *syssession.Session) error {
+				_, err := session.ExecuteInternal(ctx, "begin pessimistic")
+				require.NoError(t, err)
+				return nil
+			},
+		},
+		{
+			name: "tsFuturePrepared",
+			withSessionContext: func(sctx sessionctx.Context) error {
+				require.NoError(t, sctx.PrepareTSFuture(ctx, sessiontxn.ConstantFuture(1), kv.GlobalTxnScope))
+				return nil
+			},
+		},
+		{
+			name: "avoid reuse in withSession",
+			withSession: func(session *syssession.Session) error {
+				session.AvoidReuse()
+				return nil
+			},
+		},
+		{
+			name: "avoid reuse in withSessionContext",
+			withSession: func(session *syssession.Session) error {
+				return session.WithSessionContext(func(sessionctx.Context) error {
+					session.AvoidReuse()
+					return nil
+				})
+			},
+		},
+	}
+
+	for _, c := range cases {
+		t.Run(c.name, func(t *testing.T) {
+			var se *syssession.Session
+			var expectedErr error
+			syssession.WithSuppressAssert(func() {
+				err := p.WithSession(func(session *syssession.Session) error {
+					require.Nil(t, se)
+					se = session
+					require.True(t, session.IsOwner())
+					require.False(t, se.IsInternalClosed())
+					if c.withSession != nil {
+						expectedErr = c.withSession(session)
+						return expectedErr
+					}
+
+					if c.withSessionContext != nil {
+						err := session.WithSessionContext(func(sessionctx sessionctx.Context) error {
+							expectedErr = c.withSessionContext(sessionctx)
+							return expectedErr
+						})
+						if expectedErr != nil {
+							require.EqualError(t, err, expectedErr.Error())
+						} else {
+							require.NoError(t, err)
+						}
+						return err
+					}
+
+					return nil
+				})
+
+				if expectedErr != nil {
+					require.EqualError(t, err, expectedErr.Error())
+				} else {
+					require.NoError(t, err)
+				}
+			})
+			require.NotNil(t, se)
+			require.True(t, se.IsInternalClosed())
+			require.False(t, se.IsOwner())
+			require.Zero(t, p.(*syssession.AdvancedSessionPool).Size())
+		})
+	}
+
+	t.Run("success case", func(t *testing.T) {
+		var se *syssession.Session
+		require.NoError(t, p.WithSession(func(s *syssession.Session) error {
+			se = s
+			return s.WithSessionContext(func(sessionctx.Context) error { return nil })
+		}))
+		require.NotNil(t, se)
+		require.False(t, se.IsInternalClosed())
+		require.False(t, se.IsOwner())
+		require.Equal(t, 1, p.(*syssession.AdvancedSessionPool).Size())
+	})
+
+	t.Run("put back a put back case", func(t *testing.T) {
+		var se *syssession.Session
+		require.NoError(t, p.WithSession(func(s *syssession.Session) error {
+			se = s
+			p.Put(s)
+			return nil
+		}))
+		require.NotNil(t, se)
+		require.False(t, se.IsInternalClosed())
+		require.False(t, se.IsOwner())
+		require.Equal(t, 1, p.(*syssession.AdvancedSessionPool).Size())
+	})
+}

pkg/session/syssession/BUILD.bazel

@@ -15,8 +15,13 @@ go_library(
         "//pkg/ddl/util",
         "//pkg/infoschema",
         "//pkg/kv",
+<<<<<<< HEAD
         "//pkg/metrics",
         "//pkg/parser/model",
+=======
+        "//pkg/meta/autoid",
+        "//pkg/meta/model",
+>>>>>>> 9f3ae48f30b (statistics: ignore system tables in stats cache (#64097))
         "//pkg/parser/mysql",
         "//pkg/parser/terror",
         "//pkg/sessionctx",
@@ -36,6 +41,7 @@ go_library(
         "//pkg/types",
         "//pkg/util",
         "//pkg/util/chunk",
+        "//pkg/util/filter",
         "//pkg/util/intest",
         "//pkg/util/logutil",
         "//pkg/util/memory",