Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 4 additions & 27 deletions fe/fe-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -539,29 +539,6 @@ under the License.
<artifactId>iceberg-aws</artifactId>
<version>${iceberg.version}</version>
</dependency>
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-core</artifactId>
</dependency>

<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-common</artifactId>
</dependency>

<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-format</artifactId>
</dependency>

<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-s3</artifactId>
</dependency>
<dependency>
<groupId>org.apache.paimon</groupId>
<artifactId>paimon-jindo</artifactId>
</dependency>

<dependency>
<groupId>software.amazon.awssdk</groupId>
Expand All @@ -573,10 +550,10 @@ under the License.
</exclusion>
</exclusions>
</dependency>
<!-- Required at runtime by paimon-s3 and iceberg-aws (both direct deps): their S3 I/O
paths use software.amazon.awssdk.transfer.s3.model.ObjectTransfer and related
classes from this jar. Without it the FE classloader throws NoClassDefFoundError
when loading Paimon/Iceberg catalog metadata. -->
<!-- Required at runtime by hadoop-aws (and iceberg-aws's S3FileIO): their S3 I/O paths use
software.amazon.awssdk.transfer.s3.S3TransferManager / ObjectTransfer and related classes
from this jar. Without it the FE classloader throws NoClassDefFoundError when loading the
object-store / Iceberg catalog metadata. -->
<dependency>
<groupId>software.amazon.awssdk</groupId>
<artifactId>s3-transfer-manager</artifactId>
Expand Down
24 changes: 0 additions & 24 deletions fe/fe-core/src/main/java/org/apache/doris/catalog/Env.java
Original file line number Diff line number Diff line change
Expand Up @@ -108,8 +108,6 @@
import org.apache.doris.datasource.hive.event.MetastoreEventsProcessor;
import org.apache.doris.datasource.iceberg.IcebergExternalTable;
import org.apache.doris.datasource.iceberg.IcebergSysExternalTable;
import org.apache.doris.datasource.paimon.PaimonExternalTable;
import org.apache.doris.datasource.paimon.PaimonSysExternalTable;
import org.apache.doris.deploy.DeployManager;
import org.apache.doris.deploy.impl.LocalFileDeployManager;
import org.apache.doris.dictionary.DictionaryManager;
Expand Down Expand Up @@ -4914,28 +4912,6 @@ public static void getDdlStmt(Command command, String dbName, TableIf table, Lis
}
}
sb.append("\n)");
} else if (table.getType() == TableType.PAIMON_EXTERNAL_TABLE) {
addTableComment(table, sb);
PaimonExternalTable paimonExternalTable;
if (table instanceof PaimonExternalTable) {
paimonExternalTable = (PaimonExternalTable) table;
} else if (table instanceof PaimonSysExternalTable) {
paimonExternalTable = ((PaimonSysExternalTable) table).getSourceTable();
} else {
throw new RuntimeException("Unexpected Paimon table type: " + table.getClass().getSimpleName());
}
Map<String, String> properties = paimonExternalTable.getTableProperties();
sb.append("\nLOCATION '").append(properties.getOrDefault("path", "")).append("'");
sb.append("\nPROPERTIES (");
Iterator<Entry<String, String>> iterator = properties.entrySet().iterator();
while (iterator.hasNext()) {
Entry<String, String> prop = iterator.next();
sb.append("\n \"").append(prop.getKey()).append("\" = \"").append(prop.getValue()).append("\"");
if (iterator.hasNext()) {
sb.append(",");
}
}
sb.append("\n)");
} else if (table.getType() == TableType.PLUGIN_EXTERNAL_TABLE) {
addTableComment(table, sb);
PluginDrivenExternalTable pluginExternalTable;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -178,10 +178,18 @@ private void initStorageProperties() {
if (storagePropertiesMap == null) {
try {
boolean checkStorageProperties = true;
MetastoreProperties msp = getMetastoreProperties();
AbstractVendedCredentialsProvider provider =
VendedCredentialsFactory.getProviderType(getMetastoreProperties());
VendedCredentialsFactory.getProviderType(msp);
if (provider != null) {
checkStorageProperties = !provider.isVendedCredentialsEnabled(getMetastoreProperties());
checkStorageProperties = !provider.isVendedCredentialsEnabled(msp);
} else if (msp != null) {
// Non-provider backends signal vended credentials via the metastore-props gate
// (e.g. a Paimon REST catalog skips the static storage map): SDK-free replacement
// of the former VendedCredentialsFactory PAIMON case. Iceberg still routes through
// its provider above, so its behavior is unchanged. The null guard preserves the
// pre-change "build the static map" behavior when there is no metastore.
checkStorageProperties = !msp.isVendedCredentialsEnabled();
}
if (checkStorageProperties) {
this.orderedStoragePropertiesList = StorageProperties.createAll(getProperties());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,6 @@
import org.apache.doris.datasource.lakesoul.LakeSoulExternalDatabase;
import org.apache.doris.datasource.metacache.MetaCache;
import org.apache.doris.datasource.operations.ExternalMetadataOps;
import org.apache.doris.datasource.paimon.PaimonExternalDatabase;
import org.apache.doris.datasource.test.TestExternalCatalog;
import org.apache.doris.datasource.test.TestExternalDatabase;
import org.apache.doris.nereids.trees.plans.commands.info.CreateTableInfo;
Expand Down Expand Up @@ -963,8 +962,6 @@ protected ExternalDatabase<? extends ExternalTable> buildDbForInit(String remote
return new LakeSoulExternalDatabase(this, dbId, localDbName, remoteDbName);
case TEST:
return new TestExternalDatabase(this, dbId, localDbName, remoteDbName);
case PAIMON:
return new PaimonExternalDatabase(this, dbId, localDbName, remoteDbName);
case TRINO_CONNECTOR:
return new PluginDrivenExternalDatabase(this, dbId, localDbName, remoteDbName);
case REMOTE_DORIS:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,6 @@
import org.apache.doris.datasource.metacache.MetaCacheEntryDef;
import org.apache.doris.datasource.metacache.MetaCacheEntryInvalidation;
import org.apache.doris.datasource.metacache.MetaCacheEntryStats;
import org.apache.doris.datasource.paimon.PaimonExternalMetaCache;
import org.apache.doris.fs.FileSystemCache;

import com.github.benmanes.caffeine.cache.stats.CacheStats;
Expand Down Expand Up @@ -63,7 +62,6 @@ public class ExternalMetaCacheMgr {
private static final String ENGINE_HIVE = "hive";
private static final String ENGINE_HUDI = "hudi";
private static final String ENGINE_ICEBERG = "iceberg";
private static final String ENGINE_PAIMON = "paimon";
private static final String ENGINE_DORIS = "doris";

/**
Expand Down Expand Up @@ -173,11 +171,6 @@ public IcebergExternalMetaCache iceberg(long catalogId) {
return (IcebergExternalMetaCache) engine(ENGINE_ICEBERG);
}

public PaimonExternalMetaCache paimon(long catalogId) {
prepareCatalogByEngine(catalogId, ENGINE_PAIMON);
return (PaimonExternalMetaCache) engine(ENGINE_PAIMON);
}

public DorisExternalMetaCache doris(long catalogId) {
prepareCatalogByEngine(catalogId, ENGINE_DORIS);
return (DorisExternalMetaCache) engine(ENGINE_DORIS);
Expand Down Expand Up @@ -299,7 +292,6 @@ private void registerBuiltinEngineCaches() {
cacheRegistry.register(new HiveExternalMetaCache(commonRefreshExecutor, fileListingExecutor));
cacheRegistry.register(new HudiExternalMetaCache(commonRefreshExecutor));
cacheRegistry.register(new IcebergExternalMetaCache(commonRefreshExecutor));
cacheRegistry.register(new PaimonExternalMetaCache(commonRefreshExecutor));
cacheRegistry.register(new DorisExternalMetaCache(commonRefreshExecutor));
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
* <p>Created transiently by {@link org.apache.doris.datasource.systable.PluginDrivenSysTable} during
* planning/describe (via {@code createSysExternalTable}); it is NEVER added to a persisted table map
* and is NOT GSON-registered, mirroring legacy sys ExternalTables (e.g.
* {@link org.apache.doris.datasource.paimon.PaimonSysExternalTable}).</p>
* {@code PaimonSysExternalTable}).</p>
*
* <p>It reports {@link org.apache.doris.catalog.TableIf.TableType#PLUGIN_EXTERNAL_TABLE} (inherited);
* no connector-specific table type is introduced. The whole schema/partition/row-count path is reused
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
package org.apache.doris.datasource.credentials;

import org.apache.doris.datasource.iceberg.IcebergVendedCredentialsProvider;
import org.apache.doris.datasource.paimon.PaimonVendedCredentialsProvider;
import org.apache.doris.datasource.property.metastore.MetastoreProperties;
import org.apache.doris.datasource.property.storage.StorageProperties;
import org.apache.doris.datasource.property.storage.StorageProperties.Type;
Expand Down Expand Up @@ -62,10 +61,10 @@ public static AbstractVendedCredentialsProvider getProviderType(MetastorePropert
switch (type) {
case ICEBERG:
return IcebergVendedCredentialsProvider.getInstance();
case PAIMON:
return PaimonVendedCredentialsProvider.getInstance();
default:
// Other types do not support vendor credentials
// Other types either do not support vended credentials, or signal them via the
// MetastoreProperties.isVendedCredentialsEnabled() gate (e.g. Paimon REST) instead
// of a dedicated provider.
return null;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@
import org.apache.doris.datasource.doris.RemoteDorisExternalCatalog;
import org.apache.doris.datasource.hive.HMSExternalCatalog;
import org.apache.doris.datasource.iceberg.IcebergExternalCatalog;
import org.apache.doris.datasource.paimon.PaimonExternalCatalog;

import java.util.ArrayList;
import java.util.LinkedHashSet;
Expand All @@ -38,7 +37,6 @@ public class ExternalMetaCacheRouteResolver {
private static final String ENGINE_HIVE = "hive";
private static final String ENGINE_HUDI = "hudi";
private static final String ENGINE_ICEBERG = "iceberg";
private static final String ENGINE_PAIMON = "paimon";
private static final String ENGINE_DORIS = "doris";

private final ExternalMetaCacheRegistry registry;
Expand Down Expand Up @@ -66,10 +64,6 @@ private void addBuiltinRoutes(Set<ExternalMetaCache> resolved, CatalogIf<?> cata
resolved.add(registry.resolve(ENGINE_ICEBERG));
return;
}
if (catalog instanceof PaimonExternalCatalog) {
resolved.add(registry.resolve(ENGINE_PAIMON));
return;
}
if (catalog instanceof RemoteDorisExternalCatalog) {
resolved.add(registry.resolve(ENGINE_DORIS));
return;
Expand Down

This file was deleted.

This file was deleted.

Loading
Loading