This is an automated email from the ASF dual-hosted git repository.
reshke 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 477e86e6428 Fix rebase issues with `contrib/ltree`
477e86e6428 is described below
commit 477e86e64282ce0948d9389c34820eeb66132537
Author: reshke <[email protected]>
AuthorDate: Sun Dec 14 17:37:03 2025 +0000
Fix rebase issues with `contrib/ltree`
make changes to regression test suite. Reason is, default
page size in Cloudberry is 4 times bigger that in upstream
---
contrib/ltree/expected/ltree.out | 26 ++++++++------------------
contrib/ltree/ltree_gist.c | 4 ----
contrib/ltree/sql/ltree.sql | 13 +++----------
3 files changed, 11 insertions(+), 32 deletions(-)
diff --git a/contrib/ltree/expected/ltree.out b/contrib/ltree/expected/ltree.out
index 6eaf9495500..6cd7a3d4e58 100644
--- a/contrib/ltree/expected/ltree.out
+++ b/contrib/ltree/expected/ltree.out
@@ -7835,24 +7835,16 @@ SELECT * FROM ltreetest WHERE t ? '{23.*.1,23.*.2}'
order by t asc;
drop index tstidx;
create index tstidx on ltreetest using gist (t gist_ltree_ops(siglen=0));
ERROR: value 0 out of bounds for option "siglen"
-<<<<<<< HEAD
-DETAIL: Valid values are between "1" and "8168".
+DETAIL: Valid values are between "4" and "8168".
create index tstidx on ltreetest using gist (t gist_ltree_ops(siglen=8169));
ERROR: value 8169 out of bounds for option "siglen"
-DETAIL: Valid values are between "1" and "8168".
-create index tstidx on ltreetest using gist (t gist_ltree_ops(siglen=8168));
-=======
-DETAIL: Valid values are between "4" and "2024".
-create index tstidx on ltreetest using gist (t gist_ltree_ops(siglen=2025));
-ERROR: value 2025 out of bounds for option "siglen"
-DETAIL: Valid values are between "4" and "2024".
-create index tstidx on ltreetest using gist (t gist_ltree_ops(siglen=2028));
-ERROR: value 2028 out of bounds for option "siglen"
-DETAIL: Valid values are between "4" and "2024".
-create index tstidx on ltreetest using gist (t gist_ltree_ops(siglen=2019));
+DETAIL: Valid values are between "4" and "8168".
+create index tstidx on ltreetest using gist (t gist_ltree_ops(siglen=8172));
+ERROR: value 8172 out of bounds for option "siglen"
+DETAIL: Valid values are between "4" and "8168".
+create index tstidx on ltreetest using gist (t gist_ltree_ops(siglen=8167));
ERROR: siglen value must be a multiple of 4
-create index tstidx on ltreetest using gist (t gist_ltree_ops(siglen=2024));
->>>>>>> REL_16_9
+create index tstidx on ltreetest using gist (t gist_ltree_ops(siglen=8168));
SELECT count(*) FROM ltreetest WHERE t < '12.3';
count
-------
@@ -8111,7 +8103,6 @@ SELECT count(*) FROM _ltreetest WHERE t ?
'{23.*.1,23.*.2}' ;
15
(1 row)
-<<<<<<< HEAD
-- Test that has all opclasses
select opcname,amname from pg_opclass opc, pg_am am where
am.oid=opc.opcmethod and opcintype='ltree'::regtype;
opcname | amname
@@ -8120,7 +8111,7 @@ select opcname,amname from pg_opclass opc, pg_am am
where am.oid=opc.opcmethod
gist_ltree_ops | gist
ltree_ops | bitmap
(3 rows)
-=======
+
-- test non-error-throwing input
SELECT str as "value", typ as "type",
pg_input_is_valid(str,typ) as ok,
@@ -8149,5 +8140,4 @@ FROM (VALUES ('.2.3', 'ltree'),
$tree & aWdf@* | ltxtquery | f | 42601 | operand syntax error
| |
!tree & aWdf@* | ltxtquery | t | |
| |
(8 rows)
->>>>>>> REL_16_9
diff --git a/contrib/ltree/ltree_gist.c b/contrib/ltree/ltree_gist.c
index f88df52fc68..932f69bff2d 100644
--- a/contrib/ltree/ltree_gist.c
+++ b/contrib/ltree/ltree_gist.c
@@ -739,13 +739,9 @@ ltree_gist_options(PG_FUNCTION_ARGS)
init_local_reloptions(relopts, sizeof(LtreeGistOptions));
add_local_int_reloption(relopts, "siglen",
"signature length in
bytes",
-<<<<<<< HEAD
- LTREE_SIGLEN_DEFAULT,
1, LTREE_SIGLEN_MAX,
-=======
LTREE_SIGLEN_DEFAULT,
INTALIGN(1),
LTREE_SIGLEN_MAX,
->>>>>>> REL_16_9
offsetof(LtreeGistOptions, siglen));
register_reloptions_validator(relopts, ltree_gist_relopts_validator);
diff --git a/contrib/ltree/sql/ltree.sql b/contrib/ltree/sql/ltree.sql
index 5881444fd34..7a62b760f66 100644
--- a/contrib/ltree/sql/ltree.sql
+++ b/contrib/ltree/sql/ltree.sql
@@ -331,15 +331,10 @@ SELECT * FROM ltreetest WHERE t ? '{23.*.1,23.*.2}' order
by t asc;
drop index tstidx;
create index tstidx on ltreetest using gist (t gist_ltree_ops(siglen=0));
-<<<<<<< HEAD
create index tstidx on ltreetest using gist (t gist_ltree_ops(siglen=8169));
+create index tstidx on ltreetest using gist (t gist_ltree_ops(siglen=8172));
+create index tstidx on ltreetest using gist (t gist_ltree_ops(siglen=8167));
create index tstidx on ltreetest using gist (t gist_ltree_ops(siglen=8168));
-=======
-create index tstidx on ltreetest using gist (t gist_ltree_ops(siglen=2025));
-create index tstidx on ltreetest using gist (t gist_ltree_ops(siglen=2028));
-create index tstidx on ltreetest using gist (t gist_ltree_ops(siglen=2019));
-create index tstidx on ltreetest using gist (t gist_ltree_ops(siglen=2024));
->>>>>>> REL_16_9
SELECT count(*) FROM ltreetest WHERE t < '12.3';
SELECT count(*) FROM ltreetest WHERE t <= '12.3';
@@ -397,10 +392,9 @@ SELECT count(*) FROM _ltreetest WHERE t ~ '23.*.1' ;
SELECT count(*) FROM _ltreetest WHERE t ~ '23.*.2' ;
SELECT count(*) FROM _ltreetest WHERE t ? '{23.*.1,23.*.2}' ;
-<<<<<<< HEAD
-- Test that has all opclasses
select opcname,amname from pg_opclass opc, pg_am am where
am.oid=opc.opcmethod and opcintype='ltree'::regtype;
-=======
+
-- test non-error-throwing input
SELECT str as "value", typ as "type",
@@ -419,4 +413,3 @@ FROM (VALUES ('.2.3', 'ltree'),
('!tree & aWdf@*','ltxtquery'))
AS a(str,typ),
LATERAL pg_input_error_info(a.str, a.typ) as errinfo;
->>>>>>> REL_16_9
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
