Fix cherry-pick issue

Author: reshke

src/test/isolation2/expected/brin_heap.out

@@ -2,8 +2,6 @@
 -- White-box tests are necessary to ensure that summarization is done
 -- successfully (to avoid cases where ranges have brin data tuples without
 -- values or where the range is not covered by the revmap etc)
-CREATE EXTENSION pageinspect;
-CREATE
 
 -- Turn off sequential scans to force usage of BRIN indexes for scans.
 SET enable_seqscan TO off;
@@ -317,5 +315,3 @@ SELECT gp_inject_fault('brin_bitmap_page_added', 'reset', dbid) FROM gp_segment_
 
 RESET enable_seqscan;
 RESET
-DROP EXTENSION pageinspect;
-DROP

src/test/isolation2/input/uao/brin.source

@@ -572,4 +572,3 @@ SELECT gp_inject_fault('brin_bitmap_page_added', 'reset', dbid)
   FROM gp_segment_configuration WHERE content = 1 AND role = 'p';
 
 RESET enable_seqscan;
-DROP EXTENSION pageinspect;

src/test/isolation2/output/uao/brin.source

@@ -820,8 +820,6 @@ INSERT 1
  1          | 33554432 | 1      | f        | f        | t           | {20 .. 30} 
 (1 row)
 
-<<<<<<< HEAD
-=======
 --------------------------------------------------------------------------------
 -- Summarization with multiple block sequences (segfiles).
 --------------------------------------------------------------------------------
@@ -1257,6 +1255,3 @@ SELECT gp_inject_fault('brin_bitmap_page_added', 'reset', dbid) FROM gp_segment_
 
 RESET enable_seqscan;
 RESET
-DROP EXTENSION pageinspect;
-DROP
->>>>>>> 46766ec0380 (brin ao/co: Ensure final range summarization: build)

src/test/isolation2/output/uao/brin_chain.source

@@ -74,34 +74,35 @@ CREATE
  0     | meta           
  1     | revmap         
  2     | regular        
- 3     | regular        
+ 3     | revmap         
  4     | regular        
  5     | regular        
- 6     | revmap         
+ 6     | regular        
  7     | revmap         
-(8 rows)
+ 8     | revmap         
+(9 rows)
 1U: SELECT firstrevmappages[:5] FROM brin_metapage_info(get_raw_page('brin_chain_@amname@_i_idx', 0));
- firstrevmappages   
------0--------------
- [-1, 1, -1, 7, -1] 
+ firstrevmappages  
+-------------------
+ [1, 3, -1, 8, -1] 
 (1 row)
 1U: SELECT lastrevmappages[:5] FROM brin_metapage_info(get_raw_page('brin_chain_@amname@_i_idx', 0));
- lastrevmappages    
---------------------
- [-1, 6, -1, 7, -1] 
+ lastrevmappages   
+-------------------
+ [1, 7, -1, 8, -1] 
 (1 row)
 1U: SELECT lastrevmappagenums[:5] FROM brin_metapage_info(get_raw_page('brin_chain_@amname@_i_idx', 0));
  lastrevmappagenums 
 --------------------
- [0, 2, 0, 1, 0]    
+ [1, 2, 0, 1, 0]    
 (1 row)
 1U: SELECT segnum, brin_revmap_chain('brin_chain_@amname@_i_idx', segnum) AS chain FROM generate_series(0, 3) segnum;
  segnum | chain  
 --------+--------
- 0      |        
- 1      | [1, 6] 
+ 0      | [1]    
+ 1      | [3, 7] 
  2      |        
- 3      | [7]    
+ 3      | [8]    
 (4 rows)
 
 -- Now test index retrieval. We should be able to:

src/test/isolation2/sql/brin_heap.sql

@@ -2,7 +2,6 @@
 -- White-box tests are necessary to ensure that summarization is done
 -- successfully (to avoid cases where ranges have brin data tuples without
 -- values or where the range is not covered by the revmap etc)
-CREATE EXTENSION pageinspect;
 
 -- Turn off sequential scans to force usage of BRIN indexes for scans.
 SET enable_seqscan TO off;
@@ -141,4 +140,3 @@ SELECT gp_inject_fault('brin_bitmap_page_added', 'reset', dbid)
 FROM gp_segment_configuration WHERE content = 1 AND role = 'p';
 
 RESET enable_seqscan;
-DROP EXTENSION pageinspect;