phoenix git commit: PHOENIX-3901 SpillableGroupByIT.testStatisticsAreNotWritten is failing

2017-05-31 Thread samarth 
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 
Authored: Wed May 31 13:21:02 2017 -0700
Committer: Samarth Jain 
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());
 }
 
 }

phoenix git commit: PHOENIX-3901 SpillableGroupByIT.testStatisticsAreNotWritten is failing

2017-05-31 Thread samarth 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.1 89e633046 -> 0f1e7e7fe


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

Branch: refs/heads/4.x-HBase-1.1
Commit: 0f1e7e7fe2c51da1a675de7a9a32e17df38e4722
Parents: 89e6330
Author: Samarth Jain 
Authored: Wed May 31 13:17:52 2017 -0700
Committer: Samarth Jain 
Committed: Wed May 31 13:17:52 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/0f1e7e7f/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());
 }

phoenix git commit: PHOENIX-3901 SpillableGroupByIT.testStatisticsAreNotWritten is failing

2017-05-31 Thread samarth 
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 
Authored: Wed May 31 13:16:50 2017 -0700
Committer: Samarth Jain 
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());
 }

phoenix git commit: PHOENIX-3901 SpillableGroupByIT.testStatisticsAreNotWritten is failing

2017-05-31 Thread samarth 
Repository: phoenix
Updated Branches:
  refs/heads/4.x-HBase-1.2 c8cd24f59 -> 518a973cd


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

Branch: refs/heads/4.x-HBase-1.2
Commit: 518a973cdbebf245b66e6ed8554714e3b3b63b39
Parents: c8cd24f
Author: Samarth Jain 
Authored: Wed May 31 13:17:25 2017 -0700
Committer: Samarth Jain 
Committed: Wed May 31 13:17:25 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/518a973c/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());
 }