Update pg_query_state to PostgreSQL 18

1. Change backend status to text conversion due to possible status set changes
2. Update Travis CI

Author: Ekaterina Sokolova

.travis.yml

@@ -22,22 +22,21 @@ notifications:
         on_failure: always
 
 env:
+    - PG_VERSION=18
     - PG_VERSION=17
     - PG_VERSION=16 LEVEL=hardcore USE_TPCDS=0
     - PG_VERSION=16
     - 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
     - PG_VERSION=13
-    - PG_VERSION=12 LEVEL=hardcore USE_TPCDS=0
     - PG_VERSION=12
     - PG_VERSION=10
     - PG_VERSION=9.6
 
 matrix:
     allow_failures:
-        - env: PG_VERSION=13 LEVEL=hardcore USE_TPCDS=1
+        - env: PG_VERSION=12
         - env: PG_VERSION=10
         - env: PG_VERSION=9.6

Makefile

@@ -13,6 +13,7 @@ PGFILEDESC = "pg_query_state - facility to track progress of plan execution"
 EXTRA_CLEAN = ./isolation_output $(EXTENSION)--$(EXTVERSION).sql \
 	Dockerfile ./tests/*.pyc ./tmp_stress
 
+ISOLATION = corner_cases
 ISOLATION_OPTS = --load-extension=pg_query_state
 
 TAP_TESTS = 1

pg_query_state.c

@@ -67,16 +67,7 @@ List					*QueryDescStack = NIL;
 static ProcSignalReason UserIdPollReason = INVALID_PROCSIGNAL;
 static ProcSignalReason QueryStatePollReason = INVALID_PROCSIGNAL;
 static ProcSignalReason WorkerPollReason = INVALID_PROCSIGNAL;
-static bool			module_initialized = false;
-static const char		*be_state_str[] = {						/* BackendState -> string repr */
-							"undefined",						/* STATE_UNDEFINED */
-							"idle",								/* STATE_IDLE */
-							"active",							/* STATE_RUNNING */
-							"idle in transaction",				/* STATE_IDLEINTRANSACTION */
-							"fastpath function call",			/* STATE_FASTPATH */
-							"idle in transaction (aborted)",	/* STATE_IDLEINTRANSACTION_ABORTED */
-							"disabled",							/* STATE_DISABLED */
-						};
+static bool				module_initialized = false;
 static int              reqid = 0;
 
 typedef struct
@@ -352,6 +343,37 @@ qs_ExecutorFinish(QueryDesc *queryDesc)
 	PG_END_TRY();
 }
 
+/*
+ *	Convert BackendState to string description
+ */
+static const char *
+be_state_str(BackendState be_state)
+{
+	switch (be_state)
+	{
+		case STATE_UNDEFINED:
+			return "undefined";
+#if PG_VERSION_NUM >= 180000
+		case STATE_STARTING:
+			return "starting";
+#endif
+		case STATE_IDLE:
+			return "idle";
+		case STATE_RUNNING:
+			return "active";
+		case STATE_IDLEINTRANSACTION:
+			return "idle in transaction";
+		case STATE_FASTPATH:
+			return "fastpath function call";
+		case STATE_IDLEINTRANSACTION_ABORTED:
+			return "idle in transaction (aborted)";
+		case STATE_DISABLED:
+			return "disabled";
+		default:
+			return "unknown";
+	}
+}
+
 /*
  * Find PgBackendStatus entry
  */
@@ -598,7 +620,7 @@ pg_query_state(PG_FUNCTION_ARGS)
 
 					if (be_status)
 						elog(INFO, "state of backend is %s",
-								be_state_str[be_status->st_state - STATE_UNDEFINED]);
+								be_state_str(be_status->st_state));
 					else
 						elog(INFO, "backend is not running query");
 

signal_handler.c

@@ -12,6 +12,7 @@
 
 #include "commands/explain.h"
 #if PG_VERSION_NUM >= 180000
+#include "commands/explain_state.h"
 #include "commands/explain_format.h"
 #endif
 #include "miscadmin.h"