Skip to content

Commit 7a4db35

Browse files
committed
[P4-T07/T08/T09] remove legacy MaxCompute subsystem from fe-core
After the catalog-SPI cutover (apache#64253) a max_compute catalog deserializes to PluginDrivenExternalCatalog and no legacy MaxComputeExternal* object is ever instantiated. Remove the now-dead legacy subsystem as one compiling unit. - Delete 20 fe-core files: datasource/maxcompute/* (incl. MCTransaction and source/MaxComputeScanNode|Split), the MaxCompute sink/insert/txn plumbing (Logical/Physical/Unbound sinks, MCInsertExecutor/Context, MaxComputeTableSink, MCTransactionManager, the impl rule), and 2 legacy-only tests. - Clean ~21 reverse-reference sites: drop imports + now-dead instanceof/visitor/ rule branches, keeping every PluginDriven/connector sibling branch and the image/replay keep-set (GsonUtils compat strings, TableType/TransactionType/ TableFormatType/InitCatalogLog.Type MAX_COMPUTE enums, block-id thrift). - Trim/rewire 3 tests: drop legacy MCTransaction/MaxComputeExternalMetaCache cases; rewire FrontendServiceImplTest's block-id RPC test onto the generic Transaction SPI (mock), since getMaxComputeBlockIdRange now reads the PluginDriven connector transaction. fe-core has zero com.aliyun.odps source refs after this (pom deps dropped in a follow-up). test-compile + checkstyle + connector import-gate all green.
1 parent 9ed4957 commit 7a4db35

44 files changed

Lines changed: 8 additions & 4705 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,6 @@
4848
import org.apache.doris.datasource.infoschema.ExternalInfoSchemaDatabase;
4949
import org.apache.doris.datasource.infoschema.ExternalMysqlDatabase;
5050
import org.apache.doris.datasource.lakesoul.LakeSoulExternalDatabase;
51-
import org.apache.doris.datasource.maxcompute.MaxComputeExternalDatabase;
5251
import org.apache.doris.datasource.metacache.MetaCache;
5352
import org.apache.doris.datasource.operations.ExternalMetadataOps;
5453
import org.apache.doris.datasource.paimon.PaimonExternalDatabase;
@@ -950,8 +949,6 @@ protected ExternalDatabase<? extends ExternalTable> buildDbForInit(String remote
950949
return new PluginDrivenExternalDatabase(this, dbId, localDbName, remoteDbName);
951950
case ICEBERG:
952951
return new IcebergExternalDatabase(this, dbId, localDbName, remoteDbName);
953-
case MAX_COMPUTE:
954-
return new MaxComputeExternalDatabase(this, dbId, localDbName, remoteDbName);
955952
case LAKESOUL:
956953
return new LakeSoulExternalDatabase(this, dbId, localDbName, remoteDbName);
957954
case TEST:

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

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
import org.apache.doris.datasource.hive.HiveExternalMetaCache;
2525
import org.apache.doris.datasource.hudi.HudiExternalMetaCache;
2626
import org.apache.doris.datasource.iceberg.IcebergExternalMetaCache;
27-
import org.apache.doris.datasource.maxcompute.MaxComputeExternalMetaCache;
2827
import org.apache.doris.datasource.metacache.AbstractExternalMetaCache;
2928
import org.apache.doris.datasource.metacache.ExternalMetaCache;
3029
import org.apache.doris.datasource.metacache.ExternalMetaCacheRegistry;
@@ -65,7 +64,6 @@ public class ExternalMetaCacheMgr {
6564
private static final String ENGINE_HUDI = "hudi";
6665
private static final String ENGINE_ICEBERG = "iceberg";
6766
private static final String ENGINE_PAIMON = "paimon";
68-
private static final String ENGINE_MAXCOMPUTE = "maxcompute";
6967
private static final String ENGINE_DORIS = "doris";
7068

7169
/**
@@ -180,11 +178,6 @@ public PaimonExternalMetaCache paimon(long catalogId) {
180178
return (PaimonExternalMetaCache) engine(ENGINE_PAIMON);
181179
}
182180

183-
public MaxComputeExternalMetaCache maxCompute(long catalogId) {
184-
prepareCatalogByEngine(catalogId, ENGINE_MAXCOMPUTE);
185-
return (MaxComputeExternalMetaCache) engine(ENGINE_MAXCOMPUTE);
186-
}
187-
188181
public DorisExternalMetaCache doris(long catalogId) {
189182
prepareCatalogByEngine(catalogId, ENGINE_DORIS);
190183
return (DorisExternalMetaCache) engine(ENGINE_DORIS);
@@ -307,7 +300,6 @@ private void registerBuiltinEngineCaches() {
307300
cacheRegistry.register(new HudiExternalMetaCache(commonRefreshExecutor));
308301
cacheRegistry.register(new IcebergExternalMetaCache(commonRefreshExecutor));
309302
cacheRegistry.register(new PaimonExternalMetaCache(commonRefreshExecutor));
310-
cacheRegistry.register(new MaxComputeExternalMetaCache(commonRefreshExecutor));
311303
cacheRegistry.register(new DorisExternalMetaCache(commonRefreshExecutor));
312304
}
313305

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

Lines changed: 0 additions & 262 deletions
This file was deleted.

0 commit comments

Comments
 (0)