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 3d945e0ee14 Fix some answer files
3d945e0ee14 is described below
commit 3d945e0ee14efafea79b46cd1249d08d5ba19719
Author: Jinbao Chen <[email protected]>
AuthorDate: Fri Nov 28 16:50:47 2025 +0800
Fix some answer files
---
src/test/regress/expected/conversion.out | 10 ++---
src/test/regress/expected/jsonb.out | 2 +
src/test/regress/expected/jsonpath.out | 77 --------------------------------
src/test/regress/expected/prepare.out | 6 ---
src/test/regress/serial_schedule | 24 +++++-----
src/test/regress/sql/conversion.sql | 7 +--
src/test/regress/sql/jsonb.sql | 2 +
src/test/regress/sql/rangefuncs.sql | 3 --
8 files changed, 22 insertions(+), 109 deletions(-)
diff --git a/src/test/regress/expected/conversion.out
b/src/test/regress/expected/conversion.out
index 9e6d706c923..36543ed6682 100644
--- a/src/test/regress/expected/conversion.out
+++ b/src/test/regress/expected/conversion.out
@@ -1,8 +1,6 @@
--
-- create user defined conversion
--
-<<<<<<< HEAD
-=======
-- directory paths and dlsuffix are passed to us in environment variables
\getenv libdir PG_LIBDIR
\getenv dlsuffix PG_DLSUFFIX
@@ -10,17 +8,17 @@
CREATE FUNCTION test_enc_setup() RETURNS void
AS :'regresslib', 'test_enc_setup'
LANGUAGE C STRICT;
->>>>>>> REL_16_9
SELECT FROM test_enc_setup();
--
(1 row)
-<<<<<<< HEAD
-=======
CREATE FUNCTION test_enc_conversion(bytea, name, name, bool, validlen OUT int,
result OUT bytea)
AS :'regresslib', 'test_enc_conversion'
LANGUAGE C STRICT;
->>>>>>> REL_16_9
+SELECT FROM test_enc_setup();
+--
+(1 row)
+
CREATE USER regress_conversion_user WITH NOCREATEDB NOCREATEROLE;
SET SESSION AUTHORIZATION regress_conversion_user;
CREATE CONVERSION myconv FOR 'LATIN1' TO 'UTF8' FROM iso8859_1_to_utf8;
diff --git a/src/test/regress/expected/jsonb.out
b/src/test/regress/expected/jsonb.out
index c0e0de5d726..6b89bd83996 100644
--- a/src/test/regress/expected/jsonb.out
+++ b/src/test/regress/expected/jsonb.out
@@ -5266,6 +5266,7 @@ select length(id), test_json[id] from
test_jsonb_subscript;
2500 | "baz"
(2 rows)
+-- start_ignore
\x
table test_jsonb_subscript;
-[ RECORD 1
]-----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
[...]
@@ -5276,6 +5277,7 @@ id |
xyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyz
test_json |
{"xyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyzzyxyz
[...]
\x
+-- end_ignore
-- jsonb to tsvector
select to_tsvector('{"a": "aaa bbb ddd ccc", "b": ["eee fff ggg"], "c": {"d":
"hhh iii"}}'::jsonb);
to_tsvector
diff --git a/src/test/regress/expected/jsonpath.out
b/src/test/regress/expected/jsonpath.out
index b97940ecf93..eeffb38c1b6 100644
--- a/src/test/regress/expected/jsonpath.out
+++ b/src/test/regress/expected/jsonpath.out
@@ -567,19 +567,6 @@ select '$ ? (@.a < +1)'::jsonpath;
(1 row)
select '$ ? (@.a < .1)'::jsonpath;
-<<<<<<< HEAD
-ERROR: syntax error at or near "." of jsonpath input
-LINE 1: select '$ ? (@.a < .1)'::jsonpath;
- ^
-select '$ ? (@.a < -.1)'::jsonpath;
-ERROR: syntax error at or near "." of jsonpath input
-LINE 1: select '$ ? (@.a < -.1)'::jsonpath;
- ^
-select '$ ? (@.a < +.1)'::jsonpath;
-ERROR: syntax error at or near "." of jsonpath input
-LINE 1: select '$ ? (@.a < +.1)'::jsonpath;
- ^
-=======
jsonpath
-----------------
$?(@."a" < 0.1)
@@ -597,7 +584,6 @@ select '$ ? (@.a < +.1)'::jsonpath;
$?(@."a" < 0.1)
(1 row)
->>>>>>> REL_16_9
select '$ ? (@.a < 0.1)'::jsonpath;
jsonpath
-----------------
@@ -653,19 +639,6 @@ select '$ ? (@.a < +1e1)'::jsonpath;
(1 row)
select '$ ? (@.a < .1e1)'::jsonpath;
-<<<<<<< HEAD
-ERROR: syntax error at or near "." of jsonpath input
-LINE 1: select '$ ? (@.a < .1e1)'::jsonpath;
- ^
-select '$ ? (@.a < -.1e1)'::jsonpath;
-ERROR: syntax error at or near "." of jsonpath input
-LINE 1: select '$ ? (@.a < -.1e1)'::jsonpath;
- ^
-select '$ ? (@.a < +.1e1)'::jsonpath;
-ERROR: syntax error at or near "." of jsonpath input
-LINE 1: select '$ ? (@.a < +.1e1)'::jsonpath;
- ^
-=======
jsonpath
---------------
$?(@."a" < 1)
@@ -683,7 +656,6 @@ select '$ ? (@.a < +.1e1)'::jsonpath;
$?(@."a" < 1)
(1 row)
->>>>>>> REL_16_9
select '$ ? (@.a < 0.1e1)'::jsonpath;
jsonpath
---------------
@@ -739,19 +711,6 @@ select '$ ? (@.a < +1e-1)'::jsonpath;
(1 row)
select '$ ? (@.a < .1e-1)'::jsonpath;
-<<<<<<< HEAD
-ERROR: syntax error at or near "." of jsonpath input
-LINE 1: select '$ ? (@.a < .1e-1)'::jsonpath;
- ^
-select '$ ? (@.a < -.1e-1)'::jsonpath;
-ERROR: syntax error at or near "." of jsonpath input
-LINE 1: select '$ ? (@.a < -.1e-1)'::jsonpath;
- ^
-select '$ ? (@.a < +.1e-1)'::jsonpath;
-ERROR: syntax error at or near "." of jsonpath input
-LINE 1: select '$ ? (@.a < +.1e-1)'::jsonpath;
- ^
-=======
jsonpath
------------------
$?(@."a" < 0.01)
@@ -769,7 +728,6 @@ select '$ ? (@.a < +.1e-1)'::jsonpath;
$?(@."a" < 0.01)
(1 row)
->>>>>>> REL_16_9
select '$ ? (@.a < 0.1e-1)'::jsonpath;
jsonpath
------------------
@@ -825,19 +783,6 @@ select '$ ? (@.a < +1e+1)'::jsonpath;
(1 row)
select '$ ? (@.a < .1e+1)'::jsonpath;
-<<<<<<< HEAD
-ERROR: syntax error at or near "." of jsonpath input
-LINE 1: select '$ ? (@.a < .1e+1)'::jsonpath;
- ^
-select '$ ? (@.a < -.1e+1)'::jsonpath;
-ERROR: syntax error at or near "." of jsonpath input
-LINE 1: select '$ ? (@.a < -.1e+1)'::jsonpath;
- ^
-select '$ ? (@.a < +.1e+1)'::jsonpath;
-ERROR: syntax error at or near "." of jsonpath input
-LINE 1: select '$ ? (@.a < +.1e+1)'::jsonpath;
- ^
-=======
jsonpath
---------------
$?(@."a" < 1)
@@ -855,7 +800,6 @@ select '$ ? (@.a < +.1e+1)'::jsonpath;
$?(@."a" < 1)
(1 row)
->>>>>>> REL_16_9
select '$ ? (@.a < 0.1e+1)'::jsonpath;
jsonpath
---------------
@@ -900,11 +844,7 @@ select '0'::jsonpath;
(1 row)
select '00'::jsonpath;
-<<<<<<< HEAD
-ERROR: syntax error at end of jsonpath input
-=======
ERROR: trailing junk after numeric literal at or near "00" of jsonpath input
->>>>>>> REL_16_9
LINE 1: select '00'::jsonpath;
^
select '0755'::jsonpath;
@@ -1068,22 +1008,6 @@ select '(1.2).e3'::jsonpath;
(1 row)
select '1..e'::jsonpath;
-<<<<<<< HEAD
-ERROR: syntax error at or near "." of jsonpath input
-LINE 1: select '1..e'::jsonpath;
- ^
-select '1..e3'::jsonpath;
-ERROR: syntax error at or near "." of jsonpath input
-LINE 1: select '1..e3'::jsonpath;
- ^
-select '(1.).e'::jsonpath;
-ERROR: syntax error at or near ")" of jsonpath input
-LINE 1: select '(1.).e'::jsonpath;
- ^
-select '(1.).e3'::jsonpath;
-ERROR: syntax error at or near ")" of jsonpath input
-LINE 1: select '(1.).e3'::jsonpath;
-=======
jsonpath
----------
(1)."e"
@@ -1136,7 +1060,6 @@ select '0x42F'::jsonpath;
select '0b'::jsonpath;
ERROR: trailing junk after numeric literal at or near "0b" of jsonpath input
LINE 1: select '0b'::jsonpath;
->>>>>>> REL_16_9
^
select '1b'::jsonpath;
ERROR: trailing junk after numeric literal at or near "1b" of jsonpath input
diff --git a/src/test/regress/expected/prepare.out
b/src/test/regress/expected/prepare.out
index 241ff06981f..b6b1a81f095 100644
--- a/src/test/regress/expected/prepare.out
+++ b/src/test/regress/expected/prepare.out
@@ -1,16 +1,10 @@
-- Regression tests for prepareable statements. We query the content
-- of the pg_prepared_statements view as prepared statements are
-- created and removed.
-<<<<<<< HEAD
SET optimizer_trace_fallback to on;
-SELECT name, statement, parameter_types FROM pg_prepared_statements;
- name | statement | parameter_types
-------+-----------+-----------------
-=======
SELECT name, statement, parameter_types, result_types FROM
pg_prepared_statements;
name | statement | parameter_types | result_types
------+-----------+-----------------+--------------
->>>>>>> REL_16_9
(0 rows)
PREPARE q1 AS SELECT 1 AS a;
diff --git a/src/test/regress/serial_schedule b/src/test/regress/serial_schedule
index 818724423f8..93475d17313 100644
--- a/src/test/regress/serial_schedule
+++ b/src/test/regress/serial_schedule
@@ -169,19 +169,19 @@ test: equivclass
test: json
test: jsonb
test: json_encoding
-# test: jsonpath
-# test: jsonpath_encoding
-# test: jsonb_jsonpath
-# test: plancache
-# test: limit
-# test: plpgsql
+test: jsonpath
+test: jsonpath_encoding
+test: jsonb_jsonpath
+test: plancache
+test: limit
+test: plpgsql
# test: copy2
-# test: temp
-# test: domain
-# test: rangefuncs
-# test: prepare
-# test: conversion
-# test: truncate
+test: temp
+test: domain
+test: rangefuncs
+test: prepare
+test: conversion
+test: truncate
# test: alter_table
# test: sequence
# test: polymorphism
diff --git a/src/test/regress/sql/conversion.sql
b/src/test/regress/sql/conversion.sql
index cbb54ca94af..ab39ec23d9d 100644
--- a/src/test/regress/sql/conversion.sql
+++ b/src/test/regress/sql/conversion.sql
@@ -2,10 +2,6 @@
-- create user defined conversion
--
-<<<<<<< HEAD
-SELECT FROM test_enc_setup();
-
-=======
-- directory paths and dlsuffix are passed to us in environment variables
\getenv libdir PG_LIBDIR
\getenv dlsuffix PG_DLSUFFIX
@@ -21,7 +17,8 @@ CREATE FUNCTION test_enc_conversion(bytea, name, name, bool,
validlen OUT int, r
AS :'regresslib', 'test_enc_conversion'
LANGUAGE C STRICT;
->>>>>>> REL_16_9
+SELECT FROM test_enc_setup();
+
CREATE USER regress_conversion_user WITH NOCREATEDB NOCREATEROLE;
SET SESSION AUTHORIZATION regress_conversion_user;
CREATE CONVERSION myconv FOR 'LATIN1' TO 'UTF8' FROM iso8859_1_to_utf8;
diff --git a/src/test/regress/sql/jsonb.sql b/src/test/regress/sql/jsonb.sql
index 024a3e8cf51..87f31f3b927 100644
--- a/src/test/regress/sql/jsonb.sql
+++ b/src/test/regress/sql/jsonb.sql
@@ -1440,9 +1440,11 @@ insert into test_jsonb_subscript
select length(id), test_json[id] from test_jsonb_subscript;
update test_jsonb_subscript set test_json[id] = '"baz"';
select length(id), test_json[id] from test_jsonb_subscript;
+-- start_ignore
\x
table test_jsonb_subscript;
\x
+-- end_ignore
-- jsonb to tsvector
select to_tsvector('{"a": "aaa bbb ddd ccc", "b": ["eee fff ggg"], "c": {"d":
"hhh iii"}}'::jsonb);
diff --git a/src/test/regress/sql/rangefuncs.sql
b/src/test/regress/sql/rangefuncs.sql
index cb5b0135eff..bbe1f4f421a 100644
--- a/src/test/regress/sql/rangefuncs.sql
+++ b/src/test/regress/sql/rangefuncs.sql
@@ -862,8 +862,6 @@ select * from
from unnest(array['{"lectures": [{"id": "1"}]}'::jsonb])
as unnested_modules(module)) as ss,
jsonb_to_recordset(ss.lecture) as j (id text);
-<<<<<<< HEAD
-=======
-- check detection of mismatching record types with a const-folded expression
@@ -874,4 +872,3 @@ select * from a, coalesce(b) as c(d int, e int, f int, g
int); -- fail
with a(b) as (values (row(1,2,3)))
select * from a, coalesce(b) as c(d int, e int, f float); -- fail
select * from int8_tbl, coalesce(row(1)) as (a int, b int); -- fail
->>>>>>> REL_16_9
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
