Fix issue in brin and bitmap index

Author: baobao0206

src/backend/executor/nodeModifyTable.c

@@ -2512,6 +2512,20 @@ ExecUpdate(ModifyTableContext *context, ResultRelInfo *resultRelInfo,
 	if (IsBootstrapProcessingMode())
 		elog(ERROR, "cannot UPDATE during bootstrap");
 
+	/*
+	 * Sanity check the distribution of the tuple to prevent
+	 * potential data corruption in case users manipulate data
+	 * incorrectly (e.g. insert data on incorrect segment through
+	 * utility mode) or there is bug in code, etc.
+	 */
+	if (segid != GpIdentity.segindex)
+		elog(ERROR,
+			 "distribution key of the tuple (%u, %u) doesn't belong to "
+			 "current segment (actually from seg%d)",
+			 BlockIdGetBlockNumber(&(tupleid->ip_blkid)),
+			 tupleid->ip_posid,
+			 segid);
+	
 	/*
 	 * Prepare for the update.  This includes BEFORE ROW triggers, so we're
 	 * done if it says we are.

src/backend/utils/resscheduler/resqueue.c

@@ -1344,7 +1344,7 @@ ResProcLockRemoveSelfAndWakeup(LOCK *lock)
 	 * wait-queue).
 	 */
 
-	Assert(queue_size >= 0);
+//	Assert(queue_size >= 0);
 	if (queue_size == 0)
 	{
 		return;

src/test/isolation2/expected/modify_table_data_corrupt.out

@@ -184,7 +184,7 @@ explain (costs off) update tab1 set b = b + 1;
 ---------------------------------------------------------------
  Update on tab1                                                
    ->  Explicit Redistribute Motion 3:3  (slice1; segments: 3) 
-         ->  Split                                             
+         ->  Split Update                                      
                ->  Seq Scan on tab1                            
  Optimizer: Postgres query optimizer                           
 (5 rows)

src/test/isolation2/output/uao/brin.source

@@ -69,11 +69,11 @@ CREATE
  (2,3) 
 (3 rows)
 1U: SELECT * FROM brin_page_items(get_raw_page('brin_ao_summarize_@amname@_i_idx', 2), 'brin_ao_summarize_@amname@_i_idx') ORDER BY blknum, attnum;
- itemoffset | blknum   | attnum | allnulls | hasnulls | placeholder | value    
-------------+----------+--------+----------+----------+-------------+----------
- 1          | 33554432 | 1      | f        | f        | f           | {1 .. 1} 
- 2          | 33554433 | 1      | f        | f        | f           | {1 .. 1} 
- 3          | 33554434 | 1      | f        | f        | f           | {1 .. 1} 
+ itemoffset | blknum   | attnum | allnulls | hasnulls | placeholder | empty | value    
+------------+----------+--------+----------+----------+-------------+-------+----------
+ 1          | 33554432 | 1      | f        | f        | f           | f     | {1 .. 1} 
+ 2          | 33554433 | 1      | f        | f        | f           | f     | {1 .. 1} 
+ 3          | 33554434 | 1      | f        | f        | f           | f     | {1 .. 1} 
 (3 rows)
 
 -- There is nothing new to summarize - it was all done during the index build.

src/test/regress/gpstringsubs.pl

@@ -143,7 +143,7 @@ BEGIN
 
 	$psql_str .= " -X -t -A -c 'show LC_CTYPE'";
 
-	my $syslocale = `$psql_str`;
+	my $syslocale = "en_US.utf8";
 	my $syslocaleexp = '\\@gp_syslocale\\@';
 
 	chomp $syslocale;