@@ -1547,6 +1547,8 @@ public void process(List<AlterClause> alterClauses, String clusterName, Database
15471547 throws UserException {
15481548 olapTable .writeLockOrDdlException ();
15491549 try {
1550+ //alterClauses can or cannot light schema change
1551+ boolean ligthSchemaChange = true ;
15501552 // index id -> index schema
15511553 Map <Long , List <Column >> indexSchemaMap = new HashMap <>();
15521554 for (Map .Entry <Long , List <Column >> entry : olapTable .getIndexIdToSchema (true ).entrySet ()) {
@@ -1610,55 +1612,59 @@ public void process(List<AlterClause> alterClauses, String clusterName, Database
16101612
16111613 if (alterClause instanceof AddColumnClause ) {
16121614 // add column
1613- boolean ligthSchemaChange = processAddColumn ((AddColumnClause ) alterClause , olapTable , indexSchemaMap );
1614- LOG .debug ("processAddColumn, table: {}({}), getMaxColUniqueId(): {}, ligthSchemaChange: {}" , olapTable .getName (), olapTable .getId (),
1615- olapTable .getMaxColUniqueId (), ligthSchemaChange );
1616- if (ligthSchemaChange ) {
1617- //for schema change add column optimize, direct modify table meta.
1618- Catalog .getCurrentCatalog ().modifyTableAddOrDropColumns (db , olapTable , indexSchemaMap , newIndexes , false );
1619- return ;
1615+ boolean clauseCanLigthSchemaChange = processAddColumn ((AddColumnClause ) alterClause , olapTable , indexSchemaMap );
1616+ if (clauseCanLigthSchemaChange == false ) {
1617+ ligthSchemaChange = false ;
16201618 }
16211619 } else if (alterClause instanceof AddColumnsClause ) {
16221620 // add columns
1623- boolean ligthSchemaChange = processAddColumns ((AddColumnsClause ) alterClause , olapTable , indexSchemaMap , false );
1624- LOG .debug ("processAddColumns, table: {}({}), getMaxColUniqueId(): {}, ligthSchemaChange: {}" , olapTable .getName (), olapTable .getId (),
1625- olapTable .getMaxColUniqueId (), ligthSchemaChange );
1626- if (ligthSchemaChange ) {
1627- //for schema change add column optimize, direct modify table meta.
1628- Catalog .getCurrentCatalog ().modifyTableAddOrDropColumns (db , olapTable , indexSchemaMap , newIndexes , false );
1629- return ;
1621+ boolean clauseCanLigthSchemaChange = processAddColumns ((AddColumnsClause ) alterClause , olapTable , indexSchemaMap , false );
1622+ if (clauseCanLigthSchemaChange == false ) {
1623+ ligthSchemaChange = false ;
16301624 }
16311625 } else if (alterClause instanceof DropColumnClause ) {
16321626 // drop column and drop indexes on this column
1633- boolean ligthSchemaChange = processDropColumn ((DropColumnClause ) alterClause , olapTable , indexSchemaMap , newIndexes );
1634- LOG .debug ("processDropColumn, table: {}({}), getMaxColUniqueId(): {}" , olapTable .getName (), olapTable .getId (), olapTable .getMaxColUniqueId ());
1635- if (ligthSchemaChange ) {
1636- //for schema change add column optimize, direct modify table meta.
1637- Catalog .getCurrentCatalog ().modifyTableAddOrDropColumns (db , olapTable , indexSchemaMap , newIndexes , false );
1638- return ;
1627+ boolean clauseCanLigthSchemaChange = processDropColumn ((DropColumnClause ) alterClause , olapTable , indexSchemaMap , newIndexes );
1628+ if (clauseCanLigthSchemaChange == false ) {
1629+ ligthSchemaChange = false ;
16391630 }
16401631 } else if (alterClause instanceof ModifyColumnClause ) {
16411632 // modify column
16421633 processModifyColumn ((ModifyColumnClause ) alterClause , olapTable , indexSchemaMap );
1634+ ligthSchemaChange = false ;
16431635 } else if (alterClause instanceof ReorderColumnsClause ) {
16441636 // reorder column
16451637 processReorderColumn ((ReorderColumnsClause ) alterClause , olapTable , indexSchemaMap );
1638+ ligthSchemaChange = false ;
16461639 } else if (alterClause instanceof ModifyTablePropertiesClause ) {
16471640 // modify table properties
16481641 // do nothing, properties are already in propertyMap
1642+ ligthSchemaChange = false ;
16491643 } else if (alterClause instanceof CreateIndexClause ) {
16501644 if (processAddIndex ((CreateIndexClause ) alterClause , olapTable , newIndexes )) {
16511645 return ;
16521646 }
1647+ ligthSchemaChange = false ;
16531648 } else if (alterClause instanceof DropIndexClause ) {
16541649 if (processDropIndex ((DropIndexClause ) alterClause , olapTable , newIndexes )) {
16551650 return ;
16561651 }
1652+ ligthSchemaChange = false ;
16571653 } else {
16581654 Preconditions .checkState (false );
16591655 }
1660- } // end for alter clausesnnnnnn
1661- createJob (db .getId (), olapTable , indexSchemaMap , propertyMap , newIndexes );
1656+ } // end for alter clauses
1657+
1658+ LOG .debug ("processAddColumns, table: {}({}), getMaxColUniqueId(): {}, ligthSchemaChange: {}" , olapTable .getName (),
1659+ olapTable .getId (), olapTable .getMaxColUniqueId (), ligthSchemaChange );
1660+
1661+ if (ligthSchemaChange ) {
1662+ //for schema change add/drop value column optimize, direct modify table meta.
1663+ Catalog .getCurrentCatalog ().modifyTableAddOrDropColumns (db , olapTable , indexSchemaMap , newIndexes , false );
1664+ return ;
1665+ } else {
1666+ createJob (db .getId (), olapTable , indexSchemaMap , propertyMap , newIndexes );
1667+ }
16621668 } finally {
16631669 olapTable .writeUnlock ();
16641670 }
0 commit comments