phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From sama...@apache.org
Subject phoenix git commit: PHOENIX-4151 Addendum to fix test failure
Date Wed, 06 Sep 2017 02:41:49 GMT
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.2 1bcccb40c -> 3ae9f552a


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/3ae9f552
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/3ae9f552
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/3ae9f552

Branch: refs/heads/4.x-HBase-1.2
Commit: 3ae9f552ac0da53d4da01a5fbb3cab7e9d36b7f9
Parents: 1bcccb4
Author: Samarth Jain <samarth@apache.org>
Authored: Tue Sep 5 19:41:43 2017 -0700
Committer: Samarth Jain <samarth@apache.org>
Committed: Tue Sep 5 19:41:43 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/3ae9f552/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/3ae9f552/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);


Mime
View raw message