This is an automated email from the ASF dual-hosted git repository.
leesf pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-hudi.git
The following commit(s) were added to refs/heads/master by this push:
new 90227ee [HUDI-673] Rename hudi-hive-bundle to hudi-hive-sync-bundle
90227ee is described below
commit 90227eeda757516abdd06b436ae08a4adacc28e1
Author: lamber-ken <[email protected]>
AuthorDate: Sat Mar 7 15:55:31 2020 +0800
[HUDI-673] Rename hudi-hive-bundle to hudi-hive-sync-bundle
---
docker/hoodie/hadoop/hive_base/Dockerfile | 2 +-
docker/hoodie/hadoop/hive_base/pom.xml | 2 +-
hudi-hive-sync/run_sync_tool.sh | 2 +-
hudi-hive-sync/src/main/java/org/apache/hudi/hive/HiveSyncTool.java | 2 +-
hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestBase.java | 4 ++--
packaging/{hudi-hive-bundle => hudi-hive-sync-bundle}/pom.xml | 2 +-
.../src/main/java/org/apache/hudi/hive/bundle/Main.java | 0
pom.xml | 2 +-
8 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/docker/hoodie/hadoop/hive_base/Dockerfile
b/docker/hoodie/hadoop/hive_base/Dockerfile
index bd0e9c5..b8452d6 100644
--- a/docker/hoodie/hadoop/hive_base/Dockerfile
+++ b/docker/hoodie/hadoop/hive_base/Dockerfile
@@ -52,7 +52,7 @@ ADD conf/llap-daemon-log4j2.properties $HIVE_HOME/conf
ADD target/ /var/hoodie/ws/docker/hoodie/hadoop/hive_base/target/
ENV
HUDI_HADOOP_BUNDLE=/var/hoodie/ws/docker/hoodie/hadoop/hive_base/target/hoodie-hadoop-mr-bundle.jar
-ENV
HUDI_HIVE_BUNDLE=/var/hoodie/ws/docker/hoodie/hadoop/hive_base/target/hoodie-hive-bundle.jar
+ENV
HUDI_HIVE_SYNC_BUNDLE=/var/hoodie/ws/docker/hoodie/hadoop/hive_base/target/hoodie-hive-sync-bundle.jar
ENV
HUDI_SPARK_BUNDLE=/var/hoodie/ws/docker/hoodie/hadoop/hive_base/target/hoodie-spark-bundle.jar
ENV
HUDI_UTILITIES_BUNDLE=/var/hoodie/ws/docker/hoodie/hadoop/hive_base/target/hoodie-utilities.jar
diff --git a/docker/hoodie/hadoop/hive_base/pom.xml
b/docker/hoodie/hadoop/hive_base/pom.xml
index 04aac75..1a632eb 100644
--- a/docker/hoodie/hadoop/hive_base/pom.xml
+++ b/docker/hoodie/hadoop/hive_base/pom.xml
@@ -57,7 +57,7 @@
<configuration>
<tasks>
<copy
file="${project.basedir}/../../../../packaging/hudi-hadoop-mr-bundle/target/hudi-hadoop-mr-bundle-${project.version}.jar"
tofile="target/hoodie-hadoop-mr-bundle.jar" />
- <copy
file="${project.basedir}/../../../../packaging/hudi-hive-bundle/target/hudi-hive-bundle-${project.version}.jar"
tofile="target/hoodie-hive-bundle.jar" />
+ <copy
file="${project.basedir}/../../../../packaging/hudi-hive-sync-bundle/target/hudi-hive-sync-bundle-${project.version}.jar"
tofile="target/hoodie-hive-sync-bundle.jar" />
<copy
file="${project.basedir}/../../../../packaging/hudi-spark-bundle/target/hudi-spark-bundle_${scala.binary.version}-${project.version}.jar"
tofile="target/hoodie-spark-bundle.jar" />
<copy
file="${project.basedir}/../../../../packaging/hudi-utilities-bundle/target/hudi-utilities-bundle_${scala.binary.version}-${project.version}.jar"
diff --git a/hudi-hive-sync/run_sync_tool.sh b/hudi-hive-sync/run_sync_tool.sh
index 42d2b9a..d5dc5eb 100755
--- a/hudi-hive-sync/run_sync_tool.sh
+++ b/hudi-hive-sync/run_sync_tool.sh
@@ -31,7 +31,7 @@ fi
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
#Ensure we pick the right jar even for hive11 builds
-HUDI_HIVE_UBER_JAR=`ls -c
$DIR/../packaging/hudi-hive-bundle/target/hudi-hive-*.jar | grep -v source |
head -1`
+HUDI_HIVE_UBER_JAR=`ls -c
$DIR/../packaging/hudi-hive-sync-bundle/target/hudi-hive-sync-*.jar | grep -v
source | head -1`
if [ -z "$HADOOP_CONF_DIR" ]; then
echo "setting hadoop conf dir"
diff --git
a/hudi-hive-sync/src/main/java/org/apache/hudi/hive/HiveSyncTool.java
b/hudi-hive-sync/src/main/java/org/apache/hudi/hive/HiveSyncTool.java
index bc976b0..a651da7 100644
--- a/hudi-hive-sync/src/main/java/org/apache/hudi/hive/HiveSyncTool.java
+++ b/hudi-hive-sync/src/main/java/org/apache/hudi/hive/HiveSyncTool.java
@@ -44,7 +44,7 @@ import java.util.stream.Collectors;
/**
* Tool to sync a hoodie HDFS table with a hive metastore table. Either use it
as a api
- * HiveSyncTool.syncHoodieTable(HiveSyncConfig) or as a command line java -cp
hoodie-hive.jar HiveSyncTool [args]
+ * HiveSyncTool.syncHoodieTable(HiveSyncConfig) or as a command line java -cp
hoodie-hive-sync.jar HiveSyncTool [args]
* <p>
* This utility will get the schema from the latest commit and will sync hive
table schema Also this will sync the
* partitions incrementally (all the partitions modified since the last commit)
diff --git
a/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestBase.java
b/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestBase.java
index 4a227c6..ee3b51e 100644
--- a/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestBase.java
+++ b/hudi-integ-test/src/test/java/org/apache/hudi/integ/ITTestBase.java
@@ -59,8 +59,8 @@ public abstract class ITTestBase {
protected static final String HOODIE_JAVA_APP = HOODIE_WS_ROOT +
"/hudi-spark/run_hoodie_app.sh";
protected static final String HUDI_HADOOP_BUNDLE =
HOODIE_WS_ROOT +
"/docker/hoodie/hadoop/hive_base/target/hoodie-hadoop-mr-bundle.jar";
- protected static final String HUDI_HIVE_BUNDLE =
- HOODIE_WS_ROOT +
"/docker/hoodie/hadoop/hive_base/target/hoodie-hive-bundle.jar";
+ protected static final String HUDI_HIVE_SYNC_BUNDLE =
+ HOODIE_WS_ROOT +
"/docker/hoodie/hadoop/hive_base/target/hoodie-hive-sync-bundle.jar";
protected static final String HUDI_SPARK_BUNDLE =
HOODIE_WS_ROOT +
"/docker/hoodie/hadoop/hive_base/target/hoodie-spark-bundle.jar";
protected static final String HUDI_UTILITIES_BUNDLE =
diff --git a/packaging/hudi-hive-bundle/pom.xml
b/packaging/hudi-hive-sync-bundle/pom.xml
similarity index 99%
rename from packaging/hudi-hive-bundle/pom.xml
rename to packaging/hudi-hive-sync-bundle/pom.xml
index 668270a..0e9d894 100644
--- a/packaging/hudi-hive-bundle/pom.xml
+++ b/packaging/hudi-hive-sync-bundle/pom.xml
@@ -23,7 +23,7 @@
<relativePath>../../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
- <artifactId>hudi-hive-bundle</artifactId>
+ <artifactId>hudi-hive-sync-bundle</artifactId>
<packaging>jar</packaging>
<properties>
diff --git
a/packaging/hudi-hive-bundle/src/main/java/org/apache/hudi/hive/bundle/Main.java
b/packaging/hudi-hive-sync-bundle/src/main/java/org/apache/hudi/hive/bundle/Main.java
similarity index 100%
rename from
packaging/hudi-hive-bundle/src/main/java/org/apache/hudi/hive/bundle/Main.java
rename to
packaging/hudi-hive-sync-bundle/src/main/java/org/apache/hudi/hive/bundle/Main.java
diff --git a/pom.xml b/pom.xml
index 4c2fb8b..8d45a9c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,7 @@
<module>hudi-timeline-service</module>
<module>hudi-utilities</module>
<module>packaging/hudi-hadoop-mr-bundle</module>
- <module>packaging/hudi-hive-bundle</module>
+ <module>packaging/hudi-hive-sync-bundle</module>
<module>packaging/hudi-spark-bundle</module>
<module>packaging/hudi-presto-bundle</module>
<module>packaging/hudi-utilities-bundle</module>
