phoenix-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From la...@apache.org
Subject [3/3] phoenix git commit: Revert "PHOENIX-1496 Further reduce work in StatsCollector."
Date Tue, 02 Dec 2014 05:54:59 GMT
Revert "PHOENIX-1496 Further reduce work in StatsCollector."

This reverts commit 3fa1ddccf782e8b708c3d1f13d7046fd8b511dce.


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

Branch: refs/heads/master
Commit: a180860250058c8f0fd3afa9807530ccddaaeb32
Parents: 3fa1ddc
Author: Lars Hofhansl <larsh@apache.org>
Authored: Mon Dec 1 21:54:57 2014 -0800
Committer: Lars Hofhansl <larsh@apache.org>
Committed: Mon Dec 1 21:54:57 2014 -0800

----------------------------------------------------------------------
 .../UngroupedAggregateRegionObserver.java       |  4 +--
 .../schema/stats/StatisticsCollector.java       | 36 +++++---------------
 2 files changed, 10 insertions(+), 30 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/phoenix/blob/a1808602/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
----------------------------------------------------------------------
diff --git a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
index ff05dad..e0ff5b3 100644
--- a/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
+++ b/phoenix-core/src/main/java/org/apache/phoenix/coprocessor/UngroupedAggregateRegionObserver.java
@@ -466,9 +466,7 @@ public class UngroupedAggregateRegionObserver extends BaseScannerRegionObserver{
                 // when background tasks are updating stats. Instead we track the max timestamp
of
                 // the cells and use that.
                 long clientTimeStamp = useCurrentTime ? TimeKeeper.SYSTEM.getCurrentTime()
: StatisticsCollector.NO_TIMESTAMP;
-                StatisticsCollector stats = new StatisticsCollector(
-                        c.getEnvironment(), table.getNameAsString(),
-                        clientTimeStamp, store.getFamily().getName());
+                StatisticsCollector stats = new StatisticsCollector(c.getEnvironment(), table.getNameAsString(),
clientTimeStamp);
                 internalScanner = stats.createCompactionScanner(c.getEnvironment().getRegion(),
store, scanner);
             } catch (IOException e) {
                 // If we can't reach the stats table, don't interrupt the normal

http://git-wip-us.apache.org/repos/asf/phoenix/blob/a1808602/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 619684a..4123ebe 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
@@ -65,13 +65,8 @@ public class StatisticsCollector {
     // Tracks the bytecount per family if it has reached the guidePostsDepth
     private Map<ImmutableBytesPtr, Boolean> familyMap = Maps.newHashMap();
     protected StatisticsWriter statsTable;
-    private Pair<Long,GuidePostsInfo> cachedGps = null;
 
     public StatisticsCollector(RegionCoprocessorEnvironment env, String tableName, long clientTimeStamp)
throws IOException {
-        this(env, tableName, clientTimeStamp, null);
-    }
-
-    public StatisticsCollector(RegionCoprocessorEnvironment env, String tableName, long clientTimeStamp,
byte[] family) throws IOException {
         Configuration config = env.getConfiguration();
         int guidepostPerRegion = config.getInt(QueryServices.STATS_GUIDEPOST_PER_REGION_ATTRIB,

                 QueryServicesOptions.DEFAULT_STATS_GUIDEPOST_PER_REGION);
@@ -81,14 +76,6 @@ public class StatisticsCollector {
         // Get the stats table associated with the current table on which the CP is
         // triggered
         this.statsTable = StatisticsWriter.newWriter(env, tableName, clientTimeStamp);
-        // in a compaction we know the one family ahead of time
-        // pre-populate familyMap and guidePostsMap here
-        if (family != null) {
-            ImmutableBytesPtr cfKey = new ImmutableBytesPtr(family, 0, family.length);
-            familyMap.put(cfKey, true);
-            cachedGps = new Pair<Long,GuidePostsInfo>(0L,new GuidePostsInfo(0, Collections.<byte[]>emptyList()));
-            guidePostsMap.put(cfKey, cachedGps);
-        }
     }
     
     public long getMaxTimeStamp() {
@@ -205,22 +192,17 @@ public class StatisticsCollector {
         maxTimeStamp = Math.max(maxTimeStamp, timestamp);
     }
     
+    @SuppressWarnings("deprecation")
     public void updateStatistic(KeyValue kv) {
+        ImmutableBytesPtr cfKey = new ImmutableBytesPtr(kv.getBuffer(), kv.getFamilyOffset(),
kv.getFamilyLength());
+        familyMap.put(cfKey, true);
+        
         maxTimeStamp = Math.max(maxTimeStamp, kv.getTimestamp());
-
-        Pair<Long,GuidePostsInfo> gps;
-        if (cachedGps == null) {
-            ImmutableBytesPtr cfKey = new ImmutableBytesPtr(kv.getFamilyArray(), kv.getFamilyOffset(),
kv.getFamilyLength());
-            familyMap.put(cfKey, true);
-
-            // TODO : This can be moved to an interface so that we could collect guide posts
in different ways
-            gps = guidePostsMap.get(cfKey);
-            if (gps == null) {
-                gps = new Pair<Long,GuidePostsInfo>(0L,new GuidePostsInfo(0, Collections.<byte[]>emptyList()));
-                guidePostsMap.put(cfKey, gps);
-            }
-        } else {
-            gps = cachedGps;
+        // TODO : This can be moved to an interface so that we could collect guide posts
in different ways
+        Pair<Long,GuidePostsInfo> gps = guidePostsMap.get(cfKey);
+        if (gps == null) {
+            gps = new Pair<Long,GuidePostsInfo>(0L,new GuidePostsInfo(0, Collections.<byte[]>emptyList()));
+            guidePostsMap.put(cfKey, gps);
         }
         int kvLength = kv.getLength();
         long byteCount = gps.getFirst() + kvLength;


Mime
View raw message