CB has special singlenode mode - revert Singlenode lock condition to …

…tryOpenTable after incorrect mergefix
apache · Oct 31, 2024 · 0d1c0a1 · 0d1c0a1
1 parent a861ac7
commit 0d1c0a1
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 13 deletions.
diff --git a/src/backend/access/table/table.c b/src/backend/access/table/table.c
@@ -199,7 +199,7 @@ CdbTryOpenTable(Oid relid, LOCKMODE reqmode, bool *lockUpgraded)
 {
 	LOCKMODE    lockmode;
 
-	Relation    rel = InvalidRelation;
+	Relation    rel;
 
 	/*
 	 * This if-else statement will try to open the relation and
@@ -209,12 +209,16 @@ CdbTryOpenTable(Oid relid, LOCKMODE reqmode, bool *lockUpgraded)
 	 * only be possible when GUC allow_system_table_mods is set), the
 	 * update or delete does not hold locks on catalog on segments, so
 	 * we do not need to consider lock-upgrade for DML on catalogs.
+	 *
+	 * In singlenode mode, since local deadlock detection can already
+	 * detect and solve deadlocks, we act as if the global deadlock
+	 * detector is enabled.
 	 */
 	if (reqmode == RowExclusiveLock &&
-		Gp_role == GP_ROLE_DISPATCH &&
+		(Gp_role == GP_ROLE_DISPATCH || IS_SINGLENODE()) &&
 		relid >= FirstNormalObjectId)
 	{
-		if (!gp_enable_global_deadlock_detector)
+		if (!gp_enable_global_deadlock_detector && !IS_SINGLENODE())
 		{
 			/*
 			 * Without GDD, to avoid global deadlock, always
@@ -227,7 +231,9 @@ CdbTryOpenTable(Oid relid, LOCKMODE reqmode, bool *lockUpgraded)
 		{
 			lockmode = RowExclusiveLock;
 			rel = try_table_open(relid, lockmode, false);
-			if (RelationIsAppendOptimized(rel))
+
+			if (RelationIsValid(rel) &&
+				RelationIsAppendOptimized(rel))
 			{
 				/*
 				 * AO|AOCO table does not support concurrently
@@ -243,16 +249,14 @@ CdbTryOpenTable(Oid relid, LOCKMODE reqmode, bool *lockUpgraded)
 				rel = try_table_open(relid, lockmode, false);
 			}
 		}
+
 	}
 	else
 	{
 		lockmode = reqmode;
 		rel = try_table_open(relid, lockmode, false);
 	}
 
-	if (lockUpgraded != NULL && lockmode > reqmode)
-		*lockUpgraded = true;
-
 	if (lockUpgraded != NULL && lockmode > reqmode)
 		*lockUpgraded = true;
 

diff --git a/src/test/regress/expected/groupingsets.out b/src/test/regress/expected/groupingsets.out
@@ -8,6 +8,9 @@
 --
 -- To work around that, create a new datatype that is just like the built-in
 -- 'bit' type, but doesn't have the hash opclass.
+-- start_matchignore
+-- m/^DETAIL:  GPDB Expression type: .* not supported in DXL/
+-- end_matchignore
 set optimizer_trace_fallback = on;
 create type unhashable_bit;
 create function unhashable_bit_out (unhashable_bit) returns cstring immutable

diff --git a/src/test/regress/expected/groupingsets_optimizer.out b/src/test/regress/expected/groupingsets_optimizer.out
@@ -8,6 +8,9 @@
 --
 -- To work around that, create a new datatype that is just like the built-in
 -- 'bit' type, but doesn't have the hash opclass.
+-- start_matchignore
+-- m/^DETAIL:  GPDB Expression type: .* not supported in DXL/
+-- end_matchignore
 set optimizer_trace_fallback = on;
 create type unhashable_bit;
 create function unhashable_bit_out (unhashable_bit) returns cstring immutable
@@ -991,9 +994,6 @@ explain (costs off)
 select v.c, (select count(*) from gstest2 group by () having v.c)
   from (values (false),(true)) v(c) order by v.c;
 INFO:  GPORCA failed to produce a plan, falling back to planner
--- start_matchignore
--- m/^DETAIL:  GPDB Expression type: .* not supported in DXL/
--- end_matchignore
  c | count 
 ---+-------
  f |      
@@ -1004,9 +1004,6 @@ explain (costs off)
   select v.c, (select count(*) from gstest2 group by () having v.c)
     from (values (false),(true)) v(c) order by v.c;
 INFO:  GPORCA failed to produce a plan, falling back to planner
--- start_matchignore
--- m/^DETAIL:  GPDB Expression type: .* not supported in DXL/
--- end_matchignore
                                 QUERY PLAN                                
 --------------------------------------------------------------------------
  Sort

diff --git a/src/test/regress/sql/groupingsets.sql b/src/test/regress/sql/groupingsets.sql
@@ -9,6 +9,9 @@
 --
 -- To work around that, create a new datatype that is just like the built-in
 -- 'bit' type, but doesn't have the hash opclass.
+-- start_matchignore
+-- m/^DETAIL:  GPDB Expression type: .* not supported in DXL/
+-- end_matchignore
 set optimizer_trace_fallback = on;
 create type unhashable_bit;
 create function unhashable_bit_out (unhashable_bit) returns cstring immutable