Merge 20b17d6 into 036e3a8

create_shards.c

@@ -21,6 +21,7 @@
 #include "create_shards.h"
 #include "ddl_commands.h"
 #include "distribution_metadata.h"
+#include "prune_shard_list.h"
 
 #include <ctype.h>
 #include <limits.h>
@@ -29,8 +30,11 @@
 #include <string.h>
 
 #include "access/attnum.h"
+#include "access/skey.h"
 #include "catalog/namespace.h"
 #include "catalog/pg_class.h"
+#include "catalog/pg_am.h"
+#include "commands/defrem.h"
 #include "lib/stringinfo.h"
 #include "nodes/pg_list.h"
 #include "nodes/primnodes.h"
@@ -73,6 +77,11 @@ master_create_distributed_table(PG_FUNCTION_ARGS)
 	AttrNumber partitionColumnId = InvalidAttrNumber;
 	char *partitionColumnName = text_to_cstring(partitionColumnText);
 	char *tableName = text_to_cstring(tableNameText);
+	Var* partitionColumnVar = NULL;
+	Oid partitionColumnTypeId = InvalidOid;
+	Oid partitionColumnOpClassId = InvalidOid;
+	Oid lessEqualOperatorId = InvalidOid;
+	Oid greaterEqualOperatorId = InvalidOid;
 
 	/* verify target relation is either regular or foreign table */
 	relationKind = get_rel_relkind(distributedTableId);
@@ -97,6 +106,35 @@ master_create_distributed_table(PG_FUNCTION_ARGS)
 		ereport(ERROR, (errmsg("unsupported partition method: %c", partitionMethod)));
 	}
 
+	partitionColumnVar = ColumnNameToColumn(distributedTableId, partitionColumnName);
+	partitionColumnTypeId = partitionColumnVar->vartype;
+	partitionColumnOpClassId = GetDefaultOpClass(partitionColumnTypeId, BTREE_AM_OID);
+
+	/* if there is no operator class for the partition column, error out */
+	if (partitionColumnOpClassId == InvalidOid)
+	{
+		ereport(ERROR, (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+						errmsg("cannot distribute relation: \"%s\"", tableName),
+						errdetail("Column \"%s\" is not eligible to be the distribution "
+								  "column.", partitionColumnName),
+						errhint("Try another column as the distribution column.")));
+	}
+
+	lessEqualOperatorId = GetOperatorByType(partitionColumnTypeId, BTREE_AM_OID,
+											BTLessEqualStrategyNumber);
+	greaterEqualOperatorId =  GetOperatorByType(partitionColumnTypeId, BTREE_AM_OID,
+												BTGreaterEqualStrategyNumber);
+
+	/* if partition column does not support <= and >= operators, error out*/
+	if (lessEqualOperatorId == InvalidOid ||  greaterEqualOperatorId == InvalidOid)
+	{
+		ereport(ERROR, (errcode(ERRCODE_WRONG_OBJECT_TYPE),
+						errmsg("cannot distribute relation: \"%s\"", tableName),
+						errdetail("Column \"%s\" does not support comparison operators.",
+								  partitionColumnName),
+						errhint("Try another column as the distribution column.")));
+	}
+
 	/* insert row into the partition metadata table */
 	InsertPartitionRow(distributedTableId, partitionMethod, partitionColumnText);
 

distribution_metadata.c

@@ -58,7 +58,6 @@ static List *ShardIntervalListCache = NIL;
 
 
 /* local function forward declarations */
