external
/
citus
mirror of https://github.com/citusdata/citus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix merge

pull/7555/head
EmelSimsek 2024-03-11 17:15:59 +03:00
parent 3474de5195
commit 57a4958109
No known key found for this signature in database
GPG Key ID: EB13DFB77C32D7D8
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/distributed/utils/multi_partitioning_utils.c
View File

@ -50,10 +50,6 @@
#include "distributed/version_compat.h" #include "distributed/version_compat.h"
#include "distributed/worker_protocol.h" #include "distributed/worker_protocol.h"
<<<<<<< HEAD
extern List * FullShardPlacementList(Oid relationId, ArrayType *excludedShardArray);
=======
>>>>>>> parent of c48bf5eba (Rename per worker)
static char * PartitionBound(Oid partitionId); static char * PartitionBound(Oid partitionId);
static Relation try_relation_open_nolock(Oid relationId); static Relation try_relation_open_nolock(Oid relationId);
static List * CreateFixPartitionConstraintsTaskList(Oid relationId); static List * CreateFixPartitionConstraintsTaskList(Oid relationId);