Handle sequences

src/backend/distributed/commands/create_distributed_table.c

@@ -430,6 +430,16 @@ CreateDistributedTable(Oid relationId, Var *distributionColumn, char distributio
 		DropFKeysRelationInvolvedWithTableType(relationId, INCLUDE_LOCAL_TABLES);
 	}
 
+	/*
+	 * Ensure that the sequences used in column defaults of the table
+	 * have proper types
+	 */
+	List *attnumList = NIL;
+	List *dependentSequenceList = NIL;
+	GetDependentSequencesWithRelation(relationId, &attnumList, &dependentSequenceList, 0);
+	EnsureDistributedSequencesHaveOneType(relationId, dependentSequenceList,
+										  attnumList);
+
 	/*
 	 * distributed tables might have dependencies on different objects, since we create
 	 * shards for a distributed table via multiple sessions these objects will be created
@@ -439,13 +449,9 @@ CreateDistributedTable(Oid relationId, Var *distributionColumn, char distributio
 	ObjectAddress tableAddress = { 0 };
 	ObjectAddressSet(tableAddress, RelationRelationId, relationId);
 	EnsureDependenciesExistOnAllNodes(&tableAddress);
+	/* TODO: Update owner of the sequence(?) */
 
-	/*
+	/* TODO: Consider partitioned tables */
-	 * For now assume that we can create table after ensuring that dependencies exist.
-	 * Obviously it doesn't support sequences we don't care for it now.
-	 *
-	 * TODO: Consider partitioned tables
-	 */
 	CreateShellTableOnWorkers(relationId);
 	MarkObjectDistributed(&tableAddress);
 
