You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by ma...@apache.org on 2017/03/16 21:12:08 UTC
[46/50] [abbrv] phoenix git commit: Fix merge conflicts;
fix compilation errors; fix test failures
http://git-wip-us.apache.org/repos/asf/phoenix/blob/db78bd6f/phoenix-core/src/test/java/org/apache/phoenix/query/BaseConnectionlessQueryTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/db78bd6f/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
----------------------------------------------------------------------
diff --cc phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
index 38fffc1,078c1e8..604b51a
--- a/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
+++ b/phoenix-core/src/test/java/org/apache/phoenix/query/BaseTest.java
@@@ -467,8 -458,12 +468,12 @@@ public abstract class BaseTest
config.setInt(TxConstants.Service.CFG_DATA_TX_BIND_PORT, Networks.getRandomPort());
config.set(TxConstants.Manager.CFG_TX_SNAPSHOT_DIR, tmpFolder.newFolder().getAbsolutePath());
config.setInt(TxConstants.Manager.CFG_TX_TIMEOUT, DEFAULT_TXN_TIMEOUT_SECONDS);
-
+ config.unset(TxConstants.Manager.CFG_TX_HDFS_USER);
+ config.setLong(TxConstants.Manager.CFG_TX_SNAPSHOT_INTERVAL, 5L);
+ }
+
+ protected static void setupTxManager() throws SQLException, IOException {
- ConnectionInfo connInfo = ConnectionInfo.create(getUrl());
+ ConnectionInfo connInfo = ConnectionInfo.create(getOldUrl());
zkClient = ZKClientServices.delegate(
ZKClients.reWatchOnExpire(
ZKClients.retryOnFailure(
@@@ -1266,16 -1261,14 +1276,13 @@@
stmt.setFloat(15, 0.09f);
stmt.setDouble(16, 0.0009);
stmt.execute();
-
conn.commit();
- return tableName;
- } finally {
- conn.close();
}
+ return tableName;
}
-
protected static void initEntityHistoryTableValues(String tenantId, byte[][] splits, Date date, Long ts) throws Exception {
- initEntityHistoryTableValues(tenantId, splits, date, ts, getUrl());
+ initEntityHistoryTableValues(tenantId, splits, date, ts, getOldUrl());
}
protected static void initSaltedEntityHistoryTableValues(String tenantId, byte[][] splits, Date date, Long ts) throws Exception {
http://git-wip-us.apache.org/repos/asf/phoenix/blob/db78bd6f/phoenix-core/src/test/java/org/apache/phoenix/util/TestUtil.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/db78bd6f/pom.xml
----------------------------------------------------------------------