Skip to content
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

Jump to bottom

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

Merged
merged 1 commit into from
Apr 22, 2024
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...reload-extensions/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2314,7 +2314,7 @@ public List<FieldSchema> getSchema(String catName, String db, String tableName)
} 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<String, String> props = new HashMap<>();
props.put("hive.added.jars.path", addedJars);
envCxt = new EnvironmentContext(props);
Expand Down
2 changes: 1 addition & 1 deletion fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergMetadataCache.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,9 +27,9 @@
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;
Expand Down
2 changes: 1 addition & 1 deletion fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergTransaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
import org.apache.doris.thrift.TIcebergCommitData;
import org.apache.doris.transaction.Transaction;

import avro.shaded.com.google.common.collect.Lists;
import com.google.common.base.VerifyException;
import com.google.common.collect.Lists;
import org.apache.iceberg.AppendFiles;
import org.apache.iceberg.DataFiles;
import org.apache.iceberg.FileContent;
Expand Down
4 changes: 2 additions & 2 deletions fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/PaimonExternalTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,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 @@ -76,7 +76,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
4 changes: 2 additions & 2 deletions fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/source/PaimonScanNode.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,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;
Expand Down Expand Up @@ -221,7 +221,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 ...-core/src/test/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/OtherJoinTest.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.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;

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 @@ -228,7 +228,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.4</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
Loading