Merge pull request #2866 from citusdata/fix_83_regression

Do not record relation accessess unnecessarily

src/backend/distributed/commands/multi_copy.c

@@ -2346,6 +2346,8 @@ CitusCopyDestReceiverStartup(DestReceiver *dest, int operation,
 
 	copyDest->shardStateHash = CreateShardStateHash(TopTransactionContext);
 	copyDest->connectionStateHash = CreateConnectionStateHash(TopTransactionContext);
+
+	RecordRelationAccessIfReferenceTable(tableId, PLACEMENT_ACCESS_DML);
 }
 
 

src/backend/distributed/commands/table.c

@@ -418,11 +418,15 @@ PlanAlterTableStmt(AlterTableStmt *alterTableStatement, const char *alterTableCo
 															   command);
 	}
 
+	if (executeSequentially)
+	{
+		SetLocalMultiShardModifyModeToSequential();
+	}
+
 	ddlJob = palloc0(sizeof(DDLJob));
 	ddlJob->targetRelationId = leftRelationId;
 	ddlJob->concurrentIndexCmd = false;
 	ddlJob->commandString = alterTableCommand;
-	ddlJob->executeSequentially = executeSequentially;
 
 	if (rightRelationId)
 	{

src/backend/distributed/commands/utility_hook.c

@@ -553,7 +553,6 @@ static void
 ExecuteDistributedDDLJob(DDLJob *ddlJob)
 {
 	bool shouldSyncMetadata = ShouldSyncTableMetadata(ddlJob->targetRelationId);
-	int targetPoolSize = ddlJob->executeSequentially ? 1 : MaxAdaptiveExecutorPoolSize;
 
 	EnsureCoordinator();
 	EnsurePartitionTableNotReplicated(ddlJob->targetRelationId);
@@ -579,8 +578,7 @@ ExecuteDistributedDDLJob(DDLJob *ddlJob)
 		}
 
 		/* use adaptive executor when enabled */
-		ExecuteUtilityTaskListWithoutResults(ddlJob->taskList, targetPoolSize,
-											 ddlJob->executeSequentially);
+		ExecuteUtilityTaskListWithoutResults(ddlJob->taskList);
 	}
 	else
 	{
@@ -592,8 +590,7 @@ ExecuteDistributedDDLJob(DDLJob *ddlJob)
 		PG_TRY();
 		{
 			/* use adaptive executor when enabled */
-			ExecuteUtilityTaskListWithoutResults(ddlJob->taskList, targetPoolSize,
-												 ddlJob->executeSequentially);
+			ExecuteUtilityTaskListWithoutResults(ddlJob->taskList);
 
 			if (shouldSyncMetadata)
 			{

src/backend/distributed/commands/vacuum.c

@@ -74,7 +74,6 @@ ProcessVacuumStmt(VacuumStmt *vacuumStmt, const char *vacuumCommand)
 		{
 			List *vacuumColumnList = NIL;
 			List *taskList = NIL;
-			int targetPoolSize = MaxAdaptiveExecutorPoolSize;
 
 			/*
 			 * VACUUM commands cannot run inside a transaction block, so we use
@@ -94,7 +93,7 @@ ProcessVacuumStmt(VacuumStmt *vacuumStmt, const char *vacuumCommand)
 			taskList = VacuumTaskList(relationId, vacuumStmt->options, vacuumColumnList);
 
 			/* use adaptive executor when enabled */
-			ExecuteUtilityTaskListWithoutResults(taskList, targetPoolSize, false);
+			ExecuteUtilityTaskListWithoutResults(taskList);
 			executedVacuumCount++;
 		}
 		relationIndex++;

src/backend/distributed/connection/placement_connection.c

@@ -366,6 +366,8 @@ AssignPlacementListToConnection(List *placementAccessList, MultiConnection *conn
 		ConnectionPlacementHashEntry *placementEntry = NULL;
 		ConnectionReference *placementConnection = NULL;
 
+		Oid relationId = InvalidOid;
+
 		if (placement->shardId == INVALID_SHARD_ID)
 		{
 			/*
@@ -452,8 +454,9 @@ AssignPlacementListToConnection(List *placementAccessList, MultiConnection *conn
 			placementConnection->hadDML = true;
 		}
 
-		/* record the relation access mapping */
-		AssociatePlacementAccessWithRelation(placement, accessType);
+		/* record the relation access */
+		relationId = RelationIdForShard(placement->shardId);
+		RecordRelationAccessIfReferenceTable(relationId, accessType);
 	}
 }
 
@@ -700,9 +703,6 @@ FindPlacementListConnection(int flags, List *placementAccessList, const char *us
 			Assert(!placementConnection->hadDML);
 			Assert(accessType != PLACEMENT_ACCESS_DDL);
 		}
-
-		/* record the relation access mapping */
-		AssociatePlacementAccessWithRelation(placement, accessType);
 	}
 
 	return chosenConnection;

src/backend/distributed/executor/adaptive_executor.c

@@ -657,17 +657,15 @@ AdaptiveExecutor(CustomScanState *node)
  * through router executor.
  */
 void
-ExecuteUtilityTaskListWithoutResults(List *taskList, int targetPoolSize,
-									 bool forceSequentialExecution)
+ExecuteUtilityTaskListWithoutResults(List *taskList)
 {
 	if (TaskExecutorType == MULTI_EXECUTOR_ADAPTIVE)
 	{
-		ExecuteTaskList(ROW_MODIFY_NONE, taskList, targetPoolSize);
+		ExecuteTaskList(ROW_MODIFY_NONE, taskList, MaxAdaptiveExecutorPoolSize);
 	}
 	else
 	{
-		if (MultiShardConnectionType == SEQUENTIAL_CONNECTION ||
-			forceSequentialExecution)
+		if (MultiShardConnectionType == SEQUENTIAL_CONNECTION)
 		{
 			ExecuteModifyTasksSequentiallyWithoutResults(taskList, ROW_MODIFY_NONE);
 		}

src/backend/distributed/master/master_truncate.c

@@ -77,8 +77,7 @@ citus_truncate_trigger(PG_FUNCTION_ARGS)
 	{
 		List *taskList = TruncateTaskList(relationId);
 
-		ExecuteUtilityTaskListWithoutResults(taskList, MaxAdaptiveExecutorPoolSize,
-											 false);
+		ExecuteUtilityTaskListWithoutResults(taskList);
 	}
 
 	PG_RETURN_DATUM(PointerGetDatum(NULL));

src/backend/distributed/transaction/relation_access_tracking.c

@@ -82,7 +82,7 @@ static HTAB *RelationAccessHash;
 
 
 /* functions related to access recording */
-static void RecordRelationAccess(Oid relationId, ShardPlacementAccessType accessType);
+static void RecordRelationAccessBase(Oid relationId, ShardPlacementAccessType accessType);
 static void RecordPlacementAccessToCache(Oid relationId,
 										 ShardPlacementAccessType accessType);
 static void RecordRelationParallelSelectAccessForTask(Task *task);
@@ -148,25 +148,32 @@ AllocateRelationAccessHash(void)
 
 
 /*
- * AssociatePlacementAccessWithRelation associates the placement access to the
- * distributed relation that the placement belongs to.
+ * RecordRelationAccessIfReferenceTable marks the relation accessed if it is a
+ * reference relation.
+ *
+ * The function is a wrapper around RecordRelationAccessBase().
  */
 void
-AssociatePlacementAccessWithRelation(ShardPlacement *placement,
-									 ShardPlacementAccessType accessType)
+RecordRelationAccessIfReferenceTable(Oid relationId, ShardPlacementAccessType accessType)
 {
-	Oid relationId = InvalidOid;
-	uint64 shardId = INVALID_SHARD_ID;
-
 	if (!ShouldRecordRelationAccess())
 	{
 		return;
 	}
 
-	shardId = placement->shardId;
-	relationId = RelationIdForShard(shardId);
+	/*
+	 * We keep track of relation accesses for the purposes of foreign keys to
+	 * reference tables. So, other distributed tables are not relevant for now.
+	 * Additionally, partitioned tables with lots of partitions might require
+	 * recursively calling RecordRelationAccessBase(), so becareful about
+	 * removing this check.
+	 */
+	if (PartitionMethod(relationId) != DISTRIBUTE_BY_NONE)
+	{
+		return;
+	}
 
-	RecordRelationAccess(relationId, accessType);
+	RecordRelationAccessBase(relationId, accessType);
 }
 
 
@@ -205,15 +212,15 @@ PlacementAccessTypeToText(ShardPlacementAccessType accessType)
 
 
 /*
- * RecordRelationAccess associates the access to the distributed relation. The
+ * RecordRelationAccessBase associates the access to the distributed relation. The
  * function takes partitioned relations into account as well.
  *
  * We implemented this function to prevent accessing placement metadata during
  * recursive calls of the function itself (e.g., avoid
- * AssociatePlacementAccessWithRelation()).
+ * RecordRelationAccessBase()).
  */
 static void
-RecordRelationAccess(Oid relationId, ShardPlacementAccessType accessType)
+RecordRelationAccessBase(Oid relationId, ShardPlacementAccessType accessType)
 {
 	/* make sure that this is not a conflicting access */
 	CheckConflictingRelationAccesses(relationId, accessType);
@@ -244,7 +251,7 @@ RecordRelationAccess(Oid relationId, ShardPlacementAccessType accessType)
 			}
 
 			/* recursively call the function to cover multi-level partitioned tables */
-			RecordRelationAccess(partitionOid, accessType);
+			RecordRelationAccessBase(partitionOid, accessType);
 		}
 	}
 	else if (PartitionTableNoLock(relationId))
@@ -680,7 +687,7 @@ GetRelationAccessMode(Oid relationId, ShardPlacementAccessType accessType)
 	}
 	else
 	{
-		return RELATION_SEQUENTIAL_ACCESSED;
+		return RELATION_REFERENCE_ACCESSED;
 	}
 }
 

