agora inbox for pgsql-hackers@postgresql.orghelp / color / mirror / Atom feed
[PATCH v2 2/9] Constify some ilist.h functions 3+ messages / 2 participants [nested] [flat]
* [PATCH v2 2/9] Constify some ilist.h functions @ 2022-11-20 05:32 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 3+ messages in thread From: Andres Freund @ 2022-11-20 05:32 UTC (permalink / raw) This is required for some of the replacements of SHM_QUEUE, because of code dealing with const PGPROC's. --- src/include/lib/ilist.h | 22 +++++++++++----------- src/backend/lib/ilist.c | 8 ++++---- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/include/lib/ilist.h b/src/include/lib/ilist.h index a1a4abf0609..64596ad0f1e 100644 --- a/src/include/lib/ilist.h +++ b/src/include/lib/ilist.h @@ -290,8 +290,8 @@ extern void slist_delete(slist_head *head, slist_node *node); #ifdef ILIST_DEBUG extern void dlist_member_check(dlist_head *head, dlist_node *node); -extern void dlist_check(dlist_head *head); -extern void slist_check(slist_head *head); +extern void dlist_check(const dlist_head *head); +extern void slist_check(const slist_head *head); #else /* * These seemingly useless casts to void are here to keep the compiler quiet @@ -333,7 +333,7 @@ dlist_node_init(dlist_node *node) * An empty list has either its first 'next' pointer set to NULL, or to itself. */ static inline bool -dlist_is_empty(dlist_head *head) +dlist_is_empty(const dlist_head *head) { dlist_check(head); @@ -500,7 +500,7 @@ dlist_move_tail(dlist_head *head, dlist_node *node) * Caution: unreliable if 'node' is not in the list. */ static inline bool -dlist_has_next(dlist_head *head, dlist_node *node) +dlist_has_next(const dlist_head *head, const dlist_node *node) { return node->next != &head->head; } @@ -510,7 +510,7 @@ dlist_has_next(dlist_head *head, dlist_node *node) * Caution: unreliable if 'node' is not in the list. */ static inline bool -dlist_has_prev(dlist_head *head, dlist_node *node) +dlist_has_prev(const dlist_head *head, const dlist_node *node) { return node->prev != &head->head; } @@ -679,7 +679,7 @@ dclist_init(dclist_head *head) * Returns true if the list is empty, otherwise false. */ static inline bool -dclist_is_empty(dclist_head *head) +dclist_is_empty(const dclist_head *head) { Assert(dlist_is_empty(&head->dlist) == (head->count == 0)); return (head->count == 0); @@ -836,7 +836,7 @@ dclist_move_tail(dclist_head *head, dlist_node *node) * Caution: 'node' must be a member of 'head'. */ static inline bool -dclist_has_next(dclist_head *head, dlist_node *node) +dclist_has_next(const dclist_head *head, const dlist_node *node) { dlist_member_check(&head->dlist, node); Assert(head->count > 0); @@ -851,7 +851,7 @@ dclist_has_next(dclist_head *head, dlist_node *node) * Caution: 'node' must be a member of 'head'. */ static inline bool -dclist_has_prev(dclist_head *head, dlist_node *node) +dclist_has_prev(const dclist_head *head, const dlist_node *node) { dlist_member_check(&head->dlist, node); Assert(head->count > 0); @@ -929,7 +929,7 @@ dclist_tail_node(dclist_head *head) * Returns the stored number of entries in 'head' */ static inline uint32 -dclist_count(dclist_head *head) +dclist_count(const dclist_head *head) { Assert(dlist_is_empty(&head->dlist) == (head->count == 0)); @@ -992,7 +992,7 @@ slist_init(slist_head *head) * Is the list empty? */ static inline bool -slist_is_empty(slist_head *head) +slist_is_empty(const slist_head *head) { slist_check(head); @@ -1040,7 +1040,7 @@ slist_pop_head_node(slist_head *head) * Check whether 'node' has a following node. */ static inline bool -slist_has_next(slist_head *head, slist_node *node) +slist_has_next(const slist_head *head, const slist_node *node) { slist_check(head); diff --git a/src/backend/lib/ilist.c b/src/backend/lib/ilist.c index e8ea9811764..fc78e06b1f9 100644 --- a/src/backend/lib/ilist.c +++ b/src/backend/lib/ilist.c @@ -73,9 +73,9 @@ dlist_member_check(dlist_head *head, dlist_node *node) * Verify integrity of a doubly linked list */ void -dlist_check(dlist_head *head) +dlist_check(const dlist_head *head) { - dlist_node *cur; + const dlist_node *cur; if (head == NULL) elog(ERROR, "doubly linked list head address is NULL"); @@ -110,9 +110,9 @@ dlist_check(dlist_head *head) * Verify integrity of a singly linked list */ void -slist_check(slist_head *head) +slist_check(const slist_head *head) { - slist_node *cur; + const slist_node *cur; if (head == NULL) elog(ERROR, "singly linked list head address is NULL"); -- 2.38.0 --boiclxjzuujo3uzo Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v2-0003-Use-dclist-instead-of-PROC_QUEUE-SHM_QUEUE-for-he.patch" ^ permalink raw reply [nested|flat] 3+ messages in thread
* [PATCH v2 2/9] Constify some ilist.h functions @ 2022-11-20 05:32 Andres Freund <andres@anarazel.de> 0 siblings, 0 replies; 3+ messages in thread From: Andres Freund @ 2022-11-20 05:32 UTC (permalink / raw) This is required for some of the replacements of SHM_QUEUE, because of code dealing with const PGPROC's. --- src/include/lib/ilist.h | 22 +++++++++++----------- src/backend/lib/ilist.c | 8 ++++---- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/src/include/lib/ilist.h b/src/include/lib/ilist.h index a1a4abf0609..64596ad0f1e 100644 --- a/src/include/lib/ilist.h +++ b/src/include/lib/ilist.h @@ -290,8 +290,8 @@ extern void slist_delete(slist_head *head, slist_node *node); #ifdef ILIST_DEBUG extern void dlist_member_check(dlist_head *head, dlist_node *node); -extern void dlist_check(dlist_head *head); -extern void slist_check(slist_head *head); +extern void dlist_check(const dlist_head *head); +extern void slist_check(const slist_head *head); #else /* * These seemingly useless casts to void are here to keep the compiler quiet @@ -333,7 +333,7 @@ dlist_node_init(dlist_node *node) * An empty list has either its first 'next' pointer set to NULL, or to itself. */ static inline bool -dlist_is_empty(dlist_head *head) +dlist_is_empty(const dlist_head *head) { dlist_check(head); @@ -500,7 +500,7 @@ dlist_move_tail(dlist_head *head, dlist_node *node) * Caution: unreliable if 'node' is not in the list. */ static inline bool -dlist_has_next(dlist_head *head, dlist_node *node) +dlist_has_next(const dlist_head *head, const dlist_node *node) { return node->next != &head->head; } @@ -510,7 +510,7 @@ dlist_has_next(dlist_head *head, dlist_node *node) * Caution: unreliable if 'node' is not in the list. */ static inline bool -dlist_has_prev(dlist_head *head, dlist_node *node) +dlist_has_prev(const dlist_head *head, const dlist_node *node) { return node->prev != &head->head; } @@ -679,7 +679,7 @@ dclist_init(dclist_head *head) * Returns true if the list is empty, otherwise false. */ static inline bool -dclist_is_empty(dclist_head *head) +dclist_is_empty(const dclist_head *head) { Assert(dlist_is_empty(&head->dlist) == (head->count == 0)); return (head->count == 0); @@ -836,7 +836,7 @@ dclist_move_tail(dclist_head *head, dlist_node *node) * Caution: 'node' must be a member of 'head'. */ static inline bool -dclist_has_next(dclist_head *head, dlist_node *node) +dclist_has_next(const dclist_head *head, const dlist_node *node) { dlist_member_check(&head->dlist, node); Assert(head->count > 0); @@ -851,7 +851,7 @@ dclist_has_next(dclist_head *head, dlist_node *node) * Caution: 'node' must be a member of 'head'. */ static inline bool -dclist_has_prev(dclist_head *head, dlist_node *node) +dclist_has_prev(const dclist_head *head, const dlist_node *node) { dlist_member_check(&head->dlist, node); Assert(head->count > 0); @@ -929,7 +929,7 @@ dclist_tail_node(dclist_head *head) * Returns the stored number of entries in 'head' */ static inline uint32 -dclist_count(dclist_head *head) +dclist_count(const dclist_head *head) { Assert(dlist_is_empty(&head->dlist) == (head->count == 0)); @@ -992,7 +992,7 @@ slist_init(slist_head *head) * Is the list empty? */ static inline bool -slist_is_empty(slist_head *head) +slist_is_empty(const slist_head *head) { slist_check(head); @@ -1040,7 +1040,7 @@ slist_pop_head_node(slist_head *head) * Check whether 'node' has a following node. */ static inline bool -slist_has_next(slist_head *head, slist_node *node) +slist_has_next(const slist_head *head, const slist_node *node) { slist_check(head); diff --git a/src/backend/lib/ilist.c b/src/backend/lib/ilist.c index e8ea9811764..fc78e06b1f9 100644 --- a/src/backend/lib/ilist.c +++ b/src/backend/lib/ilist.c @@ -73,9 +73,9 @@ dlist_member_check(dlist_head *head, dlist_node *node) * Verify integrity of a doubly linked list */ void -dlist_check(dlist_head *head) +dlist_check(const dlist_head *head) { - dlist_node *cur; + const dlist_node *cur; if (head == NULL) elog(ERROR, "doubly linked list head address is NULL"); @@ -110,9 +110,9 @@ dlist_check(dlist_head *head) * Verify integrity of a singly linked list */ void -slist_check(slist_head *head) +slist_check(const slist_head *head) { - slist_node *cur; + const slist_node *cur; if (head == NULL) elog(ERROR, "singly linked list head address is NULL"); -- 2.38.0 --boiclxjzuujo3uzo Content-Type: text/x-diff; charset=us-ascii Content-Disposition: attachment; filename="v2-0003-Use-dclist-instead-of-PROC_QUEUE-SHM_QUEUE-for-he.patch" ^ permalink raw reply [nested|flat] 3+ messages in thread
* [PATCH v7 2/3] Handle default tablespace in AlterTableInternal @ 2025-08-04 22:05 Erik Wienhold <ewie@ewie.name> 0 siblings, 0 replies; 3+ messages in thread From: Erik Wienhold @ 2025-08-04 22:05 UTC (permalink / raw) Move handling of default tablespace for CREATE OR REPLACE MATERIALIZED VIEW from create_ctas_internal to ATPrepSetTableSpace. It feels cleaner that way in my opinion by not having to resolve the tablespace name just to pass it to AlterTableInternal. The default table space is passed as empty string to AlterTableInternal. --- src/backend/commands/createas.c | 21 ++------------------- src/backend/commands/tablecmds.c | 14 ++++++++++++-- 2 files changed, 14 insertions(+), 21 deletions(-) diff --git a/src/backend/commands/createas.c b/src/backend/commands/createas.c index 1620273f965..30ca0a21903 100644 --- a/src/backend/commands/createas.c +++ b/src/backend/commands/createas.c @@ -24,7 +24,6 @@ */ #include "postgres.h" -#include "miscadmin.h" #include "access/heapam.h" #include "access/reloptions.h" #include "access/tableam.h" @@ -35,7 +34,6 @@ #include "commands/matview.h" #include "commands/prepare.h" #include "commands/tablecmds.h" -#include "commands/tablespace.h" #include "commands/view.h" #include "executor/execdesc.h" #include "executor/executor.h" @@ -160,23 +158,8 @@ create_ctas_internal(List *attrList, IntoClause *into) /* tablespace */ atcmd = makeNode(AlterTableCmd); atcmd->subtype = AT_SetTableSpace; - if (into->tableSpaceName != NULL) - atcmd->name = into->tableSpaceName; - else - { - Oid spcid; - - /* - * Resolve the name of the default or database tablespace because - * we need to specify the tablespace by name. - * - * TODO: Move that to ATPrepSetTableSpace? Must allow AlterTableCmd.name to be NULL then. - */ - spcid = GetDefaultTablespace(RELPERSISTENCE_PERMANENT, false); - if (!OidIsValid(spcid)) - spcid = MyDatabaseTableSpace; - atcmd->name = get_tablespace_name(spcid); - } + /* use empty string to specify default tablespace */ + atcmd->name = into->tableSpaceName ? into->tableSpaceName : ""; atcmds = lappend(atcmds, atcmd); /* storage options */ diff --git a/src/backend/commands/tablecmds.c b/src/backend/commands/tablecmds.c index 44dcd2c5b0d..6ec0b87f841 100644 --- a/src/backend/commands/tablecmds.c +++ b/src/backend/commands/tablecmds.c @@ -16580,8 +16580,18 @@ ATPrepSetTableSpace(AlteredTableInfo *tab, Relation rel, const char *tablespacen { Oid tablespaceId; - /* Check that the tablespace exists */ - tablespaceId = get_tablespace_oid(tablespacename, false); + if (tablespacename != NULL && tablespacename[0] == '\0') + { + /* Use default tablespace if name is empty string */ + tablespaceId = GetDefaultTablespace(rel->rd_rel->relpersistence, rel->rd_rel->relispartition); + if (!OidIsValid(tablespaceId)) + tablespaceId = MyDatabaseTableSpace; + } + else + { + /* Check that the tablespace exists */ + tablespaceId = get_tablespace_oid(tablespacename, false); + } /* Check permissions except when moving to database's default */ if (OidIsValid(tablespaceId) && tablespaceId != MyDatabaseTableSpace) -- 2.50.1 --r33ycpluvyfavkwy Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="v7-0003-Add-WITH-OLD-DATA-to-CREATE-OR-REPLACE-MATERIALIZ.patch" ^ permalink raw reply [nested|flat] 3+ messages in thread
end of thread, other threads:[~2025-08-04 22:05 UTC | newest] Thread overview: 3+ messages (download: mbox mbox.gz follow: Atom feed) -- links below jump to the message on this page -- 2022-11-20 05:32 [PATCH v2 2/9] Constify some ilist.h functions Andres Freund <andres@anarazel.de> 2022-11-20 05:32 [PATCH v2 2/9] Constify some ilist.h functions Andres Freund <andres@anarazel.de> 2025-08-04 22:05 [PATCH v7 2/3] Handle default tablespace in AlterTableInternal Erik Wienhold <ewie@ewie.name>
This inbox is served by agora; see mirroring instructions for how to clone and mirror all data and code used for this inbox