Add one more injection point and check the task progress.

Author: Antonin Houska

expected/pg_rewrite_concurrent.out

@@ -1,20 +1,20 @@
 Parsed test spec with 2 sessions
 
-starting permutation: wait_before_lock wait_for_s1_sleep do_changes wakeup_before_lock wait_for_backend_exit check
+starting permutation: do_rewrite wait_for_before_lock_ip do_changes wakeup_before_lock_ip wait_for_after_commit_ip check wakeup_after_commit_ip
 injection_points_attach
 -----------------------
 
 (1 row)
 
-step wait_before_lock: 
+step do_rewrite: 
     SELECT rewrite_table_nowait('tbl_src', 'tbl_dst', 'tbl_src_old');
 
 rewrite_table_nowait
 --------------------
 
 (1 row)
 
-step wait_for_s1_sleep: 
+step wait_for_before_lock_ip: 
 DO $$
 BEGIN
         LOOP
@@ -52,39 +52,43 @@ step do_changes:
 	-- Delete.
 	DELETE FROM tbl_src WHERE i=4;
 
-step wakeup_before_lock: 
+step wakeup_before_lock_ip: 
     SELECT injection_points_wakeup('pg_rewrite-before-lock');
-    SELECT injection_points_detach('pg_rewrite-before-lock');
 
 injection_points_wakeup
 -----------------------
 
 (1 row)
 
-injection_points_detach
------------------------
-                       
-(1 row)
-
-step wait_for_backend_exit: 
+step wait_for_after_commit_ip: 
 DO $$
 BEGIN
         LOOP
-		PERFORM FROM pg_rewrite_progress;
+		PERFORM pg_stat_clear_snapshot();
 
-		IF NOT FOUND THEN
+	        PERFORM
+		FROM pg_stat_activity
+		WHERE (wait_event_type, wait_event)=('InjectionPoint', 'pg_rewrite-after-commit');
+
+		IF FOUND THEN
 			EXIT;
 		END IF;
 
 		PERFORM pg_sleep(.1);
 	END LOOP;
 END;
-$$;
-
+$$
 
 step check: 
+    TABLE pg_rewrite_progress;
+
     SELECT i, j FROM tbl_src ORDER BY i, j;
 
+src_table|dst_table|src_table_new|ins_initial|ins|upd|del
+---------+---------+-------------+-----------+---+---+---
+tbl_src  |tbl_dst  |tbl_src_old  |          2|  4|  3|  2
+(1 row)
+
 i|j
 -+-
 1|0
@@ -93,3 +97,16 @@ i|j
 7|4
 (4 rows)
 
+step wakeup_after_commit_ip: 
+    SELECT injection_points_wakeup('pg_rewrite-after-commit');
+
+injection_points_wakeup
+-----------------------
+                       
+(1 row)
+
+injection_points_detach
+-----------------------
+                       
+(1 row)
+

pg_rewrite.c

@@ -743,6 +743,13 @@ rewrite_worker_main(Datum main_arg)
 		rewrite_table_impl(relschema, relname, relname_new, relschema_dst,
 						   relname_dst);
 		CommitTransactionCommand();
+
+		/*
+		 * In regression tests, use this injection point to check that
+		 * the changes are visible by other transactions.
+		 */
+		INJECTION_POINT("pg_rewrite-after-commit");
+
 	}
 	PG_CATCH();
 	{

specs/pg_rewrite_concurrent.spec

@@ -22,6 +22,7 @@ session s1
 setup
 {
     SELECT injection_points_attach('pg_rewrite-before-lock', 'wait');
+    SELECT injection_points_attach('pg_rewrite-after-commit', 'wait');
 }
 # Perform the initial load and wait for s2 to do some data changes.
 #
@@ -30,31 +31,15 @@ setup
 # is who waits). Therefore use rewrite_table_nowait(), which only launches the
 # worker and goes on. The 'wait_for_s1_sleep' step below then checks until the
 # waiting started.
-step wait_before_lock
+step do_rewrite
 {
     SELECT rewrite_table_nowait('tbl_src', 'tbl_dst', 'tbl_src_old');
-}
-# Wait until the changes have been surely applied.
-step wait_for_backend_exit
-{
-DO $$
-BEGIN
-        LOOP
-		PERFORM FROM pg_rewrite_progress;
-
-		IF NOT FOUND THEN
-			EXIT;
-		END IF;
-
-		PERFORM pg_sleep(.1);
-	END LOOP;
-END;
-$$;
-
 }
 # Check the data.
 step check
 {
+    TABLE pg_rewrite_progress;
+
     SELECT i, j FROM tbl_src ORDER BY i, j;
 }
 
@@ -63,7 +48,7 @@ session s2
 # does not appear to be waiting on the injection point. Instead we need to
 # check explicitly if the waiting on the injection point is in progress, and
 # wait if it's not.
-step wait_for_s1_sleep
+step wait_for_before_lock_ip
 {
 DO $$
 BEGIN
@@ -103,16 +88,48 @@ step do_changes
 	-- Delete.
 	DELETE FROM tbl_src WHERE i=4;
 }
-step wakeup_before_lock
+step wakeup_before_lock_ip
 {
     SELECT injection_points_wakeup('pg_rewrite-before-lock');
+}
+# Wait until the concurrent changes have been committed by the pg_rewrite
+# worker.
+step wait_for_after_commit_ip
+{
+DO $$
+BEGIN
+        LOOP
+		PERFORM pg_stat_clear_snapshot();
+
+	        PERFORM
+		FROM pg_stat_activity
+		WHERE (wait_event_type, wait_event)=('InjectionPoint', 'pg_rewrite-after-commit');
+
+		IF FOUND THEN
+			EXIT;
+		END IF;
+
+		PERFORM pg_sleep(.1);
+	END LOOP;
+END;
+$$
+}
+# Like wakeup_before_lock_ip above.
+step wakeup_after_commit_ip
+{
+    SELECT injection_points_wakeup('pg_rewrite-after-commit');
+}
+teardown
+{
     SELECT injection_points_detach('pg_rewrite-before-lock');
+    SELECT injection_points_detach('pg_rewrite-after-commit');
 }
 
 permutation
-    wait_before_lock
-    wait_for_s1_sleep
+    do_rewrite
+    wait_for_before_lock_ip
     do_changes
-    wakeup_before_lock
-    wait_for_backend_exit
+    wakeup_before_lock_ip
+    wait_for_after_commit_ip
     check
+    wakeup_after_commit_ip