You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/11/28 02:24:53 UTC
svn commit: r1642252 [2/3] - in /lucene/dev/branches/branch_5x: ./ lucene/
lucene/analysis/
lucene/analysis/common/src/java/org/apache/lucene/analysis/br/
lucene/analysis/common/src/java/org/apache/lucene/analysis/cjk/
lucene/analysis/common/src/java/o...
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/AutomatonTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/AutomatonTermsEnum.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/AutomatonTermsEnum.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/AutomatonTermsEnum.java Fri Nov 28 01:24:49 2014
@@ -305,7 +305,7 @@ class AutomatonTermsEnum extends Filtere
* can match.
*
* @param position current position in the input String
- * @return position >=0 if more possible solutions exist for the DFA
+ * @return {@code position >= 0} if more possible solutions exist for the DFA
*/
private int backtrack(int position) {
while (position-- > 0) {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java Fri Nov 28 01:24:49 2014
@@ -162,7 +162,7 @@ public class ConcurrentMergeScheduler ex
};
/**
- * Called whenever the running merges have changed, to pause & unpause
+ * Called whenever the running merges have changed, to pause and unpause
* threads. This method sorts the merge threads by their merge size in
* descending order and then pauses/unpauses threads from first to last --
* that way, smaller merges are guaranteed to run before larger ones.
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/DocValuesType.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/DocValuesType.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/DocValuesType.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/DocValuesType.java Fri Nov 28 01:24:49 2014
@@ -40,7 +40,7 @@ public enum DocValuesType {
* A pre-sorted byte[]. Fields with this type only store distinct byte values
* and store an additional offset pointer per document to dereference the shared
* byte[]. The stored byte[] is presorted and allows access via document id,
- * ordinal and by-value. Values must be <= 32766 bytes.
+ * ordinal and by-value. Values must be {@code <= 32766} bytes.
*/
SORTED,
/**
@@ -52,7 +52,7 @@ public enum DocValuesType {
* A pre-sorted Set<byte[]>. Fields with this type only store distinct byte values
* and store additional offset pointers per document to dereference the shared
* byte[]s. The stored byte[] is presorted and allows access via document id,
- * ordinal and by-value. Values must be <= 32766 bytes.
+ * ordinal and by-value. Values must be {@code <= 32766} bytes.
*/
SORTED_SET,
}
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushQueue.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushQueue.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushQueue.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushQueue.java Fri Nov 28 01:24:49 2014
@@ -178,7 +178,7 @@ class DocumentsWriterFlushQueue {
/**
* Publishes the flushed segment, segment private deletes (if any) and its
* associated global delete (if present) to IndexWriter. The actual
- * publishing operation is synced on IW -> BDS so that the {@link SegmentInfo}'s
+ * publishing operation is synced on {@code IW -> BDS} so that the {@link SegmentInfo}'s
* delete generation is always GlobalPacket_deleteGeneration + 1
*/
protected final void publishFlushedSegment(IndexWriter indexWriter, FlushedSegment newSegment, FrozenBufferedUpdates globalPacket)
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FlushByRamOrCountsPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FlushByRamOrCountsPolicy.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FlushByRamOrCountsPolicy.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/FlushByRamOrCountsPolicy.java Fri Nov 28 01:24:49 2014
@@ -53,7 +53,7 @@ import org.apache.lucene.index.Documents
* <p>
* If {@link IndexWriterConfig#setRAMBufferSizeMB(double)} is enabled, the
* largest ram consuming {@link DocumentsWriterPerThread} will be marked as
- * pending iff the global active RAM consumption is >= the configured max RAM
+ * pending iff the global active RAM consumption is {@code >=} the configured max RAM
* buffer.
*/
class FlushByRamOrCountsPolicy extends FlushPolicy {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexCommit.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexCommit.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexCommit.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexCommit.java Fri Nov 28 01:24:49 2014
@@ -108,7 +108,7 @@ public abstract class IndexCommit implem
/** Returns userData, previously passed to {@link
* IndexWriter#setCommitData(Map)} for this commit. Map is
- * String -> String. */
+ * {@code String -> String}. */
public abstract Map<String,String> getUserData() throws IOException;
@Override
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexFileNames.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexFileNames.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexFileNames.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexFileNames.java Fri Nov 28 01:24:49 2014
@@ -56,7 +56,7 @@ public final class IndexFileNames {
/**
* Computes the full file name from base, extension and generation. If the
* generation is -1, the file name is null. If it's 0, the file name is
- * <base>.<ext>. If it's > 0, the file name is
+ * <base>.<ext>. If it's > 0, the file name is
* <base>_<gen>.<ext>.<br>
* <b>NOTE:</b> .<ext> is added to the name only if <code>ext</code> is
* not an empty string.
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Fri Nov 28 01:24:49 2014
@@ -1580,8 +1580,8 @@ public class IndexWriter implements Clos
final InfoStream infoStream;
/**
- * Forces merge policy to merge segments until there are <=
- * maxNumSegments. The actual merges to be
+ * Forces merge policy to merge segments until there are
+ * {@code <= maxNumSegments}. The actual merges to be
* executed are determined by the {@link MergePolicy}.
*
* <p>This is a horribly costly operation, especially when
@@ -1600,7 +1600,7 @@ public class IndexWriter implements Clos
* afterwards, to allow IndexWriter to free up disk space.</p>
*
* <p>If some but not all readers re-open while merging
- * is underway, this will cause > 2X temporary
+ * is underway, this will cause {@code > 2X} temporary
* space to be consumed as those new readers will then
* hold open the temporary segments at that time. It is
* best not to re-open readers while merging is running.</p>
@@ -2823,7 +2823,7 @@ public class IndexWriter implements Clos
private final Object commitLock = new Object();
/**
- * <p>Commits all pending changes (added & deleted
+ * <p>Commits all pending changes (added and deleted
* documents, segment merges, added
* indexes, etc.) to the index, and syncs all referenced
* index files, such that a reader will see the changes
@@ -2835,7 +2835,7 @@ public class IndexWriter implements Clos
*
* <p> Note that this operation calls Directory.sync on
* the index files. That call should not return until the
- * file contents & metadata are on stable storage. For
+ * file contents and metadata are on stable storage. For
* FSDirectory, this calls the OS's fsync. But, beware:
* some hardware devices may in fact cache writes even
* during fsync, and return before the bits are actually
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/LogMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/LogMergePolicy.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/LogMergePolicy.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/LogMergePolicy.java Fri Nov 28 01:24:49 2014
@@ -60,7 +60,7 @@ public abstract class LogMergePolicy ext
* or larger will never be merged. @see setMaxMergeDocs */
public static final int DEFAULT_MAX_MERGE_DOCS = Integer.MAX_VALUE;
- /** Default noCFSRatio. If a merge's size is >= 10% of
+ /** Default noCFSRatio. If a merge's size is {@code >= 10%} of
* the index, then we disable compound file for it.
* @see MergePolicy#setNoCFSRatio */
public static final double DEFAULT_NO_CFS_RATIO = 0.1;
@@ -124,8 +124,8 @@ public abstract class LogMergePolicy ext
* faster, but indexing speed is slower. With larger
* values, more RAM is used during indexing, and while
* searches is slower, indexing is
- * faster. Thus larger values (> 10) are best for batch
- * index creation, and smaller values (< 10) for indices
+ * faster. Thus larger values ({@code > 10}) are best for batch
+ * index creation, and smaller values ({@code < 10}) for indices
* that are interactively maintained. */
public void setMergeFactor(int mergeFactor) {
if (mergeFactor < 2)
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java Fri Nov 28 01:24:49 2014
@@ -420,7 +420,7 @@ public abstract class MergePolicy {
/**
* Determine what set of merge operations is necessary in
- * order to merge to <= the specified segment count. {@link IndexWriter} calls this when its
+ * order to merge to {@code <=} the specified segment count. {@link IndexWriter} calls this when its
* {@link IndexWriter#forceMerge} method is called. This call is always
* synchronized on the {@link IndexWriter} instance so only one thread at a
* time will call this method.
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/MultiFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/MultiFields.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/MultiFields.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/MultiFields.java Fri Nov 28 01:24:49 2014
@@ -120,14 +120,14 @@ public final class MultiFields extends F
return getFields(r).terms(field);
}
- /** Returns {@link DocsEnum} for the specified field &
+ /** Returns {@link DocsEnum} for the specified field and
* term. This will return null if the field or term does
* not exist. */
public static DocsEnum getTermDocsEnum(IndexReader r, Bits liveDocs, String field, BytesRef term) throws IOException {
return getTermDocsEnum(r, liveDocs, field, term, DocsEnum.FLAG_FREQS);
}
- /** Returns {@link DocsEnum} for the specified field &
+ /** Returns {@link DocsEnum} for the specified field and
* term, with control over whether freqs are required.
* Some codecs may be able to optimize their
* implementation when freqs are not required. This will
@@ -147,7 +147,7 @@ public final class MultiFields extends F
}
/** Returns {@link DocsAndPositionsEnum} for the specified
- * field & term. This will return null if the field or
+ * field and term. This will return null if the field or
* term does not exist or positions were not indexed.
* @see #getTermPositionsEnum(IndexReader, Bits, String, BytesRef, int) */
public static DocsAndPositionsEnum getTermPositionsEnum(IndexReader r, Bits liveDocs, String field, BytesRef term) throws IOException {
@@ -155,7 +155,7 @@ public final class MultiFields extends F
}
/** Returns {@link DocsAndPositionsEnum} for the specified
- * field & term, with control over whether offsets and payloads are
+ * field and term, with control over whether offsets and payloads are
* required. Some codecs may be able to optimize
* their implementation when offsets and/or payloads are not
* required. This will return null if the field or term does not
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java Fri Nov 28 01:24:49 2014
@@ -738,7 +738,7 @@ public final class SegmentInfos implemen
return dest;
}
- /** Writes & syncs to the Directory dir, taking care to
+ /** Writes and syncs to the Directory dir, taking care to
* remove the segments file on exception
* <p>
* Note: {@link #changed()} should be called prior to this
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SortedDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SortedDocValues.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SortedDocValues.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/SortedDocValues.java Fri Nov 28 01:24:49 2014
@@ -46,7 +46,7 @@ public abstract class SortedDocValues ex
* {@link BytesRef} may be re-used across calls to {@link #lookupOrd(int)}
* so make sure to {@link BytesRef#deepCopyOf(BytesRef) copy it} if you want
* to keep it around.
- * @param ord ordinal to lookup (must be >= 0 and < {@link #getValueCount()})
+ * @param ord ordinal to lookup (must be >= 0 and < {@link #getValueCount()})
* @see #getOrd(int)
*/
public abstract BytesRef lookupOrd(int ord);
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/Terms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/Terms.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/Terms.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/Terms.java Fri Nov 28 01:24:49 2014
@@ -46,7 +46,7 @@ public abstract class Terms {
* are accepted by the provided {@link
* CompiledAutomaton}. If the <code>startTerm</code> is
* provided then the returned enum will only accept terms
- * > <code>startTerm</code>, but you still must call
+ * {@code > startTerm}, but you still must call
* next() first to get to the first term. Note that the
* provided <code>startTerm</code> must be accepted by
* the automaton.
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/TermsHashPerField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/TermsHashPerField.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/TermsHashPerField.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/TermsHashPerField.java Fri Nov 28 01:24:49 2014
@@ -91,7 +91,7 @@ abstract class TermsHashPerField impleme
int[] sortedTermIDs;
- /** Collapse the hash table & sort in-place; also sets
+ /** Collapse the hash table and sort in-place; also sets
* this.sortedTermIDs to the results */
public int[] sortPostings() {
sortedTermIDs = bytesHash.sort(BytesRef.getUTF8SortedAsUnicodeComparator());
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java Fri Nov 28 01:24:49 2014
@@ -73,7 +73,7 @@ import java.util.Map;
// maybe CMS should do so)
public class TieredMergePolicy extends MergePolicy {
- /** Default noCFSRatio. If a merge's size is >= 10% of
+ /** Default noCFSRatio. If a merge's size is {@code >= 10%} of
* the index, then we disable compound file for it.
* @see MergePolicy#setNoCFSRatio */
public static final double DEFAULT_NO_CFS_RATIO = 0.1;
@@ -215,7 +215,7 @@ public class TieredMergePolicy extends M
/** Sets the allowed number of segments per tier. Smaller
* values mean more merging but fewer segments.
*
- * <p><b>NOTE</b>: this value should be >= the {@link
+ * <p><b>NOTE</b>: this value should be {@code >=} the {@link
* #setMaxMergeAtOnce} otherwise you'll force too much
* merging to occur.</p>
*
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/FieldComparator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/FieldComparator.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/FieldComparator.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/FieldComparator.java Fri Nov 28 01:24:49 2014
@@ -98,9 +98,9 @@ public abstract class FieldComparator<T>
*
* @param slot1 first slot to compare
* @param slot2 second slot to compare
- * @return any N < 0 if slot2's value is sorted after
- * slot1, any N > 0 if the slot2's value is sorted before
- * slot1 and 0 if they are equal
+ * @return any {@code N < 0} if slot2's value is sorted after
+ * slot1, any {@code N > 0} if the slot2's value is sorted before
+ * slot1 and {@code 0} if they are equal
*/
public abstract int compare(int slot1, int slot2);
@@ -134,9 +134,9 @@ public abstract class FieldComparator<T>
* frequently).</p>
*
* @param doc that was hit
- * @return any N < 0 if the doc's value is sorted after
- * the bottom entry (not competitive), any N > 0 if the
- * doc's value is sorted before the bottom entry and 0 if
+ * @return any {@code N < 0} if the doc's value is sorted after
+ * the bottom entry (not competitive), any {@code N > 0} if the
+ * doc's value is sorted before the bottom entry and {@code 0} if
* they are equal.
*/
public abstract int compareBottom(int doc) throws IOException;
@@ -150,9 +150,9 @@ public abstract class FieldComparator<T>
* use searchAfter (deep paging).
*
* @param doc that was hit
- * @return any N < 0 if the doc's value is sorted after
- * the bottom entry (not competitive), any N > 0 if the
- * doc's value is sorted before the bottom entry and 0 if
+ * @return any {@code N < 0} if the doc's value is sorted after
+ * the bottom entry (not competitive), any {@code N > 0} if the
+ * doc's value is sorted before the bottom entry and {@code 0} if
* they are equal.
*/
public abstract int compareTop(int doc) throws IOException;
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/FuzzyQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/FuzzyQuery.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/FuzzyQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/FuzzyQuery.java Fri Nov 28 01:24:49 2014
@@ -71,7 +71,7 @@ public class FuzzyQuery extends MultiTer
* of that length is also required.
*
* @param term the term to search for
- * @param maxEdits must be >= 0 and <= {@link LevenshteinAutomata#MAXIMUM_SUPPORTED_DISTANCE}.
+ * @param maxEdits must be {@code >= 0} and {@code <=} {@link LevenshteinAutomata#MAXIMUM_SUPPORTED_DISTANCE}.
* @param prefixLength length of common (non-fuzzy) prefix
* @param maxExpansions the maximum number of terms to match. If this number is
* greater than {@link BooleanQuery#getMaxClauseCount} when the query is rewritten,
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/LiveFieldValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/LiveFieldValues.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/LiveFieldValues.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/LiveFieldValues.java Fri Nov 28 01:24:49 2014
@@ -126,7 +126,7 @@ public abstract class LiveFieldValues<S,
}
}
- /** This is called when the id/value was already flushed & opened
+ /** This is called when the id/value was already flushed and opened
* in an NRT IndexSearcher. You must implement this to
* go look up the value (eg, via doc values, field cache,
* stored fields, etc.). */
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java Fri Nov 28 01:24:49 2014
@@ -94,8 +94,8 @@ public abstract class TopDocsCollector<T
}
/**
- * Returns the documents in the rage [start .. pq.size()) that were collected
- * by this collector. Note that if start >= pq.size(), an empty TopDocs is
+ * Returns the documents in the range [start .. pq.size()) that were collected
+ * by this collector. Note that if {@code start >= pq.size()}, an empty TopDocs is
* returned.<br>
* This method is convenient to call if the application always asks for the
* last results, starting from the last 'page'.<br>
@@ -113,8 +113,8 @@ public abstract class TopDocsCollector<T
}
/**
- * Returns the documents in the rage [start .. start+howMany) that were
- * collected by this collector. Note that if start >= pq.size(), an empty
+ * Returns the documents in the range [start .. start+howMany) that were
+ * collected by this collector. Note that if {@code start >= pq.size()}, an empty
* TopDocs is returned, and if pq.size() - start < howMany, then only the
* available documents in [start .. pq.size()) are returned.<br>
* This method is useful to call in case pagination of search results is
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/similarities/SimilarityBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/similarities/SimilarityBase.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/similarities/SimilarityBase.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/similarities/SimilarityBase.java Fri Nov 28 01:24:49 2014
@@ -216,7 +216,7 @@ public abstract class SimilarityBase ext
// ------------------------------ Norm handling ------------------------------
- /** Norm -> document length map. */
+ /** Norm to document length map. */
private static final float[] NORM_TABLE = new float[256];
static {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java Fri Nov 28 01:24:49 2014
@@ -80,17 +80,17 @@ import org.apache.lucene.util.BytesRef;
* of the weighted query vectors <i>V(q)</i> and <i>V(d)</i>:
*
* <br> <br>
- * <table cellpadding="2" cellspacing="2" border="0" align="center" style="width:auto">
+ * <table cellpadding="2" cellspacing="2" border="0" align="center" style="width:auto" summary="formatting only">
* <tr><td>
- * <table cellpadding="1" cellspacing="0" border="1" align="center">
+ * <table cellpadding="1" cellspacing="0" border="1" align="center" summary="formatting only">
* <tr><td>
- * <table cellpadding="2" cellspacing="2" border="0" align="center">
+ * <table cellpadding="2" cellspacing="2" border="0" align="center" summary="cosine similarity formula">
* <tr>
* <td valign="middle" align="right" rowspan="1">
* cosine-similarity(q,d) =
* </td>
* <td valign="middle" align="center">
- * <table>
+ * <table summary="cosine similarity formula">
* <tr><td align="center" style="text-align: center"><small>V(q) · V(d)</small></td></tr>
* <tr><td align="center" style="text-align: center">–––––––––</td></tr>
* <tr><td align="center" style="text-align: center"><small>|V(q)| |V(d)|</small></td></tr>
@@ -165,11 +165,11 @@ import org.apache.lucene.util.BytesRef;
* we get <i>Lucene's Conceptual scoring formula</i>:
*
* <br> <br>
- * <table cellpadding="2" cellspacing="2" border="0" align="center" style="width:auto">
+ * <table cellpadding="2" cellspacing="2" border="0" align="center" style="width:auto" summary="formatting only">
* <tr><td>
- * <table cellpadding="1" cellspacing="0" border="1" align="center">
+ * <table cellpadding="1" cellspacing="0" border="1" align="center" summary="formatting only">
* <tr><td>
- * <table cellpadding="2" cellspacing="2" border="0" align="center">
+ * <table cellpadding="2" cellspacing="2" border="0" align="center" summary="formatting only">
* <tr>
* <td valign="middle" align="right" rowspan="1">
* score(q,d) =
@@ -177,7 +177,7 @@ import org.apache.lucene.util.BytesRef;
* <font color="#CCCC00">query-boost(q)</font> ·
* </td>
* <td valign="middle" align="center">
- * <table>
+ * <table summary="Lucene conceptual scoring formula">
* <tr><td align="center" style="text-align: center"><small><font color="#993399">V(q) · V(d)</font></small></td></tr>
* <tr><td align="center" style="text-align: center">–––––––––</td></tr>
* <tr><td align="center" style="text-align: center"><small><font color="#FF33CC">|V(q)|</font></small></td></tr>
@@ -257,11 +257,11 @@ import org.apache.lucene.util.BytesRef;
* to those of the <i>conceptual</i> formula:
*
* <P>
- * <table cellpadding="2" cellspacing="2" border="0" align="center" style="width:auto">
+ * <table cellpadding="2" cellspacing="2" border="0" align="center" style="width:auto" summary="formatting only">
* <tr><td>
- * <table cellpadding="" cellspacing="2" border="2" align="center">
+ * <table cellpadding="" cellspacing="2" border="2" align="center" summary="formatting only">
* <tr><td>
- * <table cellpadding="2" cellspacing="2" border="0" align="center">
+ * <table cellpadding="2" cellspacing="2" border="0" align="center" summary="Lucene conceptual scoring formula">
* <tr>
* <td valign="middle" align="right" rowspan="1">
* score(q,d) =
@@ -310,7 +310,7 @@ import org.apache.lucene.util.BytesRef;
* {@link org.apache.lucene.search.similarities.DefaultSimilarity#tf(float) DefaultSimilarity} is:
*
* <br> <br>
- * <table cellpadding="2" cellspacing="2" border="0" align="center" style="width:auto">
+ * <table cellpadding="2" cellspacing="2" border="0" align="center" style="width:auto" summary="term frequency computation">
* <tr>
* <td valign="middle" align="right" rowspan="1">
* {@link org.apache.lucene.search.similarities.DefaultSimilarity#tf(float) tf(t in d)} =
@@ -335,7 +335,7 @@ import org.apache.lucene.util.BytesRef;
* {@link org.apache.lucene.search.similarities.DefaultSimilarity#idf(long, long) DefaultSimilarity} is:
*
* <br> <br>
- * <table cellpadding="2" cellspacing="2" border="0" align="center" style="width:auto">
+ * <table cellpadding="2" cellspacing="2" border="0" align="center" style="width:auto" summary="inverse document frequency computation">
* <tr>
* <td valign="middle" align="right">
* {@link org.apache.lucene.search.similarities.DefaultSimilarity#idf(long, long) idf(t)} =
@@ -344,7 +344,7 @@ import org.apache.lucene.util.BytesRef;
* 1 + log <big>(</big>
* </td>
* <td valign="middle" align="center">
- * <table>
+ * <table summary="inverse document frequency computation">
* <tr><td align="center" style="text-align: center"><small>numDocs</small></td></tr>
* <tr><td align="center" style="text-align: center">–––––––––</td></tr>
* <tr><td align="center" style="text-align: center"><small>docFreq+1</small></td></tr>
@@ -383,7 +383,7 @@ import org.apache.lucene.util.BytesRef;
* {@link org.apache.lucene.search.similarities.DefaultSimilarity#queryNorm(float) DefaultSimilarity}
* produces a <a href="http://en.wikipedia.org/wiki/Euclidean_norm#Euclidean_norm">Euclidean norm</a>:
* <br> <br>
- * <table cellpadding="1" cellspacing="0" border="0" align="center" style="width:auto">
+ * <table cellpadding="1" cellspacing="0" border="0" align="center" style="width:auto" summary="query normalization computation">
* <tr>
* <td valign="middle" align="right" rowspan="1">
* queryNorm(q) =
@@ -391,7 +391,7 @@ import org.apache.lucene.util.BytesRef;
* =
* </td>
* <td valign="middle" align="center" rowspan="1">
- * <table>
+ * <table summary="query normalization computation">
* <tr><td align="center" style="text-align: center"><big>1</big></td></tr>
* <tr><td align="center" style="text-align: center"><big>
* ––––––––––––––
@@ -409,7 +409,7 @@ import org.apache.lucene.util.BytesRef;
* computes this value as:
*
* <br> <br>
- * <table cellpadding="1" cellspacing="0" border="0" align="center" style="width:auto">
+ * <table cellpadding="1" cellspacing="0" border="0" align="center" style="width:auto" summary="sum of squared weights computation">
* <tr>
* <td valign="middle" align="right" rowspan="1">
* {@link org.apache.lucene.search.Weight#getValueForNormalization() sumOfSquaredWeights} =
@@ -475,7 +475,7 @@ import org.apache.lucene.util.BytesRef;
* If the document has multiple fields with the same name, all their boosts are multiplied together:
*
* <br> <br>
- * <table cellpadding="1" cellspacing="0" border="0" align="center" style="width:auto">
+ * <table cellpadding="1" cellspacing="0" border="0" align="center" style="width:auto" summary="index-time normalization">
* <tr>
* <td valign="middle" align="right" rowspan="1">
* norm(t,d) =
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/Spans.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/Spans.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/Spans.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/search/spans/Spans.java Fri Nov 28 01:24:49 2014
@@ -34,12 +34,13 @@ public abstract class Spans {
* <code> target ≤ current</code>, or after the iterator has exhausted.
* Both cases may result in unpredicted behavior.
* <p>Returns true iff there is such
- * a match. <p>Behaves as if written: <pre class="prettyprint">
+ * a match. <p>Behaves as if written:
+ * <pre class="prettyprint">
* boolean skipTo(int target) {
* do {
* if (!next())
* return false;
- * } while (target > doc());
+ * } while (target > doc());
* return true;
* }
* </pre>
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/DataOutput.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/DataOutput.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/DataOutput.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/DataOutput.java Fri Nov 28 01:24:49 2014
@@ -91,7 +91,7 @@ public abstract class DataOutput {
* resulting integer value. Thus values from zero to 127 may be stored in a single
* byte, values from 128 to 16,383 may be stored in two bytes, and so on.</p>
* <p>VByte Encoding Example</p>
- * <table cellspacing="0" cellpadding="2" border="0">
+ * <table cellspacing="0" cellpadding="2" border="0" summary="variable length encoding examples">
* <col width="64*">
* <col width="64*">
* <col width="64*">
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/LockStressTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/LockStressTest.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/LockStressTest.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/LockStressTest.java Fri Nov 28 01:24:49 2014
@@ -27,7 +27,7 @@ import java.nio.file.Paths;
import java.util.Random;
/**
- * Simple standalone tool that forever acquires & releases a
+ * Simple standalone tool that forever acquires and releases a
* lock using a specific LockFactory. Run without any args
* to see usage.
*
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/NRTCachingDirectory.java Fri Nov 28 01:24:49 2014
@@ -58,7 +58,7 @@ import org.apache.lucene.util.IOUtils;
* </pre>
*
* <p>This will cache all newly flushed segments, all merges
- * whose expected segment size is <= 5 MB, unless the net
+ * whose expected segment size is {@code <= 5 MB}, unless the net
* cached bytes exceeds 60 MB at which point all writes will
* not be cached (until the net bytes falls below 60 MB).</p>
*
@@ -77,9 +77,9 @@ public class NRTCachingDirectory extends
/**
* We will cache a newly created output if 1) it's a
- * flush or a merge and the estimated size of the merged segment is <=
- * maxMergeSizeMB, and 2) the total cached bytes is <=
- * maxCachedMB */
+ * flush or a merge and the estimated size of the merged segment is
+ * {@code <= maxMergeSizeMB}, and 2) the total cached bytes is
+ * {@code <= maxCachedMB} */
public NRTCachingDirectory(Directory delegate, double maxMergeSizeMB, double maxCachedMB) {
super(delegate);
maxMergeSizeBytes = (long) (maxMergeSizeMB*1024*1024);
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/RateLimiter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/RateLimiter.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/RateLimiter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/RateLimiter.java Fri Nov 28 01:24:49 2014
@@ -93,7 +93,7 @@ public abstract class RateLimiter {
/** Pauses, if necessary, to keep the instantaneous IO
* rate at or below the target. Be sure to only call
- * this method when bytes > {@link #getMinPauseCheckBytes},
+ * this method when bytes > {@link #getMinPauseCheckBytes},
* otherwise it will pause way too long!
*
* @return the pause time in nano seconds */
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/VerifyingLockFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/VerifyingLockFactory.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/VerifyingLockFactory.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/store/VerifyingLockFactory.java Fri Nov 28 01:24:49 2014
@@ -29,7 +29,7 @@ import java.io.OutputStream;
* external server ({@link LockVerifyServer}) to assert that
* at most one process holds the lock at a time. To use
* this, you should also run {@link LockVerifyServer} on the
- * host & port matching what you pass to the constructor.
+ * host and port matching what you pass to the constructor.
*
* @see LockVerifyServer
* @see LockStressTest
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/ArrayUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/ArrayUtil.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/ArrayUtil.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/ArrayUtil.java Fri Nov 28 01:24:49 2014
@@ -134,7 +134,7 @@ public final class ArrayUtil {
END APACHE HARMONY CODE
*/
- /** Returns an array size >= minTargetSize, generally
+ /** Returns an array size >= minTargetSize, generally
* over-allocating exponentially to achieve amortized
* linear-time cost as the array grows.
*
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/BitUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/BitUtil.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/BitUtil.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/BitUtil.java Fri Nov 28 01:24:49 2014
@@ -46,7 +46,7 @@ public final class BitUtil {
// packed inside a 32 bit integer (8 4 bit numbers). That
// should be faster than accessing an array for each index, and
// the total array size is kept smaller (256*sizeof(int))=1K
- /***** the python code that generated bitlist
+ /* the python code that generated bitlist
def bits2int(val):
arr=0
for shift in range(8,0,-1):
@@ -58,7 +58,7 @@ public final class BitUtil {
def int_table():
tbl = [ hex(bits2int(val)).strip('L') for val in range(256) ]
return ','.join(tbl)
- ******/
+ */
private static final int[] BIT_LISTS = {
0x0, 0x1, 0x2, 0x21, 0x3, 0x31, 0x32, 0x321, 0x4, 0x41, 0x42, 0x421, 0x43,
0x431, 0x432, 0x4321, 0x5, 0x51, 0x52, 0x521, 0x53, 0x531, 0x532, 0x5321,
@@ -98,12 +98,12 @@ public final class BitUtil {
}
/** Return the list of bits which are set in b encoded as followed:
- * <code>(i >>> (4 * n)) & 0x0F</code> is the offset of the n-th set bit of
+ * {@code (i >>> (4 * n)) & 0x0F} is the offset of the n-th set bit of
* the given byte plus one, or 0 if there are n or less bits set in the given
* byte. For example <code>bitList(12)</code> returns 0x43:<ul>
- * <li><code>0x43 & 0x0F</code> is 3, meaning the the first bit set is at offset 3-1 = 2,</li>
- * <li><code>(0x43 >>> 4) & 0x0F</code> is 4, meaning there is a second bit set at offset 4-1=3,</li>
- * <li><code>(0x43 >>> 8) & 0x0F</code> is 0, meaning there is no more bit set in this byte.</li>
+ * <li>{@code 0x43 & 0x0F} is 3, meaning the the first bit set is at offset 3-1 = 2,</li>
+ * <li>{@code (0x43 >>> 4) & 0x0F} is 4, meaning there is a second bit set at offset 4-1=3,</li>
+ * <li>{@code (0x43 >>> 8) & 0x0F} is 0, meaning there is no more bit set in this byte.</li>
* </ul>*/
public static int bitList(byte b) {
return BIT_LISTS[b & 0xFF];
@@ -142,7 +142,7 @@ public final class BitUtil {
return popCount;
}
- /** Returns the popcount or cardinality of A & ~B.
+ /** Returns the popcount or cardinality of {@code A & ~B}.
* Neither array is modified. */
public static long pop_andnot(long[] arr1, long[] arr2, int wordOffset, int numWords) {
long popCount = 0;
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/BytesRefHash.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/BytesRefHash.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/BytesRefHash.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/BytesRefHash.java Fri Nov 28 01:24:49 2014
@@ -266,7 +266,7 @@ public final class BytesRefHash {
* haven't been hashed before.
*
* @throws MaxBytesLengthExceededException
- * if the given bytes are > 2 +
+ * if the given bytes are {@code > 2 +}
* {@link ByteBlockPool#BYTE_BLOCK_SIZE}
*/
public int add(BytesRef bytes) {
@@ -403,7 +403,7 @@ public final class BytesRefHash {
}
/**
- * Called when hash is too small (> 50% occupied) or too large (< 20%
+ * Called when hash is too small ({@code > 50%} occupied) or too large ({@code < 20%}
* occupied).
*/
private void rehash(final int newSize, boolean hashOnData) {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java Fri Nov 28 01:24:49 2014
@@ -192,7 +192,7 @@ public final class PagedBytes implements
/** Copy BytesRef in, setting BytesRef out to the result.
* Do not use this if you will use freeze(true).
- * This only supports bytes.length <= blockSize */
+ * This only supports bytes.length <= blockSize */
public void copy(BytesRef bytes, BytesRef out) {
int left = blockSize - upto;
if (bytes.length > left || currentBlock==null) {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/SentinelIntSet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/SentinelIntSet.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/SentinelIntSet.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/SentinelIntSet.java Fri Nov 28 01:24:49 2014
@@ -22,7 +22,7 @@ import java.util.Arrays;
/**
* A native int hash-based set where one value is reserved to mean "EMPTY" internally. The space overhead is fairly low
* as there is only one power-of-two sized int[] to hold the values. The set is re-hashed when adding a value that
- * would make it >= 75% full. Consider extending and over-riding {@link #hash(int)} if the values might be poor
+ * would make it >= 75% full. Consider extending and over-riding {@link #hash(int)} if the values might be poor
* hash keys; Lucene docids should be fine.
* The internal fields are exposed publicly to enable more efficient use at the expense of better O-O principles.
* <p/>
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/VirtualMethod.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/VirtualMethod.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/VirtualMethod.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/VirtualMethod.java Fri Nov 28 01:24:49 2014
@@ -43,11 +43,11 @@ import java.util.Set;
* instance's class, use a <strong>non-static</strong> field:</p>
* <pre class="prettyprint">
* final boolean isDeprecatedMethodOverridden =
- * oldMethod.getImplementationDistance(this.getClass()) > newMethod.getImplementationDistance(this.getClass());
+ * oldMethod.getImplementationDistance(this.getClass()) > newMethod.getImplementationDistance(this.getClass());
*
* <em>// alternatively (more readable):</em>
* final boolean isDeprecatedMethodOverridden =
- * VirtualMethod.compareImplementationDistance(this.getClass(), oldMethod, newMethod) > 0
+ * VirtualMethod.compareImplementationDistance(this.getClass(), oldMethod, newMethod) > 0
* </pre>
* <p>{@link #getImplementationDistance} returns the distance of the subclass that overrides this method.
* The one with the larger distance should be used preferable.
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/automaton/Automata.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/automaton/Automata.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/automaton/Automata.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/automaton/Automata.java Fri Nov 28 01:24:49 2014
@@ -211,10 +211,10 @@ final public class Automata {
* @param min minimal value of interval
* @param max maximal value of interval (both end points are included in the
* interval)
- * @param digits if >0, use fixed number of digits (strings must be prefixed
+ * @param digits if > 0, use fixed number of digits (strings must be prefixed
* by 0's to obtain the right length) - otherwise, the number of
* digits is not fixed (any number of leading 0s is accepted)
- * @exception IllegalArgumentException if min>max or if numbers in the
+ * @exception IllegalArgumentException if min > max or if numbers in the
* interval cannot be expressed with the given fixed number of
* digits
*/
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/automaton/CompiledAutomaton.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/automaton/CompiledAutomaton.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/automaton/CompiledAutomaton.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/automaton/CompiledAutomaton.java Fri Nov 28 01:24:49 2014
@@ -297,7 +297,7 @@ public class CompiledAutomaton {
}
/** Finds largest term accepted by this Automaton, that's
- * <= the provided input term. The result is placed in
+ * <= the provided input term. The result is placed in
* output; it's fine for output and input to point to
* the same bytes. The returned result is either the
* provided output, or null if there is no floor term
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/automaton/RegExp.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/automaton/RegExp.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/automaton/RegExp.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/automaton/RegExp.java Fri Nov 28 01:24:49 2014
@@ -41,7 +41,7 @@ import java.util.Set;
* <p>
* Regular expressions are built from the following abstract syntax:
* <p>
- * <table border=0>
+ * <table border=0 summary="description of regular expression grammar">
* <tr>
* <td><i>regexp</i></td>
* <td>::=</td>
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/BytesRefFSTEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/BytesRefFSTEnum.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/BytesRefFSTEnum.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/BytesRefFSTEnum.java Fri Nov 28 01:24:49 2014
@@ -58,7 +58,7 @@ public final class BytesRefFSTEnum<T> ex
return setResult();
}
- /** Seeks to smallest term that's >= target. */
+ /** Seeks to smallest term that's >= target. */
public InputOutput<T> seekCeil(BytesRef target) throws IOException {
this.target = target;
targetLength = target.length;
@@ -66,7 +66,7 @@ public final class BytesRefFSTEnum<T> ex
return setResult();
}
- /** Seeks to biggest term that's <= target. */
+ /** Seeks to biggest term that's <= target. */
public InputOutput<T> seekFloor(BytesRef target) throws IOException {
this.target = target;
targetLength = target.length;
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java Fri Nov 28 01:24:49 2014
@@ -76,7 +76,7 @@ class BytesStore extends DataOutput impl
nextWrite = blocks.get(blocks.size()-1).length;
}
- /** Absolute write byte; you must ensure dest is < max
+ /** Absolute write byte; you must ensure dest is < max
* position written so far. */
public void writeByte(int dest, byte b) {
int blockIndex = dest >> blockBits;
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/FSTEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/FSTEnum.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/FSTEnum.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/FSTEnum.java Fri Nov 28 01:24:49 2014
@@ -114,7 +114,7 @@ abstract class FSTEnum<T> {
// TODO: should we return a status here (SEEK_FOUND / SEEK_NOT_FOUND /
// SEEK_END)? saves the eq check above?
- /** Seeks to smallest term that's >= target. */
+ /** Seeks to smallest term that's >= target. */
protected void doSeekCeil() throws IOException {
//System.out.println(" advance len=" + target.length + " curlen=" + current.length);
@@ -256,7 +256,7 @@ abstract class FSTEnum<T> {
// TODO: should we return a status here (SEEK_FOUND / SEEK_NOT_FOUND /
// SEEK_END)? saves the eq check above?
- /** Seeks to largest term that's <= target. */
+ /** Seeks to largest term that's <= target. */
protected void doSeekFloor() throws IOException {
// TODO: possibly caller could/should provide common
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/IntsRefFSTEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/IntsRefFSTEnum.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/IntsRefFSTEnum.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/IntsRefFSTEnum.java Fri Nov 28 01:24:49 2014
@@ -58,7 +58,7 @@ public final class IntsRefFSTEnum<T> ext
return setResult();
}
- /** Seeks to smallest term that's >= target. */
+ /** Seeks to smallest term that's >= target. */
public InputOutput<T> seekCeil(IntsRef target) throws IOException {
this.target = target;
targetLength = target.length;
@@ -66,7 +66,7 @@ public final class IntsRefFSTEnum<T> ext
return setResult();
}
- /** Seeks to biggest term that's <= target. */
+ /** Seeks to biggest term that's <= target. */
public InputOutput<T> seekFloor(IntsRef target) throws IOException {
this.target = target;
targetLength = target.length;
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/Outputs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/Outputs.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/Outputs.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/Outputs.java Fri Nov 28 01:24:49 2014
@@ -41,13 +41,13 @@ public abstract class Outputs<T> {
// (new object per byte/char/int) if eg used during
// analysis
- /** Eg common("foobar", "food") -> "foo" */
+ /** Eg common("foobar", "food") -> "foo" */
public abstract T common(T output1, T output2);
- /** Eg subtract("foobar", "foo") -> "bar" */
+ /** Eg subtract("foobar", "foo") -> "bar" */
public abstract T subtract(T output, T inc);
- /** Eg add("foo", "bar") -> "foobar" */
+ /** Eg add("foo", "bar") -> "foobar" */
public abstract T add(T prefix, T output);
/** Encode an output value into a {@link DataOutput}. */
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/Util.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/Util.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/Util.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/fst/Util.java Fri Nov 28 01:24:49 2014
@@ -588,7 +588,7 @@ public final class Util {
*
* <p>
* Note: larger FSTs (a few thousand nodes) won't even
- * render, don't bother. If the FST is > 2.1 GB in size
+ * render, don't bother. If the FST is > 2.1 GB in size
* then this method will throw strange exceptions.
*
* @param sameRank
@@ -600,7 +600,7 @@ public final class Util {
* If <code>true</code> states will have labels equal to their offsets in their
* binary format. Expands the graph considerably.
*
- * @see "http://www.graphviz.org/"
+ * @see <a href="http://www.graphviz.org/">graphviz project</a>
*/
public static <T> void toDot(FST<T> fst, Writer out, boolean sameRank, boolean labelStates)
throws IOException {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java Fri Nov 28 01:24:49 2014
@@ -152,16 +152,16 @@ abstract class BulkOperation implements
* For every number of bits per value, there is a minimum number of
* blocks (b) / values (v) you need to write in order to reach the next block
* boundary:
- * - 16 bits per value -> b=2, v=1
- * - 24 bits per value -> b=3, v=1
- * - 50 bits per value -> b=25, v=4
- * - 63 bits per value -> b=63, v=8
+ * - 16 bits per value -> b=2, v=1
+ * - 24 bits per value -> b=3, v=1
+ * - 50 bits per value -> b=25, v=4
+ * - 63 bits per value -> b=63, v=8
* - ...
*
* A bulk read consists in copying <code>iterations*v</code> values that are
* contained in <code>iterations*b</code> blocks into a <code>long[]</code>
* (higher values of <code>iterations</code> are likely to yield a better
- * throughput) => this requires n * (b + 8v) bytes of memory.
+ * throughput): this requires n * (b + 8v) bytes of memory.
*
* This method computes <code>iterations</code> as
* <code>ramBudget / (b + 8v)</code> (since a long is 8 bytes).
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/DirectReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/DirectReader.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/DirectReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/DirectReader.java Fri Nov 28 01:24:49 2014
@@ -30,7 +30,7 @@ import org.apache.lucene.util.LongValues
* int bitsPerValue = 100;
* IndexInput in = dir.openInput("packed", IOContext.DEFAULT);
* LongValues values = DirectReader.getInstance(in.randomAccessSlice(start, end), bitsPerValue);
- * for (int i = 0; i < numValues; i++) {
+ * for (int i = 0; i < numValues; i++) {
* long value = values.get(i);
* }
* </pre>
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/DirectWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/DirectWriter.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/DirectWriter.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/DirectWriter.java Fri Nov 28 01:24:49 2014
@@ -27,13 +27,13 @@ import org.apache.lucene.store.IndexOutp
* Class for writing packed integers to be directly read from Directory.
* Integers can be read on-the-fly via {@link DirectReader}.
* <p>
- * Unlike PackedInts, it optimizes for read i/o operations and supports > 2B values.
+ * Unlike PackedInts, it optimizes for read i/o operations and supports > 2B values.
* Example usage:
* <pre class="prettyprint">
* int bitsPerValue = DirectWriter.bitsRequired(100); // values up to and including 100
* IndexOutput output = dir.createOutput("packed", IOContext.DEFAULT);
* DirectWriter writer = DirectWriter.getInstance(output, numberOfValues, bitsPerValue);
- * for (int i = 0; i < numberOfValues; i++) {
+ * for (int i = 0; i < numberOfValues; i++) {
* writer.add(value);
* }
* writer.finish();
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/EliasFanoDecoder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/EliasFanoDecoder.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/EliasFanoDecoder.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/EliasFanoDecoder.java Fri Nov 28 01:24:49 2014
@@ -375,7 +375,7 @@ public class EliasFanoDecoder {
/** Decrement efindex and setBitForIndex and
* shift curHighLong so that it does not contain the high bits after setBitForIndex.
- * @return true iff efindex still >= 0
+ * @return true iff efindex still {@code >= 0}
*/
private boolean toBeforeCurrentHighBit() {
efIndex -= 1;
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/EliasFanoEncoder.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/EliasFanoEncoder.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/EliasFanoEncoder.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/EliasFanoEncoder.java Fri Nov 28 01:24:49 2014
@@ -30,11 +30,11 @@ import org.apache.lucene.util.ToStringUt
* that was introduced in the 1970's by Peter Elias and Robert Fano.
* <p>
* The Elias-Fano encoding is a high bits / low bits representation of
- * a monotonically increasing sequence of <code>numValues > 0</code> natural numbers <code>x[i]</code>
+ * a monotonically increasing sequence of {@code numValues > 0} natural numbers <code>x[i]</code>
* <p>
- * <code>0 <= x[0] <= x[1] <= ... <= x[numValues-2] <= x[numValues-1] <= upperBound</code>
+ * {@code 0 <= x[0] <= x[1] <= ... <= x[numValues-2] <= x[numValues-1] <= upperBound}
* <p>
- * where <code>upperBound > 0</code> is an upper bound on the last value.
+ * where {@code upperBound > 0} is an upper bound on the last value.
* <br>
* The Elias-Fano encoding uses less than half a bit per encoded number more
* than the smallest representation
@@ -53,7 +53,7 @@ import org.apache.lucene.util.ToStringUt
* <code>0...01</code>. <br>
* In the upper bits the total the number of 1 bits is <code>numValues</code>
* and the total number of 0 bits is:<p>
- * <code>floor(x[numValues-1]/2**L) <= upperBound/(2**max(0, floor(log(upperBound/numValues)))) <= 2*numValues</code>
+ * {@code floor(x[numValues-1]/2**L) <= upperBound/(2**max(0, floor(log(upperBound/numValues)))) <= 2*numValues}
* <p>
* The Elias-Fano encoding uses at most
* <p>
@@ -61,7 +61,7 @@ import org.apache.lucene.util.ToStringUt
* <p>
* bits per encoded number. With <code>upperBound</code> in these bounds (<code>p</code> is an integer):
* <p>
- * <code>2**p < x[numValues-1] <= upperBound <= 2**(p+1)</code>
+ * {@code 2**p < x[numValues-1] <= upperBound <= 2**(p+1)}
* <p>
* the number of bits per encoded number is minimized.
* <p>
@@ -121,7 +121,7 @@ public class EliasFanoEncoder implements
* @param upperBound At least the highest value that will be encoded.
* For space efficiency this should not exceed the power of two that equals
* or is the first higher than the actual maximum.
- * <br>When <code>numValues >= (upperBound/3)</code>
+ * <br>When {@code numValues >= (upperBound/3)}
* a {@link FixedBitSet} will take less space.
* @param indexInterval The number of high zero bits for which a single index entry is built.
* The index will have at most <code>2 * numValues / indexInterval</code> entries
@@ -132,12 +132,12 @@ public class EliasFanoEncoder implements
* <li><code>numValues</code> is negative, or
* <li><code>numValues</code> is non negative and <code>upperBound</code> is negative, or
* <li>the low bits do not fit in a <code>long[]</code>:
- * <code>(L * numValues / 64) > Integer.MAX_VALUE</code>, or
+ * {@code (L * numValues / 64) > Integer.MAX_VALUE}, or
* <li>the high bits do not fit in a <code>long[]</code>:
- * <code>(2 * numValues / 64) > Integer.MAX_VALUE</code>, or
- * <li><code>indexInterval < 2</code>,
+ * {@code (2 * numValues / 64) > Integer.MAX_VALUE}, or
+ * <li>{@code indexInterval < 2},
* <li>the index bits do not fit in a <code>long[]</code>:
- * <code>(numValues / indexInterval * ceil(2log(3 * numValues)) / 64) > Integer.MAX_VALUE</code>.
+ * {@code (numValues / indexInterval * ceil(2log(3 * numValues)) / 64) > Integer.MAX_VALUE}.
* </ul>
*/
public EliasFanoEncoder(long numValues, long upperBound, long indexInterval) {
@@ -267,7 +267,7 @@ public class EliasFanoEncoder implements
* (including some space for its index) is at most about 5/6 of the size of the FixedBitSet,
* this is the same as comparing estimates of the number of bits accessed by a pair of FixedBitSets and
* by a pair of non indexed EliasFanoDocIdSets when determining the intersections of the pairs.
- * <br>A bit set is preferred when <code>upperbound <= 256</code>.
+ * <br>A bit set is preferred when {@code upperbound <= 256}.
* <br>It is assumed that {@link #DEFAULT_INDEX_INTERVAL} is used.
* @param numValues The number of document identifiers that is to be encoded. Should be non negative.
* @param upperBound The maximum possible value for a document identifier. Should be at least <code>numValues</code>.
Modified: lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java Fri Nov 28 01:24:49 2014
@@ -32,7 +32,7 @@ import org.apache.lucene.util.RamUsageEs
/**
* Simplistic compression for array of unsigned long values.
- * Each value is >= 0 and <= a specified maximum value. The
+ * Each value is {@code >= 0} and {@code <=} a specified maximum value. The
* values are stored as packed ints, with each value
* consuming a fixed number of bits.
*
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java Fri Nov 28 01:24:49 2014
@@ -36,7 +36,7 @@ import org.apache.lucene.util.LuceneTest
import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
/**
- * Test indexes ~82M docs with 52 positions each, so you get > Integer.MAX_VALUE positions
+ * Test indexes ~82M docs with 52 positions each, so you get > Integer.MAX_VALUE positions
* @lucene.experimental
*/
@SuppressCodecs({ "SimpleText", "Memory", "Direct" })
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/Test2BPostings.java Fri Nov 28 01:24:49 2014
@@ -32,7 +32,7 @@ import org.apache.lucene.util.TimeUnits;
import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
/**
- * Test indexes ~82M docs with 26 terms each, so you get > Integer.MAX_VALUE terms/docs pairs
+ * Test indexes ~82M docs with 26 terms each, so you get > Integer.MAX_VALUE terms/docs pairs
* @lucene.experimental
*/
@SuppressCodecs({ "SimpleText", "Memory", "Direct", "Compressing" })
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java Fri Nov 28 01:24:49 2014
@@ -35,7 +35,7 @@ import org.apache.lucene.util.LuceneTest
/**
* Test indexes 2B docs with 65k freqs each,
- * so you get > Integer.MAX_VALUE postings data for the term
+ * so you get > Integer.MAX_VALUE postings data for the term
* @lucene.experimental
*/
@SuppressCodecs({ "SimpleText", "Memory", "Direct" })
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/TestSloppyPhraseQuery.java Fri Nov 28 01:24:49 2014
@@ -55,7 +55,7 @@ public class TestSloppyPhraseQuery exten
/**
* Test DOC_4 and QUERY_4.
- * QUERY_4 has a fuzzy (len=1) match to DOC_4, so all slop values > 0 should succeed.
+ * QUERY_4 has a fuzzy (len=1) match to DOC_4, so all slop values > 0 should succeed.
* But only the 3rd sequence of A's in DOC_4 will do.
*/
public void testDoc4_Query4_All_Slops_Should_match() throws Exception {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestBasics.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestBasics.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestBasics.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/search/spans/TestBasics.java Fri Nov 28 01:24:49 2014
@@ -664,7 +664,7 @@ public class TestBasics extends LuceneTe
boolean hasMore = true;
do {
- hasMore = skipToAccoringToJavaDocs(s1, s1.doc() + 1);
+ hasMore = skipToAccordingToJavaDocs(s1, s1.doc() + 1);
assertEquals(hasMore, s2.skipTo(s2.doc() + 1));
assertEquals(s1.doc(), s2.doc());
} while (hasMore);
@@ -677,12 +677,12 @@ public class TestBasics extends LuceneTe
* do {
* if (!next())
* return false;
- * } while (target > doc());
+ * } while (target > doc());
* return true;
* }
* </pre>
*/
- private boolean skipToAccoringToJavaDocs(Spans s, int target)
+ private boolean skipToAccordingToJavaDocs(Spans s, int target)
throws Exception {
do {
if (!s.next())
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java Fri Nov 28 01:24:49 2014
@@ -33,7 +33,7 @@ import org.apache.lucene.util.TestUtil;
* Tests MMapDirectory's MultiMMapIndexInput
* <p>
* Because Java's ByteBuffer uses an int to address the
- * values, it's necessary to access a file >
+ * values, it's necessary to access a file >
* Integer.MAX_VALUE in size using multiple byte buffers.
*/
public class TestMultiMMap extends BaseDirectoryTestCase {
Modified: lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java (original)
+++ lucene/dev/branches/branch_5x/lucene/core/src/test/org/apache/lucene/util/fst/TestFSTs.java Fri Nov 28 01:24:49 2014
@@ -1033,7 +1033,7 @@ public class TestFSTs extends LuceneTest
* Test state expansion (array format) on close-to-root states. Creates
* synthetic input that has one expanded state on each level.
*
- * @see "https://issues.apache.org/jira/browse/LUCENE-2933"
+ * @see <a href="https://issues.apache.org/jira/browse/LUCENE-2933">LUCENE-2933</a>
*/
public void testExpandedCloseToRoot() throws Exception {
class SyntheticData {
Modified: lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/DrillSideways.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/DrillSideways.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/DrillSideways.java (original)
+++ lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/DrillSideways.java Fri Nov 28 01:24:49 2014
@@ -249,7 +249,7 @@ public class DrillSideways {
/** Result of a drill sideways search, including the
* {@link Facets} and {@link TopDocs}. */
public static class DrillSidewaysResult {
- /** Combined drill down & sideways results. */
+ /** Combined drill down and sideways results. */
public final Facets facets;
/** Hits. */
Modified: lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/FacetsConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/FacetsConfig.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/FacetsConfig.java (original)
+++ lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/FacetsConfig.java Fri Nov 28 01:24:49 2014
@@ -121,7 +121,7 @@ public class FacetsConfig {
}
/** Pass {@code true} if this dimension is hierarchical
- * (has depth > 1 paths). */
+ * (has depth > 1 paths). */
public synchronized void setHierarchical(String dimName, boolean v) {
DimConfig ft = fieldTypes.get(dimName);
if (ft == null) {
Modified: lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRangeFacetCounts.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRangeFacetCounts.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRangeFacetCounts.java (original)
+++ lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/range/DoubleRangeFacetCounts.java Fri Nov 28 01:24:49 2014
@@ -42,7 +42,7 @@ import org.apache.lucene.util.NumericUti
* this for dimensions that change in real-time (e.g. a
* relative time based dimension like "Past day", "Past 2
* days", etc.) or that change for each request (e.g.
- * distance from the user's location, "< 1 km", "< 2 km",
+ * distance from the user's location, "< 1 km", "< 2 km",
* etc.).
*
* <p> If you had indexed your field using {@link
Modified: lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/range/LongRangeFacetCounts.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/range/LongRangeFacetCounts.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/range/LongRangeFacetCounts.java (original)
+++ lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/range/LongRangeFacetCounts.java Fri Nov 28 01:24:49 2014
@@ -38,7 +38,7 @@ import org.apache.lucene.search.DocIdSet
* this for dimensions that change in real-time (e.g. a
* relative time based dimension like "Past day", "Past 2
* days", etc.) or that change for each request (e.g.
- * distance from the user's location, "< 1 km", "< 2 km",
+ * distance from the user's location, "< 1 km", "< 2 km",
* etc.).
*
* @lucene.experimental */
Modified: lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/DocValuesOrdinalsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/DocValuesOrdinalsReader.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/DocValuesOrdinalsReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/DocValuesOrdinalsReader.java Fri Nov 28 01:24:49 2014
@@ -65,7 +65,7 @@ public class DocValuesOrdinalsReader ext
return field;
}
- /** Subclass & override if you change the encoding. */
+ /** Subclass and override if you change the encoding. */
protected void decode(BytesRef buf, IntsRef ordinals) {
// grow the buffer up front, even if by a large number of values (buf.length)
Modified: lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/OrdinalMappingLeafReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/OrdinalMappingLeafReader.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/OrdinalMappingLeafReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/OrdinalMappingLeafReader.java Fri Nov 28 01:24:49 2014
@@ -53,7 +53,7 @@ import org.apache.lucene.util.IntsRef;
* IndexWriter writer = new IndexWriter(newDir, conf);
* List<LeafReaderContext> leaves = reader.leaves();
* LeafReader wrappedLeaves[] = new LeafReader[leaves.size()];
- * for (int i = 0; i < leaves.size(); i++) {
+ * for (int i = 0; i < leaves.size(); i++) {
* wrappedLeaves[i] = new OrdinalMappingLeafReader(leaves.get(i).reader(), ordmap);
* }
* writer.addIndexes(new MultiReader(wrappedLeaves));
Modified: lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java (original)
+++ lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/directory/DirectoryTaxonomyReader.java Fri Nov 28 01:24:49 2014
@@ -346,7 +346,7 @@ public class DirectoryTaxonomyReader ext
}
}
- /** Returns ordinal -> label mapping, up to the provided
+ /** Returns ordinal -> label mapping, up to the provided
* max ordinal or number of ordinals, whichever is
* smaller. */
public String toString(int max) {
Modified: lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/LabelToOrdinal.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/LabelToOrdinal.java?rev=1642252&r1=1642251&r2=1642252&view=diff
==============================================================================
--- lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/LabelToOrdinal.java (original)
+++ lucene/dev/branches/branch_5x/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/writercache/LabelToOrdinal.java Fri Nov 28 01:24:49 2014
@@ -20,7 +20,7 @@ import org.apache.lucene.facet.taxonomy.
*/
/**
- * Abstract class for storing Label->Ordinal mappings in a taxonomy.
+ * Abstract class for storing Label->Ordinal mappings in a taxonomy.
*
* @lucene.experimental
*/