tests: more usages for table_checksum

and reduce batch twice for sanity

Author: funny-falcon

tests/archive_test.py

@@ -2215,9 +2215,7 @@ def test_multi_timeline_recovery_prefetching(self):
         node.slow_start()
 
         node.pgbench_init(scale=20)
-        result = node.safe_psql(
-            'postgres',
-            'select * from pgbench_accounts')
+        result = node.table_checksum("pgbench_accounts", "aid")
         node.stop()
         node.cleanup()
 
@@ -2242,9 +2240,7 @@ def test_multi_timeline_recovery_prefetching(self):
 
         node.slow_start()
 
-        result_new = node.safe_psql(
-            'postgres',
-            'select * from pgbench_accounts')
+        result_new = node.table_checksum("pgbench_accounts", "aid")
 
         self.assertEqual(result, result_new)
 

tests/cfs_backup_test.py

@@ -761,7 +761,7 @@ def test_multiple_segments(self):
                 't_heap', tblspace_name)
         )
 
-        full_result = self.node.safe_psql("postgres", "SELECT * FROM t_heap")
+        full_result = self.node.table_checksum("t_heap", "id")
 
         try:
             backup_id_full = self.backup_node(
@@ -783,7 +783,7 @@ def test_multiple_segments(self):
                 't_heap')
         )
 
-        page_result = self.node.safe_psql("postgres", "SELECT * FROM t_heap")
+        page_result = self.node.table_checksum("t_heap", "id")
 
         try:
             backup_id_page = self.backup_node(
@@ -824,7 +824,7 @@ def test_multiple_segments(self):
         self.node.slow_start()
         self.assertEqual(
             full_result,
-            self.node.safe_psql("postgres", "SELECT * FROM t_heap"),
+            self.node.table_checksum("t_heap", "id"),
             'Lost data after restore')
 
         # CHECK PAGE BACKUP
@@ -843,7 +843,7 @@ def test_multiple_segments(self):
         self.node.slow_start()
         self.assertEqual(
             page_result,
-            self.node.safe_psql("postgres", "SELECT * FROM t_heap"),
+            self.node.table_checksum("t_heap", "id"),
             'Lost data after restore')
 
     # @unittest.expectedFailure
@@ -877,10 +877,8 @@ def test_multiple_segments_in_multiple_tablespaces(self):
             "FROM generate_series(0,1005000) i".format(
                 't_heap_2', tblspace_name_2))
 
-        full_result_1 = self.node.safe_psql(
-            "postgres", "SELECT * FROM t_heap_1")
-        full_result_2 = self.node.safe_psql(
-            "postgres", "SELECT * FROM t_heap_2")
+        full_result_1 = self.node.table_checksum("t_heap_1", "id")
+        full_result_2 = self.node.table_checksum("t_heap_2", "id")
 
         try:
             backup_id_full = self.backup_node(
@@ -911,10 +909,8 @@ def test_multiple_segments_in_multiple_tablespaces(self):
                 't_heap_2')
         )
 
-        page_result_1 = self.node.safe_psql(
-            "postgres", "SELECT * FROM t_heap_1")
-        page_result_2 = self.node.safe_psql(
-            "postgres", "SELECT * FROM t_heap_2")
+        page_result_1 = self.node.table_checksum("t_heap_1", "id")
+        page_result_2 = self.node.table_checksum("t_heap_2", "id")
 
         try:
             backup_id_page = self.backup_node(
@@ -955,11 +951,11 @@ def test_multiple_segments_in_multiple_tablespaces(self):
 
         self.assertEqual(
             full_result_1,
-            self.node.safe_psql("postgres", "SELECT * FROM t_heap_1"),
+            self.node.table_checksum("t_heap_1", "id"),
             'Lost data after restore')
         self.assertEqual(
             full_result_2,
-            self.node.safe_psql("postgres", "SELECT * FROM t_heap_2"),
+            self.node.table_checksum("t_heap_2", "id"),
             'Lost data after restore')
 
         # CHECK PAGE BACKUP
@@ -976,11 +972,11 @@ def test_multiple_segments_in_multiple_tablespaces(self):
 
         self.assertEqual(
             page_result_1,
-            self.node.safe_psql("postgres", "SELECT * FROM t_heap_1"),
+            self.node.table_checksum("t_heap_1", "id"),
             'Lost data after restore')
         self.assertEqual(
             page_result_2,
-            self.node.safe_psql("postgres", "SELECT * FROM t_heap_2"),
+            self.node.table_checksum("t_heap_2", "id"),
             'Lost data after restore')
 
     # @unittest.expectedFailure

tests/helpers/ptrack_helpers.py

@@ -215,7 +215,7 @@ def table_checksum(self, table, sort, dbname="postgres"):
         """)
 
         while True:
-            rows = con.execute(f"FETCH FORWARD 10000 FROM {curname}")
+            rows = con.execute(f"FETCH FORWARD 5000 FROM {curname}")
             if not rows:
                 break
             for row in rows:

tests/page_test.py

@@ -1191,8 +1191,7 @@ def test_multi_timeline_page(self):
 
         pgdata = self.pgdata_content(node.data_dir)
 
-        result = node.safe_psql(
-            "postgres", "select * from pgbench_accounts")
+        result = node.table_checksum("pgbench_accounts", "aid")
 
         node_restored = self.make_simple_node(
             base_dir=os.path.join(self.module_name, self.fname, 'node_restored'))
@@ -1204,8 +1203,7 @@ def test_multi_timeline_page(self):
         self.set_auto_conf(node_restored, {'port': node_restored.port})
         node_restored.slow_start()
 
-        result_new = node_restored.safe_psql(
-            "postgres", "select * from pgbench_accounts")
+        result_new = node_restored.table_checksum("pgbench_accounts", "aid")
 
         self.assertEqual(result, result_new)
 

tests/ptrack_test.py

@@ -375,7 +375,7 @@ def test_ptrack_eat_my_data(self):
 
         self.switch_wal_segment(node)
 
-        result = node.safe_psql("postgres", "SELECT * FROM pgbench_accounts")
+        result = node.table_checksum("pgbench_accounts", "aid")
 
         node_restored.cleanup()
         self.restore_node(backup_dir, 'node', node_restored)
@@ -396,9 +396,7 @@ def test_ptrack_eat_my_data(self):
         # Logical comparison
         self.assertEqual(
             result,
-            node_restored.safe_psql(
-                'postgres',
-                'SELECT * FROM pgbench_accounts'),
+            node.table_checksum("pgbench_accounts", "aid"),
             'Data loss')
 
     # @unittest.skip("skip")

tests/replica_test.py

@@ -326,7 +326,7 @@ def test_replica_archive_page_backup(self):
 
         self.switch_wal_segment(master)
 
-        before = master.safe_psql("postgres", "SELECT * FROM pgbench_accounts")
+        before = master.table_checksum("pgbench_accounts", "aid")
 
         self.validate_pb(backup_dir, 'replica')
         self.assertEqual(
@@ -342,7 +342,7 @@ def test_replica_archive_page_backup(self):
         node.slow_start()
 
         # CHECK DATA CORRECTNESS
-        after = node.safe_psql("postgres", "SELECT * FROM pgbench_accounts")
+        after = master.table_checksum("pgbench_accounts", "aid")
         self.assertEqual(
             before, after, 'Restored data is not equal to original')