Refactor: Use generate_qualified_relation_name instead of a series of functions whenever possible.

pull/7427/head
eaydingol 2024-01-18 11:39:50 +00:00
parent 5640ea4579
commit 1105614561
7 changed files with 9 additions and 35 deletions

View File

@ -1160,9 +1160,7 @@ DropIdentitiesOnTable(Oid relationId)
if (attributeForm->attidentity) if (attributeForm->attidentity)
{ {
char *tableName = get_rel_name(relationId); char *qualifiedTableName = generate_qualified_relation_name(relationId);
char *schemaName = get_namespace_name(get_rel_namespace(relationId));
char *qualifiedTableName = quote_qualified_identifier(schemaName, tableName);
StringInfo dropCommand = makeStringInfo(); StringInfo dropCommand = makeStringInfo();
@ -1222,9 +1220,7 @@ DropViewsOnTable(Oid relationId)
Oid viewId = InvalidOid; Oid viewId = InvalidOid;
foreach_oid(viewId, reverseOrderedViews) foreach_oid(viewId, reverseOrderedViews)
{ {
char *viewName = get_rel_name(viewId); char *qualifiedViewName = generate_qualified_relation_name(viewId);
char *schemaName = get_namespace_name(get_rel_namespace(viewId));
char *qualifiedViewName = quote_qualified_identifier(schemaName, viewName);
StringInfo dropCommand = makeStringInfo(); StringInfo dropCommand = makeStringInfo();
appendStringInfo(dropCommand, "DROP %sVIEW IF EXISTS %s", appendStringInfo(dropCommand, "DROP %sVIEW IF EXISTS %s",

View File

@ -1323,10 +1323,7 @@ CreateCitusTable(Oid relationId, CitusTableType tableType,
{ {
List *partitionList = PartitionList(relationId); List *partitionList = PartitionList(relationId);
Oid partitionRelationId = InvalidOid; Oid partitionRelationId = InvalidOid;
Oid namespaceId = get_rel_namespace(relationId); char *parentRelationName = generate_qualified_relation_name(relationId);
char *schemaName = get_namespace_name(namespaceId);
char *relationName = get_rel_name(relationId);
char *parentRelationName = quote_qualified_identifier(schemaName, relationName);
/* /*
* when there are many partitions, each call to CreateDistributedTable * when there are many partitions, each call to CreateDistributedTable

View File

@ -2547,12 +2547,8 @@ ShardIdForTuple(CitusCopyDestReceiver *copyDest, Datum *columnValues, bool *colu
if (columnNulls[partitionColumnIndex]) if (columnNulls[partitionColumnIndex])
{ {
Oid relationId = copyDest->distributedRelationId; char *qualifiedTableName = generate_qualified_relation_name(
char *relationName = get_rel_name(relationId); copyDest->distributedRelationId);
Oid schemaOid = get_rel_namespace(relationId);
char *schemaName = get_namespace_name(schemaOid);
char *qualifiedTableName = quote_qualified_identifier(schemaName,
relationName);
ereport(ERROR, (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED), ereport(ERROR, (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
errmsg("the partition column of table %s cannot be NULL", errmsg("the partition column of table %s cannot be NULL",

View File

@ -392,9 +392,7 @@ CreateViewDDLCommand(Oid viewOid)
static void static void
AppendQualifiedViewNameToCreateViewCommand(StringInfo buf, Oid viewOid) AppendQualifiedViewNameToCreateViewCommand(StringInfo buf, Oid viewOid)
{ {
char *viewName = get_rel_name(viewOid); char *qualifiedViewName = generate_qualified_relation_name(viewOid);
char *schemaName = get_namespace_name(get_rel_namespace(viewOid));
char *qualifiedViewName = quote_qualified_identifier(schemaName, viewName);
appendStringInfo(buf, "%s ", qualifiedViewName); appendStringInfo(buf, "%s ", qualifiedViewName);
} }

View File

@ -143,15 +143,10 @@ NonPushableInsertSelectExecScan(CustomScanState *node)
targetRelation->partitionColumn); targetRelation->partitionColumn);
if (distributionColumnIndex == -1) if (distributionColumnIndex == -1)
{ {
char *relationName = get_rel_name(targetRelationId);
Oid schemaOid = get_rel_namespace(targetRelationId);
char *schemaName = get_namespace_name(schemaOid);
ereport(ERROR, (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED), ereport(ERROR, (errcode(ERRCODE_NULL_VALUE_NOT_ALLOWED),
errmsg( errmsg(
"the partition column of table %s should have a value", "the partition column of table %s should have a value",
quote_qualified_identifier(schemaName, generate_qualified_relation_name(targetRelationId))));
relationName))));
} }
TargetEntry *selectPartitionTE = list_nth(selectQuery->targetList, TargetEntry *selectPartitionTE = list_nth(selectQuery->targetList,

View File

@ -1945,11 +1945,7 @@ ConstructQualifiedShardName(ShardInterval *shardInterval)
static List * static List *
RecreateTableDDLCommandList(Oid relationId) RecreateTableDDLCommandList(Oid relationId)
{ {
const char *relationName = get_rel_name(relationId); const char *qualifiedRelationName = generate_qualified_relation_name(relationId);
Oid relationSchemaId = get_rel_namespace(relationId);
const char *relationSchemaName = get_namespace_name(relationSchemaId);
const char *qualifiedRelationName = quote_qualified_identifier(relationSchemaName,
relationName);
StringInfo dropCommand = makeStringInfo(); StringInfo dropCommand = makeStringInfo();

View File

@ -170,14 +170,10 @@ WorkerDropDistributedTable(Oid relationId)
*/ */
if (!IsAnyObjectAddressOwnedByExtension(list_make1(distributedTableObject), NULL)) if (!IsAnyObjectAddressOwnedByExtension(list_make1(distributedTableObject), NULL))
{ {
char *relName = get_rel_name(relationId);
Oid schemaId = get_rel_namespace(relationId);
char *schemaName = get_namespace_name(schemaId);
StringInfo dropCommand = makeStringInfo(); StringInfo dropCommand = makeStringInfo();
appendStringInfo(dropCommand, "DROP%sTABLE %s CASCADE", appendStringInfo(dropCommand, "DROP%sTABLE %s CASCADE",
IsForeignTable(relationId) ? " FOREIGN " : " ", IsForeignTable(relationId) ? " FOREIGN " : " ",
quote_qualified_identifier(schemaName, relName)); generate_qualified_relation_name(relationId));
Node *dropCommandNode = ParseTreeNode(dropCommand->data); Node *dropCommandNode = ParseTreeNode(dropCommand->data);