Repository: phoenix Updated Branches: refs/heads/master b142e8815 -> c6080ea55
PHOENIX-3901 SpillableGroupByIT.testStatisticsAreNotWritten is failing Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/c6080ea5 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/c6080ea5 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/c6080ea5 Branch: refs/heads/master Commit: c6080ea55539d83c5d95b26ac19d0b3823631cb3 Parents: b142e88 Author: Samarth Jain <[email protected]> Authored: Wed May 31 13:16:50 2017 -0700 Committer: Samarth Jain <[email protected]> Committed: Wed May 31 13:17:00 2017 -0700 ---------------------------------------------------------------------- .../apache/phoenix/schema/stats/StatisticsCollectorFactory.java | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/c6080ea5/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollectorFactory.java ---------------------------------------------------------------------- diff --git a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollectorFactory.java b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollectorFactory.java index 1fe329f..4e37e5c 100644 --- a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollectorFactory.java +++ b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollectorFactory.java @@ -24,8 +24,6 @@ import static org.apache.phoenix.query.QueryServicesOptions.DEFAULT_STATS_COLLEC import java.io.IOException; import org.apache.hadoop.hbase.coprocessor.RegionCoprocessorEnvironment; -import org.apache.phoenix.query.QueryServices; -import org.apache.phoenix.query.QueryServicesOptions; /** * Provides new {@link StatisticsCollector} instances based on configuration settings for a @@ -67,7 +65,7 @@ public class StatisticsCollectorFactory { return (env.getConfiguration().getBoolean(STATS_COLLECTION_ENABLED, DEFAULT_STATS_COLLECTION_ENABLED) // old config left here for backward compatibility. TODO: remove in the next major release - || env.getConfiguration().getBoolean(STATS_ENABLED_ATTRIB, true) + && env.getConfiguration().getBoolean(STATS_ENABLED_ATTRIB, true) ) && StatisticsUtil.isStatsEnabled(env.getRegionInfo().getTable()); }
