Repository: accumulo Updated Branches: refs/heads/1.5 07422efc5 -> 901d60ef1 refs/heads/1.6 3bf46661e -> 9ca1ff02e refs/heads/master 44e2b2cdf -> 392d9d6a4
http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bc67602/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java ---------------------------------------------------------------------- diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java index 56a3989..f6d256a 100644 --- a/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java +++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/CountSampler.java @@ -24,7 +24,7 @@ public class CountSampler extends org.htrace.impl.CountSampler implements Sample public CountSampler(long frequency) { super(frequency); } - + @Override public boolean next() { return super.next(null); http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bc67602/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java ---------------------------------------------------------------------- diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java index 94e5e67..9563f8f 100644 --- a/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java +++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/Sampler.java @@ -21,7 +21,7 @@ package org.apache.accumulo.trace.instrument; */ @Deprecated public interface Sampler extends org.htrace.Sampler<Object> { - + boolean next(); - + } http://git-wip-us.apache.org/repos/asf/accumulo/blob/6bc67602/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java ---------------------------------------------------------------------- diff --git a/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java b/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java index 7c0e8bc..dbd8882 100644 --- a/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java +++ b/trace/src/main/java/org/apache/accumulo/trace/instrument/Span.java @@ -75,7 +75,7 @@ public class Span extends org.apache.accumulo.core.trace.Span implements Cloudtr } @Override - public Map<String, String> getData() { + public Map<String,String> getData() { Map<byte[],byte[]> data = span.getKVAnnotations(); HashMap<String,String> stringData = new HashMap<>(); for (Entry<byte[],byte[]> d : data.entrySet()) {
