diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/CloudRollupJobV2.java b/fe/fe-core/src/main/java/org/apache/doris/alter/CloudRollupJobV2.java index f36d9b5f370006c..5c5dd1972ed3232 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/alter/CloudRollupJobV2.java +++ b/fe/fe-core/src/main/java/org/apache/doris/alter/CloudRollupJobV2.java @@ -131,11 +131,11 @@ protected void onCancel() { Long rollupTabletId = tabletEntry.getKey(); Long baseTabletId = tabletEntry.getValue(); ((CloudInternalCatalog) Env.getCurrentInternalCatalog()) - .removeSchemaChangeJob(dbId, tableId, baseIndexId, rollupIndexId, + .removeSchemaChangeJob(dbId, tableId, baseIndexId, rollupIndexId, partitionId, baseTabletId, rollupTabletId); } - LOG.info("Cancel RollupJob. Remove SchemaChangeJob in ms." + - "dbId:{}, tableId:{}, rollupIndexId: {} partitionId:{}. tabletSize:{}", + LOG.info("Cancel RollupJob. Remove SchemaChangeJob in ms." + + "dbId:{}, tableId:{}, rollupIndexId: {} partitionId:{}. tabletSize:{}", dbId, tableId, rollupIndexId, partitionId, rollupTabletIdToBaseTabletId.size()); } break; diff --git a/fe/fe-core/src/main/java/org/apache/doris/alter/CloudSchemaChangeJobV2.java b/fe/fe-core/src/main/java/org/apache/doris/alter/CloudSchemaChangeJobV2.java index ac80812e5b8420f..3d79863addb8ac8 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/alter/CloudSchemaChangeJobV2.java +++ b/fe/fe-core/src/main/java/org/apache/doris/alter/CloudSchemaChangeJobV2.java @@ -134,11 +134,11 @@ protected void onCancel() { Long shadowTabletId = entry.getKey(); Long originTabletId = entry.getValue(); ((CloudInternalCatalog) Env.getCurrentInternalCatalog()) - .removeSchemaChangeJob(dbId, tableId, originIndexId, shadowIndexId, + .removeSchemaChangeJob(dbId, tableId, originIndexId, shadowIndexId, partitionId, originTabletId, shadowTabletId); } - LOG.info("Cancel SchemaChange. Remove SchemaChangeJob in ms." + - "dbId:{}, tableId:{}, originIndexId:{}, partitionId:{}. tabletSize:{}", + LOG.info("Cancel SchemaChange. Remove SchemaChangeJob in ms." + + "dbId:{}, tableId:{}, originIndexId:{}, partitionId:{}. tabletSize:{}", dbId, tableId, originIndexId, partitionId, shadowTabletIdToOriginTabletId.size()); } break; diff --git a/fe/fe-core/src/main/java/org/apache/doris/cloud/datasource/CloudInternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/cloud/datasource/CloudInternalCatalog.java index c3243630376b4c8..f0c9278562d4378 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/cloud/datasource/CloudInternalCatalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/cloud/datasource/CloudInternalCatalog.java @@ -874,8 +874,8 @@ public void removeSchemaChangeJob(long dbId, long tableId, long indexId, long ne newtabletIndexPBBuilder.setTabletId(newTabletId); final Cloud.TabletIndexPB newtabletIndex = newtabletIndexPBBuilder.build(); schemaChangeJobPBBuilder.setNewTabletIdx(newtabletIndex); - final Cloud.TabletSchemaChangeJobPB tabletSchemaChangeJobPb = - schemaChangeJobPBBuilder.build(); + final Cloud.TabletSchemaChangeJobPB tabletSchemaChangeJobPb = + schemaChangeJobPBBuilder.build(); tabletJobInfoPBBuilder.setSchemaChange(tabletSchemaChangeJobPb);