Merge branch 'PGPROEE9_6' of git.postgrespro.ru:pgpro-dev/postgrespro into PGPROEE9_6

Alexander Korotkov · Alexander Korotkov · commit d14744add4f8 · 2017-01-20T13:22:24.000+03:00
diff --git a/contrib/pgpro_scheduler/Makefile b/contrib/pgpro_scheduler/Makefile
@@ -6,10 +6,9 @@ OBJS = src/pgpro_scheduler.o src/cron_string.o src/sched_manager_poll.o \
 	$(WIN32RES)
 EXTENSION = pgpro_scheduler
 DATA = pgpro_scheduler--1.0.sql
-#SCRIPTS = bin/pgpro_scheduler
-#REGRESS	= install_pgpro_scheduler cron_string
-#REGRESS_OPTS = --create-role=robot --user=postgres
-#CFLAGS=-ggdb -Og -g3 -fno-omit-frame-pointer
+REGRESS	= install_pgpro_scheduler cron_string
+#REGRESS_OPTS = --user=postgres
+EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add
 
 ifdef USE_PGXS
 	PG_CONFIG = pg_config
diff --git a/contrib/pgpro_scheduler/conf.add b/contrib/pgpro_scheduler/conf.add
@@ -0,0 +1 @@
+shared_preload_libraries='pgpro_scheduler'
diff --git a/contrib/pgpro_scheduler/expected/cron_string.out b/contrib/pgpro_scheduler/expected/cron_string.out
@@ -0,0 +1,63 @@
+create user __temp_robot;
+select schedule.create_job(
+    '{
+        "name": "Test @reboot",
+        "cron": "@reboot",
+        "command": "show all",
+        "run_as": "__temp_robot"
+    }'
+);
+ create_job 
+------------
+          1
+(1 row)
+
+select schedule.create_job(
+    '{
+        "name": "Test 1",
+        "cron": "* * * * *",
+        "command": "select ''this is every minute job''",
+        "run_as": "__temp_robot",
+        "last_start_available": "2 hours"
+    }'
+);
+ create_job 
+------------
+          2
+(1 row)
+
+select schedule.create_job(
+    '{
+        "name": "Test 2 4/4 2/4 * * *",
+        "cron": "4/4 2/4 * * *",
+        "command": "select pg_sleep(10)",
+        "run_as": "__temp_robot"
+    }'
+);
+ create_job 
+------------
+          3
+(1 row)
+
+select schedule.create_job(
+	'{
+		"name": "Test 3",
+		"cron": "23 1 * * THU,SUN",
+		"command": "select ''ok'' as ok"
+	}'
+);
+ create_job 
+------------
+          4
+(1 row)
+
+select id,node,name,rule,do_sql,same_transaction, postpone,retry from schedule.cron order by id;
+ id |  node  |         name         |                                                                                                                                                                                                                                                                                             rule                                                                                                                                                                                                                                                                                             |                do_sql                 | same_transaction | postpone  | retry 
+----+--------+----------------------+----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------+---------------------------------------+------------------+-----------+-------
+  1 | master | Test @reboot         | {"crontab": "@reboot", "onstart": 1}                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                         | {"show all"}                          | f                |           |     0
+  2 | master | Test 1               | {"days": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31], "hours": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23], "wdays": [0, 1, 2, 3, 4, 5, 6], "months": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], "crontab": "* * * * *", "minutes": [0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59]} | {"select 'this is every minute job'"} | f                | @ 2 hours |     0
+  3 | master | Test 2 4/4 2/4 * * * | {"days": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31], "hours": [2, 6, 10, 14, 18, 22], "wdays": [0, 1, 2, 3, 4, 5, 6], "months": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], "crontab": "4/4 2/4 * * *", "minutes": [4, 8, 12, 16, 20, 24, 28, 32, 36, 40, 44, 48, 52, 56]}                                                                                                                                                                                                                                             | {"select pg_sleep(10)"}               | f                |           |     0
+  4 | master | Test 3               | {"days": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31], "hours": [1], "wdays": [0, 4], "months": [1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12], "crontab": "23 1 * * THU,SUN", "minutes": [23]}                                                                                                                                                                                                                                                                                                                              | {"select 'ok' as ok"}                 | f                |           |     0
+(4 rows)
+
+drop user __temp_robot;
diff --git a/contrib/pgpro_scheduler/expected/install_pgpro_scheduler.out b/contrib/pgpro_scheduler/expected/install_pgpro_scheduler.out
@@ -0,0 +1 @@
+CREATE EXTENSION pgpro_scheduler;
diff --git a/contrib/pgpro_scheduler/sql/cron_string.sql b/contrib/pgpro_scheduler/sql/cron_string.sql
@@ -0,0 +1,41 @@
+create user __temp_robot;
+select schedule.create_job(
+    '{
+        "name": "Test @reboot",
+        "cron": "@reboot",
+        "command": "show all",
+        "run_as": "__temp_robot"
+    }'
+);
+
+select schedule.create_job(
+    '{
+        "name": "Test 1",
+        "cron": "* * * * *",
+        "command": "select ''this is every minute job''",
+        "run_as": "__temp_robot",
+        "last_start_available": "2 hours"
+    }'
+);
+
+select schedule.create_job(
+    '{
+        "name": "Test 2 4/4 2/4 * * *",
+        "cron": "4/4 2/4 * * *",
+        "command": "select pg_sleep(10)",
+        "run_as": "__temp_robot"
+    }'
+);
+
+select schedule.create_job(
+	'{
+		"name": "Test 3",
+		"cron": "23 1 * * THU,SUN",
+		"command": "select ''ok'' as ok"
+	}'
+);
+
+select id,node,name,rule,do_sql,same_transaction, postpone,retry from schedule.cron order by id;
+
+
+drop user __temp_robot;
diff --git a/contrib/pgpro_scheduler/sql/install_pgpro_scheduler.sql b/contrib/pgpro_scheduler/sql/install_pgpro_scheduler.sql
@@ -0,0 +1 @@
+CREATE EXTENSION pgpro_scheduler;
diff --git a/contrib/pgpro_scheduler/src/cron_string.c b/contrib/pgpro_scheduler/src/cron_string.c
@@ -4,6 +4,7 @@
 #include <stdarg.h>
 #include "cron_string.h"
 #include "postgres.h"
