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 ae94b074f44 Fix aggrel errors
ae94b074f44 is described below
commit ae94b074f44ec39e99bd766866eb9699eef9bf36
Author: Jinbao Chen <[email protected]>
AuthorDate: Tue Nov 11 20:42:55 2025 +0800
Fix aggrel errors
---
src/backend/nodes/copyfuncs.c | 1 +
src/backend/nodes/equalfuncs.c | 1 +
src/backend/nodes/outfuncs.c | 1 +
src/backend/nodes/readfuncs.c | 1 +
src/backend/optimizer/plan/planner.c | 18 +++++++++---------
src/backend/storage/smgr/smgr.c | 2 +-
src/test/regress/expected/vacuum.out | 4 ----
src/test/regress/serial_schedule | 8 ++++----
8 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/src/backend/nodes/copyfuncs.c b/src/backend/nodes/copyfuncs.c
index 42bd51612a1..b287dcf8a9d 100644
--- a/src/backend/nodes/copyfuncs.c
+++ b/src/backend/nodes/copyfuncs.c
@@ -1966,6 +1966,7 @@ _copyVar(const Var *from)
COPY_SCALAR_FIELD(vartype);
COPY_SCALAR_FIELD(vartypmod);
COPY_SCALAR_FIELD(varcollid);
+ COPY_BITMAPSET_FIELD(varnullingrels);
COPY_SCALAR_FIELD(varlevelsup);
COPY_SCALAR_FIELD(varnosyn);
COPY_SCALAR_FIELD(varattnosyn);
diff --git a/src/backend/nodes/equalfuncs.c b/src/backend/nodes/equalfuncs.c
index 3891910d80f..5e33e2cbf49 100644
--- a/src/backend/nodes/equalfuncs.c
+++ b/src/backend/nodes/equalfuncs.c
@@ -196,6 +196,7 @@ _equalVar(const Var *a, const Var *b)
COMPARE_SCALAR_FIELD(vartypmod);
COMPARE_SCALAR_FIELD(varcollid);
COMPARE_SCALAR_FIELD(varlevelsup);
+ COMPARE_BITMAPSET_FIELD(varnullingrels);
/*
* varnosyn/varattnosyn are intentionally ignored here, because Vars
with
diff --git a/src/backend/nodes/outfuncs.c b/src/backend/nodes/outfuncs.c
index 5c6a2f34c77..0afcfdcf28c 100644
--- a/src/backend/nodes/outfuncs.c
+++ b/src/backend/nodes/outfuncs.c
@@ -1375,6 +1375,7 @@ _outVar(StringInfo str, const Var *node)
WRITE_OID_FIELD(vartype);
WRITE_INT_FIELD(vartypmod);
WRITE_OID_FIELD(varcollid);
+ WRITE_BITMAPSET_FIELD(varnullingrels);
WRITE_UINT_FIELD(varlevelsup);
WRITE_UINT_FIELD(varnosyn);
WRITE_INT_FIELD(varattnosyn);
diff --git a/src/backend/nodes/readfuncs.c b/src/backend/nodes/readfuncs.c
index ff083abaa42..75e952d53b4 100644
--- a/src/backend/nodes/readfuncs.c
+++ b/src/backend/nodes/readfuncs.c
@@ -590,6 +590,7 @@ _readVar(void)
READ_OID_FIELD(vartype);
READ_INT_FIELD(vartypmod);
READ_OID_FIELD(varcollid);
+ READ_BITMAPSET_FIELD(varnullingrels);
READ_UINT_FIELD(varlevelsup);
READ_UINT_FIELD(varnosyn);
READ_INT_FIELD(varattnosyn);
diff --git a/src/backend/optimizer/plan/planner.c
b/src/backend/optimizer/plan/planner.c
index 1d39d4bc166..524bb08bdc8 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -6013,7 +6013,7 @@ create_final_distinct_paths(PlannerInfo *root, RelOptInfo
*input_rel,
AGG_HASHED,
AGGSPLIT_SIMPLE,
false,
/* streaming */
-
parse->distinctClause,
+
root->processed_distinctClause,
NIL,
NULL,
numDistinctRows),
@@ -8194,7 +8194,7 @@ add_paths_to_grouping_rel(PlannerInfo *root, RelOptInfo
*input_rel,
parse->groupClause ? AGG_SORTED : AGG_PLAIN,
AGGSPLIT_SIMPLE,
false, /* streaming */
-
parse->groupClause,
+
root->processed_groupClause,
havingQual,
agg_costs,
dNumGroups));
@@ -8354,7 +8354,7 @@ add_paths_to_grouping_rel(PlannerInfo *root, RelOptInfo
*input_rel,
AGG_HASHED,
AGGSPLIT_SIMPLE,
false,
-
parse->groupClause,
+
root->processed_groupClause,
havingQual,
agg_costs,
dNumGroups),
@@ -8402,7 +8402,7 @@ add_paths_to_grouping_rel(PlannerInfo *root, RelOptInfo
*input_rel,
AGG_HASHED,
AGGSPLIT_SIMPLE,
false,
-
parse->groupClause,
+
root->processed_groupClause,
havingQual,
agg_costs,
dNumGroups));
@@ -8459,7 +8459,7 @@ add_paths_to_grouping_rel(PlannerInfo *root, RelOptInfo
*input_rel,
AGG_HASHED,
AGGSPLIT_FINAL_DESERIAL,
false,
-
parse->groupClause,
+
root->processed_groupClause,
havingQual,
agg_final_costs,
dNumGroups),
@@ -8796,7 +8796,7 @@ create_partial_grouping_paths(PlannerInfo *root,
parse->groupClause ? AGG_SORTED : AGG_PLAIN,
AGGSPLIT_INITIAL_SERIAL,
false,
-
parse->groupClause,
+
root->processed_groupClause,
NIL,
agg_partial_costs,
dNumPartialGroups),
@@ -8890,7 +8890,7 @@ create_partial_grouping_paths(PlannerInfo *root,
parse->groupClause ? AGG_SORTED : AGG_PLAIN,
AGGSPLIT_INITIAL_SERIAL,
false,
-
parse->groupClause,
+
root->processed_groupClause,
NIL,
agg_partial_costs,
dNumPartialPartialGroups));
@@ -8992,7 +8992,7 @@ create_partial_grouping_paths(PlannerInfo *root,
AGG_HASHED,
AGGSPLIT_INITIAL_SERIAL,
false,
-
parse->groupClause,
+
root->processed_groupClause,
NIL,
agg_partial_costs,
dNumPartialGroups),
@@ -9025,7 +9025,7 @@ create_partial_grouping_paths(PlannerInfo *root,
AGG_HASHED,
AGGSPLIT_INITIAL_SERIAL,
false,
-
parse->groupClause,
+
root->processed_groupClause,
NIL,
agg_partial_costs,
dNumPartialPartialGroups));
diff --git a/src/backend/storage/smgr/smgr.c b/src/backend/storage/smgr/smgr.c
index 091f8ce3d19..2b9cef04687 100644
--- a/src/backend/storage/smgr/smgr.c
+++ b/src/backend/storage/smgr/smgr.c
@@ -872,7 +872,7 @@ smgrtruncate2(SMgrRelation reln, ForkNumber *forknum, int
nforks,
/* Make the cached size is invalid if we encounter an error. */
reln->smgr_cached_nblocks[forknum[i]] = InvalidBlockNumber;
- (*reln->smgr).smgr_truncate(reln, forknum[i], *old_nblocks,
nblocks[i]);
+ (*reln->smgr).smgr_truncate(reln, forknum[i], old_nblocks[i],
nblocks[i]);
/*
* We might as well update the local smgr_cached_nblocks
values. The
diff --git a/src/test/regress/expected/vacuum.out
b/src/test/regress/expected/vacuum.out
index d61be0b371a..7e5efcb95bf 100644
--- a/src/test/regress/expected/vacuum.out
+++ b/src/test/regress/expected/vacuum.out
@@ -249,11 +249,7 @@ VACUUM (FREEZE) vacparted;
VACUUM ANALYZE vacparted(a,b,a);
ERROR: column "a" of relation "vacparted1" appears more than once
ANALYZE vacparted(a,b,b);
-<<<<<<< HEAD
ERROR: column "b" of relation "vacparted1" appears more than once
-=======
-ERROR: column "b" of relation "vacparted" appears more than once
->>>>>>> REL_16_9
-- partitioned table with index
CREATE TABLE vacparted_i (a int primary key, b varchar(100))
PARTITION BY HASH (a);
diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule
index 68d50d4fb10..44a9ad50c4e 100644
--- a/src/test/regress/serial_schedule
+++ b/src/test/regress/serial_schedule
@@ -74,10 +74,10 @@ test: constraints
test: triggers
test: select
test: inherit
-# test: typed_table
-# test: vacuum
-# test: drop_if_exists
-# test: updatable_views
+test: typed_table
+test: vacuum
+test: drop_if_exists
+test: updatable_views
# test: roleattributes
# test: create_am
# test: hash_func
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
