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-4171 Creating immutable index is timing out intermittently
Date Thu, 07 Sep 2017 01:08:29 GMT
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 c63155661 -> 5feaa864c


PHOENIX-4171 Creating immutable index is timing out intermittently


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/5feaa864
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/5feaa864
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/5feaa864

Branch: refs/heads/4.x-HBase-1.1
Commit: 5feaa864c04e888ee3a2a612cee8bb7f732f41e9
Parents: c631556
Author: Samarth Jain <samarth@apache.org>
Authored: Wed Sep 6 18:08:23 2017 -0700
Committer: Samarth Jain <samarth@apache.org>
Committed: Wed Sep 6 18:08:23 2017 -0700

----------------------------------------------------------------------
 .../src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java  | 5 +++--
 .../java/org/apache/phoenix/query/QueryServicesOptions.java     | 4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/5feaa864/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java b/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java
index d8a9ed4..1c18667 100644
--- a/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java
+++ b/phoenix-core/src/it/java/org/apache/phoenix/rpc/PhoenixServerRpcIT.java
@@ -143,8 +143,9 @@ public class PhoenixServerRpcIT extends BaseUniqueNamesOwnClusterIT {
             
             TestPhoenixIndexRpcSchedulerFactory.reset();
             createIndex(conn, indexName + "_1");
-            // verify that that index queue is used and only once (during Upsert Select on
server to build the index)
-            Mockito.verify(TestPhoenixIndexRpcSchedulerFactory.getIndexRpcExecutor()).dispatch(Mockito.any(CallRunner.class));
+            // Verify that that index queue is not used since running upsert select on server
side has been disabled
+            // See PHOENIX-4171
+            Mockito.verify(TestPhoenixIndexRpcSchedulerFactory.getIndexRpcExecutor(), Mockito.never()).dispatch(Mockito.any(CallRunner.class));
         }
         finally {
             conn.close();

http://git-wip-us.apache.org/repos/asf/phoenix/blob/5feaa864/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
index 4ff65db..feaf5dd 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/query/QueryServicesOptions.java
@@ -329,8 +329,8 @@ public class QueryServicesOptions {
                                                                                     // 4.10,
psql and CSVBulkLoad
                                                                                     // expects
binary data to be base 64
                                                                                     // encoded
-    // RS -> RS calls for upsert select statements are enabled by default
-    public static final boolean DEFAULT_ENABLE_SERVER_UPSERT_SELECT = true;
+    // RS -> RS calls for upsert select statements are disabled by default
+    public static final boolean DEFAULT_ENABLE_SERVER_UPSERT_SELECT = false;
 
     private final Configuration config;
 


Mime
View raw message