Fix hot_standby isolation2 and regress tests

Author: fanfuxiaoran

src/test/isolation2/expected/hot_standby/basic.out

@@ -23,13 +23,13 @@
 -- Test: basic query dispatch
 ----------------------------------------------------------------
 create table hs_t1(a int);
-CREATE TABLE
+CREATE
 create table hs_t2(a int);
-CREATE TABLE
+CREATE
 
 -- standby should see the results for 2pc immediately.
 insert into hs_t1 select * from generate_series(1,10);
-INSERT 0 10
+INSERT 10
 -1S: select * from hs_t1;
  a  
 ----
@@ -49,14 +49,14 @@ INSERT 0 10
 -- as long as another 2pc comes it will be able to see the previous 1pc. Wee
 -- tolerate this case in the mirrored cluster setup.
 insert into hs_t2 values(1);
-INSERT 0 1
+INSERT 1
 -1S: select * from hs_t2;
  a 
 ---
 (0 rows)
 -- any following 2pc will make the 1pc visible
 create temp table tt(a int);
-CREATE TABLE
+CREATE
 -1S: select * from hs_t2;
  a 
 ---
@@ -115,7 +115,7 @@ CREATE TABLE
 begin;
 BEGIN
 insert into hs_t1 select * from generate_series(11,20);
-INSERT 0 10
+INSERT 10
 
 -- standby should only see 1...10
 -1S: select * from hs_t1;
@@ -134,7 +134,7 @@ INSERT 0 10
 (10 rows)
 
 end;
-COMMIT
+END
 
 -- standby should see 1...20 now
 -1S: select * from hs_t1;
@@ -224,9 +224,9 @@ ERROR:  cannot execute VACUUM during recovery
 -- No hintbit WAL generation in SELECT.
 --
 create table hs_nohintbit(a int) distributed by (a);
-CREATE TABLE
+CREATE
 insert into hs_nohintbit select generate_series (1, 10);
-INSERT 0 10
+INSERT 10
 -- flush the data to disk
 checkpoint;
 CHECKPOINT

src/test/isolation2/expected/hot_standby/faults.out

@@ -18,9 +18,9 @@
 (exited with code 0)
 
 create table hs_failover(a int);
-CREATE TABLE
+CREATE
 insert into hs_failover select * from generate_series(1,10);
-INSERT 0 10
+INSERT 10
 -1S: select * from hs_failover;
  a  
 ----
@@ -47,7 +47,7 @@ select pg_ctl(datadir, 'stop', 'immediate') from gp_segment_configuration where
 
 -- make sure mirror is detected down
 create temp table hs_tt(a int);
-CREATE TABLE
+CREATE
 select gp_request_fts_probe_scan();
  gp_request_fts_probe_scan 
 ---------------------------
@@ -137,10 +137,9 @@ HINT:  Exit the current session and re-connect.
 -- will fail due to downed mirror (previous primary)
 -1S: select * from hs_failover;
 ERROR:  failed to acquire resources on one or more segments
-DETAIL:  could not connect to server: Connection refused
-	Is the server running on host "127.0.1.1" and accepting
-	TCP/IP connections on port 7003?
- (seg1 127.0.1.1:7003)
+DETAIL:  connection to server at "10.13.9.74", port 7003 failed: Connection refused
+	Is the server running on that host and accepting TCP/IP connections?
+ (seg1 10.13.9.74:7003)
 -1Sq: ... <quitting>
 
 -- bring the downed mirror up
@@ -219,7 +218,7 @@ select wait_until_all_segments_synchronized();
 (1 row)
 
 1: create table tt_hs_dtx(a int);
-CREATE TABLE
+CREATE
 
 -- inject fault to repeatedly fail the COMMIT PREPARE phase of 2PC, which ensures that the dtx cannot finish even by the dtx recovery process.
 select gp_inject_fault_infinite('finish_commit_prepared', 'error', dbid) from gp_segment_configuration where content=1 and role='p';