Repository: phoenix Updated Branches: refs/heads/3.0 401931872 -> c1da4c9f2 refs/heads/4.0 0585ba4e4 -> 198d749df refs/heads/master edf5ec27c -> 3fa1ddccf
PHOENIX-1496 Further reduce work in StatsCollector. Project: http://git-wip-us.apache.org/repos/asf/phoenix/repo Commit: http://git-wip-us.apache.org/repos/asf/phoenix/commit/3fa1ddcc Tree: http://git-wip-us.apache.org/repos/asf/phoenix/tree/3fa1ddcc Diff: http://git-wip-us.apache.org/repos/asf/phoenix/diff/3fa1ddcc Branch: refs/heads/master Commit: 3fa1ddccf782e8b708c3d1f13d7046fd8b511dce Parents: edf5ec2 Author: Lars Hofhansl <[email protected]> Authored: Mon Dec 1 20:44:01 2014 -0800 Committer: Lars Hofhansl <[email protected]> Committed: Mon Dec 1 20:44:01 2014 -0800 ---------------------------------------------------------------------- .../UngroupedAggregateRegionObserver.java | 4 ++- .../schema/stats/StatisticsCollector.java | 36 +++++++++++++++----- 2 files changed, 30 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/phoenix/blob/3fa1ddcc/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 e0ff5b3..ff05dad 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,7 +466,9 @@ 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); + StatisticsCollector stats = new StatisticsCollector( + c.getEnvironment(), table.getNameAsString(), + clientTimeStamp, store.getFamily().getName()); 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/3fa1ddcc/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 4123ebe..619684a 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,8 +65,13 @@ 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); @@ -76,6 +81,14 @@ 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() { @@ -192,17 +205,22 @@ 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()); - // 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); + + 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; } int kvLength = kv.getLength(); long byteCount = gps.getFirst() + kvLength;
