Skip to content

Commit

Permalink
dep: update tidb-tools (#11070)
Browse files Browse the repository at this point in the history
  • Loading branch information
@lance6716
lance6716 authored May 11, 2024
1 parent 0332357 commit 2bc8f02
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 28 deletions.
13 changes: 3 additions & 10 deletions dm/pkg/utils/common.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ import (
"sync"

exprctx "github.com/pingcap/tidb/pkg/expression/context"
exprctximpl "github.com/pingcap/tidb/pkg/expression/contextimpl"
"github.com/pingcap/tidb/pkg/expression/contextsession"
infoschema "github.com/pingcap/tidb/pkg/infoschema/context"
"github.com/pingcap/tidb/pkg/parser/model"
"github.com/pingcap/tidb/pkg/sessionctx"
Expand Down Expand Up @@ -150,14 +150,10 @@ func UnpackTableID(id string) *filter.Table {
}
}

type exprCtxImpl struct {
*session
*exprctximpl.ExprCtxExtendedImpl
}
type session struct {
sessionctx.Context
vars *variable.SessionVars
exprctx *exprCtxImpl
exprctx exprctx.ExprContext
values map[fmt.Stringer]interface{}
builtinFunctionUsage map[string]uint32
mu sync.RWMutex
Expand Down Expand Up @@ -218,10 +214,7 @@ func NewSessionCtx(vars map[string]string) sessionctx.Context {
values: make(map[fmt.Stringer]interface{}, 1),
builtinFunctionUsage: make(map[string]uint32),
}
sessionCtx.exprctx = &exprCtxImpl{
session: &sessionCtx,
ExprCtxExtendedImpl: exprctximpl.NewExprExtendedImpl(&sessionCtx),
}
sessionCtx.exprctx = contextsession.NewExprExtendedImpl(&sessionCtx)
return &sessionCtx
}

Expand Down
11 changes: 5 additions & 6 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,10 @@ require (
github.com/pingcap/failpoint v0.0.0-20220801062533-2eaa32854a6c
github.com/pingcap/kvproto v0.0.0-20240227073058-929ab83f9754
github.com/pingcap/log v1.1.1-0.20240314023424-862ccc32f18d
github.com/pingcap/tidb v1.1.0-beta.0.20240415145106-cd9c676e9ba4
github.com/pingcap/tidb v1.1.0-beta.0.20240428083427-66ba419636ce
github.com/pingcap/tidb-dashboard v0.0.0-20240326110213-9768844ff5d7
github.com/pingcap/tidb-tools v0.0.0-20240305021104-9f9bea84490b
github.com/pingcap/tidb/pkg/parser v0.0.0-20240410110152-5fc42c9be2f5
github.com/pingcap/tidb-tools v0.0.0-20240508055508-ee5de104059e
github.com/pingcap/tidb/pkg/parser v0.0.0-20240428083427-66ba419636ce
github.com/prometheus/client_golang v1.19.0
github.com/prometheus/client_model v0.6.1
github.com/r3labs/diff v1.1.0
Expand All @@ -90,7 +90,7 @@ require (
github.com/swaggo/swag v1.16.3
github.com/syndtr/goleveldb v1.0.1-0.20210305035536-64b5b1c73954
github.com/thanhpk/randstr v1.0.6
github.com/tikv/client-go/v2 v2.0.8-0.20240409022718-714958ccd4d5
github.com/tikv/client-go/v2 v2.0.8-0.20240424052342-0229f4077f0c
github.com/tikv/pd v1.1.0-beta.0.20240407022249-7179657d129b
github.com/tikv/pd/client v0.0.0-20240322051414-fb9e2d561b6e
github.com/tinylib/msgp v1.1.6
Expand Down Expand Up @@ -170,7 +170,6 @@ require (
github.com/kylelemons/godebug v1.1.0 // indirect
github.com/otiai10/copy v1.2.0 // indirect
github.com/robfig/cron/v3 v3.0.1 // indirect
github.com/scalalang2/golang-fifo v0.1.5 // indirect
github.com/segmentio/asm v1.2.0 // indirect
github.com/sergi/go-diff v1.3.1 // indirect
github.com/tidwall/btree v1.7.0 // indirect
Expand Down Expand Up @@ -330,7 +329,7 @@ require (
github.com/pkg/errors v0.9.1 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/power-devops/perfstat v0.0.0-20221212215047-62379fc7944b // indirect
github.com/prometheus/common v0.52.2 // indirect
github.com/prometheus/common v0.53.0 // indirect
github.com/prometheus/procfs v0.13.0 // indirect
github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec // indirect
github.com/reusee/mmh3 v0.0.0-20140820141314-64b85163255b // indirect
Expand Down
22 changes: 10 additions & 12 deletions go.sum
View file
Original file line number Diff line number Diff line change
Expand Up @@ -835,14 +835,14 @@ github.com/pingcap/log v1.1.1-0.20240314023424-862ccc32f18d h1:y3EueKVfVykdpTyfU
github.com/pingcap/log v1.1.1-0.20240314023424-862ccc32f18d/go.mod h1:ORfBOFp1eteu2odzsyaxI+b8TzJwgjwyQcGhI+9SfEA=
github.com/pingcap/sysutil v1.0.1-0.20240311050922-ae81ee01f3a5 h1:T4pXRhBflzDeAhmOQHNPRRogMYxP13V7BkYw3ZsoSfE=
github.com/pingcap/sysutil v1.0.1-0.20240311050922-ae81ee01f3a5/go.mod h1:rlimy0GcTvjiJqvD5mXTRr8O2eNZPBrcUgiWVYp9530=
github.com/pingcap/tidb v1.1.0-beta.0.20240415145106-cd9c676e9ba4 h1:ABG15lJCeFLVhCLtJZ7FEkddtdr7yI2/vdHUSDn5Nzg=
github.com/pingcap/tidb v1.1.0-beta.0.20240415145106-cd9c676e9ba4/go.mod h1:q7rWac5/DO6wMdzLiXyhZgq/jxl9fkFA7+/rsXKNJko=
github.com/pingcap/tidb v1.1.0-beta.0.20240428083427-66ba419636ce h1:mllkNoeTwmK8JAj+LOb9JzJ4e24FHKohJUGlbR1AHQQ=
github.com/pingcap/tidb v1.1.0-beta.0.20240428083427-66ba419636ce/go.mod h1:EKK9Vq80W5+ooOtI672OwrW+vrBv4s8+vji/R11TV9U=
github.com/pingcap/tidb-dashboard v0.0.0-20240326110213-9768844ff5d7 h1:eFu98FbfJB7PKWOtkaV6YNXXJWqDhczQX56j/iucgU4=
github.com/pingcap/tidb-dashboard v0.0.0-20240326110213-9768844ff5d7/go.mod h1:ucZBRz52icb23T/5Z4CsuUHmarYiin7p2MeiVBe+o8c=
github.com/pingcap/tidb-tools v0.0.0-20240305021104-9f9bea84490b h1:UC4lLT2OBHGImFJbiXQfIxIck7AoFLIiRJ6Eo6uFVaw=
github.com/pingcap/tidb-tools v0.0.0-20240305021104-9f9bea84490b/go.mod h1:FupVn04P2/dkvzK4Tt5URj5z2Y4ILcULw7dU3GnJXgQ=
github.com/pingcap/tidb/pkg/parser v0.0.0-20240410110152-5fc42c9be2f5 h1:pAcwBObaCobuCvh+S56Ywwp7zelqzFHGJzWkLv8Ixz8=
github.com/pingcap/tidb/pkg/parser v0.0.0-20240410110152-5fc42c9be2f5/go.mod h1:c/4la2yfv1vBYvtIG8WCDyDinLMDIUC5+zLRHiafY+Y=
github.com/pingcap/tidb-tools v0.0.0-20240508055508-ee5de104059e h1:Rjz73zLJ9DzHQVStfUoCNi3gSyJwv0TB/gIsRlbcLys=
github.com/pingcap/tidb-tools v0.0.0-20240508055508-ee5de104059e/go.mod h1:bmZybuk+FT28lb8wi5hJS2FqBfimK7kf32ebgL85iWA=
github.com/pingcap/tidb/pkg/parser v0.0.0-20240428083427-66ba419636ce h1:/+WQFDURkLepAwnN2B+jnTaGqPcpKr3p3mFDojCptmw=
github.com/pingcap/tidb/pkg/parser v0.0.0-20240428083427-66ba419636ce/go.mod h1:c/4la2yfv1vBYvtIG8WCDyDinLMDIUC5+zLRHiafY+Y=
github.com/pingcap/tipb v0.0.0-20240318032315-55a7867ddd50 h1:fVNBE06Rjec+EIHaYAKAHa/bIt5lnu3Zh9O6kV7ZAdg=
github.com/pingcap/tipb v0.0.0-20240318032315-55a7867ddd50/go.mod h1:A7mrd7WHBl1o63LE2bIBGEJMTNWXqhgmYiOvMLxozfs=
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
Expand All @@ -868,8 +868,8 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
github.com/prometheus/common v0.0.0-20181020173914-7e9e6cabbd39/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
github.com/prometheus/common v0.52.2 h1:LW8Vk7BccEdONfrJBDffQGRtpSzi5CQaRZGtboOO2ck=
github.com/prometheus/common v0.52.2/go.mod h1:lrWtQx+iDfn2mbH5GUzlH9TSHyfZpHkSiG1W7y3sF2Q=
github.com/prometheus/common v0.53.0 h1:U2pL9w9nmJwJDa4qqLQ3ZaePJ6ZTwt7cMD3AG3+aLCE=
github.com/prometheus/common v0.53.0/go.mod h1:BrxBKv3FWBIGXw89Mg1AeBq7FSyRzXWI3l3e7W3RN5U=
github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
github.com/prometheus/procfs v0.13.0 h1:GqzLlQyfsPbaEHaQkO7tbDlriv/4o5Hudv6OXHGKX7o=
github.com/prometheus/procfs v0.13.0/go.mod h1:cd4PFCR54QLnGKPaKGA6l+cfuNXtht43ZKY6tow0Y1g=
Expand Down Expand Up @@ -907,8 +907,6 @@ github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 h1:GHRpF1pTW19a
github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod h1:uAQ5PCi+MFsC7HjREoAz1BU+Mq60+05gifQSsHSDG/8=
github.com/sasha-s/go-deadlock v0.3.1 h1:sqv7fDNShgjcaxkO0JNcOAlr8B9+cV5Ey/OB71efZx0=
github.com/sasha-s/go-deadlock v0.3.1/go.mod h1:F73l+cr82YSh10GxyRI6qZiCgK64VaZjwesgfQ1/iLM=
github.com/scalalang2/golang-fifo v0.1.5 h1:cl70TQhlMGGpI2DZGcr+7/GFTJOjHMeor0t7wynEEoA=
github.com/scalalang2/golang-fifo v0.1.5/go.mod h1:IK3OZBg7iHbVdQVGPDjcW1MWPb6JcWjaS/w0iRBS8gs=
github.com/sclevine/agouti v3.0.0+incompatible/go.mod h1:b4WX9W9L1sfQKXeJf1mUTLZKJ48R1S7H23Ji7oFO5Bw=
github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys=
github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=
Expand Down Expand Up @@ -1034,8 +1032,8 @@ github.com/tidwall/rtree v0.0.0-20180113144539-6cd427091e0e/go.mod h1:/h+UnNGt0I
github.com/tidwall/tinyqueue v0.0.0-20180302190814-1e39f5511563/go.mod h1:mLqSmt7Dv/CNneF2wfcChfN1rvapyQr01LGKnKex0DQ=
github.com/tidwall/tinyqueue v0.1.1 h1:SpNEvEggbpyN5DIReaJ2/1ndroY8iyEGxPYxoSaymYE=
github.com/tidwall/tinyqueue v0.1.1/go.mod h1:O/QNHwrnjqr6IHItYrzoHAKYhBkLI67Q096fQP5zMYw=
github.com/tikv/client-go/v2 v2.0.8-0.20240409022718-714958ccd4d5 h1:NIYXG5l8JrDyc7k0zO17ppKJkRlUfKMWFOnjIQT5Tc4=
github.com/tikv/client-go/v2 v2.0.8-0.20240409022718-714958ccd4d5/go.mod h1:+vXk4Aex17GnI8gfSMPxrL0SQLbBYgP3Db4FvHiImwM=
github.com/tikv/client-go/v2 v2.0.8-0.20240424052342-0229f4077f0c h1:M97Y/RO0vGpX0FplwGTk02idZDmSPEJlO6fTCPaxkCI=
github.com/tikv/client-go/v2 v2.0.8-0.20240424052342-0229f4077f0c/go.mod h1:+vXk4Aex17GnI8gfSMPxrL0SQLbBYgP3Db4FvHiImwM=
github.com/tikv/pd v1.1.0-beta.0.20240407022249-7179657d129b h1:t2XoZp4UHrkPpYPsxbRTRVExJnriWlh+ZsDIfpYyd98=
github.com/tikv/pd v1.1.0-beta.0.20240407022249-7179657d129b/go.mod h1:7HJMdb0O5umNpZIFt8e/wKAcEmH99n2HsYgXX+vZj3k=
github.com/tikv/pd/client v0.0.0-20240322051414-fb9e2d561b6e h1:u2OoEvmh3qyjIiAKXUPRiFCOSwznByMINDx2fsorjAo=
Expand Down

0 comments on commit 2bc8f02

Please sign in to comment.