@@ -121,8 +121,6 @@ public class SchemaChangeHandler extends AlterHandler {
121121
122122 public int cycleCount = 0 ;
123123
124- public int maxColUniqueId = Column .COLUMN_UNIQUE_ID_INIT_VALUE ;
125-
126124 public SchemaChangeHandler () {
127125 super ("schema change" , Config .default_schema_change_scheduler_interval_millisecond );
128126 }
@@ -145,11 +143,13 @@ private boolean processAddColumn(AddColumnClause alterClause, OlapTable olapTabl
145143
146144 Set <String > newColNameSet = Sets .newHashSet (column .getName ());
147145
146+ int maxColUniqueId = olapTable .getPendingMaxColUniqueId ();
148147 //only new table generate ColUniqueId, exist table do not.
149148 if (olapTable .getMaxColUniqueId () > Column .COLUMN_UNIQUE_ID_INIT_VALUE ) {
150149 maxColUniqueId ++;
151150 column .setUniqueId (maxColUniqueId );
152151 }
152+ olapTable .setPendingMaxColUniqueId (maxColUniqueId );
153153
154154 return addColumnInternal (olapTable , column , columnPos , targetIndexId , baseIndexId ,
155155 indexSchemaMap , newColNameSet , false );
@@ -206,13 +206,15 @@ public boolean processAddColumns(AddColumnsClause alterClause, OlapTable olapTab
206206 targetIndexId = olapTable .getIndexIdByName (targetIndexName );
207207 }
208208
209+ int maxColUniqueId = olapTable .getPendingMaxColUniqueId ();
209210 //for new table calculate column unique id
210211 if (olapTable .getMaxColUniqueId () > Column .COLUMN_UNIQUE_ID_INIT_VALUE ) {
211212 for (Column column : columns ) {
212213 maxColUniqueId ++;
213214 column .setUniqueId (maxColUniqueId );
214215 }
215216 }
217+ olapTable .setPendingMaxColUniqueId (maxColUniqueId );
216218
217219 boolean ligthSchemaChange = true ;
218220 for (Column column : columns ) {
@@ -1575,10 +1577,6 @@ private void getAlterJobV2Infos(Database db, List<List<Comparable>> schemaChange
15751577 getAlterJobV2Infos (db , ImmutableList .copyOf (alterJobsV2 .values ()), schemaChangeJobInfos );
15761578 }
15771579
1578- public void setMaxColUniqueId (int maxColUniqueId ) {
1579- this .maxColUniqueId = maxColUniqueId ;
1580- }
1581-
15821580 @ Override
15831581 public void process (List <AlterClause > alterClauses , String clusterName , Database db , OlapTable olapTable )
15841582 throws UserException {
@@ -1587,7 +1585,7 @@ public void process(List<AlterClause> alterClauses, String clusterName, Database
15871585 //alterClauses can or cannot light schema change
15881586 boolean ligthSchemaChange = true ;
15891587 //for multi add colmuns clauses
1590- this . setMaxColUniqueId (olapTable .getMaxColUniqueId ());
1588+ olapTable . setPendingMaxColUniqueId (olapTable .getMaxColUniqueId ());
15911589 // index id -> index schema
15921590 Map <Long , List <Column >> indexSchemaMap = new HashMap <>();
15931591 for (Map .Entry <Long , List <Column >> entry : olapTable .getIndexIdToSchema (true ).entrySet ()) {
@@ -1707,8 +1705,8 @@ public void process(List<AlterClause> alterClauses, String clusterName, Database
17071705 }
17081706 } // end for alter clauses
17091707
1710- LOG .debug ("processAddColumns, table: {}({}), maxColUniqueId : {}, ligthSchemaChange: {}" , olapTable .getName (),
1711- olapTable .getId (), maxColUniqueId , ligthSchemaChange );
1708+ LOG .debug ("processAddColumns, table: {}({}), pendingMaxColUniqueId : {}, ligthSchemaChange: {}" , olapTable .getName (),
1709+ olapTable .getId (), olapTable . getPendingMaxColUniqueId () , ligthSchemaChange );
17121710
17131711 if (ligthSchemaChange ) {
17141712 long jobId = Catalog .getCurrentCatalog ().getNextId ();
@@ -1719,8 +1717,6 @@ public void process(List<AlterClause> alterClauses, String clusterName, Database
17191717 createJob (db .getId (), olapTable , indexSchemaMap , propertyMap , newIndexes );
17201718 }
17211719 } finally {
1722- //reset schema change max col unique id
1723- maxColUniqueId = Column .COLUMN_UNIQUE_ID_INIT_VALUE ;
17241720 olapTable .writeUnlock ();
17251721 }
17261722 }
0 commit comments