Merge branch 'master' into isolation_tests

Author: maksm90

.gitignore

@@ -2,7 +2,6 @@
 *.o
 *.so
 /results
-*pg_wait_sampling--1.1.sql
 .log
 Dockerfile
 /log/

.travis.yml

@@ -17,15 +17,16 @@ script:
     - docker-compose run tests
 
 env:
-    - PG_VERSION=9.6 CHECK_CODE=clang
-    - PG_VERSION=9.6 CHECK_CODE=cppcheck
-    - PG_VERSION=9.6 CHECK_CODE=false
-    - PG_VERSION=10  CHECK_CODE=clang
-    - PG_VERSION=10  CHECK_CODE=cppcheck
-    - PG_VERSION=10  CHECK_CODE=false
-    - PG_VERSION=11  CHECK_CODE=clang
-    - PG_VERSION=11  CHECK_CODE=false
-    - PG_VERSION=12  CHECK_CODE=clang
-    - PG_VERSION=12  CHECK_CODE=false
-    - PG_VERSION=13  CHECK_CODE=clang
-    - PG_VERSION=13  CHECK_CODE=false
+    - PG_VERSION=10      CHECK_CODE=clang
+    - PG_VERSION=10      CHECK_CODE=cppcheck
+    - PG_VERSION=10      CHECK_CODE=false
+    - PG_VERSION=11      CHECK_CODE=clang
+    - PG_VERSION=11      CHECK_CODE=false
+    - PG_VERSION=12      CHECK_CODE=clang
+    - PG_VERSION=12      CHECK_CODE=false
+    - PG_VERSION=13      CHECK_CODE=clang
+    - PG_VERSION=13      CHECK_CODE=false
+    - PG_VERSION=14      CHECK_CODE=clang
+    - PG_VERSION=14      CHECK_CODE=false
+    - PG_VERSION=15beta3 CHECK_CODE=clang
+    - PG_VERSION=15beta3 CHECK_CODE=false

Makefile

@@ -1,18 +1,14 @@
 # contrib/pg_wait_sampling/Makefile
 
 MODULE_big = pg_wait_sampling
-OBJS = pg_wait_sampling.o collector.o compat.o
+OBJS = pg_wait_sampling.o collector.o
 
 EXTENSION = pg_wait_sampling
-EXTVERSION = 1.1
-DATA_built = pg_wait_sampling--$(EXTVERSION).sql
-DATA = pg_wait_sampling--1.0--1.1.sql
+DATA = pg_wait_sampling--1.1.sql pg_wait_sampling--1.0--1.1.sql
 
 REGRESS = load queries
 ISOLATION_TESTS = queryid bfv_queryid_for_relation_lock
 
-EXTRA_CLEAN = pg_wait_sampling--$(EXTVERSION).sql
-
 ifdef USE_PGXS
 PG_CONFIG = pg_config
 PGXS = $(shell $(PG_CONFIG) --pgxs)
@@ -31,9 +27,6 @@ include $(top_builddir)/src/Makefile.global
 include $(top_srcdir)/contrib/contrib-global.mk
 endif
 
-$(EXTENSION)--$(EXTVERSION).sql: setup.sql
-	cat $^ > $@
-
 # Prepare the package for PGXN submission
 package: dist .git
 	$(eval DISTVERSION := $(shell git tag -l | tail -n 1 | cut -d 'v' -f 2))

collector.c

@@ -26,6 +26,7 @@
 #include "utils/resowner.h"
 #include "pgstat.h"
 
+#include "compat.h"
 #include "pg_wait_sampling.h"
 
 static volatile sig_atomic_t shutdown_requested = false;
@@ -36,7 +37,7 @@ static void handle_sigterm(SIGNAL_ARGS);
  * Register background worker for collecting waits history.
  */
 void
