Fix compability with 9.6

ildus · ildus · commit 03bb2cff8c6b · 2017-12-08T17:17:07.000+03:00
diff --git a/expected/load.out b/expected/load.out
@@ -6,6 +6,7 @@ View "public.pg_wait_sampling_current"
  pid        | integer | 
  event_type | text    | 
  event      | text    | 
+ queryid    | bigint  | 
 
 \d pg_wait_sampling_history
       View "public.pg_wait_sampling_history"
@@ -15,6 +16,7 @@ View "public.pg_wait_sampling_current"
  ts         | timestamp with time zone | 
  event_type | text                     | 
  event      | text                     | 
+ queryid    | bigint                   | 
 
 \d pg_wait_sampling_profile
 View "public.pg_wait_sampling_profile"
@@ -23,6 +25,7 @@ View "public.pg_wait_sampling_profile"
  pid        | integer | 
  event_type | text    | 
  event      | text    | 
+ queryid    | bigint  | 
  count      | bigint  | 
 
 DROP EXTENSION pg_wait_sampling;
diff --git a/pg_wait_sampling.c b/pg_wait_sampling.c
@@ -775,14 +775,20 @@ pgws_planner_hook(Query *parse, int cursorOptions,
 	if (MyProc)
 	{
 		int i = MyProc - ProcGlobal->allProcs;
+#if PG_VERSION_NUM >= 110000
 		/*
 		 * since we depend on queryId we need to check that its size
 		 * is uint64 as we coded in pg_wait_sampling
 		 */
 		StaticAssertExpr(sizeof(parse->queryId) == sizeof(uint64),
 				"queryId size is not uint64");
-		if (proc_queryids[i] == UINT64CONST(0))
+#else
+		StaticAssertExpr(sizeof(parse->queryId) == sizeof(uint32),
+				"queryId size is not uint32");
+#endif
+		if (!proc_queryids[i])
 			proc_queryids[i] = parse->queryId;
+
 	}
 
 	/* Invoke original hook if needed */
