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

plan_test: make test stable (#5208) #5609

Merged
merged 1 commit into from
Jan 10, 2018
Merged

plan_test: make test stable (#5208) #5609

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 6 additions & 15 deletions plan/cbo_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ package plan_test

import (
"fmt"
"time"

"github.com/juju/errors"
. "github.com/pingcap/check"
Expand All @@ -38,7 +37,7 @@ type testAnalyzeSuite struct {
// CBOWithoutAnalyze tests the plan with stats that only have count info.
func (s *testAnalyzeSuite) TestCBOWithoutAnalyze(c *C) {
defer testleak.AfterTest(c)()
store, dom, err := newStoreWithBootstrapWithStatsLease(10 * time.Millisecond)
store, dom, err := newStoreWithBootstrap()
c.Assert(err, IsNil)
testKit := testkit.NewTestKit(c, store)
defer func() {
Expand All @@ -49,9 +48,13 @@ func (s *testAnalyzeSuite) TestCBOWithoutAnalyze(c *C) {
testKit.MustExec("drop table if exists t")
testKit.MustExec("create table t1 (a int)")
testKit.MustExec("create table t2 (a int)")
h := dom.StatsHandle()
c.Assert(h.HandleDDLEvent(<-h.DDLEventCh()), IsNil)
c.Assert(h.HandleDDLEvent(<-h.DDLEventCh()), IsNil)
testKit.MustExec("insert into t1 values (1), (2), (3), (4), (5), (6)")
testKit.MustExec("insert into t2 values (1), (2), (3), (4), (5), (6)")
time.Sleep(1 * time.Second)
h.DumpStatsDeltaToKV()
c.Assert(h.Update(dom.InfoSchema()), IsNil)
testKit.MustQuery("explain select * from t1, t2 where t1.a = t2.a").Check(testkit.Rows(
"TableScan_9 cop table:t1, range:(-inf,+inf), keep order:false 6",
"TableReader_10 HashLeftJoin_7 root data:TableScan_9 6",
Expand Down Expand Up @@ -364,15 +367,3 @@ func newStoreWithBootstrap() (kv.Storage, *domain.Domain, error) {
dom, err := tidb.BootstrapSession(store)
return store, dom, errors.Trace(err)
}

func newStoreWithBootstrapWithStatsLease(lease time.Duration) (kv.Storage, *domain.Domain, error) {
store, err := tikv.NewMockTikvStore()
if err != nil {
return nil, nil, errors.Trace(err)
}
tidb.SetSchemaLease(0)
tidb.SetStatsLease(lease)
domain.RunAutoAnalyze = false
dom, err := tidb.BootstrapSession(store)
return store, dom, errors.Trace(err)
}