cleanup based on review by @jasonmp85

src/backend/distributed/relay/relay_event_utility.c

@@ -42,20 +42,13 @@
 #include "utils/palloc.h"
 #include "utils/relcache.h"
 
-/* expression tree walker context for rewriting row references */
-typedef struct
-{
-	uint64 shardId;
-} ColumnRefWalkerState;
-
-
 /* Local functions forward declarations */
 static bool TypeAddIndexConstraint(const AlterTableCmd *command);
 static bool TypeDropIndexConstraint(const AlterTableCmd *command,
 									const RangeVar *relation, uint64 shardId);
 static void AppendShardIdToConstraintName(AlterTableCmd *command, uint64 shardId);
 static void SetSchemaNameIfNotExist(char **schemaName, char *newSchemaName);
-static bool UpdateWholeRowColumnReferencesWalker(Node *node, ColumnRefWalkerState *state);
+static bool UpdateWholeRowColumnReferencesWalker(Node *node, uint64 *shardId);
 
 /*
  * RelayEventExtendNames extends relation names in the given parse tree for
@@ -294,7 +287,6 @@ RelayEventExtendNames(Node *parseTree, char *schemaName, uint64 shardId)
 		case T_IndexStmt:
 		{
 			IndexStmt *indexStmt = (IndexStmt *) parseTree;
-			ColumnRefWalkerState state;
 			char **relationName = &(indexStmt->relation->relname);
 			char **indexName = &(indexStmt->idxname);
 			char **relationSchemaName = &(indexStmt->relation->schemaname);
@@ -321,9 +313,8 @@ RelayEventExtendNames(Node *parseTree, char *schemaName, uint64 shardId)
 			}
 
 			/* extend ColumnRef nodes in the IndexStmt with the shardId */
-			state.shardId = shardId;
+			UpdateWholeRowColumnReferencesWalker((Node *) indexStmt->indexParams,
-			raw_expression_tree_walker((Node *) indexStmt->indexParams,
+												 &shardId);
-									   UpdateWholeRowColumnReferencesWalker, &state);
 
 			/* prefix with schema name if it is not added already */
 			SetSchemaNameIfNotExist(relationSchemaName, schemaName);
@@ -549,8 +540,16 @@ AppendShardIdToConstraintName(AlterTableCmd *command, uint64 shardId)
 }
 
 
+/*
+ * UpdateWholeRowColumnReferencesWalker extends ColumnRef nodes that end with A_Star
+ * with the given shardId.
+ *
+ * ColumnRefs that don't reference A_Star are not extended as catalog access isn't
+ * allowed here and we don't otherwise have enough context to disambiguate a
+ * field name that is identical to the table name.
+ */
 static bool
-UpdateWholeRowColumnReferencesWalker(Node *node, ColumnRefWalkerState *state)
+UpdateWholeRowColumnReferencesWalker(Node *node, uint64 *shardId)
 {
 	bool walkIsComplete = false;
 
@@ -565,7 +564,7 @@ UpdateWholeRowColumnReferencesWalker(Node *node, ColumnRefWalkerState *state)
 
 		walkIsComplete = raw_expression_tree_walker(indexElem->expr,
 													UpdateWholeRowColumnReferencesWalker,
-													state);
+													shardId);
 	}
 	else if (IsA(node, ColumnRef))
 	{
@@ -578,13 +577,11 @@ UpdateWholeRowColumnReferencesWalker(Node *node, ColumnRefWalkerState *state)
 			 * ColumnRef fields list ends with an A_Star, so we can blindly
 			 * extend the penultimate element with the shardId.
 			 */
-			Value *relnameValue;
+			int colrefFieldCount = list_length(columnRef->fields);
-			int len = list_length(columnRef->fields);
+			Value *relnameValue = list_nth(columnRef->fields, colrefFieldCount - 2);
-
-			relnameValue = list_nth(columnRef->fields, len - 2);
 			Assert(IsA(relnameValue, String));
 
-			AppendShardIdToName(&relnameValue->val.str, state->shardId);
+			AppendShardIdToName(&relnameValue->val.str, *shardId);
 		}
 
 		/* might be more than one ColumnRef to visit */
@@ -594,7 +591,7 @@ UpdateWholeRowColumnReferencesWalker(Node *node, ColumnRefWalkerState *state)
 	{
 		walkIsComplete = raw_expression_tree_walker(node,
 													UpdateWholeRowColumnReferencesWalker,
-													state);
+													shardId);
 	}
 
 	return walkIsComplete;

src/backend/distributed/utils/ruleutils_95.c

@@ -3621,13 +3621,7 @@ get_variable(Var *var, int levelsup, bool istoplevel, deparse_context *context)
 		attname = colinfo->colnames[attnum - 1];
 		Assert(attname != NULL);
 	}
-	else
+	else if (GetRangeTblKind(rte) == CITUS_RTE_SHARD)
-	{
-		CitusRTEKind rtekind;
-
-		rtekind = GetRangeTblKind(rte);
-
-		if (rtekind == CITUS_RTE_SHARD || rtekind == CITUS_RTE_REMOTE_QUERY)
 	{
 		/* System column on a Citus shared/remote relation */
 		attname = get_relid_attribute_name(rte->relid, attnum);
@@ -3637,7 +3631,6 @@ get_variable(Var *var, int levelsup, bool istoplevel, deparse_context *context)
 		/* System column - name is fixed, get it from the catalog */
 		attname = get_rte_attribute_name(rte, attnum);
 	}
-	}
 
 	if (refname && (context->varprefix || attname == NULL))
 	{

src/test/regress/expected/multi_simple_queries.out

@@ -502,7 +502,7 @@ DEBUG:  pruning merge fetch taskId 11
 DETAIL:  Creating dependency on merge taskId 14
 ERROR:  cannot use real time executor with repartition jobs
 HINT:  Set citus.task_executor_type to "task-tracker".
--- system columns from shard tables can be queried retrieved
+-- system columns from shard tables can be queried and retrieved
 SELECT count(*) FROM (
     SELECT tableoid, ctid, cmin, cmax, xmin, xmax
         FROM articles

src/test/regress/sql/multi_simple_queries.sql

@@ -260,7 +260,7 @@ SELECT *
 	FROM articles a, articles b
 	WHERE a.id = b.id  AND a.author_id = 1;
 
--- system columns from shard tables can be queried retrieved
+-- system columns from shard tables can be queried and retrieved
 SELECT count(*) FROM (
     SELECT tableoid, ctid, cmin, cmax, xmin, xmax
         FROM articles