Repository: incubator-tephra Updated Branches: refs/heads/master 810c9dd0a -> 174c33253
http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/174c3325/tephra-hbase-compat-1.0/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionVisibilityFilterTest.java ---------------------------------------------------------------------- diff --git a/tephra-hbase-compat-1.0/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionVisibilityFilterTest.java b/tephra-hbase-compat-1.0/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionVisibilityFilterTest.java index 9638644..4b2b40c 100644 --- a/tephra-hbase-compat-1.0/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionVisibilityFilterTest.java +++ b/tephra-hbase-compat-1.0/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionVisibilityFilterTest.java @@ -37,7 +37,6 @@ import java.util.Map; import javax.annotation.Nullable; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; /** * HBase 1.0 specific test for filtering logic applied when reading data transactionally. @@ -249,20 +248,20 @@ public class TransactionVisibilityFilterTest extends AbstractTransactionVisibili */ Transaction tx1 = txManager.startShort(); - assertTrue(txManager.canCommit(tx1, EMPTY_CHANGESET)); - assertTrue(txManager.commit(tx1)); + txManager.canCommit(tx1.getTransactionId(), EMPTY_CHANGESET); + txManager.commit(tx1.getTransactionId(), tx1.getWritePointer()); Transaction tx2 = txManager.startShort(); - assertTrue(txManager.canCommit(tx2, EMPTY_CHANGESET)); - assertTrue(txManager.commit(tx2)); + txManager.canCommit(tx2.getTransactionId(), EMPTY_CHANGESET); + txManager.commit(tx2.getTransactionId(), tx2.getWritePointer()); Transaction tx3 = txManager.startShort(); Transaction tx4 = txManager.startShort(); txManager.invalidate(tx4.getTransactionId()); Transaction tx5 = txManager.startShort(); - assertTrue(txManager.canCommit(tx5, EMPTY_CHANGESET)); - assertTrue(txManager.commit(tx5)); + txManager.canCommit(tx5.getTransactionId(), EMPTY_CHANGESET); + txManager.commit(tx5.getTransactionId(), tx5.getWritePointer()); Transaction tx6 = txManager.startShort(); http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/174c3325/tephra-hbase-compat-1.1-base/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionProcessorTest.java ---------------------------------------------------------------------- diff --git a/tephra-hbase-compat-1.1-base/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionProcessorTest.java b/tephra-hbase-compat-1.1-base/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionProcessorTest.java index f133735..3cad210 100644 --- a/tephra-hbase-compat-1.1-base/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionProcessorTest.java +++ b/tephra-hbase-compat-1.1-base/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionProcessorTest.java @@ -48,7 +48,6 @@ import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.wal.WAL; import org.apache.hadoop.hbase.wal.WALFactory; import org.apache.hadoop.hdfs.MiniDFSCluster; -import org.apache.tephra.ChangeId; import org.apache.tephra.Transaction; import org.apache.tephra.TransactionManager; import org.apache.tephra.TxConstants; @@ -78,7 +77,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.TreeMap; import java.util.concurrent.TimeUnit; @@ -133,11 +131,11 @@ public class TransactionProcessorTest { InvalidTxList invalidTxList = new InvalidTxList(); invalidTxList.addAll(invalidSet); TransactionSnapshot txSnapshot = TransactionSnapshot.copyFrom( - System.currentTimeMillis(), V[6] - 1, V[7], invalidTxList, - // this will set visibility upper bound to V[6] - Maps.newTreeMap(ImmutableSortedMap.of(V[6], new TransactionManager.InProgressTx( + System.currentTimeMillis(), V[6] - 1, V[7], invalidTxList, + // this will set visibility upper bound to V[6] + Maps.newTreeMap(ImmutableSortedMap.of(V[6], new TransactionManager.InProgressTx( V[6] - 1, Long.MAX_VALUE, TransactionManager.InProgressType.SHORT))), - new HashMap<Long, Set<ChangeId>>(), new TreeMap<Long, Set<ChangeId>>()); + new HashMap<Long, TransactionManager.ChangeSet>(), new TreeMap<Long, TransactionManager.ChangeSet>()); txVisibilityState = new TransactionSnapshot(txSnapshot.getTimestamp(), txSnapshot.getReadPointer(), txSnapshot.getWritePointer(), txSnapshot.getInvalid(), txSnapshot.getInProgress()); http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/174c3325/tephra-hbase-compat-1.1-base/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionVisibilityFilterTest.java ---------------------------------------------------------------------- diff --git a/tephra-hbase-compat-1.1-base/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionVisibilityFilterTest.java b/tephra-hbase-compat-1.1-base/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionVisibilityFilterTest.java index d976085..1b02609 100644 --- a/tephra-hbase-compat-1.1-base/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionVisibilityFilterTest.java +++ b/tephra-hbase-compat-1.1-base/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionVisibilityFilterTest.java @@ -37,7 +37,6 @@ import java.util.Map; import javax.annotation.Nullable; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; /** * HBase 1.1 specific test for filtering logic applied when reading data transactionally. @@ -250,20 +249,20 @@ public class TransactionVisibilityFilterTest extends AbstractTransactionVisibili */ Transaction tx1 = txManager.startShort(); - assertTrue(txManager.canCommit(tx1, EMPTY_CHANGESET)); - assertTrue(txManager.commit(tx1)); + txManager.canCommit(tx1.getTransactionId(), EMPTY_CHANGESET); + txManager.commit(tx1.getTransactionId(), tx1.getWritePointer()); Transaction tx2 = txManager.startShort(); - assertTrue(txManager.canCommit(tx2, EMPTY_CHANGESET)); - assertTrue(txManager.commit(tx2)); + txManager.canCommit(tx2.getTransactionId(), EMPTY_CHANGESET); + txManager.commit(tx2.getTransactionId(), tx2.getWritePointer()); Transaction tx3 = txManager.startShort(); Transaction tx4 = txManager.startShort(); txManager.invalidate(tx4.getTransactionId()); Transaction tx5 = txManager.startShort(); - assertTrue(txManager.canCommit(tx5, EMPTY_CHANGESET)); - assertTrue(txManager.commit(tx5)); + txManager.canCommit(tx5.getTransactionId(), EMPTY_CHANGESET); + txManager.commit(tx5.getTransactionId(), tx5.getWritePointer()); Transaction tx6 = txManager.startShort(); http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/174c3325/tephra-hbase-compat-1.3/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionProcessorTest.java ---------------------------------------------------------------------- diff --git a/tephra-hbase-compat-1.3/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionProcessorTest.java b/tephra-hbase-compat-1.3/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionProcessorTest.java index 4c8fa64..95acc3d 100644 --- a/tephra-hbase-compat-1.3/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionProcessorTest.java +++ b/tephra-hbase-compat-1.3/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionProcessorTest.java @@ -48,7 +48,6 @@ import org.apache.hadoop.hbase.util.FSUtils; import org.apache.hadoop.hbase.wal.WAL; import org.apache.hadoop.hbase.wal.WALFactory; import org.apache.hadoop.hdfs.MiniDFSCluster; -import org.apache.tephra.ChangeId; import org.apache.tephra.Transaction; import org.apache.tephra.TransactionManager; import org.apache.tephra.TxConstants; @@ -78,7 +77,6 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.TreeMap; import java.util.concurrent.TimeUnit; @@ -137,7 +135,7 @@ public class TransactionProcessorTest { // this will set visibility upper bound to V[6] Maps.newTreeMap(ImmutableSortedMap.of(V[6], new TransactionManager.InProgressTx( V[6] - 1, Long.MAX_VALUE, TransactionManager.InProgressType.SHORT))), - new HashMap<Long, Set<ChangeId>>(), new TreeMap<Long, Set<ChangeId>>()); + new HashMap<Long, TransactionManager.ChangeSet>(), new TreeMap<Long, TransactionManager.ChangeSet>()); txVisibilityState = new TransactionSnapshot(txSnapshot.getTimestamp(), txSnapshot.getReadPointer(), txSnapshot.getWritePointer(), txSnapshot.getInvalid(), txSnapshot.getInProgress()); http://git-wip-us.apache.org/repos/asf/incubator-tephra/blob/174c3325/tephra-hbase-compat-1.3/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionVisibilityFilterTest.java ---------------------------------------------------------------------- diff --git a/tephra-hbase-compat-1.3/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionVisibilityFilterTest.java b/tephra-hbase-compat-1.3/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionVisibilityFilterTest.java index d976085..1b02609 100644 --- a/tephra-hbase-compat-1.3/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionVisibilityFilterTest.java +++ b/tephra-hbase-compat-1.3/src/test/java/org/apache/tephra/hbase/coprocessor/TransactionVisibilityFilterTest.java @@ -37,7 +37,6 @@ import java.util.Map; import javax.annotation.Nullable; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertTrue; /** * HBase 1.1 specific test for filtering logic applied when reading data transactionally. @@ -250,20 +249,20 @@ public class TransactionVisibilityFilterTest extends AbstractTransactionVisibili */ Transaction tx1 = txManager.startShort(); - assertTrue(txManager.canCommit(tx1, EMPTY_CHANGESET)); - assertTrue(txManager.commit(tx1)); + txManager.canCommit(tx1.getTransactionId(), EMPTY_CHANGESET); + txManager.commit(tx1.getTransactionId(), tx1.getWritePointer()); Transaction tx2 = txManager.startShort(); - assertTrue(txManager.canCommit(tx2, EMPTY_CHANGESET)); - assertTrue(txManager.commit(tx2)); + txManager.canCommit(tx2.getTransactionId(), EMPTY_CHANGESET); + txManager.commit(tx2.getTransactionId(), tx2.getWritePointer()); Transaction tx3 = txManager.startShort(); Transaction tx4 = txManager.startShort(); txManager.invalidate(tx4.getTransactionId()); Transaction tx5 = txManager.startShort(); - assertTrue(txManager.canCommit(tx5, EMPTY_CHANGESET)); - assertTrue(txManager.commit(tx5)); + txManager.canCommit(tx5.getTransactionId(), EMPTY_CHANGESET); + txManager.commit(tx5.getTransactionId(), tx5.getWritePointer()); Transaction tx6 = txManager.startShort();
