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

copr: add MppVersionV3 #58652

Merged
merged 4 commits into from
Jan 13, 2025
Merged

copr: add MppVersionV3 #58652

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e98ec30
mpp: add MppVersionV3
JinheLin Jan 2, 2025
74ab71a
fix ut
JinheLin Jan 2, 2025
26fec75
fix tests
JinheLin Jan 13, 2025
b02ac18
fix test
JinheLin Jan 13, 2025
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
16 changes: 8 additions & 8 deletions pkg/executor/test/tiflashtest/tiflash_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1507,15 +1507,15 @@ func TestDisaggregatedTiFlashQuery(t *testing.T) {
require.NoError(t, err)
tk.MustQuery("explain select * from t1 where c1 < 2").Check(testkit.Rows(
"PartitionUnion_11 9970.00 root ",
"├─TableReader_16 3323.33 root MppVersion: 2, data:ExchangeSender_15",
"├─TableReader_16 3323.33 root MppVersion: 3, data:ExchangeSender_15",
"│ └─ExchangeSender_15 3323.33 mpp[tiflash] ExchangeType: PassThrough",
"│ └─Selection_14 3323.33 mpp[tiflash] lt(test.t1.c1, 2)",
"│ └─TableFullScan_13 10000.00 mpp[tiflash] table:t1, partition:p0 pushed down filter:empty, keep order:false, stats:pseudo",
"├─TableReader_20 3323.33 root MppVersion: 2, data:ExchangeSender_19",
"├─TableReader_20 3323.33 root MppVersion: 3, data:ExchangeSender_19",
"│ └─ExchangeSender_19 3323.33 mpp[tiflash] ExchangeType: PassThrough",
"│ └─Selection_18 3323.33 mpp[tiflash] lt(test.t1.c1, 2)",
"│ └─TableFullScan_17 10000.00 mpp[tiflash] table:t1, partition:p1 pushed down filter:empty, keep order:false, stats:pseudo",
"└─TableReader_24 3323.33 root MppVersion: 2, data:ExchangeSender_23",
"└─TableReader_24 3323.33 root MppVersion: 3, data:ExchangeSender_23",
" └─ExchangeSender_23 3323.33 mpp[tiflash] ExchangeType: PassThrough",
" └─Selection_22 3323.33 mpp[tiflash] lt(test.t1.c1, 2)",
" └─TableFullScan_21 10000.00 mpp[tiflash] table:t1, partition:p2 pushed down filter:empty, keep order:false, stats:pseudo"))
Expand Down Expand Up @@ -1820,11 +1820,11 @@ func TestMPP47766(t *testing.T) {
tk.MustQuery("explain select date(test_time), count(1) as test_date from `traces` group by 1").Check(testkit.Rows(
"Projection_4 8000.00 root test.traces.test_time_gen->Column#5, Column#4",
"└─HashAgg_8 8000.00 root group by:test.traces.test_time_gen, funcs:count(1)->Column#4, funcs:firstrow(test.traces.test_time_gen)->test.traces.test_time_gen",
" └─TableReader_20 10000.00 root MppVersion: 2, data:ExchangeSender_19",
" └─TableReader_20 10000.00 root MppVersion: 3, data:ExchangeSender_19",
" └─ExchangeSender_19 10000.00 mpp[tiflash] ExchangeType: PassThrough",
" └─TableFullScan_18 10000.00 mpp[tiflash] table:traces keep order:false, stats:pseudo"))
tk.MustQuery("explain select /*+ read_from_storage(tiflash[traces]) */ date(test_time) as test_date, count(1) from `traces` group by 1").Check(testkit.Rows(
"TableReader_31 8000.00 root MppVersion: 2, data:ExchangeSender_30",
"TableReader_31 8000.00 root MppVersion: 3, data:ExchangeSender_30",
"└─ExchangeSender_30 8000.00 mpp[tiflash] ExchangeType: PassThrough",
" └─Projection_5 8000.00 mpp[tiflash] date(test.traces.test_time)->Column#5, Column#4",
" └─Projection_26 8000.00 mpp[tiflash] Column#4, test.traces.test_time",
Expand Down Expand Up @@ -2089,13 +2089,13 @@ func TestMppAggShouldAlignFinalMode(t *testing.T) {
" └─PartitionUnion 400.00 root ",
" ├─Projection 200.00 root test.t.d",
" │ └─HashAgg 200.00 root group by:test.t.d, funcs:firstrow(partial2,test.t.d)->test.t.d, funcs:count(final,Column#12)->Column#9",
" │ └─TableReader 200.00 root MppVersion: 2, data:ExchangeSender",
" │ └─TableReader 200.00 root MppVersion: 3, data:ExchangeSender",
" │ └─ExchangeSender 200.00 mpp[tiflash] ExchangeType: PassThrough",
" │ └─HashAgg 200.00 mpp[tiflash] group by:test.t.d, funcs:count(partial1,1)->Column#12",
" │ └─TableRangeScan 250.00 mpp[tiflash] table:t, partition:p1 range:[2023-07-01,2023-07-03], keep order:false, stats:pseudo",
" └─Projection 200.00 root test.t.d",
" └─HashAgg 200.00 root group by:test.t.d, funcs:firstrow(partial2,test.t.d)->test.t.d, funcs:count(final,Column#14)->Column#10",
" └─TableReader 200.00 root MppVersion: 2, data:ExchangeSender",
" └─TableReader 200.00 root MppVersion: 3, data:ExchangeSender",
" └─ExchangeSender 200.00 mpp[tiflash] ExchangeType: PassThrough",
" └─HashAgg 200.00 mpp[tiflash] group by:test.t.d, funcs:count(partial1,1)->Column#14",
" └─TableRangeScan 250.00 mpp[tiflash] table:t, partition:p2 range:[2023-07-01,2023-07-03], keep order:false, stats:pseudo"))
Expand Down Expand Up @@ -2215,7 +2215,7 @@ func TestIndexMergeCarePreferTiflash(t *testing.T) {
require.NoError(t, err)
tk.MustQuery("explain format=\"brief\" SELECT" +
" /*+ read_from_storage(tiflash[a]) */ a.i FROM t a WHERE a.s = 0 AND a.a NOT IN (-1, 0) AND m >= 1726910326 AND m <= 1726910391 AND ( a.w IN ('1123') OR a.l IN ('1123'))").Check(
testkit.Rows("TableReader 0.00 root MppVersion: 2, data:ExchangeSender",
testkit.Rows("TableReader 0.00 root MppVersion: 3, data:ExchangeSender",
"└─ExchangeSender 0.00 mpp[tiflash] ExchangeType: PassThrough",
" └─Projection 0.00 mpp[tiflash] test.t.i",
" └─Selection 0.00 mpp[tiflash] ge(test.t.m, 1726910326), le(test.t.m, 1726910391), not(in(test.t.a, -1, 0)), or(eq(test.t.w, \"1123\"), eq(test.t.l, \"1123\"))",
Expand Down
2 changes: 1 addition & 1 deletion pkg/expression/integration_test/integration_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -538,7 +538,7 @@ func TestVectorIndexExplain(t *testing.T) {

tk.MustQuery(fmt.Sprintf("explain format = 'brief' select * from t1 order by vec_cosine_distance(vec, '%s') limit 1", vb.String())).Check(testkit.Rows(
`TopN 1.00 root Column#5, offset:0, count:1`,
`└─TableReader 1.00 root MppVersion: 2, data:ExchangeSender`,
`└─TableReader 1.00 root MppVersion: 3, data:ExchangeSender`,
` └─ExchangeSender 1.00 mpp[tiflash] ExchangeType: PassThrough`,
` └─TopN 1.00 mpp[tiflash] Column#5, offset:0, count:1`,
` └─Projection 1.00 mpp[tiflash] test.t1.vec, vec_cosine_distance(test.t1.vec, [1e+02,1e+02,1e+02,1e+02,1e+02,(95 more)...])->Column#5`,
Expand Down
4 changes: 3 additions & 1 deletion pkg/kv/mpp.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,9 @@ const (

// MppVersionV2 supports TiFlash version [v7.3, ~], support ReportMPPTaskStatus service
MppVersionV2
// MppVersionV3

// MppVersionV3 supports TiFlash version [v9.0, ~], support new serdes format of strings
MppVersionV3

mppVersionMax

Expand Down
7 changes: 6 additions & 1 deletion pkg/kv/version_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func TestVersion(t *testing.T) {
}

func TestMppVersion(t *testing.T) {
assert.Equal(t, int64(2), GetNewestMppVersion().ToInt64())
assert.Equal(t, int64(3), GetNewestMppVersion().ToInt64())
{
v, ok := ToMppVersion("unspecified")
assert.True(t, ok)
Expand All @@ -59,6 +59,11 @@ func TestMppVersion(t *testing.T) {
assert.True(t, ok)
assert.Equal(t, v, MppVersionV2)
}
{
v, ok := ToMppVersion("3")
assert.True(t, ok)
assert.Equal(t, v, MppVersionV3)
}
}

func TestExchangeCompressionMode(t *testing.T) {
Expand Down
4 changes: 2 additions & 2 deletions pkg/planner/core/casetest/cbotest/testdata/analyze_suite_out.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,7 +285,7 @@
"Name": "TestTiFlashCostModel",
"Cases": [
[
"TableReader_12 10000.00 root MppVersion: 2, data:ExchangeSender_11",
"TableReader_12 10000.00 root MppVersion: 3, data:ExchangeSender_11",
"└─ExchangeSender_11 10000.00 mpp[tiflash] ExchangeType: PassThrough",
" └─TableFullScan_10 10000.00 mpp[tiflash] table:t keep order:false, stats:pseudo"
],
Expand All @@ -297,7 +297,7 @@
"Batch_Point_Get_5 2.00 root table:t handle:[1 2], keep order:false, desc:false"
],
[
"TableReader_11 2.00 root MppVersion: 2, data:ExchangeSender_10",
"TableReader_11 2.00 root MppVersion: 3, data:ExchangeSender_10",
"└─ExchangeSender_10 2.00 mpp[tiflash] ExchangeType: PassThrough",
" └─TableRangeScan_9 2.00 mpp[tiflash] table:t range:[1,1], [2,2], keep order:false, stats:pseudo"
]
Expand Down
Loading