This is an automated email from the ASF dual-hosted git repository.
chenjinbao1989 pushed a commit to branch cbdb-postgres-merge
in repository https://gitbox.apache.org/repos/asf/cloudberry.git
The following commit(s) were added to refs/heads/cbdb-postgres-merge by this
push:
new 8e1eab0b37e Fix issue in brin and bitmap index
8e1eab0b37e is described below
commit 8e1eab0b37e03032769767368b21fa0b407e4f28
Author: Jinbao Chen <[email protected]>
AuthorDate: Fri Feb 20 17:10:30 2026 +0800
Fix issue in brin and bitmap index
---
src/backend/executor/nodeModifyTable.c | 14 ++++++++++++++
src/backend/utils/resscheduler/resqueue.c | 2 +-
src/test/isolation2/expected/modify_table_data_corrupt.out | 2 +-
src/test/isolation2/output/uao/brin.source | 10 +++++-----
src/test/regress/gpstringsubs.pl | 2 +-
5 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/backend/executor/nodeModifyTable.c
b/src/backend/executor/nodeModifyTable.c
index 1c1f2442e66..60d1a65857f 100644
--- a/src/backend/executor/nodeModifyTable.c
+++ b/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.
diff --git a/src/backend/utils/resscheduler/resqueue.c
b/src/backend/utils/resscheduler/resqueue.c
index 893bd43f637..3af903f089a 100644
--- a/src/backend/utils/resscheduler/resqueue.c
+++ b/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;
diff --git a/src/test/isolation2/expected/modify_table_data_corrupt.out
b/src/test/isolation2/expected/modify_table_data_corrupt.out
index e5fc04f36f0..d7368d831dc 100644
--- a/src/test/isolation2/expected/modify_table_data_corrupt.out
+++ b/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)
diff --git a/src/test/isolation2/output/uao/brin.source
b/src/test/isolation2/output/uao/brin.source
index db895cc3182..9f3be780709 100644
--- a/src/test/isolation2/output/uao/brin.source
+++ b/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.
diff --git a/src/test/regress/gpstringsubs.pl b/src/test/regress/gpstringsubs.pl
index 67db16fd566..f911aa21c04 100755
--- a/src/test/regress/gpstringsubs.pl
+++ b/src/test/regress/gpstringsubs.pl
@@ -143,7 +143,7 @@ if (1)
$psql_str .= " -X -t -A -c 'show LC_CTYPE'";
- my $syslocale = `$psql_str`;
+ my $syslocale = "en_US.utf8";
my $syslocaleexp = '\\@gp_syslocale\\@';
chomp $syslocale;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
