fix tests
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/9abc8521 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/9abc8521 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/9abc8521 Branch: refs/heads/txn Commit: 9abc8521e34988a1fe8fedf7db866a440d64ff9e Parents: 626ac29 Author: Thomas D'Silva <[email protected]> Authored: Mon Nov 9 17:13:21 2015 -0800 Committer: Thomas D'Silva <[email protected]> Committed: Mon Nov 9 17:13:21 2015 -0800 ---------------------------------------------------------------------- .../apache/phoenix/end2end/index/txn/MutableRollbackIT.java | 6 ++++-- .../main/java/org/apache/phoenix/execute/MutationState.java | 1 + .../org/apache/phoenix/index/PhoenixTransactionalIndexer.java | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/9abc8521/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java index 6c0486c..271997d 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/index/txn/MutableRollbackIT.java @@ -244,10 +244,11 @@ public class MutableRollbackIT extends BaseHBaseManagedTimeIT { assertFalse(rs.next()); //assert original row exists in DEMO1_idx - rs = stmt.executeQuery("select k, v1 from DEMO1 ORDER BY v1"); + rs = stmt.executeQuery("select k, v1, v2 from DEMO1 ORDER BY v1"); assertTrue(rs.next()); assertEquals("x", rs.getString(1)); assertEquals("y", rs.getString(2)); + assertEquals("a", rs.getString(3)); assertFalse(rs.next()); //assert no rows exists in DEMO2 @@ -312,10 +313,11 @@ public class MutableRollbackIT extends BaseHBaseManagedTimeIT { assertFalse(rs.next()); //assert new covered row key value exists in DEMO1_idx - rs = stmt.executeQuery("select k, v1 from DEMO1 ORDER BY v1"); + rs = stmt.executeQuery("select k, v1, v2 from DEMO1 ORDER BY v1"); assertTrue(rs.next()); assertEquals("x", rs.getString(1)); assertEquals("z", rs.getString(2)); + assertEquals("a", rs.getString(3)); assertFalse(rs.next()); //assert rows exists in DEMO2 http://git-wip-us.apache.org/repos/asf/phoenix/blob/9abc8521/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java index 8633e8a..ff9fa41 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/execute/MutationState.java @@ -158,6 +158,7 @@ public class MutationState implements SQLCloseable { boolean isMetricsEnabled = connection.isRequestLevelMetricsEnabled(); this.mutationMetricQueue = isMetricsEnabled ? new MutationMetricQueue() : NoOpMutationMetricsQueue.NO_OP_MUTATION_METRICS_QUEUE; + this.tx = tx; if (tx == null) { this.txAwares = Collections.emptyList(); TransactionSystemClient txServiceClient = this.connection http://git-wip-us.apache.org/repos/asf/phoenix/blob/9abc8521/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixTransactionalIndexer.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixTransactionalIndexer.java b/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixTransactionalIndexer.java index 0c12975..e7428bd 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixTransactionalIndexer.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/index/PhoenixTransactionalIndexer.java @@ -24,7 +24,7 @@ import java.util.Set; import co.cask.tephra.Transaction; import co.cask.tephra.Transaction.VisibilityLevel; import co.cask.tephra.TxConstants; -import co.cask.tephra.hbase98.TransactionAwareHTable; +import co.cask.tephra.hbase11.TransactionAwareHTable; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory;
