Skip to content

Commit ca3b3af

Browse files
swjtu-zhangleiLchangliang
authored andcommitted
[bug](schema change) fix max col unique id repeatitive. (apache#232)
1 parent 5532020 commit ca3b3af

3 files changed

Lines changed: 20 additions & 12 deletions

File tree

‎fe/fe-core/src/main/java/org/apache/doris/alter/SchemaChangeHandler.java‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -119,8 +119,6 @@ public class SchemaChangeHandler extends AlterHandler {
119119

120120
public int cycleCount = 0;
121121

122-
public int maxColUniqueId = Column.COLUMN_UNIQUE_ID_INIT_VALUE;
123-
124122
public SchemaChangeHandler() {
125123
super("schema change", Config.default_schema_change_scheduler_interval_millisecond);
126124
}
@@ -143,11 +141,13 @@ private boolean processAddColumn(AddColumnClause alterClause, OlapTable olapTabl
143141

144142
Set<String> newColNameSet = Sets.newHashSet(column.getName());
145143

144+
int maxColUniqueId = olapTable.getPendingMaxColUniqueId();
146145
//only new table generate ColUniqueId, exist table do not.
147146
if (olapTable.getMaxColUniqueId() > Column.COLUMN_UNIQUE_ID_INIT_VALUE) {
148147
maxColUniqueId++;
149148
column.setUniqueId(maxColUniqueId);
150149
}
150+
olapTable.setPendingMaxColUniqueId(maxColUniqueId);
151151

152152
return addColumnInternal(olapTable, column, columnPos, targetIndexId, baseIndexId,
153153
indexSchemaMap, newColNameSet, false);
@@ -202,13 +202,15 @@ public boolean processAddColumns(AddColumnsClause alterClause, OlapTable olapTab
202202
targetIndexId = olapTable.getIndexIdByName(targetIndexName);
203203
}
204204

205+
int maxColUniqueId = olapTable.getPendingMaxColUniqueId();
205206
//for new table calculate column unique id
206207
if (olapTable.getMaxColUniqueId() > Column.COLUMN_UNIQUE_ID_INIT_VALUE) {
207208
for (Column column : columns) {
208209
maxColUniqueId++;
209210
column.setUniqueId(maxColUniqueId);
210211
}
211212
}
213+
olapTable.setPendingMaxColUniqueId(maxColUniqueId);
212214

213215
boolean ligthSchemaChange = true;
214216
for (Column column : columns) {
@@ -1544,10 +1546,6 @@ private void getAlterJobV2Infos(Database db, List<List<Comparable>> schemaChange
15441546
getAlterJobV2Infos(db, ImmutableList.copyOf(alterJobsV2.values()), schemaChangeJobInfos);
15451547
}
15461548

1547-
public void setMaxColUniqueId(int maxColUniqueId) {
1548-
this.maxColUniqueId = maxColUniqueId;
1549-
}
1550-
15511549
@Override
15521550
public void process(List<AlterClause> alterClauses, String clusterName, Database db, OlapTable olapTable)
15531551
throws UserException {
@@ -1556,7 +1554,7 @@ public void process(List<AlterClause> alterClauses, String clusterName, Database
15561554
//alterClauses can or cannot light schema change
15571555
boolean ligthSchemaChange = true;
15581556
//for multi add colmuns clauses
1559-
this.setMaxColUniqueId(olapTable.getMaxColUniqueId());
1557+
olapTable.setPendingMaxColUniqueId(olapTable.getMaxColUniqueId());
15601558
// index id -> index schema
15611559
Map<Long, List<Column>> indexSchemaMap = new HashMap<>();
15621560
for (Map.Entry<Long, List<Column>> entry : olapTable.getIndexIdToSchema(true).entrySet()) {
@@ -1663,8 +1661,8 @@ public void process(List<AlterClause> alterClauses, String clusterName, Database
16631661
}
16641662
} // end for alter clauses
16651663

1666-
LOG.debug("processAddColumns, table: {}({}), maxColUniqueId: {}, ligthSchemaChange: {}", olapTable.getName(),
1667-
olapTable.getId(), maxColUniqueId, ligthSchemaChange);
1664+
LOG.debug("processAddColumns, table: {}({}), pendingMaxColUniqueId: {}, ligthSchemaChange: {}", olapTable.getName(),
1665+
olapTable.getId(), olapTable.getPendingMaxColUniqueId(), ligthSchemaChange);
16681666

16691667
if (ligthSchemaChange) {
16701668
long jobId = Catalog.getCurrentCatalog().getNextId();
@@ -1675,8 +1673,6 @@ public void process(List<AlterClause> alterClauses, String clusterName, Database
16751673
createJob(db.getId(), olapTable, indexSchemaMap, propertyMap, newIndexes);
16761674
}
16771675
} finally {
1678-
//reset schema change max col unique id
1679-
maxColUniqueId = Column.COLUMN_UNIQUE_ID_INIT_VALUE;
16801676
olapTable.writeUnlock();
16811677
}
16821678
}

‎fe/fe-core/src/main/java/org/apache/doris/catalog/OlapTable.java‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
import org.apache.doris.analysis.SlotRef;
2828
import org.apache.doris.backup.Status;
2929
import org.apache.doris.backup.Status.ErrCode;
30+
import org.apache.doris.catalog.Column;
3031
import org.apache.doris.catalog.DistributionInfo.DistributionInfoType;
3132
import org.apache.doris.catalog.MaterializedIndex.IndexExtState;
3233
import org.apache.doris.catalog.MaterializedIndex.IndexState;
@@ -144,6 +145,9 @@ public enum OlapTableState {
144145

145146
private int maxColUniqueId = Column.COLUMN_UNIQUE_ID_INIT_VALUE;
146147

148+
//only used for stash maxColUniqueId in schema change.
149+
private int pendingMaxColUniqueId = Column.COLUMN_UNIQUE_ID_INIT_VALUE;
150+
147151
public OlapTable() {
148152
// for persist
149153
super(TableType.OLAP);
@@ -208,6 +212,14 @@ public void setMaxColUniqueId(int maxColUniqueId) {
208212
this.maxColUniqueId = maxColUniqueId;
209213
}
210214

215+
public int getPendingMaxColUniqueId() {
216+
return this.pendingMaxColUniqueId;
217+
}
218+
219+
public void setPendingMaxColUniqueId(int pendingMaxColUniqueId) {
220+
this.pendingMaxColUniqueId = pendingMaxColUniqueId;
221+
}
222+
211223
public boolean dynamicPartitionExists() {
212224
return tableProperty != null
213225
&& tableProperty.getDynamicPartitionProperty() != null

‎fe/fe-core/src/main/java/org/apache/doris/service/FrontendServiceImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1280,7 +1280,7 @@ public TAddColumnsResult addColumns(TAddColumnsRequest request) throws TExceptio
12801280
}
12811281
//4. call schame change function, only for dynamic table feature.
12821282
SchemaChangeHandler schemaChangeHandler = new SchemaChangeHandler();
1283-
schemaChangeHandler.setMaxColUniqueId(olapTable.getMaxColUniqueId());
1283+
olapTable.setPendingMaxColUniqueId(olapTable.getMaxColUniqueId());
12841284
boolean ligthSchemaChange = schemaChangeHandler.processAddColumns(addColumnsClause, olapTable, indexSchemaMap, true);
12851285
if (ligthSchemaChange) {
12861286
//for schema change add column optimize, direct modify table meta.

0 commit comments

Comments
 (0)