[1/9] phoenix git commit: PHOENIX-1434 Stats are not maintained correctly through splits (Mujtaba)

2014-11-12 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/master c8883bcca - 5363c989a


PHOENIX-1434 Stats are not maintained correctly through splits (Mujtaba)


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/b0c18719
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/b0c18719
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/b0c18719

Branch: refs/heads/master
Commit: b0c187195657be92bc63c13a9fc2e563ec962d97
Parents: c8883bc
Author: James Taylor jtay...@salesforce.com
Authored: Wed Nov 12 09:06:11 2014 -0800
Committer: James Taylor jtay...@salesforce.com
Committed: Wed Nov 12 21:49:29 2014 -0800

--
 .../phoenix/schema/stats/StatisticsCollector.java   |  4 ++--
 .../apache/phoenix/schema/stats/StatisticsScanner.java  |  4 ++--
 .../apache/phoenix/schema/stats/StatisticsWriter.java   | 12 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/b0c18719/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollector.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollector.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollector.java
index 5212ff9..90c8324 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollector.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollector.java
@@ -123,13 +123,13 @@ public class StatisticsCollector {
 if(logger.isDebugEnabled()) {
 logger.debug(Deleting the stats for the region 
+region.getRegionInfo());
 }
-
statsTable.deleteStats(region.getRegionInfo().getRegionNameAsString(), this, 
Bytes.toString(fam.copyBytesIfNecessary()),
+
statsTable.deleteStats(region.getRegionInfo().getRegionName(), this, 
Bytes.toString(fam.copyBytesIfNecessary()),
 mutations);
 }
 if(logger.isDebugEnabled()) {
 logger.debug(Adding new stats for the region 
+region.getRegionInfo());
 }
-
statsTable.addStats((region.getRegionInfo().getRegionNameAsString()), this, 
Bytes.toString(fam.copyBytesIfNecessary()),
+statsTable.addStats((region.getRegionInfo().getRegionName()), 
this, Bytes.toString(fam.copyBytesIfNecessary()),
 mutations);
 }
 } catch (IOException e) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/b0c18719/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsScanner.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsScanner.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsScanner.java
index 3a84cfc..fa3930d 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsScanner.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsScanner.java
@@ -83,12 +83,12 @@ public class StatisticsScanner implements InternalScanner {
 LOG.debug(Deleting the stats for the region  + 
region.getRegionNameAsString()
 +  as part of major compaction);
 }
-stats.deleteStats(region.getRegionNameAsString(), this.tracker, 
Bytes.toString(family), mutations);
+stats.deleteStats(region.getRegionName(), this.tracker, 
Bytes.toString(family), mutations);
 if (LOG.isDebugEnabled()) {
 LOG.debug(Adding new stats for the region  + 
region.getRegionNameAsString()
 +  as part of major compaction);
 }
