Skip to content

Commit

Permalink
0004732: Do not worry about conflict winner in load only or log based
Browse files Browse the repository at this point in the history
target nodes
  • Loading branch information
jumpmind-josh committed Dec 29, 2020
1 parent 97ff16d commit 3c60ed3
Showing 1 changed file with 4 additions and 1 deletion.
Expand Up @@ -169,7 +169,10 @@ protected boolean isCaptureTimeNewer(Conflict conflict, AbstractDatabaseWriter w

boolean isWinner = isLoadOnlyNode || existingTs == null || (loadingTs != null && (loadingTs.getTime() > existingTs.getTime()
|| (loadingTs.getTime() == existingTs.getTime() && writer.getContext().getBatch().getSourceNodeId().hashCode() > existingNodeId.hashCode())));
writer.getContext().put(DatabaseConstants.IS_CONFLICT_WINNER, isWinner);

if (!isLoadOnlyNode) {
writer.getContext().put(DatabaseConstants.IS_CONFLICT_WINNER, isWinner);
}

if (log.isDebugEnabled()) {
log.debug("{} row from batch {} with local time of {} and remote time of {} for table {} and pk of {}",
Expand Down

0 comments on commit 3c60ed3

Please sign in to comment.