Skip to content

Commit

Permalink
expression: improve expression to make test faster (pingcap#41426)
Browse files Browse the repository at this point in the history
  • Loading branch information
hawkingrei authored and ghazalfamilyusa committed Feb 15, 2023
1 parent 663478d commit 87f8b3b
Show file tree
Hide file tree
Showing 10 changed files with 100 additions and 28 deletions.
3 changes: 0 additions & 3 deletions expression/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -165,13 +165,11 @@ go_test(
"collation_test.go",
"column_test.go",
"constant_fold_test.go",
"constant_propagation_test.go",
"constant_test.go",
"distsql_builtin_test.go",
"evaluator_test.go",
"expr_to_pb_test.go",
"expression_test.go",
"flag_simplify_test.go",
"function_traits_test.go",
"helper_test.go",
"integration_serial_test.go",
Expand Down Expand Up @@ -207,7 +205,6 @@ go_test(
"//table",
"//tablecodec",
"//testkit",
"//testkit/testdata",
"//testkit/testmain",
"//testkit/testsetup",
"//testkit/testutil",
Expand Down
24 changes: 24 additions & 0 deletions expression/casetest/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
load("@io_bazel_rules_go//go:def.bzl", "go_test")

go_test(
name = "casetest_test",
timeout = "short",
srcs = [
"constant_propagation_test.go",
"flag_simplify_test.go",
"main_test.go",
],
data = glob(["testdata/**"]),
flaky = True,
shard_count = 2,
deps = [
"//config",
"//testkit",
"//testkit/testdata",
"//testkit/testmain",
"//testkit/testsetup",
"//util/timeutil",
"@com_github_tikv_client_go_v2//tikv",
"@org_uber_go_goleak//:goleak",
],
)
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package expression_test
package casetest

import (
"testing"

"github.com/pingcap/tidb/expression"
"github.com/pingcap/tidb/testkit"
"github.com/pingcap/tidb/testkit/testdata"
)
Expand All @@ -38,7 +37,7 @@ func TestOuterJoinPropConst(t *testing.T) {
Result []string
}

expressionSuiteData := expression.GetExpressionSuiteData()
expressionSuiteData := GetExpressionSuiteData()
expressionSuiteData.LoadTestCases(t, &input, &output)
for i, tt := range input {
testdata.OnRecord(func() {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.

package expression_test
package casetest

import (
"testing"

"github.com/pingcap/tidb/expression"
"github.com/pingcap/tidb/testkit"
"github.com/pingcap/tidb/testkit/testdata"
)
Expand All @@ -35,7 +34,7 @@ func TestSimplifyExpressionByFlag(t *testing.T) {
SQL string
Plan []string
}
flagSimplifyData := expression.GetFlagSimplifyData()
flagSimplifyData := GetFlagSimplifyData()
flagSimplifyData.LoadTestCases(t, &input, &output)
for i, tt := range input {
testdata.OnRecord(func() {
Expand Down
71 changes: 71 additions & 0 deletions expression/casetest/main_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,71 @@
// Copyright 2023 PingCAP, Inc.
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
// You may obtain a copy of the License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the License is distributed on an "AS IS" BASIS,
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
// See the License for the specific language governing permissions and
// limitations under the License.

package casetest

import (
"testing"

"github.com/pingcap/tidb/config"
"github.com/pingcap/tidb/testkit/testdata"
"github.com/pingcap/tidb/testkit/testmain"
"github.com/pingcap/tidb/testkit/testsetup"
"github.com/pingcap/tidb/util/timeutil"
"github.com/tikv/client-go/v2/tikv"
"go.uber.org/goleak"
)

var testDataMap = make(testdata.BookKeeper)

func TestMain(m *testing.M) {
testsetup.SetupForCommonTest()
testmain.ShortCircuitForBench(m)

config.UpdateGlobal(func(conf *config.Config) {
conf.TiKVClient.AsyncCommit.SafeWindow = 0
conf.TiKVClient.AsyncCommit.AllowedClockDrift = 0
conf.Experimental.AllowsExpressionIndex = true
})
tikv.EnableFailpoints()

// Some test depends on the values of timeutil.SystemLocation()
// If we don't SetSystemTZ() here, the value would change unpredictable.
// Affected by the order whether a testsuite runs before or after integration test.
// Note, SetSystemTZ() is a sync.Once operation.
timeutil.SetSystemTZ("system")

testDataMap.LoadTestSuiteData("testdata", "flag_simplify")
testDataMap.LoadTestSuiteData("testdata", "expression_suite")

opts := []goleak.Option{
goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"),
goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"),
goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"),
goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
}

callback := func(i int) int {
testDataMap.GenerateOutputIfNeeded()
return i
}
goleak.VerifyTestMain(testmain.WrapTestingM(m, callback), opts...)
}

func GetFlagSimplifyData() testdata.TestData {
return testDataMap["flag_simplify"]
}

func GetExpressionSuiteData() testdata.TestData {
return testDataMap["expression_suite"]
}
File renamed without changes.
File renamed without changes.
20 changes: 1 addition & 19 deletions expression/main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ import (
"time"

"github.com/pingcap/tidb/config"
"github.com/pingcap/tidb/testkit/testdata"
"github.com/pingcap/tidb/testkit/testmain"
"github.com/pingcap/tidb/testkit/testsetup"
"github.com/pingcap/tidb/util/mock"
Expand All @@ -29,8 +28,6 @@ import (
"go.uber.org/goleak"
)

var testDataMap = make(testdata.BookKeeper)

func TestMain(m *testing.M) {
testsetup.SetupForCommonTest()
testmain.ShortCircuitForBench(m)
Expand All @@ -48,21 +45,14 @@ func TestMain(m *testing.M) {
// Note, SetSystemTZ() is a sync.Once operation.
timeutil.SetSystemTZ("system")

testDataMap.LoadTestSuiteData("testdata", "flag_simplify")
testDataMap.LoadTestSuiteData("testdata", "expression_suite")

opts := []goleak.Option{
goleak.IgnoreTopFunction("github.com/golang/glog.(*loggingT).flushDaemon"),
goleak.IgnoreTopFunction("github.com/lestrrat-go/httprc.runFetchWorker"),
goleak.IgnoreTopFunction("go.etcd.io/etcd/client/pkg/v3/logutil.(*MergeLogger).outputLoop"),
goleak.IgnoreTopFunction("go.opencensus.io/stats/view.(*worker).start"),
}

callback := func(i int) int {
testDataMap.GenerateOutputIfNeeded()
return i
}
goleak.VerifyTestMain(testmain.WrapTestingM(m, callback), opts...)
goleak.VerifyTestMain(m, opts...)
}

func createContext(t *testing.T) *mock.Context {
Expand All @@ -74,11 +64,3 @@ func createContext(t *testing.T) *mock.Context {
ctx.GetSessionVars().PlanColumnID = 0
return ctx
}

func GetFlagSimplifyData() testdata.TestData {
return testDataMap["flag_simplify"]
}

func GetExpressionSuiteData() testdata.TestData {
return testDataMap["expression_suite"]
}

0 comments on commit 87f8b3b

Please sign in to comment.