Merge branch 'PGPROEE9_6' into PGPRO-177_cfs_backup

Author: vbwagner

configure

@@ -9898,9 +9898,9 @@ done
 fi
 
 if test "$with_icu" = yes ; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open_58" >&5
-$as_echo_n "checking for library containing ucol_open_58... " >&6; }
-if ${ac_cv_search_ucol_open_58+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing ucol_open" >&5
+$as_echo_n "checking for library containing ucol_open... " >&6; }
+if ${ac_cv_search_ucol_open+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -9913,11 +9913,11 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char ucol_open_58 ();
+char ucol_open ();
 int
 main ()
 {
-return ucol_open_58 ();
+return ucol_open ();
   ;
   return 0;
 }
@@ -9930,25 +9930,25 @@ for ac_lib in '' icui18n icuin; do
     LIBS="-l$ac_lib  $ac_func_search_save_LIBS"
   fi
   if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_search_ucol_open_58=$ac_res
+  ac_cv_search_ucol_open=$ac_res
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if ${ac_cv_search_ucol_open_58+:} false; then :
+  if ${ac_cv_search_ucol_open+:} false; then :
   break
 fi
 done
-if ${ac_cv_search_ucol_open_58+:} false; then :
+if ${ac_cv_search_ucol_open+:} false; then :
 
 else
-  ac_cv_search_ucol_open_58=no
+  ac_cv_search_ucol_open=no
 fi
 rm conftest.$ac_ext
 LIBS=$ac_func_search_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucol_open_58" >&5
-$as_echo "$ac_cv_search_ucol_open_58" >&6; }
-ac_res=$ac_cv_search_ucol_open_58
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_search_ucol_open" >&5
+$as_echo "$ac_cv_search_ucol_open" >&6; }
+ac_res=$ac_cv_search_ucol_open
 if test "$ac_res" != no; then :
   test "$ac_res" = "none required" || LIBS="$ac_res $LIBS"
 
@@ -10959,9 +10959,9 @@ fi
 
 fi
 
- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars_58 in -licuuc" >&5
-$as_echo_n "checking for ucnv_fromUChars_58 in -licuuc... " >&6; }
-if ${ac_cv_lib_icuuc_ucnv_fromUChars_58+:} false; then :
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ucnv_fromUChars in -licuuc" >&5
+$as_echo_n "checking for ucnv_fromUChars in -licuuc... " >&6; }
+if ${ac_cv_lib_icuuc_ucnv_fromUChars+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -10975,27 +10975,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 #ifdef __cplusplus
 extern "C"
 #endif
-char ucnv_fromUChars_58 ();
+char ucnv_fromUChars ();
 int
 main ()
 {
-return ucnv_fromUChars_58 ();
+return ucnv_fromUChars ();
   ;
   return 0;
 }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_icuuc_ucnv_fromUChars_58=yes
+  ac_cv_lib_icuuc_ucnv_fromUChars=yes
 else
-  ac_cv_lib_icuuc_ucnv_fromUChars_58=no
+  ac_cv_lib_icuuc_ucnv_fromUChars=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_icuuc_ucnv_fromUChars_58" >&5
-$as_echo "$ac_cv_lib_icuuc_ucnv_fromUChars_58" >&6; }
-if test "x$ac_cv_lib_icuuc_ucnv_fromUChars_58" = xyes; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_icuuc_ucnv_fromUChars" >&5
+$as_echo "$ac_cv_lib_icuuc_ucnv_fromUChars" >&6; }
+if test "x$ac_cv_lib_icuuc_ucnv_fromUChars" = xyes; then :
   cat >>confdefs.h <<_ACEOF
 #define HAVE_LIBICUUC 1
 _ACEOF

configure.in

@@ -1162,7 +1162,7 @@ if test "$with_openssl" = yes ; then
 fi
 
 if test "$with_icu" = yes ; then
- AC_SEARCH_LIBS(ucol_open_58, [icui18n icuin], [], [
+ AC_SEARCH_LIBS(ucol_open, [icui18n icuin], [], [
  AC_SEARCH_LIBS(ucol_open_57, [icui18n icuin], [], [
  AC_SEARCH_LIBS(ucol_open_56, [icui18n icuin], [], [
  AC_SEARCH_LIBS(ucol_open_55, [icui18n icuin], [], [
@@ -1197,7 +1197,7 @@ if test "$with_icu" = yes ; then
  ])
  ])
 ])
- AC_CHECK_LIB(icuuc, ucnv_fromUChars_58, [], [
+ AC_CHECK_LIB(icuuc, ucnv_fromUChars, [], [
  AC_CHECK_LIB(icuuc, ucnv_fromUChars_57, [], [
  AC_CHECK_LIB(icuuc, ucnv_fromUChars_56, [], [
  AC_CHECK_LIB(icuuc, ucnv_fromUChars_55, [], [

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 --
 --------------

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"
 
 

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);

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();
 }
 
 

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);