[PGPRO-7010] - Revision of docker tests for pg_query_state under version 15

tags: pg_query_state

Author: MakSl

.travis.yml

@@ -22,6 +22,8 @@ notifications:
         on_failure: always
 
 env:
+    - PG_VERSION=15 LEVEL=hardcore USE_TPCDS=0
+    - PG_VERSION=15
     - PG_VERSION=14 LEVEL=hardcore USE_TPCDS=0
     - PG_VERSION=14
     - PG_VERSION=13 LEVEL=hardcore USE_TPCDS=0

patches/custom_signals_15.0.patch

@@ -2,10 +2,10 @@ diff --git a/src/backend/storage/ipc/procsignal.c b/src/backend/storage/ipc/proc
 index defb75a..4245d28 100644
 --- a/src/backend/storage/ipc/procsignal.c
 +++ b/src/backend/storage/ipc/procsignal.c
-@@ -95,6 +95,13 @@ typedef struct
+@@ -96,6 +96,13 @@ typedef struct
  #define BARRIER_CLEAR_BIT(flags, type) \
  	((flags) &= ~(((uint32) 1) << (uint32) (type)))
- 
+
 +#define IsCustomProcSignalReason(reason) \
 +	((reason) >= PROCSIG_CUSTOM_1 && (reason) <= PROCSIG_CUSTOM_N)
 +
@@ -15,20 +15,20 @@ index defb75a..4245d28 100644
 +
  static ProcSignalHeader *ProcSignal = NULL;
  static ProcSignalSlot *MyProcSignalSlot = NULL;
- 
-@@ -103,6 +110,8 @@ static void CleanupProcSignalState(int status, Datum arg);
+
+@@ -103,6 +110,8 @@ static bool CheckProcSignal(ProcSignalReason reason);
+ static void CleanupProcSignalState(int status, Datum arg);
  static void ResetProcSignalBarrierBits(uint32 flags);
- static bool ProcessBarrierPlaceholder(void);
- 
+
 +static void CheckAndSetCustomSignalInterrupts(void);
 +
  /*
   * ProcSignalShmemSize
-  *		Compute space needed for procsignal's shared memory
+  *		Compute space needed for ProcSignal's shared memory
 @@ -246,6 +255,36 @@ CleanupProcSignalState(int status, Datum arg)
  	slot->pss_pid = 0;
  }
- 
+
 +/*
 + * RegisterCustomProcSignalHandler
 + *		Assign specific handler of custom process signal with new
@@ -62,7 +62,7 @@ index defb75a..4245d28 100644
  /*
   * SendProcSignal
   *		Send a signal to a Postgres process
-@@ -679,7 +718,62 @@ procsignal_sigusr1_handler(SIGNAL_ARGS)
+@@ -675,7 +714,72 @@ procsignal_sigusr1_handler(SIGNAL_ARGS)
  	if (CheckProcSignal(PROCSIG_RECOVERY_CONFLICT_BUFFERPIN))
  		RecoveryConflictInterrupt(PROCSIG_RECOVERY_CONFLICT_BUFFERPIN);
 
@@ -135,12 +135,12 @@ index defb75a..4245d28 100644
 +
 +	RESUME_INTERRUPTS();
 +}
-\ No newline at end of file
++
 diff --git a/src/backend/tcop/postgres.c b/src/backend/tcop/postgres.c
 index 8cea10c..dd77c98 100644
 --- a/src/backend/tcop/postgres.c
 +++ b/src/backend/tcop/postgres.c
-@@ -3364,6 +3364,8 @@ ProcessInterrupts(void)
+@@ -3402,6 +3402,8 @@ ProcessInterrupts(void)
  	if (ParallelMessagePending)
  		HandleParallelMessages();
 
@@ -186,16 +186,17 @@ index eec186b..74af186 100644
  	NUM_PROCSIGNALS				/* Must be last! */
  } ProcSignalReason;
 
