40 lines
1.7 KiB
Diff
40 lines
1.7 KiB
Diff
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' openGauss-server-5.0.1/src/bin/pg_basebackup/pg_basebackup.cpp openGauss-server-5.0.1-edit/src/bin/pg_basebackup/pg_basebackup.cpp
|
|
*** openGauss-server-5.0.1/src/bin/pg_basebackup/pg_basebackup.cpp 2024-05-07 20:16:39.176795495 +0800
|
|
--- openGauss-server-5.0.1-edit/src/bin/pg_basebackup/pg_basebackup.cpp 2024-05-07 20:17:58.441380003 +0800
|
|
***************
|
|
*** 1622,1628 ****
|
|
struct dirent* ent;
|
|
while (1) {
|
|
ent = readdir(dir);
|
|
! if (ent <= 0) {
|
|
break;
|
|
}
|
|
if ((strcmp(".", ent->d_name) == 0) || (strcmp("..", ent->d_name) == 0)) {
|
|
--- 1622,1628 ----
|
|
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' '--exclude=.vscode' openGauss-server-5.0.1/src/gausskernel/runtime/opfusion/opfusion_util.cpp openGauss-server-5.0.1-edit/src/gausskernel/runtime/opfusion/opfusion_util.cpp
|
|
*** openGauss-server-5.0.1/src/gausskernel/runtime/opfusion/opfusion_util.cpp 2024-05-07 20:16:39.780799949 +0800
|
|
--- openGauss-server-5.0.1-edit/src/gausskernel/runtime/opfusion/opfusion_util.cpp 2024-05-07 20:17:59.041384427 +0800
|
|
***************
|
|
*** 424,430 ****
|
|
|
|
/* check whether to have order by */
|
|
if (node->aggstrategy != AGG_PLAIN ||
|
|
! node->groupingSets > 0) {
|
|
return NOBYPASS_NOT_PLAIN_AGG;
|
|
}
|
|
|
|
--- 424,430 ----
|
|
|
|
/* check whether to have order by */
|
|
if (node->aggstrategy != AGG_PLAIN ||
|
|
! node->groupingSets != NIL) {
|
|
return NOBYPASS_NOT_PLAIN_AGG;
|
|
}
|