Added missing set sampling

pelly-ryu · Jan 27, 2017 · c7167d5 · c7167d5
1 parent 3bb4c0b
commit c7167d5
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 18 deletions.
diff --git a/hollow/src/main/java/com/netflix/hollow/api/sampling/HollowSetSampler.java b/hollow/src/main/java/com/netflix/hollow/api/sampling/HollowSetSampler.java
@@ -32,9 +32,8 @@ public class HollowSetSampler implements HollowSampler {
     private HollowSamplingDirector director;
 
     private long sizeSamples;
-    private long containsSamples;
+    private long getSamples;
     private long iteratorSamples;
-    private long bucketRetrievalSamples;
 
     public HollowSetSampler(String typeName, HollowSamplingDirector director) {
         this.typeName = typeName;
@@ -58,9 +57,9 @@ public void setUpdateThread(Thread t) {
         director.setUpdateThread(t);
     }
 
-    public void recordContains() {
+    public void recordGet() {
         if(director.shouldRecord())
-            containsSamples++;
+            getSamples++;
     }
 
     public void recordSize() {
@@ -73,32 +72,25 @@ public void recordIterator() {
             iteratorSamples++;
     }
 
-    public void recordBucketRetrieval() {
-        if(director.shouldRecord())
-            bucketRetrievalSamples++;
-    }
-
     @Override
     public boolean hasSampleResults() {
-        return sizeSamples > 0 || containsSamples > 0 || iteratorSamples > 0 || bucketRetrievalSamples > 0;
+        return sizeSamples > 0 || getSamples > 0 || iteratorSamples > 0;
     }
 
     @Override
     public Collection<SampleResult> getSampleResults() {
         List<SampleResult> results = new ArrayList<SampleResult>(3);
         results.add(new SampleResult(typeName + ".size()", sizeSamples));
-        results.add(new SampleResult(typeName + ".contains()", containsSamples));
+        results.add(new SampleResult(typeName + ".get()", getSamples));
         results.add(new SampleResult(typeName + ".iterator()", iteratorSamples));
-        results.add(new SampleResult(typeName + ".bucketValue()", bucketRetrievalSamples));
         return results;
     }
 
     @Override
     public void reset() {
         sizeSamples = 0;
-        containsSamples = 0;
+        getSamples = 0;
         iteratorSamples = 0;
-        bucketRetrievalSamples = 0;
     }
 
 }
diff --git a/hollow/src/main/java/com/netflix/hollow/core/read/engine/set/HollowSetTypeReadState.java b/hollow/src/main/java/com/netflix/hollow/core/read/engine/set/HollowSetTypeReadState.java
@@ -134,6 +134,7 @@ public int maxOrdinal() {
 
     @Override
     public int size(int ordinal) {
+        sampler.recordSize();
         return shards[ordinal & shardNumberMask].size(ordinal >> shardOrdinalShift);
     }
 
@@ -144,11 +145,14 @@ public boolean contains(int ordinal, int value) {
 
     @Override
     public boolean contains(int ordinal, int value, int hashCode) {
+        sampler.recordGet();
         return shards[ordinal & shardNumberMask].contains(ordinal >> shardOrdinalShift, value, hashCode);
     }
 
     @Override
     public int findElement(int ordinal, Object... hashKey) {
+        sampler.recordGet();
+
         if(keyDeriver == null)
             return -1;
 
@@ -168,13 +172,15 @@ public int relativeBucketValue(int setOrdinal, int bucketIndex) {
 
     @Override
     public HollowOrdinalIterator potentialMatchOrdinalIterator(int ordinal, int hashCode) {
+        sampler.recordGet();
         if(size(ordinal) == 0)
             return EmptyOrdinalIterator.INSTANCE;
         return new PotentialMatchHollowSetOrdinalIterator(ordinal, this, hashCode);
     }
 
     @Override
     public HollowOrdinalIterator ordinalIterator(int ordinal) {
+        sampler.recordIterator();
         if(size(ordinal) == 0)
             return EmptyOrdinalIterator.INSTANCE;
         return new HollowSetOrdinalIterator(ordinal, this);

diff --git a/hollow/src/main/java/com/netflix/hollow/tools/history/HollowHistoricalSetDataAccess.java b/hollow/src/main/java/com/netflix/hollow/tools/history/HollowHistoricalSetDataAccess.java
@@ -54,7 +54,7 @@ public int size(int ordinal) {
 
     @Override
     public boolean contains(int ordinal, int value) {
-        sampler().recordContains();
+        sampler().recordGet();
         recordStackTrace();
 
         if(!ordinalIsPresent(ordinal))
@@ -64,7 +64,7 @@ public boolean contains(int ordinal, int value) {
 
     @Override
     public int findElement(int ordinal, Object... hashKey) {
-        sampler().recordContains();
+        sampler().recordGet();
         recordStackTrace();
 
         if(keyMatcher == null)
@@ -96,7 +96,7 @@ public int findElement(int ordinal, Object... hashKey) {
 
     @Override
     public boolean contains(int ordinal, int value, int hashCode) {
-        sampler().recordContains();
+        sampler().recordGet();
         recordStackTrace();
 
         if(!ordinalIsPresent(ordinal))
@@ -106,7 +106,6 @@ public boolean contains(int ordinal, int value, int hashCode) {
 
     @Override
     public int relativeBucketValue(int ordinal, int bucketIndex) {
-        sampler().recordBucketRetrieval();
         recordStackTrace();
 
         if(!ordinalIsPresent(ordinal))