address crazycs520's comments

bb7133 · Dec 6, 2018 · ade79af · ade79af
1 parent 27ff953
commit ade79af
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 12 deletions.
diff --git a/ddl/ddl_worker.go b/ddl/ddl_worker.go
@@ -483,7 +483,7 @@ func (w *worker) runDDLJob(d *ddlCtx, t *meta.Meta, job *model.Job) (ver int64,
 	case model.ActionDropSchema:
 		ver, err = onDropSchema(t, job)
 	case model.ActionCreateTable:
-		ver, err = onCreateTable(d, w, t, job)
+		ver, err = onCreateTable(d, t, job)
 	case model.ActionDropTable:
 		ver, err = onDropTable(t, job)
 	case model.ActionDropTablePartition:

diff --git a/ddl/table.go b/ddl/table.go
@@ -16,6 +16,9 @@ package ddl
 import (
 	"context"
 	"fmt"
+	"strconv"
+	"strings"
+
 	"github.com/pingcap/errors"
 	"github.com/pingcap/parser/model"
 	"github.com/pingcap/tidb/ddl/util"
@@ -27,11 +30,9 @@ import (
 	"github.com/pingcap/tidb/tablecodec"
 	"github.com/pingcap/tidb/util/sqlexec"
 	log "github.com/sirupsen/logrus"
-	"strconv"
-	"strings"
 )
 
-func onCreateTable(d *ddlCtx, w *worker, t *meta.Meta, job *model.Job) (ver int64, err error) {
+func onCreateTable(d *ddlCtx, t *meta.Meta, job *model.Job) (ver int64, err error) {
 	schemaID := job.SchemaID
 	tbInfo := &model.TableInfo{}
 	var withSelect bool   // if this is a 'create table ... select' job
@@ -55,14 +56,20 @@ func onCreateTable(d *ddlCtx, w *worker, t *meta.Meta, job *model.Job) (ver int6
 
 		if withSelect {
 			tbInfo.State = model.StateWriteReorganization
+			job.SchemaState = model.StateWriteReorganization
 		} else {
 			tbInfo.State = model.StatePublic
+			job.SchemaState = model.StatePublic
 		}
 
 		err = t.CreateTable(schemaID, tbInfo)
 		if err != nil {
 			return ver, errors.Trace(err)
 		}
+		if EnableSplitTableRegion {
+			// TODO: Add restrictions to this operation.
+			go splitTableRegion(d.store, tbInfo.ID)
+		}
 	case model.StateWriteReorganization:
 		// reorganization -> public (insert data before we make the table public)
 		err = doCreateTableInsert(d, t, job, tbInfo, snapshotTS)
@@ -72,14 +79,11 @@ func onCreateTable(d *ddlCtx, w *worker, t *meta.Meta, job *model.Job) (ver int6
 		}
 
 		tbInfo.State = model.StatePublic
+		job.SchemaState = model.StatePublic
 	default:
 		return ver, ErrInvalidTableState.GenWithStack("invalid table state %v", tbInfo.State)
 	}
 	tbInfo.UpdateTS = t.StartTS
-	if EnableSplitTableRegion {
-		// TODO: Add restrictions to this operation.
-		go splitTableRegion(d.store, tbInfo.ID)
-	}
 	ver, err = updateVersionAndTableInfo(t, job, tbInfo, originalState != tbInfo.State)
 	if err != nil {
 		job.State = model.JobStateCancelled

diff --git a/ddl/util/util.go b/ddl/util/util.go
@@ -17,6 +17,7 @@ import (
 	"context"
 	"encoding/hex"
 	"fmt"
+
 	"github.com/pingcap/errors"
 	"github.com/pingcap/parser/terror"
 	"github.com/pingcap/tidb/kv"

diff --git a/executor/builder.go b/executor/builder.go
@@ -17,9 +17,6 @@ import (
 	"bytes"
 	"context"
 	"fmt"
-	"github.com/pingcap/tidb/meta"
-	"github.com/pingcap/tidb/meta/autoid"
-	"github.com/pingcap/tidb/table/tables"
 	"math"
 	"sort"
 	"strings"
@@ -39,12 +36,15 @@ import (
 	"github.com/pingcap/tidb/expression/aggregation"
 	"github.com/pingcap/tidb/infoschema"
 	"github.com/pingcap/tidb/kv"
+	"github.com/pingcap/tidb/meta"
+	"github.com/pingcap/tidb/meta/autoid"
 	"github.com/pingcap/tidb/metrics"
 	plannercore "github.com/pingcap/tidb/planner/core"
 	"github.com/pingcap/tidb/sessionctx"
 	"github.com/pingcap/tidb/sessionctx/stmtctx"
 	"github.com/pingcap/tidb/statistics"
 	"github.com/pingcap/tidb/table"
+	"github.com/pingcap/tidb/table/tables"
 	"github.com/pingcap/tidb/types"
 	"github.com/pingcap/tidb/util/admin"
 	"github.com/pingcap/tidb/util/chunk"

diff --git a/executor/ddl_test.go b/executor/ddl_test.go
@@ -16,7 +16,6 @@ package executor_test
 import (
 	"context"
 	"fmt"
-	"github.com/pingcap/tidb/util/testutil"
 	"math"
 	"strings"
 	"time"
@@ -33,6 +32,8 @@ import (
 	"github.com/pingcap/tidb/types"
 	"github.com/pingcap/tidb/util/chunk"
 	"github.com/pingcap/tidb/util/testkit"
+	"github.com/pingcap/tidb/util/testutil"
+	"golang.org/x/net/context"
 )
 
 func (s *testSuite) TestTruncateTable(c *C) {