diff --git a/fe/fe-core/pom.xml b/fe/fe-core/pom.xml index b47cac79c9..c5e31fcacc 100644 --- a/fe/fe-core/pom.xml +++ b/fe/fe-core/pom.xml @@ -557,12 +557,6 @@ under the License. ${paimon.version} - - io.delta - delta-standalone_2.12 - ${delta.version} - - software.amazon.awssdk glue diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/TableIf.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/TableIf.java index e5f14a8a31..3539d17e26 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/TableIf.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/TableIf.java @@ -156,7 +156,7 @@ public interface TableIf { MYSQL, ODBC, OLAP, SCHEMA, INLINE_VIEW, VIEW, BROKER, ELASTICSEARCH, HIVE, ICEBERG, @Deprecated HUDI, JDBC, TABLE_VALUED_FUNCTION, HMS_EXTERNAL_TABLE, ES_EXTERNAL_TABLE, MATERIALIZED_VIEW, JDBC_EXTERNAL_TABLE, ICEBERG_EXTERNAL_TABLE, TEST_EXTERNAL_TABLE, PAIMON_EXTERNAL_TABLE, MAX_COMPUTE_EXTERNAL_TABLE, - HUDI_EXTERNAL_TABLE, DELTALAKE_EXTERNAL_TABLE; + HUDI_EXTERNAL_TABLE; public String toEngineName() { switch (this) { @@ -193,8 +193,6 @@ public interface TableIf { return "iceberg"; case HUDI_EXTERNAL_TABLE: return "hudi"; - case DELTALAKE_EXTERNAL_TABLE: - return "deltalake"; default: return null; } @@ -223,7 +221,6 @@ public interface TableIf { case ES_EXTERNAL_TABLE: case ICEBERG_EXTERNAL_TABLE: case PAIMON_EXTERNAL_TABLE: - case DELTALAKE_EXTERNAL_TABLE: return "EXTERNAL TABLE"; default: return null; diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/external/DeltaLakeExternalDataBase.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/external/DeltaLakeExternalDataBase.java deleted file mode 100644 index 2db5c4eb83..0000000000 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/external/DeltaLakeExternalDataBase.java +++ /dev/null @@ -1,34 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -package org.apache.doris.catalog.external; - -import org.apache.doris.datasource.ExternalCatalog; -import org.apache.doris.datasource.InitDatabaseLog; -import org.apache.doris.datasource.deltalake.DeltaLakeExternalCatalog; - -public class DeltaLakeExternalDataBase extends HMSExternalDatabase { - - public DeltaLakeExternalDataBase(ExternalCatalog extCatalog, long id, String name) { - super(extCatalog, id, name, InitDatabaseLog.Type.DELTALAKE); - } - - @Override - protected DeltaLakeExternalTable getExternalTable(String tableName, long tblId, ExternalCatalog catalog) { - return new DeltaLakeExternalTable(tblId, tableName, name, (DeltaLakeExternalCatalog) extCatalog); - } -} diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/external/DeltaLakeExternalTable.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/external/DeltaLakeExternalTable.java deleted file mode 100644 index cd5bb16200..0000000000 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/external/DeltaLakeExternalTable.java +++ /dev/null @@ -1,159 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -package org.apache.doris.catalog.external; - -import org.apache.doris.catalog.ArrayType; -import org.apache.doris.catalog.Column; -import org.apache.doris.catalog.HiveMetaStoreClientHelper; -import org.apache.doris.catalog.MapType; -import org.apache.doris.catalog.ScalarType; -import org.apache.doris.catalog.StructType; -import org.apache.doris.catalog.Type; -import org.apache.doris.datasource.HMSExternalCatalog; -import org.apache.doris.datasource.deltalake.DeltaLakeExternalCatalog; - -import com.google.common.collect.Lists; -import io.delta.standalone.DeltaLog; -import io.delta.standalone.actions.Metadata; -import io.delta.standalone.types.DataType; -import io.delta.standalone.types.StructField; -import org.apache.hadoop.conf.Configuration; -import org.apache.hadoop.hive.metastore.api.FieldSchema; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -public class DeltaLakeExternalTable extends HMSExternalTable { - public DeltaLakeExternalTable(long id, String name, String dbName, - DeltaLakeExternalCatalog catalog) { - super(id, name, dbName, catalog, TableType.DELTALAKE_EXTERNAL_TABLE); - } - - @Override - protected synchronized void makeSureInitialized() { - super.makeSureInitialized(); - if (!objectCreated) { - remoteTable = ((HMSExternalCatalog) catalog).getClient().getTable(dbName, name); - if (remoteTable == null) { - dlaType = DLAType.UNKNOWN; - } else { - if (supportedDeltaLakeTable()) { - dlaType = DLAType.DELTALAKE; - } else { - dlaType = DLAType.UNKNOWN; - } - } - objectCreated = true; - } - } - - private boolean supportedDeltaLakeTable() { - Map parameters = remoteTable.getParameters(); - if (parameters == null) { - return false; - } - // Check that the 'spark.sql.sources.provider' parameter exists and has a value of 'delta' - return "delta".equalsIgnoreCase(parameters.get("spark.sql.sources.provider")); - } - - @Override - public List initSchema() { - makeSureInitialized(); - List columns; - List schema = ((DeltaLakeExternalCatalog) catalog).getClient().getSchema(dbName, name); - io.delta.standalone.types.StructType deltaSchema = getDeltaTableSchema(this); - List tmpSchema = Lists.newArrayListWithCapacity(schema.size()); - for (StructField field : deltaSchema.getFields()) { - String columnName = field.getName(); - tmpSchema.add(new Column(columnName, fromDeltaTypeToDorisType(field.getDataType()), - true, null, true, null, "", true, null, -1, null)); - } - columns = tmpSchema; - initPartitionColumns(columns); - return columns; - } - - private static io.delta.standalone.types.StructType getDeltaTableSchema(DeltaLakeExternalTable table) { - String path = table.getRemoteTable().getSd().getLocation(); - Configuration conf = HiveMetaStoreClientHelper.getConfiguration(table); - DeltaLog deltaLog = DeltaLog.forTable(conf, path); - Metadata metadata = deltaLog.snapshot().getMetadata(); - io.delta.standalone.types.StructType tableSchema = metadata.getSchema(); - return tableSchema; - } - - private static Type fromDeltaTypeToDorisType(DataType dataType) { - String typeName = dataType.getTypeName(); - switch (typeName) { - case "boolean": - return Type.BOOLEAN; - case "byte": - case "tinyint": - return Type.TINYINT; - case "smallint": - return Type.SMALLINT; - case "integer": - return Type.INT; - case "long": - return Type.BIGINT; - case "float": - return Type.FLOAT; - case "double": - return Type.DOUBLE; - case "date": - return Type.DATEV2; - case "timestamp": - return ScalarType.createDatetimeV2Type(6); - case "string": - return Type.STRING; - case "decimal": - int precision = ((io.delta.standalone.types.DecimalType) dataType).getPrecision(); - int scale = ((io.delta.standalone.types.DecimalType) dataType).getScale(); - return ScalarType.createDecimalV3Type(precision, scale); - case "array": - io.delta.standalone.types.ArrayType arrayType = (io.delta.standalone.types.ArrayType) dataType; - Type innerType = fromDeltaTypeToDorisType(arrayType.getElementType()); - return ArrayType.create(innerType, true); - case "map": - io.delta.standalone.types.MapType mapType = (io.delta.standalone.types.MapType) dataType; - return new MapType(Type.STRING, fromDeltaTypeToDorisType(mapType.getValueType())); - case "struct": - io.delta.standalone.types.StructType deltaStructType = (io.delta.standalone.types.StructType) dataType; - ArrayList dorisFields = new ArrayList<>(); - for (io.delta.standalone.types.StructField deltaField : deltaStructType.getFields()) { - // Convert the Delta field type to a Doris type - Type dorisFieldType = fromDeltaTypeToDorisType(deltaField.getDataType()); - - // Create a Doris struct field with the same name and type - org.apache.doris.catalog.StructField dorisField = new org.apache.doris.catalog.StructField( - deltaField.getName(), dorisFieldType); - - // Add the Doris field to the list - dorisFields.add(dorisField); - } - // Create a Doris struct type with the converted fields - return new StructType(dorisFields); - case "null": - return Type.NULL; - case "binary": - default: - return Type.UNSUPPORTED; - } - } -} diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/external/HMSExternalDatabase.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/external/HMSExternalDatabase.java index 318ea06f34..d75f86bd08 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/external/HMSExternalDatabase.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/external/HMSExternalDatabase.java @@ -46,10 +46,6 @@ public class HMSExternalDatabase extends ExternalDatabase { super(extCatalog, id, name, InitDatabaseLog.Type.HMS); } - public HMSExternalDatabase(ExternalCatalog extCatalog, long id, String name, InitDatabaseLog.Type type) { - super(extCatalog, id, name, type); - } - @Override protected HMSExternalTable getExternalTable(String tableName, long tblId, ExternalCatalog catalog) { return new HMSExternalTable(tblId, tableName, name, (HMSExternalCatalog) extCatalog); diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/external/HMSExternalTable.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/external/HMSExternalTable.java index 0243ad12f7..38f4256276 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/external/HMSExternalTable.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/external/HMSExternalTable.java @@ -108,10 +108,10 @@ public class HMSExternalTable extends ExternalTable { SUPPORTED_HUDI_FILE_FORMATS.add("com.uber.hoodie.hadoop.realtime.HoodieRealtimeInputFormat"); } - protected volatile org.apache.hadoop.hive.metastore.api.Table remoteTable = null; - protected List partitionColumns; + private volatile org.apache.hadoop.hive.metastore.api.Table remoteTable = null; + private List partitionColumns; - protected DLAType dlaType = DLAType.UNKNOWN; + private DLAType dlaType = DLAType.UNKNOWN; // No as precise as row count in TableStats, but better than none. private long estimatedRowCount = -1; @@ -120,7 +120,7 @@ public class HMSExternalTable extends ExternalTable { protected volatile long eventUpdateTime; public enum DLAType { - UNKNOWN, HIVE, HUDI, ICEBERG, DELTALAKE + UNKNOWN, HIVE, HUDI, ICEBERG } /** @@ -135,10 +135,6 @@ public class HMSExternalTable extends ExternalTable { super(id, name, catalog, dbName, TableType.HMS_EXTERNAL_TABLE); } - public HMSExternalTable(long id, String name, String dbName, HMSExternalCatalog catalog, TableType type) { - super(id, name, catalog, dbName, type); - } - public boolean isSupportedHmsTable() { makeSureInitialized(); return dlaType != DLAType.UNKNOWN; @@ -493,7 +489,7 @@ public class HMSExternalTable extends ExternalTable { return tmpSchema; } - protected void initPartitionColumns(List schema) { + private void initPartitionColumns(List schema) { List partitionKeys = remoteTable.getPartitionKeys().stream().map(FieldSchema::getName) .collect(Collectors.toList()); partitionColumns = Lists.newArrayListWithCapacity(partitionKeys.size()); diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogFactory.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogFactory.java index d3dd3fa5fb..09ad69ec8b 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogFactory.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/CatalogFactory.java @@ -28,7 +28,6 @@ import org.apache.doris.catalog.Env; import org.apache.doris.catalog.Resource; import org.apache.doris.common.DdlException; import org.apache.doris.common.FeConstants; -import org.apache.doris.datasource.deltalake.DeltaLakeExternalCatalog; import org.apache.doris.datasource.iceberg.IcebergExternalCatalogFactory; import org.apache.doris.datasource.jdbc.JdbcExternalCatalog; import org.apache.doris.datasource.paimon.PaimonExternalCatalogFactory; @@ -131,9 +130,6 @@ public class CatalogFactory { case "max_compute": catalog = new MaxComputeExternalCatalog(catalogId, name, resource, props, comment); break; - case "deltalake": - catalog = new DeltaLakeExternalCatalog(catalogId, name, resource, props, comment); - break; case "test": if (!FeConstants.runningUnitTest) { throw new DdlException("test catalog is only for FE unit test"); diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java index 7393a75bac..413f6554c8 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/ExternalCatalog.java @@ -22,7 +22,6 @@ import org.apache.doris.catalog.DatabaseIf; import org.apache.doris.catalog.Env; import org.apache.doris.catalog.Resource; import org.apache.doris.catalog.TableIf; -import org.apache.doris.catalog.external.DeltaLakeExternalDataBase; import org.apache.doris.catalog.external.EsExternalDatabase; import org.apache.doris.catalog.external.ExternalDatabase; import org.apache.doris.catalog.external.ExternalTable; @@ -497,8 +496,6 @@ public abstract class ExternalCatalog return new TestExternalDatabase(this, dbId, dbName); case PAIMON: return new PaimonExternalDatabase(this, dbId, dbName); - case DELTALAKE: - return new DeltaLakeExternalDataBase(this, dbId, dbName); default: break; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/HMSExternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/HMSExternalCatalog.java index 408504f5cc..6e3543dfcc 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/HMSExternalCatalog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/HMSExternalCatalog.java @@ -84,13 +84,6 @@ public class HMSExternalCatalog extends ExternalCatalog { catalogProperty = new CatalogProperty(resource, props); } - public HMSExternalCatalog(long catalogId, String name, String resource, Map props, - String comment, InitCatalogLog.Type type) { - super(catalogId, name, type, comment); - props = PropertyConverter.convertToMetaProperties(props); - catalogProperty = new CatalogProperty(resource, props); - } - @Override public void checkProperties() throws DdlException { super.checkProperties(); diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/InitCatalogLog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/InitCatalogLog.java index e766324a72..dd30fbf43c 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/InitCatalogLog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/InitCatalogLog.java @@ -40,7 +40,6 @@ public class InitCatalogLog implements Writable { PAIMON, MAX_COMPUTE, HUDI, - DELTALAKE, TEST, UNKNOWN; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/InitDatabaseLog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/InitDatabaseLog.java index 1659a38cc0..3a85fb1edc 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/InitDatabaseLog.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/InitDatabaseLog.java @@ -40,7 +40,6 @@ public class InitDatabaseLog implements Writable { MAX_COMPUTE, HUDI, PAIMON, - DELTALAKE, TEST, UNKNOWN; } diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/deltalake/DeltaLakeExternalCatalog.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/deltalake/DeltaLakeExternalCatalog.java deleted file mode 100644 index af142ea731..0000000000 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/deltalake/DeltaLakeExternalCatalog.java +++ /dev/null @@ -1,69 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -package org.apache.doris.datasource.deltalake; - -import org.apache.doris.catalog.external.HMSExternalDatabase; -import org.apache.doris.catalog.external.HMSExternalTable; -import org.apache.doris.datasource.HMSExternalCatalog; -import org.apache.doris.datasource.InitCatalogLog; -import org.apache.doris.datasource.SessionContext; - -import com.google.common.collect.Lists; -import org.apache.hadoop.hive.metastore.api.Table; - -import java.util.List; -import java.util.Map; - -public class DeltaLakeExternalCatalog extends HMSExternalCatalog { - - public DeltaLakeExternalCatalog(long catalogId, String name, String resource, Map props, - String comment) { - super(catalogId, name, resource, props, comment, InitCatalogLog.Type.DELTALAKE); - } - - @Override - public List listTableNames(SessionContext ctx, String dbName) { - makeSureInitialized(); - HMSExternalDatabase hmsExternalDatabase = (HMSExternalDatabase) idToDb.get(dbNameToId.get(dbName)); - if (hmsExternalDatabase != null && hmsExternalDatabase.isInitialized()) { - List names = Lists.newArrayList(); - for (HMSExternalTable table : hmsExternalDatabase.getTables()) { - String tableName = table.getName(); - Table tableDetails = client.getTable(dbName, tableName); - Map parameters = tableDetails.getParameters(); - String provider = parameters.get("spark.sql.sources.provider"); - if ("delta".equalsIgnoreCase(provider)) { - names.add(tableName); - } - } - return names; - } else { - List allTableNames = client.getAllTables(getRealTableName(dbName)); - List deltaTableNames = Lists.newArrayList(); - for (String tableName : allTableNames) { - Table tableDetails = client.getTable(dbName, tableName); - Map parameters = tableDetails.getParameters(); - String provider = parameters.get("spark.sql.sources.provider"); - if ("delta".equalsIgnoreCase(provider)) { - deltaTableNames.add(tableName); - } - } - return deltaTableNames; - } - } -} diff --git a/fe/fe-core/src/main/java/org/apache/doris/persist/gson/GsonUtils.java b/fe/fe-core/src/main/java/org/apache/doris/persist/gson/GsonUtils.java index 8b6f85d511..f467128780 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/persist/gson/GsonUtils.java +++ b/fe/fe-core/src/main/java/org/apache/doris/persist/gson/GsonUtils.java @@ -44,8 +44,6 @@ import org.apache.doris.catalog.SinglePartitionInfo; import org.apache.doris.catalog.SparkResource; import org.apache.doris.catalog.StructType; import org.apache.doris.catalog.TableIf; -import org.apache.doris.catalog.external.DeltaLakeExternalDataBase; -import org.apache.doris.catalog.external.DeltaLakeExternalTable; import org.apache.doris.catalog.external.EsExternalDatabase; import org.apache.doris.catalog.external.EsExternalTable; import org.apache.doris.catalog.external.ExternalDatabase; @@ -66,7 +64,6 @@ import org.apache.doris.datasource.EsExternalCatalog; import org.apache.doris.datasource.HMSExternalCatalog; import org.apache.doris.datasource.InternalCatalog; import org.apache.doris.datasource.MaxComputeExternalCatalog; -import org.apache.doris.datasource.deltalake.DeltaLakeExternalCatalog; import org.apache.doris.datasource.iceberg.IcebergDLFExternalCatalog; import org.apache.doris.datasource.iceberg.IcebergExternalCatalog; import org.apache.doris.datasource.iceberg.IcebergGlueExternalCatalog; @@ -214,8 +211,7 @@ public class GsonUtils { .registerSubtype(PaimonExternalCatalog.class, PaimonExternalCatalog.class.getSimpleName()) .registerSubtype(PaimonHMSExternalCatalog.class, PaimonHMSExternalCatalog.class.getSimpleName()) .registerSubtype(PaimonFileExternalCatalog.class, PaimonFileExternalCatalog.class.getSimpleName()) - .registerSubtype(MaxComputeExternalCatalog.class, MaxComputeExternalCatalog.class.getSimpleName()) - .registerSubtype(DeltaLakeExternalCatalog.class, DeltaLakeExternalCatalog.class.getSimpleName()); + .registerSubtype(MaxComputeExternalCatalog.class, MaxComputeExternalCatalog.class.getSimpleName()); // routine load data source private static RuntimeTypeAdapterFactory rdsTypeAdapterFactory = RuntimeTypeAdapterFactory.of( @@ -234,8 +230,7 @@ public class GsonUtils { .registerSubtype(JdbcExternalDatabase.class, JdbcExternalDatabase.class.getSimpleName()) .registerSubtype(IcebergExternalDatabase.class, IcebergExternalDatabase.class.getSimpleName()) .registerSubtype(PaimonExternalDatabase.class, PaimonExternalDatabase.class.getSimpleName()) - .registerSubtype(MaxComputeExternalDatabase.class, MaxComputeExternalDatabase.class.getSimpleName()) - .registerSubtype(DeltaLakeExternalDataBase.class, DeltaLakeExternalDataBase.class.getSimpleName()); + .registerSubtype(MaxComputeExternalDatabase.class, MaxComputeExternalDatabase.class.getSimpleName()); private static RuntimeTypeAdapterFactory tblTypeAdapterFactory = RuntimeTypeAdapterFactory.of( TableIf.class, "clazz").registerSubtype(ExternalTable.class, ExternalTable.class.getSimpleName()) @@ -245,8 +240,7 @@ public class GsonUtils { .registerSubtype(JdbcExternalTable.class, JdbcExternalTable.class.getSimpleName()) .registerSubtype(IcebergExternalTable.class, IcebergExternalTable.class.getSimpleName()) .registerSubtype(PaimonExternalTable.class, PaimonExternalTable.class.getSimpleName()) - .registerSubtype(MaxComputeExternalTable.class, MaxComputeExternalTable.class.getSimpleName()) - .registerSubtype(DeltaLakeExternalTable.class, DeltaLakeExternalTable.class.getSimpleName()); + .registerSubtype(MaxComputeExternalTable.class, MaxComputeExternalTable.class.getSimpleName()); // runtime adapter for class "PartitionInfo" private static RuntimeTypeAdapterFactory partitionInfoTypeAdapterFactory diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/SingleNodePlanner.java b/fe/fe-core/src/main/java/org/apache/doris/planner/SingleNodePlanner.java index 8e128b3b4a..1ba48b0b9d 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/planner/SingleNodePlanner.java +++ b/fe/fe-core/src/main/java/org/apache/doris/planner/SingleNodePlanner.java @@ -1926,7 +1926,7 @@ public class SingleNodePlanner { ((HiveScanNode) scanNode).setTableSample(tblRef.getTableSample()); break; default: - throw new UserException("Not supported table type: " + ((HMSExternalTable) table).getDlaType()); + throw new UserException("Not supported table type" + table.getType()); } break; case ICEBERG_EXTERNAL_TABLE: @@ -1950,7 +1950,7 @@ public class SingleNodePlanner { scanNode = new TestExternalTableScanNode(ctx.getNextNodeId(), tblRef.getDesc()); break; default: - throw new UserException("Not supported table type: " + tblRef.getTable().getType()); + throw new UserException("Not supported table type" + tblRef.getTable().getType()); } if (scanNode instanceof OlapScanNode || scanNode instanceof EsScanNode || scanNode instanceof OdbcScanNode || scanNode instanceof JdbcScanNode diff --git a/fe/pom.xml b/fe/pom.xml index d004879523..18990f4fc2 100644 --- a/fe/pom.xml +++ b/fe/pom.xml @@ -303,7 +303,6 @@ under the License. 1.1.0 - 3.0.0rc1 0.45.2-public 1.11.2 13.0.0