From 9edb62cb89191d54aa57399c6fcabd89b0b1214e Mon Sep 17 00:00:00 2001 From: Maysam Yabandeh Date: Thu, 17 May 2012 17:32:10 +0200 Subject: [PATCH] fix compile problems caused by merge --- pom.xml | 10 ++++++++++ .../java/com/yahoo/omid/client/TransactionalTable.java | 3 +-- src/main/java/com/yahoo/omid/tso/TSOHandler.java | 5 ++--- src/main/java/com/yahoo/omid/tso/TSOState.java | 6 +++++- src/test/java/com/yahoo/omid/tso/TestTimestamps.java | 2 +- 5 files changed, 19 insertions(+), 7 deletions(-) diff --git a/pom.xml b/pom.xml index c30a1553..6b1cf448 100644 --- a/pom.xml +++ b/pom.xml @@ -86,6 +86,16 @@ -Djava.library.path=${basedir}/src/main/native + + org.apache.maven.plugins + maven-surefire-plugin + 2.12 + + + ${basedir}/conf + + + diff --git a/src/main/java/com/yahoo/omid/client/TransactionalTable.java b/src/main/java/com/yahoo/omid/client/TransactionalTable.java index d47dc0bf..ebfb56e9 100644 --- a/src/main/java/com/yahoo/omid/client/TransactionalTable.java +++ b/src/main/java/com/yahoo/omid/client/TransactionalTable.java @@ -229,8 +229,7 @@ public void put(TransactionState transactionState, Put put) throws IOException, } // should add the table as well - transactionState.addWrittenRow(new RowKeyFamily(put.getRow(), getTableName(), put.getFamilyMap())); - transactionState.addRow(new RowKeyFamily(tsput.getRow(), getTableName(), tsput.getFamilyMap())); + transactionState.addWrittenRow(new RowKeyFamily(tsput.getRow(), getTableName(), tsput.getFamilyMap())); put(tsput); } diff --git a/src/main/java/com/yahoo/omid/tso/TSOHandler.java b/src/main/java/com/yahoo/omid/tso/TSOHandler.java index fde419b1..78835cfe 100644 --- a/src/main/java/com/yahoo/omid/tso/TSOHandler.java +++ b/src/main/java/com/yahoo/omid/tso/TSOHandler.java @@ -253,7 +253,6 @@ public void handle(TimestampRequest msg, ChannelHandlerContext ctx) { */ public void handle(CommitRequest msg, ChannelHandlerContext ctx) { CommitResponse reply = new CommitResponse(msg.startTimestamp); - ByteArrayOutputStream baos = sharedState.baos; DataOutputStream toWAL = sharedState.toWAL; reply.committed = true; //HashSet lockedSet = new HashSet(); @@ -424,7 +423,7 @@ public void handle(CommitRequest msg, ChannelHandlerContext ctx) { LOG.debug("Going to add record of size " + sharedState.baos.size()); } //sharedState.lh.asyncAddEntry(baos.toByteArray(), this, sharedState.nextBatch); - sharedState.addRecord(baos.toByteArray(), new AddRecordCallback() { + sharedState.addRecord(sharedState.baos.toByteArray(), new AddRecordCallback() { @Override public void addRecordComplete(int rc, Object ctx) { if (rc != Code.OK) { @@ -552,7 +551,7 @@ public void flush() { if(LOG.isDebugEnabled()){ LOG.debug("Adding record, size " + sharedState.baos.size()); } - sharedState.addRecord(baos.toByteArray(), new AddRecordCallback() { + sharedState.addRecord(sharedState.baos.toByteArray(), new AddRecordCallback() { @Override public void addRecordComplete(int rc, Object ctx) { if (rc != Code.OK) { diff --git a/src/main/java/com/yahoo/omid/tso/TSOState.java b/src/main/java/com/yahoo/omid/tso/TSOState.java index 16539b20..e44194aa 100644 --- a/src/main/java/com/yahoo/omid/tso/TSOState.java +++ b/src/main/java/com/yahoo/omid/tso/TSOState.java @@ -128,6 +128,9 @@ protected TimestampOracle getSO(){ * * @param startTimestamp */ + protected long processCommit(long startTimestamp, long commitTimestamp){ + return processCommit(startTimestamp, commitTimestamp, largestDeletedTimestamp); + } protected long processCommit(long startTimestamp, long commitTimestamp, long newmax){ newmax = hashmap.setCommitted(startTimestamp, commitTimestamp, newmax); return newmax; @@ -195,8 +198,9 @@ void stop(){ public TSOState(StateLogger logger, TimestampOracle timestampOracle) { this.timestampOracle = timestampOracle; - this.largestDeletedTimestamp = this.previousLargestDeletedTimestamp = this.timestampOracle.get(); + this.largestDeletedTimestamp = this.timestampOracle.get(); this.uncommited = new Uncommited(largestDeletedTimestamp); + this.elders = new Elders(); this.logger = logger; } diff --git a/src/test/java/com/yahoo/omid/tso/TestTimestamps.java b/src/test/java/com/yahoo/omid/tso/TestTimestamps.java index 2f53a24c..e79b0ece 100644 --- a/src/test/java/com/yahoo/omid/tso/TestTimestamps.java +++ b/src/test/java/com/yahoo/omid/tso/TestTimestamps.java @@ -36,4 +36,4 @@ public void testGetTimestamp() throws Exception { assertTrue(tr2.timestamp > tr1.timestamp); } -} \ No newline at end of file +}