Merge lp:~mmcm/akiban-server/is-full-text-indexes into lp:~akiban-technologies/akiban-server/trunk

[Mike McMahon]

Include full text indexes in INFORMATION_SCHEMA.INDEXES.

This appears to be all that's needed to get akdump to output them. It doesn't need any additional information.

[Thomas Jones-Low (tjoneslo)]

It's that simple.

review: Approve

=== modified file 'src/main/java/com/akiban/server/service/is/BasicInfoSchemaTablesServiceImpl.java'
--- src/main/java/com/akiban/server/service/is/BasicInfoSchemaTablesServiceImpl.java	2013-03-22 20:05:57 +0000
+++ src/main/java/com/akiban/server/service/is/BasicInfoSchemaTablesServiceImpl.java	2013-04-04 20:45:28 +0000
@@ -20,6 +20,7 @@
 import com.akiban.ais.model.AkibanInformationSchema;
 import com.akiban.ais.model.CharsetAndCollation;
 import com.akiban.ais.model.Column;
+import com.akiban.ais.model.FullTextIndex;
 import com.akiban.ais.model.GroupIndex;
 import com.akiban.ais.model.Index;
 import com.akiban.ais.model.IndexColumn;
@@ -723,7 +724,7 @@
                                      indexType,
                                      boolResult(index.isUnique()),
                                      index.isGroupIndex() ? index.getJoinType().name() : null,
-                                     index.isSpatial() ? index.getIndexMethod().name() : null,
+                                     (index.getIndexMethod() == Index.IndexMethod.NORMAL) ? null : index.getIndexMethod().name(),
                                      ++rowCounter /*hidden pk*/);
             }
         }
@@ -1077,6 +1078,7 @@
         private final Iterator<UserTable> tableIt;
         Iterator<TableIndex> tableIndexIt;
         Iterator<GroupIndex> groupIndexIt;
+        Iterator<FullTextIndex> textIndexIt;
         UserTable curTable;
 
         public IndexIteration(Session session,
@@ -1094,11 +1096,15 @@
                         return index;
                     }
                 }
+                while(textIndexIt != null && textIndexIt.hasNext()) {
+                    return textIndexIt.next();
+                }
                 while(tableIt.hasNext()) {
                     curTable = tableIt.next();
                     if(isAccessible(session, curTable.getName())) {
                         tableIndexIt = curTable.getIndexes().iterator();
                         groupIndexIt = curTable.getGroup().getIndexes().iterator();
+                        textIndexIt = curTable.getOwnFullTextIndexes().iterator();
                         continue getIndexes;
                     }
                 } 

=== modified file 'src/test/java/com/akiban/server/explain/format/DefaultFormatterTest.java'
--- src/test/java/com/akiban/server/explain/format/DefaultFormatterTest.java	2013-03-22 20:05:57 +0000
+++ src/test/java/com/akiban/server/explain/format/DefaultFormatterTest.java	2013-04-04 20:45:28 +0000
@@ -58,8 +58,6 @@
      */
     @Test
     public void testDescribe_Explainer() {
-        System.out.println("describe");
-        
         // copied from TreeFormatTest
         // parent expresion: 
         // SUBSTRING(FROM_UNIXTIME(123456 * 7 + 8, "%Y-%m-%d"), 9 + 10, 11)