@@ -1578,6 +1578,8 @@ public void process(List<AlterClause> alterClauses, String clusterName, Database
15781578 throws UserException {
15791579 olapTable .writeLockOrDdlException ();
15801580 try {
1581+ //alterClauses can or cannot light schema change
1582+ boolean ligthSchemaChange = true ;
15811583 // index id -> index schema
15821584 Map <Long , List <Column >> indexSchemaMap = new HashMap <>();
15831585 for (Map .Entry <Long , List <Column >> entry : olapTable .getIndexIdToSchema (true ).entrySet ()) {
@@ -1654,55 +1656,59 @@ public void process(List<AlterClause> alterClauses, String clusterName, Database
16541656
16551657 if (alterClause instanceof AddColumnClause ) {
16561658 // add column
1657- boolean ligthSchemaChange = processAddColumn ((AddColumnClause ) alterClause , olapTable , indexSchemaMap );
1658- LOG .debug ("processAddColumn, table: {}({}), getMaxColUniqueId(): {}, ligthSchemaChange: {}" , olapTable .getName (), olapTable .getId (),
1659- olapTable .getMaxColUniqueId (), ligthSchemaChange );
1660- if (ligthSchemaChange ) {
1661- //for schema change add column optimize, direct modify table meta.
1662- Catalog .getCurrentCatalog ().modifyTableAddOrDropColumns (db , olapTable , indexSchemaMap , newIndexes , false );
1663- return ;
1659+ boolean clauseCanLigthSchemaChange = processAddColumn ((AddColumnClause ) alterClause , olapTable , indexSchemaMap );
1660+ if (clauseCanLigthSchemaChange == false ) {
1661+ ligthSchemaChange = false ;
16641662 }
16651663 } else if (alterClause instanceof AddColumnsClause ) {
16661664 // add columns
1667- boolean ligthSchemaChange = processAddColumns ((AddColumnsClause ) alterClause , olapTable , indexSchemaMap , false );
1668- LOG .debug ("processAddColumns, table: {}({}), getMaxColUniqueId(): {}, ligthSchemaChange: {}" , olapTable .getName (), olapTable .getId (),
1669- olapTable .getMaxColUniqueId (), ligthSchemaChange );
1670- if (ligthSchemaChange ) {
1671- //for schema change add column optimize, direct modify table meta.
1672- Catalog .getCurrentCatalog ().modifyTableAddOrDropColumns (db , olapTable , indexSchemaMap , newIndexes , false );
1673- return ;
1665+ boolean clauseCanLigthSchemaChange = processAddColumns ((AddColumnsClause ) alterClause , olapTable , indexSchemaMap , false );
1666+ if (clauseCanLigthSchemaChange == false ) {
1667+ ligthSchemaChange = false ;
16741668 }
16751669 } else if (alterClause instanceof DropColumnClause ) {
16761670 // drop column and drop indexes on this column
1677- boolean ligthSchemaChange = processDropColumn ((DropColumnClause ) alterClause , olapTable , indexSchemaMap , newIndexes );
1678- LOG .debug ("processDropColumn, table: {}({}), getMaxColUniqueId(): {}" , olapTable .getName (), olapTable .getId (), olapTable .getMaxColUniqueId ());
1679- if (ligthSchemaChange ) {
1680- //for schema change add column optimize, direct modify table meta.
1681- Catalog .getCurrentCatalog ().modifyTableAddOrDropColumns (db , olapTable , indexSchemaMap , newIndexes , false );
1682- return ;
1671+ boolean clauseCanLigthSchemaChange = processDropColumn ((DropColumnClause ) alterClause , olapTable , indexSchemaMap , newIndexes );
1672+ if (clauseCanLigthSchemaChange == false ) {
1673+ ligthSchemaChange = false ;
16831674 }
16841675 } else if (alterClause instanceof ModifyColumnClause ) {
16851676 // modify column
16861677 processModifyColumn ((ModifyColumnClause ) alterClause , olapTable , indexSchemaMap );
1678+ ligthSchemaChange = false ;
16871679 } else if (alterClause instanceof ReorderColumnsClause ) {
16881680 // reorder column
16891681 processReorderColumn ((ReorderColumnsClause ) alterClause , olapTable , indexSchemaMap );
1682+ ligthSchemaChange = false ;
16901683 } else if (alterClause instanceof ModifyTablePropertiesClause ) {
16911684 // modify table properties
16921685 // do nothing, properties are already in propertyMap
1686+ ligthSchemaChange = false ;
16931687 } else if (alterClause instanceof CreateIndexClause ) {
16941688 if (processAddIndex ((CreateIndexClause ) alterClause , olapTable , newIndexes )) {
16951689 return ;
16961690 }
1691+ ligthSchemaChange = false ;
16971692 } else if (alterClause instanceof DropIndexClause ) {
16981693 if (processDropIndex ((DropIndexClause ) alterClause , olapTable , newIndexes )) {
16991694 return ;
17001695 }
1696+ ligthSchemaChange = false ;
17011697 } else {
17021698 Preconditions .checkState (false );
17031699 }
1704- } // end for alter clausesnnnnnn
1705- createJob (db .getId (), olapTable , indexSchemaMap , propertyMap , newIndexes );
1700+ } // end for alter clauses
1701+
1702+ LOG .debug ("processAddColumns, table: {}({}), getMaxColUniqueId(): {}, ligthSchemaChange: {}" , olapTable .getName (),
1703+ olapTable .getId (), olapTable .getMaxColUniqueId (), ligthSchemaChange );
1704+
1705+ if (ligthSchemaChange ) {
1706+ //for schema change add/drop value column optimize, direct modify table meta.
1707+ Catalog .getCurrentCatalog ().modifyTableAddOrDropColumns (db , olapTable , indexSchemaMap , newIndexes , false );
1708+ return ;
1709+ } else {
1710+ createJob (db .getId (), olapTable , indexSchemaMap , propertyMap , newIndexes );
1711+ }
17061712 } finally {
17071713 olapTable .writeUnlock ();
17081714 }
0 commit comments