src/include/distributed/commands/utility_hook.h

@@ -37,7 +37,6 @@ typedef struct DDLJob
 {
 	Oid targetRelationId;      /* oid of the target distributed relation */
 	bool concurrentIndexCmd;   /* related to a CONCURRENTLY index command? */
-	bool executeSequentially;
 	const char *commandString; /* initial (coordinator) DDL command string */
 	List *taskList;            /* worker DDL tasks to execute */
 } DDLJob;

src/include/distributed/multi_executor.h

@@ -42,8 +42,7 @@ extern uint64 ExecuteTaskListExtended(RowModifyLevel modLevel, List *taskList,
 									  TupleDesc tupleDescriptor,
 									  Tuplestorestate *tupleStore,
 									  bool hasReturning, int targetPoolSize);
-extern void ExecuteUtilityTaskListWithoutResults(List *taskList, int targetPoolSize,
-												 bool forceSequentialExecution);
+extern void ExecuteUtilityTaskListWithoutResults(List *taskList);
 extern uint64 ExecuteTaskList(RowModifyLevel modLevel, List *taskList, int
 							  targetPoolSize);
 extern TupleTableSlot * CitusExecScan(CustomScanState *node);

src/include/distributed/relation_access_tracking.h

@@ -23,13 +23,20 @@ struct ShardPlacement;
 typedef enum RelationAccessMode
 {
 	RELATION_NOT_ACCESSED,
-	RELATION_SEQUENTIAL_ACCESSED,
+
+	/* only valid for reference tables */
+	RELATION_REFERENCE_ACCESSED,
+
+	/*
+	 * Only valid for distributed tables and set
+	 * if table is accessed in parallel mode
+	 */
 	RELATION_PARALLEL_ACCESSED
 } RelationAccessMode;
 
 extern void AllocateRelationAccessHash(void);
 extern void ResetRelationAccessHash(void);
