Merge remote-tracking branch 'origin/PGPROEE10' into PGPROEE10_pg_shardman

Author: arssher

contrib/in_memory/in_memory.c

@@ -26,6 +26,7 @@
 #include "postmaster/autovacuum.h"
 #include "replication/message.h"
 #include "storage/ipc.h"
+#include "storage/lmgr.h"
 #include "storage/lwlock.h"
 #include "storage/proc.h"
 #include "storage/shmem.h"
@@ -345,8 +346,7 @@ in_memory_utility_command(PlannedStmt *pstmt,
 	}
 	else if (IsA(pstmt->utilityStmt, AlterTableStmt))
 	{
-		AlterTableStmt  *stmt = (AlterTableStmt*)pstmt->utilityStmt;
-		RangeVar		*rv;
+		AlterTableStmt *stmt = (AlterTableStmt * )pstmt->utilityStmt;
 		Relation		rel;
 		Oid				myrelid;
 		LOCKMODE		mode;
@@ -365,20 +365,22 @@ in_memory_utility_command(PlannedStmt *pstmt,
 		}
 		if (mode != AccessExclusiveLock)
 			goto done_alter_table;
-		rv = stmt->relation;
-		rel = heap_openrv(rv, AccessExclusiveLock);
-		myrelid = RelationGetRelid(rel);
+		myrelid = AlterTableLookupRelation(stmt, AccessExclusiveLock);
+
+		if (!OidIsValid(myrelid))
+			goto done_alter_table;
 
 		if (!check_fdw_is_in_memory_relid(myrelid))
 		{
-			heap_close(rel, AccessExclusiveLock);
+			UnlockRelationOid(myrelid, AccessExclusiveLock);
 			goto done_alter_table;
 		}
 
+		rel = heap_open(myrelid, NoLock);
 		validate_fdw_alter_table_commands(myrelid, stmt->cmds, rel);
 		call_next = true;
 		heap_close(rel, AccessExclusiveLock);
-		
+
 done_alter_table:
 		(void)0;
 	}

contrib/pgpro_scheduler/src/scheduler_manager.c

@@ -1,3 +1,6 @@
+/*
+ * contrib/pgpro_scheduler/src/scheduler_manager.c
+ */
 #include <stdlib.h>
 #include "postgres.h"
 
@@ -946,8 +949,21 @@ int launch_executor_worker(scheduler_manager_ctx_t *ctx, scheduler_manager_slot_
 void init_executor_shared_data(schd_executor_share_t *data, scheduler_manager_ctx_t *ctx, job_t *job)
 {
 	data->status = SchdExecutorInit;
-	memcpy(data->database, ctx->database, strlen(ctx->database));
-	memcpy(data->nodename, job->node, strlen(job->node));
+
+	if(strlen(ctx->database) < PGPRO_SCHEDULER_DBNAME_MAX)
+		strcpy(data->database, ctx->database);
+	else
+		elog(ERROR, "String \"%s\"\n"
+					"has %d symbols, while it should have less than %d symbols.",
+					ctx->database, strlen(ctx->database), PGPRO_SCHEDULER_DBNAME_MAX);
+
+	if(strlen(job->node) < PGPRO_SCHEDULER_NODENAME_MAX)
+		strcpy(data->nodename, job->node);
+	else
+		elog(ERROR, "String \"%s\"\n"
+					"has %d symbols, while it should have less than %d symbols.",
+					job->node, strlen(job->node), PGPRO_SCHEDULER_NODENAME_MAX);
+
 	data->new_job = true;
 
 	if(job)
@@ -1775,8 +1791,21 @@ int start_at_worker(scheduler_manager_ctx_t *ctx, int pos)
 	item->res_owner = CurrentResourceOwner;
 	shm_data = dsm_segment_address(item->shared);
 
-	memcpy(shm_data->database, ctx->database, strlen(ctx->database));
-	memcpy(shm_data->nodename, ctx->nodename, strlen(ctx->nodename));
+
+	if(strlen(ctx->database) < PGPRO_SCHEDULER_DBNAME_MAX)
+		strcpy(shm_data->database, ctx->database);
+	else
+		elog(ERROR, "String \"%s\"\n"
+					"has %d symbols, while it should have less than %d symbols.",
+					ctx->database, strlen(ctx->database), PGPRO_SCHEDULER_DBNAME_MAX);
+
+	if(strlen(ctx->nodename) < PGPRO_SCHEDULER_NODENAME_MAX)
+		strcpy(shm_data->nodename, ctx->nodename);
+	else
+		elog(ERROR, "String \"%s\"\n"
+					"has %d symbols, while it should have less than %d symbols.",
+					ctx->nodename, strlen(ctx->nodename), PGPRO_SCHEDULER_NODENAME_MAX);
+
 	shm_data->stop_worker  = false;
 	shm_data->status  = SchdExecutorInit;
 	shm_data->start_at  = 0;

doc/src/sgml/config.sgml

@@ -7654,7 +7654,8 @@ dynamic_library_path = 'C:\tools\postgresql;H:\my_project\lib;$libdir'
       </term>
       <listitem>
        <para>
-        Defines the backend to use for range partitioning. Possible values are:
+        Defines the backend to use for partitioning with declarative syntax.
+        Possible values are:
         <itemizedlist spacing="compact">
           <listitem>
             <para>

doc/src/sgml/filelist.sgml

@@ -197,6 +197,7 @@
 <!ENTITY sourcerepo SYSTEM "sourcerepo.sgml">
 
 <!ENTITY release    SYSTEM "release.sgml">
+<!ENTITY release-proee-10 SYSTEM "release-proee-10.sgml">
 <!ENTITY release-pro-10 SYSTEM "release-pro-10.sgml">
 <!ENTITY release-pro-9.6 SYSTEM "release-pro-9.6.sgml">
 <!ENTITY release-pro-9.5 SYSTEM "release-pro-9.5.sgml">