You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ja...@apache.org on 2015/10/30 02:33:14 UTC
phoenix git commit: PHOENIX-2358 Ensure commented out test snippets
in TransactionIT pass after TEPHRA-143 is fixed
Repository: phoenix
Updated Branches:
refs/heads/txn 657060b36 -> f8812c2e7
PHOENIX-2358 Ensure commented out test snippets in TransactionIT pass after TEPHRA-143 is fixed
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/f8812c2e
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/f8812c2e
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/f8812c2e
Branch: refs/heads/txn
Commit: f8812c2e7b3a700dc742bb13826d35a9575463da
Parents: 657060b
Author: James Taylor <jt...@salesforce.com>
Authored: Thu Oct 29 18:33:03 2015 -0700
Committer: James Taylor <jt...@salesforce.com>
Committed: Thu Oct 29 18:33:03 2015 -0700
----------------------------------------------------------------------
.../src/it/java/org/apache/phoenix/tx/TransactionIT.java | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/f8812c2e/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java b/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
index 878d2cf..71d0790 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/tx/TransactionIT.java
@@ -21,6 +21,7 @@ import java.sql.DriverManager;
import java.sql.PreparedStatement;
import java.sql.ResultSet;
import java.sql.SQLException;
+import java.util.List;
import org.apache.hadoop.hbase.client.HBaseAdmin;
import org.apache.hadoop.hbase.client.HTableInterface;
@@ -38,6 +39,8 @@ import org.apache.phoenix.util.TestUtil;
import org.junit.Before;
import org.junit.Test;
+import com.google.common.collect.Lists;
+
import co.cask.tephra.hbase98.coprocessor.TransactionProcessor;
public class TransactionIT extends BaseHBaseManagedTimeIT {
@@ -253,18 +256,16 @@ public class TransactionIT extends BaseHBaseManagedTimeIT {
conn.createStatement().execute("CREATE INDEX IDX ON NON_TX_TABLE(v)");
// Reset empty column value to an empty value like it is pre-transactions
- /** TODO: when TEPHRA-143 is fixed, comment this back in
HTableInterface htable = conn.unwrap(PhoenixConnection.class).getQueryServices().getTable(Bytes.toBytes("NON_TX_TABLE"));
List<Put>puts = Lists.newArrayList(new Put(PInteger.INSTANCE.toBytes(1)), new Put(PInteger.INSTANCE.toBytes(2)), new Put(PInteger.INSTANCE.toBytes(3)));
for (Put put : puts) {
put.add(QueryConstants.DEFAULT_COLUMN_FAMILY_BYTES, QueryConstants.EMPTY_COLUMN_BYTES, ByteUtil.EMPTY_BYTE_ARRAY);
}
htable.put(puts);
- **/
conn.createStatement().execute("ALTER TABLE NON_TX_TABLE SET TRANSACTIONAL=true");
- HTableInterface htable = conn.unwrap(PhoenixConnection.class).getQueryServices().getTable(Bytes.toBytes("NON_TX_TABLE"));
+ htable = conn.unwrap(PhoenixConnection.class).getQueryServices().getTable(Bytes.toBytes("NON_TX_TABLE"));
assertTrue(htable.getTableDescriptor().getCoprocessors().contains(TransactionProcessor.class.getName()));
htable = conn.unwrap(PhoenixConnection.class).getQueryServices().getTable(Bytes.toBytes("IDX"));
assertTrue(htable.getTableDescriptor().getCoprocessors().contains(TransactionProcessor.class.getName()));