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

Conditionally read INT4 or INT8 from nodePort

pull/869/head
Brian Cloutier 2016-10-19 19:03:27 +03:00
parent bceedcf2b1
commit f4d5773f73
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/backend/distributed/commands/create_distributed_table.c
View File

@ -291,8 +291,8 @@ master_create_distributed_table(PG_FUNCTION_ARGS)
CharGetDatum(distributionMethod); CharGetDatum(distributionMethod);
newValues[Anum_pg_dist_partition_partkey - 1] = newValues[Anum_pg_dist_partition_partkey - 1] =
CStringGetTextDatum(distributionKeyString); CStringGetTextDatum(distributionKeyString);
newValues[Anum_pg_dist_partition_colocationid - 1] = Int64GetDatum( newValues[Anum_pg_dist_partition_colocationid - 1] =
INVALID_COLOCATION_ID); Int64GetDatum(INVALID_COLOCATION_ID);
newValues[Anum_pg_dist_partition_repmodel - 1] = CharGetDatum(replicationModel); newValues[Anum_pg_dist_partition_repmodel - 1] = CharGetDatum(replicationModel);
newTuple = heap_form_tuple(RelationGetDescr(pgDistPartition), newValues, newNulls); newTuple = heap_form_tuple(RelationGetDescr(pgDistPartition), newValues, newNulls);

11
src/backend/distributed/master/master_metadata_utility.c
View File

@ -325,6 +325,8 @@ TupleToShardPlacement(TupleDesc tupleDescriptor, HeapTuple heapTuple)
{ {
ShardPlacement *shardPlacement = NULL; ShardPlacement *shardPlacement = NULL;
bool isNull = false; bool isNull = false;
Oid nodePortAttTypeId =
tupleDescriptor->attrs[Anum_pg_dist_shard_placement_nodeport - 1]->atttypid;
Datum placementId = heap_getattr(heapTuple, Anum_pg_dist_shard_placement_placementid, Datum placementId = heap_getattr(heapTuple, Anum_pg_dist_shard_placement_placementid,
tupleDescriptor, &isNull); tupleDescriptor, &isNull);
@ -350,7 +352,14 @@ TupleToShardPlacement(TupleDesc tupleDescriptor, HeapTuple heapTuple)
shardPlacement->shardLength = DatumGetInt64(shardLength); shardPlacement->shardLength = DatumGetInt64(shardLength);
shardPlacement->shardState = DatumGetUInt32(shardState); shardPlacement->shardState = DatumGetUInt32(shardState);
shardPlacement->nodeName = TextDatumGetCString(nodeName); shardPlacement->nodeName = TextDatumGetCString(nodeName);
shardPlacement->nodePort = DatumGetInt32(nodePort); if (nodePortAttTypeId == INT4OID)
{
shardPlacement->nodePort = DatumGetInt32(nodePort);
}
else
{
shardPlacement->nodePort = DatumGetInt64(nodePort);
}
return shardPlacement; return shardPlacement;
} }