*: preparation for Go1.11 module cherry pick

Gopkg.toml

@@ -28,10 +28,6 @@ required = ["github.com/golang/protobuf/jsonpb"]
   version = "1.1.0"
   name = "github.com/golang/protobuf"
 
-[[constraint]]
-  branch = "master"
-  name = "github.com/cznic/parser"
-
 [[constraint]]
   branch = "master"
   name = "github.com/cznic/sortutil"
@@ -106,3 +102,7 @@ required = ["github.com/golang/protobuf/jsonpb"]
 [[constraint]]
   name = "github.com/pingcap/tidb-tools"
   revision = "8dd71127bcf09130ae032ab6877dd22f32b53e14"
+
+[[constraint]]
+  name = "github.com/pingcap/parser"
+  branch = "release-2.1"

Makefile

@@ -28,7 +28,7 @@ FILES     := $$(find $$($(PACKAGE_DIRECTORIES)) -name "*.go" | grep -vE "vendor"
 GOFAIL_ENABLE  := $$(find $$PWD/ -type d | grep -vE "(\.git|vendor)" | xargs gofail enable)
 GOFAIL_DISABLE := $$(find $$PWD/ -type d | grep -vE "(\.git|vendor)" | xargs gofail disable)
 
-LDFLAGS += -X "github.com/pingcap/tidb/mysql.TiDBReleaseVersion=$(shell git describe --tags --dirty)"
+LDFLAGS += -X "github.com/pingcap/parser/mysql.TiDBReleaseVersion=$(shell git describe --tags --dirty)"
 LDFLAGS += -X "github.com/pingcap/tidb/util/printer.TiDBBuildTS=$(shell date -u '+%Y-%m-%d %I:%M:%S')"
 LDFLAGS += -X "github.com/pingcap/tidb/util/printer.TiDBGitHash=$(shell git rev-parse HEAD)"
 LDFLAGS += -X "github.com/pingcap/tidb/util/printer.TiDBGitBranch=$(shell git rev-parse --abbrev-ref HEAD)"
@@ -40,7 +40,7 @@ CHECK_LDFLAGS += $(LDFLAGS) ${TEST_LDFLAGS}
 
 TARGET = ""
 
-.PHONY: all build update parser clean todo test gotest interpreter server dev benchkv benchraw check parserlib checklist
+.PHONY: all build update parser clean todo test gotest interpreter server dev benchkv benchraw check checklist parser
 
 default: server buildsucc
 
@@ -51,35 +51,14 @@ buildsucc:
 
 all: dev server benchkv
 
-dev: checklist parserlib test check
+parser:
+	@echo "remove this command later"
+
+dev: checklist test check
 
 build:
 	$(GOBUILD)
 
-goyacc:
-	$(GOBUILD) -o bin/goyacc parser/goyacc/main.go
-
-parser: goyacc
-	bin/goyacc -o /dev/null parser/parser.y
-	bin/goyacc -o parser/parser.go parser/parser.y 2>&1 | egrep "(shift|reduce)/reduce" | awk '{print} END {if (NR > 0) {print "Find conflict in parser.y. Please check y.output for more information."; exit 1;}}'
-	rm -f y.output
-
-	@if [ $(ARCH) = $(LINUX) ]; \
-	then \
-		sed -i -e 's|//line.*||' -e 's/yyEofCode/yyEOFCode/' parser/parser.go; \
-	elif [ $(ARCH) = $(MAC) ]; \
-	then \
-		/usr/bin/sed -i "" 's|//line.*||' parser/parser.go; \
-		/usr/bin/sed -i "" 's/yyEofCode/yyEOFCode/' parser/parser.go; \
-	fi
-
-	@awk 'BEGIN{print "// Code generated by goyacc"} {print $0}' parser/parser.go > tmp_parser.go && mv tmp_parser.go parser/parser.go;
-
-parserlib: parser/parser.go
-
-parser/parser.go: parser/parser.y
-	make parser
-
 # The retool tools.json is setup from hack/retool-install.sh
 check-setup:
 	@which retool >/dev/null 2>&1 || go get github.com/twitchtv/retool
@@ -135,7 +114,7 @@ test: checklist gotest explaintest
 explaintest: server
 	@cd cmd/explaintest && ./run-tests.sh -s ../../bin/tidb-server
 
-gotest: parserlib
+gotest:
 	go get github.com/etcd-io/gofail
 	@$(GOFAIL_ENABLE)
 ifeq ("$(TRAVIS_COVERAGE)", "1")
@@ -152,21 +131,21 @@ else
 endif
 	@$(GOFAIL_DISABLE)
 
-race: parserlib
+race:
 	go get github.com/etcd-io/gofail
 	@$(GOFAIL_ENABLE)
 	@export log_level=debug; \
 	$(GOTEST) -timeout 20m -race $(PACKAGES) || { $(GOFAIL_DISABLE); exit 1; }
 	@$(GOFAIL_DISABLE)
 
-leak: parserlib
+leak:
 	go get github.com/etcd-io/gofail
 	@$(GOFAIL_ENABLE)
 	@export log_level=debug; \
 	$(GOTEST) -tags leak $(PACKAGES) || { $(GOFAIL_DISABLE); exit 1; }
 	@$(GOFAIL_DISABLE)
 
-tikv_integration_test: parserlib
+tikv_integration_test:
 	go get github.com/etcd-io/gofail
 	@$(GOFAIL_ENABLE)
 	$(GOTEST) ./store/tikv/. -with-tikv=true || { $(GOFAIL_DISABLE); exit 1; }
@@ -183,14 +162,14 @@ ifeq ("$(WITH_CHECK)", "1")
 	CHECK_FLAG = $(TEST_LDFLAGS)
 endif
 
-server: parserlib
+server:
 ifeq ($(TARGET), "")
 	$(GOBUILD) $(RACE_FLAG) -ldflags '$(LDFLAGS) $(CHECK_FLAG)' -o bin/tidb-server tidb-server/main.go
 else
 	$(GOBUILD) $(RACE_FLAG) -ldflags '$(LDFLAGS) $(CHECK_FLAG)' -o '$(TARGET)' tidb-server/main.go
 endif
 
-server_check: parserlib
+server_check:
 ifeq ($(TARGET), "")
 	$(GOBUILD) $(RACE_FLAG) -ldflags '$(CHECK_LDFLAGS)' -o bin/tidb-server tidb-server/main.go
 else

ast/ast.go

@@ -18,10 +18,8 @@ package ast
 import (
 	"io"
 
-	"github.com/pingcap/tidb/model"
-	"github.com/pingcap/tidb/types"
-	"github.com/pingcap/tidb/util/chunk"
-	"golang.org/x/net/context"
+	"github.com/pingcap/parser/model"
+	"github.com/pingcap/parser/types"
 )
 
 // Node is the basic element of the AST.
@@ -64,14 +62,6 @@ type ExprNode interface {
 	SetType(tp *types.FieldType)
 	// GetType gets the evaluation type of the expression.
 	GetType() *types.FieldType
-	// SetValue sets value to the expression.
-	SetValue(val interface{})
-	// GetValue gets value of the expression.
-	GetValue() interface{}
-	// SetDatum sets datum to the expression.
-	SetDatum(datum types.Datum)
-	// GetDatum gets datum of the expression.
-	GetDatum() *types.Datum
 	// SetFlag sets flag to the expression.
 	// Flag indicates whether the expression contains
 	// parameter marker, reference, aggregate function...
@@ -138,31 +128,6 @@ type ResultField struct {
 	Referenced bool
 }
 
-// RecordSet is an abstract result set interface to help get data from Plan.
-type RecordSet interface {
-	// Fields gets result fields.
-	Fields() []*ResultField
-
-	// Next reads records into chunk.
-	Next(ctx context.Context, chk *chunk.Chunk) error
-
-	// NewChunk creates a new chunk with initial capacity.
-	NewChunk() *chunk.Chunk
-
-	// Close closes the underlying iterator, call Next after Close will
-	// restart the iteration.
-	Close() error
-}
-
-// RowToDatums converts row to datum slice.
-func RowToDatums(row chunk.Row, fields []*ResultField) []types.Datum {
-	datums := make([]types.Datum, len(fields))
-	for i, f := range fields {
-		datums[i] = row.GetDatum(i, &f.Column.FieldType)
-	}
-	return datums
-}
-
 // ResultSetNode interface has a ResultFields property, represents a Node that returns result set.
 // Implementations include SelectStmt, SubqueryExpr, TableSource, TableName and Join.
 type ResultSetNode interface {
@@ -176,28 +141,6 @@ type SensitiveStmtNode interface {
 	SecureText() string
 }
 
-// Statement is an interface for SQL execution.
-// NOTE: all Statement implementations must be safe for
-// concurrent using by multiple goroutines.
-// If the Exec method requires any Execution domain local data,
-// they must be held out of the implementing instance.
-type Statement interface {
-	// OriginText gets the origin SQL text.
-	OriginText() string
-
-	// Exec executes SQL and gets a Recordset.
-	Exec(ctx context.Context) (RecordSet, error)
-
-	// IsPrepared returns whether this statement is prepared statement.
-	IsPrepared() bool
-
-	// IsReadOnly returns if the statement is read only. For example: SelectStmt without lock.
-	IsReadOnly() bool
-
-	// RebuildPlan rebuilds the plan of the statement.
-	RebuildPlan() (schemaVersion int64, err error)
-}
-
 // Visitor visits a Node.
 type Visitor interface {
 	// Enter is called before children nodes are visited.

ast/base.go

@@ -13,7 +13,7 @@
 
 package ast
 
-import "github.com/pingcap/tidb/types"
+import "github.com/pingcap/parser/types"
 
 // node is the struct implements node interface except for Accept method.
 // Node implementations should embed it in.
@@ -62,20 +62,12 @@ func (dn *dmlNode) dmlStatement() {}
 // Expression implementations should embed it in.
 type exprNode struct {
 	node
-	types.Datum
 	Type types.FieldType
 	flag uint64
 }
 
-// SetDatum implements ExprNode interface.
-func (en *exprNode) SetDatum(datum types.Datum) {
-	en.Datum = datum
-}
-
-// GetDatum implements ExprNode interface.
-func (en *exprNode) GetDatum() *types.Datum {
-	return &en.Datum
-}
+// TexprNode is exported for parser driver.
+type TexprNode = exprNode
 
 // SetType implements ExprNode interface.
 func (en *exprNode) SetType(tp *types.FieldType) {

ast/ddl.go

@@ -14,8 +14,8 @@
 package ast
 
 import (
-	"github.com/pingcap/tidb/model"
-	"github.com/pingcap/tidb/types"
+	"github.com/pingcap/parser/model"
+	"github.com/pingcap/parser/types"
 )
 
 var (

ast/ddl_test.go

@@ -15,7 +15,7 @@ package ast_test
 
 import (
 	. "github.com/pingcap/check"
-	. "github.com/pingcap/tidb/ast"
+	. "github.com/pingcap/parser/ast"
 )
 
 var _ = Suite(&testDDLSuite{})

ast/dml.go

@@ -14,9 +14,9 @@
 package ast
 
 import (
-	"github.com/pingcap/tidb/model"
-	"github.com/pingcap/tidb/mysql"
-	"github.com/pingcap/tidb/util/auth"
+	"github.com/pingcap/parser/auth"
+	"github.com/pingcap/parser/model"
+	"github.com/pingcap/parser/mysql"
 )
 
 var (

ast/dml_test.go

@@ -15,7 +15,7 @@ package ast_test
 
 import (
 	. "github.com/pingcap/check"
-	. "github.com/pingcap/tidb/ast"
+	. "github.com/pingcap/parser/ast"
 )
 
 var _ = Suite(&testDMLSuite{})