From 6f4e53a5c3fbe1e3ea40475d55ba6fe5746a1af0 Mon Sep 17 00:00:00 2001 From: Brian Cloutier Date: Wed, 19 Oct 2016 17:57:30 +0300 Subject: [PATCH] Fix some crashes under --disable-float8-byval --- src/backend/distributed/commands/create_distributed_table.c | 2 +- src/backend/distributed/utils/node_metadata.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/backend/distributed/commands/create_distributed_table.c b/src/backend/distributed/commands/create_distributed_table.c index 9fcf4ecc7..a44dd2249 100644 --- a/src/backend/distributed/commands/create_distributed_table.c +++ b/src/backend/distributed/commands/create_distributed_table.c @@ -291,7 +291,7 @@ master_create_distributed_table(PG_FUNCTION_ARGS) CharGetDatum(distributionMethod); newValues[Anum_pg_dist_partition_partkey - 1] = CStringGetTextDatum(distributionKeyString); - newValues[Anum_pg_dist_partition_colocationid - 1] = INVALID_COLOCATION_ID; + newValues[Anum_pg_dist_partition_colocationid - 1] = Int64GetDatum(INVALID_COLOCATION_ID); newValues[Anum_pg_dist_partition_repmodel - 1] = CharGetDatum(replicationModel); newTuple = heap_form_tuple(RelationGetDescr(pgDistPartition), newValues, newNulls); diff --git a/src/backend/distributed/utils/node_metadata.c b/src/backend/distributed/utils/node_metadata.c index 9bdf0b592..aa074011e 100644 --- a/src/backend/distributed/utils/node_metadata.c +++ b/src/backend/distributed/utils/node_metadata.c @@ -461,7 +461,7 @@ DeleteNodeRow(char *nodeName, int32 nodePort) ScanKeyInit(&scanKey[0], Anum_pg_dist_node_nodename, BTEqualStrategyNumber, F_TEXTEQ, CStringGetTextDatum(nodeName)); ScanKeyInit(&scanKey[1], Anum_pg_dist_node_nodeport, - BTEqualStrategyNumber, F_INT8EQ, Int32GetDatum(nodePort)); + BTEqualStrategyNumber, F_INT4EQ, Int32GetDatum(nodePort)); heapScan = systable_beginscan(pgDistNode, InvalidOid, indexOK, NULL, scanKeyCount, scanKey);