Fix Merge Conflict

This commit fixes merge conflicts.

src/backend/distributed/commands/multi_copy.c

@@ -310,12 +310,6 @@ CopyToExistingShards(CopyStmt *copyStatement, char *completionTag)
 								  relationName)));
 	}
 
-	if (partitionMethod == DISTRIBUTE_BY_APPEND)
-	{
-		ereport(ERROR, (errcode(ERRCODE_INVALID_PARAMETER_VALUE),
-						errmsg("unsupported partition method %d", partitionMethod)));
-	}
-
 	/* prevent concurrent placement changes and non-commutative DML statements */
 	LockAllShards(shardIntervalList);
 

src/backend/distributed/planner/multi_router_planner.c

@@ -559,6 +559,8 @@ TargetShardInterval(Query *query)
 
 		prunedShardList = PruneShardList(distributedTableId, tableId, restrictClauseList,
 										 shardIntervalList);
+	}
+
 	prunedShardCount = list_length(prunedShardList);
 	if (prunedShardCount != 1)
 	{

src/backend/distributed/utils/metadata_cache.c

@@ -12,6 +12,7 @@
 #include "access/genam.h"
 #include "access/heapam.h"
 #include "access/htup_details.h"
+#include "access/nbtree.h"
 #include "access/xact.h"
 #include "catalog/indexing.h"
 #include "catalog/pg_namespace.h"

src/test/regress/expected/multi_router_planner.out

@@ -105,8 +105,8 @@ DEBUG:  Creating router plan
 DEBUG:  Plan is router executable
 -- first, test zero-shard SELECT, which should return an empty row
 SELECT COUNT(*) FROM articles_hash WHERE author_id = 1 AND author_id = 2;
-DEBUG:  predicate pruning for shardId 103301
 DEBUG:  predicate pruning for shardId 103300
+DEBUG:  predicate pruning for shardId 103301
  count 
 -------
       
@@ -1120,7 +1120,6 @@ DEBUG:  predicate pruning for shardId 103301
 -- insert query is router plannable even under task-tracker
 INSERT INTO articles_hash VALUES (51,  1, 'amateus', 1814);
 DEBUG:  Creating router plan
-DEBUG:  predicate pruning for shardId 103301
 DEBUG:  Plan is router executable
 -- verify insert is successfull (not router plannable and executable)
 SELECT id