You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by ap...@apache.org on 2020/03/10 19:00:30 UTC

[incubator-pinot] branch docker-pinot-time-series-generator updated: jar unpack

This is an automated email from the ASF dual-hosted git repository.

apucher pushed a commit to branch docker-pinot-time-series-generator
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git


The following commit(s) were added to refs/heads/docker-pinot-time-series-generator by this push:
     new 3edf854  jar unpack
3edf854 is described below

commit 3edf85492956c5a7bb638eebe2a67129f7f394ea
Author: Alexander Pucher <al...@alexpucher.com>
AuthorDate: Tue Mar 10 12:00:16 2020 -0700

    jar unpack
---
 docker/images/pinot/Dockerfile       | 1 +
 docker/images/pinot/bin/generator.sh | 9 +++------
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/docker/images/pinot/Dockerfile b/docker/images/pinot/Dockerfile
index 67b72b7..fb7f925 100644
--- a/docker/images/pinot/Dockerfile
+++ b/docker/images/pinot/Dockerfile
@@ -70,6 +70,7 @@ VOLUME ["${PINOT_HOME}/configs", "${PINOT_HOME}/data"]
 COPY --from=pinot_build_env ${PINOT_HOME} ${PINOT_HOME}
 COPY ingestion-job-specs ${PINOT_HOME}/examples/docker/ingestion-job-specs
 COPY table-configs ${PINOT_HOME}/examples/docker/table-configs
+COPY bin ${PINOT_HOME}/bin
 
 # expose ports for controller/broker/server/admin
 EXPOSE 9000 8099 8098 8097 8096
diff --git a/docker/images/pinot/bin/generator.sh b/docker/images/pinot/bin/generator.sh
index fea9413..af296d4 100755
--- a/docker/images/pinot/bin/generator.sh
+++ b/docker/images/pinot/bin/generator.sh
@@ -32,17 +32,14 @@ TEMPLATE_NAME="$1"
 DATA_DIR="${TEMP_DIR:?}/${TEMPLATE_NAME}"
 SEGMENT_DIR="${TEMP_DIR:?}/${TEMPLATE_NAME}Segment"
 
-echo "Extracting template files"
-/bin/sh -c "cd ${TEMP_DIR} && jar -f \"${JAR_PATH}\" -x generator/${TEMPLATE_NAME}_schema.json generator/${TEMPLATE_NAME}_config.json generator/${TEMPLATE_NAME}_generator.json"
-
-ls ${TEMPLATE_BASEDIR}
-pause
-
 echo "Preparing temp directory for ${TEMPLATE_NAME}"
 rm -rf "${DATA_DIR}"
 rm -rf "${SEGMENT_DIR}"
 mkdir -p "${TEMP_DIR}"
 
+echo "Extracting template files"
+/bin/sh -c "cd \"${TEMP_DIR}\" && jar -xf \"${JAR_PATH}\" \"generator/${TEMPLATE_NAME}_schema.json\" \"generator/${TEMPLATE_NAME}_config.json\" \"generator/${TEMPLATE_NAME}_generator.json\""
+
 echo "Generating data for ${TEMPLATE_NAME} in ${DATA_DIR}"
 ${ADMIN_PATH} GenerateData \
 -numFiles 1 -numRecords 354780  -format csv \


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org