Merge remote-tracking branch 'origin/PGPROEE9_6_sha2_scram_port_v3_task_CORE-416' into PGPROEE9_6_sha2_scram_port_v3_task_CORE-416

afiskon · afiskon · commit eef35718ba7e · 2016-12-05T15:40:02.000+03:00
diff --git a/contrib/pg_pathman/src/copy_stmt_hooking.c b/contrib/pg_pathman/src/copy_stmt_hooking.c
@@ -341,7 +341,6 @@ PathmanDoCopy(const CopyStmt *stmt, const char *queryString, uint64 *processed)
 	{
 		bool is_old_protocol = PG_PROTOCOL_MAJOR(FrontendProtocol) < 3 &&
 							   stmt->filename == NULL;
-		ParseState *pstate;
 
 		/* There should be relation */
 		if (!rel) elog(FATAL, "No relation for PATHMAN COPY FROM");
@@ -351,19 +350,15 @@ PathmanDoCopy(const CopyStmt *stmt, const char *queryString, uint64 *processed)
 			PreventCommandIfReadOnly("PATHMAN COPY FROM");
 		PreventCommandIfParallelMode("PATHMAN COPY FROM");
 
-	    pstate = make_parsestate(NULL);
-	    pstate->p_sourcetext = queryString;
-		cstate = BeginCopyFrom(pstate,rel, stmt->filename, stmt->is_program,
+		cstate = BeginCopyFrom(rel, stmt->filename, stmt->is_program,
 							   stmt->attlist, stmt->options);
 		*processed = PathmanCopyFrom(cstate, rel, range_table, is_old_protocol);
 		EndCopyFrom(cstate);
-		free_parsestate(pstate);
 	}
 	/* COPY ... TO ... */
 	else
 	{
 		CopyStmt	modified_copy_stmt;
-		ParseState *pstate;
 
 		/* We should've created a query */
 		Assert(query);
@@ -372,13 +367,10 @@ PathmanDoCopy(const CopyStmt *stmt, const char *queryString, uint64 *processed)
 		modified_copy_stmt = *stmt;
 		modified_copy_stmt.relation = NULL;
 		modified_copy_stmt.query = query;
-	    pstate = make_parsestate(NULL);
-	    pstate->p_sourcetext = queryString;
 
 
 		/* Call standard DoCopy using a new CopyStmt */
-		DoCopy(pstate,&modified_copy_stmt, processed);
-		free_parsestate(pstate);
+		DoCopy(&modified_copy_stmt,queryString, processed);
 	}
 
 	/*
