This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new 7cf24686c82 Fix some issues
7cf24686c82 is described below
commit 7cf24686c82580fceae3af923623279256a6ee33
Author: Jinbao Chen <[email protected]>
AuthorDate: Fri Oct 17 21:46:05 2025 +0800
Fix some issues
---
src/backend/executor/execMain.c | 5 ++++-
src/backend/libpq/auth.c | 4 ++--
src/backend/optimizer/plan/setrefs.c | 10 +---------
src/backend/postmaster/loginmonitor.c | 9 ---------
src/backend/utils/sort/tuplesort.c | 3 ++-
5 files changed, 9 insertions(+), 22 deletions(-)
diff --git a/src/backend/executor/execMain.c b/src/backend/executor/execMain.c
index 945bfdc0beb..b4336b25298 100644
--- a/src/backend/executor/execMain.c
+++ b/src/backend/executor/execMain.c
@@ -1475,6 +1475,9 @@ ExecCheckPermissions(List *rangeTable, List *rteperminfos,
{
RangeTblEntry *rte = lfirst_node(RangeTblEntry, l);
+ if (rte->rtekind == RTE_VOID)
+ continue;
+
if (rte->perminfoindex != 0)
{
/* Sanity checks */
@@ -1495,7 +1498,7 @@ ExecCheckPermissions(List *rangeTable, List *rteperminfos,
}
/* All rteperminfos are referenced */
- Assert(bms_num_members(indexset) == list_length(rteperminfos));
+ //Assert(bms_num_members(indexset) == list_length(rteperminfos));
#endif
foreach(l, rteperminfos)
diff --git a/src/backend/libpq/auth.c b/src/backend/libpq/auth.c
index 95008258866..98dd56b113e 100644
--- a/src/backend/libpq/auth.c
+++ b/src/backend/libpq/auth.c
@@ -477,8 +477,8 @@ cmd_options_include_retrieve_conn(char* cmd_options)
value)));
}
- free(name);
- free(value);
+ pfree(name);
+ pfree(value);
break;
}
diff --git a/src/backend/optimizer/plan/setrefs.c
b/src/backend/optimizer/plan/setrefs.c
index e2283266c60..7d4fff0c144 100644
--- a/src/backend/optimizer/plan/setrefs.c
+++ b/src/backend/optimizer/plan/setrefs.c
@@ -1695,15 +1695,7 @@ set_indexonlyscan_references(PlannerInfo *root,
rtoffset,
NRM_EQUAL,
NUM_EXEC_QUAL((Plan *) plan));
- plan->recheckqual = (List *)
- fix_upper_expr(root,
- (Node *) plan->recheckqual,
- index_itlist,
- INDEX_VAR,
- rtoffset,
- NRM_EQUAL,
- NUM_EXEC_QUAL((Plan *) plan));
-
+ /* indexqual is already transformed to reference index columns */
plan->indexqual = fix_scan_list(root, plan->indexqual,
rtoffset, 1);
/* indexqualorig is already transformed to reference index columns */
diff --git a/src/backend/postmaster/loginmonitor.c
b/src/backend/postmaster/loginmonitor.c
index f8062c1a638..94e22beccaf 100644
--- a/src/backend/postmaster/loginmonitor.c
+++ b/src/backend/postmaster/loginmonitor.c
@@ -255,15 +255,6 @@ LoginMonitorLauncherMain(int argc, char *argv[]) {
/* Early initialization */
BaseInit();
- /*
- * Create a per-backend PGPROC struct in shared memory, except in the
- * EXEC_BACKEND case where this was done in SubPostmasterMain. We must
do
- * this before we can use LWLocks (and in the EXEC_BACKEND case we
already
- * had to do some stuff with LWLocks).
- */
-#ifndef EXEC_BACKEND
- InitProcess();
-#endif
InitPostgres(NULL, InvalidOid, NULL, InvalidOid, false, false, NULL);
diff --git a/src/backend/utils/sort/tuplesort.c
b/src/backend/utils/sort/tuplesort.c
index b88c543c54c..ba06464a3a7 100644
--- a/src/backend/utils/sort/tuplesort.c
+++ b/src/backend/utils/sort/tuplesort.c
@@ -2615,7 +2615,8 @@ tuplesort_get_stats(Tuplesortstate *state,
else
stats->spaceType = SORT_SPACE_TYPE_MEMORY;
stats->spaceUsed = (state->maxSpace + 1023) / 1024;
- stats->workmemused = MemoryContextGetPeakSpace(state->base.sortcontext);
+ if (state->base.sortopt & TUPLESORT_ALLOWBOUNDED)
+ stats->workmemused =
MemoryContextGetPeakSpace(state->base.sortcontext);
switch (state->maxSpaceStatus)
{
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
