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

Merge ffa269e738 into be113e99cc

pull/747/merge
Brian Cloutier 2016-09-07 10:29:48 +00:00 committed by GitHub
parent be113e99cc ffa269e738
commit a1d3fc3423
4 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/backend/distributed/master/master_delete_protocol.c
View File

@ -323,7 +323,7 @@ DropShards(Oid relationId, char *schemaName, char *relationName,
Assert(shardInterval->relationId == relationId); Assert(shardInterval->relationId == relationId);
/* Build shard relation name. */ /* build shard relation name */
appendStringInfoString(shardName, relationName); appendStringInfoString(shardName, relationName);
AppendShardIdToStringInfo(shardName, shardId); AppendShardIdToStringInfo(shardName, shardId);
quotedShardName = quote_qualified_identifier(schemaName, shardName->data); quotedShardName = quote_qualified_identifier(schemaName, shardName->data);

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

@ -334,7 +334,7 @@ InsertShardRow(Oid relationId, uint64 shardId, char storageType,
values[Anum_pg_dist_shard_shardid - 1] = Int64GetDatum(shardId); values[Anum_pg_dist_shard_shardid - 1] = Int64GetDatum(shardId);
values[Anum_pg_dist_shard_shardstorage - 1] = CharGetDatum(storageType); values[Anum_pg_dist_shard_shardstorage - 1] = CharGetDatum(storageType);
/* deprecated shardalias column is always null. */ /* deprecated shardalias column is always null */
isNulls[Anum_pg_dist_shard_shardalias_DEPRECATED - 1] = true; isNulls[Anum_pg_dist_shard_shardalias_DEPRECATED - 1] = true;
/* check if shard min/max values are null */ /* check if shard min/max values are null */

4
src/backend/distributed/master/master_stage_protocol.c
View File

@ -238,7 +238,7 @@ master_append_table_to_shard(PG_FUNCTION_ARGS)
shardSchemaOid = get_rel_namespace(relationId); shardSchemaOid = get_rel_namespace(relationId);
shardSchemaName = get_namespace_name(shardSchemaOid); shardSchemaName = get_namespace_name(shardSchemaOid);
/* Build shard table name. */ /* build shard table name */
shardTableName = get_rel_name(relationId); shardTableName = get_rel_name(relationId);
AppendShardIdToName(&shardTableName, shardId); AppendShardIdToName(&shardTableName, shardId);
@ -489,7 +489,7 @@ UpdateShardStatistics(int64 shardId)
text *minValue = NULL; text *minValue = NULL;
text *maxValue = NULL; text *maxValue = NULL;
/* Build shard qualified name. */ /* build shard qualified name */
char *shardName = get_rel_name(relationId); char *shardName = get_rel_name(relationId);
Oid schemaId = get_rel_namespace(relationId); Oid schemaId = get_rel_namespace(relationId);
char *schemaName = get_namespace_name(schemaId); char *schemaName = get_namespace_name(schemaId);

6
src/backend/distributed/planner/multi_physical_planner.c
View File

@ -115,7 +115,7 @@ static uint32 HashPartitionCount(void);
static ArrayType * SplitPointObject(ShardInterval **shardIntervalArray, static ArrayType * SplitPointObject(ShardInterval **shardIntervalArray,
uint32 shardIntervalCount); uint32 shardIntervalCount);
/* Local functions forward declarations for task list creation */ /* local function forward declarations for task list creation */
static Job * BuildJobTreeTaskList(Job *jobTree); static Job * BuildJobTreeTaskList(Job *jobTree);
static List * SubquerySqlTaskList(Job *job); static List * SubquerySqlTaskList(Job *job);
static List * SqlTaskList(Job *job); static List * SqlTaskList(Job *job);
@ -3969,9 +3969,7 @@ FragmentAlias(RangeTblEntry *rangeTableEntry, RangeTableFragment *fragment)
aliasName = relationName; aliasName = relationName;
/* /* set shard name in alias to <relation_name>_<shard_id> */
* Set shard name in alias to <relation_name>_<shard_id>.
*/
fragmentName = pstrdup(relationName); fragmentName = pstrdup(relationName);
AppendShardIdToName(&fragmentName, shardId); AppendShardIdToName(&fragmentName, shardId);
} }