This is an automated email from the ASF dual-hosted git repository.
zhangbutao pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/hive.git
The following commit(s) were added to refs/heads/master by this push:
new e21a4b7eba5 HIVE-28494: Iceberg: mvn build enables iceberg module by
default (#5428)(Butao Zhang, reviewed by Denys Kuzmenko, Indhumathi
Muthumurugesh,Stamatis Zampetakis)
e21a4b7eba5 is described below
commit e21a4b7eba5b3598c7f212adc7aa22388b9af794
Author: Butao Zhang <[email protected]>
AuthorDate: Thu Sep 5 09:55:51 2024 -0400
HIVE-28494: Iceberg: mvn build enables iceberg module by default
(#5428)(Butao Zhang, reviewed by Denys Kuzmenko, Indhumathi
Muthumurugesh,Stamatis Zampetakis)
---
.github/workflows/docker-GA-images.yml | 2 +-
Jenkinsfile | 6 +++---
itests/pom.xml | 9 +--------
packaging/pom.xml | 16 +++++-----------
packaging/src/docker/build.sh | 2 +-
pom.xml | 7 +------
6 files changed, 12 insertions(+), 30 deletions(-)
diff --git a/.github/workflows/docker-GA-images.yml
b/.github/workflows/docker-GA-images.yml
index b3309ca4c25..4d2bea91229 100644
--- a/.github/workflows/docker-GA-images.yml
+++ b/.github/workflows/docker-GA-images.yml
@@ -119,7 +119,7 @@ jobs:
run: echo "TEZ_VERSION=$(mvn -f "pom.xml" -q help:evaluate
-Dexpression=tez.version -DforceStdout)" >> $GITHUB_ENV
- name: Build project
- run: mvn clean package -DskipTests -Pitests,iceberg -Pdist
+ run: mvn clean package -DskipTests -Pitests -Pdist
- name: Check for hive tar.gz
run: ls ./packaging/target/
diff --git a/Jenkinsfile b/Jenkinsfile
index 50250d739b3..5dfefaf614e 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -95,7 +95,7 @@ export MAVEN_OPTS="-Xmx2g"
export -n HIVE_CONF_DIR
cp $SETTINGS .git/settings.xml
OPTS=" -s $PWD/.git/settings.xml -B -Dtest.groups= "
-OPTS+=" -Pitests,qsplits,dist,errorProne,iceberg"
+OPTS+=" -Pitests,qsplits,dist,errorProne"
OPTS+="
-Dorg.slf4j.simpleLogger.log.org.apache.maven.plugin.surefire.SurefirePlugin=INFO"
OPTS+=" -Dmaven.repo.local=$PWD/.git/m2"
git config extra.mavenOpts "$OPTS"
@@ -314,14 +314,14 @@ time docker rm -f dev_$dbType || true
set -e
dev-support/nightly
'''
- buildHive("install -Dtest=noMatches -Pdist -Piceberg -pl packaging
-am")
+ buildHive("install -Dtest=noMatches -Pdist -pl packaging -am")
}
stage('Verify') {
sh '''#!/bin/bash
set -e
tar -xzf packaging/target/apache-hive-*-nightly-*-src.tar.gz
'''
- buildHive("install -Dtest=noMatches -Pdist,iceberg -f
apache-hive-*-nightly-*/pom.xml")
+ buildHive("install -Dtest=noMatches -Pdist -f
apache-hive-*-nightly-*/pom.xml")
}
}
}
diff --git a/itests/pom.xml b/itests/pom.xml
index 45aa288ab81..21536af74c5 100644
--- a/itests/pom.xml
+++ b/itests/pom.xml
@@ -42,6 +42,7 @@
<module>hive-minikdc</module>
<module>qtest-druid</module>
<module>qtest-kudu</module>
+ <module>qtest-iceberg</module>
</modules>
<dependencyManagement>
<dependencies>
@@ -496,14 +497,6 @@
</dependency>
</dependencies>
</dependencyManagement>
- <profiles>
- <profile>
- <id>iceberg</id>
- <modules>
- <module>qtest-iceberg</module>
- </modules>
- </profile>
- </profiles>
<build>
<plugins>
<plugin>
diff --git a/packaging/pom.xml b/packaging/pom.xml
index 6a1f6fbe516..cfc37f087f9 100644
--- a/packaging/pom.xml
+++ b/packaging/pom.xml
@@ -231,17 +231,6 @@
</plugins>
</build>
</profile>
- <!-- Add iceberg dependencies only with iceberg build -->
- <profile>
- <id>iceberg</id>
- <dependencies>
- <dependency>
- <groupId>org.apache.hive</groupId>
- <artifactId>hive-iceberg-handler</artifactId>
- <version>${project.version}</version>
- </dependency>
- </dependencies>
- </profile>
<profile>
<id>docker</id>
<build>
@@ -351,6 +340,11 @@
<artifactId>hive-druid-handler</artifactId>
<version>${project.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.hive</groupId>
+ <artifactId>hive-iceberg-handler</artifactId>
+ <version>${project.version}</version>
+ </dependency>
<dependency>
<groupId>org.apache.hive</groupId>
<artifactId>kafka-handler</artifactId>
diff --git a/packaging/src/docker/build.sh b/packaging/src/docker/build.sh
index 0387f30a438..f13e3307f71 100755
--- a/packaging/src/docker/build.sh
+++ b/packaging/src/docker/build.sh
@@ -95,7 +95,7 @@ if [ -n "$HIVE_VERSION" ]; then
else
HIVE_VERSION=$(mvn -f "$SOURCE_DIR/pom.xml" -q help:evaluate
-Dexpression=project.version -DforceStdout)
HIVE_TAR="$SOURCE_DIR/packaging/target/apache-hive-$HIVE_VERSION-bin.tar.gz"
- if ls $HIVE_TAR || mvn -f $SOURCE_DIR/pom.xml clean package -DskipTests
-Pdist -Piceberg; then
+ if ls $HIVE_TAR || mvn -f $SOURCE_DIR/pom.xml clean package -DskipTests
-Pdist; then
cp "$HIVE_TAR" "$WORK_DIR/"
else
echo "Failed to compile Hive Project, exiting..."
diff --git a/pom.xml b/pom.xml
index 42a942752b0..e0ea2ef17ef 100644
--- a/pom.xml
+++ b/pom.xml
@@ -60,6 +60,7 @@
<module>packaging</module>
<module>standalone-metastore</module>
<module>kafka-handler</module>
+ <module>iceberg</module>
</modules>
<properties>
<standalone-metastore.version>4.1.0-SNAPSHOT</standalone-metastore.version>
@@ -2099,12 +2100,6 @@
<module>itests</module>
</modules>
</profile>
- <profile>
- <id>iceberg</id>
- <modules>
- <module>iceberg</module>
- </modules>
- </profile>
<profile>
<id>customhbase</id>
<activation>