On Tue, 3 Nov 2026 21:12:48 GMT, Justin Lu <[email protected]> wrote: > As pointed out in https://github.com/openjdk/jdk/pull/33592, > `updateResolvedConflictToDB` does not need to supply its own local versions > of the `buildWhereClause` parameters. This PR updates resolution to use the > writer's existing key columns, parameters and metadata. > > Behaviorally, this means that CLOB, STRUCT, SQLXML, BLOB, ARRAY, and OTHER > columns are now excluded from the WHERE matching during resolution, if > explicit key columns have not been set. From a consistency standpoint, this > makes sense since resolution should be using the same key columns as the > actual synchronization of the writer. For example with the old code, if CLOB > is not part of the synchronization but part of the resolution, it could fail > to match during resolution. > > The first commit makes this adjustment, and the second commit is just drive > by cleanup of the dated code. > > --------- > - [x] I confirm that I make this contribution in accordance with the [OpenJDK > Interim AI Policy](https://openjdk.org/legal/ai).
Hi Justin, Thanks for the additional clean up as it is a positive step in addressing some of the issues we have become aware of. ------------- Marked as reviewed by lancea (Reviewer). PR Review: https://git.openjdk.org/jdk/pull/33707#pullrequestreview-5770006463