-extern void AssociatePlacementAccessWithRelation(ShardPlacement *placement,
+extern void RecordRelationAccessIfReferenceTable(Oid relationId,
 												 ShardPlacementAccessType accessType);
 extern void RecordParallelRelationAccessForTaskList(List *taskList);
 extern void RecordParallelSelectAccess(Oid relationId);

src/test/regress/expected/foreign_key_restriction_enforcement.out

@@ -1064,8 +1064,6 @@ ADD CONSTRAINT
 	fkey_delete FOREIGN KEY(value_1) 
 REFERENCES 
 	reference_table(id) ON DELETE CASCADE;
-DEBUG:  switching to sequential query execution mode
-DETAIL:  Reference relation "reference_table" is modified, which might lead to data inconsistencies or distributed deadlocks via parallel accesses to hash distributed relations due to foreign keys. Any parallel modification to those hash distributed relations in the same transaction can only be executed in sequential query execution mode
 INSERT INTO reference_table SELECT i FROM generate_series(0, 10) i;
 DEBUG:  distributed INSERT ... SELECT can only select from distributed tables
 DEBUG:  Collecting INSERT ... SELECT results on coordinator

src/test/regress/expected/foreign_key_restriction_enforcement_0.out

@@ -1064,8 +1064,6 @@ ADD CONSTRAINT
 	fkey_delete FOREIGN KEY(value_1) 
 REFERENCES 
 	reference_table(id) ON DELETE CASCADE;
-DEBUG:  switching to sequential query execution mode
-DETAIL:  Reference relation "reference_table" is modified, which might lead to data inconsistencies or distributed deadlocks via parallel accesses to hash distributed relations due to foreign keys. Any parallel modification to those hash distributed relations in the same transaction can only be executed in sequential query execution mode
 INSERT INTO reference_table SELECT i FROM generate_series(0, 10) i;
 DEBUG:  distributed INSERT ... SELECT can only select from distributed tables
 DEBUG:  Collecting INSERT ... SELECT results on coordinator

src/test/regress/expected/relation_access_tracking.out

@@ -22,14 +22,30 @@ CREATE OR REPLACE FUNCTION relation_ddl_access_mode(relationId Oid)
     RETURNS int
     LANGUAGE C STABLE STRICT
     AS 'citus', $$relation_ddl_access_mode$$;
-CREATE OR REPLACE FUNCTION relation_access_mode_to_text(relationShardAccess int)
+CREATE OR REPLACE FUNCTION distributed_relation(relation_name text)
+RETURNS bool AS
+$$
+DECLARE
+	part_method char;
+BEGIN
+		 select partmethod INTO part_method from pg_dist_partition  WHERE logicalrelid = relation_name::regclass;
+         IF part_method = 'h' THEN
+                RETURN true;
+         ELSE
+                RETURN false;
+         END IF;
+END;
+$$ LANGUAGE 'plpgsql' IMMUTABLE;
+CREATE OR REPLACE FUNCTION relation_access_mode_to_text(relation_name text, relationShardAccess int)
 RETURNS text AS
 $$
 BEGIN
-	 IF relationShardAccess = 0 THEN
+	 IF relationShardAccess = 0 and distributed_relation(relation_name) THEN
+	 	RETURN 'not_parallel_accessed';
+	 ELSIF relationShardAccess = 0 and NOT distributed_relation(relation_name) THEN
 	 	RETURN 'not_accessed';
 	 ELSIF relationShardAccess = 1 THEN
-	 	RETURN 'sequential_access';
+	 	RETURN 'reference_table_access';
 	 ELSE 
 		RETURN 'parallel_access';
 	 END IF;
@@ -37,9 +53,9 @@ END;
 $$ LANGUAGE 'plpgsql' IMMUTABLE;
 CREATE VIEW relation_acesses AS 
 	SELECT table_name, 
-			relation_access_mode_to_text(relation_select_access_mode(table_name::regclass)) as select_access,
-			relation_access_mode_to_text(relation_dml_access_mode(table_name::regclass)) as dml_access,
-			relation_access_mode_to_text(relation_ddl_access_mode(table_name::regclass)) as ddl_access
+			relation_access_mode_to_text(table_name, relation_select_access_mode(table_name::regclass)) as select_access,
+			relation_access_mode_to_text(table_name, relation_dml_access_mode(table_name::regclass)) as dml_access,
+			relation_access_mode_to_text(table_name, relation_ddl_access_mode(table_name::regclass)) as ddl_access
 	FROM 
 		((SELECT 'table_' || i as table_name FROM generate_series(1, 7) i) UNION (SELECT 'partitioning_test') UNION (SELECT 'partitioning_test_2009') UNION (SELECT 'partitioning_test_2010')) tables;
 SET citus.shard_replication_factor TO 1;
@@ -102,8 +118,8 @@ BEGIN;
 
 	SELECT * FROM relation_acesses  WHERE table_name IN ('table_7')  ORDER BY 1;
  table_name |     select_access     |      dml_access       |   ddl_access    
-------------+---------------+--------------+-----------------
- table_7    | not_accessed  | not_accessed | parallel_access
+------------+-----------------------+-----------------------+-----------------
+ table_7    | not_parallel_accessed | not_parallel_accessed | parallel_access
 (1 row)
 
 COMMIT;
@@ -116,8 +132,8 @@ SELECT count(*) FROM table_1;
 
 SELECT * FROM relation_acesses WHERE table_name = 'table_1';
  table_name |     select_access     |      dml_access       |      ddl_access       
-------------+---------------+--------------+--------------
- table_1    | not_accessed  | not_accessed | not_accessed
+------------+-----------------------+-----------------------+-----------------------
+ table_1    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (1 row)
 
 -- a very simple test that first checks sequential 
@@ -125,8 +141,8 @@ SELECT * FROM relation_acesses WHERE table_name = 'table_1';
 BEGIN;
 	SELECT * FROM relation_acesses WHERE table_name = 'table_1';
  table_name |     select_access     |      dml_access       |      ddl_access       
-------------+---------------+--------------+--------------
- table_1    | not_accessed  | not_accessed | not_accessed
+------------+-----------------------+-----------------------+-----------------------
+ table_1    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (1 row)
 
 	SELECT count(*) FROM table_1 WHERE key = 1;
@@ -137,8 +153,8 @@ BEGIN;
 
 	SELECT * FROM relation_acesses WHERE table_name = 'table_1';
  table_name |     select_access     |      dml_access       |      ddl_access       
-------------+-------------------+--------------+--------------
- table_1    | sequential_access | not_accessed | not_accessed
+------------+-----------------------+-----------------------+-----------------------
+ table_1    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (1 row)
 
 	SELECT count(*) FROM table_1 WHERE key = 1 OR key = 2;
@@ -149,30 +165,30 @@ BEGIN;
 
 	SELECT * FROM relation_acesses WHERE table_name = 'table_1';
  table_name |  select_access  |      dml_access       |      ddl_access       
-------------+-----------------+--------------+--------------
- table_1    | parallel_access | not_accessed | not_accessed
+------------+-----------------+-----------------------+-----------------------
+ table_1    | parallel_access | not_parallel_accessed | not_parallel_accessed
 (1 row)
 
 	INSERT INTO table_1 VALUES (1,1);
 	SELECT * FROM relation_acesses WHERE table_name = 'table_1';
  table_name |  select_access  |      dml_access       |      ddl_access       
-------------+-----------------+-------------------+--------------
- table_1    | parallel_access | sequential_access | not_accessed
+------------+-----------------+-----------------------+-----------------------
+ table_1    | parallel_access | not_parallel_accessed | not_parallel_accessed
 (1 row)
 
 	INSERT INTO table_1 VALUES (1,1), (2,2);
 	SELECT * FROM relation_acesses WHERE table_name = 'table_1';
  table_name |  select_access  |      dml_access       |      ddl_access       
-------------+-----------------+-------------------+--------------
- table_1    | parallel_access | sequential_access | not_accessed
+------------+-----------------+-----------------------+-----------------------
+ table_1    | parallel_access | not_parallel_accessed | not_parallel_accessed
 (1 row)
 
 	ALTER TABLE table_1 ADD COLUMN test_col INT;
 	-- now see that the other tables are not accessed at all
 	SELECT * FROM relation_acesses WHERE table_name = 'table_1';
  table_name |  select_access  |      dml_access       |   ddl_access    
-------------+-----------------+-------------------+-----------------
- table_1    | parallel_access | sequential_access | parallel_access
+------------+-----------------+-----------------------+-----------------
+ table_1    | parallel_access | not_parallel_accessed | parallel_access
 (1 row)
 
 ROLLBACK;
@@ -187,8 +203,8 @@ BEGIN;
 
 	SELECT * FROM relation_acesses WHERE table_name = 'table_1';
  table_name |     select_access     |      dml_access       |      ddl_access       
-------------+-------------------+--------------+--------------
- table_1    | sequential_access | not_accessed | not_accessed
+------------+-----------------------+-----------------------+-----------------------
+ table_1    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (1 row)
 
 	SELECT count(*) FROM table_1 WHERE key = 2;
@@ -199,22 +215,22 @@ BEGIN;
 
 	SELECT * FROM relation_acesses WHERE table_name = 'table_1';
  table_name |     select_access     |      dml_access       |      ddl_access       
-------------+-------------------+--------------+--------------
- table_1    | sequential_access | not_accessed | not_accessed
+------------+-----------------------+-----------------------+-----------------------
+ table_1    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (1 row)
 
 	INSERT INTO table_1 VALUES (1,1);
 	SELECT * FROM relation_acesses WHERE table_name = 'table_1';
  table_name |     select_access     |      dml_access       |      ddl_access       
-------------+-------------------+-------------------+--------------
- table_1    | sequential_access | sequential_access | not_accessed
+------------+-----------------------+-----------------------+-----------------------
+ table_1    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (1 row)
 
 	INSERT INTO table_1 VALUES (2,2);
 	SELECT * FROM relation_acesses WHERE table_name = 'table_1';
  table_name |     select_access     |      dml_access       |      ddl_access       
-------------+-------------------+-------------------+--------------
- table_1    | sequential_access | sequential_access | not_accessed
+------------+-----------------------+-----------------------+-----------------------
+ table_1    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (1 row)
 
 ROLLBACK;
@@ -223,8 +239,8 @@ BEGIN;
 	ALTER TABLE table_1 ADD CONSTRAINT table_1_u UNIQUE (key);
 	SELECT * FROM relation_acesses WHERE table_name = 'table_1';
  table_name |     select_access     |      dml_access       |   ddl_access    
-------------+---------------+--------------+-----------------
- table_1    | not_accessed  | not_accessed | parallel_access
+------------+-----------------------+-----------------------+-----------------
+ table_1    | not_parallel_accessed | not_parallel_accessed | parallel_access
 (1 row)
 
 ROLLBACK;
@@ -245,14 +261,14 @@ BEGIN;
 
 		SELECT * FROM relation_acesses WHERE table_name LIKE 'table_%' ORDER BY 1;
  table_name |     select_access     |      dml_access       |      ddl_access       
-------------+-------------------+--------------+--------------
- table_1    | sequential_access | not_accessed | not_accessed
- table_2    | sequential_access | not_accessed | not_accessed
- table_3    | sequential_access | not_accessed | not_accessed
- table_4    | sequential_access | not_accessed | not_accessed
- table_5    | sequential_access | not_accessed | not_accessed
+------------+-----------------------+-----------------------+-----------------------
+ table_1    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
+ table_2    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
+ table_3    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
+ table_4    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
+ table_5    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
  table_6    | not_accessed          | not_accessed          | not_accessed
- table_7    | not_accessed      | not_accessed | not_accessed
+ table_7    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (7 rows)
 
 ROLLBACK;
@@ -271,9 +287,9 @@ BEGIN;
 
 		SELECT * FROM relation_acesses WHERE table_name IN ('table_1', 'table_2')  ORDER BY 1;
  table_name |  select_access  |      dml_access       |      ddl_access       
-------------+-----------------+--------------+--------------
- table_1    | parallel_access | not_accessed | not_accessed
- table_2    | parallel_access | not_accessed | not_accessed
+------------+-----------------+-----------------------+-----------------------
+ table_1    | parallel_access | not_parallel_accessed | not_parallel_accessed
+ table_2    | parallel_access | not_parallel_accessed | not_parallel_accessed
 (2 rows)
 
 ROLLBACK;
@@ -294,9 +310,9 @@ BEGIN;
 
 		SELECT * FROM relation_acesses WHERE table_name IN ('table_1', 'table_2')  ORDER BY 1;
  table_name |     select_access     |      dml_access       |      ddl_access       
-------------+-------------------+--------------+--------------
- table_1    | sequential_access | not_accessed | not_accessed
- table_2    | sequential_access | not_accessed | not_accessed
+------------+-----------------------+-----------------------+-----------------------
+ table_1    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
+ table_2    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (2 rows)
 
 ROLLBACK;
@@ -321,14 +337,14 @@ BEGIN;
 
 	SELECT * FROM relation_acesses WHERE table_name LIKE 'table_%' ORDER BY 1;
  table_name |     select_access     |      dml_access       |      ddl_access       
-------------+-----------------+--------------+--------------
- table_1    | parallel_access | not_accessed | not_accessed
- table_2    | parallel_access | not_accessed | not_accessed
- table_3    | parallel_access | not_accessed | not_accessed
- table_4    | parallel_access | not_accessed | not_accessed
- table_5    | parallel_access | not_accessed | not_accessed
+------------+-----------------------+-----------------------+-----------------------
+ table_1    | parallel_access       | not_parallel_accessed | not_parallel_accessed
+ table_2    | parallel_access       | not_parallel_accessed | not_parallel_accessed
+ table_3    | parallel_access       | not_parallel_accessed | not_parallel_accessed
+ table_4    | parallel_access       | not_parallel_accessed | not_parallel_accessed
+ table_5    | parallel_access       | not_parallel_accessed | not_parallel_accessed
  table_6    | not_accessed          | not_accessed          | not_accessed
- table_7    | not_accessed    | not_accessed | not_accessed
+ table_7    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (7 rows)
 
 ROLLBACK;
@@ -339,17 +355,17 @@ BEGIN;
 	UPDATE table_1 SET value = 15;
 	SELECT * FROM relation_acesses WHERE table_name = 'table_1';
  table_name |  select_access  |   dml_access    |      ddl_access       
-------------+-----------------+-----------------+--------------
- table_1    | parallel_access | parallel_access | not_accessed
+------------+-----------------+-----------------+-----------------------
+ table_1    | parallel_access | parallel_access | not_parallel_accessed
 (1 row)
 
 	SET LOCAL citus.multi_shard_modify_mode = 'sequential';
 	UPDATE table_2 SET value = 15;
 	SELECT * FROM relation_acesses WHERE table_name IN ('table_1', 'table_2')  ORDER BY 1;
  table_name |     select_access     |      dml_access       |      ddl_access       
-------------+-------------------+-------------------+--------------
- table_1    | parallel_access   | parallel_access   | not_accessed
- table_2    | sequential_access | sequential_access | not_accessed
+------------+-----------------------+-----------------------+-----------------------
+ table_1    | parallel_access       | parallel_access       | not_parallel_accessed
+ table_2    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (2 rows)
 
 ROLLBACK;
@@ -360,10 +376,10 @@ BEGIN;
 	WHERE key IN (SELECT key FROM table_2 JOIN table_3 USING (key) WHERE table_2.value = 15);
 	SELECT * FROM relation_acesses WHERE table_name IN ('table_1', 'table_2', 'table_3')  ORDER BY 1;
  table_name |  select_access  |      dml_access       |      ddl_access       
-------------+-----------------+-----------------+--------------
- table_1    | parallel_access | parallel_access | not_accessed
- table_2    | parallel_access | not_accessed    | not_accessed
- table_3    | parallel_access | not_accessed    | not_accessed
+------------+-----------------+-----------------------+-----------------------
+ table_1    | parallel_access | parallel_access       | not_parallel_accessed
+ table_2    | parallel_access | not_parallel_accessed | not_parallel_accessed
+ table_3    | parallel_access | not_parallel_accessed | not_parallel_accessed
 (3 rows)
 
 ROLLBACK;
@@ -372,9 +388,9 @@ BEGIN;
 	INSERT INTO table_2 SELECT * FROM table_1;
 	SELECT * FROM relation_acesses WHERE table_name IN ('table_1', 'table_2')  ORDER BY 1;
  table_name |     select_access     |      dml_access       |      ddl_access       
-------------+-----------------+-----------------+--------------
- table_1    | parallel_access | not_accessed    | not_accessed
- table_2    | not_accessed    | parallel_access | not_accessed
+------------+-----------------------+-----------------------+-----------------------
+ table_1    | parallel_access       | not_parallel_accessed | not_parallel_accessed
+ table_2    | not_parallel_accessed | parallel_access       | not_parallel_accessed
 (2 rows)
 
 ROLLBACK;
@@ -384,9 +400,9 @@ BEGIN;
 	INSERT INTO table_2 SELECT * FROM table_1;
 	SELECT * FROM relation_acesses WHERE table_name IN ('table_1', 'table_2')  ORDER BY 1;
  table_name |     select_access     |      dml_access       |      ddl_access       
-------------+-------------------+-------------------+--------------
- table_1    | sequential_access | not_accessed      | not_accessed
- table_2    | not_accessed      | sequential_access | not_accessed
+------------+-----------------------+-----------------------+-----------------------
+ table_1    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
+ table_2    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (2 rows)
 
 ROLLBACK;
@@ -395,9 +411,9 @@ BEGIN;
 	INSERT INTO table_2 SELECT * FROM table_1 OFFSET 0;
 	SELECT * FROM relation_acesses WHERE table_name IN ('table_1', 'table_2')  ORDER BY 1;
  table_name |     select_access     |      dml_access       |      ddl_access       
-------------+-----------------+-----------------+--------------
- table_1    | parallel_access | not_accessed    | not_accessed
- table_2    | not_accessed    | parallel_access | not_accessed
+------------+-----------------------+-----------------------+-----------------------
+ table_1    | parallel_access       | not_parallel_accessed | not_parallel_accessed
+ table_2    | not_parallel_accessed | parallel_access       | not_parallel_accessed
 (2 rows)
 
 ROLLBACK;
@@ -423,9 +439,9 @@ BEGIN;
 
 	SELECT * FROM relation_acesses  WHERE table_name IN ('table_1', 'table_2')  ORDER BY 1;
  table_name |  select_access  |      dml_access       |      ddl_access       
-------------+-----------------+--------------+--------------
- table_1    | parallel_access | not_accessed | not_accessed
- table_2    | parallel_access | not_accessed | not_accessed
+------------+-----------------+-----------------------+-----------------------
+ table_1    | parallel_access | not_parallel_accessed | not_parallel_accessed
+ table_2    | parallel_access | not_parallel_accessed | not_parallel_accessed
 (2 rows)
 
 ROLLBACK;
@@ -446,10 +462,10 @@ BEGIN;
 	) as foo;
 	SELECT * FROM relation_acesses  WHERE table_name IN ('table_1', 'table_2', 'table_3')  ORDER BY 1;
  table_name |     select_access     |      dml_access       |      ddl_access       
