Repository: phoenix Updated Branches: refs/heads/4.x-HBase-0.98 d1db996cb -> bf0a9c435
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/bf0a9c43 Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/bf0a9c43 Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/bf0a9c43 Branch: refs/heads/4.x-HBase-0.98 Commit: bf0a9c4358f6cd58d349ba619c7f2356ee954a6d Parents: d1db996 Author: Samarth Jain <[email protected]> Authored: Wed May 31 13:21:02 2017 -0700 Committer: Samarth Jain <[email protected]> Committed: Wed May 31 13:21:02 2017 -0700 ---------------------------------------------------------------------- .../schema/stats/StatisticsCollectorFactory.java | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/bf0a9c43/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 4c0413b..0a90de2 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 DefaultStatisticsCollector} instances based on configuration settings for a @@ -64,12 +62,12 @@ public class StatisticsCollectorFactory { * use case for that. */ private static boolean statisticsEnabled(RegionCoprocessorEnvironment env) { - 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)) - && StatisticsUtil.isStatsEnabled(env.getRegionInfo().getTable()); + 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) + ) + && StatisticsUtil.isStatsEnabled(env.getRegionInfo().getTable()); } }
