1 files changed, 127 insertions, 68 deletions
diff --git a/src/test/regress/expected/hash_index.out b/src/test/regress/expected/hash_index.out
index ee3f615beb5..db687e5a242 100644
--- a/src/test/regress/expected/hash_index.out
+++ b/src/test/regress/expected/hash_index.out
@@ -1,139 +1,198 @@
-QUERY: SELECT hash_i4_heap.*
+--
+-- HASH_INDEX
+-- grep 843938989 hash.data
+--
+SELECT hash_i4_heap.* 
    WHERE hash_i4_heap.random = 843938989;
-seqno|   random
------+---------
-   15|843938989
+ seqno |  random   
+-------+-----------
+    15 | 843938989
 (1 row)
 
-QUERY: SELECT hash_i4_heap.*
+--
+-- hash index
+-- grep 66766766 hash.data
+--
+SELECT hash_i4_heap.*
    WHERE hash_i4_heap.random = 66766766;
-seqno|random
------+------
+ seqno | random 
+-------+--------
 (0 rows)
 
-QUERY: SELECT hash_name_heap.*
+--
+-- hash index
+-- grep 1505703298 hash.data
+--
+SELECT hash_name_heap.*
    WHERE hash_name_heap.random = '1505703298'::name;
-seqno|    random
------+----------
- 9838|1505703298
+ seqno |   random   
+-------+------------
+  9838 | 1505703298
 (1 row)
 
-QUERY: SELECT hash_name_heap.*
+--
+-- hash index
+-- grep 7777777 hash.data
+--
+SELECT hash_name_heap.*
    WHERE hash_name_heap.random = '7777777'::name;
-seqno|random
------+------
+ seqno | random 
+-------+--------
 (0 rows)
 
-QUERY: SELECT hash_txt_heap.*
+--
+-- hash index
+-- grep 1351610853 hash.data
+--
+SELECT hash_txt_heap.*
    WHERE hash_txt_heap.random = '1351610853'::text;
-seqno|    random
------+----------
- 5677|1351610853
+ seqno |   random   
+-------+------------
+  5677 | 1351610853
 (1 row)
 
-QUERY: SELECT hash_txt_heap.*
+--
+-- hash index
+-- grep 111111112222222233333333 hash.data
+--
+SELECT hash_txt_heap.*
    WHERE hash_txt_heap.random = '111111112222222233333333'::text;
-seqno|random
------+------
+ seqno | random 
+-------+--------
 (0 rows)
 
-QUERY: SELECT hash_f8_heap.*
+--
+-- hash index
+-- grep 444705537 hash.data
+--
+SELECT hash_f8_heap.*
    WHERE hash_f8_heap.random = '444705537'::float8;
-seqno|   random
------+---------
- 7853|444705537
+ seqno |  random   
+-------+-----------
+  7853 | 444705537
 (1 row)
 
-QUERY: SELECT hash_f8_heap.*
+--
+-- hash index
+-- grep 88888888 hash.data
+--
+SELECT hash_f8_heap.*
    WHERE hash_f8_heap.random = '88888888'::float8;
-seqno|random
------+------
+ seqno | random 
+-------+--------
 (0 rows)
 
-QUERY: UPDATE hash_i4_heap
+--
+-- hash index
+-- grep '^90[^0-9]' hashovfl.data
+--
+-- SELECT count(*) AS i988 FROM hash_ovfl_heap
+--    WHERE x = 90;
+--
+-- hash index
+-- grep '^1000[^0-9]' hashovfl.data
+--
+-- SELECT count(*) AS i0 FROM hash_ovfl_heap
+--    WHERE x = 1000;
+--
+-- HASH
+--
+UPDATE hash_i4_heap
    SET random = 1
    WHERE hash_i4_heap.seqno = 1492;
-QUERY: SELECT h.seqno AS i1492, h.random AS i1
+SELECT h.seqno AS i1492, h.random AS i1
    FROM hash_i4_heap h
    WHERE h.random = 1;
-i1492|i1
------+--
- 1492| 1
+ i1492 | i1 
+-------+----
+  1492 |  1
 (1 row)
 
