Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -116,12 +116,16 @@ func TestGroupBy(t *testing.T) {
mcmp.Exec("insert into t3(id5, id6, id7) values(1,1,2), (2,2,4), (3,2,4), (4,1,2), (5,1,2), (6,3,6)")
// test ordering and group by int column
mcmp.AssertMatches("select id6, id7, count(*) k from t3 group by id6, id7 order by k", `[[INT64(3) INT64(6) INT64(1)] [INT64(2) INT64(4) INT64(2)] [INT64(1) INT64(2) INT64(3)]]`)
mcmp.AssertMatches("select id6+id7, count(*) k from t3 group by id6+id7 order by k", `[[INT64(9) INT64(1)] [INT64(6) INT64(2)] [INT64(3) INT64(3)]]`)
if utils.BinaryIsAtLeastAtVersion(18, "vtgate") {
mcmp.AssertMatches("select id6+id7, count(*) k from t3 group by id6+id7 order by k", `[[INT64(9) INT64(1)] [INT64(6) INT64(2)] [INT64(3) INT64(3)]]`)
}
Comment on lines +119 to +121

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.


// Test the same queries in streaming mode
utils.Exec(t, mcmp.VtConn, "set workload = olap")
mcmp.AssertMatches("select id6, id7, count(*) k from t3 group by id6, id7 order by k", `[[INT64(3) INT64(6) INT64(1)] [INT64(2) INT64(4) INT64(2)] [INT64(1) INT64(2) INT64(3)]]`)
mcmp.AssertMatches("select id6+id7, count(*) k from t3 group by id6+id7 order by k", `[[INT64(9) INT64(1)] [INT64(6) INT64(2)] [INT64(3) INT64(3)]]`)
if utils.BinaryIsAtLeastAtVersion(18, "vtgate") {
mcmp.AssertMatches("select id6+id7, count(*) k from t3 group by id6+id7 order by k", `[[INT64(9) INT64(1)] [INT64(6) INT64(2)] [INT64(3) INT64(3)]]`)
}
}

func TestEqualFilterOnScatter(t *testing.T) {
Expand Down
1 change: 1 addition & 0 deletions go/test/endtoend/vtgate/queries/derived/derived_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,7 @@ func TestDerivedTableWithOrderByLimit(t *testing.T) {
}

func TestDerivedAggregationOnRHS(t *testing.T) {
utils.SkipIfBinaryIsBelowVersion(t, 18, "vtgate")

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For this test, it makes sense. Support for the query was added in v18 via vitessio#13750 after we saw it was failing on vitessio#11703.

mcmp, closer := start(t)
defer closer()

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
)

func TestFoundRows(t *testing.T) {
utils.SkipIfBinaryIsBelowVersion(t, 18, "vtgate")
defer cluster.PanicHandler(t)
mcmp, err := utils.NewMySQLCompare(t, vtParams, mysqlParams)
require.NoError(t, err)
Expand Down
Loading