-register_wait_collector(void)
+pgws_register_wait_collector(void)
 {
 	BackgroundWorker worker;
 
@@ -47,7 +48,7 @@ register_wait_collector(void)
 	worker.bgw_restart_time = 1;
 	worker.bgw_notify_pid = 0;
 	snprintf(worker.bgw_library_name, BGW_MAXLEN, "pg_wait_sampling");
-	snprintf(worker.bgw_function_name, BGW_MAXLEN, CppAsString(collector_main));
+	snprintf(worker.bgw_function_name, BGW_MAXLEN, CppAsString(pgws_collector_main));
 	snprintf(worker.bgw_name, BGW_MAXLEN, "pg_wait_sampling collector");
 	worker.bgw_main_arg = (Datum) 0;
 	RegisterBackgroundWorker(&worker);
@@ -56,7 +57,7 @@ register_wait_collector(void)
 /*
  * Allocate memory for waits history.
  */
-void
+static void
 alloc_history(History *observations, int count)
 {
 	observations->items = (HistoryItem *) palloc0(sizeof(HistoryItem) * count);
@@ -150,7 +151,7 @@ probe_waits(History *observations, HTAB *profile_hash,
 	TimestampTz	ts = GetCurrentTimestamp();
 
 	/* Realloc waits history if needed */
-	newSize = collector_hdr->historySize;
+	newSize = pgws_collector_hdr->historySize;
 	if (observations->count != newSize)
 		realloc_history(observations, newSize);
 
@@ -172,8 +173,8 @@ probe_waits(History *observations, HTAB *profile_hash,
 		item.pid = proc->pid;
 		item.wait_event_info = proc->wait_event_info;
 
-		if (collector_hdr->profileQueries)
-			item.queryId = proc_queryids[i];
+		if (pgws_collector_hdr->profileQueries)
+			item.queryId = pgws_proc_queryids[i];
 		else
 			item.queryId = 0;
 
@@ -291,7 +292,7 @@ make_profile_hash()
 	hash_ctl.hash = tag_hash;
 	hash_ctl.hcxt = TopMemoryContext;
 
-	if (collector_hdr->profileQueries)
+	if (pgws_collector_hdr->profileQueries)
 		hash_ctl.keysize = offsetof(ProfileItem, count);
 	else
 		hash_ctl.keysize = offsetof(ProfileItem, queryId);
@@ -320,7 +321,7 @@ millisecs_diff(TimestampTz tz1, TimestampTz tz2)
  * Main routine of wait history collector.
  */
 void
-collector_main(Datum main_arg)
+pgws_collector_main(Datum main_arg)
 {
 	HTAB		   *profile_hash = NULL;
 	History			observations;
@@ -350,25 +351,20 @@ collector_main(Datum main_arg)
 	pqsignal(SIGTERM, handle_sigterm);
 	pqsignal(SIGUSR1, procsignal_sigusr1_handler);
 	BackgroundWorkerUnblockSignals();
-
-#if PG_VERSION_NUM >= 110000
-	InitPostgres(NULL, InvalidOid, NULL, InvalidOid, NULL, false);
-#else
-	InitPostgres(NULL, InvalidOid, NULL, InvalidOid, NULL);
-#endif
+	InitPostgresCompat(NULL, InvalidOid, NULL, InvalidOid, false, false, NULL);
 	SetProcessingMode(NormalProcessing);
 
 	/* Make pg_wait_sampling recognisable in pg_stat_activity */
 	pgstat_report_appname("pg_wait_sampling collector");
 
 	profile_hash = make_profile_hash();
-	collector_hdr->latch = &MyProc->procLatch;
+	pgws_collector_hdr->latch = &MyProc->procLatch;
 
 	CurrentResourceOwner = ResourceOwnerCreate(NULL, "pg_wait_sampling collector");
 	collector_context = AllocSetContextCreate(TopMemoryContext,
 			"pg_wait_sampling context", ALLOCSET_DEFAULT_SIZES);
 	old_context = MemoryContextSwitchTo(collector_context);
-	alloc_history(&observations, collector_hdr->historySize);
+	alloc_history(&observations, pgws_collector_hdr->historySize);
 	MemoryContextSwitchTo(old_context);
 
 	ereport(LOG, (errmsg("pg_wait_sampling collector started")));
@@ -395,16 +391,16 @@ collector_main(Datum main_arg)
 
 		history_diff = millisecs_diff(history_ts, current_ts);
 		profile_diff = millisecs_diff(profile_ts, current_ts);
-		history_period = collector_hdr->historyPeriod;
-		profile_period = collector_hdr->profilePeriod;
+		history_period = pgws_collector_hdr->historyPeriod;
+		profile_period = pgws_collector_hdr->profilePeriod;
 
 		write_history = (history_diff >= (int64)history_period);
 		write_profile = (profile_diff >= (int64)profile_period);
 
 		if (write_history || write_profile)
 		{
 			probe_waits(&observations, profile_hash,
-						write_history, write_profile, collector_hdr->profilePid);
+						write_history, write_profile, pgws_collector_hdr->profilePid);
 
 			if (write_history)
 			{
@@ -443,23 +439,24 @@ collector_main(Datum main_arg)
 		ResetLatch(&MyProc->procLatch);
 
 		/* Handle request if any */
-		if (collector_hdr->request != NO_REQUEST)
+		if (pgws_collector_hdr->request != NO_REQUEST)
 		{
 			LOCKTAG		tag;
-			SHMRequest	request = collector_hdr->request;
+			SHMRequest	request;
 
-			init_lock_tag(&tag, PGWS_COLLECTOR_LOCK);
+			pgws_init_lock_tag(&tag, PGWS_COLLECTOR_LOCK);
 
 			LockAcquire(&tag, ExclusiveLock, false, false);
-			collector_hdr->request = NO_REQUEST;
+			request = pgws_collector_hdr->request;
+			pgws_collector_hdr->request = NO_REQUEST;
 
 			if (request == HISTORY_REQUEST || request == PROFILE_REQUEST)
 			{
 				shm_mq_result	mq_result;
 
 				/* Send history or profile */
-				shm_mq_set_sender(collector_mq, MyProc);
-				mqh = shm_mq_attach(collector_mq, NULL, NULL);
+				shm_mq_set_sender(pgws_collector_mq, MyProc);
+				mqh = shm_mq_attach(pgws_collector_mq, NULL, NULL);
 				mq_result = shm_mq_wait_for_attach(mqh);
 				switch (mq_result)
 				{
@@ -485,7 +482,7 @@ collector_main(Datum main_arg)
 					default:
 						AssertState(false);
 				}
-				shm_mq_detach_compat(mqh, collector_mq);
+				shm_mq_detach_compat(mqh, pgws_collector_mq);
 			}
 			else if (request == PROFILE_RESET)
 			{

compat.c

@@ -0,0 +1,68 @@
+/*
+ * compat.h
+ *		Definitions for function wrappers compatible between PG versions.
+ *
+ * Copyright (c) 2015-2022, Postgres Professional
+ *
+ * IDENTIFICATION
+ *	  contrib/pg_wait_sampling/compat.h
+ */
+#ifndef __COMPAT_H__
+#define __COMPAT_H__
+
+#include "postgres.h"
+
+#include "access/tupdesc.h"
+#include "miscadmin.h"
+#include "storage/shm_mq.h"
+
+static inline TupleDesc
+CreateTemplateTupleDescCompat(int nattrs, bool hasoid)
+{
+#if PG_VERSION_NUM >= 120000
+	return CreateTemplateTupleDesc(nattrs);
+#else
+	return CreateTemplateTupleDesc(nattrs, hasoid);
+#endif
+}
+
+static inline void
+shm_mq_detach_compat(shm_mq_handle *mqh, shm_mq *mq)
+{
+#if PG_VERSION_NUM >= 100000
+	shm_mq_detach(mqh);
+#else
+	shm_mq_detach(mq);
+#endif
+}
+
+static inline shm_mq_result
+shm_mq_send_compat(shm_mq_handle *mqh, Size nbytes, const void *data,
+				   bool nowait, bool force_flush)
+{
+#if PG_VERSION_NUM >= 150000
+	return shm_mq_send(mqh, nbytes, data, nowait, force_flush);
+#else
+	return shm_mq_send(mqh, nbytes, data, nowait);
+#endif
+}
+
+static inline void
+InitPostgresCompat(const char *in_dbname, Oid dboid,
+				   const char *username, Oid useroid,
+				   bool load_session_libraries,
+				   bool override_allow_connections,
+				   char *out_dbname)
+{
+#if PG_VERSION_NUM >= 150000
+	InitPostgres(in_dbname, dboid, username, useroid, load_session_libraries,
+				 override_allow_connections, out_dbname);
+#elif PG_VERSION_NUM >= 110000
+	InitPostgres(in_dbname, dboid, username, useroid, out_dbname,
+				 override_allow_connections);
+#else
+	InitPostgres(in_dbname, dboid, username, useroid, out_dbname);
+#endif
+}
+
+#endif