add support for REMOVE PARTITIONING syntax

pingcap · Jul 25, 2019 · 5225a29 · 5225a29
1 parent 57e1f3b
commit 5225a29
Show file tree

Hide file tree

Showing 5 changed files with 6,936 additions and 6,835 deletions.
diff --git a/ast/ddl.go b/ast/ddl.go
@@ -1676,7 +1676,6 @@ const (
 	AlterTableCoalescePartitions
 	AlterTableDropPartition
 	AlterTableTruncatePartition
-	AlterTablePartition
 	AlterTableEnableKeys
 	AlterTableDisableKeys
 
@@ -1738,6 +1737,41 @@ func (a AlterAlgorithm) String() string {
 	}
 }
 
+type AlterTablePartitionOption struct {
+	node
+
+	Partition            *PartitionOptions
+	IsRemovePartitioning bool
+}
+
+func (n *AlterTablePartitionOption) Restore(ctx *RestoreCtx) error {
+	if n.Partition != nil {
+		ctx.WritePlain(" ")
+		if n.IsRemovePartitioning {
+			ctx.WriteKeyWord("REMOVE PARTITIONING")
+		} else {
+			if err := n.Partition.Restore(ctx); err != nil {
+				return errors.Annotate(err, "An error occurred while restore AlterTableStmt.AlterTablePartitionOption.Partition")
+			}
+		}
+	}
+	return nil
+}
+
+func (n *AlterTablePartitionOption) Accept(v Visitor) (Node, bool) {
+	newNode, skipChildren := v.Enter(n)
+	if skipChildren {
+		return v.Leave(newNode)
+	}
+	n = newNode.(*AlterTablePartitionOption)
+	node, ok := n.Partition.Accept(v)
+	if !ok {
+		return n, false
+	}
+	n.Partition = node.(*PartitionOptions)
+	return v.Leave(n)
+}
+
 // AlterTableSpec represents alter table specification.
 type AlterTableSpec struct {
 	node
@@ -1964,10 +1998,6 @@ func (n *AlterTableSpec) Restore(ctx *RestoreCtx) error {
 			}
 			ctx.WriteName(name.O)
 		}
-	case AlterTablePartition:
-		if err := n.Partition.Restore(ctx); err != nil {
-			return errors.Annotate(err, "An error occurred while restore AlterTableSpec.Partition")
-		}
 	case AlterTableEnableKeys:
 		ctx.WriteKeyWord("ENABLE KEYS")
 	case AlterTableDisableKeys:
@@ -2029,8 +2059,9 @@ func (n *AlterTableSpec) Accept(v Visitor) (Node, bool) {
 type AlterTableStmt struct {
 	ddlNode
 
-	Table *TableName
-	Specs []*AlterTableSpec
+	Table        *TableName
+	Specs        []*AlterTableSpec
+	PartitionOpt *AlterTablePartitionOption
 }
 
 // Restore implements Node interface.
@@ -2040,7 +2071,7 @@ func (n *AlterTableStmt) Restore(ctx *RestoreCtx) error {
 		return errors.Annotate(err, "An error occurred while restore AlterTableStmt.Table")
 	}
 	for i, spec := range n.Specs {
-		if i == 0 || spec.Tp == AlterTablePartition {
+		if i == 0 {
 			ctx.WritePlain(" ")
 		} else {
 			ctx.WritePlain(", ")
@@ -2049,6 +2080,16 @@ func (n *AlterTableStmt) Restore(ctx *RestoreCtx) error {
 			return errors.Annotatef(err, "An error occurred while restore AlterTableStmt.Specs[%d]", i)
 		}
 	}
+	if n.PartitionOpt != nil {
+		ctx.WritePlain(" ")
+		if n.PartitionOpt.IsRemovePartitioning {
+			ctx.WriteKeyWord("REMOVE PARTITIONING")
+		} else {
+			if err := n.PartitionOpt.Partition.Restore(ctx); err != nil {
+				return errors.Annotate(err, "An error occurred while restore AlterTableStmt.AlterTablePartitionOption.Partition")
+			}
+		}
+	}
 	return nil
 }
 

diff --git a/misc.go b/misc.go
@@ -406,6 +406,7 @@ var tokenMap = map[string]int{
 	"PACK_KEYS":                packKeys,
 	"PAGE":                     pageSym,
 	"PARTITION":                partition,
+	"PARTITIONING":             partitioning,
 	"PARTITIONS":               partitions,
 	"PASSWORD":                 password,
 	"PESSIMISTIC":              pessimistic,
@@ -438,6 +439,7 @@ var tokenMap = map[string]int{
 	"REGEXP":                   regexpKwd,
 	"REGIONS":                  regions,
 	"RELOAD":                   reload,
+	"REMOVE":                   remove,
 	"RENAME":                   rename,
 	"REPEAT":                   repeat,
 	"REPEATABLE":               repeatable,