Add compat version of BeginCopyFrom and DoCopy routines

Author: maksm90

expected/pathman_utility_stmt.out

@@ -294,15 +294,13 @@ SELECT create_hash_partitions('rename.test', 'a', 3);
 
 ALTER TABLE rename.test_0 RENAME TO test_one;
 /* We expect to find check constraint renamed as well */
-\d+ rename.test_one
-                                              Table "rename.test_one"
- Column |  Type   |                        Modifiers                        | Storage | Stats target | Description 
---------+---------+---------------------------------------------------------+---------+--------------+-------------
- a      | integer | not null default nextval('rename.test_a_seq'::regclass) | plain   |              | 
- b      | integer |                                                         | plain   |              | 
-Check constraints:
-    "pathman_test_one_check" CHECK (get_hash_part_idx(hashint4(a), 3) = 0)
-Inherits: rename.test
+SELECT r.conname, pg_get_constraintdef(r.oid, true)
+FROM pg_constraint r
+WHERE r.conrelid = 'rename.test_one'::regclass AND r.contype = 'c';
+        conname         |             pg_get_constraintdef              
+------------------------+-----------------------------------------------
+ pathman_test_one_check | CHECK (get_hash_part_idx(hashint4(a), 3) = 0)
+(1 row)
 
 /* Generates check constraint for relation */
 CREATE OR REPLACE FUNCTION add_constraint(rel regclass)
@@ -329,15 +327,14 @@ SELECT add_constraint('rename.test_inh_1');
 (1 row)
 
 ALTER TABLE rename.test_inh_1 RENAME TO test_inh_one;
-\d+ rename.test_inh_one
-                                            Table "rename.test_inh_one"
- Column |  Type   |                        Modifiers                        | Storage | Stats target | Description 
---------+---------+---------------------------------------------------------+---------+--------------+-------------
- a      | integer | not null default nextval('rename.test_a_seq'::regclass) | plain   |              | 
- b      | integer |                                                         | plain   |              | 
-Check constraints:
-    "pathman_test_inh_1_check" CHECK (a < 100)
-Inherits: rename.test_inh
+/* Show check constraints of rename.test_inh_one */
+SELECT r.conname, pg_get_constraintdef(r.oid, true)
+FROM pg_constraint r
+WHERE r.conrelid = 'rename.test_inh_one'::regclass AND r.contype = 'c';
+         conname          | pg_get_constraintdef 
+--------------------------+----------------------
+ pathman_test_inh_1_check | CHECK (a < 100)
+(1 row)
 
 /* Check that plain tables are not affected too */
 CREATE TABLE rename.plain_test(a serial, b int);
@@ -348,24 +345,24 @@ SELECT add_constraint('rename.plain_test_renamed');
 
 (1 row)
 
-\d+ rename.plain_test_renamed
-                                            Table "rename.plain_test_renamed"
- Column |  Type   |                           Modifiers                           | Storage | Stats target | Description 
---------+---------+---------------------------------------------------------------+---------+--------------+-------------
- a      | integer | not null default nextval('rename.plain_test_a_seq'::regclass) | plain   |              | 
- b      | integer |                                                               | plain   |              | 
-Check constraints:
-    "pathman_plain_test_renamed_check" CHECK (a < 100)
+/* Show check constraints of rename.plain_test_renamed */
+SELECT r.conname, pg_get_constraintdef(r.oid, true)
+FROM pg_constraint r
+WHERE r.conrelid = 'rename.plain_test_renamed'::regclass AND r.contype = 'c';
+             conname              | pg_get_constraintdef 
+----------------------------------+----------------------
+ pathman_plain_test_renamed_check | CHECK (a < 100)
+(1 row)
 
 ALTER TABLE rename.plain_test_renamed RENAME TO plain_test;
-\d+ rename.plain_test
-                                                Table "rename.plain_test"
- Column |  Type   |                           Modifiers                           | Storage | Stats target | Description 
---------+---------+---------------------------------------------------------------+---------+--------------+-------------
- a      | integer | not null default nextval('rename.plain_test_a_seq'::regclass) | plain   |              | 
- b      | integer |                                                               | plain   |              | 
-Check constraints:
-    "pathman_plain_test_renamed_check" CHECK (a < 100)
+/* ... and check constraints of rename.plain_test */
+SELECT r.conname, pg_get_constraintdef(r.oid, true)
+FROM pg_constraint r
+WHERE r.conrelid = 'rename.plain_test'::regclass AND r.contype = 'c';
+             conname              | pg_get_constraintdef 
+----------------------------------+----------------------
+ pathman_plain_test_renamed_check | CHECK (a < 100)
+(1 row)
 
 DROP SCHEMA rename CASCADE;
 NOTICE:  drop cascades to 7 other objects