-@@ -56,6 +68,8 @@ typedef enum
- 	 */
- 	PROCSIGNAL_BARRIER_PLACEHOLDER = 0
+@@ -51,6 +63,9 @@ typedef enum
+ {
+ 	PROCSIGNAL_BARRIER_SMGRRELEASE	/* ask smgr to close files */
  } ProcSignalBarrierType;
++
 +/* Handler of custom process signal */
 +typedef void (*ProcSignalHandler_type) (void);
 
  /*
   * prototypes for functions in procsignal.c
-@@ -64,12 +78,15 @@ extern Size ProcSignalShmemSize(void);
+@@ -59,12 +74,15 @@ extern Size ProcSignalShmemSize(void);
  extern void ProcSignalShmemInit(void);
 
  extern void ProcSignalInit(int pss_idx);

patches/runtime_explain_15.0.patch

@@ -2,7 +2,7 @@ diff --git a/src/backend/commands/explain.c b/src/backend/commands/explain.c
 index 10644dfac4..7106ed4257 100644
 --- a/src/backend/commands/explain.c
 +++ b/src/backend/commands/explain.c
-@@ -984,14 +984,36 @@ report_triggers(ResultRelInfo *rInfo, bool show_relname, ExplainState *es)
+@@ -990,14 +990,36 @@ report_triggers(ResultRelInfo *rInfo, bool show_relname, ExplainState *es)
  		char	   *relname;
  		char	   *conname = NULL;
 
@@ -40,7 +40,7 @@ index 10644dfac4..7106ed4257 100644
  			continue;
 
  		ExplainOpenGroup("Trigger", NULL, true, es);
-@@ -1017,9 +1039,9 @@ report_triggers(ResultRelInfo *rInfo, bool show_relname, ExplainState *es)
+@@ -1023,9 +1045,9 @@ report_triggers(ResultRelInfo *rInfo, bool show_relname, ExplainState *es)
  				appendStringInfo(es->str, " on %s", relname);
  			if (es->timing)
  				appendStringInfo(es->str, ": time=%.3f calls=%.0f\n",
@@ -52,7 +52,7 @@ index 10644dfac4..7106ed4257 100644
  		}
  		else
  		{
-@@ -1028,9 +1050,8 @@ report_triggers(ResultRelInfo *rInfo, bool show_relname, ExplainState *es)
+@@ -1034,9 +1056,8 @@ report_triggers(ResultRelInfo *rInfo, bool show_relname, ExplainState *es)
  				ExplainPropertyText("Constraint Name", conname, es);
  			ExplainPropertyText("Relation", relname, es);
  			if (es->timing)
@@ -64,7 +64,7 @@ index 10644dfac4..7106ed4257 100644
  		}
 
  		if (conname)
-@@ -1600,8 +1621,11 @@ ExplainNode(PlanState *planstate, List *ancestors,
+@@ -1609,8 +1630,11 @@ ExplainNode(PlanState *planstate, List *ancestors,
  	 * instrumentation results the user didn't ask for.  But we do the
  	 * InstrEndLoop call anyway, if possible, to reduce the number of cases
  	 * auto_explain has to contend with.
@@ -77,7 +77,7 @@ index 10644dfac4..7106ed4257 100644
  		InstrEndLoop(planstate->instrument);
 
  	if (es->analyze &&
-@@ -1636,7 +1660,7 @@ ExplainNode(PlanState *planstate, List *ancestors,
+@@ -1645,7 +1669,7 @@ ExplainNode(PlanState *planstate, List *ancestors,
  			ExplainPropertyFloat("Actual Loops", NULL, nloops, 0, es);
  		}
  	}
@@ -86,7 +86,7 @@ index 10644dfac4..7106ed4257 100644
  	{
  		if (es->format == EXPLAIN_FORMAT_TEXT)
  			appendStringInfoString(es->str, " (never executed)");
-@@ -1652,6 +1676,75 @@ ExplainNode(PlanState *planstate, List *ancestors,
+@@ -1661,6 +1685,75 @@ ExplainNode(PlanState *planstate, List *ancestors,
  		}
  	}
 
@@ -162,7 +162,7 @@ index 10644dfac4..7106ed4257 100644
  	/* in text format, first line ends here */
  	if (es->format == EXPLAIN_FORMAT_TEXT)
  		appendStringInfoChar(es->str, '\n');
