phoenix git commit: PHOENIX-4171 Creating immutable index is timing out intermittently

2017-09-06 Thread samarth 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.2 59ede02af -> 035d7d972


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

Branch: refs/heads/4.x-HBase-1.2
Commit: 035d7d9725794e2b33895e91e9fed2acc1f802f8
Parents: 59ede02
Author: Samarth Jain 
Authored: Wed Sep 6 18:08:41 2017 -0700
Committer: Samarth Jain 
Committed: Wed Sep 6 18:08:41 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/035d7d97/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/035d7d97/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;

phoenix git commit: PHOENIX-4171 Creating immutable index is timing out intermittently

2017-09-06 Thread samarth 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-0.98 455a51de7 -> b8068d69f


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

Branch: refs/heads/4.x-HBase-0.98
Commit: b8068d69f27e982be5f9bdf55c66f1937ac84b74
Parents: 455a51d
Author: Samarth Jain 
Authored: Wed Sep 6 18:08:04 2017 -0700
Committer: Samarth Jain 
Committed: Wed Sep 6 18:08:04 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/b8068d69/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 176f86e..050fb5c 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
@@ -142,8 +142,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/b8068d69/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 9c2c3e6..a38b82e 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
@@ -317,8 +317,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;