From 7ff6a69ecf55d60700d62db72f0d693f3480e8d7 Mon Sep 17 00:00:00 2001 From: Lynn Date: Thu, 18 May 2017 11:12:50 +0800 Subject: [PATCH] ddl: remove the function of Start (#3288) --- ddl/ddl.go | 15 --------------- ddl/ddl_worker_test.go | 6 ++---- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/ddl/ddl.go b/ddl/ddl.go index a151e49cfd..f9e5b8d0ae 100644 --- a/ddl/ddl.go +++ b/ddl/ddl.go @@ -126,8 +126,6 @@ type DDL interface { GetScope(status string) variable.ScopeFlag // Stop stops DDL worker. Stop() error - // Start starts DDL worker. - Start() error // RegisterEventCh registers event channel for ddl. RegisterEventCh(chan<- *Event) } @@ -297,19 +295,6 @@ func (d *ddl) Stop() error { return errors.Trace(err) } -func (d *ddl) Start() error { - d.m.Lock() - defer d.m.Unlock() - - if !d.isClosed() { - return nil - } - - d.start() - - return nil -} - func (d *ddl) start() { d.quitCh = make(chan struct{}) d.wait.Add(2) diff --git a/ddl/ddl_worker_test.go b/ddl/ddl_worker_test.go index 6404efaa80..2c30e75f5e 100644 --- a/ddl/ddl_worker_test.go +++ b/ddl/ddl_worker_test.go @@ -74,10 +74,8 @@ func (s *testDDLSuite) TestCheckOwner(c *C) { d2.SetLease(1 * time.Second) err := d2.Stop() c.Assert(err, IsNil) - err = d1.Start() - c.Assert(err, IsNil) - err = d1.Start() - c.Assert(err, IsNil) + d1.start() + d2.start() testCheckOwner(c, d1, true, ddlJobFlag) testCheckOwner(c, d1, true, bgJobFlag)