diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' opengauss_server_600/src/bin/pg_basebackup/pg_basebackup.cpp opengauss_server_600_edit/src/bin/pg_basebackup/pg_basebackup.cpp
*** opengauss_server_600/src/bin/pg_basebackup/pg_basebackup.cpp	2024-11-19 20:01:27.697621300 +0800
--- opengauss_server_600_edit/src/bin/pg_basebackup/pg_basebackup.cpp	2024-11-19 20:04:07.105621300 +0800
***************
*** 1689,1695 ****
      struct dirent* ent;
      while (1) {
          ent = readdir(dir);
!         if (ent <= 0) {
              break;
          }
          if ((strcmp(".", ent->d_name) == 0) || (strcmp("..", ent->d_name) == 0)) {
--- 1689,1695 ----
      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_600/src/bin/pg_ctl/backup.cpp opengauss_server_600_edit/src/bin/pg_ctl/backup.cpp
*** opengauss_server_600/src/bin/pg_ctl/backup.cpp	2024-11-19 20:01:27.697621300 +0800
--- opengauss_server_600_edit/src/bin/pg_ctl/backup.cpp	2024-11-19 20:04:07.109621300 +0800
***************
*** 1985,1991 ****
          }
          while (1) {
              de = readdir(dir);
!             if (de <= 0) {
                  break;
              }
              if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0) {
--- 1985,1991 ----
          }
          while (1) {
              de = readdir(dir);
!             if (de == NULL) {
                  break;
              }
              if (strcmp(de->d_name, ".") == 0 || strcmp(de->d_name, "..") == 0) {
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' opengauss_server_600/src/gausskernel/runtime/opfusion/opfusion_util.cpp opengauss_server_600_edit/src/gausskernel/runtime/opfusion/opfusion_util.cpp
*** opengauss_server_600/src/gausskernel/runtime/opfusion/opfusion_util.cpp	2024-11-19 20:01:27.705621300 +0800
--- opengauss_server_600_edit/src/gausskernel/runtime/opfusion/opfusion_util.cpp	2024-11-19 20:04:07.757621300 +0800
***************
*** 446,452 ****
  
      /* check whether to have order by */
      if (node->aggstrategy != AGG_PLAIN ||
!             node->groupingSets > 0) {
          return NOBYPASS_NOT_PLAIN_AGG;
      }
  
--- 446,452 ----
  
      /* check whether to have order by */
      if (node->aggstrategy != AGG_PLAIN ||
!             node->groupingSets != NULL) {
          return NOBYPASS_NOT_PLAIN_AGG;
      }
  
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' opengauss_server_600/src/include/gs_policy/policy_common.h opengauss_server_600_edit/src/include/gs_policy/policy_common.h
*** opengauss_server_600/src/include/gs_policy/policy_common.h	2024-11-19 20:01:27.721621300 +0800
--- opengauss_server_600_edit/src/include/gs_policy/policy_common.h	2024-11-19 20:04:08.029621300 +0800
***************
*** 30,35 ****
--- 30,37 ----
  #include "gs_map.h"
  #include "gs_vector.h"
  #include "pgaudit.h"
+ #include <vector>
+ #include <string>
  
  struct GsPolicyFQDN {
      GsPolicyFQDN():m_value_schema(0), m_value_object(0), is_function(false){}
diff -crN '--exclude=.git' '--exclude=.gitee' '--exclude=.vscode' openGauss-server-600/src/gausskernel/storage/access/nbtree/nbtree.cpp openGauss-server-600-edit/src/gausskernel/storage/access/nbtree/nbtree.cpp
*** openGauss-server-600/src/gausskernel/storage/access/nbtree/nbtree.cpp       2024-12-12 11:20:52.332744190 +0800
--- openGauss-server-600-edit/src/gausskernel/storage/access/nbtree/nbtree.cpp  2024-12-12 11:20:18.144744190 +0800
***************
*** 1108,1114 ****
               * that.
               */
              Assert(num_dead_heap_tids >= Max(num_deletable, 1));
!             Assert(num_deletable > 0 || updatable > 0);
              _bt_delitems_vacuum(rel, buf, deletable, num_deletable, updatable, num_updatable,
                                  vstate->lastBlockVacuumed);

--- 1108,1114 ----
               * that.
               */
              Assert(num_dead_heap_tids >= Max(num_deletable, 1));
!             Assert(num_deletable != NULL || updatable != NULL);
              _bt_delitems_vacuum(rel, buf, deletable, num_deletable, updatable, num_updatable,
                                  vstate->lastBlockVacuumed);