-------------+-----------------+-----------------+--------------
- table_1    | parallel_access | not_accessed    | not_accessed
- table_2    | parallel_access | not_accessed    | not_accessed
- table_3    | not_accessed    | parallel_access | not_accessed
+------------+-----------------------+-----------------------+-----------------------
+ table_1    | parallel_access       | not_parallel_accessed | not_parallel_accessed
+ table_2    | parallel_access       | not_parallel_accessed | not_parallel_accessed
+ table_3    | not_parallel_accessed | parallel_access       | not_parallel_accessed
 (3 rows)
 
 ROLLBACK;
@@ -472,10 +488,10 @@ BEGIN;
 	) as foo;
 	SELECT * FROM relation_acesses  WHERE table_name IN ('table_1', 'table_2', 'table_3')  ORDER BY 1;
  table_name |     select_access     |      dml_access       |      ddl_access       
-------------+-------------------+-------------------+--------------
- table_1    | sequential_access | not_accessed      | not_accessed
- table_2    | sequential_access | not_accessed      | not_accessed
- table_3    | not_accessed      | sequential_access | not_accessed
+------------+-----------------------+-----------------------+-----------------------
+ table_1    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
+ table_2    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
+ table_3    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (3 rows)
 
 ROLLBACK;
@@ -498,11 +514,11 @@ BEGIN;
 	) AND value IN (SELECT key FROM table_4);
 	SELECT * FROM relation_acesses  WHERE table_name IN ('table_1', 'table_2', 'table_3', 'table_4')  ORDER BY 1;
  table_name |  select_access  |      dml_access       |      ddl_access       
