You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2015/08/24 21:56:44 UTC
svn commit: r1697496 - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/codecs/blocktree/
lucene/core/src/java/org/apache/lucene/codecs/compressing/
lucene/core/src/java/org/apache/lucene/index/ lucene/c...
Author: cpoerschke
Date: Mon Aug 24 19:56:43 2015
New Revision: 1697496
URL: http://svn.apache.org/r1697496
Log:
LUCENE-6571: fix some private access level javadoc errors and warnings (merge in revision 1697491 from trunk)
Modified:
lucene/dev/branches/branch_5x/ (props changed)
lucene/dev/branches/branch_5x/lucene/ (props changed)
lucene/dev/branches/branch_5x/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/branch_5x/lucene/core/ (props changed)
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/blocktree/AutoPrefixTermsWriter.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/TermScorer.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/FST.java
lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/Packed64.java
Modified: lucene/dev/branches/branch_5x/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/CHANGES.txt?rev=1697496&r1=1697495&r2=1697496&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/branch_5x/lucene/CHANGES.txt Mon Aug 24 19:56:43 2015
@@ -55,6 +55,9 @@ Other
* LUCENE-6755: more tests of ToChildBlockJoinScorer.advance (hossman)
+* LUCENE-6571: fix some private access level javadoc errors and warnings
+ (Cao Manh Dat, Christine Poerschke)
+
Build
* LUCENE-6732: Improve checker for invalid source patterns to also
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/blocktree/AutoPrefixTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/blocktree/AutoPrefixTermsWriter.java?rev=1697496&r1=1697495&r2=1697496&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/blocktree/AutoPrefixTermsWriter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/blocktree/AutoPrefixTermsWriter.java Mon Aug 24 19:56:43 2015
@@ -40,7 +40,7 @@ import org.apache.lucene.util.StringHelp
/** Used in the first pass when writing a segment to locate
* "appropriate" auto-prefix terms to pre-compile into the index.
* This visits every term in the index to find prefixes that
- * match >= min and <= max number of terms. */
+ * match {@code >= min} and {@code <= max} number of terms. */
class AutoPrefixTermsWriter {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java?rev=1697496&r1=1697495&r2=1697496&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/codecs/compressing/CompressingStoredFieldsWriter.java Mon Aug 24 19:56:43 2015
@@ -341,7 +341,6 @@ public final class CompressingStoredFiel
* <li>Bytes --> Potential additional bytes to read depending on the
* header.
* </ul>
- * <p>
*/
static void writeZFloat(DataOutput out, float f) throws IOException {
int intVal = (int) f;
@@ -380,7 +379,6 @@ public final class CompressingStoredFiel
* <li>Bytes --> Potential additional bytes to read depending on the
* header.
* </ul>
- * <p>
*/
static void writeZDouble(DataOutput out, double d) throws IOException {
int intVal = (int) d;
@@ -431,7 +429,6 @@ public final class CompressingStoredFiel
* <li>Bytes --> Potential additional bytes to read depending on the
* header.
* </ul>
- * <p>
*/
// T for "timestamp"
static void writeTLong(DataOutput out, long l) throws IOException {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java?rev=1697496&r1=1697495&r2=1697496&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexWriterConfig.java Mon Aug 24 19:56:43 2015
@@ -286,7 +286,6 @@ public final class IndexWriterConfig ext
/** Expert: Sets the {@link DocumentsWriterPerThreadPool} instance used by the
* IndexWriter to assign thread-states to incoming indexing threads.
- * </p>
* <p>
* NOTE: The given {@link DocumentsWriterPerThreadPool} instance must not be used with
* other {@link IndexWriter} instances once it has been initialized / associated with an
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/TermScorer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/TermScorer.java?rev=1697496&r1=1697495&r2=1697496&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/TermScorer.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/TermScorer.java Mon Aug 24 19:56:43 2015
@@ -36,7 +36,7 @@ final class TermScorer extends Scorer {
* @param td
* An iterator over the documents matching the <code>Term</code>.
* @param docScorer
- * The </code>Similarity.SimScorer</code> implementation
+ * The <code>Similarity.SimScorer</code> implementation
* to be used for score computations.
*/
TermScorer(Weight weight, PostingsEnum td, Similarity.SimScorer docScorer) {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/FST.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/FST.java?rev=1697496&r1=1697495&r2=1697496&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/FST.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/FST.java Mon Aug 24 19:56:43 2015
@@ -43,7 +43,6 @@ import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.Constants;
import org.apache.lucene.util.PriorityQueue;
import org.apache.lucene.util.RamUsageEstimator;
-import org.apache.lucene.util.fst.Builder.UnCompiledNode;
import org.apache.lucene.util.packed.GrowableWriter;
import org.apache.lucene.util.packed.PackedInts;
@@ -104,17 +103,17 @@ public final class FST<T> implements Acc
private static final byte ARCS_AS_FIXED_ARRAY = BIT_ARC_HAS_FINAL_OUTPUT;
/**
- * @see #shouldExpand(Builder, UnCompiledNode)
+ * @see #shouldExpand(Builder, Builder.UnCompiledNode)
*/
static final int FIXED_ARRAY_SHALLOW_DISTANCE = 3; // 0 => only root node.
/**
- * @see #shouldExpand(Builder, UnCompiledNode)
+ * @see #shouldExpand(Builder, Builder.UnCompiledNode)
*/
static final int FIXED_ARRAY_NUM_ARCS_SHALLOW = 5;
/**
- * @see #shouldExpand(Builder, UnCompiledNode)
+ * @see #shouldExpand(Builder, Builder.UnCompiledNode)
*/
static final int FIXED_ARRAY_NUM_ARCS_DEEP = 10;
@@ -1332,7 +1331,7 @@ public final class FST<T> implements Acc
* @see #FIXED_ARRAY_NUM_ARCS_DEEP
* @see Builder.UnCompiledNode#depth
*/
- private boolean shouldExpand(Builder<T> builder, UnCompiledNode<T> node) {
+ private boolean shouldExpand(Builder<T> builder, Builder.UnCompiledNode<T> node) {
return builder.allowArrayArcs &&
((node.depth <= FIXED_ARRAY_SHALLOW_DISTANCE && node.numArcs >= FIXED_ARRAY_NUM_ARCS_SHALLOW) ||
node.numArcs >= FIXED_ARRAY_NUM_ARCS_DEEP);
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/Packed64.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/Packed64.java?rev=1697496&r1=1697495&r2=1697496&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/Packed64.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/Packed64.java Mon Aug 24 19:56:43 2015
@@ -26,11 +26,11 @@ import org.apache.lucene.util.RamUsageEs
/**
* Space optimized random access capable array of values with a fixed number of
* bits/value. Values are packed contiguously.
- * </p><p>
+ * <p>
* The implementation strives to perform af fast as possible under the
* constraint of contiguous bits, by avoiding expensive operations. This comes
* at the cost of code clarity.
- * </p><p>
+ * <p>
* Technical details: This implementation is a refinement of a non-branching
* version. The non-branching get and set methods meant that 2 or 4 atomics in
* the underlying array were always accessed, even for the cases where only