packages/opengauss-server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

!28 修复在openEuler2309上编译错误

Browse Source 
From: @zhang_xubo 
Reviewed-by: @dillon_chen 
Signed-off-by: @dillon_chen
This commit is contained in:
openeuler-ci-bot 2023-08-14 05:48:17 +00:00 committed by Gitee
commit 69c8c7394b
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 46 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
compile_2309.patch Normal file
View File

@ -0,0 +1,40 @@
diff -crN '--exclude=.git' '--exclude=.gitee' openGauss-server-2.1.0/src/bin/pg_basebackup/pg_basebackup.cpp openGauss-server-2.1.0-edit/src/bin/pg_basebackup/pg_basebackup.cpp
*** openGauss-server-2.1.0/src/bin/pg_basebackup/pg_basebackup.cpp 2021-12-13 16:23:09.000000000 +0800
--- openGauss-server-2.1.0-edit/src/bin/pg_basebackup/pg_basebackup.cpp 2023-08-14 10:19:02.650301090 +0800
***************
*** 1584,1590 ****
struct dirent* ent;
while (1) {
ent = readdir(dir);
! if (ent <= 0) {
break;
}
if ((strcmp(".", ent->d_name) == 0) || (strcmp("..", ent->d_name) == 0)) {
--- 1584,1590 ----
struct dirent* ent;
while (1) {
ent = readdir(dir);
! if (ent == NULL) {
break;
}
if ((strcmp(".", ent->d_name) == 0) || (strcmp("..", ent->d_name) == 0)) {
diff -crN '--exclude=.git' '--exclude=.gitee' openGauss-server-2.1.0/src/gausskernel/runtime/opfusion/opfusion_util.cpp openGauss-server-2.1.0-edit/src/gausskernel/runtime/opfusion/opfusion_util.cpp
*** openGauss-server-2.1.0/src/gausskernel/runtime/opfusion/opfusion_util.cpp 2021-12-13 16:23:09.000000000 +0800
--- openGauss-server-2.1.0-edit/src/gausskernel/runtime/opfusion/opfusion_util.cpp 2023-08-14 10:18:07.476105895 +0800
***************
*** 405,411 ****
/* check whether to have order by */
if (node->aggstrategy != AGG_PLAIN ||
! node->groupingSets > 0) {
return NOBYPASS_NOT_PLAIN_AGG;
}
--- 405,411 ----
/* check whether to have order by */
if (node->aggstrategy != AGG_PLAIN ||
! node->groupingSets != NIL) {
return NOBYPASS_NOT_PLAIN_AGG;
}

7
opengauss-server.spec
View File

@ -12,7 +12,7 @@
Name: opengauss
Version: 2.1.0
Release: 4
Release: 5
Summary: openGauss is an open source relational database management system
License: MulanPSL-2.0 and MIT and BSD and zlib and TCL and Apache-2.0 and BSL-1.0
URL: https://gitee.com/opengauss/openGauss-server
@ -33,6 +33,7 @@ Patch22: 0003-zlib.patch
Patch23: makefile-miniunz.patch
Patch40: 0001-orc.patch
Patch50: openssl3-adptor.patch
Patch51: compile_2309.patch
BuildRequires: cmake gcc gcc-c++ openssl-devel python
BuildRequires: cjson lz4-devel protobuf-devel snappy-devel zstd-devel boost-devel
@ -70,6 +71,7 @@ openGauss kernel : openGauss is an open source relational database management sy
pushd openGauss-server-%{version}
%patch0 -p1
%patch50 -p1
%patch51 -p1
popd
pushd %{cjson_name}-%{cjson_version}
@ -290,6 +292,9 @@ fi
%changelog
* Mon Aug 14 2023 zhangxubo <zhangxubo1@huawei.com> - 2.1.0-5
- Fix bugs: #I7QJRO
* Sat Feb 11 2023 zhangxubo <zhangxubo1@huawei.com> - 2.1.0-4
- Fix bugs: #I6ED94