From 5effec722bb6c2b5e62171f23c15d865b5869fbb Mon Sep 17 00:00:00 2001 From: Calvin Kirs Date: Tue, 9 Apr 2024 15:59:46 +0800 Subject: [PATCH 1/7] [feat](dependency)hivecatalog slimming down --- fe/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fe/pom.xml b/fe/pom.xml index 32d960f742ea58..a26041ef7eee0d 100644 --- a/fe/pom.xml +++ b/fe/pom.xml @@ -221,7 +221,7 @@ under the License. ${fe.dir}/../ 1.2-SNAPSHOT UTF-8 - 1.0.3 + CK-1.0.0-SNAPSHOT 1.8 1.8 From 190cf676194f3ebef6cdf2789a36efeaa77f5367 Mon Sep 17 00:00:00 2001 From: Calvin Kirs Date: Tue, 9 Apr 2024 16:43:44 +0800 Subject: [PATCH 2/7] [feat](dependency)hivecatalog slimming down --- .../nereids/trees/plans/physical/PhysicalOlapTableSink.java | 2 +- .../doris/planner/external/iceberg/IcebergMetadataCache.java | 2 +- .../apache/doris/planner/external/paimon/PaimonScanNode.java | 2 +- .../org/apache/doris/nereids/trees/expressions/UdfTest.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalOlapTableSink.java b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalOlapTableSink.java index 9a65864f1e2d8b..187bae193ca607 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalOlapTableSink.java +++ b/fe/fe-core/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalOlapTableSink.java @@ -38,7 +38,7 @@ import org.apache.doris.nereids.util.Utils; import org.apache.doris.statistics.Statistics; -import avro.shaded.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Lists; diff --git a/fe/fe-core/src/main/java/org/apache/doris/planner/external/iceberg/IcebergMetadataCache.java b/fe/fe-core/src/main/java/org/apache/doris/planner/external/iceberg/IcebergMetadataCache.java index e6b2575ee3b21e..93847190144858 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/planner/external/iceberg/IcebergMetadataCache.java +++ b/fe/fe-core/src/main/java/org/apache/doris/planner/external/iceberg/IcebergMetadataCache.java @@ -29,10 +29,10 @@ import org.apache.doris.datasource.property.constants.HMSProperties; import org.apache.doris.thrift.TIcebergMetadataParams; -import avro.shaded.com.google.common.collect.Lists; import com.google.common.cache.Cache; import com.google.common.cache.CacheBuilder; 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/planner/external/paimon/PaimonScanNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/external/paimon/PaimonScanNode.java index 37c3660d068283..28b0ee4939e7c2 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/planner/external/paimon/PaimonScanNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/planner/external/paimon/PaimonScanNode.java @@ -43,7 +43,7 @@ import org.apache.doris.thrift.TScanRangeLocations; import org.apache.doris.thrift.TTableFormatFileDesc; -import avro.shaded.com.google.common.base.Preconditions; +import com.google.common.base.Preconditions; import com.google.common.collect.Sets; import org.apache.hadoop.fs.Path; import org.apache.logging.log4j.LogManager; diff --git a/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/expressions/UdfTest.java b/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/expressions/UdfTest.java index a7e1357d26915b..d6121f05888f0f 100644 --- a/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/expressions/UdfTest.java +++ b/fe/fe-core/src/test/java/org/apache/doris/nereids/trees/expressions/UdfTest.java @@ -40,7 +40,7 @@ import org.apache.doris.nereids.util.PlanPatternMatchSupported; import org.apache.doris.utframe.TestWithFeService; -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; From db592740d338db6ec614309984f23c6e994b0e90 Mon Sep 17 00:00:00 2001 From: Calvin Kirs Date: Tue, 9 Apr 2024 18:16:56 +0800 Subject: [PATCH 3/7] [feat](dependency)hivecatalog slimming down --- fe/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fe/pom.xml b/fe/pom.xml index a26041ef7eee0d..f737686e81ed87 100644 --- a/fe/pom.xml +++ b/fe/pom.xml @@ -221,7 +221,7 @@ under the License. ${fe.dir}/../ 1.2-SNAPSHOT UTF-8 - CK-1.0.0-SNAPSHOT + CK-1.0.0.1-SNAPSHOT 1.8 1.8 From f1beb05355706f3a3a940d55187981f39aabc4f9 Mon Sep 17 00:00:00 2001 From: Calvin Kirs Date: Wed, 10 Apr 2024 15:49:25 +0800 Subject: [PATCH 4/7] Just for test --- fe/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fe/pom.xml b/fe/pom.xml index f737686e81ed87..d2aed11e6c798e 100644 --- a/fe/pom.xml +++ b/fe/pom.xml @@ -221,7 +221,7 @@ under the License. ${fe.dir}/../ 1.2-SNAPSHOT UTF-8 - CK-1.0.0.1-SNAPSHOT + CK-1.0.0.2-SNAPSHOT 1.8 1.8 From 4a807ba5f71678c2ce98a8d1dda444a133de1a50 Mon Sep 17 00:00:00 2001 From: Calvin Kirs Date: Thu, 11 Apr 2024 15:09:54 +0800 Subject: [PATCH 5/7] Just for test --- fe/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fe/pom.xml b/fe/pom.xml index d2aed11e6c798e..687fafbd174fe2 100644 --- a/fe/pom.xml +++ b/fe/pom.xml @@ -221,7 +221,7 @@ under the License. ${fe.dir}/../ 1.2-SNAPSHOT UTF-8 - CK-1.0.0.2-SNAPSHOT + CK-1.0.0.3-SNAPSHOT 1.8 1.8 From 014798150ce17d8af5bde7168393318c2b869401 Mon Sep 17 00:00:00 2001 From: Calvin Kirs Date: Fri, 19 Apr 2024 20:09:30 +0800 Subject: [PATCH 6/7] replace release version --- fe/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fe/pom.xml b/fe/pom.xml index 93376adea61b17..77297d7640e133 100644 --- a/fe/pom.xml +++ b/fe/pom.xml @@ -221,7 +221,7 @@ under the License. ${fe.dir}/../ 1.2-SNAPSHOT UTF-8 - CK-1.0.0.3-SNAPSHOT + 2.0.0 1.8 1.8 From 8f783d2fb941e851b05226052c2c8e1c7da8fc04 Mon Sep 17 00:00:00 2001 From: Calvin Kirs Date: Mon, 22 Apr 2024 10:25:20 +0800 Subject: [PATCH 7/7] Adapt paimon 0.6.0 --- .../apache/doris/catalog/external/PaimonExternalTable.java | 4 ++-- .../apache/doris/planner/external/paimon/PaimonScanNode.java | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fe/fe-core/src/main/java/org/apache/doris/catalog/external/PaimonExternalTable.java b/fe/fe-core/src/main/java/org/apache/doris/catalog/external/PaimonExternalTable.java index 0d53ff87b1ac9e..beb7ed9f32a1d5 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/catalog/external/PaimonExternalTable.java +++ b/fe/fe-core/src/main/java/org/apache/doris/catalog/external/PaimonExternalTable.java @@ -29,7 +29,7 @@ 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; @@ -73,7 +73,7 @@ public List initSchema() { //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/planner/external/paimon/PaimonScanNode.java b/fe/fe-core/src/main/java/org/apache/doris/planner/external/paimon/PaimonScanNode.java index 28b0ee4939e7c2..5d8e59c6408bab 100644 --- a/fe/fe-core/src/main/java/org/apache/doris/planner/external/paimon/PaimonScanNode.java +++ b/fe/fe-core/src/main/java/org/apache/doris/planner/external/paimon/PaimonScanNode.java @@ -50,7 +50,7 @@ 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; @@ -222,7 +222,7 @@ public void updateRequiredSlots(PlanTranslatorContext planTranslatorContext, @Override public TFileType getLocationType() throws DdlException, MetaNotFoundException { - return getLocationType(((AbstractFileStoreTable) source.getPaimonTable()).location().toString()); + return getLocationType(((FileStoreTable) source.getPaimonTable()).location().toString()); } @Override