Merge lp:~tjoneslo/akiban-sql-parser/fix-bug-1053091 into lp:~akiban-technologies/akiban-sql-parser/trunk

[Thomas Jones-Low]

Fix for bug 1152175 and 1053091 -

Add an IndexDefinition interface so the two methods of defining indexes (CreateIndexNode and IndexConstraintDefinitionNode) have a consistent interface to allow the server to create the same indexes from both sets of definitions.

Update the IndexConstraintDefinitionNode output of the IndexColumns so they can be verified.

[Nathan Williams (nwilliams)]

Looks good.

review: Approve

=== modified file 'src/main/java/com/akiban/sql/parser/ConstraintDefinitionNode.java'
--- src/main/java/com/akiban/sql/parser/ConstraintDefinitionNode.java	2012-11-07 17:49:31 +0000
+++ src/main/java/com/akiban/sql/parser/ConstraintDefinitionNode.java	2013-03-07 17:31:22 +0000
@@ -56,7 +56,7 @@
         NOT_NULL, PRIMARY_KEY, UNIQUE, CHECK, DROP, FOREIGN_KEY, INDEX
     }
 
-    private TableName constraintName;
+    protected TableName constraintName;
     protected ConstraintType constraintType;
     protected Properties properties;
     private ResultColumnList columnList;

=== modified file 'src/main/java/com/akiban/sql/parser/CreateIndexNode.java'
--- src/main/java/com/akiban/sql/parser/CreateIndexNode.java	2012-11-07 17:49:31 +0000
+++ src/main/java/com/akiban/sql/parser/CreateIndexNode.java	2013-03-07 17:31:22 +0000
@@ -52,7 +52,7 @@
  *
  */
 
