You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@phoenix.apache.org by sa...@apache.org on 2017/09/06 02:40:13 UTC
phoenix git commit: PHOENIX-4151 Addendum to fix test failure
Repository: phoenix
Updated Branches:
refs/heads/master a3bb174bc -> cdfb08bd8
PHOENIX-4151 Addendum to fix test failure
Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/cdfb08bd
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/cdfb08bd
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/cdfb08bd
Branch: refs/heads/master
Commit: cdfb08bd8862693b4826c4714259a63737dd2c3f
Parents: a3bb174
Author: Samarth Jain <sa...@apache.org>
Authored: Tue Sep 5 19:40:09 2017 -0700
Committer: Samarth Jain <sa...@apache.org>
Committed: Tue Sep 5 19:40:09 2017 -0700
----------------------------------------------------------------------
.../it/java/org/apache/phoenix/end2end/AggregateQueryIT.java | 1 -
.../src/it/java/org/apache/phoenix/end2end/MutableQueryIT.java | 5 +----
2 files changed, 1 insertion(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/phoenix/blob/cdfb08bd/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryIT.java
index 01c6e37..3dc0184 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/AggregateQueryIT.java
@@ -39,7 +39,6 @@ import org.apache.hadoop.hbase.client.HTable;
import org.apache.hadoop.hbase.util.Bytes;
import org.apache.phoenix.jdbc.PhoenixConnection;
import org.apache.phoenix.util.ByteUtil;
-import org.apache.phoenix.util.PhoenixRuntime;
import org.apache.phoenix.util.PropertiesUtil;
import org.junit.Test;
http://git-wip-us.apache.org/repos/asf/phoenix/blob/cdfb08bd/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableQueryIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableQueryIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableQueryIT.java
index 770c015..746d274 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableQueryIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/MutableQueryIT.java
@@ -311,21 +311,18 @@ public class MutableQueryIT extends BaseQueryIT {
" A_INTEGER) " +
"VALUES (?, ?, ?)";
upsertConn.setAutoCommit(true); // Test auto commit
- upsertConn.close();
-
PreparedStatement stmt = upsertConn.prepareStatement(upsertStmt);
stmt.setString(1, tenantId);
stmt.setString(2, ROW4);
stmt.setInt(3, 5);
stmt.execute(); // should commit too
+ upsertConn.close();
long upsert1Time = System.currentTimeMillis();
long timeDelta = 100;
Thread.sleep(timeDelta);
- // Override value again, but should be ignored since it's past the SCN
upsertConn = DriverManager.getConnection(url, props);
upsertConn.setAutoCommit(true); // Test auto commit
- // Insert all rows at ts
stmt = upsertConn.prepareStatement(upsertStmt);
stmt.setString(1, tenantId);
stmt.setString(2, ROW4);