-------------+-----------------+-----------------+--------------
- table_1    | parallel_access | not_accessed    | not_accessed
- table_2    | parallel_access | not_accessed    | not_accessed
- table_3    | parallel_access | parallel_access | not_accessed
- table_4    | parallel_access | not_accessed    | not_accessed
+------------+-----------------+-----------------------+-----------------------
+ table_1    | parallel_access | not_parallel_accessed | not_parallel_accessed
+ table_2    | parallel_access | not_parallel_accessed | not_parallel_accessed
+ table_3    | parallel_access | parallel_access       | not_parallel_accessed
+ table_4    | parallel_access | not_parallel_accessed | not_parallel_accessed
 (4 rows)
 
 ROLLBACK;
@@ -514,8 +530,8 @@ BEGIN;
 3	3
 	SELECT * FROM relation_acesses  WHERE table_name IN ('table_1')  ORDER BY 1;
  table_name |  select_access  |      dml_access       |      ddl_access       
-------------+-----------------+--------------+--------------
- table_1    | parallel_access | not_accessed | not_accessed
+------------+-----------------+-----------------------+-----------------------
+ table_1    | parallel_access | not_parallel_accessed | not_parallel_accessed
 (1 row)
 
 ROLLBACK;
@@ -524,8 +540,8 @@ BEGIN;
 	COPY table_1 FROM STDIN WITH CSV;
 	SELECT * FROM relation_acesses  WHERE table_name IN ('table_1')  ORDER BY 1;
  table_name |     select_access     |   dml_access    |      ddl_access       
-------------+---------------+-----------------+--------------
- table_1    | not_accessed  | parallel_access | not_accessed
+------------+-----------------------+-----------------+-----------------------
+ table_1    | not_parallel_accessed | parallel_access | not_parallel_accessed
 (1 row)
 
 ROLLBACK;
@@ -534,8 +550,8 @@ BEGIN;
 	COPY table_1 FROM STDIN WITH CSV;
 	SELECT * FROM relation_acesses  WHERE table_name IN ('table_1')  ORDER BY 1;
  table_name |     select_access     |      dml_access       |      ddl_access       
-------------+---------------+-------------------+--------------
- table_1    | not_accessed  | sequential_access | not_accessed
+------------+-----------------------+-----------------------+-----------------------
+ table_1    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (1 row)
 
 ROLLBACK;
@@ -549,22 +565,22 @@ BEGIN;
 
 	SELECT * FROM relation_acesses  WHERE table_name IN ('table_6');
  table_name |     select_access      |  dml_access  |  ddl_access  
-------------+-------------------+--------------+--------------
- table_6    | sequential_access | not_accessed | not_accessed
+------------+------------------------+--------------+--------------
+ table_6    | reference_table_access | not_accessed | not_accessed
 (1 row)
 
 	UPDATE table_6 SET value = 15;
 	SELECT * FROM relation_acesses  WHERE table_name IN ('table_6');
  table_name |     select_access      |       dml_access       |  ddl_access  
-------------+-------------------+-------------------+--------------
- table_6    | sequential_access | sequential_access | not_accessed
+------------+------------------------+------------------------+--------------
+ table_6    | reference_table_access | reference_table_access | not_accessed
 (1 row)
 
 	ALTER TABLE table_6 ADD COLUMN x INT;	
 	SELECT * FROM relation_acesses  WHERE table_name IN ('table_6');
  table_name |     select_access      |       dml_access       |       ddl_access       
-------------+-------------------+-------------------+-------------------
- table_6    | sequential_access | sequential_access | sequential_access
+------------+------------------------+------------------------+------------------------
+ table_6    | reference_table_access | reference_table_access | reference_table_access
 (1 row)
 
 ROLLBACK;
@@ -578,8 +594,8 @@ BEGIN;
 
 	SELECT * FROM relation_acesses  WHERE table_name IN ('table_6', 'table_1') ORDER BY 1,2;
  table_name |  select_access  |      dml_access       |      ddl_access       
-------------+-----------------+--------------+--------------
- table_1    | parallel_access | not_accessed | not_accessed
+------------+-----------------+-----------------------+-----------------------
+ table_1    | parallel_access | not_parallel_accessed | not_parallel_accessed
  table_6    | parallel_access | not_accessed          | not_accessed
 (2 rows)
 
@@ -589,8 +605,8 @@ BEGIN;
 	TRUNCATE table_1;
 	SELECT * FROM relation_acesses  WHERE table_name IN ('table_1')  ORDER BY 1;
  table_name |     select_access     |      dml_access       |   ddl_access    
-------------+---------------+--------------+-----------------
- table_1    | not_accessed  | not_accessed | parallel_access
+------------+-----------------------+-----------------------+-----------------
+ table_1    | not_parallel_accessed | not_parallel_accessed | parallel_access
 (1 row)
 
 ROLLBACK;
@@ -600,8 +616,8 @@ BEGIN;
 	TRUNCATE table_1;
 	SELECT * FROM relation_acesses  WHERE table_name IN ('table_1')  ORDER BY 1;
  table_name |     select_access     |      dml_access       |      ddl_access       
