From a7f1f099505d74196296bd1985d0b7c45afbb472 Mon Sep 17 00:00:00 2001 From: jianghongbo4 Date: Tue, 3 Jan 2023 19:47:25 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=89=88=E6=9C=AC=E5=8F=B7?= =?UTF-8?q?=E8=87=B33.1.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 1 + build/script/aarch64_lite_list | 2 +- build/script/gaussdb.ver | 2 +- build/script/x86_64_lite_list | 2 +- cmake/src/build_function.cmake | 2 +- cmake/src/config-in/pg_config.h.in | 2 +- cmake/src/config-in/pg_config_nocheck.h.in | 2 +- configure | 2 +- src/bin/gs_plan_simulator/gs_plan_simulator.sh | 2 +- src/bin/pg_config/pg_config.cpp | 2 +- 10 files changed, 10 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index c5f182fa9..5ad74a555 100644 --- a/README.md +++ b/README.md @@ -414,6 +414,7 @@ https://opengauss.org/zh/ | 2.1.0 | https://opengauss.obs.cn-south-1.myhuaweicloud.com/2.1.0/openGauss-third_party_binarylibs.tar.gz | | 3.0.0 | https://opengauss.obs.cn-south-1.myhuaweicloud.com/3.0.0/openGauss-third_party_binarylibs.tar.gz | | 3.1.0 | **openEuler_arm:** https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/binarylibs/openGauss-third_party_binarylibs_openEuler_arm.tar.gz
**openEuler_x86:** https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/binarylibs/openGauss-third_party_binarylibs_openEuler_x86_64.tar.gz
**Centos_x86:** https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/binarylibs/openGauss-third_party_binarylibs_Centos7.6_x86_64.tar.gz | +| 3.1.1 | **openEuler_arm:** https://opengauss.obs.cn-south-1.myhuaweicloud.com/3.1.1/binarylibs/openGauss-third_party_binarylibs_openEuler_arm.tar.gz
**openEuler_x86:** https://opengauss.obs.cn-south-1.myhuaweicloud.com/3.1.1/binarylibs/openGauss-third_party_binarylibs_openEuler_x86_64.tar.gz
**Centos_x86:** https://opengauss.obs.cn-south-1.myhuaweicloud.com/3.1.1/binarylibs/openGauss-third_party_binarylibs_Centos7.6_x86_64.tar.gz | | master | **openEuler_arm:** https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/binarylibs/openGauss-third_party_binarylibs_openEuler_arm.tar.gz
**openEuler_x86:** https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/binarylibs/openGauss-third_party_binarylibs_openEuler_x86_64.tar.gz
**Centos_x86:** https://opengauss.obs.cn-south-1.myhuaweicloud.com/latest/binarylibs/openGauss-third_party_binarylibs_Centos7.6_x86_64.tar.gz | 现在我们已经拥有完整的openGauss代码，把它存储在以下目录中（以sda为例）。 diff --git a/build/script/aarch64_lite_list b/build/script/aarch64_lite_list index 0f7f51ca0..86825fd04 100644 --- a/build/script/aarch64_lite_list +++ b/build/script/aarch64_lite_list @@ -904,4 +904,4 @@ ./include/pqcomm.h ./include/pqexpbuffer.h [version] -3.1.0 +3.1.1 diff --git a/build/script/gaussdb.ver b/build/script/gaussdb.ver index 8432747e3..6031ae7dc 100644 --- a/build/script/gaussdb.ver +++ b/build/script/gaussdb.ver @@ -1,2 +1,2 @@ PRODUCT=openGauss -VERSION=3.1.0 \ No newline at end of file +VERSION=3.1.1 \ No newline at end of file diff --git a/build/script/x86_64_lite_list b/build/script/x86_64_lite_list index 1921e4f24..1b0a88128 100644 --- a/build/script/x86_64_lite_list +++ b/build/script/x86_64_lite_list @@ -903,4 +903,4 @@ ./include/pqcomm.h ./include/pqexpbuffer.h [version] -3.1.0 +3.1.1 diff --git a/cmake/src/build_function.cmake b/cmake/src/build_function.cmake index eb6e837f4..04c5f5e26 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 "3.1.0") + set(OPENGAUSS_VERSION "3.1.1") 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 0ab50738b..b4e7e82fd 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 "3.1.0" +#define OPENGAUSS_VERSION_NUM_STR "3.1.1" /* 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 3d54679ce..f3c0dfda8 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 "3.1.0" +#define OPENGAUSS_VERSION "3.1.1" /* 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 7d9f7744d..22009e034 100755 --- a/configure +++ b/configure @@ -2195,7 +2195,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='3.1.0' +OPENGAUSS_VERSION='3.1.1' cat >>confdefs.h <<_ACEOF #define PG_VERSION "$PACKAGE_VERSION" diff --git a/src/bin/gs_plan_simulator/gs_plan_simulator.sh b/src/bin/gs_plan_simulator/gs_plan_simulator.sh index ebf71313a..c4b064bd5 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 3.1.0" + echo " Version 3.1.1" echo "--------------------------------------------------------------------------" } diff --git a/src/bin/pg_config/pg_config.cpp b/src/bin/pg_config/pg_config.cpp index 6ded8b53f..76e3ea569 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 3.1.0\n"); + printf("openGauss 3.1.1\n"); #endif }