diff --git a/fe/be-java-extensions/preload-extensions/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java b/fe/be-java-extensions/preload-extensions/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java index e5c7957d77..f32bea9498 100644 --- a/fe/be-java-extensions/preload-extensions/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java +++ b/fe/be-java-extensions/preload-extensions/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java @@ -2314,7 +2314,7 @@ public class HiveMetaStoreClient implements IMetaStoreClient, AutoCloseable { } else { EnvironmentContext envCxt = null; String addedJars = MetastoreConf.getVar(conf, ConfVars.ADDED_JARS); - if (org.apache.commons.lang.StringUtils.isNotBlank(addedJars)) { + if (org.apache.commons.lang3.StringUtils.isNotBlank(addedJars)) { Map props = new HashMap<>(); props.put("hive.added.jars.path", addedJars); envCxt = new EnvironmentContext(props); diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergMetadataCache.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergMetadataCache.java index adc1e1f74f..1081981d06 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergMetadataCache.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergMetadataCache.java @@ -27,9 +27,9 @@ import org.apache.doris.datasource.hive.HiveMetaStoreClientHelper; import org.apache.doris.datasource.property.constants.HMSProperties; import org.apache.doris.thrift.TIcebergMetadataParams; -import avro.shaded.com.google.common.collect.Lists; import com.github.benmanes.caffeine.cache.LoadingCache; import com.google.common.collect.Iterables; +import com.google.common.collect.Lists; import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.hdfs.HdfsConfiguration; import org.apache.iceberg.ManifestFiles; diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/PaimonExternalTable.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/PaimonExternalTable.java index 41440c3f4c..af2da32374 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/PaimonExternalTable.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/PaimonExternalTable.java @@ -32,7 +32,7 @@ import com.google.common.collect.Lists; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.paimon.schema.TableSchema; -import org.apache.paimon.table.AbstractFileStoreTable; +import org.apache.paimon.table.FileStoreTable; import org.apache.paimon.table.Table; import org.apache.paimon.table.source.Split; import org.apache.paimon.types.ArrayType; @@ -76,7 +76,7 @@ public class PaimonExternalTable extends ExternalTable { //init schema need update lastUpdateTime and get latest schema objectCreated = false; Table table = getOriginTable(); - TableSchema schema = ((AbstractFileStoreTable) table).schema(); + TableSchema schema = ((FileStoreTable) table).schema(); List columns = schema.fields(); List tmpSchema = Lists.newArrayListWithCapacity(columns.size()); for (DataField field : columns) { diff --git a/fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/source/PaimonScanNode.java b/fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/source/PaimonScanNode.java index 733565e706..ddb5a8c4f3 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/source/PaimonScanNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/source/PaimonScanNode.java @@ -49,7 +49,7 @@ import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.apache.paimon.data.BinaryRow; import org.apache.paimon.predicate.Predicate; -import org.apache.paimon.table.AbstractFileStoreTable; +import org.apache.paimon.table.FileStoreTable; import org.apache.paimon.table.source.DataSplit; import org.apache.paimon.table.source.RawFile; import org.apache.paimon.table.source.ReadBuilder; @@ -221,7 +221,7 @@ public class PaimonScanNode extends FileQueryScanNode { @Override public TFileType getLocationType() throws DdlException, MetaNotFoundException { - return getLocationType(((AbstractFileStoreTable) source.getPaimonTable()).location().toString()); + return getLocationType(((FileStoreTable) source.getPaimonTable()).location().toString()); } @Override diff --git a/fe/fe-core/src/test/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/OtherJoinTest.java b/fe/fe-core/src/test/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/OtherJoinTest.java index 561e624e91..a914457458 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/OtherJoinTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/OtherJoinTest.java @@ -29,7 +29,7 @@ import org.apache.doris.nereids.util.HyperGraphBuilder; import org.apache.doris.nereids.util.MemoTestUtils; import org.apache.doris.nereids.util.PlanChecker; -import avro.shaded.com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableList; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; diff --git a/fe/pom.xml b/fe/pom.xml index e30fdc2f6c..54ba8a28c7 100644 --- a/fe/pom.xml +++ b/fe/pom.xml @@ -228,7 +228,7 @@ under the License. ${fe.dir}/../ 1.2-SNAPSHOT UTF-8 - 1.0.4 + 2.0.0 1.8 1.8 @@ -350,7 +350,7 @@ under the License. 2.3.2 - 0.6.0-incubating + 0.7.0-incubating 3.4.4 shade-format-flatbuffers