From 93c3f30024f22556deba0a042ef464af4ad61014 Mon Sep 17 00:00:00 2001
From: Onur Tirtir <onurcantirtir@gmail.com>
Date: Tue, 2 Feb 2021 16:02:19 +0300
Subject: [PATCH] Rename ExtractColumnsOwningSequences

---
 .../commands/citus_add_local_table_to_metadata.c      |  4 ++--
 src/backend/distributed/commands/sequence.c           | 11 ++++++-----
 src/backend/distributed/metadata/metadata_sync.c      |  4 ++--
 src/include/distributed/commands/sequence.h           |  5 +++--
 4 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/backend/distributed/commands/citus_add_local_table_to_metadata.c b/src/backend/distributed/commands/citus_add_local_table_to_metadata.c
index b485df318..d3654a41a 100644
--- a/src/backend/distributed/commands/citus_add_local_table_to_metadata.c
+++ b/src/backend/distributed/commands/citus_add_local_table_to_metadata.c
@@ -893,8 +893,8 @@ DropAndMoveDefaultSequenceOwnerships(Oid sourceRelationId, Oid targetRelationId)
 {
 	List *columnNameList = NIL;
 	List *ownedSequenceIdList = NIL;
-	ExtractColumnsOwningSequences(sourceRelationId, &columnNameList,
-								  &ownedSequenceIdList);
+	ExtractDefaultColumnsAndOwnedSequences(sourceRelationId, &columnNameList,
+										   &ownedSequenceIdList);
 
 	ListCell *columnNameCell = NULL;
 	ListCell *ownedSequenceIdCell = NULL;
diff --git a/src/backend/distributed/commands/sequence.c b/src/backend/distributed/commands/sequence.c
index 8170ee0c2..64ae4e246 100644
--- a/src/backend/distributed/commands/sequence.c
+++ b/src/backend/distributed/commands/sequence.c
@@ -151,13 +151,14 @@ OptionsSpecifyOwnedBy(List *optionList, Oid *ownedByTableId)
 
 
 /*
- * ExtractColumnsOwningSequences finds each column of relation with relationId
- * defaulting to an owned sequence. Then, appends the column name and id of the
- * owned sequence -that the column defaults- to the lists passed as NIL initially.
+ * ExtractDefaultColumnsAndOwnedSequences finds each column of relation with
+ * relationId that has a DEFAULT expression and each sequence owned by such
+ * columns (if any). Then, appends the column name and id of the owned sequence
+ * -that the column defaults- to the lists passed as NIL initially.
  */
 void
-ExtractColumnsOwningSequences(Oid relationId, List **columnNameList,
-							  List **ownedSequenceIdList)
+ExtractDefaultColumnsAndOwnedSequences(Oid relationId, List **columnNameList,
+									   List **ownedSequenceIdList)
 {
 	Assert(*columnNameList == NIL && *ownedSequenceIdList == NIL);
 
diff --git a/src/backend/distributed/metadata/metadata_sync.c b/src/backend/distributed/metadata/metadata_sync.c
index 8f507d84a..8aa8618e3 100644
--- a/src/backend/distributed/metadata/metadata_sync.c
+++ b/src/backend/distributed/metadata/metadata_sync.c
@@ -1131,7 +1131,7 @@ SequenceDependencyCommandList(Oid relationId)
 	List *columnNameList = NIL;
 	List *sequenceIdList = NIL;
 
-	ExtractColumnsOwningSequences(relationId, &columnNameList, &sequenceIdList);
+	ExtractDefaultColumnsAndOwnedSequences(relationId, &columnNameList, &sequenceIdList);
 
 	ListCell *columnNameCell = NULL;
 	ListCell *sequenceIdCell = NULL;
@@ -1144,7 +1144,7 @@ SequenceDependencyCommandList(Oid relationId)
 		if (!OidIsValid(sequenceId))
 		{
 			/*
-			 * ExtractColumnsOwningSequences returns entries for all columns,
+			 * ExtractDefaultColumnsAndOwnedSequences returns entries for all columns,
 			 * but with 0 sequence ID unless there is default nextval(..).
 			 */
 			continue;
diff --git a/src/include/distributed/commands/sequence.h b/src/include/distributed/commands/sequence.h
index 1addbd1c1..5c39df1ac 100644
--- a/src/include/distributed/commands/sequence.h
+++ b/src/include/distributed/commands/sequence.h
@@ -13,8 +13,9 @@
 #include "nodes/pg_list.h"
 
 
-extern void ExtractColumnsOwningSequences(Oid relationId, List **columnNameList,
-										  List **ownedSequenceIdList);
+extern void ExtractDefaultColumnsAndOwnedSequences(Oid relationId,
+												   List **columnNameList,
+												   List **ownedSequenceIdList);
 
 
 #endif /* CITUS_SEQUENCE_H */