| Chunk |
|---|
| Conflicting content |
|---|
StaticBuffer curRidBuf = new StaticArrayBuffer(curRid);
ridsSeen.add(curRidBuf);
<<<<<<< HEAD
if (log.isTraceEnabled()) {
log.trace(
"Entry #{} for {}: ts={} rid={} (seen {} unique rids so far)",
new Object[] { entryCounter, lc, tsNS,
Hex.encodeHexString(curRid),
ridsSeen.size() });
}
=======
>>>>>>> 659594c7db27ecba5e2e6a278deb7a09029d9517
// Ignore expired lock claims
if (tsNS < now - (backer.getLockExpireMS() * MILLION)) { |
| Solution content |
|---|
StaticBuffer curRidBuf = new StaticArrayBuffer(curRid);
ridsSeen.add(curRidBuf);
if (log.isTraceEnabled()) {
log.trace(
"Entry #{} for {}: ts={} rid={} (seen {} unique rids so far)",
new Object[] { entryCounter, lc, tsNS,
Hex.encodeHexString(curRid),
ridsSeen.size() });
}
// Ignore expired lock claims
if (tsNS < now - (backer.getLockExpireMS() * MILLION)) { |
| File |
|---|
| ConsistentKeyLockTransaction.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| If statement |
| Chunk |
|---|
| Conflicting content |
|---|
new Object[] { Hex.encodeHexString(earliestRid), earliestNS, latestNS } );
} else {
log.warn("Timestamp mismatch: expected={}, actual={}", lc.getTimestamp(), earliestNS);
<<<<<<< HEAD
=======
>>>>>>> 659594c7db27ecba5e2e6a278deb7a09029d9517
/*
* This is probably evidence of a prior attempt to write a lock
* that the client perceived as a failure but which in fact |
| Solution content |
|---|
new Object[] { Hex.encodeHexString(earliestRid), earliestNS, latestNS } );
} else {
log.warn("Timestamp mismatch: expected={}, actual={}", lc.getTimestamp(), earliestNS);
/*
* This is probably evidence of a prior attempt to write a lock
* that the client perceived as a failure but which in fact |
| File |
|---|
| ConsistentKeyLockTransaction.java |
| Developer's decision |
|---|
| Version 1 |
| Kind of conflict |
|---|
| Blank |