diff --git a/docker/client/Dockerfile b/docker/client/Dockerfile index c3693fc2cc..2fa3997c0c 100644 --- a/docker/client/Dockerfile +++ b/docker/client/Dockerfile @@ -22,7 +22,7 @@ WORKDIR /root/iginx RUN mvn clean package -pl client -am -Dmaven.test.skip=true -P-format -e FROM openjdk:11-jre-slim -COPY --from=builder /root/iginx/client/target/iginx-client-0.7.1/ /iginx_client/ +COPY --from=builder /root/iginx/client/target/iginx-client-0.7.2/ /iginx_client/ RUN mkdir -p /iginx_client/logs RUN mkdir -p /iginx_client/data diff --git a/docker/client/Dockerfile-no-maven b/docker/client/Dockerfile-no-maven index ba11339c64..305d8eb8ff 100644 --- a/docker/client/Dockerfile-no-maven +++ b/docker/client/Dockerfile-no-maven @@ -1,5 +1,5 @@ FROM openjdk:11-jre-slim -COPY ./target/iginx-client-0.7.1/ /iginx_client/ +COPY ./target/iginx-client-0.7.2/ /iginx_client/ RUN mkdir -p /iginx_client/logs RUN mkdir -p /iginx_client/data diff --git a/docker/client/Dockerfile-no-maven-windows b/docker/client/Dockerfile-no-maven-windows index 9caef88e54..78edd2ab5d 100644 --- a/docker/client/Dockerfile-no-maven-windows +++ b/docker/client/Dockerfile-no-maven-windows @@ -2,7 +2,7 @@ FROM mcr.microsoft.com/windows/servercore:ltsc2022 COPY . C:/iginx WORKDIR C:/iginx -COPY ./target/iginx-client-0.7.1/ C:/iginx_client +COPY ./target/iginx-client-0.7.2/ C:/iginx_client # 设置环境变量 USER ContainerAdministrator diff --git a/docker/client/build-no-maven.bat b/docker/client/build-no-maven.bat index 67c4880c3d..3c69beeb0f 100644 --- a/docker/client/build-no-maven.bat +++ b/docker/client/build-no-maven.bat @@ -16,4 +16,4 @@ @REM along with this program. If not, see . @REM -docker build --file Dockerfile-no-maven-windows -t iginx-client:0.7.1 ../../client \ No newline at end of file +docker build --file Dockerfile-no-maven-windows -t iginx-client:0.7.2 ../../client \ No newline at end of file diff --git a/docker/client/build-no-maven.sh b/docker/client/build-no-maven.sh index 921954355b..43490a1969 100644 --- a/docker/client/build-no-maven.sh +++ b/docker/client/build-no-maven.sh @@ -17,4 +17,4 @@ # along with this program. If not, see . # -docker build --file Dockerfile-no-maven -t iginx-client:0.7.1 ../../client \ No newline at end of file +docker build --file Dockerfile-no-maven -t iginx-client:0.7.2 ../../client \ No newline at end of file diff --git a/docker/client/build.bat b/docker/client/build.bat index bdd20718c3..bda96932c3 100644 --- a/docker/client/build.bat +++ b/docker/client/build.bat @@ -16,4 +16,4 @@ @REM along with this program. If not, see . @REM -docker build --file Dockerfile -t iginx-client:0.7.1 ../../client \ No newline at end of file +docker build --file Dockerfile -t iginx-client:0.7.2 ../../client \ No newline at end of file diff --git a/docker/client/build.sh b/docker/client/build.sh index 9399df24ec..7644569eb6 100644 --- a/docker/client/build.sh +++ b/docker/client/build.sh @@ -17,4 +17,4 @@ # along with this program. If not, see . # -docker build --file Dockerfile -t iginx-client:0.7.1 ../../client \ No newline at end of file +docker build --file Dockerfile -t iginx-client:0.7.2 ../../client \ No newline at end of file diff --git a/docker/client/run_docker.bat b/docker/client/run_docker.bat index 7f21da8a32..599fad509c 100644 --- a/docker/client/run_docker.bat +++ b/docker/client/run_docker.bat @@ -52,7 +52,7 @@ if not exist "%datadir%" ( mkdir "%datadir%" ) -set command=docker run --name="%name%" -dit --add-host=host.docker.internal:host-gateway --mount type=bind,source=!datadir!,target=C:/iginx_client/data iginx-client:0.7.1 +set command=docker run --name="%name%" -dit --add-host=host.docker.internal:host-gateway --mount type=bind,source=!datadir!,target=C:/iginx_client/data iginx-client:0.7.2 echo %command% %command% diff --git a/docker/client/run_docker.sh b/docker/client/run_docker.sh index 623bda8ba9..70aee64914 100644 --- a/docker/client/run_docker.sh +++ b/docker/client/run_docker.sh @@ -39,6 +39,6 @@ done [ -d "$datadir" ] || mkdir -p "$datadir" -command="docker run --name=\"$name\" --privileged -dit --add-host=host.docker.internal:host-gateway --mount type=bind,source=${datadir},target=/iginx_client/data iginx-client:0.7.1" +command="docker run --name=\"$name\" --privileged -dit --add-host=host.docker.internal:host-gateway --mount type=bind,source=${datadir},target=/iginx_client/data iginx-client:0.7.2" echo $command eval $command diff --git a/docker/oneShot/.dockerignore b/docker/oneShot/.dockerignore index bea80728f7..abb1d135c6 100644 --- a/docker/oneShot/.dockerignore +++ b/docker/oneShot/.dockerignore @@ -1,3 +1,3 @@ -docker-compose.yaml -Dockerfile -docs +docker-compose.yaml +Dockerfile +docs diff --git a/docker/oneShot/Dockerfile b/docker/oneShot/Dockerfile index 7b2e7da1ba..6f8ea9c343 100644 --- a/docker/oneShot/Dockerfile +++ b/docker/oneShot/Dockerfile @@ -1,26 +1,26 @@ -# -# IGinX - the polystore system with high performance -# Copyright (C) Tsinghua University -# -# This program is free software: you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation, either version 3 of the License, or -# (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program. If not, see . -# - -FROM maven:3-amazoncorretto-8 AS builder -COPY . /root/IGinX -WORKDIR /root/IGinX -RUN --mount=type=cache,target=/root/.m2 mvn clean package -pl core,dataSources/iotdb12 -am -Dmaven.test.skip=true -Drevision=dev - -FROM amazoncorretto:8 -COPY --from=builder /root/IGinX/core/target/iginx-core-dev /root/IGinX +# +# IGinX - the polystore system with high performance +# Copyright (C) Tsinghua University +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# + +FROM maven:3-amazoncorretto-8 AS builder +COPY . /root/IGinX +WORKDIR /root/IGinX +RUN --mount=type=cache,target=/root/.m2 mvn clean package -pl core,dataSources/iotdb12 -am -Dmaven.test.skip=true -Drevision=dev + +FROM amazoncorretto:8 +COPY --from=builder /root/IGinX/core/target/iginx-core-dev /root/IGinX ENV PS1='\u@\h:\w\$ ' \ No newline at end of file diff --git a/docker/onlyIginx-parquet/Dockerfile-iginx b/docker/onlyIginx-parquet/Dockerfile-iginx index 5079219295..ce6b59caff 100644 --- a/docker/onlyIginx-parquet/Dockerfile-iginx +++ b/docker/onlyIginx-parquet/Dockerfile-iginx @@ -4,7 +4,7 @@ WORKDIR /root/iginx RUN mvn clean package -DskipTests -P-format -e FROM openjdk:11-jre-slim -COPY --from=builder /root/iginx/core/target/iginx-core-0.7.1 /iginx +COPY --from=builder /root/iginx/core/target/iginx-core-0.7.2 /iginx # ports will be cast in run.bat diff --git a/docker/onlyIginx-parquet/build_iginx_docker.bat b/docker/onlyIginx-parquet/build_iginx_docker.bat index 245dfed144..9b70fb26b8 100644 --- a/docker/onlyIginx-parquet/build_iginx_docker.bat +++ b/docker/onlyIginx-parquet/build_iginx_docker.bat @@ -16,4 +16,4 @@ @REM along with this program. If not, see . @REM -docker build --file Dockerfile-iginx -t iginx:0.7.1 ../.. \ No newline at end of file +docker build --file Dockerfile-iginx -t iginx:0.7.2 ../.. \ No newline at end of file diff --git a/docker/onlyIginx-parquet/build_iginx_docker.sh b/docker/onlyIginx-parquet/build_iginx_docker.sh index 9b3a8fe921..533a10fda5 100644 --- a/docker/onlyIginx-parquet/build_iginx_docker.sh +++ b/docker/onlyIginx-parquet/build_iginx_docker.sh @@ -17,4 +17,4 @@ # along with this program. If not, see . # -docker build --file Dockerfile-iginx -t iginx:0.7.1 ../.. \ No newline at end of file +docker build --file Dockerfile-iginx -t iginx:0.7.2 ../.. \ No newline at end of file diff --git a/docker/onlyIginx-parquet/run_iginx_docker.bat b/docker/onlyIginx-parquet/run_iginx_docker.bat index 9bb2055016..2f93926f10 100644 --- a/docker/onlyIginx-parquet/run_iginx_docker.bat +++ b/docker/onlyIginx-parquet/run_iginx_docker.bat @@ -180,7 +180,7 @@ if "!network!" neq "null" ( set "configFileConfig=-v !localConfigFile!:/iginx/conf " @REM -set command=docker run --name="%name%" !network!!localIPConfig!!configFileConfig!--privileged -dit -e host_iginx_port=%hostPort% -p %hostPort%:!port! !engineCast!iginx:0.7.1 +set command=docker run --name="%name%" !network!!localIPConfig!!configFileConfig!--privileged -dit -e host_iginx_port=%hostPort% -p %hostPort%:!port! !engineCast!iginx:0.7.2 echo %command% %command% diff --git a/docker/onlyIginx-parquet/run_iginx_docker.sh b/docker/onlyIginx-parquet/run_iginx_docker.sh index 4bdd1127e0..25b6a86abc 100644 --- a/docker/onlyIginx-parquet/run_iginx_docker.sh +++ b/docker/onlyIginx-parquet/run_iginx_docker.sh @@ -139,6 +139,6 @@ fi configFileConfig="-v ${localConfigFile}:/iginx/conf/config.properties " -command="docker run --name=${name} ${localIPConfig}${configFileConfig}--add-host=host.docker.internal:host-gateway ${network}--privileged -dit -e host_iginx_port=${hostPort}${portCastParams} iginx:0.7.1" +command="docker run --name=${name} ${localIPConfig}${configFileConfig}--add-host=host.docker.internal:host-gateway ${network}--privileged -dit -e host_iginx_port=${hostPort}${portCastParams} iginx:0.7.2" echo "RUNNING ${command}" # ${command} \ No newline at end of file diff --git a/docker/onlyIginx/Dockerfile-iginx b/docker/onlyIginx/Dockerfile-iginx index cf3763770a..05d78abcf2 100644 --- a/docker/onlyIginx/Dockerfile-iginx +++ b/docker/onlyIginx/Dockerfile-iginx @@ -4,7 +4,7 @@ WORKDIR /root/iginx RUN mvn clean package -DskipTests -P-format FROM openjdk:11-jre-slim -COPY --from=builder /root/iginx/core/target/iginx-core-0.7.1 /iginx +COPY --from=builder /root/iginx/core/target/iginx-core-0.7.2 /iginx # 安装 Python 3.8, pip 并安装所需的 Python 包 RUN apt-get update && \ diff --git a/docker/onlyIginx/build_iginx_docker.bat b/docker/onlyIginx/build_iginx_docker.bat index 245dfed144..9b70fb26b8 100644 --- a/docker/onlyIginx/build_iginx_docker.bat +++ b/docker/onlyIginx/build_iginx_docker.bat @@ -16,4 +16,4 @@ @REM along with this program. If not, see . @REM -docker build --file Dockerfile-iginx -t iginx:0.7.1 ../.. \ No newline at end of file +docker build --file Dockerfile-iginx -t iginx:0.7.2 ../.. \ No newline at end of file diff --git a/docker/onlyIginx/build_iginx_docker.sh b/docker/onlyIginx/build_iginx_docker.sh index ba33ff4609..5b2d2ff2f8 100755 --- a/docker/onlyIginx/build_iginx_docker.sh +++ b/docker/onlyIginx/build_iginx_docker.sh @@ -16,4 +16,4 @@ # along with this program. If not, see . # -docker build --file Dockerfile-iginx -t iginx:0.7.1 ../.. \ No newline at end of file +docker build --file Dockerfile-iginx -t iginx:0.7.2 ../.. \ No newline at end of file diff --git a/docker/onlyIginx/run_iginx_docker.bat b/docker/onlyIginx/run_iginx_docker.bat index 73c15145c2..70e20b3bd9 100644 --- a/docker/onlyIginx/run_iginx_docker.bat +++ b/docker/onlyIginx/run_iginx_docker.bat @@ -29,4 +29,4 @@ set ip=%1 set name=%2 set port=%3 mkdir -p logs/docker_logs -docker run --name="%name%" --privileged -dit --net docker-cluster-iginx --ip %ip% --add-host=host.docker.internal:host-gateway -v %logdir%:/iginx/logs/ -p %port%:6888 iginx:0.7.1 \ No newline at end of file +docker run --name="%name%" --privileged -dit --net docker-cluster-iginx --ip %ip% --add-host=host.docker.internal:host-gateway -v %logdir%:/iginx/logs/ -p %port%:6888 iginx:0.7.2 \ No newline at end of file diff --git a/docker/onlyIginx/run_iginx_docker.sh b/docker/onlyIginx/run_iginx_docker.sh index 2a41e973df..f7f3b92b9b 100755 --- a/docker/onlyIginx/run_iginx_docker.sh +++ b/docker/onlyIginx/run_iginx_docker.sh @@ -21,4 +21,4 @@ name=$2 port=$3 logdir="$(pwd)/../../logs/docker_logs" mkdir -p $logdir -docker run --name="${name}" --privileged -dit --net docker-cluster-iginx --ip ${ip} --add-host=host.docker.internal:host-gateway -v ${logdir}:/iginx/logs/ -p ${port}:6888 iginx:0.7.1 \ No newline at end of file +docker run --name="${name}" --privileged -dit --net docker-cluster-iginx --ip ${ip} --add-host=host.docker.internal:host-gateway -v ${logdir}:/iginx/logs/ -p ${port}:6888 iginx:0.7.2 \ No newline at end of file diff --git a/docs/images/IGinXZeppelin/create_new_note.png b/docs/images/IGinXZeppelin/create_new_note.png index dcee0bb3c8..ae33bb43e5 100644 Binary files a/docs/images/IGinXZeppelin/create_new_note.png and b/docs/images/IGinXZeppelin/create_new_note.png differ diff --git a/docs/images/IGinXZeppelin/iginx_sql.png b/docs/images/IGinXZeppelin/iginx_sql.png index a1cfffdf47..7ececbd1fe 100644 Binary files a/docs/images/IGinXZeppelin/iginx_sql.png and b/docs/images/IGinXZeppelin/iginx_sql.png differ diff --git a/docs/images/IGinXZeppelin/restart_interpreter.png b/docs/images/IGinXZeppelin/restart_interpreter.png index 8eb3e938fd..ea0be41d68 100644 Binary files a/docs/images/IGinXZeppelin/restart_interpreter.png and b/docs/images/IGinXZeppelin/restart_interpreter.png differ diff --git a/docs/images/IGinXZeppelin/restful.png b/docs/images/IGinXZeppelin/restful.png index 498a5d8cde..90d7e65409 100644 Binary files a/docs/images/IGinXZeppelin/restful.png and b/docs/images/IGinXZeppelin/restful.png differ diff --git a/docs/images/IGinXZeppelin/set_new_note.png b/docs/images/IGinXZeppelin/set_new_note.png index 0bed898058..58a6c1bc53 100644 Binary files a/docs/images/IGinXZeppelin/set_new_note.png and b/docs/images/IGinXZeppelin/set_new_note.png differ diff --git a/docs/images/IGinXZeppelin/zeppelin_download_page.png b/docs/images/IGinXZeppelin/zeppelin_download_page.png index 329b4f0703..90739f9fb0 100644 Binary files a/docs/images/IGinXZeppelin/zeppelin_download_page.png and b/docs/images/IGinXZeppelin/zeppelin_download_page.png differ diff --git a/docs/images/IginX_arch.png b/docs/images/IginX_arch.png index 9aacff434a..640d56315b 100644 Binary files a/docs/images/IginX_arch.png and b/docs/images/IginX_arch.png differ diff --git a/docs/images/cluster_arch.png b/docs/images/cluster_arch.png index b4beed147a..11bb862e21 100644 Binary files a/docs/images/cluster_arch.png and b/docs/images/cluster_arch.png differ diff --git a/docs/images/softwareArch.png b/docs/images/softwareArch.png index 7586281da3..7182229aa7 100644 Binary files a/docs/images/softwareArch.png and b/docs/images/softwareArch.png differ diff --git a/docs/pdf/SQLManual.pdf b/docs/pdf/SQLManual.pdf index 789189b47d..d34fd4ef73 100644 Binary files a/docs/pdf/SQLManual.pdf and b/docs/pdf/SQLManual.pdf differ diff --git a/docs/pdf/userManualC.pdf b/docs/pdf/userManualC.pdf index f196181fd5..30ebdef238 100644 Binary files a/docs/pdf/userManualC.pdf and b/docs/pdf/userManualC.pdf differ diff --git a/docs/quickStarts/IGinXByDocker-EnglishVersion.md b/docs/quickStarts/IGinXByDocker-EnglishVersion.md index 9e140ffea2..1833d1fb1e 100644 --- a/docs/quickStarts/IGinXByDocker-EnglishVersion.md +++ b/docs/quickStarts/IGinXByDocker-EnglishVersion.md @@ -255,7 +255,7 @@ The following words are displayed to indicate that the image was built successfu => [builder 2/4] COPY . /root/iginx 1.3s => [builder 3/4] WORKDIR /root/iginx 0.1s => [builder 4/4] RUN mvn clean package -DskipTests -P-format 876.3s -=> [stage-1 2/2] COPY --from=builder /root/iginx/core/target/iginx-core-0.7.1 /iginx 0.2s +=> [stage-1 2/2] COPY --from=builder /root/iginx/core/target/iginx-core-0.7.2 /iginx 0.2s => exporting to image 0.5s => => exporting layers 0.5s => => writing image sha256:e738348598c9db601dbf39c7a8ca9e1396c5ff51769afeb0fe3da12e2fdcd73a 0.0s diff --git a/docs/quickStarts/IGinXByDocker.md b/docs/quickStarts/IGinXByDocker.md index c8e21e811f..2f54896904 100644 --- a/docs/quickStarts/IGinXByDocker.md +++ b/docs/quickStarts/IGinXByDocker.md @@ -254,7 +254,7 @@ $ ./build_iginx_docker.sh => [builder 2/4] COPY . /root/iginx 1.3s => [builder 3/4] WORKDIR /root/iginx 0.1s => [builder 4/4] RUN mvn clean package -DskipTests -P-format 876.3s -=> [stage-1 2/2] COPY --from=builder /root/iginx/core/target/iginx-core-0.7.1 /iginx 0.2s +=> [stage-1 2/2] COPY --from=builder /root/iginx/core/target/iginx-core-0.7.2 /iginx 0.2s => exporting to image 0.5s => => exporting layers 0.5s => => writing image sha256:e738348598c9db601dbf39c7a8ca9e1396c5ff51769afeb0fe3da12e2fdcd73a 0.0s diff --git a/docs/quickStarts/IGinXBySource-EnglishVersion.md b/docs/quickStarts/IGinXBySource-EnglishVersion.md index 5dac28f1db..61e3da5bf4 100644 --- a/docs/quickStarts/IGinXBySource-EnglishVersion.md +++ b/docs/quickStarts/IGinXBySource-EnglishVersion.md @@ -180,7 +180,7 @@ The following words are displayed, indicating that the IGinX build is successful ```shell [INFO] ------------------------------------------------------------------------ -[INFO] Reactor Summary for IGinX 0.7.1: +[INFO] Reactor Summary for IGinX 0.7.2: [INFO] [INFO] IGinX .............................................. SUCCESS [ 20.674 s] [INFO] IGinX Thrift ....................................... SUCCESS [01:18 min] diff --git a/docs/quickStarts/IGinXBySource.md b/docs/quickStarts/IGinXBySource.md index abe098b0d5..b2ca5a2cc3 100644 --- a/docs/quickStarts/IGinXBySource.md +++ b/docs/quickStarts/IGinXBySource.md @@ -180,7 +180,7 @@ $ mvn clean install -Dmaven.test.skip=true ```shell [INFO] ------------------------------------------------------------------------ -[INFO] Reactor Summary for IGinX 0.7.1: +[INFO] Reactor Summary for IGinX 0.7.2: [INFO] [INFO] IGinX .............................................. SUCCESS [ 20.674 s] [INFO] IGinX Thrift ....................................... SUCCESS [01:18 min] @@ -257,7 +257,7 @@ Starting zookeeper ... STARTED ```shell $ cd ~ -$ cd IGinX/core/target/iginx-core-0.7.1 +$ cd IGinX/core/target/iginx-core-0.7.2 $ chmod +x sbin/start_iginx.sh # 为启动脚本添加启动权限 $ ./sbin/start_iginx.sh ``` diff --git a/docs/quickStarts/IGinXZeppelin-EnglishVersion.md b/docs/quickStarts/IGinXZeppelin-EnglishVersion.md index 0b0507d291..741178d7f3 100644 --- a/docs/quickStarts/IGinXZeppelin-EnglishVersion.md +++ b/docs/quickStarts/IGinXZeppelin-EnglishVersion.md @@ -10,7 +10,7 @@ Navigate to the IGinX directory and execute the following command to build the I mvn clean package -DskipTests -P get-jar-with-dependencies ``` -Upon successful compilation, you will find the `zeppelin-iginx-0.7.1-jar-with-dependencies.jar` package in the `IGinX/zeppelin-interpreter/target/` directory. We will need this package for the next steps of deploying Zeppelin. +Upon successful compilation, you will find the `zeppelin-iginx-0.7.2-jar-with-dependencies.jar` package in the `IGinX/zeppelin-interpreter/target/` directory. We will need this package for the next steps of deploying Zeppelin. ## Deploying Zeppelin @@ -56,7 +56,7 @@ export JAVA_HOME= #### Integrating IGinX Zeppelin Interpreter -In the `zeppelin-0.10.1-bin-netinst/interpreter/` folder, create a new folder named `IGinX`. Place the compiled `zeppelin-iginx-0.7.1-jar-with-dependencies.jar` package inside this folder. +In the `zeppelin-0.10.1-bin-netinst/interpreter/` folder, create a new folder named `IGinX`. Place the compiled `zeppelin-iginx-0.7.2-jar-with-dependencies.jar` package inside this folder. #### Starting IGinX @@ -86,7 +86,7 @@ Before deploying Zeppelin, start IGinX. Prepare a folder to place the IGinX Zeppelin Interpreter. For example, let's name the folder `zeppelin-interpreter` with the absolute path `~/code/zeppelin-interpreter/`. -Place the `zeppelin-iginx-0.7.1-jar-with-dependencies.jar` package inside this prepared `zeppelin-interpreter` folder. +Place the `zeppelin-iginx-0.7.2-jar-with-dependencies.jar` package inside this prepared `zeppelin-interpreter` folder. #### Starting Docker Container Using Commands diff --git a/docs/quickStarts/IGinXZeppelin.md b/docs/quickStarts/IGinXZeppelin.md index fad8030908..3fe0c6dbf6 100644 --- a/docs/quickStarts/IGinXZeppelin.md +++ b/docs/quickStarts/IGinXZeppelin.md @@ -10,7 +10,7 @@ mvn clean package -DskipTests -P get-jar-with-dependencies ``` -构建成功后，在`IGinX/zeppelin-interpreter/target/`路径下找到`zeppelin-iginx-0.7.1-jar-with-dependencies.jar`包。 +构建成功后，在`IGinX/zeppelin-interpreter/target/`路径下找到`zeppelin-iginx-0.7.2-jar-with-dependencies.jar`包。 在下一步部署Zeppelin时我们需要用到这个包。 @@ -60,7 +60,7 @@ export JAVA_HOME= #### 接入IGinX Zeppelin Interpreter -在`zeppelin-0.10.1-bin-netinst/interpreter/`文件夹下新建一个文件夹`IGinX`，将构建好的`zeppelin-iginx-0.7.1-jar-with-dependencies.jar`包放入其中即可。 +在`zeppelin-0.10.1-bin-netinst/interpreter/`文件夹下新建一个文件夹`IGinX`，将构建好的`zeppelin-iginx-0.7.2-jar-with-dependencies.jar`包放入其中即可。 #### 启动IGinX @@ -90,7 +90,7 @@ export JAVA_HOME= 我们需要准备一个文件夹，用于放置IGinX Zeppelin Interpreter。例如我们准备一个文件夹名为`zeppelin-interpreter`，其绝对路径为`~/code/zeppelin-interpreter/`。 -将`zeppelin-iginx-0.7.1-jar-with-dependencies.jar`包放入我们准备好的`zeppelin-interpreter`文件夹内即可。 +将`zeppelin-iginx-0.7.2-jar-with-dependencies.jar`包放入我们准备好的`zeppelin-interpreter`文件夹内即可。 #### 使用命令启动Docker容器 diff --git a/docs/quickStarts_Parquet/IGinXByDocker-EnglishVersion.md b/docs/quickStarts_Parquet/IGinXByDocker-EnglishVersion.md index 07c2433546..3ce411407c 100644 --- a/docs/quickStarts_Parquet/IGinXByDocker-EnglishVersion.md +++ b/docs/quickStarts_Parquet/IGinXByDocker-EnglishVersion.md @@ -250,7 +250,7 @@ The following words are displayed to indicate that the image was built successfu => [builder 2/4] COPY . /root/iginx 1.3s => [builder 3/4] WORKDIR /root/iginx 0.1s => [builder 4/4] RUN mvn clean package -DskipTests -P passFormat 876.3s -=> [stage-1 2/2] COPY --from=builder /root/iginx/core/target/iginx-core-0.7.1 /iginx 0.2s +=> [stage-1 2/2] COPY --from=builder /root/iginx/core/target/iginx-core-0.7.2 /iginx 0.2s => exporting to image 0.5s => => exporting layers 0.5s => => writing image sha256:e738348598c9db601dbf39c7a8ca9e1396c5ff51769afeb0fe3da12e2fdcd73a 0.0s diff --git a/docs/quickStarts_Parquet/IGinXByDocker.md b/docs/quickStarts_Parquet/IGinXByDocker.md index 7d22b40f2a..8b40887f3f 100644 --- a/docs/quickStarts_Parquet/IGinXByDocker.md +++ b/docs/quickStarts_Parquet/IGinXByDocker.md @@ -249,7 +249,7 @@ $ ./build_iginx_docker.sh => [builder 2/4] COPY . /root/iginx 1.3s => [builder 3/4] WORKDIR /root/iginx 0.1s => [builder 4/4] RUN mvn clean package -DskipTests -P passFormat 876.3s -=> [stage-1 2/2] COPY --from=builder /root/iginx/core/target/iginx-core-0.7.1 /iginx 0.2s +=> [stage-1 2/2] COPY --from=builder /root/iginx/core/target/iginx-core-0.7.2 /iginx 0.2s => exporting to image 0.5s => => exporting layers 0.5s => => writing image sha256:e738348598c9db601dbf39c7a8ca9e1396c5ff51769afeb0fe3da12e2fdcd73a 0.0s diff --git a/docs/quickStarts_Parquet/IGinXBySource-EnglishVersion.md b/docs/quickStarts_Parquet/IGinXBySource-EnglishVersion.md index 7ca1f1301d..a99993268c 100644 --- a/docs/quickStarts_Parquet/IGinXBySource-EnglishVersion.md +++ b/docs/quickStarts_Parquet/IGinXBySource-EnglishVersion.md @@ -168,7 +168,7 @@ The following words are displayed, indicating that the IGinX build is successful ```shell [INFO] ------------------------------------------------------------------------ -[INFO] Reactor Summary for IGinX 0.7.1: +[INFO] Reactor Summary for IGinX 0.7.2: [INFO] [INFO] IGinX .............................................. SUCCESS [ 20.674 s] [INFO] IGinX Thrift ....................................... SUCCESS [01:18 min] diff --git a/docs/quickStarts_Parquet/IGinXBySource.md b/docs/quickStarts_Parquet/IGinXBySource.md index 08524999f6..a7fa23edf2 100644 --- a/docs/quickStarts_Parquet/IGinXBySource.md +++ b/docs/quickStarts_Parquet/IGinXBySource.md @@ -170,7 +170,7 @@ $ mvn clean install -Dmaven.test.skip=true ```shell [INFO] ------------------------------------------------------------------------ -[INFO] Reactor Summary for IGinX 0.7.1: +[INFO] Reactor Summary for IGinX 0.7.2: [INFO] [INFO] IGinX .............................................. SUCCESS [ 20.674 s] [INFO] IGinX Thrift ....................................... SUCCESS [01:18 min] @@ -232,7 +232,7 @@ storageEngineList=127.0.0.1#6667#parquet#dir=parquetData#has_data=false#is_read_ ```shell $ cd ~ -$ cd IGinX/core/target/iginx-core-0.7.1 +$ cd IGinX/core/target/iginx-core-0.7.2 $ chmod +x sbin/start_iginx.sh # 为启动脚本添加启动权限 $ ./sbin/start_iginx.sh ``` diff --git a/pom.xml b/pom.xml index c7aedc4137..f7a49e274f 100644 --- a/pom.xml +++ b/pom.xml @@ -66,7 +66,7 @@ 8 UTF-8 UTF-8 - 0.7.1 + 0.7.2