-@@ -2051,6 +2144,9 @@ ExplainNode(PlanState *planstate, List *ancestors,
+@@ -2068,6 +2161,9 @@ ExplainNode(PlanState *planstate, List *ancestors,
 
  	/* Prepare per-worker buffer/WAL usage */
  	if (es->workers_state && (es->buffers || es->wal) && es->verbose)
@@ -172,7 +172,7 @@ index 10644dfac4..7106ed4257 100644
  	{
  		WorkerInstrumentation *w = planstate->worker_instrument;
 
-@@ -3015,6 +3111,11 @@ show_hash_info(HashState *hashstate, ExplainState *es)
+@@ -3032,6 +3128,11 @@ show_hash_info(HashState *hashstate, ExplainState *es)
  		memcpy(&hinstrument, hashstate->hinstrument,
  			   sizeof(HashInstrumentation));
 
@@ -184,7 +184,7 @@ index 10644dfac4..7106ed4257 100644
  	/*
  	 * Merge results from workers.  In the parallel-oblivious case, the
  	 * results from all participants should be identical, except where
-@@ -3392,20 +3493,16 @@ show_instrumentation_count(const char *qlabel, int which,
+@@ -3412,20 +3513,16 @@ show_instrumentation_count(const char *qlabel, int which,
  	if (!es->analyze || !planstate->instrument)
  		return;
 
@@ -209,7 +209,7 @@ index 10644dfac4..7106ed4257 100644
  }
 
  /*
-@@ -3977,15 +4074,27 @@ show_modifytable_info(ModifyTableState *mtstate, List *ancestors,
+@@ -4028,15 +4125,27 @@ show_modifytable_info(ModifyTableState *mtstate, List *ancestors,
  			double		insert_path;
  			double		other_path;
 

tests/test_cases.py

@@ -45,7 +45,7 @@ def test_simple_query(config):
 	acon1, acon2 = common.n_async_connect(config, 2)
 	query = 'select count(*) from foo join bar on foo.c1=bar.c1 and unlock_if_eq_1(foo.c1)=bar.c1'
 	expected = r"""Aggregate \(Current loop: actual rows=\d+, loop number=1\)
-  ->  Hash Join \(Current loop: actual rows=62473, loop number=1\)
+  ->  Hash Join \(Current loop: actual rows=\d+, loop number=1\)
         Hash Cond: \(foo.c1 = bar.c1\)
         Join Filter: \(unlock_if_eq_1\(foo.c1\) = bar.c1\)
         ->  Seq Scan on foo \(Current loop: actual rows=\d+, loop number=1\)
@@ -111,10 +111,10 @@ def test_nested_call(config):
 	expected_nested = r"""Result \(Current loop: actual rows=0, loop number=1\)
   InitPlan 1 \(returns \$0\)
     ->  Aggregate \(Current loop: actual rows=0, loop number=1\)
-          ->  Hash Join \(Current loop: actual rows=62473, loop number=1\)
+          ->  Hash Join \(Current loop: actual rows=\d+, loop number=1\)
                 Hash Cond: \(foo.c1 = bar.c1\)
                 Join Filter: \(unlock_if_eq_1\(foo.c1\) = bar.c1\)
-                ->  Seq Scan on foo \(Current loop: actual rows=1000000, loop number=1\)
+                ->  Seq Scan on foo \(Current loop: actual rows=\d+, loop number=1\)
                 ->  Hash \(Current loop: actual rows=500000, loop number=1\)
                       Buckets: \d+  Batches: \d+  Memory Usage: \d+kB
                       ->  Seq Scan on bar \(Current loop: actual rows=\d+, loop number=1\)"""
@@ -232,7 +232,7 @@ def test_costs(config):
   ->  Hash Join  \(cost=\d+.\d+..\d+.\d+ rows=\d+ width=0\) \(Current loop: actual rows=\d+, loop number=1\)
         Hash Cond: \(foo.c1 = bar.c1\)
         Join Filter: \(unlock_if_eq_1\(foo.c1\) = bar.c1\)
-        ->  Seq Scan on foo  \(cost=0.00..\d+.\d+ rows=\d+ width=4\) \(Current loop: actual rows=1000000, loop number=1\)
+        ->  Seq Scan on foo  \(cost=0.00..\d+.\d+ rows=\d+ width=4\) \(Current loop: actual rows=\d+, loop number=1\)
         ->  Hash  \(cost=\d+.\d+..\d+.\d+ rows=\d+ width=4\) \(Current loop: actual rows=500000, loop number=1\)
               Buckets: \d+  Batches: \d+  Memory Usage: \d+kB
               ->  Seq Scan on bar  \(cost=0.00..\d+.\d+ rows=\d+ width=4\) \(Current loop: actual rows=\d+, loop number=1\)"""
@@ -249,25 +249,33 @@ def test_buffers(config):
 
 	acon1, acon2 = common.n_async_connect(config, 2)
 	query = 'select count(*) from foo join bar on foo.c1=bar.c1 and unlock_if_eq_1(foo.c1)=bar.c1'
-	expected = r"""Aggregate \(Current loop: actual rows=0, loop number=1\)
+	temporary = r"""Aggregate \(Current loop: actual rows=0, loop number=1\)
   ->  Hash Join \(Current loop: actual rows=\d+, loop number=1\)
         Hash Cond: \(foo.c1 = bar.c1\)
-        Join Filter: \(unlock_if_eq_1\(foo.c1\) = bar.c1\)
-        Buffers: shared hit=\d+, temp read=\d+ written=\d+
-        ->  Seq Scan on foo \(Current loop: actual rows=1000000, loop number=1\)
+        Join Filter: \(unlock_if_eq_1\(foo.c1\) = bar.c1\)"""
+	expected = temporary
+	expected_15 = temporary
+	expected += r"""
+        Buffers: shared hit=\d+, temp read=\d+ written=\d+"""
+	expected_15 += r"""
+        Buffers: shared hit=\d+, temp written=\d+"""
+	temporary = r"""
+        ->  Seq Scan on foo \(Current loop: actual rows=\d+, loop number=1\)
               Buffers: [^\n]*
         ->  Hash \(Current loop: actual rows=500000, loop number=1\)
               Buckets: \d+  Batches: \d+  Memory Usage: \d+kB
               Buffers: shared hit=\d+, temp written=\d+
               ->  Seq Scan on bar \(Current loop: actual rows=\d+, loop number=1\)
                     Buffers: .*"""
+	expected += temporary
+	expected_15 += temporary
 
 	common.set_guc(acon1, 'pg_query_state.enable_buffers', 'on')
 
 	qs, notices = common.onetime_query_state_locks(config, acon1, acon2, query, {'buffers': True})
 
 	assert len(qs) == 2
-	assert re.match(expected, qs[0][3])
+	assert (re.match(expected, qs[0][3]) or re.match(expected_15, qs[0][3]))
 	assert len(notices) == 0
 
 	common.n_close((acon1, acon2))
@@ -282,7 +290,7 @@ def test_timing(config):
   ->  Hash Join \(Current loop: actual time=\d+.\d+..\d+.\d+ rows=\d+, loop number=1\)
         Hash Cond: \(foo.c1 = bar.c1\)
         Join Filter: \(unlock_if_eq_1\(foo.c1\) = bar.c1\)
-        ->  Seq Scan on foo \(Current loop: actual time=\d+.\d+..\d+.\d+ rows=1000000, loop number=1\)
+        ->  Seq Scan on foo \(Current loop: actual time=\d+.\d+..\d+.\d+ rows=\d+, loop number=1\)
         ->  Hash \(Current loop: actual time=\d+.\d+..\d+.\d+ rows=500000, loop number=1\)
               Buckets: \d+  Batches: \d+  Memory Usage: \d+kB
               ->  Seq Scan on bar \(Current loop: actual time=\d+.\d+..\d+.\d+ rows=\d+, loop number=1\)"""