From 67e45280180e4a1e449cc2de3182e481662c108e Mon Sep 17 00:00:00 2001 From: Hanlin Shi Date: Thu, 11 Mar 2021 00:10:55 -0800 Subject: [PATCH] executor: initialize expensive query handler on domain creation (#21340) --- domain/domain.go | 6 +----- session/bootstrap_test.go | 1 - session/session.go | 1 - 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/domain/domain.go b/domain/domain.go index 6a6ad59166362..a4cf71836b798 100644 --- a/domain/domain.go +++ b/domain/domain.go @@ -692,6 +692,7 @@ func NewDomain(store kv.Storage, ddlLease time.Duration, statsLease time.Duratio } do.SchemaValidator = NewSchemaValidator(ddlLease, do) + do.expensiveQueryHandle = expensivequery.NewExpensiveQueryHandle(do.exit) return do } @@ -1296,11 +1297,6 @@ func (do *Domain) ExpensiveQueryHandle() *expensivequery.Handle { return do.expensiveQueryHandle } -// InitExpensiveQueryHandle init the expensive query handler. -func (do *Domain) InitExpensiveQueryHandle() { - do.expensiveQueryHandle = expensivequery.NewExpensiveQueryHandle(do.exit) -} - const privilegeKey = "/tidb/privilege" // NotifyUpdatePrivilege updates privilege key in etcd, TiDB client that watches diff --git a/session/bootstrap_test.go b/session/bootstrap_test.go index f7f30a9759c17..526133f6ea27c 100644 --- a/session/bootstrap_test.go +++ b/session/bootstrap_test.go @@ -484,7 +484,6 @@ func (s *testBootstrapSuite) TestBootstrapInitExpensiveQueryHandle(c *C) { dom := domain.GetDomain(se) c.Assert(dom, NotNil) defer dom.Close() - dom.InitExpensiveQueryHandle() c.Assert(dom.ExpensiveQueryHandle(), NotNil) } diff --git a/session/session.go b/session/session.go index dfb6853cfbbca..365d06ed47dc2 100644 --- a/session/session.go +++ b/session/session.go @@ -2172,7 +2172,6 @@ func BootstrapSession(store kv.Storage) (*domain.Domain, error) { } dom := domain.GetDomain(se) - dom.InitExpensiveQueryHandle() se2, err := createSession(store) if err != nil {