Integrate public as bindata optionally (#293)

* Dropped unused codekit config

* Integrated dynamic and static bindata for public

* Ignore public bindata

* Add a general generate make task

* Integrated flexible public assets into web command

* Updated vendoring, added all missiong govendor deps

* Made the linter happy with the bindata and dynamic code

* Moved public bindata definition to modules directory

* Ignoring the new bindata path now

* Updated to the new public modules import path

* Updated public bindata command and drop the new prefix

vendor/github.com/pingcap/tidb/model/ddl.go

@@ -0,0 +1,163 @@
+// Copyright 2015 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,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package model
+
+import (
+	"encoding/json"
+	"fmt"
+
+	"github.com/juju/errors"
+)
+
+// ActionType is the type for DDL action.
+type ActionType byte
+
+// List DDL actions.
+const (
+	ActionNone ActionType = iota
+	ActionCreateSchema
+	ActionDropSchema
+	ActionCreateTable
+	ActionDropTable
+	ActionAddColumn
+	ActionDropColumn
+	ActionAddIndex
+	ActionDropIndex
+)
+
+func (action ActionType) String() string {
+	switch action {
+	case ActionCreateSchema:
+		return "create schema"
+	case ActionDropSchema:
+		return "drop schema"
+	case ActionCreateTable:
+		return "create table"
+	case ActionDropTable:
+		return "drop table"
+	case ActionAddColumn:
+		return "add column"
+	case ActionDropColumn:
+		return "drop column"
+	case ActionAddIndex:
+		return "add index"
+	case ActionDropIndex:
+		return "drop index"
+	default:
+		return "none"
+	}
+}
+
+// Job is for a DDL operation.
+type Job struct {
+	ID       int64      `json:"id"`
+	Type     ActionType `json:"type"`
+	SchemaID int64      `json:"schema_id"`
+	TableID  int64      `json:"table_id"`
+	State    JobState   `json:"state"`
+	Error    string     `json:"err"`
+	// every time we meet an error when running job, we will increase it
+	ErrorCount int64         `json:"err_count"`
+	Args       []interface{} `json:"-"`
+	// we must use json raw message for delay parsing special args.
+	RawArgs     json.RawMessage `json:"raw_args"`
+	SchemaState SchemaState     `json:"schema_state"`
+	// snapshot version for this job.
+	SnapshotVer uint64 `json:"snapshot_ver"`
+	// unix nano seconds
+	// TODO: use timestamp allocated by TSO
+	LastUpdateTS int64 `json:"last_update_ts"`
+}
+
+// Encode encodes job with json format.
+func (job *Job) Encode() ([]byte, error) {
+	var err error
+	job.RawArgs, err = json.Marshal(job.Args)
+	if err != nil {
+		return nil, errors.Trace(err)
+	}
+
+	var b []byte
+	b, err = json.Marshal(job)
+	return b, errors.Trace(err)
+}
+
+// Decode decodes job from the json buffer, we must use DecodeArgs later to
+// decode special args for this job.
+func (job *Job) Decode(b []byte) error {
+	err := json.Unmarshal(b, job)
+	return errors.Trace(err)
+}
+
+// DecodeArgs decodes job args.
+func (job *Job) DecodeArgs(args ...interface{}) error {
+	job.Args = args
+	err := json.Unmarshal(job.RawArgs, &job.Args)
+	return errors.Trace(err)
+}
+
+// String implements fmt.Stringer interface.
+func (job *Job) String() string {
+	return fmt.Sprintf("ID:%d, Type:%s, State:%s, SchemaState:%s, SchemaID:%d, TableID:%d, Args:%s",
+		job.ID, job.Type, job.State, job.SchemaState, job.SchemaID, job.TableID, job.RawArgs)
+}
+
+// IsFinished returns whether job is finished or not.
+// If the job state is Done or Cancelled, it is finished.
+func (job *Job) IsFinished() bool {
+	return job.State == JobDone || job.State == JobCancelled
+}
+
+// IsRunning returns whether job is still running or not.
+func (job *Job) IsRunning() bool {
+	return job.State == JobRunning
+}
+
+// JobState is for job state.
+type JobState byte
+
+// List job states.
+const (
+	JobNone JobState = iota
+	JobRunning
+	JobDone
+	JobCancelled
+)
+
+// String implements fmt.Stringer interface.
+func (s JobState) String() string {
+	switch s {
+	case JobRunning:
+		return "running"
+	case JobDone:
+		return "done"
+	case JobCancelled:
+		return "cancelled"
+	default:
+		return "none"
+	}
+}
+
+// Owner is for DDL Owner.
+type Owner struct {
+	OwnerID string `json:"owner_id"`
+	// unix nano seconds
+	// TODO: use timestamp allocated by TSO
+	LastUpdateTS int64 `json:"last_update_ts"`
+}
+
+// String implements fmt.Stringer interface.
+func (o *Owner) String() string {
+	return fmt.Sprintf("ID:%s, LastUpdateTS:%d", o.OwnerID, o.LastUpdateTS)
+}

vendor/github.com/pingcap/tidb/model/model.go

@@ -0,0 +1,199 @@
+// Copyright 2015 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,
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package model
+
+import (
+	"strings"
+
+	"github.com/pingcap/tidb/util/types"
+)
+
+// SchemaState is the state for schema elements.
+type SchemaState byte
+
+const (
+	// StateNone means this schema element is absent and can't be used.
+	StateNone SchemaState = iota
+	// StateDeleteOnly means we can only delete items for this schema element.
+	StateDeleteOnly
+	// StateWriteOnly means we can use any write operation on this schema element,
+	// but outer can't read the changed data.
+	StateWriteOnly
+	// StateWriteReorganization means we are re-organizating whole data after write only state.
+	StateWriteReorganization
+	// StateDeleteReorganization means we are re-organizating whole data after delete only state.
+	StateDeleteReorganization
+	// StatePublic means this schema element is ok for all write and read operations.
+	StatePublic
+)
+
+// String implements fmt.Stringer interface.
+func (s SchemaState) String() string {
+	switch s {
+	case StateDeleteOnly:
+		return "delete only"
+	case StateWriteOnly:
+		return "write only"
+	case StateWriteReorganization:
+		return "write reorganization"
+	case StateDeleteReorganization:
+		return "delete reorganization"
+	case StatePublic:
+		return "public"
+	default:
+		return "none"
+	}
+}
+
+// ColumnInfo provides meta data describing of a table column.
+type ColumnInfo struct {
+	ID              int64       `json:"id"`
+	Name            CIStr       `json:"name"`
+	Offset          int         `json:"offset"`
+	DefaultValue    interface{} `json:"default"`
+	types.FieldType `json:"type"`
+	State           SchemaState `json:"state"`
+}
+
+// Clone clones ColumnInfo.
+func (c *ColumnInfo) Clone() *ColumnInfo {
+	nc := *c
+	return &nc
+}
+
+// TableInfo provides meta data describing a DB table.
+type TableInfo struct {
+	ID      int64  `json:"id"`
+	Name    CIStr  `json:"name"`
+	Charset string `json:"charset"`
+	Collate string `json:"collate"`
+	// Columns are listed in the order in which they appear in the schema.
+	Columns    []*ColumnInfo `json:"cols"`
+	Indices    []*IndexInfo  `json:"index_info"`
+	State      SchemaState   `json:"state"`
+	PKIsHandle bool          `json:"pk_is_handle"`
+	Comment    string        `json:"comment"`
+}
+
+// Clone clones TableInfo.
+func (t *TableInfo) Clone() *TableInfo {
+	nt := *t
+	nt.Columns = make([]*ColumnInfo, len(t.Columns))
+	nt.Indices = make([]*IndexInfo, len(t.Indices))
+
+	for i := range t.Columns {
+		nt.Columns[i] = t.Columns[i].Clone()
+	}
+
+	for i := range t.Indices {
+		nt.Indices[i] = t.Indices[i].Clone()
+	}
+	return &nt
+}
+
+// IndexColumn provides index column info.
+type IndexColumn struct {
+	Name   CIStr `json:"name"`   // Index name
+	Offset int   `json:"offset"` // Index offset
+	Length int   `json:"length"` // Index length
+}
+
+// Clone clones IndexColumn.
+func (i *IndexColumn) Clone() *IndexColumn {
+	ni := *i
+	return &ni
+}
+
+// IndexType is the type of index
+type IndexType int
+
+// String implements Stringer interface.
+func (t IndexType) String() string {
+	switch t {
+	case IndexTypeBtree:
+		return "BTREE"
+	case IndexTypeHash:
+		return "HASH"
+	}
+	return ""
+}
+
+// IndexTypes
+const (
+	IndexTypeBtree IndexType = iota + 1
+	IndexTypeHash
+)
+
+// IndexInfo provides meta data describing a DB index.
+// It corresponds to the statement `CREATE INDEX Name ON Table (Column);`
+// See: https://dev.mysql.com/doc/refman/5.7/en/create-index.html
+type IndexInfo struct {
+	ID      int64          `json:"id"`
+	Name    CIStr          `json:"idx_name"`   // Index name.
+	Table   CIStr          `json:"tbl_name"`   // Table name.
+	Columns []*IndexColumn `json:"idx_cols"`   // Index columns.
+	Unique  bool           `json:"is_unique"`  // Whether the index is unique.
+	Primary bool           `json:"is_primary"` // Whether the index is primary key.
+	State   SchemaState    `json:"state"`
+	Comment string         `json:"comment"`    // Comment
+	Tp      IndexType      `json:"index_type"` // Index type: Btree or Hash
+}
+
+// Clone clones IndexInfo.
+func (index *IndexInfo) Clone() *IndexInfo {
+	ni := *index
+	ni.Columns = make([]*IndexColumn, len(index.Columns))
+	for i := range index.Columns {
+		ni.Columns[i] = index.Columns[i].Clone()
+	}
+	return &ni
+}
+
+// DBInfo provides meta data describing a DB.
+type DBInfo struct {
+	ID      int64        `json:"id"`      // Database ID
+	Name    CIStr        `json:"db_name"` // DB name.
+	Charset string       `json:"charset"`
+	Collate string       `json:"collate"`
+	Tables  []*TableInfo `json:"-"` // Tables in the DB.
+	State   SchemaState  `json:"state"`
+}
+
+// Clone clones DBInfo.
+func (db *DBInfo) Clone() *DBInfo {
+	newInfo := *db
+	newInfo.Tables = make([]*TableInfo, len(db.Tables))
+	for i := range db.Tables {
+		newInfo.Tables[i] = db.Tables[i].Clone()
+	}
+	return &newInfo
+}
+
+// CIStr is case insensitve string.
+type CIStr struct {
+	O string `json:"O"` // Original string.
+	L string `json:"L"` // Lower case string.
+}
+
+// String implements fmt.Stringer interface.
+func (cis CIStr) String() string {
+	return cis.O
+}
+
+// NewCIStr creates a new CIStr.
+func NewCIStr(s string) (cs CIStr) {
+	cs.O = s
+	cs.L = strings.ToLower(s)
+	return
+}