Skip to content

Commit 68fdf55

Browse files
lcwangchaolcwangchao
authored
*: rename some packages of context (#56108)
close #56107
1 parent 70a26f8 commit 68fdf55

File tree

157 files changed

+1184
-1184
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

157 files changed

+1184
-1184
lines changed

‎pkg/ddl/BUILD.bazel

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,8 @@ go_library(
9696
"//pkg/domain/infosync",
9797
"//pkg/errctx",
9898
"//pkg/expression",
99-
"//pkg/expression/context",
100-
"//pkg/expression/contextstatic",
99+
"//pkg/expression/exprctx",
100+
"//pkg/expression/exprstatic",
101101
"//pkg/infoschema",
102102
"//pkg/kv",
103103
"//pkg/lightning/backend",
@@ -133,8 +133,8 @@ go_library(
133133
"//pkg/store/driver/txn",
134134
"//pkg/store/helper",
135135
"//pkg/table",
136-
"//pkg/table/context",
137136
"//pkg/table/tables",
137+
"//pkg/table/tblctx",
138138
"//pkg/tablecodec",
139139
"//pkg/tidb-binlog/pump_client",
140140
"//pkg/ttl/cache",
@@ -293,7 +293,7 @@ go_test(
293293
"//pkg/errno",
294294
"//pkg/executor",
295295
"//pkg/expression",
296-
"//pkg/expression/contextstatic",
296+
"//pkg/expression/exprstatic",
297297
"//pkg/infoschema",
298298
"//pkg/keyspace",
299299
"//pkg/kv",

‎pkg/ddl/add_column.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828
"github.com/pingcap/tidb/pkg/ddl/notifier"
2929
"github.com/pingcap/tidb/pkg/errctx"
3030
"github.com/pingcap/tidb/pkg/expression"
31-
exprctx "github.com/pingcap/tidb/pkg/expression/context"
31+
"github.com/pingcap/tidb/pkg/expression/exprctx"
3232
"github.com/pingcap/tidb/pkg/infoschema"
3333
"github.com/pingcap/tidb/pkg/meta"
3434
"github.com/pingcap/tidb/pkg/meta/autoid"

‎pkg/ddl/backfilling.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ import (
3232
ddlutil "github.com/pingcap/tidb/pkg/ddl/util"
3333
"github.com/pingcap/tidb/pkg/disttask/operator"
3434
"github.com/pingcap/tidb/pkg/expression"
35-
exprctx "github.com/pingcap/tidb/pkg/expression/context"
36-
"github.com/pingcap/tidb/pkg/expression/contextstatic"
35+
"github.com/pingcap/tidb/pkg/expression/exprctx"
36+
"github.com/pingcap/tidb/pkg/expression/exprstatic"
3737
"github.com/pingcap/tidb/pkg/kv"
3838
"github.com/pingcap/tidb/pkg/meta/model"
3939
"github.com/pingcap/tidb/pkg/metrics"
@@ -183,10 +183,10 @@ func newBackfillCtx(id int, rInfo *reorgInfo,
183183
// See: https://github.com/pingcap/tidb/pull/25728 for more details.
184184
hasStrictMode := rInfo.ReorgMeta.SQLMode.HasStrictMode()
185185
tc := exprCtx.GetStaticEvalCtx().TypeCtx()
186-
evalCtx := exprCtx.GetStaticEvalCtx().Apply(contextstatic.WithTypeFlags(
186+
evalCtx := exprCtx.GetStaticEvalCtx().Apply(exprstatic.WithTypeFlags(
187187
tc.Flags().WithIgnoreZeroDateErr(!hasStrictMode),
188188
))
189-
exprCtx = exprCtx.Apply(contextstatic.WithEvalCtx(evalCtx))
189+
exprCtx = exprCtx.Apply(exprstatic.WithEvalCtx(evalCtx))
190190
}
191191

192192
tblCtx := newReorgTableMutateContext(exprCtx)

‎pkg/ddl/backfilling_test.go

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222
"github.com/pingcap/tidb/pkg/ddl/ingest"
2323
distsqlctx "github.com/pingcap/tidb/pkg/distsql/context"
2424
"github.com/pingcap/tidb/pkg/errctx"
25-
"github.com/pingcap/tidb/pkg/expression/contextstatic"
25+
"github.com/pingcap/tidb/pkg/expression/exprstatic"
2626
"github.com/pingcap/tidb/pkg/kv"
2727
"github.com/pingcap/tidb/pkg/meta/model"
2828
"github.com/pingcap/tidb/pkg/parser/mysql"
@@ -96,21 +96,21 @@ func TestPickBackfillType(t *testing.T) {
9696
require.Equal(t, tp, model.ReorgTypeLitMerge)
9797
}
9898

99-
func assertStaticExprContextEqual(t *testing.T, sctx sessionctx.Context, exprCtx *contextstatic.StaticExprContext, warnHandler contextutil.WarnHandler) {
99+
func assertStaticExprContextEqual(t *testing.T, sctx sessionctx.Context, exprCtx *exprstatic.ExprContext, warnHandler contextutil.WarnHandler) {
100100
exprCtxManualCheckFields := []struct {
101101
field string
102-
check func(*contextstatic.StaticExprContext)
102+
check func(*exprstatic.ExprContext)
103103
}{
104104
{
105105
field: "evalCtx",
106-
check: func(ctx *contextstatic.StaticExprContext) {
106+
check: func(ctx *exprstatic.ExprContext) {
107107
require.NotZero(t, ctx.GetEvalCtx().CtxID())
108108
require.NotEqual(t, sctx.GetExprCtx().GetEvalCtx().CtxID(), ctx.GetEvalCtx().CtxID())
109109
},
110110
},
111111
{
112112
field: "blockEncryptionMode",
113-
check: func(context *contextstatic.StaticExprContext) {
113+
check: func(context *exprstatic.ExprContext) {
114114
m := sctx.GetExprCtx().GetBlockEncryptionMode()
115115
if m == "" {
116116
// Empty string is not a valid encryption mode, so we expect the exprCtx.GetBlockEncryptionMode()
@@ -123,13 +123,13 @@ func assertStaticExprContextEqual(t *testing.T, sctx sessionctx.Context, exprCtx
123123
},
124124
{
125125
field: "rng",
126-
check: func(ctx *contextstatic.StaticExprContext) {
126+
check: func(ctx *exprstatic.ExprContext) {
127127
require.NotNil(t, ctx.Rng())
128128
},
129129
},
130130
{
131131
field: "planCacheTracker",
132-
check: func(ctx *contextstatic.StaticExprContext) {
132+
check: func(ctx *exprstatic.ExprContext) {
133133
require.Equal(t, sctx.GetExprCtx().IsUseCache(), ctx.IsUseCache())
134134
ctx.SetSkipPlanCache("test reason")
135135
require.False(t, ctx.IsUseCache())
@@ -139,24 +139,24 @@ func assertStaticExprContextEqual(t *testing.T, sctx sessionctx.Context, exprCtx
139139

140140
evalCtxManualCheckFields := []struct {
141141
field string
142-
check func(*contextstatic.StaticEvalContext)
142+
check func(*exprstatic.EvalContext)
143143
}{
144144
{
145145
field: "warnHandler",
146-
check: func(ctx *contextstatic.StaticEvalContext) {
146+
check: func(ctx *exprstatic.EvalContext) {
147147
require.Same(t, warnHandler, ctx.GetWarnHandler())
148148
},
149149
},
150150
{
151151
field: "typeCtx.warnHandler",
152-
check: func(ctx *contextstatic.StaticEvalContext) {
152+
check: func(ctx *exprstatic.EvalContext) {
153153
ec := ctx.ErrCtx()
154154
require.Equal(t, errctx.NewContextWithLevels(ec.LevelMap(), ctx), ec)
155155
},
156156
},
157157
{
158158
field: "typeCtx.loc",
159-
check: func(ctx *contextstatic.StaticEvalContext) {
159+
check: func(ctx *exprstatic.EvalContext) {
160160
tc := ctx.TypeCtx()
161161
require.Same(t, tc.Location(), ctx.Location())
162162
require.Equal(t, sctx.GetSessionVars().Location().String(), tc.Location().String())
@@ -165,14 +165,14 @@ func assertStaticExprContextEqual(t *testing.T, sctx sessionctx.Context, exprCtx
165165
},
166166
{
167167
field: "errCtx.warnHandler",
168-
check: func(ctx *contextstatic.StaticEvalContext) {
168+
check: func(ctx *exprstatic.EvalContext) {
169169
tc := ctx.TypeCtx()
170170
require.Equal(t, types.NewContext(tc.Flags(), tc.Location(), ctx), tc)
171171
},
172172
},
173173
{
174174
field: "currentTime",
175-
check: func(ctx *contextstatic.StaticEvalContext) {
175+
check: func(ctx *exprstatic.EvalContext) {
176176
tm1, err := sctx.GetExprCtx().GetEvalCtx().CurrentTime()
177177
require.NoError(t, err)
178178

@@ -184,7 +184,7 @@ func assertStaticExprContextEqual(t *testing.T, sctx sessionctx.Context, exprCtx
184184
},
185185
{
186186
field: "requestVerificationFn",
187-
check: func(ctx *contextstatic.StaticEvalContext) {
187+
check: func(ctx *exprstatic.EvalContext) {
188188
// RequestVerification should allow all privileges
189189
// that is the same with input session context (GetPrivilegeManager returns nil).
190190
require.Nil(t, privilege.GetPrivilegeManager(sctx))
@@ -194,7 +194,7 @@ func assertStaticExprContextEqual(t *testing.T, sctx sessionctx.Context, exprCtx
194194
},
195195
{
196196
field: "requestDynamicVerificationFn",
197-
check: func(ctx *contextstatic.StaticEvalContext) {
197+
check: func(ctx *exprstatic.EvalContext) {
198198
// RequestDynamicVerification should allow all privileges
199199
// that is the same with input session context (GetPrivilegeManager returns nil).
200200
require.Nil(t, privilege.GetPrivilegeManager(sctx))
@@ -204,21 +204,21 @@ func assertStaticExprContextEqual(t *testing.T, sctx sessionctx.Context, exprCtx
204204
},
205205
}
206206

207-
// check StaticExprContext except StaticEvalContext
207+
// check ExprContext except EvalContext
208208
expected := sctx.GetExprCtx().(*mock.Context).IntoStatic()
209209
ignoreFields := make([]string, 0, len(exprCtxManualCheckFields))
210210
for _, f := range exprCtxManualCheckFields {
211211
f.check(exprCtx)
212-
ignoreFields = append(ignoreFields, "$.staticExprCtxState."+f.field)
212+
ignoreFields = append(ignoreFields, "$.exprCtxState."+f.field)
213213
}
214214
deeptest.AssertDeepClonedEqual(t, expected, exprCtx, deeptest.WithIgnorePath(ignoreFields))
215215

216-
// check StaticEvalContext
216+
// check EvalContext
217217
ignoreFields = make([]string, 0, len(evalCtxManualCheckFields))
218218
ignoreFields = append(ignoreFields, "$.id")
219219
for _, f := range evalCtxManualCheckFields {
220220
f.check(exprCtx.GetStaticEvalCtx())
221-
ignoreFields = append(ignoreFields, "$.staticEvalCtxState."+f.field)
221+
ignoreFields = append(ignoreFields, "$.evalCtxState."+f.field)
222222
}
223223
deeptest.AssertDeepClonedEqual(
224224
t,
@@ -298,7 +298,7 @@ func TestReorgTableMutateContext(t *testing.T) {
298298
originalRowFmt := variable.GetDDLReorgRowFormat()
299299
defer variable.SetDDLReorgRowFormat(originalRowFmt)
300300

301-
exprCtx := contextstatic.NewStaticExprContext()
301+
exprCtx := exprstatic.NewExprContext()
302302

303303
assertTblCtxMatchSessionCtx := func(ctx table.MutateContext, sctx sessionctx.Context) {
304304
sctxTblCtx := sctx.GetTableCtx()

‎pkg/ddl/copr/BUILD.bazel

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ go_library(
88
deps = [
99
"//pkg/distsql/context",
1010
"//pkg/expression",
11-
"//pkg/expression/context",
11+
"//pkg/expression/exprctx",
1212
"//pkg/infoschema",
1313
"//pkg/meta/model",
1414
"//pkg/parser/model",
@@ -27,7 +27,7 @@ go_test(
2727
shard_count = 3,
2828
deps = [
2929
"//pkg/expression",
30-
"//pkg/expression/contextstatic",
30+
"//pkg/expression/exprstatic",
3131
"//pkg/meta/model",
3232
"//pkg/parser/model",
3333
"//pkg/parser/mysql",

‎pkg/ddl/copr/copr_ctx.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import (
1818
"github.com/pingcap/errors"
1919
distsqlctx "github.com/pingcap/tidb/pkg/distsql/context"
2020
"github.com/pingcap/tidb/pkg/expression"
21-
exprctx "github.com/pingcap/tidb/pkg/expression/context"
21+
"github.com/pingcap/tidb/pkg/expression/exprctx"
2222
// make sure mock.MockInfoschema is initialized to make sure the test pass
2323
_ "github.com/pingcap/tidb/pkg/infoschema"
2424
"github.com/pingcap/tidb/pkg/meta/model"

‎pkg/ddl/copr/copr_ctx_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import (
1919
"testing"
2020

2121
"github.com/pingcap/tidb/pkg/expression"
22-
"github.com/pingcap/tidb/pkg/expression/contextstatic"
22+
"github.com/pingcap/tidb/pkg/expression/exprstatic"
2323
"github.com/pingcap/tidb/pkg/meta/model"
2424
pmodel "github.com/pingcap/tidb/pkg/parser/model"
2525
"github.com/pingcap/tidb/pkg/parser/mysql"
@@ -202,7 +202,7 @@ func TestCollectVirtualColumnOffsetsAndTypes(t *testing.T) {
202202
}
203203
for _, tt := range tests {
204204
t.Run(tt.name, func(t *testing.T) {
205-
ctx := contextstatic.NewStaticEvalContext()
205+
ctx := exprstatic.NewEvalContext()
206206
gotOffsets, gotFt := collectVirtualColumnOffsetsAndTypes(ctx, tt.cols)
207207
require.Equal(t, gotOffsets, tt.offsets)
208208
require.Equal(t, len(gotFt), len(tt.fieldTp))

‎pkg/ddl/index_cop.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
distsqlctx "github.com/pingcap/tidb/pkg/distsql/context"
2626
"github.com/pingcap/tidb/pkg/errctx"
2727
"github.com/pingcap/tidb/pkg/expression"
28-
exprctx "github.com/pingcap/tidb/pkg/expression/context"
28+
"github.com/pingcap/tidb/pkg/expression/exprctx"
2929
"github.com/pingcap/tidb/pkg/kv"
3030
"github.com/pingcap/tidb/pkg/meta/model"
3131
"github.com/pingcap/tidb/pkg/table"

‎pkg/ddl/modify_column.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ import (
2727
sess "github.com/pingcap/tidb/pkg/ddl/session"
2828
"github.com/pingcap/tidb/pkg/errctx"
2929
"github.com/pingcap/tidb/pkg/expression"
30-
exprctx "github.com/pingcap/tidb/pkg/expression/context"
30+
"github.com/pingcap/tidb/pkg/expression/exprctx"
3131
"github.com/pingcap/tidb/pkg/infoschema"
3232
"github.com/pingcap/tidb/pkg/kv"
3333
"github.com/pingcap/tidb/pkg/meta"

0 commit comments

Comments
 (0)