-------------+---------------+--------------+-------------------
- table_1    | not_accessed  | not_accessed | sequential_access
+------------+-----------------------+-----------------------+-----------------------
+ table_1    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (1 row)
 
 ROLLBACK;
@@ -610,8 +626,8 @@ BEGIN;
 	TRUNCATE table_6;
 	SELECT * FROM relation_acesses  WHERE table_name IN ('table_6')  ORDER BY 1;
  table_name | select_access |  dml_access  |       ddl_access       
-------------+---------------+--------------+-------------------
- table_6    | not_accessed  | not_accessed | sequential_access
+------------+---------------+--------------+------------------------
+ table_6    | not_accessed  | not_accessed | reference_table_access
 (1 row)
 
 ROLLBACK;
@@ -621,9 +637,9 @@ BEGIN;
 	ALTER TABLE table_2 ADD CONSTRAINT table_2_u FOREIGN KEY (key) REFERENCES table_1(key);
 	SELECT * FROM relation_acesses  WHERE table_name IN ('table_1', 'table_2')  ORDER BY 1;
  table_name |     select_access     |      dml_access       |   ddl_access    
-------------+---------------+--------------+-----------------
- table_1    | not_accessed  | not_accessed | parallel_access
- table_2    | not_accessed  | not_accessed | parallel_access
+------------+-----------------------+-----------------------+-----------------
+ table_1    | not_parallel_accessed | not_parallel_accessed | parallel_access
+ table_2    | not_parallel_accessed | not_parallel_accessed | parallel_access
 (2 rows)
 
 ROLLBACK;
@@ -634,9 +650,9 @@ BEGIN;
 	ALTER TABLE table_2 ADD CONSTRAINT table_2_u FOREIGN KEY (key) REFERENCES table_1(key);
 	SELECT * FROM relation_acesses  WHERE table_name IN ('table_1', 'table_2')  ORDER BY 1;
  table_name |     select_access     |      dml_access       |      ddl_access       
-------------+---------------+--------------+-------------------
- table_1    | not_accessed  | not_accessed | sequential_access
- table_2    | not_accessed  | not_accessed | sequential_access
+------------+-----------------------+-----------------------+-----------------------
+ table_1    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
+ table_2    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (2 rows)
 
 ROLLBACK;
@@ -652,9 +668,9 @@ BEGIN;
 	CREATE TABLE partitioning_test_2009 PARTITION OF partitioning_test FOR VALUES FROM ('2009-01-01') TO ('2010-01-01');
 	SELECT * FROM relation_acesses  WHERE table_name IN ('partitioning_test', 'partitioning_test_2009')  ORDER BY 1;
        table_name       |     select_access     |      dml_access       |   ddl_access    
-------------------------+---------------+--------------+-----------------
- partitioning_test      | not_accessed  | not_accessed | parallel_access
- partitioning_test_2009 | not_accessed  | not_accessed | parallel_access
+------------------------+-----------------------+-----------------------+-----------------
+ partitioning_test      | not_parallel_accessed | not_parallel_accessed | parallel_access
+ partitioning_test_2009 | not_parallel_accessed | not_parallel_accessed | parallel_access
 (2 rows)
 
 ROLLBACK;
@@ -664,9 +680,9 @@ BEGIN;
 	ALTER TABLE partitioning_test ATTACH PARTITION partitioning_test_2009 FOR VALUES FROM ('2009-01-01') TO ('2010-01-01');
 	SELECT * FROM relation_acesses  WHERE table_name IN ('partitioning_test', 'partitioning_test_2009')  ORDER BY 1;
        table_name       |     select_access     |      dml_access       |   ddl_access    
-------------------------+---------------+--------------+-----------------
- partitioning_test      | not_accessed  | not_accessed | parallel_access
- partitioning_test_2009 | not_accessed  | not_accessed | parallel_access
+------------------------+-----------------------+-----------------------+-----------------
+ partitioning_test      | not_parallel_accessed | not_parallel_accessed | parallel_access
+ partitioning_test_2009 | not_parallel_accessed | not_parallel_accessed | parallel_access
 (2 rows)
 
 COMMIT;
@@ -682,9 +698,9 @@ BEGIN;
 	ALTER TABLE partitioning_test ATTACH PARTITION partitioning_test_2010 FOR VALUES FROM ('2010-01-01') TO ('2011-01-01');
 	SELECT * FROM relation_acesses  WHERE table_name IN ('partitioning_test', 'partitioning_test_2010')  ORDER BY 1;
        table_name       |     select_access     |      dml_access       |   ddl_access    
-------------------------+---------------+--------------+-----------------
- partitioning_test      | not_accessed  | not_accessed | parallel_access
- partitioning_test_2010 | not_accessed  | not_accessed | parallel_access
+------------------------+-----------------------+-----------------------+-----------------
+ partitioning_test      | not_parallel_accessed | not_parallel_accessed | parallel_access
+ partitioning_test_2010 | not_parallel_accessed | not_parallel_accessed | parallel_access
 (2 rows)
 
 COMMIT;
@@ -698,10 +714,10 @@ BEGIN;
 
 	SELECT * FROM relation_acesses  WHERE table_name IN ('partitioning_test', 'partitioning_test_2009', 'partitioning_test_2010')  ORDER BY 1;
        table_name       |  select_access  |      dml_access       |      ddl_access       
-------------------------+-----------------+--------------+--------------
- partitioning_test      | parallel_access | not_accessed | not_accessed
- partitioning_test_2009 | parallel_access | not_accessed | not_accessed
- partitioning_test_2010 | parallel_access | not_accessed | not_accessed
+------------------------+-----------------+-----------------------+-----------------------
+ partitioning_test      | parallel_access | not_parallel_accessed | not_parallel_accessed
+ partitioning_test_2009 | parallel_access | not_parallel_accessed | not_parallel_accessed
+ partitioning_test_2010 | parallel_access | not_parallel_accessed | not_parallel_accessed
 (3 rows)
 
 COMMIT;
@@ -716,10 +732,10 @@ BEGIN;
 
 	SELECT * FROM relation_acesses  WHERE table_name IN ('partitioning_test', 'partitioning_test_2009', 'partitioning_test_2010')  ORDER BY 1;
        table_name       |     select_access     |      dml_access       |      ddl_access       
-------------------------+-------------------+--------------+--------------
- partitioning_test      | sequential_access | not_accessed | not_accessed
- partitioning_test_2009 | sequential_access | not_accessed | not_accessed
- partitioning_test_2010 | sequential_access | not_accessed | not_accessed
+------------------------+-----------------------+-----------------------+-----------------------
+ partitioning_test      | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
+ partitioning_test_2009 | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
+ partitioning_test_2010 | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (3 rows)
 
 COMMIT;
@@ -728,10 +744,10 @@ BEGIN;
 	UPDATE partitioning_test SET time = now();
 	SELECT * FROM relation_acesses  WHERE table_name IN ('partitioning_test', 'partitioning_test_2009', 'partitioning_test_2010')  ORDER BY 1;
        table_name       |  select_access  |   dml_access    |      ddl_access       
-------------------------+-----------------+-----------------+--------------
- partitioning_test      | parallel_access | parallel_access | not_accessed
- partitioning_test_2009 | parallel_access | parallel_access | not_accessed
- partitioning_test_2010 | parallel_access | parallel_access | not_accessed
+------------------------+-----------------+-----------------+-----------------------
+ partitioning_test      | parallel_access | parallel_access | not_parallel_accessed
+ partitioning_test_2009 | parallel_access | parallel_access | not_parallel_accessed
+ partitioning_test_2010 | parallel_access | parallel_access | not_parallel_accessed
 (3 rows)
 
 COMMIT;
