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

Small refactor, we were using incompatible types

pull/1959/head
Brian Cloutier 2018-01-22 17:14:38 -08:00 committed by Brian Cloutier
parent b864d014ab
commit 457f570b77
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/distributed/metadata/metadata_sync.c
View File

@ -830,7 +830,7 @@ MarkNodeHasMetadata(char *nodeName, int32 nodePort, bool hasMetadata)
ScanKeyInit(&scanKey[0], Anum_pg_dist_node_nodename, ScanKeyInit(&scanKey[0], Anum_pg_dist_node_nodename,
BTEqualStrategyNumber, F_TEXTEQ, CStringGetTextDatum(nodeName)); BTEqualStrategyNumber, F_TEXTEQ, CStringGetTextDatum(nodeName));
ScanKeyInit(&scanKey[1], Anum_pg_dist_node_nodeport, ScanKeyInit(&scanKey[1], Anum_pg_dist_node_nodeport,
BTEqualStrategyNumber, F_INT8EQ, Int32GetDatum(nodePort)); BTEqualStrategyNumber, F_INT4EQ, Int32GetDatum(nodePort));
scanDescriptor = systable_beginscan(pgDistNode, InvalidOid, indexOK, scanDescriptor = systable_beginscan(pgDistNode, InvalidOid, indexOK,
NULL, scanKeyCount, scanKey); NULL, scanKeyCount, scanKey);

10
src/backend/distributed/utils/node_metadata.c
View File

@ -516,7 +516,7 @@ UpdateNodeLocation(int32 nodeId, char *newNodeName, int32 newNodePort)
tupleDescriptor = RelationGetDescr(pgDistNode); tupleDescriptor = RelationGetDescr(pgDistNode);
ScanKeyInit(&scanKey[0], Anum_pg_dist_node_nodeid, ScanKeyInit(&scanKey[0], Anum_pg_dist_node_nodeid,
BTEqualStrategyNumber, F_INT8EQ, Int32GetDatum(nodeId)); BTEqualStrategyNumber, F_INT4EQ, Int32GetDatum(nodeId));
scanDescriptor = systable_beginscan(pgDistNode, DistNodeNodeIdIndexId(), indexOK, scanDescriptor = systable_beginscan(pgDistNode, DistNodeNodeIdIndexId(), indexOK,
NULL, scanKeyCount, scanKey); NULL, scanKeyCount, scanKey);
@ -630,7 +630,7 @@ get_shard_id_for_distribution_column(PG_FUNCTION_ARGS)
List *shardIntervalList = LoadShardIntervalList(relationId); List *shardIntervalList = LoadShardIntervalList(relationId);
if (shardIntervalList == NIL) if (shardIntervalList == NIL)
{ {
PG_RETURN_INT64(NULL); PG_RETURN_INT64(0);
} }
shardInterval = (ShardInterval *) linitial(shardIntervalList); shardInterval = (ShardInterval *) linitial(shardIntervalList);
@ -679,7 +679,7 @@ get_shard_id_for_distribution_column(PG_FUNCTION_ARGS)
PG_RETURN_INT64(shardInterval->shardId); PG_RETURN_INT64(shardInterval->shardId);
} }
PG_RETURN_INT64(NULL); PG_RETURN_INT64(0);
} }
@ -1052,7 +1052,7 @@ GetNodeTuple(char *nodeName, int32 nodePort)
ScanKeyInit(&scanKey[0], Anum_pg_dist_node_nodename, ScanKeyInit(&scanKey[0], Anum_pg_dist_node_nodename,
BTEqualStrategyNumber, F_TEXTEQ, CStringGetTextDatum(nodeName)); BTEqualStrategyNumber, F_TEXTEQ, CStringGetTextDatum(nodeName));
ScanKeyInit(&scanKey[1], Anum_pg_dist_node_nodeport, ScanKeyInit(&scanKey[1], Anum_pg_dist_node_nodeport,
BTEqualStrategyNumber, F_INT8EQ, Int32GetDatum(nodePort)); BTEqualStrategyNumber, F_INT4EQ, Int32GetDatum(nodePort));
scanDescriptor = systable_beginscan(pgDistNode, InvalidOid, indexOK, scanDescriptor = systable_beginscan(pgDistNode, InvalidOid, indexOK,
NULL, scanKeyCount, scanKey); NULL, scanKeyCount, scanKey);
@ -1296,7 +1296,7 @@ DeleteNodeRow(char *nodeName, int32 nodePort)
ScanKeyInit(&scanKey[0], Anum_pg_dist_node_nodename, ScanKeyInit(&scanKey[0], Anum_pg_dist_node_nodename,
BTEqualStrategyNumber, F_TEXTEQ, CStringGetTextDatum(nodeName)); BTEqualStrategyNumber, F_TEXTEQ, CStringGetTextDatum(nodeName));
ScanKeyInit(&scanKey[1], Anum_pg_dist_node_nodeport, ScanKeyInit(&scanKey[1], Anum_pg_dist_node_nodeport,
BTEqualStrategyNumber, F_INT8EQ, Int32GetDatum(nodePort)); BTEqualStrategyNumber, F_INT4EQ, Int32GetDatum(nodePort));
heapScan = systable_beginscan(pgDistNode, InvalidOid, indexOK, heapScan = systable_beginscan(pgDistNode, InvalidOid, indexOK,
NULL, scanKeyCount, scanKey); NULL, scanKeyCount, scanKey);