-static Var * ColumnNameToColumn(Oid relationId, char *columnName);
 static void LoadShardIntervalRow(int64 shardId, Oid *relationId,
 								 char **minValue, char **maxValue);
 static ShardPlacement * TupleToShardPlacement(HeapTuple heapTuple,
@@ -445,7 +444,7 @@ IsDistributedTable(Oid tableId)
  * a Var that represents that column in that relation. This function throws an
  * error if the column doesn't exist or is a system column.
  */
-static Var *
+Var *
 ColumnNameToColumn(Oid relationId, char *columnName)
 {
 	Var *partitionColumn = NULL;

distribution_metadata.h

@@ -139,6 +139,7 @@ extern List * LoadShardPlacementList(int64 shardId);
 extern Var * PartitionColumn(Oid distributedTableId);
 extern char PartitionType(Oid distributedTableId);
 extern bool IsDistributedTable(Oid tableId);
+extern Var * ColumnNameToColumn(Oid relationId, char *columnName);
 extern void InsertPartitionRow(Oid distributedTableId, char partitionType,
 							   text *partitionKeyText);
 extern void InsertShardRow(Oid distributedTableId, uint64 shardId, char shardStorage,

expected/create_shards.out.tmpl

@@ -14,7 +14,8 @@ CREATE FUNCTION create_table_then_fail(cstring, integer)
 -- ===================================================================
 CREATE TABLE table_to_distribute (
 	name text,
-	id bigint PRIMARY KEY
+	id bigint PRIMARY KEY,
+	data	json
 );
 -- use an index instead of table name
 SELECT master_create_distributed_table('table_to_distribute_pkey', 'id');
@@ -26,6 +27,11 @@ ERROR:  could not find column: bad_column
 -- use unsupported partition type
 SELECT master_create_distributed_table('table_to_distribute', 'name', 'r');
 ERROR:  unsupported partition method: r
+-- use unsupported partition column
+SELECT master_create_distributed_table('table_to_distribute', 'data');
+ERROR:  cannot distribute relation: "table_to_distribute"
+DETAIL:  Column "data" is not eligible to be the distribution column.
+HINT:  Try another column as the distribution column.
 -- distribute table and inspect side effects
 SELECT master_create_distributed_table('table_to_distribute', 'name');
  master_create_distributed_table 

prune_shard_list.c

@@ -52,7 +52,6 @@ static List *OperatorIdCache = NIL;
 
 /* local function forward declarations */
 static Oid LookupOperatorByType(Oid typeId, Oid accessMethodId, int16 strategyNumber);
-static Oid GetOperatorByType(Oid typeId, Oid accessMethodId, int16 strategyNumber);
 static bool SimpleOpExpression(Expr *clause);
 static Node * HashableClauseMutator(Node *originalNode, Var *partitionColumn);
 static bool OpExpressionContainsColumn(OpExpr *operatorExpression, Var *partitionColumn);
@@ -305,7 +304,7 @@ LookupOperatorByType(Oid typeId, Oid accessMethodId, int16 strategyNumber)
  * GetOperatorByType returns the operator oid for the given type, access
  * method, and strategy number.
  */
-static Oid
+Oid
 GetOperatorByType(Oid typeId, Oid accessMethodId, int16 strategyNumber)
 {
 	/* Get default operator class from pg_opclass */

prune_shard_list.h

@@ -46,6 +46,7 @@ typedef struct OperatorIdCacheEntry
 extern List * PruneShardList(Oid relationId, List *whereClauseList,
 							 List *shardIntervalList);
 extern OpExpr * MakeOpExpression(Var *variable, int16 strategyNumber);
+extern Oid GetOperatorByType(Oid typeId, Oid accessMethodId, int16 strategyNumber);
 
 
 #endif /* PG_SHARD_PRUNE_SHARD_LIST_H */

sql/create_shards.sql.tmpl

@@ -18,7 +18,8 @@ CREATE FUNCTION create_table_then_fail(cstring, integer)
 
 CREATE TABLE table_to_distribute (
 	name text,
-	id bigint PRIMARY KEY
+	id bigint PRIMARY KEY,
+	data	json
 );
 
 -- use an index instead of table name
@@ -30,6 +31,9 @@ SELECT master_create_distributed_table('table_to_distribute', 'bad_column');
 -- use unsupported partition type
 SELECT master_create_distributed_table('table_to_distribute', 'name', 'r');
 
+-- use unsupported partition column
+SELECT master_create_distributed_table('table_to_distribute', 'data');
+
 -- distribute table and inspect side effects
 SELECT master_create_distributed_table('table_to_distribute', 'name');
 SELECT partition_method, key FROM pgs_distribution_metadata.partition