You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudberry.apache.org by re...@apache.org on 2025/02/26 08:09:45 UTC
(cloudberry) 05/05: Resolve cherry-pick
This is an automated email from the ASF dual-hosted git repository.
reshke pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit 5cdbab19afe37078e972c037fd765a62788e5945
Author: reshke <re...@gmail.com>
AuthorDate: Tue Feb 25 14:48:33 2025 +0000
Resolve cherry-pick
---
src/test/isolation2/expected/lockmodes.out | 14 --------------
.../isolation2/expected/lockmodes_optimizer.out | 22 ++++++++--------------
src/test/isolation2/sql/lockmodes.sql | 15 ++++++++-------
3 files changed, 16 insertions(+), 35 deletions(-)
diff --git a/src/test/isolation2/expected/lockmodes.out b/src/test/isolation2/expected/lockmodes.out
index a6d3bf627f..201166e80f 100644
--- a/src/test/isolation2/expected/lockmodes.out
+++ b/src/test/isolation2/expected/lockmodes.out
@@ -2182,20 +2182,6 @@ UPDATE 1
ROLLBACK
1q: ... <quitting>
-1: BEGIN;
-BEGIN
-1: INSERT INTO t_lockmods_part_tbl_dml SELECT i, 1, i FROM generate_series(1,10)i;
-INSERT 10
--- With GDD enabled, QD will only hold lock on root for insert
-1: select * from show_locks_lockmodes;
- locktype | mode | granted | relation
-----------+------------------+---------+-------------------------
- relation | RowExclusiveLock | t | t_lockmods_part_tbl_dml
-(1 row)
-1: ROLLBACK;
-ROLLBACK
-1q: ... <quitting>
-
-- 2.8 Verify behaviors of select with locking clause (i.e. select for update)
-- when running concurrently with index creation, for Heap tables.
-- For AO/CO tables, refer to create_index_allows_readonly.source.
diff --git a/src/test/isolation2/expected/lockmodes_optimizer.out b/src/test/isolation2/expected/lockmodes_optimizer.out
index a1ec1ed294..46c0ae542e 100644
--- a/src/test/isolation2/expected/lockmodes_optimizer.out
+++ b/src/test/isolation2/expected/lockmodes_optimizer.out
@@ -2185,24 +2185,18 @@ UPDATE 1
ROLLBACK
1q: ... <quitting>
-1: BEGIN;
-BEGIN
-1: INSERT INTO t_lockmods_part_tbl_dml SELECT i, 1, i FROM generate_series(1,10)i;
-INSERT 10
--- With GDD enabled, QD will only hold lock on root for insert
-1: select * from show_locks_lockmodes;
- locktype | mode | granted | relation
-----------+------------------+---------+-------------------------
- relation | RowExclusiveLock | t | t_lockmods_part_tbl_dml
-(1 row)
-1: ROLLBACK;
-ROLLBACK
-1q: ... <quitting>
-
-- 2.8 Verify behaviors of select with locking clause (i.e. select for update)
-- when running concurrently with index creation, for Heap tables.
-- For AO/CO tables, refer to create_index_allows_readonly.source.
+-- TODO-CHERRYPICK: uncomment this, when https://github.com/greenplum-db/gpdb-archive/commit/3be17112144 cherry-picked
+-- 1: BEGIN;
+-- 1: INSERT INTO t_lockmods_part_tbl_dml SELECT i, 1, i FROM generate_series(1,10)i;
+-- -- With GDD enabled, QD will only hold lock on root for insert
+-- 1: select * from show_locks_lockmodes;
+-- 1: ROLLBACK;
+-- 1q:
+
1: CREATE TABLE create_index_select_for_update_tbl(a int, b int);
CREATE
1: INSERT INTO create_index_select_for_update_tbl SELECT i,i FROM generate_series(1,10)i;
diff --git a/src/test/isolation2/sql/lockmodes.sql b/src/test/isolation2/sql/lockmodes.sql
index ad299a964e..ec72d8608b 100644
--- a/src/test/isolation2/sql/lockmodes.sql
+++ b/src/test/isolation2/sql/lockmodes.sql
@@ -704,17 +704,18 @@ ALTER SYSTEM SET gp_enable_global_deadlock_detector TO on;
1: ROLLBACK;
1q:
-1: BEGIN;
-1: INSERT INTO t_lockmods_part_tbl_dml SELECT i, 1, i FROM generate_series(1,10)i;
--- With GDD enabled, QD will only hold lock on root for insert
-1: select * from show_locks_lockmodes;
-1: ROLLBACK;
-1q:
-
-- 2.8 Verify behaviors of select with locking clause (i.e. select for update)
-- when running concurrently with index creation, for Heap tables.
-- For AO/CO tables, refer to create_index_allows_readonly.source.
+-- TODO-CHERRYPICK: uncomment this, when https://github.com/greenplum-db/gpdb-archive/commit/3be17112144 cherry-picked
+-- 1: BEGIN;
+-- 1: INSERT INTO t_lockmods_part_tbl_dml SELECT i, 1, i FROM generate_series(1,10)i;
+-- -- With GDD enabled, QD will only hold lock on root for insert
+-- 1: select * from show_locks_lockmodes;
+-- 1: ROLLBACK;
+-- 1q:
+
1: CREATE TABLE create_index_select_for_update_tbl(a int, b int);
1: INSERT INTO create_index_select_for_update_tbl SELECT i,i FROM generate_series(1,10)i;
1: set optimizer = off;
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@cloudberry.apache.org
For additional commands, e-mail: commits-help@cloudberry.apache.org