sql/pathman_utility_stmt.sql

@@ -168,7 +168,9 @@ CREATE TABLE rename.test(a serial, b int);
 SELECT create_hash_partitions('rename.test', 'a', 3);
 ALTER TABLE rename.test_0 RENAME TO test_one;
 /* We expect to find check constraint renamed as well */
-\d+ rename.test_one
+SELECT r.conname, pg_get_constraintdef(r.oid, true)
+FROM pg_constraint r
+WHERE r.conrelid = 'rename.test_one'::regclass AND r.contype = 'c';
 
 /* Generates check constraint for relation */
 CREATE OR REPLACE FUNCTION add_constraint(rel regclass)
@@ -191,15 +193,25 @@ CREATE TABLE rename.test_inh_1 (LIKE rename.test INCLUDING ALL);
 ALTER TABLE rename.test_inh_1 INHERIT rename.test_inh;
 SELECT add_constraint('rename.test_inh_1');
 ALTER TABLE rename.test_inh_1 RENAME TO test_inh_one;
-\d+ rename.test_inh_one
+/* Show check constraints of rename.test_inh_one */
+SELECT r.conname, pg_get_constraintdef(r.oid, true)
+FROM pg_constraint r
+WHERE r.conrelid = 'rename.test_inh_one'::regclass AND r.contype = 'c';
 
 /* Check that plain tables are not affected too */
 CREATE TABLE rename.plain_test(a serial, b int);
 ALTER TABLE rename.plain_test RENAME TO plain_test_renamed;
 SELECT add_constraint('rename.plain_test_renamed');
-\d+ rename.plain_test_renamed
+/* Show check constraints of rename.plain_test_renamed */
+SELECT r.conname, pg_get_constraintdef(r.oid, true)
+FROM pg_constraint r
+WHERE r.conrelid = 'rename.plain_test_renamed'::regclass AND r.contype = 'c';
+
 ALTER TABLE rename.plain_test_renamed RENAME TO plain_test;
-\d+ rename.plain_test
+/* ... and check constraints of rename.plain_test */
+SELECT r.conname, pg_get_constraintdef(r.oid, true)
+FROM pg_constraint r
+WHERE r.conrelid = 'rename.plain_test'::regclass AND r.contype = 'c';
 
 DROP SCHEMA rename CASCADE;
 

src/hooks.c

