Merge branch 'master' into usability_fix

Vladimir Ershov · Vladimir Ershov · commit 449fc802d7c0 · 2017-01-27T16:43:25.000+03:00
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ OBJS = src/pgpro_scheduler.o src/cron_string.o src/sched_manager_poll.o \
 EXTENSION = pgpro_scheduler
 DATA = pgpro_scheduler--1.0.sql
 REGRESS	= install_pgpro_scheduler cron_string
-REGRESS_OPTS = --user=postgres
+#REGRESS_OPTS = --user=postgres
 EXTRA_REGRESS_OPTS=--temp-config=$(top_srcdir)/$(subdir)/conf.add
 
 ifdef USE_PGXS
diff --git a/pgpro_scheduler--1.0.sql b/pgpro_scheduler--1.0.sql
@@ -1096,11 +1096,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/src/pgpro_scheduler.c b/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)
