This is an automated email from the ASF dual-hosted git repository. maxyang pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit ecc0b869c4fabd21fb9754397c388be35d78bc10 Author: SmartKeyerror <[email protected]> AuthorDate: Fri Apr 29 10:04:41 2022 +0800 remove useless lockmode upgrade in inherit.c (#13434) Since #13274 and #13392 have already processed the LOCKMODE correctly in addRangeTableEntryForRelation(), and no matter we use ORCA or Optimizer, we will get correct LOCKMODE in execution stage, so we don't need another LOCKMODE upgrade in expand_inherited_rtentry, just remove it. --- src/backend/optimizer/util/inherit.c | 22 ---------------------- 1 file changed, 22 deletions(-) diff --git a/src/backend/optimizer/util/inherit.c b/src/backend/optimizer/util/inherit.c index 3a90608e38..1747cda95c 100644 --- a/src/backend/optimizer/util/inherit.c +++ b/src/backend/optimizer/util/inherit.c @@ -114,28 +114,6 @@ expand_inherited_rtentry(PlannerInfo *root, RelOptInfo *rel, oldrelation = table_open(parentOID, NoLock); lockmode = rte->rellockmode; -#if 0 - // GPDB_12_MERGE_FIXME: We used to have this code in GPDB. Where does it belong now? - else if (oldrc) - { - /* - * Cloudberry specific behavior: - * The implementation of select statement with locking clause - * (for update | no key update | share | key share) in postgres - * is to hold RowShareLock on tables during parsing stage, and - * generate a LockRows plan node for executor to lock the tuples. - * It is not easy to lock tuples in Cloudberry database, since - * tuples may be fetched through motion nodes. - * - * But when Global Deadlock Detector is enabled, and the select - * statement with locking clause contains only one table, we are - * sure that there are no motions. For such simple cases, we could - * make the behavior just the same as Postgres. - */ - lockmode = oldrc->canOptSelectLockingClause ? RowShareLock : ExclusiveLock; - } -#endif - /* * If parent relation is selected FOR UPDATE/SHARE, we need to mark its * PlanRowMark as isParent = true, and generate a new PlanRowMark for each --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
