postgrespro
diff --git a/‎contrib/pgpro_scheduler/pgpro_scheduler--2.0.sql
Lines changed: 7 additions & 13 deletions b/‎contrib/pgpro_scheduler/pgpro_scheduler--2.0.sql
Lines changed: 7 additions & 13 deletions
diff --git a/‎contrib/pgpro_scheduler/src/pgpro_scheduler.c
Lines changed: 41 additions & 3 deletions b/‎contrib/pgpro_scheduler/src/pgpro_scheduler.c
Lines changed: 41 additions & 3 deletions
diff --git a/‎contrib/pgpro_scheduler/src/pgpro_scheduler.h
Lines changed: 1 addition & 0 deletions b/‎contrib/pgpro_scheduler/src/pgpro_scheduler.h
Lines changed: 1 addition & 0 deletions
@@ -28,21 +28,15 @@ CREATE TABLE at_jobs_submitted(
 CREATE INDEX ON at_jobs_submitted(at,submit_time);
 CREATE INDEX ON at_jobs_submitted (last_start_available, node);
 
-CREATE TABLE at_jobs_process(
-	start_time timestamp with time zone default now()
-) INHERITS (at_jobs_submitted);
+CREATE TABLE at_jobs_process  (like at_jobs_submitted including all);
+ALTER TABLE at_jobs_process ADD start_time timestamp with time zone default now();
+ CREATE INDEX at_jobs_process_node_at_idx on at_jobs_process (node,  at);
 
-ALTER TABLE at_jobs_process ADD  primary key (id);
-CREATE INDEX at_jobs_process_node_at_idx on at_jobs_process (node,  at);
+CREATE TABLE at_jobs_done  (like at_jobs_process including all);
+ALTER TABLE at_jobs_done ADD status boolean;
+ALTER TABLE at_jobs_done ADD reason text;
+ALTER TABLE at_jobs_done ADD done_time timestamp with time zone default now();
 
-CREATE TABLE at_jobs_done(
-	status boolean,
-	reason text,
-	done_time timestamp with time zone default now()
-) INHERITS (at_jobs_process);
-
-ALTER TABLE at_jobs_done ADD  primary key (id);
-CREATE INDEX at_jobs_done_node_at_idx on at_jobs_done (node,  at);
 
 CREATE TABLE cron(
    id SERIAL PRIMARY KEY,
 
@@ -46,7 +46,8 @@ char *scheduler_databases = NULL;
 char *scheduler_nodename = NULL;
 char *scheduler_transaction_state = NULL;
 int  scheduler_max_workers = 2;
-int  scheduler_at_max_workers = 2;
+int  scheduler_max_parallel_workers = 2;
+int  scheduler_worker_job_limit = 1;
 bool scheduler_service_enabled = false;
 char *scheduler_schema = NULL;
 /* Custom GUC done */
@@ -163,6 +164,29 @@ bool is_scheduler_enabled(void)
 	return false;
 }
 
+char *set_schema(const char *name, bool get_old)
+{
+	char *schema_name = NULL;
+	char *current = NULL;
+	bool free_name = false;
+
+	if(get_old)
+		current = _copy_string((char *)GetConfigOption("search_path", true, false));
+	if(name)
+	{
+		schema_name = (char *)name;
+	}
+	else
+	{
+		schema_name = _copy_string((char *)GetConfigOption("schedule.schema", true, false));	
+		free_name = true;
+	}
+	SetConfigOption("search_path", schema_name,  PGC_USERSET, PGC_S_SESSION);
+	if(free_name) pfree(schema_name);
+
+	return current;
+}
+
 
 /** END of SOME UTILS **/
 
@@ -472,10 +496,10 @@ void _PG_init(void)
 		NULL
 	);
 	DefineCustomIntVariable(
-		"schedule.at_max_workers",
+		"schedule.max_parallel_workers",
 		"How much workers can serve at jobs on one database",
 		NULL,
-		&scheduler_at_max_workers,
+		&scheduler_max_parallel_workers,
 		2,
 		1,
 		100,
@@ -497,6 +521,20 @@ void _PG_init(void)
 		NULL,
 		NULL
 	);
+	DefineCustomIntVariable(
+		"schedule.worker_job_limit",
+		"How much job can worker serve before shutdown",
+		NULL,
+		&scheduler_worker_job_limit,
+		1,
+		1,
+		20000,
+		PGC_SUSET,
+		0,
+		NULL,
+		NULL,
+		NULL
+	);
 	pg_scheduler_startup();
 }
 
 
@@ -40,5 +40,6 @@ int get_integer_from_string(char *s, int start, int len);
 TimestampTz get_timestamp_from_string(char *str);
 TimestampTz _round_timestamp_to_minute(TimestampTz ts);
 bool is_scheduler_enabled(void);
+char *set_schema(const char *name, bool get_old);
 
 #endif