Fix #4, add more tests

ildus · ildus · commit 23438fe49e19 · 2017-11-08T13:55:22.000+03:00
diff --git a/Makefile b/Makefile
@@ -6,7 +6,7 @@ OBJS = pg_wait_sampling.o collector.o
 EXTENSION = pg_wait_sampling
 DATA = pg_wait_sampling--1.0.sql
 
-REGRESS = load
+REGRESS = load queries
 
 EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add
 
diff --git a/collector.c b/collector.c
@@ -399,7 +399,11 @@ collector_main(Datum main_arg)
 						send_profile(profile_hash, mqh);
 					}
 				}
+#if PG_VERSION_NUM >= 100000
+				shm_mq_detach(mqh);
+#else
 				shm_mq_detach(collector_mq);
+#endif
 			}
 			else if (request == PROFILE_RESET)
 			{
diff --git a/expected/load.out b/expected/load.out
@@ -16,4 +16,13 @@ View "public.pg_wait_sampling_current"
  event_type | text                     | 
  event      | text                     | 
 
+\d pg_wait_sampling_profile
+View "public.pg_wait_sampling_profile"
+   Column   |  Type   | Modifiers 
+------------+---------+-----------
+ pid        | integer | 
+ event_type | text    | 
+ event      | text    | 
+ count      | bigint  | 
+
 DROP EXTENSION pg_wait_sampling;
diff --git a/expected/load_1.out b/expected/load_1.out
@@ -16,4 +16,13 @@ CREATE EXTENSION pg_wait_sampling;
  event_type | text                     |           |          | 
  event      | text                     |           |          | 
 
+\d pg_wait_sampling_profile
+        View "public.pg_wait_sampling_profile"
+   Column   |  Type   | Collation | Nullable | Default 
+------------+---------+-----------+----------+---------
+ pid        | integer |           |          | 
+ event_type | text    |           |          | 
+ event      | text    |           |          | 
+ count      | bigint  |           |          | 
+
 DROP EXTENSION pg_wait_sampling;
diff --git a/pg_wait_sampling.c b/pg_wait_sampling.c
@@ -482,7 +482,11 @@ receive_array(SHMRequest request, Size item_size, Size *count)
 		ptr += item_size;
 	}
 
+#if PG_VERSION_NUM >= 100000
+	shm_mq_detach(mqh);
+#else
 	shm_mq_detach(mq);
+#endif
 
 	LockRelease(&queueTag, ExclusiveLock, false);
 
diff --git a/sql/load.sql b/sql/load.sql
@@ -1,7 +1,7 @@
 CREATE EXTENSION pg_wait_sampling;
 
 \d pg_wait_sampling_current
-
 \d pg_wait_sampling_history
+\d pg_wait_sampling_profile
 
 DROP EXTENSION pg_wait_sampling;

Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,11 @@ collector_main(Datum main_arg)`
`399`	`399`	`send_profile(profile_hash, mqh);`
`400`	`400`	`}`
`401`	`401`	`}`
	`402`	`+#if PG_VERSION_NUM >= 100000`
	`403`	`+ shm_mq_detach(mqh);`
	`404`	`+#else`
`402`	`405`	`shm_mq_detach(collector_mq);`
	`406`	`+#endif`
`403`	`407`	`}`
`404`	`408`	`else if (request == PROFILE_RESET)`
`405`	`409`	`{`
Original file line number	Diff line number	Diff line change
`@@ -482,7 +482,11 @@ receive_array(SHMRequest request, Size item_size, Size *count)`
`482`	`482`	`ptr += item_size;`
`483`	`483`	`}`
`484`	`484`
	`485`	`+#if PG_VERSION_NUM >= 100000`
	`486`	`+ shm_mq_detach(mqh);`
	`487`	`+#else`
`485`	`488`	`shm_mq_detach(mq);`
	`489`	`+#endif`
`486`	`490`
`487`	`491`	`LockRelease(&queueTag, ExclusiveLock, false);`
`488`	`492`