Skip to content

Commit 414e2c1

Browse files
committed
deps: bump tipb for TopSQL network fields
Signed-off-by: yibin87 <huyibin@pingcap.com>
1 parent 736bfe6 commit 414e2c1

5 files changed

Lines changed: 17 additions & 13 deletions

File tree

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ require (
9090
github.com/pingcap/log v1.1.1-0.20250917021125-19901e015dc9
9191
github.com/pingcap/sysutil v1.0.1-0.20240311050922-ae81ee01f3a5
9292
github.com/pingcap/tidb/pkg/parser v0.0.0-20211011031125-9b13dc409c5e
93-
github.com/pingcap/tipb v0.0.0-20241022082558-0607513e7fa4
93+
github.com/pingcap/tipb v0.0.0-20251230094608-1374320b4bd8
9494
github.com/prometheus/client_golang v1.20.5
9595
github.com/prometheus/client_model v0.6.1
9696
github.com/prometheus/common v0.57.0

go.sum

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -682,6 +682,8 @@ github.com/pingcap/sysutil v1.0.1-0.20240311050922-ae81ee01f3a5 h1:T4pXRhBflzDeA
682682
github.com/pingcap/sysutil v1.0.1-0.20240311050922-ae81ee01f3a5/go.mod h1:rlimy0GcTvjiJqvD5mXTRr8O2eNZPBrcUgiWVYp9530=
683683
github.com/pingcap/tipb v0.0.0-20241022082558-0607513e7fa4 h1:wvaUybJT0fUReCDcFtV3CEvMuI9iu+G7IW72tbSlil4=
684684
github.com/pingcap/tipb v0.0.0-20241022082558-0607513e7fa4/go.mod h1:A7mrd7WHBl1o63LE2bIBGEJMTNWXqhgmYiOvMLxozfs=
685+
github.com/pingcap/tipb v0.0.0-20251230094608-1374320b4bd8 h1:KT/h7b+7lP/P+5OuczNNV+/wsHj9d0L7Eu4ktB5VRIg=
686+
github.com/pingcap/tipb v0.0.0-20251230094608-1374320b4bd8/go.mod h1:RM8iRcMalzOthG2XJxnNBniM4xFGb/lDwHUwqkaVzt4=
685687
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c h1:+mdjkGKdHQG3305AYmdv1U2eRNDiU2ErMBj1gwrq8eQ=
686688
github.com/pkg/browser v0.0.0-20240102092130-5ac0b6a4141c/go.mod h1:7rwL4CYBLnjLxUqIJNnCWiEdr3bn6IUYi15bNlnbCCU=
687689
github.com/pkg/diff v0.0.0-20210226163009-20ebb0f2a09e/go.mod h1:pJLUxLENpZxwdsKMEsNbx1VGcRFpLqf3715MtcvvzbA=

pkg/planner/core/find_best_task.go

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2700,14 +2700,16 @@ func convertToTableScan(ds *logicalop.DataSource, prop *property.PhysicalPropert
27002700
distanceMetricPB := tipb.VectorDistanceMetric_value[string(distanceMetric)]
27012701
intest.Assert(distanceMetricPB != 0, "unexpected distance metric")
27022702

2703+
vectorColumnID := prop.VectorProp.Column.ID
27032704
ts.AnnIndexExtra = &VectorIndexExtra{
27042705
IndexInfo: candidate.path.Index,
27052706
PushDownQueryInfo: &tipb.ANNQueryInfo{
27062707
QueryType: tipb.ANNQueryType_OrderBy,
27072708
DistanceMetric: tipb.VectorDistanceMetric(distanceMetricPB),
27082709
TopK: prop.VectorProp.TopK,
27092710
ColumnName: ts.Table.Columns[candidate.path.Index.Columns[0].Offset].Name.L,
2710-
ColumnId: prop.VectorProp.Column.ID,
2711+
DeprecatedColumnId: &vectorColumnID,
2712+
Column: tipb.ColumnInfo{ColumnId: vectorColumnID},
27112713
IndexId: candidate.path.Index.ID,
27122714
RefVecF32: prop.VectorProp.Vec.SerializeTo(nil),
27132715
},

pkg/planner/core/plan_to_pb.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -276,7 +276,7 @@ func (p *PhysicalTableScan) ToPB(ctx *base.BuildPBContext, storeType kv.StoreTyp
276276

277277
if p.AnnIndexExtra != nil && p.AnnIndexExtra.PushDownQueryInfo != nil {
278278
annQueryCopy := *p.AnnIndexExtra.PushDownQueryInfo
279-
tsExec.AnnQuery = &annQueryCopy
279+
tsExec.DeprecatedAnnQuery = &annQueryCopy
280280
}
281281

282282
var err error
@@ -330,7 +330,7 @@ func (p *PhysicalTableScan) partitionTableScanToPBForFlash(ctx *base.BuildPBCont
330330

331331
if p.AnnIndexExtra != nil && p.AnnIndexExtra.PushDownQueryInfo != nil {
332332
annQueryCopy := *p.AnnIndexExtra.PushDownQueryInfo
333-
ptsExec.AnnQuery = &annQueryCopy
333+
ptsExec.DeprecatedAnnQuery = &annQueryCopy
334334
}
335335

336336
executorID := p.ExplainID().String()

pkg/util/execdetails/execdetails.go

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -852,15 +852,15 @@ func (e *basicCopRuntimeStats) mergeExecSummary(summary *tipb.ExecutorExecutionS
852852
maxRemoteStreamMs: tiflashScanContext.GetMaxRemoteStreamMs(),
853853
regionsOfInstance: regionsOfInstance,
854854

855-
totalVectorIdxLoadFromS3: tiflashScanContext.GetTotalVectorIdxLoadFromS3(),
856-
totalVectorIdxLoadFromDisk: tiflashScanContext.GetTotalVectorIdxLoadFromDisk(),
857-
totalVectorIdxLoadFromCache: tiflashScanContext.GetTotalVectorIdxLoadFromCache(),
858-
totalVectorIdxLoadTimeMs: tiflashScanContext.GetTotalVectorIdxLoadTimeMs(),
859-
totalVectorIdxSearchTimeMs: tiflashScanContext.GetTotalVectorIdxSearchTimeMs(),
860-
totalVectorIdxSearchVisitedNodes: tiflashScanContext.GetTotalVectorIdxSearchVisitedNodes(),
861-
totalVectorIdxSearchDiscardedNodes: tiflashScanContext.GetTotalVectorIdxSearchDiscardedNodes(),
862-
totalVectorIdxReadVecTimeMs: tiflashScanContext.GetTotalVectorIdxReadVecTimeMs(),
863-
totalVectorIdxReadOthersTimeMs: tiflashScanContext.GetTotalVectorIdxReadOthersTimeMs(),
855+
totalVectorIdxLoadFromS3: tiflashScanContext.GetVectorIdxLoadFromS3(),
856+
totalVectorIdxLoadFromDisk: tiflashScanContext.GetVectorIdxLoadFromDisk(),
857+
totalVectorIdxLoadFromCache: tiflashScanContext.GetVectorIdxLoadFromCache(),
858+
totalVectorIdxLoadTimeMs: tiflashScanContext.GetVectorIdxLoadTimeMs(),
859+
totalVectorIdxSearchTimeMs: tiflashScanContext.GetVectorIdxSearchTimeMs(),
860+
totalVectorIdxSearchVisitedNodes: tiflashScanContext.GetVectorIdxSearchVisitedNodes(),
861+
totalVectorIdxSearchDiscardedNodes: tiflashScanContext.GetVectorIdxSearchDiscardedNodes(),
862+
totalVectorIdxReadVecTimeMs: tiflashScanContext.GetVectorIdxReadVecTimeMs(),
863+
totalVectorIdxReadOthersTimeMs: tiflashScanContext.GetVectorIdxReadOthersTimeMs(),
864864
}
865865
if e.tiflashStats == nil {
866866
e.tiflashStats = &TiflashStats{

0 commit comments

Comments
 (0)