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 6eb742fefa3 Fix pg_lsn
6eb742fefa3 is described below
commit 6eb742fefa3c73c9dc022a24bf618986fbaeff71
Author: Jinbao Chen <[email protected]>
AuthorDate: Sat Nov 1 14:25:58 2025 +0800
Fix pg_lsn
---
src/backend/optimizer/plan/planner.c | 2 +-
src/test/regress/expected/rangetypes.out | 10 ----------
src/test/regress/serial_schedule | 8 ++++----
src/test/regress/sql/rangetypes.sql | 11 -----------
4 files changed, 5 insertions(+), 26 deletions(-)
diff --git a/src/backend/optimizer/plan/planner.c
b/src/backend/optimizer/plan/planner.c
index 356d994d5f8..94631be52b3 100644
--- a/src/backend/optimizer/plan/planner.c
+++ b/src/backend/optimizer/plan/planner.c
@@ -5884,7 +5884,7 @@ create_final_distinct_paths(PlannerInfo *root, RelOptInfo
*input_rel,
true, /* is_sorted */
0, /* presorted_keys */
distinct_rel,
-
path, path->pathtarget,
+
input_path, input_path->pathtarget,
needed_pathkeys,
-1.0,
parse->distinctClause,
diff --git a/src/test/regress/expected/rangetypes.out
b/src/test/regress/expected/rangetypes.out
index 3306a5033f5..0833e0da736 100644
--- a/src/test/regress/expected/rangetypes.out
+++ b/src/test/regress/expected/rangetypes.out
@@ -1,14 +1,4 @@
-- Tests for range data types.
-<<<<<<< HEAD
--- start_matchsubs
--- m/NOTICE: One or more columns in the following table\(s\) do not have
statistics: /
--- s/.//gs
--- m/HINT: For non-partitioned tables, run analyze .+\. For partitioned
tables, run analyze rootpartition .+\. See log for columns missing statistics\./
--- s/.//gs
--- end_matchsubs
-create type textrange as range (subtype=text, collation="C");
-=======
->>>>>>> REL_16_9
--
-- test input parser
-- (type textrange was already made in test_setup.sql)
diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule
index 68d824bc119..4a084b06710 100644
--- a/src/test/regress/serial_schedule
+++ b/src/test/regress/serial_schedule
@@ -20,10 +20,10 @@ test: txid
test: uuid
test: enum
test: money
-# test: rangetypes
-# test: multirangetypes
-# test: pg_lsn
-# test: regproc
+test: rangetypes
+test: multirangetypes
+test: pg_lsn
+test: regproc
# test: create_function_0
# test: strings
# test: numerology
diff --git a/src/test/regress/sql/rangetypes.sql
b/src/test/regress/sql/rangetypes.sql
index 6124fa0eae8..2fc7dcea7e4 100644
--- a/src/test/regress/sql/rangetypes.sql
+++ b/src/test/regress/sql/rangetypes.sql
@@ -1,16 +1,5 @@
-- Tests for range data types.
-<<<<<<< HEAD
--- start_matchsubs
--- m/NOTICE: One or more columns in the following table\(s\) do not have
statistics: /
--- s/.//gs
--- m/HINT: For non-partitioned tables, run analyze .+\. For partitioned
tables, run analyze rootpartition .+\. See log for columns missing statistics\./
--- s/.//gs
--- end_matchsubs
-create type textrange as range (subtype=text, collation="C");
-
-=======
->>>>>>> REL_16_9
--
-- test input parser
-- (type textrange was already made in test_setup.sql)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
