diff --git a/cmake/src/build_function.cmake b/cmake/src/build_function.cmake index f079574bf1e4f6c14a2f8ee8eb778b78ee5bc9dd..e2f6ed6afc4095608cfbccd1f23695d5493e0aef 100755 --- a/cmake/src/build_function.cmake +++ b/cmake/src/build_function.cmake @@ -198,7 +198,7 @@ ENDMACRO(CHECK_CC_ENABLE) function(GET_VERSIONSTR_FROMGIT ret) set(PG_VERSION "9.2.4") - set(OPENGAUSS_VERSION "7.0.0-RC1") + set(OPENGAUSS_VERSION "7.0.0-RC2") execute_process( COMMAND ${CMAKE_SOURCE_DIR}/${openGauss}/cmake/src/buildfunction.sh --s ${PROJECT_TRUNK_DIR} OUTPUT_VARIABLE GS_VERSION_STR) set(PG_VERSION "${PG_VERSION}" PARENT_SCOPE) diff --git a/cmake/src/config-in/pg_config.h.in b/cmake/src/config-in/pg_config.h.in index a2afbefb8bc9e597b4c56398e3ffd1d3d6cded1a..341ae70ad11fbed3dadbe54fb637162022b3ba8f 100755 --- a/cmake/src/config-in/pg_config.h.in +++ b/cmake/src/config-in/pg_config.h.in @@ -714,7 +714,7 @@ #define PGXC_VERSION_NUM /* openGauss version as a number string */ -#define OPENGAUSS_VERSION_NUM_STR "7.0.0-RC1" +#define OPENGAUSS_VERSION_NUM_STR "7.0.0-RC2" /* A string containing the version number, platform, and C compiler */ #define PG_VERSION_STR "@PG_VERSION_STR@" diff --git a/cmake/src/config-in/pg_config_nocheck.h.in b/cmake/src/config-in/pg_config_nocheck.h.in index 70c31be357f03b2c36ea2dd849ab6ab478abc701..391bd0bbc818978d7383ce29c1ca5bdc56eb02ef 100755 --- a/cmake/src/config-in/pg_config_nocheck.h.in +++ b/cmake/src/config-in/pg_config_nocheck.h.in @@ -695,7 +695,7 @@ #define PG_VERSION "9.2.4" /* openGauss version as a string */ -#define OPENGAUSS_VERSION "7.0.0-RC1" +#define OPENGAUSS_VERSION "7.0.0-RC2" /* Gaussdb version as a string*/ #define DEF_GS_VERSION "(GaussDB A 8.0.0 build 21f07aff) compiled at 2020-03-17 10:59:07 commit 7431 last mr 12039 debug" diff --git a/configure b/configure index 02d3c947a90e2384a86a2cba4a6b922bc77be0c3..2ccd4b494da2e9cdef8d045ff9355870c3b5a0c5 100755 --- a/configure +++ b/configure @@ -2215,7 +2215,7 @@ PACKAGE_VERSION='9.2.4' # Postgres-XC 1.1devel is based on PostgreSQL 9.2.4 PACKAGE_XC_VERSION='1.1' # openGauss is based on PostgreSQL 9.2.4 and it will be the Kernel of GaussDB database -OPENGAUSS_VERSION='7.0.0-RC1' +OPENGAUSS_VERSION='7.0.0-RC2' cat >>confdefs.h <<_ACEOF #define PG_VERSION "$PACKAGE_VERSION" diff --git a/docker/dockerfiles/7.0.0-rc1/dockerfile_amd b/docker/dockerfiles/7.0.0-RC2/dockerfile_amd similarity index 86% rename from docker/dockerfiles/7.0.0-rc1/dockerfile_amd rename to docker/dockerfiles/7.0.0-RC2/dockerfile_amd index b7d451da9c1b216d4c70582a6198d9fc0f53e4d1..63a85a0a8f7a33f939a562bffb1c5ba16fabef2a 100644 --- a/docker/dockerfiles/7.0.0-rc1/dockerfile_amd +++ b/docker/dockerfiles/7.0.0-RC2/dockerfile_amd @@ -1,6 +1,6 @@ FROM centos:7.6.1810 -COPY openGauss-Server-7.0.0-RC1-CentOS7-x86_64.tar.bz2 . +COPY openGauss-Server-7.0.0-RC2-CentOS7-x86_64.tar.bz2 . COPY gosu-amd64 /usr/local/bin/gosu ENV LANG en_US.utf8 @@ -15,10 +15,10 @@ RUN set -eux; \ mkdir -p /usr/local/opengauss && \ mkdir -p /var/run/opengauss && \ mkdir /docker-entrypoint-initdb.d && \ - tar -jxf openGauss-Server-7.0.0-RC1-CentOS7-x86_64.tar.bz2 -C /usr/local/opengauss && \ + tar -jxf openGauss-Server-7.0.0-RC2-CentOS7-x86_64.tar.bz2 -C /usr/local/opengauss && \ chown -R omm:omm /var/run/opengauss && chown -R omm:omm /usr/local/opengauss && chown -R omm:omm /var/lib/opengauss && chown -R omm:omm /docker-entrypoint-initdb.d && \ chmod 2777 /var/run/opengauss && \ - rm -rf openGauss-Server-7.0.0-RC1-CentOS7-x86_64.tar.bz2 && yum clean all + rm -rf openGauss-Server-7.0.0-RC2-CentOS7-x86_64.tar.bz2 && yum clean all RUN set -eux; \ echo "export GAUSSHOME=/usr/local/opengauss" >> /home/omm/.bashrc && \ diff --git a/docker/dockerfiles/7.0.0-rc1/dockerfile_arm b/docker/dockerfiles/7.0.0-RC2/dockerfile_arm similarity index 98% rename from docker/dockerfiles/7.0.0-rc1/dockerfile_arm rename to docker/dockerfiles/7.0.0-RC2/dockerfile_arm index 4d5a51dd93f36ecf318c411684e2c004f344c793..3ef399ddf0114983a9c0b499cad5760bd53905c3 100644 --- a/docker/dockerfiles/7.0.0-rc1/dockerfile_arm +++ b/docker/dockerfiles/7.0.0-RC2/dockerfile_arm @@ -1,6 +1,6 @@ FROM openeuler/openeuler:20.03-lts -ARG VERSION=7.0.0-RC1 +ARG VERSION=7.0.0-RC2 COPY openGauss-Server-${VERSION}-openEuler20.03-aarch64.tar.bz2 . COPY gosu-arm64 /usr/local/bin/gosu diff --git a/docker/dockerfiles/7.0.0-rc1/dockerfile_lite_arm b/docker/dockerfiles/7.0.0-RC2/dockerfile_lite_arm similarity index 98% rename from docker/dockerfiles/7.0.0-rc1/dockerfile_lite_arm rename to docker/dockerfiles/7.0.0-RC2/dockerfile_lite_arm index 3857841414013a7d4b42e78c415d9e66fbc570e4..9ee2bd510edecfd6c48db5dab7684afe46f95772 100644 --- a/docker/dockerfiles/7.0.0-rc1/dockerfile_lite_arm +++ b/docker/dockerfiles/7.0.0-RC2/dockerfile_lite_arm @@ -1,6 +1,6 @@ FROM openeuler/openeuler:20.03-lts -ARG VERSION=7.0.0-RC1 +ARG VERSION=7.0.0-RC2 COPY openGauss-Lite-${VERSION}-openEuler20.03-aarch64.tar.gz . COPY gosu-arm64 /usr/local/bin/gosu diff --git a/docker/dockerfiles/7.0.0-rc1/dockerfile_lite_x86 b/docker/dockerfiles/7.0.0-RC2/dockerfile_lite_x86 similarity index 98% rename from docker/dockerfiles/7.0.0-rc1/dockerfile_lite_x86 rename to docker/dockerfiles/7.0.0-RC2/dockerfile_lite_x86 index 1ad40c6f90648ab6ff63530534cd783f3857991e..96731f2e03e110f6bed2a497bde55295030064a4 100644 --- a/docker/dockerfiles/7.0.0-rc1/dockerfile_lite_x86 +++ b/docker/dockerfiles/7.0.0-RC2/dockerfile_lite_x86 @@ -1,6 +1,6 @@ FROM openeuler/openeuler:20.03-lts -ARG VERSION=7.0.0-RC1 +ARG VERSION=7.0.0-RC2 COPY openGauss-Lite-${VERSION}-openEuler20.03-x86_64.tar.gz . COPY gosu-amd64 /usr/local/bin/gosu diff --git a/docker/dockerfiles/7.0.0-rc1/dockerfile_x86 b/docker/dockerfiles/7.0.0-RC2/dockerfile_x86 similarity index 98% rename from docker/dockerfiles/7.0.0-rc1/dockerfile_x86 rename to docker/dockerfiles/7.0.0-RC2/dockerfile_x86 index 9a85d1124fa4dd595bb48b1618de7ffd0317e28a..be627c0fe0d53c9f216c8ec7f32620c0c957da62 100644 --- a/docker/dockerfiles/7.0.0-rc1/dockerfile_x86 +++ b/docker/dockerfiles/7.0.0-RC2/dockerfile_x86 @@ -1,6 +1,6 @@ FROM openeuler/openeuler:20.03-lts -ARG VERSION=7.0.0-RC1 +ARG VERSION=7.0.0-RC2 COPY openGauss-Server-${VERSION}-openEuler20.03-x86_64.tar.bz2 . COPY gosu-amd64 /usr/local/bin/gosu diff --git a/docker/dockerfiles/7.0.0-rc1/entrypoint.sh b/docker/dockerfiles/7.0.0-RC2/entrypoint.sh similarity index 100% rename from docker/dockerfiles/7.0.0-rc1/entrypoint.sh rename to docker/dockerfiles/7.0.0-RC2/entrypoint.sh diff --git a/docker/dockerfiles/7.0.0-rc1/gosu-amd64 b/docker/dockerfiles/7.0.0-RC2/gosu-amd64 similarity index 100% rename from docker/dockerfiles/7.0.0-rc1/gosu-amd64 rename to docker/dockerfiles/7.0.0-RC2/gosu-amd64 diff --git a/docker/dockerfiles/7.0.0-rc1/gosu-arm64 b/docker/dockerfiles/7.0.0-RC2/gosu-arm64 similarity index 100% rename from docker/dockerfiles/7.0.0-rc1/gosu-arm64 rename to docker/dockerfiles/7.0.0-RC2/gosu-arm64 diff --git a/docker/dockerfiles/7.0.0-rc1/openEuler_aarch64.repo b/docker/dockerfiles/7.0.0-RC2/openEuler_aarch64.repo similarity index 100% rename from docker/dockerfiles/7.0.0-rc1/openEuler_aarch64.repo rename to docker/dockerfiles/7.0.0-RC2/openEuler_aarch64.repo diff --git a/docker/dockerfiles/7.0.0-rc1/sha256_file_amd64 b/docker/dockerfiles/7.0.0-RC2/sha256_file_amd64 similarity index 100% rename from docker/dockerfiles/7.0.0-rc1/sha256_file_amd64 rename to docker/dockerfiles/7.0.0-RC2/sha256_file_amd64 diff --git a/docker/dockerfiles/7.0.0-rc1/sha256_file_arm64 b/docker/dockerfiles/7.0.0-RC2/sha256_file_arm64 similarity index 100% rename from docker/dockerfiles/7.0.0-rc1/sha256_file_arm64 rename to docker/dockerfiles/7.0.0-RC2/sha256_file_arm64 diff --git a/src/bin/gs_plan_simulator/gs_plan_simulator.sh b/src/bin/gs_plan_simulator/gs_plan_simulator.sh index 0b5792327584c46599afb9e346b6a48e48d534d5..9a783cfc57ec6114d4f3889f88f35360940390e7 100755 --- a/src/bin/gs_plan_simulator/gs_plan_simulator.sh +++ b/src/bin/gs_plan_simulator/gs_plan_simulator.sh @@ -88,7 +88,7 @@ function logo() echo " | | | | (_| | | | | ____) | | | | | | | |_| | | (_| | || (_) | | " echo " |_| |_|\__,_|_| |_| |_____/|_|_| |_| |_|\__,_|_|\__,_|\__|___/|_| " echo " " - echo " Version 7.0.0-RC1" + echo " Version 7.0.0-RC2" echo "--------------------------------------------------------------------------" } diff --git a/src/bin/pg_config/pg_config.cpp b/src/bin/pg_config/pg_config.cpp index fc3bbdecdf05a47b2b3006f561f0d03ff5bfa180..4b45eabe879cec5fedb227d3f2695f770b7b2ffc 100644 --- a/src/bin/pg_config/pg_config.cpp +++ b/src/bin/pg_config/pg_config.cpp @@ -297,7 +297,7 @@ static void show_version(int alls) if (alls) { printf("OPENGAUSS_VERSION = "); } - printf("openGauss 7.0.0-RC1\n"); + printf("openGauss 7.0.0-RC2\n"); #endif }