Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

fix compile errors

  • Loading branch information...
commit 2de94967a51c7d83a904714be04f18705db60715 1 parent be91f24
Maysam Yabandeh authored
View
2  src/main/java/com/yahoo/omid/client/TSOClient.java
@@ -85,7 +85,7 @@
private Map<Long, List<CommitQueryCallback>> isCommittedCallbacks;
private Committed committed = new Committed();
- private SharedAbortedSet aborted = new SharedAbortedSet();
+ SharedAbortedSet aborted = new SharedAbortedSet();
//private Set<Long> aborted = Collections.synchronizedSet(new HashSet<Long>(1000));
public Map<Long, Long> failedElders = Collections.synchronizedMap(new HashMap<Long, Long>(1000));
private long largestDeletedTimestamp;
View
6 src/main/java/com/yahoo/omid/client/TransactionManager.java
@@ -79,7 +79,7 @@ public TransactionState beginTransaction() throws TransactionException {
throw new TransactionException("Error retrieving timestamp", cb.getException());
}
- aborted.aTxnStarted();
+ tsoclient.aborted.aTxnStarted(cb.getStartTimestamp());
return new TransactionState(cb.getStartTimestamp(), tsoclient);
}
@@ -116,7 +116,7 @@ public void tryCommit(TransactionState transactionState)
" Success: " + (cb.getResult() == TSOClient.Result.OK));
}
- aborted.aTxnFinished();
+ tsoclient.aborted.aTxnFinished(transactionState.getStartTimestamp());
if (cb.getResult() == TSOClient.Result.ABORTED) {
cleanup(transactionState);
@@ -154,7 +154,7 @@ public void abort(TransactionState transactionState) throws TransactionException
LOG.trace("doneAbort " + transactionState.getStartTimestamp());
}
- aborted.aTxnFinished();
+ tsoclient.aborted.aTxnFinished(transactionState.getStartTimestamp());
// Make sure its commit timestamp is 0, so the cleanup does the right job
transactionState.setCommitTimestamp(0);
Please sign in to comment.
Something went wrong with that request. Please try again.