@@ -771,6 +771,8 @@ pathman_process_utility_hook(PlannedStmt *pstmt,
 							 DestReceiver *dest, char *completionTag)
 {
 	Node   *parsetree = pstmt->utilityStmt;
+	int		stmt_location = pstmt->stmt_location,
+			stmt_len = pstmt->stmt_len;
 #else
 pathman_process_utility_hook(Node *parsetree,
 							 const char *queryString,
@@ -779,6 +781,8 @@ pathman_process_utility_hook(Node *parsetree,
 							 DestReceiver *dest,
 							 char *completionTag)
 {
+	int		stmt_location = -1,
+			stmt_len = 0;
 #endif
 
 	if (IsPathmanReady())
@@ -793,7 +797,8 @@ pathman_process_utility_hook(Node *parsetree,
 			uint64	processed;
 
 			/* Handle our COPY case (and show a special cmd name) */
-			PathmanDoCopy((CopyStmt *) parsetree, queryString, &processed);
+			PathmanDoCopy((CopyStmt *) parsetree, queryString, stmt_location,
+						  stmt_len, &processed);
 			if (completionTag)
 				snprintf(completionTag, COMPLETION_TAG_BUFSIZE,
 						 "PATHMAN COPY " UINT64_FORMAT, processed);

src/include/compat/pg_compat.h

@@ -60,6 +60,21 @@
 #endif
 
 
+/*
+ * BeginCopyFrom()
+ */
+#if PG_VERSION_NUM >= 100000
+#define BeginCopyFromCompat(pstate, rel, filename, is_program, data_source_cb, \
+							attnamelist, options) \
+		BeginCopyFrom((pstate), (rel), (filename), (is_program), \
+					  (data_source_cb), (attnamelist), (options))
+#elif PG_VERSION_NUM >= 90500
+#define BeginCopyFromCompat(pstate, rel, filename, is_program, data_source_cb, \
+							attnamelist, options) \
+		BeginCopyFrom((rel), (filename), (is_program), (attnamelist), (options))
+#endif
+
+
 /*
  * Define ALLOCSET_DEFAULT_SIZES for our precious MemoryContexts
  */
@@ -184,6 +199,18 @@ extern void create_plain_partial_paths(PlannerInfo *root,
 #endif
 
 
+/*
+ * DoCopy()
+ */
+#if PG_VERSION_NUM >= 100000
+#define DoCopyCompat(pstate, copy_stmt, stmt_location, stmt_len, processed) \
+	DoCopy((pstate), (copy_stmt), (stmt_location), (stmt_len), (processed))
+#elif PG_VERSION_NUM >= 90500
+#define DoCopyCompat(pstate, copy_stmt, stmt_location, stmt_len, processed) \
+	DoCopy((copy_stmt), (pstate)->p_sourcetext, (processed))
+#endif
+
+
 /*
  * ExecBuildProjectionInfo
  */

src/include/utility_stmt_hooking.h

@@ -30,7 +30,8 @@ bool is_pathman_related_alter_column_type(Node *parsetree,
 										  PartType *part_type_out);
 
 /* Statement handlers */
-void PathmanDoCopy(const CopyStmt *stmt, const char *queryString, uint64 *processed);
+void PathmanDoCopy(const CopyStmt *stmt, const char *queryString,
+				   int stmt_location, int stmt_len, uint64 *processed);
 void PathmanRenameConstraint(Oid partition_relid,
 							 const RenameStmt *partition_rename_stmt);
 

src/utility_stmt_hooking.c

@@ -325,14 +325,16 @@ CopyGetAttnums(TupleDesc tupDesc, Relation rel, List *attnamelist)
  * NOTE: based on DoCopy() (see copy.c).
  */
 void
-PathmanDoCopy(const CopyStmt *stmt, const char *queryString, uint64 *processed)
+PathmanDoCopy(const CopyStmt *stmt, const char *queryString, int stmt_location,
+			  int stmt_len, uint64 *processed)
 {
 	CopyState	cstate;
 	bool		is_from = stmt->is_from;
 	bool		pipe = (stmt->filename == NULL);
 	Relation	rel;
 	Node	   *query = NULL;
 	List	   *range_table = NIL;
+	ParseState *pstate;
 
 	/* Disallow COPY TO/FROM file or program except to superusers. */
 	if (!pipe && !superuser())
@@ -481,6 +483,9 @@ PathmanDoCopy(const CopyStmt *stmt, const char *queryString, uint64 *processed)
 	/* This should never happen (see is_pathman_related_copy()) */
 	else elog(ERROR, "error in function " CppAsString(PathmanDoCopy));
 
+	pstate = make_parsestate(NULL);
+	pstate->p_sourcetext = queryString;
+
 	/* COPY ... FROM ... */
 	if (is_from)
 	{
@@ -495,13 +500,9 @@ PathmanDoCopy(const CopyStmt *stmt, const char *queryString, uint64 *processed)
 			PreventCommandIfReadOnly("PATHMAN COPY FROM");
 		PreventCommandIfParallelMode("PATHMAN COPY FROM");
 
-#if PG_VERSION_NUM >= 100000
-		cstate = BeginCopyFrom(NULL, rel, stmt->filename, stmt->is_program,
-							   NULL, stmt->attlist, stmt->options);
-#else
-		cstate = BeginCopyFrom(rel, stmt->filename, stmt->is_program,
-							   stmt->attlist, stmt->options);
-#endif
+		cstate = BeginCopyFromCompat(pstate, rel, stmt->filename,
+									 stmt->is_program, NULL, stmt->attlist,
+									 stmt->options);
 		*processed = PathmanCopyFrom(cstate, rel, range_table, is_old_protocol);
 		EndCopyFrom(cstate);
 	}
@@ -519,11 +520,8 @@ PathmanDoCopy(const CopyStmt *stmt, const char *queryString, uint64 *processed)
 		modified_copy_stmt.query = query;
 
 		/* Call standard DoCopy using a new CopyStmt */
-#if PG_VERSION_NUM >= 100000
-		DoCopy(NULL, &modified_copy_stmt, 0, 0, processed);
-#else
-		DoCopy(&modified_copy_stmt, queryString, processed);
-#endif
+		DoCopyCompat(pstate, &modified_copy_stmt, stmt_location, stmt_len,
+					 processed);
 	}
 
 	/*