Merge lp:~mmcm/akiban-sql-parser/full-text-index into lp:~akiban-technologies/akiban-sql-parser/trunk

[Mike McMahon]

Add FULL_TEXT as a special index function, like Z_ORDER_LAT_LON.

This will define a full text index on the given field(s).

[Nathan Williams (nwilliams)]

As described.

review: Approve

=== modified file 'src/main/java/com/akiban/sql/parser/IndexColumnList.java'
--- src/main/java/com/akiban/sql/parser/IndexColumnList.java	2012-11-07 17:49:31 +0000
+++ src/main/java/com/akiban/sql/parser/IndexColumnList.java	2013-02-27 07:57:18 +0000
@@ -29,7 +29,7 @@
 
     public static enum FunctionType
     {
-        Z_ORDER_LAT_LON
+        Z_ORDER_LAT_LON, FULL_TEXT
         // ADD MORE AS NEEDED
     }
 

=== modified file 'src/main/javacc/SQLGrammar.jj'
--- src/main/javacc/SQLGrammar.jj	2013-02-05 07:50:48 +0000
+++ src/main/javacc/SQLGrammar.jj	2013-02-27 07:57:18 +0000
@@ -2254,7 +2254,6 @@
 | <WORK: "work">
 | <WRITE: "write">
 | <YEAR: "year">
-| <Z_ORDER_LAT_LON: "z_order_lat_lon">
 }
 
 /* This list should contain only and all SQL92 keywords that are
@@ -2393,6 +2392,7 @@
 | <XMLPARSE:    "xmlparse">
 | <XMLQUERY:    "xmlquery">
 | <XMLSERIALIZE:    "xmlserialize">
+| <Z_ORDER_LAT_LON: "z_order_lat_lon">
 }
 
 /* This list should contain non-SQL92 keywords that are not reserved.
@@ -2434,6 +2434,7 @@
 | <FN: "fn">
 | <FORCE: "force">
 | <FORMAT: "format">
+| <FULL_TEXT: "full_text">
 | <HEADER: "header">
 | <HOUR_MICROSECOND: "hour_microsecond">
 | <HOUR_MINUTE: "hour_minute">
@@ -14807,6 +14808,7 @@
 | tok = <FORCE>
 | tok = <FORMAT>
 | tok = <FORTRAN>
+| tok = <FULL_TEXT>
 | tok = <GENERATED>
 | tok = <HEADER>
 | tok = <HOUR_MICROSECOND>
@@ -15025,6 +15027,9 @@
 groupIndexItemList(IndexColumnList columnList) throws StandardException :
 {}
 {
+    LOOKAHEAD( { getToken(1).kind == FULL_TEXT && getToken(2).kind == LEFT_PAREN } )
+    fullTextColumnItemList(columnList)
+|
     groupIndexItem(columnList) 
     ( <COMMA> groupIndexItem(columnList) )*
 }
@@ -15052,6 +15057,20 @@
       groupIndexColumnItem(columnList)
 }
 
+void fullTextColumnItemList(IndexColumnList columnList) throws StandardException :
+{
+}
+{
+      <FULL_TEXT> <LEFT_PAREN>
+      groupIndexColumnItem(columnList)
+      ( <COMMA> groupIndexColumnItem(columnList) )*
+      <RIGHT_PAREN>
+      {
+          columnList.applyFunction(IndexColumnList.FunctionType.FULL_TEXT,
+                                   0, columnList.size());
+      }
+}
+
 void
 groupIndexColumnItem(IndexColumnList columnList) throws StandardException :
 {

=== added file 'src/test/resources/com/akiban/sql/parser/create-full-text-index-1.expected'
--- src/test/resources/com/akiban/sql/parser/create-full-text-index-1.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/create-full-text-index-1.expected	2013-02-27 07:57:18 +0000
@@ -0,0 +1,32 @@
+com.akiban.sql.parser.CreateIndexNode@6c81526f
+name: text1
+statementType: CREATE INDEX
+unique: false
+indexType: null
+indexName: text1
+tableName: t1
+joinType: null
+properties: null
+existenceCheck: NO_CONDITION
+storageLocation: null
+	
+	com.akiban.sql.parser.IndexColumnList@1e4b2d10
+	
+	methodName: FULL_TEXT
+	firstArg: 0
+	lastArg: 2
+	[0]:	
+	com.akiban.sql.parser.IndexColumn@597b84f9
+	columnName: c1
+	tableName: null
+	ascending
+	[1]:	
+	com.akiban.sql.parser.IndexColumn@3c572554
+	columnName: c2
+	tableName: null
+	ascending
+	[2]:	
+	com.akiban.sql.parser.IndexColumn@7d53ccbe
+	columnName: c3
+	tableName: t2
+	ascending
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/parser/create-full-text-index-1.sql'
--- src/test/resources/com/akiban/sql/parser/create-full-text-index-1.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/parser/create-full-text-index-1.sql	2013-02-27 07:57:18 +0000
@@ -0,0 +1,1 @@
+CREATE INDEX text1 ON t1 (FULL_TEXT(c1, c2, t2.c3))
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/unparser/create-full-text-index-1.expected'
--- src/test/resources/com/akiban/sql/unparser/create-full-text-index-1.expected	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/create-full-text-index-1.expected	2013-02-27 07:57:18 +0000
@@ -0,0 +1,1 @@
+CREATE INDEX text1 ON t1(FULL_TEXT(c1, c2, t2.c3))
\ No newline at end of file

=== added file 'src/test/resources/com/akiban/sql/unparser/create-full-text-index-1.sql'
--- src/test/resources/com/akiban/sql/unparser/create-full-text-index-1.sql	1970-01-01 00:00:00 +0000
+++ src/test/resources/com/akiban/sql/unparser/create-full-text-index-1.sql	2013-02-27 07:57:18 +0000
@@ -0,0 +1,1 @@
+CREATE INDEX text1 ON t1 (FULL_TEXT(c1, c2, t2.c3))
\ No newline at end of file