From 02a8721ce478c42f79cf31432eac33f800f18abe Mon Sep 17 00:00:00 2001
From: chenxiaobin <chenxiaobin19@huawei.com>
Date: Mon, 7 Sep 2020 21:11:43 +0800
Subject: [PATCH] fix view dbe_perf.global_locks transactionid

---
 .../backend/catalog/performance_views.sql     |  2 +-
 .../regress/expected/transactions_control.out | 19 +++++++++++++++++--
 src/test/regress/sql/transactions_control.sql |  7 ++++++-
 3 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/common/backend/catalog/performance_views.sql b/src/common/backend/catalog/performance_views.sql
index 30eb775d1..eb2544656 100755
--- a/src/common/backend/catalog/performance_views.sql
+++ b/src/common/backend/catalog/performance_views.sql
@@ -3552,7 +3552,7 @@ DECLARE
         page := row_data.page;
         tuple := row_data.tuple;
         virtualxid := row_data.virtualxid;
-        transactionid := row_data.classid;
+        transactionid := row_data.transactionid;
         objid := row_data.objid;
         objsubid := row_data.objsubid;
         virtualtransaction := row_data.virtualtransaction;
diff --git a/src/test/regress/expected/transactions_control.out b/src/test/regress/expected/transactions_control.out
index 2065374d0..768d4ce24 100644
--- a/src/test/regress/expected/transactions_control.out
+++ b/src/test/regress/expected/transactions_control.out
@@ -357,7 +357,7 @@ CREATE OR REPLACE PROCEDURE PROC_OUT_PARAM_001(P1 OUT INT)
 AS
 BEGIN
 select id into P1 from test1 where name = 'bbb';
-insert into test1 values(P1, 'dddd');
+insert into test1 values(P1, 'ddd');
 COMMIT;
 insert into test1 values(P1, 'eee');
 ROLLBACK;
@@ -373,7 +373,22 @@ SELECT * from test1;
  id | name 
 ----+------
   1 | bbb
-  1 | dddd
+  1 | ddd
 (2 rows)
 
+start transaction;
+select * from test1 for share;
+ id | name 
+----+------
+  1 | bbb
+  1 | ddd
+(2 rows)
+
+select count(*) > 0 from dbe_perf.global_locks where transactionid is not null;
+ ?column? 
+----------
+ t
+(1 row)
+
+commit;
 DROP TABLE TEST1;
diff --git a/src/test/regress/sql/transactions_control.sql b/src/test/regress/sql/transactions_control.sql
index a8514b4e2..18ab8a003 100644
--- a/src/test/regress/sql/transactions_control.sql
+++ b/src/test/regress/sql/transactions_control.sql
@@ -286,7 +286,7 @@ CREATE OR REPLACE PROCEDURE PROC_OUT_PARAM_001(P1 OUT INT)
 AS
 BEGIN
 select id into P1 from test1 where name = 'bbb';
-insert into test1 values(P1, 'dddd');
+insert into test1 values(P1, 'ddd');
 COMMIT;
 insert into test1 values(P1, 'eee');
 ROLLBACK;
@@ -302,4 +302,9 @@ END;
 
 SELECT * from test1;
 
+start transaction;
+select * from test1 for share;
+select count(*) > 0 from dbe_perf.global_locks where transactionid is not null;
+commit;
+
 DROP TABLE TEST1;
\ No newline at end of file