database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[Alter] Drop index when index column is dropped (#2941)

Browse Source
This commit is contained in:
yangzhg
2020-02-19 17:57:27 +08:00
committed by GitHub
parent 3994b52f34
commit ceaa790793
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
fe/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java
View File

@ -157,7 +157,7 @@ public class SchemaChangeHandler extends AlterHandler {
}
private void processDropColumn(DropColumnClause alterClause, OlapTable olapTable,
Map<Long, LinkedList<Column>> indexSchemaMap) throws DdlException {
Map<Long, LinkedList<Column>> indexSchemaMap, List<Index> indexes) throws DdlException {
String dropColName = alterClause.getColName();
String targetIndexName = alterClause.getRollupName();
checkIndexExists(olapTable, targetIndexName);
@ -224,7 +224,18 @@ public class SchemaChangeHandler extends AlterHandler {
}
}
}
Iterator<Index> it = indexes.iterator();
while(it.hasNext()){
Index index = it.next();
for (String indexCol : index.getColumns()) {
if (dropColName.equalsIgnoreCase(indexCol)) {
it.remove();
break;
}
}
}
long baseIndexId = olapTable.getBaseIndexId();
if (targetIndexName == null) {
// if not specify rollup index, column should be dropped from both base and rollup indexes.
@ -1367,8 +1378,8 @@ public class SchemaChangeHandler extends AlterHandler {
// add columns
processAddColumns((AddColumnsClause) alterClause, olapTable, indexSchemaMap);
} else if (alterClause instanceof DropColumnClause) {
// drop column
processDropColumn((DropColumnClause) alterClause, olapTable, indexSchemaMap);
// drop column and drop indexes on this column
processDropColumn((DropColumnClause) alterClause, olapTable, indexSchemaMap, newIndexes);
} else if (alterClause instanceof ModifyColumnClause) {
// modify column
processModifyColumn((ModifyColumnClause) alterClause, olapTable, indexSchemaMap);