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 <sama...@apache.org> Authored: Wed Sep 6 18:08:04 2017 -0700 Committer: Samarth Jain <sama...@apache.org> 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;