@@ -741,10 +757,10 @@ BEGIN;
 	UPDATE partitioning_test SET time = now();
 	SELECT * FROM relation_acesses  WHERE table_name IN ('partitioning_test', 'partitioning_test_2009', 'partitioning_test_2010')  ORDER BY 1;
        table_name       |     select_access     |      dml_access       |      ddl_access       
-------------------------+-------------------+-------------------+--------------
- partitioning_test      | sequential_access | sequential_access | not_accessed
- partitioning_test_2009 | sequential_access | sequential_access | not_accessed
- partitioning_test_2010 | sequential_access | sequential_access | not_accessed
+------------------------+-----------------------+-----------------------+-----------------------
+ partitioning_test      | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
+ partitioning_test_2009 | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
+ partitioning_test_2010 | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (3 rows)
 
 COMMIT;
@@ -753,10 +769,10 @@ BEGIN;
 	ALTER TABLE partitioning_test ADD COLUMN X INT;
 	SELECT * FROM relation_acesses  WHERE table_name IN ('partitioning_test', 'partitioning_test_2009', 'partitioning_test_2010')  ORDER BY 1;
        table_name       |     select_access     |      dml_access       |   ddl_access    
-------------------------+---------------+--------------+-----------------
- partitioning_test      | not_accessed  | not_accessed | parallel_access
- partitioning_test_2009 | not_accessed  | not_accessed | parallel_access
- partitioning_test_2010 | not_accessed  | not_accessed | parallel_access
+------------------------+-----------------------+-----------------------+-----------------
+ partitioning_test      | not_parallel_accessed | not_parallel_accessed | parallel_access
+ partitioning_test_2009 | not_parallel_accessed | not_parallel_accessed | parallel_access
+ partitioning_test_2010 | not_parallel_accessed | not_parallel_accessed | parallel_access
 (3 rows)
 
 ROLLBACK;
@@ -766,10 +782,10 @@ BEGIN;
 	ALTER TABLE partitioning_test ADD COLUMN X INT;
 	SELECT * FROM relation_acesses  WHERE table_name IN ('partitioning_test', 'partitioning_test_2009', 'partitioning_test_2010')  ORDER BY 1;
        table_name       |     select_access     |      dml_access       |      ddl_access       
-------------------------+---------------+--------------+-------------------
- partitioning_test      | not_accessed  | not_accessed | sequential_access
- partitioning_test_2009 | not_accessed  | not_accessed | sequential_access
- partitioning_test_2010 | not_accessed  | not_accessed | sequential_access
+------------------------+-----------------------+-----------------------+-----------------------
+ partitioning_test      | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
+ partitioning_test_2009 | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
+ partitioning_test_2010 | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (3 rows)
 
 ROLLBACK;
@@ -783,10 +799,10 @@ BEGIN;
 
 	SELECT * FROM relation_acesses  WHERE table_name IN ('partitioning_test', 'partitioning_test_2009', 'partitioning_test_2010')  ORDER BY 1;
        table_name       |     select_access     |      dml_access       |      ddl_access       
-------------------------+-----------------+--------------+--------------
- partitioning_test      | parallel_access | not_accessed | not_accessed
- partitioning_test_2009 | parallel_access | not_accessed | not_accessed
- partitioning_test_2010 | not_accessed    | not_accessed | not_accessed
+------------------------+-----------------------+-----------------------+-----------------------
+ partitioning_test      | parallel_access       | not_parallel_accessed | not_parallel_accessed
+ partitioning_test_2009 | parallel_access       | not_parallel_accessed | not_parallel_accessed
+ partitioning_test_2010 | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (3 rows)
 
 COMMIT;
@@ -801,10 +817,10 @@ BEGIN;
 
 	SELECT * FROM relation_acesses  WHERE table_name IN ('partitioning_test', 'partitioning_test_2009', 'partitioning_test_2010')  ORDER BY 1;
        table_name       |     select_access     |      dml_access       |      ddl_access       
-------------------------+-------------------+--------------+--------------
- partitioning_test      | sequential_access | not_accessed | not_accessed
- partitioning_test_2009 | sequential_access | not_accessed | not_accessed
- partitioning_test_2010 | not_accessed      | not_accessed | not_accessed
+------------------------+-----------------------+-----------------------+-----------------------
+ partitioning_test      | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
+ partitioning_test_2009 | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
+ partitioning_test_2010 | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (3 rows)
 
 COMMIT;
@@ -813,10 +829,10 @@ BEGIN;
 	UPDATE partitioning_test_2009 SET time = now();
 	SELECT * FROM relation_acesses  WHERE table_name IN ('partitioning_test', 'partitioning_test_2009', 'partitioning_test_2010')  ORDER BY 1;
        table_name       |     select_access     |      dml_access       |      ddl_access       
-------------------------+-----------------+-----------------+--------------
- partitioning_test      | parallel_access | parallel_access | not_accessed
- partitioning_test_2009 | parallel_access | parallel_access | not_accessed
- partitioning_test_2010 | not_accessed    | not_accessed    | not_accessed
+------------------------+-----------------------+-----------------------+-----------------------
+ partitioning_test      | parallel_access       | parallel_access       | not_parallel_accessed
+ partitioning_test_2009 | parallel_access       | parallel_access       | not_parallel_accessed
+ partitioning_test_2010 | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (3 rows)
 
 COMMIT;
@@ -826,10 +842,10 @@ BEGIN;
 	UPDATE partitioning_test_2009 SET time = now();
 	SELECT * FROM relation_acesses  WHERE table_name IN ('partitioning_test', 'partitioning_test_2009', 'partitioning_test_2010')  ORDER BY 1;
        table_name       |     select_access     |      dml_access       |      ddl_access       
-------------------------+-------------------+-------------------+--------------
- partitioning_test      | sequential_access | sequential_access | not_accessed
- partitioning_test_2009 | sequential_access | sequential_access | not_accessed
- partitioning_test_2010 | not_accessed      | not_accessed      | not_accessed
+------------------------+-----------------------+-----------------------+-----------------------
+ partitioning_test      | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
+ partitioning_test_2009 | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
+ partitioning_test_2010 | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (3 rows)
 
 COMMIT;
@@ -838,10 +854,10 @@ BEGIN;
 	CREATE INDEX i1000000 ON partitioning_test_2009 (id);
 	SELECT * FROM relation_acesses  WHERE table_name IN ('partitioning_test', 'partitioning_test_2009', 'partitioning_test_2010')  ORDER BY 1;
        table_name       |     select_access     |      dml_access       |      ddl_access       
-------------------------+---------------+--------------+-----------------
- partitioning_test      | not_accessed  | not_accessed | parallel_access
- partitioning_test_2009 | not_accessed  | not_accessed | parallel_access
- partitioning_test_2010 | not_accessed  | not_accessed | not_accessed
+------------------------+-----------------------+-----------------------+-----------------------
+ partitioning_test      | not_parallel_accessed | not_parallel_accessed | parallel_access
+ partitioning_test_2009 | not_parallel_accessed | not_parallel_accessed | parallel_access
+ partitioning_test_2010 | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (3 rows)
 
 ROLLBACK;
@@ -851,10 +867,10 @@ BEGIN;
 	CREATE INDEX i1000000 ON partitioning_test_2009 (id);
 	SELECT * FROM relation_acesses  WHERE table_name IN ('partitioning_test', 'partitioning_test_2009', 'partitioning_test_2010')  ORDER BY 1;
        table_name       |     select_access     |      dml_access       |      ddl_access       
