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). ------------- Commit messages: - extra cleanup - close statement, use strBldr, unused vars, spacing - the fix itself Changes: https://git.openjdk.org/jdk/pull/33707/files Webrev: https://webrevs.openjdk.org/?repo=jdk&pr=33707&range=00 Issue: https://bugs.openjdk.org/browse/JDK-8396063 Stats: 91 lines in 1 file changed: 21 ins; 48 del; 22 mod Patch: https://git.openjdk.org/jdk/pull/33707.diff Fetch: git fetch https://git.openjdk.org/jdk.git pull/33707/head:pull/33707 PR: https://git.openjdk.org/jdk/pull/33707
