Skip to content

Commit 523c557

Browse files
swjtu-zhangleiLchangliang
authored andcommitted
[feature](schema change) light schema change add alter job. (apache#1)
1 parent 32054ad commit 523c557

6 files changed

Lines changed: 31 additions & 8 deletions

File tree

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

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,10 @@ public JobState getJobState() {
108108
return jobState;
109109
}
110110

111+
public void setJobState(JobState jobState) {
112+
this.jobState = jobState;
113+
}
114+
111115
public JobType getType() {
112116
return type;
113117
}
@@ -140,6 +144,10 @@ public long getFinishedTimeMs() {
140144
return finishedTimeMs;
141145
}
142146

147+
public void setFinishedTimeMs(long finishedTimeMs) {
148+
this.finishedTimeMs = finishedTimeMs;
149+
}
150+
143151
/**
144152
* The keyword 'synchronized' only protects 2 methods:
145153
* run() and cancel()

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import org.apache.doris.alter.AlterJobV2.JobType;
2323
import org.apache.doris.alter.MaterializedViewHandler;
2424
import org.apache.doris.alter.SchemaChangeHandler;
25+
import org.apache.doris.alter.SchemaChangeJobV2;
2526
import org.apache.doris.alter.SystemHandler;
2627
import org.apache.doris.analysis.AddPartitionClause;
2728
import org.apache.doris.analysis.AdminCheckTabletsStmt;
@@ -5042,6 +5043,14 @@ public void modifyTableAddOrDropColumns(Database db, OlapTable olapTable, Map<Lo
50425043
LOG.debug("logModifyTableAddOrDropColumns info:{}", info);
50435044
editLog.logModifyTableAddOrDropColumns(info);
50445045
}
5046+
5047+
//for compatibility, we need create a finished state schema change job v2
5048+
long jobId = this.getNextId();
5049+
SchemaChangeJobV2 schemaChangeJob = new SchemaChangeJobV2(jobId, db.getId(), olapTable.getId(), olapTable.getName(), 1000);
5050+
schemaChangeJob.setJobState(AlterJobV2.JobState.FINISHED);
5051+
schemaChangeJob.setFinishedTimeMs(System.currentTimeMillis());
5052+
this.getSchemaChangeHandler().addAlterJobV2(schemaChangeJob);
5053+
50455054
LOG.info("finished modify table's add or drop columns. table: {}, is replay: {}",
50465055
olapTable.getName(), isReplay);
50475056
}

‎fe/fe-core/src/main/java/org/apache/doris/datasource/InternalDataSource.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1744,6 +1744,12 @@ private void createOlapTable(Database db, CreateTableStmt stmt) throws UserExcep
17441744
OlapTable olapTable =
17451745
new OlapTable(tableId, tableName, baseSchema, keysType, partitionInfo, defaultDistributionInfo,
17461746
indexes);
1747+
1748+
for (Column column : baseSchema) {
1749+
column.setUniqueId(olapTable.incAndGetMaxColUniqueId());
1750+
LOG.debug("table: {}, newColumn: {}, uniqueId: {}", olapTable.getName(), column.getName(), column.getUniqueId());
1751+
}
1752+
17471753
olapTable.setComment(stmt.getComment());
17481754

17491755
// set base index id

‎fe/fe-core/src/test/java/org/apache/doris/alter/AlterJobV2Test.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ public void testSchemaChange() throws Exception {
9393
Catalog.getCurrentCatalog().getAlterInstance().processAlterTable(alterTableStmt);
9494
// 2. check alter job
9595
Map<Long, AlterJobV2> alterJobs = Catalog.getCurrentCatalog().getSchemaChangeHandler().getAlterJobsV2();
96-
Assert.assertEquals(0, alterJobs.size());
96+
Assert.assertEquals(1, alterJobs.size());
9797
waitAlterJobDone(alterJobs);
9898
// 3. check show alter table column
9999
String showAlterStmtStr = "show alter table column from test;";

‎fe/fe-core/src/test/java/org/apache/doris/alter/SchemaChangeHandlerTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ public void testAggAddOrDropColumn() throws Exception {
142142
String addValColStmtStr = "alter table test.sc_agg add column new_v1 int MAX default '0'";
143143
AlterTableStmt addValColStmt = (AlterTableStmt) parseAndAnalyzeStmt(addValColStmtStr);
144144
Catalog.getCurrentCatalog().getAlterInstance().processAlterTable(addValColStmt);
145-
145+
jobSize++;
146146
//check alter job, do not create job
147147
Map<Long, AlterJobV2> alterJobs = Catalog.getCurrentCatalog().getSchemaChangeHandler().getAlterJobsV2();
148148
Assertions.assertEquals(jobSize, alterJobs.size());
@@ -183,7 +183,7 @@ public void testAggAddOrDropColumn() throws Exception {
183183
String dropValColStmtStr = "alter table test.sc_agg drop column new_v1";
184184
AlterTableStmt dropValColStmt = (AlterTableStmt) parseAndAnalyzeStmt(dropValColStmtStr);
185185
Catalog.getCurrentCatalog().getAlterInstance().processAlterTable(dropValColStmt);
186-
186+
jobSize++;
187187
//check alter job, do not create job
188188
LOG.info("alterJobs:{}", alterJobs);
189189
Assertions.assertEquals(jobSize, alterJobs.size());
@@ -264,7 +264,7 @@ public void testUniqAddOrDropColumn() throws Exception {
264264
String addValColStmtStr = "alter table test.sc_uniq add column new_v1 int default '0'";
265265
AlterTableStmt addValColStmt = (AlterTableStmt) parseAndAnalyzeStmt(addValColStmtStr);
266266
Catalog.getCurrentCatalog().getAlterInstance().processAlterTable(addValColStmt);
267-
267+
jobSize++;
268268
//check alter job, do not create job
269269
Map<Long, AlterJobV2> alterJobs = Catalog.getCurrentCatalog().getSchemaChangeHandler().getAlterJobsV2();
270270
LOG.info("alterJobs:{}", alterJobs);
@@ -285,7 +285,7 @@ public void testUniqAddOrDropColumn() throws Exception {
285285
String dropValColStmtStr = "alter table test.sc_uniq drop column new_v1";
286286
AlterTableStmt dropValColStm = (AlterTableStmt) parseAndAnalyzeStmt(dropValColStmtStr);
287287
Catalog.getCurrentCatalog().getAlterInstance().processAlterTable(dropValColStm);
288-
288+
jobSize++;
289289
//check alter job
290290
Assertions.assertEquals(jobSize, alterJobs.size());
291291
tbl.readLock();
@@ -321,7 +321,7 @@ public void testDupAddOrDropColumn() throws Exception {
321321
String addValColStmtStr = "alter table test.sc_dup add column new_v1 int default '0'";
322322
AlterTableStmt addValColStmt = (AlterTableStmt) parseAndAnalyzeStmt(addValColStmtStr);
323323
Catalog.getCurrentCatalog().getAlterInstance().processAlterTable(addValColStmt);
324-
324+
jobSize++;
325325
//check alter job, do not create job
326326
Map<Long, AlterJobV2> alterJobs = Catalog.getCurrentCatalog().getSchemaChangeHandler().getAlterJobsV2();
327327
LOG.info("alterJobs:{}", alterJobs);
@@ -342,7 +342,7 @@ public void testDupAddOrDropColumn() throws Exception {
342342
String dropValColStmtStr = "alter table test.sc_dup drop column new_v1";
343343
AlterTableStmt dropValColStm = (AlterTableStmt) parseAndAnalyzeStmt(dropValColStmtStr);
344344
Catalog.getCurrentCatalog().getAlterInstance().processAlterTable(dropValColStm);
345-
345+
jobSize++;
346346
//check alter job
347347
Assertions.assertEquals(jobSize, alterJobs.size());
348348
tbl.readLock();

‎fe/fe-core/src/test/java/org/apache/doris/utframe/DemoTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public void testCreateDbAndTable() throws Exception {
8484

8585
// 6. check alter job
8686
Map<Long, AlterJobV2> alterJobs = Catalog.getCurrentCatalog().getSchemaChangeHandler().getAlterJobsV2();
87-
Assertions.assertEquals(0, alterJobs.size());
87+
Assertions.assertEquals(1, alterJobs.size());
8888
for (AlterJobV2 alterJobV2 : alterJobs.values()) {
8989
while (!alterJobV2.getJobState().isFinalState()) {
9090
System.out.println("alter job " + alterJobV2.getJobId() + " is running. state: " + alterJobV2.getJobState());

0 commit comments

Comments
 (0)