database/doris
2
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

[upgrade](hive-shade)(paimon) upgrade hive shade to 2.0.0 and paimon to 0.7 (#34085)

Browse Source 
* Adapt paimon 0.6.0 (#33943)

Version 2.0.0 of the shade package eliminates potential jar conflicts, resolves dependency component issues, and significantly reduces package size.
Utilize the directly-dependent guava library instead of relying on transitively included libraries.

* [chore](dependencies)Upgrade paimon to 0.7.0 (#33987)

---------

Co-authored-by: Calvin Kirs <kirs@apache.org>
This commit is contained in:
Mingyu Chen
2024-04-24 21:42:54 +08:00
committed by yiguolei
parent ac038b3d4f
commit fbd2c9db2d
6 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
fe/be-java-extensions/preload-extensions/src/main/java/org/apache/hadoop/hive/metastore/HiveMetaStoreClient.java
View File

@ -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<String, String> props = new HashMap<>();
props.put("hive.added.jars.path", addedJars);
envCxt = new EnvironmentContext(props);

2
fe/fe-core/src/main/java/org/apache/doris/datasource/iceberg/IcebergMetadataCache.java
View File

@ -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;

4
fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/PaimonExternalTable.java
View File

@ -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<DataField> columns = schema.fields();
List<Column> tmpSchema = Lists.newArrayListWithCapacity(columns.size());
for (DataField field : columns) {

4
fe/fe-core/src/main/java/org/apache/doris/datasource/paimon/source/PaimonScanNode.java
View File

@ -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

2
fe/fe-core/src/test/java/org/apache/doris/nereids/jobs/joinorder/hypergraph/OtherJoinTest.java
View File

@ -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;

4
fe/pom.xml
View File

@ -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-->
@ -350,7 +350,7 @@ under the License.
<!--todo waiting release-->
<quartz.version>2.3.2</quartz.version>
<!-- paimon -->
<paimon.version>0.6.0-incubating</paimon.version>
<paimon.version>0.7.0-incubating</paimon.version>
<disruptor.version>3.4.4</disruptor.version>
<!-- arrow flight sql -->
<arrow.vector.classifier>shade-format-flatbuffers</arrow.vector.classifier>