Repository: phoenix Updated Branches: refs/heads/4.x-HBase-1.1 c3b306cc5 -> 16504816b
PHOENIX-3113 Automatic build of async index will happen even if mapreduce.framework.name is not set in any configuration Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/16504816 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/16504816 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/16504816 Branch: refs/heads/4.x-HBase-1.1 Commit: 16504816be48d1a083282e14a8a46c1394451a2a Parents: c3b306c Author: James Taylor <[email protected]> Authored: Wed Jul 27 08:23:33 2016 -0700 Committer: James Taylor <[email protected]> Committed: Wed Jul 27 08:24:16 2016 -0700 ---------------------------------------------------------------------- .../src/it/java/org/apache/phoenix/end2end/IndexToolIT.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/16504816/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java index c66fea3..5621634 100644 --- a/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java +++ b/phoenix-core/src/it/java/org/apache/phoenix/end2end/IndexToolIT.java @@ -37,7 +37,6 @@ import java.util.UUID; import org.apache.hadoop.conf.Configuration; import org.apache.phoenix.mapreduce.index.IndexTool; -import org.apache.phoenix.mapreduce.util.PhoenixConfigurationUtil; import org.apache.phoenix.query.QueryServices; import org.apache.phoenix.query.QueryServicesOptions; import org.apache.phoenix.util.PropertiesUtil; @@ -87,8 +86,9 @@ public class IndexToolIT extends BaseOwnClusterHBaseManagedTimeIT { @BeforeClass public static void doSetup() throws Exception { - Map<String, String> serverProps = Maps.newHashMapWithExpectedSize(1); + Map<String, String> serverProps = Maps.newHashMapWithExpectedSize(2); serverProps.put(QueryServices.EXTRA_JDBC_ARGUMENTS_ATTRIB, QueryServicesOptions.DEFAULT_EXTRA_JDBC_ARGUMENTS); + serverProps.put(QueryServices.ASYNC_INDEX_AUTO_BUILD_ATTRIB, Boolean.toString(false)); Map<String, String> clientProps = Maps.newHashMapWithExpectedSize(1); clientProps.put(QueryServices.TRANSACTIONS_ENABLED, "true"); setUpRealDriver(new ReadOnlyProps(serverProps.entrySet().iterator()), new ReadOnlyProps(clientProps.entrySet().iterator()));