-------------------------+---------------+--------------+-------------------
- partitioning_test      | not_accessed  | not_accessed | sequential_access
- partitioning_test_2009 | not_accessed  | not_accessed | sequential_access
- partitioning_test_2010 | not_accessed  | not_accessed | not_accessed
+------------------------+-----------------------+-----------------------+-----------------------
+ partitioning_test      | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
+ partitioning_test_2009 | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
+ partitioning_test_2010 | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (3 rows)
 
 ROLLBACK;
@@ -865,9 +881,9 @@ BEGIN;
 NOTICE:  truncate cascades to table "table_2"
 	SELECT * FROM relation_acesses  WHERE table_name IN ('table_1', 'table_2')  ORDER BY 1;
  table_name |     select_access     |      dml_access       |   ddl_access    
-------------+---------------+--------------+-----------------
- table_1    | not_accessed  | not_accessed | parallel_access
- table_2    | not_accessed  | not_accessed | parallel_access
+------------+-----------------------+-----------------------+-----------------
+ table_1    | not_parallel_accessed | not_parallel_accessed | parallel_access
+ table_2    | not_parallel_accessed | not_parallel_accessed | parallel_access
 (2 rows)
 
 ROLLBACK;
@@ -883,8 +899,8 @@ BEGIN;
 
 	SELECT * FROM relation_acesses  WHERE table_name IN ('table_1')  ORDER BY 1;
  table_name |  select_access  |      dml_access       |      ddl_access       
-------------+-----------------+--------------+--------------
- table_1    | parallel_access | not_accessed | not_accessed
+------------+-----------------+-----------------------+-----------------------
+ table_1    | parallel_access | not_parallel_accessed | not_parallel_accessed
 (1 row)
 
 COMMIT;
@@ -900,8 +916,8 @@ BEGIN;
 
 	SELECT * FROM relation_acesses  WHERE table_name IN ('table_1')  ORDER BY 1;
  table_name |     select_access     |      dml_access       |      ddl_access       
-------------+-------------------+--------------+--------------
- table_1    | sequential_access | not_accessed | not_accessed
+------------+-----------------------+-----------------------+-----------------------
+ table_1    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (1 row)
 
 COMMIT;
@@ -919,8 +935,8 @@ BEGIN;
 
 	SELECT * FROM relation_acesses  WHERE table_name IN ('table_1')  ORDER BY 1;
  table_name |     select_access     |      dml_access       |      ddl_access       
-------------+---------------+-------------------+--------------
- table_1    | not_accessed  | sequential_access | not_accessed
+------------+-----------------------+-----------------------+-----------------------
+ table_1    | not_parallel_accessed | not_parallel_accessed | not_parallel_accessed
 (1 row)
 
 ROLLBACK;
@@ -936,8 +952,8 @@ BEGIN;
 
 	SELECT * FROM relation_acesses  WHERE table_name IN ('table_1')  ORDER BY 1;
  table_name |  select_access  |   dml_access    |      ddl_access       
-------------+-----------------+-----------------+--------------
- table_1    | parallel_access | parallel_access | not_accessed
+------------+-----------------+-----------------+-----------------------
+ table_1    | parallel_access | parallel_access | not_parallel_accessed
 (1 row)
 
 ROLLBACK;
@@ -953,8 +969,8 @@ BEGIN;
 
 	SELECT * FROM relation_acesses  WHERE table_name IN ('table_1')  ORDER BY 1;
  table_name |  select_access  |   dml_access    |      ddl_access       
-------------+-----------------+-----------------+--------------
- table_1    | parallel_access | parallel_access | not_accessed
+------------+-----------------+-----------------+-----------------------
+ table_1    | parallel_access | parallel_access | not_parallel_accessed
 (1 row)
 
 ROLLBACK;
@@ -973,18 +989,19 @@ NOTICE:  Copying data from local table...
 
 	SELECT * FROM relation_acesses  WHERE table_name IN ('table_3')  ORDER BY 1;
  table_name |     select_access     |   dml_access    |   ddl_access    
-------------+---------------+-----------------+-----------------
- table_3    | not_accessed  | parallel_access | parallel_access
+------------+-----------------------+-----------------+-----------------
+ table_3    | not_parallel_accessed | parallel_access | parallel_access
 (1 row)
 
 COMMIT;
 SET search_path TO 'public';
 DROP SCHEMA access_tracking CASCADE;
-NOTICE:  drop cascades to 13 other objects
+NOTICE:  drop cascades to 14 other objects
 DETAIL:  drop cascades to function access_tracking.relation_select_access_mode(oid)
 drop cascades to function access_tracking.relation_dml_access_mode(oid)
 drop cascades to function access_tracking.relation_ddl_access_mode(oid)
-drop cascades to function access_tracking.relation_access_mode_to_text(integer)
+drop cascades to function access_tracking.distributed_relation(text)
+drop cascades to function access_tracking.relation_access_mode_to_text(text,integer)
 drop cascades to view access_tracking.relation_acesses
 drop cascades to table access_tracking.table_1
 drop cascades to table access_tracking.table_2

src/test/regress/sql/relation_access_tracking.sql

@@ -23,15 +23,32 @@ CREATE OR REPLACE FUNCTION relation_ddl_access_mode(relationId Oid)
     LANGUAGE C STABLE STRICT
     AS 'citus', $$relation_ddl_access_mode$$;
 
+CREATE OR REPLACE FUNCTION distributed_relation(relation_name text)
+RETURNS bool AS
+$$
+DECLARE
+	part_method char;
+BEGIN
+		 select partmethod INTO part_method from pg_dist_partition  WHERE logicalrelid = relation_name::regclass;
+         IF part_method = 'h' THEN
+                RETURN true;
+         ELSE
+                RETURN false;
+         END IF;
+END;
+$$ LANGUAGE 'plpgsql' IMMUTABLE;
 
-CREATE OR REPLACE FUNCTION relation_access_mode_to_text(relationShardAccess int)
+
+CREATE OR REPLACE FUNCTION relation_access_mode_to_text(relation_name text, relationShardAccess int)
 RETURNS text AS
 $$
 BEGIN
-	 IF relationShardAccess = 0 THEN
+	 IF relationShardAccess = 0 and distributed_relation(relation_name) THEN
+	 	RETURN 'not_parallel_accessed';
+	 ELSIF relationShardAccess = 0 and NOT distributed_relation(relation_name) THEN
 	 	RETURN 'not_accessed';
 	 ELSIF relationShardAccess = 1 THEN
-	 	RETURN 'sequential_access';
+	 	RETURN 'reference_table_access';
 	 ELSE 
 		RETURN 'parallel_access';
 	 END IF;
@@ -42,9 +59,9 @@ $$ LANGUAGE 'plpgsql' IMMUTABLE;
 
 CREATE VIEW relation_acesses AS 
 	SELECT table_name, 
-			relation_access_mode_to_text(relation_select_access_mode(table_name::regclass)) as select_access,
-			relation_access_mode_to_text(relation_dml_access_mode(table_name::regclass)) as dml_access,
-			relation_access_mode_to_text(relation_ddl_access_mode(table_name::regclass)) as ddl_access
+			relation_access_mode_to_text(table_name, relation_select_access_mode(table_name::regclass)) as select_access,
+			relation_access_mode_to_text(table_name, relation_dml_access_mode(table_name::regclass)) as dml_access,
+			relation_access_mode_to_text(table_name, relation_ddl_access_mode(table_name::regclass)) as ddl_access
 	FROM 
 		((SELECT 'table_' || i as table_name FROM generate_series(1, 7) i) UNION (SELECT 'partitioning_test') UNION (SELECT 'partitioning_test_2009') UNION (SELECT 'partitioning_test_2010')) tables;