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 89994c21315 Fix answer file for create_index
89994c21315 is described below

commit 89994c213154d830e5a1fd62d8a3069c1b1a31f3
Author: Jinbao Chen <[email protected]>
AuthorDate: Fri Nov 7 22:28:52 2025 +0800

    Fix answer file for create_index
---
 src/backend/executor/spi.c                 | 10 +++++-----
 src/test/regress/expected/create_index.out |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/backend/executor/spi.c b/src/backend/executor/spi.c
index 3e8e2154840..19eae27ab38 100644
--- a/src/backend/executor/spi.c
+++ b/src/backend/executor/spi.c
@@ -2576,18 +2576,18 @@ _SPI_execute_plan(SPIPlanPtr plan, const 
SPIExecuteOptions *options,
                {
                        RawStmt    *parsetree = plansource->raw_parse_tree;
                        const char *src = plansource->query_string;
-                       List       *querytree_list;
+                       List       *stmt_list;
 
                        /*
                         * Parameter datatypes are driven by parserSetup hook 
if provided,
                         * otherwise we use the fixed parameter list.
                         */
                        if (parsetree == NULL)
-                               querytree_list = NIL;
+                               stmt_list = NIL;
                        else if (plan->parserSetup != NULL)
                        {
                                Assert(plan->nargs == 0);
-                               querytree_list = 
pg_analyze_and_rewrite_withcb(parsetree,
+                               stmt_list = 
pg_analyze_and_rewrite_withcb(parsetree,
                                                                                
                                           src,
                                                                                
                                           plan->parserSetup,
                                                                                
                                           plan->parserSetupArg,
@@ -2595,7 +2595,7 @@ _SPI_execute_plan(SPIPlanPtr plan, const 
SPIExecuteOptions *options,
                        }
                        else
                        {
-                               querytree_list = 
pg_analyze_and_rewrite_fixedparams(parsetree,
+                               stmt_list = 
pg_analyze_and_rewrite_fixedparams(parsetree,
                                                                                
                                                        src,
                                                                                
                                                        plan->argtypes,
                                                                                
                                                        plan->nargs,
@@ -2617,7 +2617,7 @@ _SPI_execute_plan(SPIPlanPtr plan, const 
SPIExecuteOptions *options,
 
                        /* Finish filling in the CachedPlanSource */
                        CompleteCachedPlan(plansource,
-                                                          querytree_list,
+                                                          stmt_list,
                                                           NULL,
                                                           
nodeTag(parsetree->stmt),
                                                           plan->argtypes,
diff --git a/src/test/regress/expected/create_index.out 
b/src/test/regress/expected/create_index.out
index 78771f3e715..26231701308 100644
--- a/src/test/regress/expected/create_index.out
+++ b/src/test/regress/expected/create_index.out
@@ -171,6 +171,7 @@ SELECT count(*) FROM point_tbl p WHERE p.f1 ~= '(-5, -12)';
 CREATE VIEW point_tblv AS
   SELECT * FROM point_tbl
   WHERE NOT f1 ~= '(1e-300, -1e-300)' AND (f1 <-> '(0,0)') != 'inf';
+NOTICE:  view "point_tblv" will be a temporary view
 -- In gpdb, we intentional filter out point (1e-300, -1e-300) and `inf` every 
order by related queries
 -- in this test case file. It is an underflow point, rank it cause randomly 
results( (0,0),
 -- (1e-300, -1e-300) are equal).
@@ -1356,7 +1357,7 @@ unique, btree, for table "public.unique_tbl"
  Column |  Type   | Key? | Definition 
 --------+---------+------+------------
  i      | integer | yes  | i
-unique nulls not distinct, btree, for table "public.unique_tbl"
+unique, btree, for table "public.unique_tbl"
 
 SELECT pg_get_indexdef('unique_idx3'::regclass);
                            pg_get_indexdef                            


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to