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

vbwagner · vbwagner · commit 2c1f08ddae2e · 2017-01-26T18:20:41.000+03:00
diff --git a/contrib/pgpro_scheduler/pgpro_scheduler--1.0.sql b/contrib/pgpro_scheduler/pgpro_scheduler--1.0.sql
@@ -1056,11 +1056,6 @@ CREATE FUNCTION schedule.cron2jsontext(CSTRING)
   AS 'MODULE_PATHNAME', 'cron_string_to_json_text'
   LANGUAGE C IMMUTABLE;
 
-CREATE FUNCTION temp_now(timestamp with time zone)
-  RETURNS timestamp with time zone 
-  AS 'MODULE_PATHNAME', 'temp_now'
-  LANGUAGE C IMMUTABLE;
-
 --------------
 -- TRIGGERS --
 --------------
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 "c.h"
 #include "port.h"
 
 
diff --git a/contrib/pgpro_scheduler/src/cron_string.h b/contrib/pgpro_scheduler/src/cron_string.h
@@ -5,6 +5,8 @@
 #include <stdlib.h>
 #include <string.h>
 #include <stdarg.h>
+#include "postgres.h"
+#include "port.h"
 
 extern int cps_error;
 
@@ -41,11 +43,7 @@ typedef struct {
 } cron_ent_t;
 
 void destroyCronEnt(cron_ent_t *);
-void _cps_set_error(int num, const char *message, ...) 
-#ifdef __GNUC__
-__attribute__ ((format (gnu_printf, 2, 3)))
-#endif
-;;
+void _cps_set_error(int num, const char *message, ...) pg_attribute_printf(2, 3);
 char *get_cps_error(void);
 int _cps_string_has(char *str, char c);
 char *_cps_append_string(char *str, char *to_add);
diff --git a/contrib/pgpro_scheduler/src/pgpro_scheduler.c b/contrib/pgpro_scheduler/src/pgpro_scheduler.c
@@ -14,16 +14,18 @@
 #include "pg_config.h"
 #include "fmgr.h"
 #include "pgstat.h"
-#include "utils/builtins.h"
 #include "executor/spi.h"
 #include "tcop/utility.h"
 #include "lib/stringinfo.h"
+#include "catalog/pg_type.h"
 #include "access/xact.h"
 #include "utils/snapmgr.h"
 #include "utils/datetime.h"
+#include "utils/builtins.h"
 #include "catalog/pg_db_role_setting.h"
 #include "commands/dbcommands.h"
 
+
 #include "char_array.h"
 #include "sched_manager_poll.h"
 #include "cron_string.h"
@@ -280,6 +282,7 @@ void parent_scheduler_main(Datum arg)
 	bool refresh = false;
 
 	init_worker_mem_ctx("Parent scheduler context");
+	elog(LOG, "Start PostgresPro scheduler."); 
 
 	/*CurrentResourceOwner = ResourceOwnerCreate(NULL, "pgpro_scheduler");*/
 	SetConfigOption("application_name", "pgp-s supervisor", PGC_USERSET, PGC_S_SESSION);
@@ -381,8 +384,6 @@ pg_scheduler_startup(void)
 {
 	BackgroundWorker worker;
 
-	elog(LOG, "Start PostgresPro scheduler.");
-
 	worker.bgw_flags = BGWORKER_SHMEM_ACCESS |
 		BGWORKER_BACKEND_DATABASE_CONNECTION;
 	worker.bgw_start_time = BgWorkerStart_ConsistentState;
@@ -483,52 +484,6 @@ void _PG_init(void)
 	pg_scheduler_startup();
 }
 
-PG_FUNCTION_INFO_V1(temp_now);
-Datum
-temp_now(PG_FUNCTION_ARGS)
-{
-	TimestampTz ts;
-	struct pg_tm info;
-	struct pg_tm cp;
-	int tz;
-	fsec_t fsec;
-	const char *tzn;
-	long int toff = 0;
-
-	if(!PG_ARGISNULL(0))
-	{
-		ts = PG_GETARG_TIMESTAMPTZ(0);
-	}
-	else
-	{
-		ts = GetCurrentTimestamp();
-	}
-
-	timestamp2tm(ts, &tz, &info, &fsec, &tzn, session_timezone );
-	info.tm_wday = j2day(date2j(info.tm_year, info.tm_mon, info.tm_mday));
-
-/*	elog(NOTICE, "WDAY: %d, MON: %d, MDAY: %d, HOUR: %d, MIN: %d, YEAR: %d (%ld)", 
-		info.tm_wday, info.tm_mon, info.tm_mday, info.tm_hour, info.tm_min,
-		info.tm_year, info.tm_gmtoff);
-	elog(NOTICE, "TZP: %d, ZONE: %s", tz, tzn); */
-
-	cp.tm_mon = info.tm_mon;
-	cp.tm_mday = info.tm_mday;
-	cp.tm_hour = info.tm_hour;
-	cp.tm_min = info.tm_min;
-	cp.tm_year = info.tm_year;
-	cp.tm_sec = info.tm_sec;
-
-	toff = DetermineTimeZoneOffset(&cp, session_timezone);
-/*	elog(NOTICE, "Detect: offset = %ld", toff); */
-
-	cp.tm_gmtoff = -toff;
-	tm2timestamp(&cp, 0, &tz, &ts);
-
-
-	PG_RETURN_TIMESTAMPTZ(ts);
-}
-
 PG_FUNCTION_INFO_V1(cron_string_to_json_text);
 Datum
 cron_string_to_json_text(PG_FUNCTION_ARGS)
@@ -567,6 +522,7 @@ cron_string_to_json_text(PG_FUNCTION_ARGS)
 			elog(ERROR, "unknown error: %d", cps_error);
 		}
 	}
+	PG_RETURN_NULL();
 }
 
 
diff --git a/contrib/pgpro_scheduler/src/scheduler_job.h b/contrib/pgpro_scheduler/src/scheduler_job.h
@@ -7,6 +7,8 @@
 #include <stdarg.h>
 #include "utils/timestamp.h"
 #include "memutils.h"
+#include "c.h"
+#include "port.h"
 
 typedef struct {
 	int cron_id;
@@ -30,11 +32,7 @@ typedef struct {
 job_t *init_scheduler_job(job_t *j);
 job_t *get_expired_jobs(char *nodename, int *n, int *is_error);
 job_t *get_jobs_to_do(char *nodename, int *n, int *is_error);
-job_t *set_job_error(job_t *j, const char *fmt, ...)
-#ifdef __GNUC__
-__attribute__ ((format (gnu_printf, 2, 3)));
-#endif
-;
+job_t *set_job_error(job_t *j, const char *fmt, ...) pg_attribute_printf(2, 3);
 int move_job_to_log(job_t *j, bool status);
 void destroy_job(job_t *j, int selfdestroy);
 