-QUERY: UPDATE hash_i4_heap
-   SET seqno = 20000
+UPDATE hash_i4_heap 
+   SET seqno = 20000 
    WHERE hash_i4_heap.random = 1492795354;
-QUERY: SELECT h.seqno AS i20000
+SELECT h.seqno AS i20000 
    FROM hash_i4_heap h
    WHERE h.random = 1492795354;
-i20000
-------
- 20000
+ i20000 
+--------
+  20000
 (1 row)
 
-QUERY: UPDATE hash_name_heap
+UPDATE hash_name_heap 
    SET random = '0123456789abcdef'::name
    WHERE hash_name_heap.seqno = 6543;
-QUERY: SELECT h.seqno AS i6543, h.random AS c0_to_f
+SELECT h.seqno AS i6543, h.random AS c0_to_f
    FROM hash_name_heap h
    WHERE h.random = '0123456789abcdef'::name;
-i6543|c0_to_f         
------+----------------
- 6543|0123456789abcdef
+ i6543 |     c0_to_f      
+-------+------------------
+  6543 | 0123456789abcdef
 (1 row)
 
-QUERY: UPDATE hash_name_heap
+UPDATE hash_name_heap
    SET seqno = 20000
    WHERE hash_name_heap.random = '76652222'::name;
-QUERY: SELECT h.seqno AS emptyset
+--
+-- this is the row we just replaced; index scan should return zero rows 
+--
+SELECT h.seqno AS emptyset
    FROM hash_name_heap h
    WHERE h.random = '76652222'::name;
-emptyset
---------
+ emptyset 
+----------
 (0 rows)
 
-QUERY: UPDATE hash_txt_heap
+UPDATE hash_txt_heap 
    SET random = '0123456789abcdefghijklmnop'::text
    WHERE hash_txt_heap.seqno = 4002;
-QUERY: SELECT h.seqno AS i4002, h.random AS c0_to_p
+SELECT h.seqno AS i4002, h.random AS c0_to_p
    FROM hash_txt_heap h
    WHERE h.random = '0123456789abcdefghijklmnop'::text;
-i4002|c0_to_p                   
------+--------------------------
- 4002|0123456789abcdefghijklmnop
+ i4002 |          c0_to_p           
+-------+----------------------------
+  4002 | 0123456789abcdefghijklmnop
 (1 row)
 
-QUERY: UPDATE hash_txt_heap
+UPDATE hash_txt_heap
    SET seqno = 20000
    WHERE hash_txt_heap.random = '959363399'::text;
-QUERY: SELECT h.seqno AS t20000
+SELECT h.seqno AS t20000
    FROM hash_txt_heap h
    WHERE h.random = '959363399'::text;
-t20000
-------
- 20000
+ t20000 
+--------
+  20000
 (1 row)
 
-QUERY: UPDATE hash_f8_heap
+UPDATE hash_f8_heap
    SET random = '-1234.1234'::float8
    WHERE hash_f8_heap.seqno = 8906;
-QUERY: SELECT h.seqno AS i8096, h.random AS f1234_1234
+SELECT h.seqno AS i8096, h.random AS f1234_1234 
    FROM hash_f8_heap h
    WHERE h.random = '-1234.1234'::float8;
-i8096|f1234_1234
------+----------
- 8906|-1234.1234
+ i8096 | f1234_1234 
+-------+------------
+  8906 | -1234.1234
 (1 row)
 
-QUERY: UPDATE hash_f8_heap
+UPDATE hash_f8_heap 
    SET seqno = 20000
    WHERE hash_f8_heap.random = '488912369'::float8;
-QUERY: SELECT h.seqno AS f20000
+SELECT h.seqno AS f20000
    FROM hash_f8_heap h
    WHERE h.random = '488912369'::float8;
-f20000
-------
- 20000
+ f20000 
+--------
+  20000
 (1 row)
 
+-- UPDATE hash_ovfl_heap
+--    SET x = 1000
+--   WHERE x = 90;
+-- this vacuums the index as well
+-- VACUUM hash_ovfl_heap;
+-- SELECT count(*) AS i0 FROM hash_ovfl_heap
+--   WHERE x = 90;
+-- SELECT count(*) AS i988 FROM hash_ovfl_heap
+--  WHERE x = 1000;