← Back to branch summary

~mmcm/akiban-server/script-invoker-pool

« back to all changes in this revision

Viewing changes to src/main/java/com/akiban/server/service/is/BasicInfoSchemaTablesServiceImpl.java

merge mmcm: Include full text indexes in INFORMATION_SCHEMA.INDEXES.

https://code.launchpad.net/~mmcm/akiban-server/is-full-text-indexes/+merge/157229

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/main/java/com/akiban/server/service/is/BasicInfoSchemaTablesServiceImpl.java
20
20
import com.akiban.ais.model.AkibanInformationSchema;
21
21
import com.akiban.ais.model.CharsetAndCollation;
22
22
import com.akiban.ais.model.Column;
 
23
import com.akiban.ais.model.FullTextIndex;
23
24
import com.akiban.ais.model.GroupIndex;
24
25
import com.akiban.ais.model.Index;
25
26
import com.akiban.ais.model.IndexColumn;
723
724
                                     indexType,
724
725
                                     boolResult(index.isUnique()),
725
726
                                     index.isGroupIndex() ? index.getJoinType().name() : null,
726
 
                                     index.isSpatial() ? index.getIndexMethod().name() : null,
 
727
                                     (index.getIndexMethod() == Index.IndexMethod.NORMAL) ? null : index.getIndexMethod().name(),
727
728
                                     ++rowCounter /*hidden pk*/);
728
729
            }
729
730
        }
1077
1078
        private final Iterator<UserTable> tableIt;
1078
1079
        Iterator<TableIndex> tableIndexIt;
1079
1080
        Iterator<GroupIndex> groupIndexIt;
 
1081
        Iterator<FullTextIndex> textIndexIt;
1080
1082
        UserTable curTable;
1081
1083
 
1082
1084
        public IndexIteration(Session session,
1094
1096
                        return index;
1095
1097
                    }
1096
1098
                }
 
1099
                while(textIndexIt != null && textIndexIt.hasNext()) {
 
1100
                    return textIndexIt.next();
 
1101
                }
1097
1102
                while(tableIt.hasNext()) {
1098
1103
                    curTable = tableIt.next();
1099
1104
                    if(isAccessible(session, curTable.getName())) {
1100
1105
                        tableIndexIt = curTable.getIndexes().iterator();
1101
1106
                        groupIndexIt = curTable.getGroup().getIndexes().iterator();
 
1107
                        textIndexIt = curTable.getOwnFullTextIndexes().iterator();
1102
1108
                        continue getIndexes;
1103
1109
                    }
1104
1110
                }