You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@hudi.apache.org by yi...@apache.org on 2023/01/30 04:56:36 UTC
[hudi] 03/19: [HUDI-5627] Improve the usability of Hudi CLI bundle (#7762)
This is an automated email from the ASF dual-hosted git repository.
yihua pushed a commit to branch release-0.13.0
in repository https://gitbox.apache.org/repos/asf/hudi.git
commit c570e6bd2711c23aa9aa898bd66d94cbdc5aa1a0
Author: Y Ethan Guo <et...@gmail.com>
AuthorDate: Fri Jan 27 15:55:36 2023 -0800
[HUDI-5627] Improve the usability of Hudi CLI bundle (#7762)
---
packaging/hudi-cli-bundle/hudi-cli-with-bundle.sh | 23 +++++++++++++++++++++--
1 file changed, 21 insertions(+), 2 deletions(-)
diff --git a/packaging/hudi-cli-bundle/hudi-cli-with-bundle.sh b/packaging/hudi-cli-bundle/hudi-cli-with-bundle.sh
index 55e76538700..50880d9a01d 100755
--- a/packaging/hudi-cli-bundle/hudi-cli-with-bundle.sh
+++ b/packaging/hudi-cli-bundle/hudi-cli-with-bundle.sh
@@ -16,14 +16,33 @@
# See the License for the specific language governing permissions and
# limitations under the License.
+JAKARTA_EL_VERSION=3.0.3
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
echo "DIR is ${DIR}"
-CLI_BUNDLE_JAR=`ls $DIR/target/hudi-cli-bundle*.jar | grep -v source | grep -v javadoc`
-SPARK_BUNDLE_JAR=`ls $DIR/../hudi-spark-bundle/target/hudi-spark*-bundle*.jar | grep -v source | grep -v javadoc`
+
+if [ -z "$CLI_BUNDLE_JAR" ]; then
+ echo "Inferring CLI_BUNDLE_JAR path assuming this script is under Hudi repo"
+ CLI_BUNDLE_JAR=`ls $DIR/target/hudi-cli-bundle*.jar | grep -v source | grep -v javadoc`
+fi
+
+if [ -z "$SPARK_BUNDLE_JAR" ]; then
+ echo "Inferring SPARK_BUNDLE_JAR path assuming this script is under Hudi repo"
+ SPARK_BUNDLE_JAR=`ls $DIR/../hudi-spark-bundle/target/hudi-spark*-bundle*.jar | grep -v source | grep -v javadoc`
+fi
+
+echo "CLI_BUNDLE_JAR: $CLI_BUNDLE_JAR"
+echo "SPARK_BUNDLE_JAR: $SPARK_BUNDLE_JAR"
+
HUDI_CONF_DIR="${DIR}"/conf
# hudi aux lib contains jakarta.el jars, which need to be put directly on class path
HUDI_AUX_LIB="${DIR}"/auxlib
+if [ ! -d $HUDI_AUX_LIB ]; then
+ echo "Downloading necessary auxiliary jars for Hudi CLI"
+ wget https://repo1.maven.org/maven2/org/glassfish/jakarta.el/$JAKARTA_EL_VERSION/jakarta.el-$JAKARTA_EL_VERSION.jar -P auxlib
+ wget https://repo1.maven.org/maven2/jakarta/el/jakarta.el-api/$JAKARTA_EL_VERSION/jakarta.el-api-$JAKARTA_EL_VERSION.jar -P auxlib
+fi
+
. "${DIR}"/conf/hudi-env.sh
if [ -z "$CLI_BUNDLE_JAR" ] || [ -z "$SPARK_BUNDLE_JAR" ]; then