-public class CreateIndexNode extends DDLStatementNode
+public class CreateIndexNode extends DDLStatementNode implements IndexDefinition
 {
     boolean unique;
     String indexType;
@@ -160,6 +160,9 @@
     public IndexColumnList getColumnList() {
         return columnList;
     }
+    public IndexColumnList getIndexColumnList() {
+        return columnList;
+    }
     public JoinType getJoinType() {
         return joinType;
     }

=== modified file 'src/main/java/com/akiban/sql/parser/IndexConstraintDefinitionNode.java'
--- src/main/java/com/akiban/sql/parser/IndexConstraintDefinitionNode.java	2012-11-07 17:49:31 +0000
+++ src/main/java/com/akiban/sql/parser/IndexConstraintDefinitionNode.java	2013-03-07 17:31:22 +0000
@@ -20,7 +20,7 @@
 import com.akiban.sql.StandardException;
 import com.akiban.sql.parser.JoinNode.JoinType;
 
-public class IndexConstraintDefinitionNode extends ConstraintDefinitionNode
+public class IndexConstraintDefinitionNode extends ConstraintDefinitionNode implements IndexDefinition
 {
     private String indexName;
     private IndexColumnList indexColumnList;
@@ -36,10 +36,10 @@
     {
         super.init(tableName,
                    ConstraintType.INDEX,
-                   null, // properties : don't need
                    null, // column list? don't need. Use indexColumnList instead
-                   null, // constrainText ? 
-                   null, // conditionCheck ?
+                   null, // properties - none
+                   null, // constrainText  - none
+                   null, // conditionCheck  - none
                    StatementType.UNKNOWN, // behaviour? 
                    ConstraintType.INDEX);
         
@@ -58,7 +58,7 @@
     {
         return indexColumnList;
     }
-    
+
     public JoinType getJoinType()
     {
         return joinType;
@@ -69,6 +69,17 @@
         return location;
     }
     
+    // This is used for the non-unique "INDEX" defintions only
+    public boolean getUniqueness() 
+    {
+        return false;
+    }
+    
+    public TableName getObjectName()
+    {
+        return constraintName;
+    }
+    
     @Override
     public void copyFrom(QueryTreeNode node) throws StandardException
     {
@@ -86,9 +97,18 @@
     {
         return super.toString()
                 + "\nindexName: " + indexName
-                + "\nindexColumnList: " + indexColumnList
                 + "\njoinType: " + joinType
                 + "\nlocation: " + location
                 ;
     }
+
+    @Override
+    public void printSubNodes(int depth) {
+        super.printSubNodes(depth);
+        if (indexColumnList != null) {
+            printLabel(depth, "indexColumnList: ");
+            indexColumnList.treePrint(depth + 1);
+        }
+    }
+    
 }

=== added file 'src/main/java/com/akiban/sql/parser/IndexDefinition.java'
--- src/main/java/com/akiban/sql/parser/IndexDefinition.java	1970-01-01 00:00:00 +0000
+++ src/main/java/com/akiban/sql/parser/IndexDefinition.java	2013-03-07 17:31:22 +0000
@@ -0,0 +1,26 @@
+/**
+ * Copyright © 2012 Akiban Technologies, Inc.  All rights
+ * reserved.
+ *
+ * This program and the accompanying materials are made available
+ * under the terms of the Eclipse Public License v1.0 which
+ * accompanies this distribution, and is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * This program may also be available under different license terms.
+ * For more information, see www.akiban.com or contact
+ * [e-mail].
+ *
+ * Contributors:
+ * Akiban Technologies, Inc.
+ */
+package com.akiban.sql.parser;
+
+import com.akiban.sql.parser.JoinNode.JoinType;
+
+public interface IndexDefinition {
+    public boolean getUniqueness();
+    public JoinType getJoinType();
+    public IndexColumnList getIndexColumnList();
+    public TableName getObjectName();
+}

=== modified file 'src/test/resources/com/akiban/sql/parser/create-table-add-geo-index-1.expected'
--- src/test/resources/com/akiban/sql/parser/create-table-add-geo-index-1.expected	2012-10-12 17:42:18 +0000
+++ src/test/resources/com/akiban/sql/parser/create-table-add-geo-index-1.expected	2013-03-07 17:31:22 +0000
@@ -30,10 +30,21 @@
 	elementType: AT_DROP_CONSTRAINT
 	
 	indexName: indx1
-	indexColumnList: 
-	methodName: Z_ORDER_LAT_LON
-	firstArg: 0
-	lastArg: 1
-	
 	joinType: null
-	location: null
\ No newline at end of file
+	location: null
+	indexColumnList: 		
+		com.akiban.sql.parser.IndexColumnList@63deebc8
+		
+		methodName: Z_ORDER_LAT_LON
+		firstArg: 0
+		lastArg: 1
+		[0]:		
+		com.akiban.sql.parser.IndexColumn@4049cab1
+		columnName: c1
+		tableName: null
+		ascending
+		[1]:		
+		com.akiban.sql.parser.IndexColumn@2c9a4b70
+		columnName: c2
+		tableName: null
+		ascending
\ No newline at end of file

=== modified file 'src/test/resources/com/akiban/sql/parser/create-table-add-index-1.expected'
--- src/test/resources/com/akiban/sql/parser/create-table-add-index-1.expected	2012-08-15 00:17:14 +0000
+++ src/test/resources/com/akiban/sql/parser/create-table-add-index-1.expected	2013-03-07 17:31:22 +0000
@@ -25,6 +25,18 @@
 	elementType: AT_DROP_CONSTRAINT
 	
 	indexName: indx1
-	indexColumnList: 
 	joinType: null
-	location: null
\ No newline at end of file
+	location: null
+	indexColumnList: 		
+		com.akiban.sql.parser.IndexColumnList@3138554d
+
+		[0]:		
+		com.akiban.sql.parser.IndexColumn@69684b79
+		columnName: c1
+		tableName: null
+		ascending
+		[1]:		
+		com.akiban.sql.parser.IndexColumn@3e332aff
+		columnName: c2
+		tableName: null
+		ascending
\ No newline at end of file

=== modified file 'src/test/resources/com/akiban/sql/parser/create-table-add-index-2.expected'
--- src/test/resources/com/akiban/sql/parser/create-table-add-index-2.expected	2012-08-15 00:17:14 +0000
+++ src/test/resources/com/akiban/sql/parser/create-table-add-index-2.expected	2013-03-07 17:31:22 +0000
@@ -25,6 +25,13 @@
 	elementType: AT_DROP_CONSTRAINT
 	
 	indexName: indx1
-	indexColumnList: 
 	joinType: null
-	location: BTREE
\ No newline at end of file
+	location: BTREE
+	indexColumnList: 		
+		com.akiban.sql.parser.IndexColumnList@114beb40
+
+		[0]:		
+		com.akiban.sql.parser.IndexColumn@f41bf9f
+		columnName: c1
+		tableName: null
+		descending
\ No newline at end of file