-stats.addStats(region.getRegionNameAsString(), this.tracker, 
Bytes.toString(family), mutations);
+stats.addStats(region.getRegionName(), this.tracker, 
Bytes.toString(family), mutations);
 if (LOG.isDebugEnabled()) {
 LOG.debug(Committing new stats for the region  + 
region.getRegionNameAsString()
 +  as part of major compaction);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/b0c18719/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsWriter.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsWriter.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsWriter.java
index 9e2d659..6681042 100644
---

[1/9] phoenix git commit: PHOENIX-1434 Stats are not maintained correctly through splits (Mujtaba)

2014-11-12 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/3.0 9b0bb38d3 - 2694568aa


PHOENIX-1434 Stats are not maintained correctly through splits (Mujtaba)


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/d2e729de
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/d2e729de
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/d2e729de

Branch: refs/heads/3.0
Commit: d2e729dea87357c208ff209aa22904f16e6aefbc
Parents: 9b0bb38
Author: James Taylor jtay...@salesforce.com
Authored: Wed Nov 12 09:06:11 2014 -0800
Committer: James Taylor jtay...@salesforce.com
Committed: Wed Nov 12 21:59:29 2014 -0800

--
 .../phoenix/schema/stats/StatisticsCollector.java   |  4 ++--
 .../apache/phoenix/schema/stats/StatisticsScanner.java  |  4 ++--
 .../apache/phoenix/schema/stats/StatisticsWriter.java   | 12 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/d2e729de/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollector.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollector.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollector.java
index 61fb7da..a362ffc 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollector.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollector.java
@@ -114,13 +114,13 @@ public class StatisticsCollector {
 if(logger.isDebugEnabled()) {
 logger.debug(Deleting the stats for the region 
+region.getRegionInfo());
 }
-
statsTable.deleteStats(region.getRegionInfo().getRegionNameAsString(), this, 
Bytes.toString(fam.copyBytesIfNecessary()),
+
statsTable.deleteStats(region.getRegionInfo().getRegionName(), this, 
Bytes.toString(fam.copyBytesIfNecessary()),
 mutations);
 }
 if(logger.isDebugEnabled()) {
 logger.debug(Adding new stats for the region 
+region.getRegionInfo());
 }
-
statsTable.addStats((region.getRegionInfo().getRegionNameAsString()), this, 
Bytes.toString(fam.copyBytesIfNecessary()),
+statsTable.addStats((region.getRegionInfo().getRegionName()), 
this, Bytes.toString(fam.copyBytesIfNecessary()),
 mutations);
 }
 } catch (IOException e) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d2e729de/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsScanner.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsScanner.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsScanner.java
index 239085d..37a1e22 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsScanner.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsScanner.java
@@ -80,12 +80,12 @@ public class StatisticsScanner implements InternalScanner {
 LOG.debug(Deleting the stats for the region  + 
region.getRegionNameAsString()
 +  as part of major compaction);
 }
-stats.deleteStats(region.getRegionNameAsString(), this.tracker, 
Bytes.toString(family), mutations);
+stats.deleteStats(region.getRegionName(), this.tracker, 
Bytes.toString(family), mutations);
 if (LOG.isDebugEnabled()) {
 LOG.debug(Adding new stats for the region  + 
region.getRegionNameAsString()
 +  as part of major compaction);
 }
-stats.addStats(region.getRegionNameAsString(), this.tracker, 
Bytes.toString(family), mutations);
+stats.addStats(region.getRegionName(), this.tracker, 
Bytes.toString(family), mutations);
 if (LOG.isDebugEnabled()) {
 LOG.debug(Committing new stats for the region  + 
region.getRegionNameAsString()
 +  as part of major compaction);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/d2e729de/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsWriter.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsWriter.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsWriter.java
index e28f805..f344c5c 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsWriter.java
+++

[1/9] phoenix git commit: PHOENIX-1434 Stats are not maintained correctly through splits (Mujtaba)

2014-11-12 Thread jamestaylor 
Repository: phoenix
Updated Branches:
  refs/heads/3.2 24246943a - 2311a3a18


PHOENIX-1434 Stats are not maintained correctly through splits (Mujtaba)


Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo
Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/764a2760
Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/764a2760
Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/764a2760

Branch: refs/heads/3.2
Commit: 764a2760f3a838776620f981272f105b28904d5b
Parents: 2424694
Author: James Taylor jtay...@salesforce.com
Authored: Wed Nov 12 09:06:11 2014 -0800
Committer: James Taylor jtay...@salesforce.com
Committed: Wed Nov 12 23:03:29 2014 -0800

--
 .../phoenix/schema/stats/StatisticsCollector.java   |  4 ++--
 .../apache/phoenix/schema/stats/StatisticsScanner.java  |  4 ++--
 .../apache/phoenix/schema/stats/StatisticsWriter.java   | 12 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/phoenix/blob/764a2760/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollector.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollector.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollector.java
index 61fb7da..a362ffc 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollector.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsCollector.java
@@ -114,13 +114,13 @@ public class StatisticsCollector {
 if(logger.isDebugEnabled()) {
 logger.debug(Deleting the stats for the region 
+region.getRegionInfo());
 }
-
statsTable.deleteStats(region.getRegionInfo().getRegionNameAsString(), this, 
Bytes.toString(fam.copyBytesIfNecessary()),
+
statsTable.deleteStats(region.getRegionInfo().getRegionName(), this, 
Bytes.toString(fam.copyBytesIfNecessary()),
 mutations);
 }
 if(logger.isDebugEnabled()) {
 logger.debug(Adding new stats for the region 
+region.getRegionInfo());
 }
-
statsTable.addStats((region.getRegionInfo().getRegionNameAsString()), this, 
Bytes.toString(fam.copyBytesIfNecessary()),
+statsTable.addStats((region.getRegionInfo().getRegionName()), 
this, Bytes.toString(fam.copyBytesIfNecessary()),
 mutations);
 }
 } catch (IOException e) {

http://git-wip-us.apache.org/repos/asf/phoenix/blob/764a2760/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsScanner.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsScanner.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsScanner.java
index 239085d..37a1e22 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsScanner.java
+++ 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsScanner.java
@@ -80,12 +80,12 @@ public class StatisticsScanner implements InternalScanner {
 LOG.debug(Deleting the stats for the region  + 
region.getRegionNameAsString()
 +  as part of major compaction);
 }
-stats.deleteStats(region.getRegionNameAsString(), this.tracker, 
Bytes.toString(family), mutations);
+stats.deleteStats(region.getRegionName(), this.tracker, 
Bytes.toString(family), mutations);
 if (LOG.isDebugEnabled()) {
 LOG.debug(Adding new stats for the region  + 
region.getRegionNameAsString()
 +  as part of major compaction);
 }
-stats.addStats(region.getRegionNameAsString(), this.tracker, 
Bytes.toString(family), mutations);
+stats.addStats(region.getRegionName(), this.tracker, 
Bytes.toString(family), mutations);
 if (LOG.isDebugEnabled()) {
 LOG.debug(Committing new stats for the region  + 
region.getRegionNameAsString()
 +  as part of major compaction);

http://git-wip-us.apache.org/repos/asf/phoenix/blob/764a2760/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsWriter.java
--
diff --git 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsWriter.java
 
b/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsWriter.java
index e28f805..f344c5c 100644
--- 
a/phoenix-core/src/main/java/org/apache/phoenix/schema/stats/StatisticsWriter.java
+++