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

commit e01b5cbbcae0662e2abc48e98a6bd739bafe966f
Author: reshke <[email protected]>
AuthorDate: Sun Dec 28 05:55:36 2025 +0000

    Fix inet btree_gist expected output
---
 contrib/btree_gist/expected/inet.out | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/contrib/btree_gist/expected/inet.out 
b/contrib/btree_gist/expected/inet.out
index 21659032a3b..6e4a3a67300 100644
--- a/contrib/btree_gist/expected/inet.out
+++ b/contrib/btree_gist/expected/inet.out
@@ -88,7 +88,6 @@ CREATE INDEX ON inettmp USING gist (a gist_inet_ops, a 
inet_ops);
 -- this can be an index-only scan, as long as the planner uses the right column
 EXPLAIN (COSTS OFF)
 SELECT count(*) FROM inettmp WHERE a  = '89.225.196.191'::inet;
-<<<<<<< HEAD
                         QUERY PLAN                        
 ----------------------------------------------------------
  Aggregate
@@ -97,14 +96,6 @@ SELECT count(*) FROM inettmp WHERE a  = 
'89.225.196.191'::inet;
                Index Cond: (a = '89.225.196.191'::inet)
  Optimizer: Postgres query optimizer
 (5 rows)
-=======
-                       QUERY PLAN                        
----------------------------------------------------------
- Aggregate
-   ->  Index Only Scan using inettmp_a_a1_idx on inettmp
-         Index Cond: (a = '89.225.196.191'::inet)
-(3 rows)
->>>>>>> REL_16_9
 
 SELECT count(*) FROM inettmp WHERE a  = '89.225.196.191'::inet;
  count 


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

Reply via email to