From 212200f06641777f4c2bc2a413bec8a793ad0ebb Mon Sep 17 00:00:00 2001 From: Gokhan Gulbiz Date: Wed, 15 Mar 2023 15:51:51 +0300 Subject: [PATCH] Remove INCLUDE_IDENTITY_AS_SEQUENCE_DEFAULTS as it became obsolete --- .../distributed/deparser/citus_ruleutils.c | 23 ++----------------- .../distributed/operations/node_protocol.c | 5 +--- .../distributed/coordinator_protocol.h | 3 +-- 3 files changed, 4 insertions(+), 27 deletions(-) diff --git a/src/backend/distributed/deparser/citus_ruleutils.c b/src/backend/distributed/deparser/citus_ruleutils.c index 2c8bf6e06..156b12cc5 100644 --- a/src/backend/distributed/deparser/citus_ruleutils.c +++ b/src/backend/distributed/deparser/citus_ruleutils.c @@ -304,10 +304,7 @@ pg_get_sequencedef(Oid sequenceRelationId) * When it's WORKER_NEXTVAL_SEQUENCE_DEFAULTS, the function creates the DEFAULT * clause using worker_nextval('sequence') and not nextval('sequence') * When IncludeIdentities is NO_IDENTITY, the function does not include identity column - * specifications. When it's INCLUDE_IDENTITY_AS_SEQUENCE_DEFAULTS, the function - * uses sequences and set them as default values for identity columns by using exactly - * the same approach with worker_nextval('sequence') & nextval('sequence') logic - * desribed above. When it's INCLUDE_IDENTITY it creates GENERATED .. AS IDENTIY clauses. + * specifications. When it's INCLUDE_IDENTITY it creates GENERATED .. AS IDENTIY clauses. */ char * pg_get_tableschemadef_string(Oid tableRelationId, IncludeSequenceDefaults @@ -403,23 +400,7 @@ pg_get_tableschemadef_string(Oid tableRelationId, IncludeSequenceDefaults Oid seqOid = getIdentitySequence(RelationGetRelid(relation), attributeForm->attnum, missing_ok); - char *sequenceName = generate_qualified_relation_name(seqOid); - - if (includeIdentityDefaults == INCLUDE_IDENTITY_AS_SEQUENCE_DEFAULTS) - { - if (pg_get_sequencedef(seqOid)->seqtypid != INT8OID) - { - appendStringInfo(&buffer, - " DEFAULT worker_nextval(%s::regclass)", - quote_literal_cstr(sequenceName)); - } - else - { - appendStringInfo(&buffer, " DEFAULT nextval(%s::regclass)", - quote_literal_cstr(sequenceName)); - } - } - else if (includeIdentityDefaults == INCLUDE_IDENTITY) + if (includeIdentityDefaults == INCLUDE_IDENTITY) { Form_pg_sequence pgSequenceForm = pg_get_sequencedef(seqOid); char *sequenceDef = psprintf( diff --git a/src/backend/distributed/operations/node_protocol.c b/src/backend/distributed/operations/node_protocol.c index 172a2a303..77da0b630 100644 --- a/src/backend/distributed/operations/node_protocol.c +++ b/src/backend/distributed/operations/node_protocol.c @@ -461,10 +461,7 @@ ResolveRelationId(text *relationName, bool missingOk) * definition, optional column storage and statistics definitions, and index * constraint and trigger definitions. * When IncludeIdentities is NO_IDENTITY, the function does not include identity column - * specifications. When it's INCLUDE_IDENTITY_AS_SEQUENCE_DEFAULTS, the function - * uses sequences and set them as default values for identity columns by using exactly - * the same approach with worker_nextval('sequence') & nextval('sequence') logic - * desribed above. When it's INCLUDE_IDENTITY it creates GENERATED .. AS IDENTIY clauses. + * specifications. When it's INCLUDE_IDENTITY it creates GENERATED .. AS IDENTIY clauses. */ List * GetFullTableCreationCommands(Oid relationId, diff --git a/src/include/distributed/coordinator_protocol.h b/src/include/distributed/coordinator_protocol.h index 1444bff91..ab3264e5d 100644 --- a/src/include/distributed/coordinator_protocol.h +++ b/src/include/distributed/coordinator_protocol.h @@ -124,8 +124,7 @@ typedef enum IncludeSequenceDefaults typedef enum IncludeIdentities { NO_IDENTITY = 0, /* don't include identities */ - INCLUDE_IDENTITY_AS_SEQUENCE_DEFAULTS = 1, /* include identities as sequences */ - INCLUDE_IDENTITY = 2 /* include identities as-is*/ + INCLUDE_IDENTITY = 1 /* include identities as-is*/ } IncludeIdentities;