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 1c6bdd4a3cf Fix errors for cluster
1c6bdd4a3cf is described below
commit 1c6bdd4a3cfde0dde8476aefd7b985173f6c3140
Author: Jinbao Chen <[email protected]>
AuthorDate: Fri Nov 28 22:03:34 2025 +0800
Fix errors for cluster
---
src/backend/commands/cluster.c | 7 ++++---
src/backend/optimizer/path/allpaths.c | 2 +-
src/test/regress/expected/cluster.out | 10 +---------
3 files changed, 6 insertions(+), 13 deletions(-)
diff --git a/src/backend/commands/cluster.c b/src/backend/commands/cluster.c
index 8de0a0fa880..a2542bf4e22 100644
--- a/src/backend/commands/cluster.c
+++ b/src/backend/commands/cluster.c
@@ -333,9 +333,10 @@ cluster_multiple_rels(ClusterStmt *stmt, List *rtcs,
ClusterParams *params, Rang
if (Gp_role == GP_ROLE_DISPATCH && dispatch)
{
- relation = makeNode(RangeVar);
- relation->schemaname =
get_namespace_name(get_rel_namespace(rtc->tableOid));
- relation->relname = get_rel_name(rtc->tableOid);
+ stmt->relation = makeNode(RangeVar);
+ stmt->relation->schemaname =
get_namespace_name(get_rel_namespace(rtc->tableOid));
+ stmt->relation->relname = get_rel_name(rtc->tableOid);
+ stmt->indexname = get_rel_name(rtc->indexOid);
/* other fields in stmt are same */
CdbDispatchUtilityStatement((Node *) stmt,
DF_CANCEL_ON_ERROR|
diff --git a/src/backend/optimizer/path/allpaths.c
b/src/backend/optimizer/path/allpaths.c
index 68e6506df19..1e17a32208d 100644
--- a/src/backend/optimizer/path/allpaths.c
+++ b/src/backend/optimizer/path/allpaths.c
@@ -4407,7 +4407,7 @@ push_down_restrict(PlannerInfo *root, RelOptInfo *rel,
Node *clause = (Node *) rinfo->clause;
if (!rinfo->pseudoconstant &&
- qual_is_pushdown_safe(subquery, rti, rinfo,
&safetyInfo))
+ qual_is_pushdown_safe(subquery, rti, rinfo,
&safetyInfo) == PUSHDOWN_SAFE)
{
/* Push it down */
subquery_push_qual(subquery, rte, rti, clause);
diff --git a/src/test/regress/expected/cluster.out
b/src/test/regress/expected/cluster.out
index d9c2765eff4..7fded11f1c0 100644
--- a/src/test/regress/expected/cluster.out
+++ b/src/test/regress/expected/cluster.out
@@ -515,7 +515,7 @@ SELECT a.relname, a.relfilenode=b.relfilenode FROM pg_class
a
-----------+----------
ptnowner | t
ptnowner1 | f
- ptnowner2 | t
+ ptnowner2 | f
(3 rows)
DROP TABLE ptnowner;
@@ -591,11 +591,7 @@ COMMIT;
-- and after clustering on clstr_expression_minus_a
CLUSTER clstr_expression USING clstr_expression_minus_a;
WITH rows AS
-<<<<<<< HEAD
(SELECT ctid, lag(a) OVER (PARTITION BY gp_segment_id ORDER BY ctid) AS la,
a FROM clstr_expression)
-=======
- (SELECT ctid, lag(a) OVER (ORDER BY ctid) AS la, a FROM clstr_expression)
->>>>>>> REL_16_9
SELECT * FROM rows WHERE la < a;
ctid | la | a
------+----+---
@@ -641,11 +637,7 @@ COMMIT;
-- and after clustering on clstr_expression_upper_b
CLUSTER clstr_expression USING clstr_expression_upper_b;
WITH rows AS
-<<<<<<< HEAD
(SELECT ctid, lag(b) OVER (PARTITION BY gp_segment_id ORDER BY ctid) AS lb,
b FROM clstr_expression)
-=======
- (SELECT ctid, lag(b) OVER (ORDER BY ctid) AS lb, b FROM clstr_expression)
->>>>>>> REL_16_9
SELECT * FROM rows WHERE upper(lb) > upper(b);
ctid | lb | b
------+----+---
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