@@ -500,16 +506,6 @@ CreateDistributedTable(Oid relationId, Var *distributionColumn, char distributio
 	InsertIntoPgDistPartition(relationId, distributionMethod, distributionColumn,
 							  colocationId, replicationModel, autoConverted);
 
-	/*
-	 * Ensure that the sequences used in column defaults of the table
-	 * have proper types
-	 */
-	List *attnumList = NIL;
-	List *dependentSequenceList = NIL;
-	GetDependentSequencesWithRelation(relationId, &attnumList, &dependentSequenceList, 0);
-	EnsureDistributedSequencesHaveOneType(relationId, dependentSequenceList,
-										  attnumList);
-
 	/* foreign tables do not support TRUNCATE trigger */
 	if (RegularTable(relationId))
 	{
@@ -543,16 +539,6 @@ CreateDistributedTable(Oid relationId, Var *distributionColumn, char distributio
 
 	if (ShouldSyncTableMetadata(relationId))
 	{
-		if (ClusterHasKnownMetadataWorkers())
-		{
-			/*
-			 * Ensure both sequence and its' dependencies and mark them as distributed
-			 * before creating table metadata on workers
-			 */
-			MarkSequenceListDistributedAndPropagateWithDependencies(relationId,
-																	dependentSequenceList);
-		}
-
 		CreateTableMetadataOnWorkers(relationId);
 	}
 

src/backend/distributed/commands/dependencies.c

@@ -25,6 +25,7 @@
 #include "distributed/worker_transaction.h"
 #include "storage/lmgr.h"
 #include "utils/lsyscache.h"
+#include "miscadmin.h"
 
 typedef bool (*AddressPredicate)(const ObjectAddress *);
 
@@ -223,27 +224,40 @@ GetDependencyCreateDDLCommands(const ObjectAddress *dependency)
 	{
 		case OCLASS_CLASS:
 		{
+			char relKind = get_rel_relkind(dependency->objectId);
+
 			/*
 			 * types have an intermediate dependency on a relation (aka class), so we do
 			 * support classes when the relkind is composite
 			 */
-			if (get_rel_relkind(dependency->objectId) == RELKIND_COMPOSITE_TYPE)
+			if (relKind == RELKIND_COMPOSITE_TYPE)
 			{
 				return NIL;
 			}
 
-			List *commandList = NIL;
+			if (relKind == RELKIND_RELATION)
-			List *tableDDLCommands = GetFullTableCreationCommands(dependency->objectId,
-																  WORKER_NEXTVAL_SEQUENCE_DEFAULTS);
-
-			TableDDLCommand *tableDDLCommand = NULL;
-			foreach_ptr(tableDDLCommand, tableDDLCommands)
 			{
-				Assert(CitusIsA(tableDDLCommand, TableDDLCommand));
+				List *commandList = NIL;
-				commandList = lappend(commandList, GetTableDDLCommand(tableDDLCommand));
+				List *tableDDLCommands = GetFullTableCreationCommands(
+					dependency->objectId,
+					WORKER_NEXTVAL_SEQUENCE_DEFAULTS);
+
+				TableDDLCommand *tableDDLCommand = NULL;
+				foreach_ptr(tableDDLCommand, tableDDLCommands)
+				{
+					Assert(CitusIsA(tableDDLCommand, TableDDLCommand));
+					commandList = lappend(commandList, GetTableDDLCommand(
+											  tableDDLCommand));
+				}
+
+				return commandList;
 			}
 
-			return commandList;
+			if (relKind == RELKIND_SEQUENCE)
+			{
+				char *userName = GetUserNameFromId(GetUserId(), false);
+				return DDLCommandsForSequence(dependency->objectId, userName);
+			}
 		}
 
 		case OCLASS_COLLATION:

src/backend/distributed/metadata/dependency.c

@@ -37,6 +37,7 @@
 #include "distributed/metadata/dependency.h"
 #include "distributed/metadata/distobject.h"
 #include "distributed/metadata_cache.h"
+#include "distributed/metadata_sync.h"
 #include "distributed/version_compat.h"
 #include "miscadmin.h"
 #include "utils/fmgroids.h"
@@ -675,7 +676,8 @@ SupportedDependencyByCitus(const ObjectAddress *address)
 			 * for tables.
 			 */
 			if (relKind == RELKIND_COMPOSITE_TYPE ||
-				relKind == RELKIND_RELATION)
+				relKind == RELKIND_RELATION ||
+				relKind == RELKIND_SEQUENCE)
 			{
 				return true;
 			}
@@ -983,6 +985,27 @@ ExpandCitusSupportedTypes(ObjectAddressCollector *collector, ObjectAddress targe
 			List *statisticsSchemaDependencyList =
 				GetRelationStatsSchemaDependencyList(relationId);
 			result = list_concat(result, statisticsSchemaDependencyList);
+
+			/*
+			 * Add the dependent sequences for the relations
+			 */
+			List *attnumList = NIL;
+			List *dependentSequenceList = NIL;
+			List *sequenceDependencyList = NIL;
+
+			GetDependentSequencesWithRelation(relationId, &attnumList,
+											  &dependentSequenceList, 0);
+
+			ListCell *dependentSequenceCell = NULL;
+			foreach(dependentSequenceCell, dependentSequenceList)
+			{
+				Oid sequenceOid = lfirst_oid(dependentSequenceCell);
+				DependencyDefinition *dependency = CreateObjectAddressDependencyDef(
+					RelationRelationId, sequenceOid);
+				sequenceDependencyList = lappend(sequenceDependencyList, dependency);
+			}
+
+			result = list_concat(result, sequenceDependencyList);
 		}
 
 		default:

src/backend/distributed/metadata/metadata_sync.c

@@ -763,9 +763,6 @@ MetadataDropCommands(void)
 	dropSnapshotCommandList = list_concat(dropSnapshotCommandList,
 										  detachPartitionCommandList);
 
-	dropSnapshotCommandList = lappend(dropSnapshotCommandList,
-									  REMOVE_ALL_CLUSTERED_TABLES_COMMAND);
-
 	dropSnapshotCommandList = lappend(dropSnapshotCommandList, DELETE_ALL_NODES);
 	dropSnapshotCommandList = lappend(dropSnapshotCommandList,
 									  DELETE_ALL_DISTRIBUTED_OBJECTS);

src/backend/distributed/metadata/node_metadata.c

@@ -106,7 +106,7 @@ static void InsertPlaceholderCoordinatorRecord(void);
 static void InsertNodeRow(int nodeid, char *nodename, int32 nodeport, NodeMetadata
 						  *nodeMetadata);
 static void DeleteNodeRow(char *nodename, int32 nodeport);
-static void SetUpSequences(WorkerNode *workerNode);
+static void SetUpSequenceDependencies(WorkerNode *workerNode);
 static void SetUpDistributedTableWithDependencies(WorkerNode *workerNode);
 static void SetUpMultipleDistributedTableIntegrations(WorkerNode *workerNode);
 static WorkerNode * TupleToWorkerNode(TupleDesc tupleDescriptor, HeapTuple heapTuple);
@@ -649,7 +649,7 @@ SetUpMultipleDistributedTableIntegrations(WorkerNode *workerNode)
 
 
 static void
-SetUpSequences(WorkerNode *workerNode)
+SetUpSequenceDependencies(WorkerNode *workerNode)
 {
 	List *distributedTableList = CitusTableList();
 	List *propagatedTableList = NIL;
@@ -675,41 +675,6 @@ SetUpSequences(WorkerNode *workerNode)
 			continue;
 		}
 
-		/*
-		 * Set object propagation to off as objects will be distributed while syncing
-		 * the metadata.
-		 */
-		bool prevDependencyCreationValue = EnableDependencyCreation;
-		SetLocalEnableDependencyCreation(false);
-
-		/*
-		 * Ensure sequence dependencies and mark them as distributed
-		 */
-		List *attnumList = NIL;
-		List *dependentSequenceList = NIL;
-		GetDependentSequencesWithRelation(relationId, &attnumList,
-										  &dependentSequenceList, 0);
-
-		Oid sequenceOid = InvalidOid;
-		foreach_oid(sequenceOid, dependentSequenceList)
-		{
-			ObjectAddress sequenceAddress = { 0 };
-			ObjectAddressSet(sequenceAddress, RelationRelationId, sequenceOid);
-			EnsureDependenciesExistOnAllNodes(&sequenceAddress);
-
-			/*
-			 * Sequences are not marked as distributed while creating table
-			 * if no metadata worker node exists. We are marking all sequences
-			 * distributed while syncing metadata in such case.
-			 */
-			MarkObjectDistributed(&sequenceAddress);
-		}
-
-		SetLocalEnableDependencyCreation(prevDependencyCreationValue);
-
-		List *workerSequenceDDLCommands = SequenceDDLCommandsForTable(relationId);
-		sequenceCommandList = list_concat(sequenceCommandList, workerSequenceDDLCommands);
-
 		List *sequenceDependencyCommandList = SequenceDependencyCommandList(relationId);
 		sequenceCommandList = list_concat(sequenceCommandList,
 										  sequenceDependencyCommandList);
@@ -1048,8 +1013,8 @@ ActivateNode(char *nodeName, int nodePort)
 						BoolGetDatum(isActive));
 	}
 
-	SetUpSequences(workerNode);
 	SetUpDistributedTableWithDependencies(workerNode);
+	SetUpSequenceDependencies(workerNode);
 	SetUpMultipleDistributedTableIntegrations(workerNode);
 
 	if (syncMetadata)