Skip to content

[chore](dependencies)upgrade hive catalog to 2.0.0 #33424

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
CalvinKirs merged 10 commits into from
Apr 22, 2024
Merged

[chore](dependencies)upgrade hive catalog to 2.0.0 #33424

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
5effec7
[feat](dependency)hivecatalog slimming down
CalvinKirs Apr 9, 2024
190cf67
[feat](dependency)hivecatalog slimming down
CalvinKirs Apr 9, 2024
db59274
[feat](dependency)hivecatalog slimming down
CalvinKirs Apr 9, 2024
f1beb05
Just for test
CalvinKirs Apr 10, 2024
4a807ba
Just for test
CalvinKirs Apr 11, 2024
052acde
Merge branch 'branch-2.0' into branch-2.0-catalog
CalvinKirs Apr 12, 2024
0147981
replace release version
CalvinKirs Apr 19, 2024
1fa5cfa
Merge branch 'branch-2.0' into branch-2.0-catalog
CalvinKirs Apr 19, 2024
8f783d2
Adapt paimon 0.6.0
CalvinKirs Apr 22, 2024
3ea63c4
Merge branch 'branch-2.0' into branch-2.0-catalog
CalvinKirs Apr 22, 2024
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
4 changes: 2 additions & 2 deletions fe/fe-core/src/main/java/org/apache/doris/catalog/external/PaimonExternalTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -73,7 +73,7 @@ public List<Column> 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<DataField> columns = schema.fields();
List<Column> tmpSchema = Lists.newArrayListWithCapacity(columns.size());
for (DataField field : columns) {
Expand Down
2 changes: 1 addition & 1 deletion ...re/src/main/java/org/apache/doris/nereids/trees/plans/physical/PhysicalOlapTableSink.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
2 changes: 1 addition & 1 deletion fe/fe-core/src/main/java/org/apache/doris/planner/external/iceberg/IcebergMetadataCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
6 changes: 3 additions & 3 deletions fe/fe-core/src/main/java/org/apache/doris/planner/external/paimon/PaimonScanNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@
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;
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;
Expand Down Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion fe/fe-core/src/test/java/org/apache/doris/nereids/trees/expressions/UdfTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down
2 changes: 1 addition & 1 deletion fe/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ under the License.
<doris.home>${fe.dir}/../</doris.home>
<revision>1.2-SNAPSHOT</revision>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<doris.hive.catalog.shade.version>1.0.3</doris.hive.catalog.shade.version>
<doris.hive.catalog.shade.version>2.0.0</doris.hive.catalog.shade.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
<!--plugin parameters-->
Expand Down