diff options
Diffstat (limited to 'src/include')
| -rw-r--r-- | src/include/access/xact.h | 15 | ||||
| -rw-r--r-- | src/include/catalog/catversion.h | 2 | ||||
| -rw-r--r-- | src/include/catalog/pg_proc.dat | 8 | ||||
| -rw-r--r-- | src/include/nodes/pathnodes.h | 2 | ||||
| -rw-r--r-- | src/include/nodes/plannodes.h | 2 | ||||
| -rw-r--r-- | src/include/optimizer/clauses.h | 3 | ||||
| -rw-r--r-- | src/include/optimizer/cost.h | 1 | ||||
| -rw-r--r-- | src/include/utils/rel.h | 25 |
8 files changed, 6 insertions, 52 deletions
diff --git a/src/include/access/xact.h b/src/include/access/xact.h index 34cfaf542c6..f49a57b35e1 100644 --- a/src/include/access/xact.h +++ b/src/include/access/xact.h @@ -466,20 +466,5 @@ extern void ParsePrepareRecord(uint8 info, xl_xact_prepare *xlrec, xl_xact_parse extern void EnterParallelMode(void); extern void ExitParallelMode(void); extern bool IsInParallelMode(void); -extern void PrepareParallelModePlanExec(CmdType commandType); - -/* - * IsModifySupportedInParallelMode - * - * Indicates whether execution of the specified table-modification command - * (INSERT/UPDATE/DELETE) in parallel-mode is supported, subject to certain - * parallel-safety conditions. - */ -static inline bool -IsModifySupportedInParallelMode(CmdType commandType) -{ - /* Currently only INSERT is supported */ - return (commandType == CMD_INSERT); -} #endif /* XACT_H */ diff --git a/src/include/catalog/catversion.h b/src/include/catalog/catversion.h index 2f18734235a..ba3e6e1b621 100644 --- a/src/include/catalog/catversion.h +++ b/src/include/catalog/catversion.h @@ -53,6 +53,6 @@ */ /* yyyymmddN */ -#define CATALOG_VERSION_NO 202103232 +#define CATALOG_VERSION_NO 202103241 #endif diff --git a/src/include/catalog/pg_proc.dat b/src/include/catalog/pg_proc.dat index 464fa8d614b..604ac564b39 100644 --- a/src/include/catalog/pg_proc.dat +++ b/src/include/catalog/pg_proc.dat @@ -3748,11 +3748,11 @@ # Generic referential integrity constraint triggers { oid => '1644', descr => 'referential integrity FOREIGN KEY ... REFERENCES', - proname => 'RI_FKey_check_ins', provolatile => 'v', proparallel => 'r', - prorettype => 'trigger', proargtypes => '', prosrc => 'RI_FKey_check_ins' }, + proname => 'RI_FKey_check_ins', provolatile => 'v', prorettype => 'trigger', + proargtypes => '', prosrc => 'RI_FKey_check_ins' }, { oid => '1645', descr => 'referential integrity FOREIGN KEY ... REFERENCES', - proname => 'RI_FKey_check_upd', provolatile => 'v', proparallel => 'r', - prorettype => 'trigger', proargtypes => '', prosrc => 'RI_FKey_check_upd' }, + proname => 'RI_FKey_check_upd', provolatile => 'v', prorettype => 'trigger', + proargtypes => '', prosrc => 'RI_FKey_check_upd' }, { oid => '1646', descr => 'referential integrity ON DELETE CASCADE', proname => 'RI_FKey_cascade_del', provolatile => 'v', prorettype => 'trigger', proargtypes => '', prosrc => 'RI_FKey_cascade_del' }, diff --git a/src/include/nodes/pathnodes.h b/src/include/nodes/pathnodes.h index e4aed435385..c13642e35eb 100644 --- a/src/include/nodes/pathnodes.h +++ b/src/include/nodes/pathnodes.h @@ -120,8 +120,6 @@ typedef struct PlannerGlobal List *relationOids; /* OIDs of relations the plan depends on */ - List *partitionOids; /* OIDs of partitions the plan depends on */ - List *invalItems; /* other dependencies, as PlanInvalItems */ List *paramExecTypes; /* type OIDs for PARAM_EXEC Params */ diff --git a/src/include/nodes/plannodes.h b/src/include/nodes/plannodes.h index 95292d75735..6e62104d0b7 100644 --- a/src/include/nodes/plannodes.h +++ b/src/include/nodes/plannodes.h @@ -79,8 +79,6 @@ typedef struct PlannedStmt List *relationOids; /* OIDs of relations the plan depends on */ - List *partitionOids; /* OIDs of partitions the plan depends on */ - List *invalItems; /* other dependencies, as PlanInvalItems */ List *paramExecTypes; /* type OIDs for PARAM_EXEC Params */ diff --git a/src/include/optimizer/clauses.h b/src/include/optimizer/clauses.h index 8d85b02514c..0673887a852 100644 --- a/src/include/optimizer/clauses.h +++ b/src/include/optimizer/clauses.h @@ -32,7 +32,7 @@ extern double expression_returns_set_rows(PlannerInfo *root, Node *clause); extern bool contain_subplans(Node *clause); -extern char max_parallel_hazard(Query *parse, PlannerGlobal *glob); +extern char max_parallel_hazard(Query *parse); extern bool is_parallel_safe(PlannerInfo *root, Node *node); extern bool contain_nonstrict_functions(Node *clause); extern bool contain_exec_param(Node *clause, List *param_ids); @@ -52,6 +52,5 @@ extern void CommuteOpExpr(OpExpr *clause); extern Query *inline_set_returning_function(PlannerInfo *root, RangeTblEntry *rte); -extern bool is_parallel_allowed_for_modify(Query *parse); #endif /* CLAUSES_H */ diff --git a/src/include/optimizer/cost.h b/src/include/optimizer/cost.h index 22e6db96b62..1be93be0983 100644 --- a/src/include/optimizer/cost.h +++ b/src/include/optimizer/cost.h @@ -47,7 +47,6 @@ typedef enum /* parameter variables and flags (see also optimizer.h) */ extern PGDLLIMPORT Cost disable_cost; extern PGDLLIMPORT int max_parallel_workers_per_gather; -extern PGDLLIMPORT bool enable_parallel_insert; extern PGDLLIMPORT bool enable_seqscan; extern PGDLLIMPORT bool enable_indexscan; extern PGDLLIMPORT bool enable_indexonlyscan; diff --git a/src/include/utils/rel.h b/src/include/utils/rel.h index 8eee1c1a835..9a3a03e5207 100644 --- a/src/include/utils/rel.h +++ b/src/include/utils/rel.h @@ -306,8 +306,6 @@ typedef struct StdRdOptions int parallel_workers; /* max number of parallel workers */ bool vacuum_index_cleanup; /* enables index vacuuming and cleanup */ bool vacuum_truncate; /* enables vacuum to truncate a relation */ - bool parallel_insert_enabled; /* enables planner's use of - * parallel insert */ } StdRdOptions; #define HEAP_MIN_FILLFACTOR 10 @@ -426,29 +424,6 @@ typedef struct ViewOptions VIEW_OPTION_CHECK_OPTION_CASCADED) /* - * PartitionedTableRdOptions - * Contents of rd_options for partitioned tables - */ -typedef struct PartitionedTableRdOptions -{ - int32 vl_len_; /* varlena header (do not touch directly!) */ - bool parallel_insert_enabled; /* enables planner's use of - * parallel insert */ -} PartitionedTableRdOptions; - -/* - * RelationGetParallelInsert - * Returns the relation's parallel_insert_enabled reloption setting. - * Note multiple eval of argument! - */ -#define RelationGetParallelInsert(relation, defaultpd) \ - ((relation)->rd_options ? \ - (relation->rd_rel->relkind == RELKIND_PARTITIONED_TABLE ? \ - ((PartitionedTableRdOptions *) (relation)->rd_options)->parallel_insert_enabled : \ - ((StdRdOptions *) (relation)->rd_options)->parallel_insert_enabled) : \ - (defaultpd)) - -/* * RelationIsValid * True iff relation descriptor is valid. */ |