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.

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

[Enhancement] Upgrade hudi dependency version to 0.12.1 #14061

Merged
merged 2 commits into from
Dec 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
16 changes: 16 additions & 0 deletions fe/fe-core/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,12 @@ under the License.
<groupId>org.apache.iceberg</groupId>
<artifactId>iceberg-api</artifactId>
<version>${iceberg.version}</version>
<exclusions>
<exclusion>
<groupId>org.apache.parquet</groupId>
<artifactId>parquet-format-structures</artifactId>
</exclusion>
</exclusions>
</dependency>

<dependency>
Expand Down Expand Up @@ -577,13 +583,20 @@ under the License.
<dependency>
<groupId>org.apache.hudi</groupId>
<artifactId>hudi-common</artifactId>
<exclusions>
<exclusion>
<groupId>io.netty</groupId>
<artifactId>*</artifactId>
</exclusion>
</exclusions>
</dependency>

<!-- https://mvnrepository.com/artifact/org.apache.hudi/hudi-hadoop-mr -->
<dependency>
<groupId>org.apache.hudi</groupId>
<artifactId>hudi-hadoop-mr</artifactId>
</dependency>

<dependency>
<groupId>com.starrocks</groupId>
<artifactId>starclient</artifactId>
Expand Down Expand Up @@ -703,6 +716,9 @@ under the License.
<thriftExecutable>${starrocks.thrift}</thriftExecutable>
<thriftSourceRoot>${starrocks.home}/gensrc/thrift</thriftSourceRoot>
<generator>java</generator>
<excludes>
<exclude>**/parquet.thrift</exclude>
</excludes>
</configuration>
<executions>
<execution>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@
import com.starrocks.sql.ast.RollupRenameClause;
import com.starrocks.sql.ast.TableRenameClause;
import com.starrocks.sql.common.MetaUtils;
import edu.umd.cs.findbugs.annotations.CheckForNull;

import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -112,7 +111,6 @@ public Void visitTableRenameClause(TableRenameClause clause, ConnectContext cont

@Override
public Void visitModifyTablePropertiesClause(ModifyTablePropertiesClause clause, ConnectContext context) {
@CheckForNull
Map<String, String> properties = clause.getProperties();
if (properties.isEmpty()) {
ErrorReport.reportSemanticException(ErrorCode.ERR_COMMON_ERROR, "Properties is not set");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
import com.starrocks.alter.AlterOpType;

import java.util.Map;
import javax.annotation.Nonnull;

// clause which is used to modify table properties
public class ModifyTablePropertiesClause extends AlterTableClause {
Expand All @@ -37,6 +38,7 @@ public void setNeedTableStable(boolean needTableStable) {
}

@Override
@Nonnull
public Map<String, String> getProperties() {
return this.properties;
}
Expand Down
2 changes: 1 addition & 1 deletion fe/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ under the License.
<parquet.version>1.10.1</parquet.version>
<hadoop.version>3.3.3</hadoop.version>
<skip.plugin>false</skip.plugin>
<hudi.version>0.10.1</hudi.version>
<hudi.version>0.12.1</hudi.version>
<hive-apache.version>3.1.2-13</hive-apache.version>
<dlf-metastore-client.version>0.2.14</dlf-metastore-client.version>
<sonar.organization>starrocks</sonar.organization>
Expand Down
11 changes: 7 additions & 4 deletions java-extensions/hudi-reader/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,12 @@
<maven.compiler.target>8</maven.compiler.target>
<java-extensions.home>${basedir}/../</java-extensions.home>
<slf4j.version>1.7.32</slf4j.version>
<hudi.version>0.11.1</hudi.version>
<presto.hadoop.version>2.7.4-9</presto.hadoop.version>
<presto.hive.version>3.0.0-8</presto.hive.version>
<hudi.version>0.12.1</hudi.version>
<fasterxml.version>2.13.4</fasterxml.version>
<fasterxml.jackson.databind.version>2.13.4.1</fasterxml.jackson.databind.version>
<esotericsoftware.kryo.shaded.version>4.0.2</esotericsoftware.kryo.shaded.version>
</properties>

<dependencies>
Expand Down Expand Up @@ -63,7 +66,7 @@
<dependency>
<groupId>com.facebook.presto.hive</groupId>
<artifactId>hive-apache</artifactId>
<version>3.0.0-8</version>
<version>${presto.hive.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
Expand All @@ -75,7 +78,7 @@
<dependency>
<groupId>com.facebook.presto.hadoop</groupId>
<artifactId>hadoop-apache2</artifactId>
<version>2.7.4-9</version>
<version>${presto.hadoop.version}</version>
<exclusions>
<exclusion>
<groupId>org.slf4j</groupId>
Expand Down Expand Up @@ -111,7 +114,7 @@
<dependency>
<groupId>com.esotericsoftware</groupId>
<artifactId>kryo-shaded</artifactId>
<version>4.0.2</version>
<version>${esotericsoftware.kryo.shaded.version}</version>
</dependency>

</dependencies>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ public class HudiSliceScannerFactory implements ScannerFactory {

/**
* Hudi scanner uses own independent classloader to find all classes
* due to hadoop class conflicts with JNI launcher of libhdfs (hadoop-3.x).
* due to hadoop version (hadoop-2.x) conflicts with JNI launcher of libhdfs (hadoop-3.x).
*/
@Override
public Class getScannerClass() throws ClassNotFoundException {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,8 @@
* open();
* do {
* int rows = getNext();
* if (rows < fetchSize) {
* // do something...
* if (rows == 0) {
* break;
* }
* } while (true);
Expand Down
2 changes: 1 addition & 1 deletion thirdparty/build-thirdparty.sh
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ set -e
curdir=`dirname "$0"`
curdir=`cd "$curdir"; pwd`

export STARROCKS_HOME=$curdir/..
export STARROCKS_HOME=${STARROCKS_HOME:-$curdir/..}
export TP_DIR=$curdir

# include custom environment variables
Expand Down