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 719e9e4201c Fix some answer files
719e9e4201c is described below
commit 719e9e4201cfdd967cc4c7a46c4839d8fe6e0ae0
Author: Jinbao Chen <[email protected]>
AuthorDate: Wed Nov 26 20:36:00 2025 +0800
Fix some answer files
---
src/test/regress/expected/join_hash.out | 10 +--
src/test/regress/expected/misc.out | 136 ++++++--------------------------
src/test/regress/expected/sysviews.out | 14 +---
src/test/regress/serial_schedule | 4 +-
4 files changed, 33 insertions(+), 131 deletions(-)
diff --git a/src/test/regress/expected/join_hash.out
b/src/test/regress/expected/join_hash.out
index 515df467c3e..ff942a2058d 100644
--- a/src/test/regress/expected/join_hash.out
+++ b/src/test/regress/expected/join_hash.out
@@ -325,7 +325,7 @@ $$);
select count(*) from simple r full outer join simple s using (id);
count
-------
- 20000
+ 60000
(1 row)
rollback to settings;
@@ -887,7 +887,7 @@ explain (costs off)
select count(*) from simple r full outer join simple s using (id);
count
-------
- 20000
+ 60000
(1 row)
rollback to settings;
@@ -968,9 +968,9 @@ explain (costs off)
(11 rows)
select count(*) from simple r full outer join simple s on (r.id = 0 - s.id);
- count
--------
- 40000
+ count
+--------
+ 120000
(1 row)
rollback to settings;
diff --git a/src/test/regress/expected/misc.out
b/src/test/regress/expected/misc.out
index 6e816c57f1f..f13b19b4ce4 100644
--- a/src/test/regress/expected/misc.out
+++ b/src/test/regress/expected/misc.out
@@ -163,123 +163,55 @@ CREATE FUNCTION equipment_named_ambiguous_2b(hobby text)
-- everyone else does nothing.
--
SELECT p.name, name(p.hobbies) FROM ONLY person p;
- name | name
--------+-------------
- mike | posthacking
- joe | basketball
- sally | basketball
-(3 rows)
-
+ERROR: function cannot execute on a QE slice because it accesses relation
"public.hobbies_r"
+CONTEXT: SQL function "hobbies" during startup
--
-- as above, but jeff also does post_hacking.
--
SELECT p.name, name(p.hobbies) FROM person* p;
- name | name
--------+-------------
- mike | posthacking
- joe | basketball
- sally | basketball
- jeff | posthacking
-(4 rows)
-
+ERROR: function cannot execute on a QE slice because it accesses relation
"public.hobbies_r"
+CONTEXT: SQL function "hobbies" during startup
--
-- the next two queries demonstrate how functions generate bogus duplicates.
-- this is a "feature" ..
--
SELECT DISTINCT hobbies_r.name, name(hobbies_r.equipment) FROM hobbies_r
ORDER BY 1,2;
- name | name
--------------+---------------
- basketball | hightops
- posthacking | advil
- posthacking | peet's coffee
- skywalking | guts
-(4 rows)
-
+ERROR: function cannot execute on a QE slice because it accesses relation
"public.equipment_r"
+CONTEXT: SQL function "equipment" during startup
SELECT hobbies_r.name, (hobbies_r.equipment).name FROM hobbies_r;
- name | name
--------------+---------------
- posthacking | advil
- posthacking | peet's coffee
- posthacking | advil
- posthacking | peet's coffee
- basketball | hightops
- basketball | hightops
- skywalking | guts
-(7 rows)
-
+ERROR: function cannot execute on a QE slice because it accesses relation
"public.equipment_r"
+CONTEXT: SQL function "equipment" during startup
--
-- mike needs advil and peet's coffee,
-- joe and sally need hightops, and
-- everyone else is fine.
--
SELECT p.name, name(p.hobbies), name(equipment(p.hobbies)) FROM ONLY person p;
- name | name | name
--------+-------------+---------------
- mike | posthacking | advil
- mike | posthacking | peet's coffee
- joe | basketball | hightops
- sally | basketball | hightops
-(4 rows)
-
+ERROR: function cannot execute on a QE slice because it accesses relation
"public.hobbies_r"
+CONTEXT: SQL function "hobbies" during startup
--
-- as above, but jeff needs advil and peet's coffee as well.
--
SELECT p.name, name(p.hobbies), name(equipment(p.hobbies)) FROM person* p;
- name | name | name
--------+-------------+---------------
- mike | posthacking | advil
- mike | posthacking | peet's coffee
- joe | basketball | hightops
- sally | basketball | hightops
- jeff | posthacking | advil
- jeff | posthacking | peet's coffee
-(6 rows)
-
+ERROR: function cannot execute on a QE slice because it accesses relation
"public.hobbies_r"
+CONTEXT: SQL function "hobbies" during startup
--
-- just like the last two, but make sure that the target list fixup and
-- unflattening is being done correctly.
--
SELECT name(equipment(p.hobbies)), p.name, name(p.hobbies) FROM ONLY person p;
- name | name | name
----------------+-------+-------------
- advil | mike | posthacking
- peet's coffee | mike | posthacking
- hightops | joe | basketball
- hightops | sally | basketball
-(4 rows)
-
+ERROR: function cannot execute on a QE slice because it accesses relation
"public.hobbies_r"
+CONTEXT: SQL function "hobbies" during startup
SELECT (p.hobbies).equipment.name, p.name, name(p.hobbies) FROM person* p;
- name | name | name
----------------+-------+-------------
- advil | mike | posthacking
- peet's coffee | mike | posthacking
- hightops | joe | basketball
- hightops | sally | basketball
- advil | jeff | posthacking
- peet's coffee | jeff | posthacking
-(6 rows)
-
+ERROR: function cannot execute on a QE slice because it accesses relation
"public.hobbies_r"
+CONTEXT: SQL function "hobbies" during startup
SELECT (p.hobbies).equipment.name, name(p.hobbies), p.name FROM ONLY person p;
- name | name | name
----------------+-------------+-------
- advil | posthacking | mike
- peet's coffee | posthacking | mike
- hightops | basketball | joe
- hightops | basketball | sally
-(4 rows)
-
+ERROR: function cannot execute on a QE slice because it accesses relation
"public.hobbies_r"
+CONTEXT: SQL function "hobbies" during startup
SELECT name(equipment(p.hobbies)), name(p.hobbies), p.name FROM person* p;
- name | name | name
----------------+-------------+-------
- advil | posthacking | mike
- peet's coffee | posthacking | mike
- hightops | basketball | joe
- hightops | basketball | sally
- advil | posthacking | jeff
- peet's coffee | posthacking | jeff
-(6 rows)
-
+ERROR: function cannot execute on a QE slice because it accesses relation
"public.hobbies_r"
+CONTEXT: SQL function "hobbies" during startup
SELECT name(equipment(hobby_construct(text 'skywalking', text 'mer')));
name
------
@@ -334,7 +266,7 @@ SELECT name(equipment_named_ambiguous_2b(text
'skywalking'));
SELECT hobbies_by_name('basketball');
hobbies_by_name
-----------------
- joe
+ sally
(1 row)
SELECT name, overpaid(emp.*) FROM emp;
@@ -364,29 +296,11 @@ SELECT name(equipment(ROW('skywalking', 'mer')));
(1 row)
SELECT *, name(equipment(h.*)) FROM hobbies_r h;
- name | person | name
--------------+--------+---------------
- posthacking | mike | advil
- posthacking | mike | peet's coffee
- posthacking | jeff | advil
- posthacking | jeff | peet's coffee
- basketball | joe | hightops
- basketball | sally | hightops
- skywalking | | guts
-(7 rows)
-
+ERROR: function cannot execute on a QE slice because it accesses relation
"public.equipment_r"
+CONTEXT: SQL function "equipment" during startup
SELECT *, (equipment(CAST((h.*) AS hobbies_r))).name FROM hobbies_r h;
- name | person | name
--------------+--------+---------------
- posthacking | mike | advil
- posthacking | mike | peet's coffee
- posthacking | jeff | advil
- posthacking | jeff | peet's coffee
- basketball | joe | hightops
- basketball | sally | hightops
- skywalking | | guts
-(7 rows)
-
+ERROR: function cannot execute on a QE slice because it accesses relation
"public.equipment_r"
+CONTEXT: SQL function "equipment" during startup
--
-- functional joins
--
diff --git a/src/test/regress/expected/sysviews.out
b/src/test/regress/expected/sysviews.out
index a9a7169e2af..df070ca4db2 100644
--- a/src/test/regress/expected/sysviews.out
+++ b/src/test/regress/expected/sysviews.out
@@ -129,31 +129,19 @@ name not in ('enable_parallel',
enable_lock_optimization | off
enable_material | on
enable_memoize | on
-<<<<<<< HEAD
enable_mergejoin | off
enable_nestloop | off
-=======
- enable_mergejoin | on
- enable_nestloop | on
->>>>>>> REL_16_9
enable_parallel_append | on
enable_parallel_hash | on
enable_partition_pruning | on
enable_partitionwise_aggregate | off
enable_partitionwise_join | off
-<<<<<<< HEAD
enable_password_profile | on
- enable_seqscan | on
- enable_sort | on
- enable_tidscan | on
-(23 rows)
-=======
enable_presorted_aggregate | on
enable_seqscan | on
enable_sort | on
enable_tidscan | on
-(21 rows)
->>>>>>> REL_16_9
+(24 rows)
-- Test that the pg_timezone_names and pg_timezone_abbrevs views are
-- more-or-less working. We can't test their contents in any great detail
diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule
index 4e32cd84142..26265da4748 100644
--- a/src/test/regress/serial_schedule
+++ b/src/test/regress/serial_schedule
@@ -134,8 +134,8 @@ test: misc
test: async
test: dbsize
test: misc_functions
-# test: sysviews
-# test: tsrf
+test: sysviews
+test: tsrf
# test: tidscan
# test: collate.icu.utf8
# #test: rules
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]