Repository: accumulo Updated Branches: refs/heads/master 437d46455 -> 190f572b8
ACCUMULO-4501 ACCUMULO-4463 Fix javadocs Fix broken javadocs introduced by several recent issues. Improve old javadoc greater-than and less-than escaping. Project: http://git-wip-us.apache.org/repos/asf/accumulo/repo Commit: http://git-wip-us.apache.org/repos/asf/accumulo/commit/190f572b Tree: http://git-wip-us.apache.org/repos/asf/accumulo/tree/190f572b Diff: http://git-wip-us.apache.org/repos/asf/accumulo/diff/190f572b Branch: refs/heads/master Commit: 190f572b81893051255b776d8d7ebc08ccb45d4b Parents: 437d464 Author: Christopher Tubbs <[email protected]> Authored: Wed May 24 14:19:41 2017 -0400 Committer: Christopher Tubbs <[email protected]> Committed: Wed May 24 14:19:41 2017 -0400 ---------------------------------------------------------------------- .../org/apache/accumulo/core/client/rfile/RFileWriter.java | 6 +++--- .../org/apache/accumulo/core/client/summary/Summarizer.java | 3 ++- .../apache/accumulo/core/file/blockfile/cache/CachedBlock.java | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/accumulo/blob/190f572b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriter.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriter.java b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriter.java index 9ae7fb0..fa6deee 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriter.java +++ b/core/src/main/java/org/apache/accumulo/core/client/rfile/RFileWriter.java @@ -55,9 +55,9 @@ import com.google.common.base.Preconditions; * * <pre> * <code> - * {@code Iterable<Entry<Key, Value>>} localityGroup1Data = ... - * {@code Iterable<Entry<Key, Value>>} localityGroup2Data = ... - * {@code Iterable<Entry<Key, Value>>} defaultGroupData = ... + * Iterable<Entry<Key, Value>> localityGroup1Data = ... + * Iterable<Entry<Key, Value>> localityGroup2Data = ... + * Iterable<Entry<Key, Value>> defaultGroupData = ... * * try(RFileWriter writer = RFile.newWriter().to(file).build()) { * http://git-wip-us.apache.org/repos/asf/accumulo/blob/190f572b/core/src/main/java/org/apache/accumulo/core/client/summary/Summarizer.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/client/summary/Summarizer.java b/core/src/main/java/org/apache/accumulo/core/client/summary/Summarizer.java index fdb194b..0850818 100644 --- a/core/src/main/java/org/apache/accumulo/core/client/summary/Summarizer.java +++ b/core/src/main/java/org/apache/accumulo/core/client/summary/Summarizer.java @@ -23,6 +23,7 @@ import org.apache.accumulo.core.client.admin.TableOperations; import org.apache.accumulo.core.client.rfile.RFile; import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Value; + //checkstyle and the formatter are in conflict, so turn off the formatter //@formatter:off /** @@ -170,7 +171,7 @@ public interface Summarizer { /** * When Accumulo calls methods in this interface, it will call {@link #accept(Key, Value)} zero or more times and then call - * {@link #summarize(Summarizer.StatisticConsumer)} once. After calling {@link #summarize(Summarizer.StatisticConsumer)}, it will not use the collector again. + * {@link #summarize(StatisticConsumer)} once. After calling {@link #summarize(StatisticConsumer)}, it will not use the collector again. * * @since 2.0.0 */ http://git-wip-us.apache.org/repos/asf/accumulo/blob/190f572b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java index 44cea6b..25c5c95 100644 --- a/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java +++ b/core/src/main/java/org/apache/accumulo/core/file/blockfile/cache/CachedBlock.java @@ -20,7 +20,7 @@ package org.apache.accumulo.core.file.blockfile.cache; import java.util.Objects; /** - * Represents an entry in the {@link LruBlockCache}. + * Represents an entry in the configurable block cache. * * <p> * Makes the block memory-aware with {@link HeapSize} and Comparable to sort by access time for the LRU. It also takes care of priority by either instantiating
