Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

server: refactor session and sessiontxn #41122

Closed
wants to merge 1 commit into from
Closed

server: refactor session and sessiontxn #41122

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion executor/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,13 @@ go_library(
"//plugin",
"//privilege",
"//privilege/privileges",
"//session/txninfo",
"//sessionctx",
"//sessionctx/sessionstates",
"//sessionctx/stmtctx",
"//sessionctx/variable",
"//sessiontxn",
"//sessiontxn/staleread",
"//sessiontxn/txninfo",
"//statistics",
"//statistics/handle",
"//store/driver/backoff",
Expand Down
2 changes: 1 addition & 1 deletion executor/infoschema_reader.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,10 @@ import (
plannercore "github.com/pingcap/tidb/planner/core"
"github.com/pingcap/tidb/privilege"
"github.com/pingcap/tidb/privilege/privileges"
"github.com/pingcap/tidb/session/txninfo"
"github.com/pingcap/tidb/sessionctx"
"github.com/pingcap/tidb/sessionctx/variable"
"github.com/pingcap/tidb/sessiontxn"
"github.com/pingcap/tidb/sessiontxn/txninfo"
"github.com/pingcap/tidb/store/helper"
"github.com/pingcap/tidb/table"
"github.com/pingcap/tidb/tablecodec"
Expand Down
1 change: 1 addition & 0 deletions executor/seqtest/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ go_test(
"//server",
"//session",
"//sessionctx/variable",
"//sessiontxn",
"//statistics/handle",
"//store/copr",
"//store/mockstore",
Expand Down
5 changes: 3 additions & 2 deletions executor/seqtest/seq_executor_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,7 @@ import (
plannercore "github.com/pingcap/tidb/planner/core"
"github.com/pingcap/tidb/session"
"github.com/pingcap/tidb/sessionctx/variable"
"github.com/pingcap/tidb/sessiontxn"
"github.com/pingcap/tidb/statistics/handle"
"github.com/pingcap/tidb/store/copr"
"github.com/pingcap/tidb/store/mockstore"
Expand Down Expand Up @@ -1358,7 +1359,7 @@ func TestAutoRandIDRetry(t *testing.T) {
tk.MustExec("insert into t values (),()")
tk.MustExec("insert into t values ()")

session.ResetMockAutoRandIDRetryCount(5)
sessiontxn.ResetMockAutoRandIDRetryCount(5)
fpName := "github.com/pingcap/tidb/session/mockCommitRetryForAutoRandID"
require.NoError(t, failpoint.Enable(fpName, `return(true)`))
tk.MustExec("commit")
Expand All @@ -1367,7 +1368,7 @@ func TestAutoRandIDRetry(t *testing.T) {
maskedHandles := extractMaskedOrderedHandles()
require.Equal(t, []int64{1, 2, 3, 4, 5}, maskedHandles)

session.ResetMockAutoRandIDRetryCount(11)
sessiontxn.ResetMockAutoRandIDRetryCount(11)
tk.MustExec("begin")
tk.MustExec("insert into t values ()")
require.NoError(t, failpoint.Enable(fpName, `return(true)`))
Expand Down
4 changes: 2 additions & 2 deletions infoschema/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ go_library(
"//parser/mysql",
"//parser/terror",
"//privilege",
"//session/txninfo",
"//sessionctx",
"//sessionctx/variable",
"//sessiontxn/txninfo",
"//table",
"//table/tables",
"//types",
Expand Down Expand Up @@ -94,8 +94,8 @@ go_test(
"//planner/core",
"//server",
"//session",
"//session/txninfo",
"//sessionctx/variable",
"//sessiontxn/txninfo",
"//store/helper",
"//store/mockstore",
"//store/mockstore/mockstorage",
Expand Down
2 changes: 1 addition & 1 deletion infoschema/tables.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,9 @@ import (
"github.com/pingcap/tidb/parser/mysql"
"github.com/pingcap/tidb/parser/terror"
"github.com/pingcap/tidb/privilege"
"github.com/pingcap/tidb/session/txninfo"
"github.com/pingcap/tidb/sessionctx"
"github.com/pingcap/tidb/sessionctx/variable"
"github.com/pingcap/tidb/sessiontxn/txninfo"
"github.com/pingcap/tidb/table"
"github.com/pingcap/tidb/types"
"github.com/pingcap/tidb/util"
Expand Down
2 changes: 1 addition & 1 deletion infoschema/tables_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ import (
"github.com/pingcap/tidb/parser/terror"
plannercore "github.com/pingcap/tidb/planner/core"
"github.com/pingcap/tidb/session"
"github.com/pingcap/tidb/session/txninfo"
"github.com/pingcap/tidb/sessionctx/variable"
"github.com/pingcap/tidb/sessiontxn/txninfo"
"github.com/pingcap/tidb/testkit"
"github.com/pingcap/tidb/types"
"github.com/pingcap/tidb/util"
Expand Down
2 changes: 1 addition & 1 deletion server/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,13 +51,13 @@ go_library(
"//privilege",
"//privilege/privileges",
"//session",
"//session/txninfo",
"//sessionctx",
"//sessionctx/binloginfo",
"//sessionctx/sessionstates",
"//sessionctx/stmtctx",
"//sessionctx/variable",
"//sessiontxn",
"//sessiontxn/txninfo",
"//statistics/handle",
"//store",
"//store/driver/error",
Expand Down
2 changes: 1 addition & 1 deletion server/http_handler.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,11 +47,11 @@ import (
"github.com/pingcap/tidb/parser/model"
"github.com/pingcap/tidb/parser/terror"
"github.com/pingcap/tidb/session"
"github.com/pingcap/tidb/session/txninfo"
"github.com/pingcap/tidb/sessionctx"
"github.com/pingcap/tidb/sessionctx/binloginfo"
"github.com/pingcap/tidb/sessionctx/stmtctx"
"github.com/pingcap/tidb/sessionctx/variable"
"github.com/pingcap/tidb/sessiontxn/txninfo"
derr "github.com/pingcap/tidb/store/driver/error"
"github.com/pingcap/tidb/store/gcworker"
"github.com/pingcap/tidb/store/helper"
Expand Down
2 changes: 1 addition & 1 deletion server/server.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,8 +63,8 @@ import (
"github.com/pingcap/tidb/plugin"
"github.com/pingcap/tidb/privilege/privileges"
"github.com/pingcap/tidb/session"
"github.com/pingcap/tidb/session/txninfo"
"github.com/pingcap/tidb/sessionctx/variable"
"github.com/pingcap/tidb/sessiontxn/txninfo"
"github.com/pingcap/tidb/util"
"github.com/pingcap/tidb/util/dbterror"
"github.com/pingcap/tidb/util/fastrand"
Expand Down
5 changes: 2 additions & 3 deletions session/BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ go_library(
"nontransactional.go",
"session.go",
"tidb.go",
"txn.go",
"txnmanager.go",
],
importpath = "github.com/pingcap/tidb/session",
Expand Down Expand Up @@ -45,7 +44,6 @@ go_library(
"//plugin",
"//privilege",
"//privilege/privileges",
"//session/txninfo",
"//sessionctx",
"//sessionctx/binloginfo",
"//sessionctx/sessionstates",
Expand All @@ -54,6 +52,7 @@ go_library(
"//sessiontxn",
"//sessiontxn/isolation",
"//sessiontxn/staleread",
"//sessiontxn/txninfo",
"//statistics",
"//statistics/handle",
"//store/driver/error",
Expand Down Expand Up @@ -98,7 +97,6 @@ go_library(
"@com_github_tikv_client_go_v2//error",
"@com_github_tikv_client_go_v2//kv",
"@com_github_tikv_client_go_v2//oracle",
"@com_github_tikv_client_go_v2//tikv",
"@com_github_tikv_client_go_v2//util",
"@io_etcd_go_etcd_client_v3//concurrency",
"@org_uber_go_zap//:zap",
Expand Down Expand Up @@ -144,6 +142,7 @@ go_test(
"//server",
"//sessionctx",
"//sessionctx/variable",
"//sessiontxn",
"//statistics",
"//store/mockstore",
"//tablecodec",
Expand Down
2 changes: 1 addition & 1 deletion session/bootstrap_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ func TestBootstrapWithError(t *testing.T) {
sessionVars: variable.NewSessionVars(nil),
}
se.functionUsageMu.builtinFunctionUsage = make(telemetry.BuiltinFunctionsUsage)
se.txn.init()
se.txn().Init()
se.mu.values = make(map[fmt.Stringer]interface{})
se.SetValue(sessionctx.Initing, true)
err := InitDDLJobTables(store, meta.BaseDDLTableVersion)
Expand Down
Loading