| Chunk |
|---|
| Conflicting content |
|---|
return (null);
}
else if (msg instanceof InitializeTxnMessage) {
<<<<<<< HEAD
// InitializeTxnMessage txn_msg = (InitializeTxnMessage)msg;
// if (bs.get(txn_msg.getProcedure().getId()) == false) {
// next = txn_msg;
// break;
// }
break;
=======
InitializeTxnMessage txn_msg = (InitializeTxnMessage)msg;
// So we have a problem here... We need to be able to know
// whether a txn is single-partition or not here because we don't want
// to start speculatively executing a distributed txn. Of course
// at this point all we have are raw bytes from the client.
if (bs.get(txn_msg.getProcedure().getId()) == false) {
next = txn_msg;
break;
}
>>>>>>> 42e375fdeb70f885cca4296205f9a001cc43d006
}
} // WHILE
if (debug.get() && next != null) { |
| Solution content |
|---|
return (null);
}
else if (msg instanceof InitializeTxnMessage) {
// So we have a problem here... We need to be able to know
// whether a txn is single-partition or not here because we don't want
// to start speculatively executing a distributed txn. Of course
// at this point all we have are raw bytes from the client.
// InitializeTxnMessage txn_msg = (InitializeTxnMessage)msg;
// if (bs.get(txn_msg.getProcedure().getId()) == false) {
// next = txn_msg;
// break;
// }
break;
}
} // WHILE
if (debug.get() && next != null) { |
| File |
|---|
| SpecExecScheduler.java |
| Developer's decision |
|---|
| Combination |
| Kind of conflict |
|---|
| Break statement |
| Cast expression |
| Comment |
| If statement |
| Variable |