This is an automated email from the ASF dual-hosted git repository. yjhjstz pushed a commit to branch main in repository https://gitbox.apache.org/repos/asf/cloudberry.git
commit a084c9fc215cabfc882e6f10d908b150d4f5b0ea Author: chaotian <108248800+charliet...@users.noreply.github.com> AuthorDate: Thu Jun 8 09:38:19 2023 +0800 remove upsert fixme from isolation_schedule (#15636) After applying ` pg_isolation_test_session_is_blocked() ` to look if there were any waiting locks instead of attaching pg_locks, we could remove fixme and then recover upsert cases. But there was one left case insert-conflict-do-update-3 failed due to CTE bugs, that's not related to upsert and I also open issue #15635 for it. --- src/test/isolation/isolation_schedule | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/src/test/isolation/isolation_schedule b/src/test/isolation/isolation_schedule index 03241eede8..e93fae8969 100644 --- a/src/test/isolation/isolation_schedule +++ b/src/test/isolation/isolation_schedule @@ -33,12 +33,8 @@ # RowExclusiveLock and the tests can probably be enabled back. # Additionally, skip-locked-4 uses pg_advisory_lock() which only takes the lock # on QD, but it needs to take it on QE segments as well. -# GPDB_95_MERGE_FIXME: insert-conflict-do-nothing, insert-conflict-do-update, -# and insert-conflict-do-update-2 fail because isolationtester does not include -# QEs when checking pg_locks. If we are able to add the QE backend pids of gang -# to this list then these tests can be enabled. insert-conflict-do-update-2 -# has additional issue where GPDB does not support creating unique indexes on -# mutated columns via lower(). +# insert-conflict-do-update-3 related to issue https://github.com/greenplum-db/gpdb/issues/15635 + # # GPDB_12_MERGE_FEATURE_NOT_SUPPORTED: tuplelock-upgrade-no-deadlock, freeze-the-dead # don't pass in normal mode for GPDB as SELECT..FOR SHARE/UPDATE can @@ -97,10 +93,10 @@ test: deadlock-soft-2 #test: lock-update-traversal test: inherit-temp test: temp-schema-cleanup -#test: insert-conflict-do-nothing -#test: insert-conflict-do-nothing-2 -#test: insert-conflict-do-update -#test: insert-conflict-do-update-2 +test: insert-conflict-do-nothing +test: insert-conflict-do-nothing-2 +test: insert-conflict-do-update +test: insert-conflict-do-update-2 #test: insert-conflict-do-update-3 test: insert-conflict-specconflict test: delete-abort-savept --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@cloudberry.apache.org For additional commands, e-mail: commits-h...@cloudberry.apache.org