+#include "port.h"
 
 
 char *cps_month_subst_data[12] = { "JAN", "FEB", "MAR", "APR", "MAY", "JUN", "JUL", "AUG", "SEP", "OCT", "NOV", "DEC" };
@@ -18,7 +19,7 @@ void _cps_set_error(int num, const char *message, ...)
 
 	cps_error = num;
 	va_start(arglist, message);
-	vsnprintf(cps_error_buffer, 512, message, arglist);
+	pvsnprintf(cps_error_buffer, 512, message, arglist);
 	va_end(arglist);
 }
 
diff --git a/contrib/pgpro_scheduler/src/pgpro_scheduler.c b/contrib/pgpro_scheduler/src/pgpro_scheduler.c
@@ -1,4 +1,5 @@
 #include "postgres.h"
+#include "port.h"
 
 #include "miscadmin.h"
 #include "postmaster/bgworker.h"
@@ -380,7 +381,7 @@ pg_scheduler_startup(void)
 {
 	BackgroundWorker worker;
 
-	elog(LOG, "Start PostgresPro scheduler");
+	elog(LOG, "Start PostgresPro scheduler.");
 
 	worker.bgw_flags = BGWORKER_SHMEM_ACCESS |
 		BGWORKER_BACKEND_DATABASE_CONNECTION;
diff --git a/contrib/pgpro_scheduler/src/scheduler_executor.c b/contrib/pgpro_scheduler/src/scheduler_executor.c
@@ -30,6 +30,8 @@
 #include "memutils.h"
 #include "utils/elog.h"
 
+#include "port.h"
+
 extern volatile sig_atomic_t got_sighup;
 extern volatile sig_atomic_t got_sigterm;
 
@@ -462,7 +464,7 @@ int push_executor_error(executor_error_t *e, char *fmt, ...)
 	int len;
 
 	va_start(arglist, fmt);
-	len = vsnprintf(buf, 1024, fmt, arglist);
+	len = pvsnprintf(buf, 1024, fmt, arglist);
 	va_end(arglist);
 
 	if(e->n == 0)
diff --git a/contrib/pgpro_scheduler/src/scheduler_job.c b/contrib/pgpro_scheduler/src/scheduler_job.c
@@ -9,6 +9,7 @@
 #include "utils/timestamp.h"
 #include "utils/builtins.h"
 #include "memutils.h"
+#include "port.h"
 
 job_t *init_scheduler_job(job_t *j)
 {
@@ -100,7 +101,7 @@ job_t *set_job_error(job_t *j, const char *fmt, ...)
 	char buf[1024];
 
 	va_start(arglist, fmt);
-	vsnprintf(buf, 1024, fmt, arglist);
+	pvsnprintf(buf, 1024, fmt, arglist);
 	va_end(arglist);
 
 	if(j->error) pfree(j->error);
diff --git a/contrib/pgpro_scheduler/src/scheduler_manager.c b/contrib/pgpro_scheduler/src/scheduler_manager.c
@@ -37,6 +37,8 @@
 #include "memutils.h"
 #include "scheduler_executor.h"
 
+#include "port.h"
+
 #define REALLOC_STEP	40
 
 extern volatile sig_atomic_t got_sighup;
@@ -1368,7 +1370,7 @@ void manager_fatal_error(scheduler_manager_ctx_t *ctx, int ecode, char *message,
     dsm_detach(ctx->seg);
 
 	va_start(arglist, message);
-	vsnprintf(buf, 1024, message, arglist);
+	pvsnprintf(buf, 1024, message, arglist);
 	va_end(arglist);
 
 
diff --git a/src/backend/storage/file/cfs.c b/src/backend/storage/file/cfs.c
@@ -559,6 +559,8 @@ static bool cfs_gc_file(char* map_path)
 						close(md2);
 						md2 = -1;
 						newSize = pg_atomic_read_u32(&newMap->usedSize);
+						virtSize = pg_atomic_read_u32(&newMap->virtSize);
+						n_pages = virtSize / BLCKSZ;
 						remove_backups = false;
 						goto ReplaceMap;
 					}
diff --git a/src/backend/storage/file/fd.c b/src/backend/storage/file/fd.c
@@ -2122,7 +2122,8 @@ FileTruncate(File file, off_t offset)
 		pg_atomic_write_u32(&map->virtSize, offset);
 		pg_atomic_fetch_sub_u32(&map->usedSize, released);
 		cfs_unlock_file(map);
-		returnCode = 0;
+		/* We can truncate compressed file only with zero offset */
+		returnCode = (offset == 0) ? ftruncate(VfdCache[file].fd, 0) : 0;
 	} else  {
 		returnCode = ftruncate(VfdCache[file].fd, offset);
 	}
diff --git a/src/backend/storage/smgr/md.c b/src/backend/storage/smgr/md.c
@@ -502,12 +502,15 @@ mdunlinkfork(RelFileNodeBackend rnode, ForkNumber forkNum, bool isRedo)
 		if (md_use_compression(rnode, forkNum))
 		{
 			File file = PathNameOpenFile(path, O_RDWR | PG_BINARY | PG_COMPRESSION, 0);
+			ret = -1;
 			if (file >= 0) {
 				elog(LOG, "Truncate file %s", path);
 				if (FileTruncate(file, 0) < 0) { 
 					ereport(WARNING,
 							(errcode_for_file_access(),
 							 errmsg("could not truncate file \"%s\": %m", path)));
+				} else { 
+					ret = 0;
 				}
 			}
 			FileClose(file);

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+shared_preload_libraries='pgpro_scheduler'`