You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2014/11/30 12:27:23 UTC
svn commit: r1642537 [2/6] - in /lucene/dev/branches/lucene6005: ./
dev-tools/ dev-tools/idea/.idea/ dev-tools/maven/solr/webapp/ lucene/
lucene/analysis/ lucene/analysis/common/
lucene/analysis/common/src/java/org/apache/lucene/analysis/br/ lucene/ana...
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialFileQueryMaker.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialFileQueryMaker.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialFileQueryMaker.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/SpatialFileQueryMaker.java Sun Nov 30 11:27:18 2014
@@ -40,7 +40,7 @@ import com.spatial4j.core.shape.Shape;
* It's parsed by {@link com.spatial4j.core.context.SpatialContext#readShapeFromWkt(String)} (String)} and then
* further manipulated via a configurable {@link SpatialDocMaker.ShapeConverter}. When using point
* data, it's likely you'll want to configure the shape converter so that the query shapes actually
- * cover a region. The queries are all created & cached in advance. This query maker works in
+ * cover a region. The queries are all created and cached in advance. This query maker works in
* conjunction with {@link SpatialDocMaker}. See spatial.alg for a listing of options, in
* particular the options starting with "query.".
*/
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/TaskStats.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/TaskStats.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/TaskStats.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/stats/TaskStats.java Sun Nov 30 11:27:18 2014
@@ -35,7 +35,7 @@ public class TaskStats implements Clonea
/** task start time */
private long start;
- /** task elapsed time. elapsed >= 0 indicates run completion! */
+ /** task elapsed time. elapsed >= 0 indicates run completion! */
private long elapsed = -1;
/** max tot mem during task */
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/AnalyzerFactoryTask.java Sun Nov 30 11:27:18 2014
@@ -393,7 +393,7 @@ public class AnalyzerFactoryTask extends
/**
* This method looks up a class with its fully qualified name (FQN), or a short-name
* class-simplename, or with a package suffix, assuming "org.apache.lucene.analysis."
- * as the package prefix (e.g. "standard.ClassicTokenizerFactory" ->
+ * as the package prefix (e.g. "standard.ClassicTokenizerFactory" ->
* "org.apache.lucene.analysis.standard.ClassicTokenizerFactory").
*
* If className contains a period, the class is first looked up as-is, assuming that it
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/NewAnalyzerTask.java Sun Nov 30 11:27:18 2014
@@ -99,7 +99,7 @@ public class NewAnalyzerTask extends Per
* <p/>
* Analyzer names may also refer to previously defined AnalyzerFactory's.
* <p/>
- * Example Declaration: {"NewAnalyzer" NewAnalyzer(WhitespaceAnalyzer, SimpleAnalyzer, StopAnalyzer, standard.StandardAnalyzer) >
+ * Example Declaration: {"NewAnalyzer" NewAnalyzer(WhitespaceAnalyzer, SimpleAnalyzer, StopAnalyzer, standard.StandardAnalyzer) >
* <p/>
* Example AnalyzerFactory usage:
* <pre>
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/ReadTask.java Sun Nov 30 11:27:18 2014
@@ -264,7 +264,7 @@ public abstract class ReadTask extends P
}
/**
- * Return true if, with search & results traversing, docs should be retrieved.
+ * Return true if, with search and results traversing, docs should be retrieved.
*/
public abstract boolean withRetrieve();
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetHighlightTask.java Sun Nov 30 11:27:18 2014
@@ -52,7 +52,7 @@ import org.apache.lucene.search.highligh
* <li>fields - The fields to highlight. If not specified all fields will be highlighted (or at least attempted)</li>
* </ul>
* Example:
- * <pre>"SearchHlgtSameRdr" SearchTravRetHighlight(size[10],highlight[10],mergeContiguous[true],maxFrags[3],fields[body]) > : 1000
+ * <pre>"SearchHlgtSameRdr" SearchTravRetHighlight(size[10],highlight[10],mergeContiguous[true],maxFrags[3],fields[body]) > : 1000
* </pre>
*
* Documents must be stored in order for this task to work. Additionally, term vector positions can be used as well.
Modified: lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java (original)
+++ lucene/dev/branches/lucene6005/lucene/benchmark/src/java/org/apache/lucene/benchmark/byTask/tasks/SearchTravRetVectorHighlightTask.java Sun Nov 30 11:27:18 2014
@@ -46,7 +46,7 @@ import org.apache.lucene.search.vectorhi
* <li>fields - The fields to highlight. If not specified all fields will be highlighted (or at least attempted)</li>
* </ul>
* Example:
- * <pre>"SearchVecHlgtSameRdr" SearchTravRetVectorHighlight(size[10],highlight[10],maxFrags[3],fields[body]) > : 1000
+ * <pre>"SearchVecHlgtSameRdr" SearchTravRetVectorHighlight(size[10],highlight[10],maxFrags[3],fields[body]) > : 1000
* </pre>
*
* Fields must be stored and term vector offsets and positions in order must be true for this task to work.
Modified: lucene/dev/branches/lucene6005/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/build.xml?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/build.xml (original)
+++ lucene/dev/branches/lucene6005/lucene/build.xml Sun Nov 30 11:27:18 2014
@@ -60,6 +60,10 @@
description="Runs pitests (core, modules and back-compat)"
/>
+ <target name="beast">
+ <fail message="The Beast only works inside of individual modules"/>
+ </target>
+
<target name="compile-core" depends="compile-lucene-core"/>
<!-- lucene/test-framework is excluded from compilation -->
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/TermsIndexReaderBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/TermsIndexReaderBase.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/TermsIndexReaderBase.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/TermsIndexReaderBase.java Sun Nov 30 11:27:18 2014
@@ -55,7 +55,7 @@ public abstract class TermsIndexReaderBa
*/
public static abstract class FieldIndexEnum {
- /** Seeks to "largest" indexed term that's <=
+ /** Seeks to "largest" indexed term that's <=
* term; returns file pointer index (into the main
* terms index file) for that term */
public abstract long seek(BytesRef term) throws IOException;
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/VariableGapTermsIndexWriter.java Sun Nov 30 11:27:18 2014
@@ -109,7 +109,7 @@ public class VariableGapTermsIndexWriter
}
}
- /** Sets an index term when docFreq >= docFreqThresh, or
+ /** Sets an index term when docFreq >= docFreqThresh, or
* every interval terms. This should reduce seek time
* to high docFreq terms. */
public static final class EveryNOrDocFreqTermSelector extends IndexTermSelector {
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsWriter.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsWriter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/blocktreeords/OrdsBlockTreeTermsWriter.java Sun Nov 30 11:27:18 2014
@@ -82,7 +82,7 @@ import org.apache.lucene.util.packed.Pac
/**
* This is just like {@link BlockTreeTermsWriter}, except it also stores a version per term, and adds a method to its TermsEnum
- * implementation to seekExact only if the version is >= the specified version. The version is added to the terms index to avoid seeking if
+ * implementation to seekExact only if the version is >= the specified version. The version is added to the terms index to avoid seeking if
* no term in the block has a high enough version. The term blocks file is .tiv and the terms index extension is .tipv.
*
* @lucene.experimental
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java Sun Nov 30 11:27:18 2014
@@ -56,9 +56,9 @@ import org.apache.lucene.util.automaton.
/** Wraps {@link Lucene50PostingsFormat} format for on-disk
* storage, but then at read time loads and stores all
- * terms & postings directly in RAM as byte[], int[].
+ * terms and postings directly in RAM as byte[], int[].
*
- * <p><b><font color=red>WARNING</font></b>: This is
+ * <p><b>WARNING</b>: This is
* exceptionally RAM intensive: it makes no effort to
* compress the postings data, storing terms as separate
* byte[] and postings as separate int[], but as a result it
@@ -91,7 +91,7 @@ public final class DirectPostingsFormat
/** minSkipCount is how many terms in a row must have the
* same prefix before we put a skip pointer down. Terms
- * with docFreq <= lowFreqCutoff will use a single int[]
+ * with docFreq <= lowFreqCutoff will use a single int[]
* to hold all docs, freqs, position and offsets; terms
* with higher docFreq will use separate arrays. */
public DirectPostingsFormat(int minSkipCount, int lowFreqCutoff) {
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTOrdTermsReader.java Sun Nov 30 11:27:18 2014
@@ -757,7 +757,7 @@ public class FSTOrdTermsReader extends F
}
/** Load frame for target arc(node) on fst, so that
- * arc.label >= label and !fsa.reject(arc.label) */
+ * arc.label >= label and !fsa.reject(arc.label) */
Frame loadCeilFrame(int label, Frame top, Frame frame) throws IOException {
FST.Arc<Long> arc = frame.arc;
arc = Util.readCeilArc(label, fst, top.arc, arc, fstReader);
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermsReader.java Sun Nov 30 11:27:18 2014
@@ -654,7 +654,7 @@ public class FSTTermsReader extends Fiel
}
/** Load frame for target arc(node) on fst, so that
- * arc.label >= label and !fsa.reject(arc.label) */
+ * arc.label >= label and !fsa.reject(arc.label) */
Frame loadCeilFrame(int label, Frame top, Frame frame) throws IOException {
FST.Arc<FSTTermOutputs.TermData> arc = frame.fstArc;
arc = Util.readCeilArc(label, fst, top.fstArc, arc, fstReader);
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java Sun Nov 30 11:27:18 2014
@@ -69,7 +69,7 @@ import org.apache.lucene.util.packed.Pac
// it pulls the FST directly from what you wrote w/o going
// to disk.
-/** Stores terms & postings (docs, positions, payloads) in
+/** Stores terms and postings (docs, positions, payloads) in
* RAM, using an FST.
*
* <p>Note that this codec implements advance as a linear
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCodec.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCodec.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCodec.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCodec.java Sun Nov 30 11:27:18 2014
@@ -31,7 +31,7 @@ import org.apache.lucene.codecs.TermVect
/**
* plain text index format.
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
* @lucene.experimental
*/
public final class SimpleTextCodec extends Codec {
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCompoundFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCompoundFormat.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCompoundFormat.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextCompoundFormat.java Sun Nov 30 11:27:18 2014
@@ -44,7 +44,7 @@ import org.apache.lucene.util.StringHelp
/**
* plain text compound format.
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
* @lucene.experimental
*/
public class SimpleTextCompoundFormat extends CompoundFormat {
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesFormat.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesFormat.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesFormat.java Sun Nov 30 11:27:18 2014
@@ -28,7 +28,7 @@ import org.apache.lucene.index.SegmentWr
/**
* plain text doc values format.
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
* <p>
* the .dat file contains the data.
* for numbers this is a "fixed-width" file, for example a single byte range:
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosFormat.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosFormat.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosFormat.java Sun Nov 30 11:27:18 2014
@@ -42,7 +42,7 @@ import org.apache.lucene.util.StringHelp
/**
* plaintext field infos format
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
* @lucene.experimental
*/
public class SimpleTextFieldInfosFormat extends FieldInfosFormat {
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextLiveDocsFormat.java Sun Nov 30 11:27:18 2014
@@ -42,7 +42,7 @@ import org.apache.lucene.util.UnicodeUti
/**
* reads/writes plaintext live docs
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
* @lucene.experimental
*/
public class SimpleTextLiveDocsFormat extends LiveDocsFormat {
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextNormsFormat.java Sun Nov 30 11:27:18 2014
@@ -33,7 +33,7 @@ import org.apache.lucene.util.Accountabl
/**
* plain-text norms format.
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
*
* @lucene.experimental
*/
@@ -53,7 +53,7 @@ public class SimpleTextNormsFormat exten
/**
* Reads plain-text norms.
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
*
* @lucene.experimental
*/
@@ -100,7 +100,7 @@ public class SimpleTextNormsFormat exten
/**
* Writes plain-text norms.
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
*
* @lucene.experimental
*/
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java Sun Nov 30 11:27:18 2014
@@ -43,7 +43,7 @@ import org.apache.lucene.util.Version;
/**
* plain text segments file format.
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
* @lucene.experimental
*/
public class SimpleTextSegmentInfoFormat extends SegmentInfoFormat {
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsFormat.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsFormat.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsFormat.java Sun Nov 30 11:27:18 2014
@@ -30,7 +30,7 @@ import org.apache.lucene.store.IOContext
/**
* plain text stored fields format.
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
* @lucene.experimental
*/
public class SimpleTextStoredFieldsFormat extends StoredFieldsFormat {
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java Sun Nov 30 11:27:18 2014
@@ -46,7 +46,7 @@ import static org.apache.lucene.codecs.s
/**
* reads plaintext stored fields
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
* @lucene.experimental
*/
public class SimpleTextStoredFieldsReader extends StoredFieldsReader {
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsWriter.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsWriter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsWriter.java Sun Nov 30 11:27:18 2014
@@ -34,7 +34,7 @@ import org.apache.lucene.util.IOUtils;
/**
* Writes plain-text stored fields.
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
* @lucene.experimental
*/
public class SimpleTextStoredFieldsWriter extends StoredFieldsWriter {
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsFormat.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsFormat.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsFormat.java Sun Nov 30 11:27:18 2014
@@ -30,7 +30,7 @@ import org.apache.lucene.store.IOContext
/**
* plain text term vectors format.
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
* @lucene.experimental
*/
public class SimpleTextTermVectorsFormat extends TermVectorsFormat {
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java Sun Nov 30 11:27:18 2014
@@ -53,7 +53,7 @@ import static org.apache.lucene.codecs.s
/**
* Reads plain-text term vectors.
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
* @lucene.experimental
*/
public class SimpleTextTermVectorsReader extends TermVectorsReader {
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsWriter.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsWriter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsWriter.java Sun Nov 30 11:27:18 2014
@@ -33,7 +33,7 @@ import org.apache.lucene.util.IOUtils;
/**
* Writes plain-text term vectors.
* <p>
- * <b><font color="red">FOR RECREATIONAL USE ONLY</font></B>
+ * <b>FOR RECREATIONAL USE ONLY</b>
* @lucene.experimental
*/
public class SimpleTextTermVectorsWriter extends TermVectorsWriter {
Modified: lucene/dev/branches/lucene6005/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/common-build.xml?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/common-build.xml (original)
+++ lucene/dev/branches/lucene6005/lucene/common-build.xml Sun Nov 30 11:27:18 2014
@@ -164,6 +164,9 @@
<property name="javac.debug" value="on"/>
<property name="javac.source" value="1.8"/>
<property name="javac.target" value="1.8"/>
+ <!-- nocommit put back
+ <property name="javac.args" value="-Xlint -Xlint:-deprecation -Xlint:-serial -Xlint:-options -Xdoclint:all/protected -Xdoclint:-html -Xdoclint:-missing"/>
+ -->
<property name="javac.args" value="-Xlint -Xlint:-deprecation -Xlint:-serial -Xlint:-options"/>
<property name="javadoc.link" value="http://download.oracle.com/javase/8/docs/api/"/>
<property name="javadoc.link.junit" value="http://junit.sourceforge.net/javadoc/"/>
@@ -372,7 +375,10 @@
<echo level="warning" message="WARN: Linting documentation HTML is not supported on this Java version (${build.java.runtime}) / JVM (${java.vm.name}). NOTHING DONE!"/>
</target>
- <!-- for now disable doclint: -->
+ <!-- for now enable only some doclint: -->
+ <!-- nocommit put back
+ <property name="javadoc.args" value="-Xdoclint:all -Xdoclint:-html -Xdoclint:-missing"/>
+ -->
<property name="javadoc.args" value="-Xdoclint:none"/>
<!-- Import custom ANT tasks. -->
@@ -1351,6 +1357,11 @@ ${tests-output}/junit4-*.suites - pe
<!-- Beast the actual tests (must be wrapped with -init-totals, -check-totals) -->
<target name="-beast" depends="resolve-groovy">
+ <fail message="The Beast only works inside of individual modules (where 'junit.classpath' is defined)">
+ <condition>
+ <not><isreference refid="junit.classpath"/></not>
+ </condition>
+ </fail>
<groovy taskname="beaster"><![CDATA[
import org.apache.tools.ant.BuildException;
import org.apache.tools.ant.BuildLogger;
Modified: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/analysis/Token.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/analysis/Token.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/analysis/Token.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/analysis/Token.java Sun Nov 30 11:27:18 2014
@@ -79,8 +79,8 @@ public class Token extends PackedTokenAt
public Token() {
}
- /** Constructs a Token with the given term text, and start
- * & end offsets. The type defaults to "word."
+ /** Constructs a Token with the given term text, start
+ * and end offsets. The type defaults to "word."
* <b>NOTE:</b> for better indexing speed you should
* instead use the char[] termBuffer methods to set the
* term text.
Modified: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/analysis/TokenStreamToAutomaton.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/analysis/TokenStreamToAutomaton.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/analysis/TokenStreamToAutomaton.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/analysis/TokenStreamToAutomaton.java Sun Nov 30 11:27:18 2014
@@ -78,7 +78,7 @@ public class TokenStreamToAutomaton {
}
}
- /** Subclass & implement this if you need to change the
+ /** Subclass and implement this if you need to change the
* token (such as escaping certain bytes) before it's
* turned into a graph. */
protected BytesRef changeToken(BytesRef in) {
Modified: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttribute.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttribute.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttribute.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttribute.java Sun Nov 30 11:27:18 2014
@@ -48,7 +48,7 @@ public interface CharTermAttribute exten
/** Grows the termBuffer to at least size newSize, preserving the
* existing content.
* @param newSize minimum size of the new termBuffer
- * @return newly created termBuffer with length >= newSize
+ * @return newly created termBuffer with {@code length >= newSize}
*/
public char[] resizeBuffer(int newSize);
Modified: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/CodecUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/CodecUtil.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/CodecUtil.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/CodecUtil.java Sun Nov 30 11:27:18 2014
@@ -178,7 +178,7 @@ public final class CodecUtil {
* @param maxVersion The maximum supported expected version number.
* @return The actual version found, when a valid header is found
* that matches <code>codec</code>, with an actual version
- * where <code>minVersion <= actual <= maxVersion</code>.
+ * where {@code minVersion <= actual <= maxVersion}.
* Otherwise an exception is thrown.
* @throws CorruptIndexException If the first four bytes are not
* {@link #CODEC_MAGIC}, or if the actual codec found is
@@ -238,7 +238,7 @@ public final class CodecUtil {
* @param expectedSuffix The expected auxiliary suffix for this file.
* @return The actual version found, when a valid header is found
* that matches <code>codec</code>, with an actual version
- * where <code>minVersion <= actual <= maxVersion</code>,
+ * where {@code minVersion <= actual <= maxVersion},
* and matching <code>expectedID</code> and <code>expectedSuffix</code>
* Otherwise an exception is thrown.
* @throws CorruptIndexException If the first four bytes are not
@@ -422,18 +422,6 @@ public final class CodecUtil {
}
}
- /**
- * Checks that the stream is positioned at the end, and throws exception
- * if it is not.
- * @deprecated Use {@link #checkFooter} instead, this should only used for files without checksums
- */
- @Deprecated
- public static void checkEOF(IndexInput in) throws IOException {
- if (in.getFilePointer() != in.length()) {
- throw new CorruptIndexException("did not read all bytes from file: read " + in.getFilePointer() + " vs size " + in.length(), in);
- }
- }
-
/**
* Clones the provided input, reads all bytes from the file, and calls {@link #checkFooter}
* <p>
Modified: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListWriter.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListWriter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListWriter.java Sun Nov 30 11:27:18 2014
@@ -42,7 +42,7 @@ import org.apache.lucene.util.MathUtil;
* Skip level i contains every skipInterval-th entry from skip level i-1.
* Therefore the number of entries on level i is: floor(df / ((skipInterval ^ (i + 1))).
*
- * Each skip entry on a level i>0 contains a pointer to the corresponding skip entry in list i-1.
+ * Each skip entry on a level {@code i>0} contains a pointer to the corresponding skip entry in list i-1.
* This guarantees a logarithmic amount of skips to find the target document.
*
* While this class takes care of writing the different skip levels,
Modified: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/PushPostingsWriterBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/PushPostingsWriterBase.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/PushPostingsWriterBase.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/PushPostingsWriterBase.java Sun Nov 30 11:27:18 2014
@@ -183,7 +183,7 @@ public abstract class PushPostingsWriter
* for the field. */
public abstract void startDoc(int docID, int freq) throws IOException;
- /** Add a new position & payload, and start/end offset. A
+ /** Add a new position and payload, and start/end offset. A
* null payload means no payload; a non-null payload with
* zero length also means no payload. Caller may reuse
* the {@link BytesRef} for the payload between calls
@@ -191,7 +191,7 @@ public abstract class PushPostingsWriter
* and <code>endOffset</code> will be -1 when offsets are not indexed. */
public abstract void addPosition(int position, BytesRef payload, int startOffset, int endOffset) throws IOException;
- /** Called when we are done adding positions & payloads
+ /** Called when we are done adding positions and payloads
* for each doc. */
public abstract void finishDoc() throws IOException;
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/compressing/MatchingReaders.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/compressing/MatchingReaders.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/compressing/MatchingReaders.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/compressing/MatchingReaders.java Sun Nov 30 11:27:18 2014
@@ -22,7 +22,7 @@ import org.apache.lucene.index.MergeStat
import org.apache.lucene.index.SegmentReader;
/**
- * Computes which segments have identical field name->number mappings,
+ * Computes which segments have identical field name to number mappings,
* which allows stored fields and term vectors in this codec to be bulk-merged.
*/
class MatchingReaders {
Modified: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/lucene50/ForUtil.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/lucene50/ForUtil.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/lucene50/ForUtil.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/lucene50/ForUtil.java Sun Nov 30 11:27:18 2014
@@ -50,7 +50,7 @@ final class ForUtil {
* Upper limit of the number of values that might be decoded in a single call to
* {@link #readBlock(IndexInput, byte[], int[])}. Although values after
* <code>BLOCK_SIZE</code> are garbage, it is necessary to allocate value buffers
- * whose size is >= MAX_DATA_SIZE to avoid {@link ArrayIndexOutOfBoundsException}s.
+ * whose size is {@code >= MAX_DATA_SIZE} to avoid {@link ArrayIndexOutOfBoundsException}s.
*/
static final int MAX_DATA_SIZE;
static {
Modified: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesConsumer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesConsumer.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesConsumer.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesConsumer.java Sun Nov 30 11:27:18 2014
@@ -81,10 +81,10 @@ class Lucene50DocValuesConsumer extends
public static final int BINARY_PREFIX_COMPRESSED = 2;
/** Standard storage for sorted set values with 1 level of indirection:
- * docId -> address -> ord. */
+ * {@code docId -> address -> ord}. */
public static final int SORTED_WITH_ADDRESSES = 0;
/** Single-valued sorted set values, encoded as sorted values, so no level
- * of indirection: docId -> ord. */
+ * of indirection: {@code docId -> ord}. */
public static final int SORTED_SINGLE_VALUED = 1;
/** placeholder for missing offset that means there are no missing values */
Modified: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesFormat.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesFormat.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50DocValuesFormat.java Sun Nov 30 11:27:18 2014
@@ -131,7 +131,7 @@ import org.apache.lucene.util.packed.Mon
* <ul>
* <li>0 --> delta-compressed. For each block of 16k integers, every integer is delta-encoded
* from the minimum value within the block.
- * <li>1 -->, gcd-compressed. When all integers share a common divisor, only quotients are stored
+ * <li>1 --> gcd-compressed. When all integers share a common divisor, only quotients are stored
* using blocks of delta-encoded ints.
* <li>2 --> table-compressed. When the number of unique numeric values is small and it would save space,
* a lookup table of unique values is written, followed by the ordinal for each document.
@@ -141,7 +141,7 @@ import org.apache.lucene.util.packed.Mon
* <p>BinaryType indicates how Binary values will be stored:
* <ul>
* <li>0 --> fixed-width. All values have the same length, addressing by multiplication.
- * <li>1 -->, variable-width. An address for each value is stored.
+ * <li>1 --> variable-width. An address for each value is stored.
* <li>2 --> prefix-compressed. An address to the start of every interval'th value is stored.
* </ul>
* <p>MinLength and MaxLength represent the min and max byte[] value lengths for Binary values.
Modified: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/FieldTypes.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/FieldTypes.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/FieldTypes.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/FieldTypes.java Sun Nov 30 11:27:18 2014
@@ -20,6 +20,7 @@ package org.apache.lucene.document;
import java.io.IOException;
import java.math.BigInteger;
import java.net.InetAddress;
+import java.nio.charset.StandardCharsets;
import java.text.Collator;
import java.util.ArrayList;
import java.util.Collections;
@@ -1282,7 +1283,7 @@ public class FieldTypes {
/** Decodes String previously created by bytesToString. */
private static byte[] stringToBytes(String s) {
- byte[] bytesIn = s.getBytes(IOUtils.CHARSET_UTF_8);
+ byte[] bytesIn = s.getBytes(StandardCharsets.UTF_8);
byte[] bytesOut = new byte[bytesIn.length*7/8];
int carry = 0;
int carryBits = 0;
@@ -1326,7 +1327,7 @@ public class FieldTypes {
}
assert outUpto == bytesOut.length: "outUpto=" + outUpto + " bytesOut.length=" + bytesOut.length + " bytesIn.length=" + bytesIn.length + " carryBits=" + carryBits;
- return new String(bytesOut, IOUtils.CHARSET_UTF_8);
+ return new String(bytesOut, StandardCharsets.UTF_8);
}
public synchronized void setPostingsFormat(String fieldName, String postingsFormat) {
Modified: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/AutomatonTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/AutomatonTermsEnum.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/AutomatonTermsEnum.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/AutomatonTermsEnum.java Sun Nov 30 11:27:18 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/lucene6005/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java Sun Nov 30 11:27:18 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/lucene6005/lucene/core/src/java/org/apache/lucene/index/DocValuesType.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/DocValuesType.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/DocValuesType.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/DocValuesType.java Sun Nov 30 11:27:18 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/lucene6005/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushQueue.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushQueue.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushQueue.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushQueue.java Sun Nov 30 11:27:18 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/lucene6005/lucene/core/src/java/org/apache/lucene/index/FlushByRamOrCountsPolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/FlushByRamOrCountsPolicy.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/FlushByRamOrCountsPolicy.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/FlushByRamOrCountsPolicy.java Sun Nov 30 11:27:18 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/lucene6005/lucene/core/src/java/org/apache/lucene/index/IndexCommit.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/IndexCommit.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/IndexCommit.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/IndexCommit.java Sun Nov 30 11:27:18 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/lucene6005/lucene/core/src/java/org/apache/lucene/index/IndexFileNames.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/IndexFileNames.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/IndexFileNames.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/IndexFileNames.java Sun Nov 30 11:27:18 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/lucene6005/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Sun Nov 30 11:27:18 2014
@@ -1525,8 +1525,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
@@ -1545,7 +1545,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>
@@ -2787,7 +2787,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
@@ -2799,7 +2799,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/lucene6005/lucene/core/src/java/org/apache/lucene/index/LogMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/LogMergePolicy.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/LogMergePolicy.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/LogMergePolicy.java Sun Nov 30 11:27:18 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/lucene6005/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java Sun Nov 30 11:27:18 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/lucene6005/lucene/core/src/java/org/apache/lucene/index/MultiFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/MultiFields.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/MultiFields.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/MultiFields.java Sun Nov 30 11:27:18 2014
@@ -121,14 +121,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
@@ -148,7 +148,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 {
@@ -156,7 +156,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/lucene6005/lucene/core/src/java/org/apache/lucene/index/SegmentCommitInfo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/SegmentCommitInfo.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/SegmentCommitInfo.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/SegmentCommitInfo.java Sun Nov 30 11:27:18 2014
@@ -70,10 +70,6 @@ public class SegmentCommitInfo {
// track the fieldInfos update files
private final Set<String> fieldInfosFiles = new HashSet<>();
- // Track the per-generation updates files
- @Deprecated
- private final Map<Long,Set<String>> genUpdatesFiles = new HashMap<>();
-
private volatile long sizeInBytes = -1;
/**
@@ -100,24 +96,6 @@ public class SegmentCommitInfo {
this.docValuesGen = docValuesGen;
this.nextWriteDocValuesGen = docValuesGen == -1 ? 1 : docValuesGen + 1;
}
-
- /**
- * Sets the updates file names per generation. Does not deep clone the map.
- *
- * @deprecated required to support 4.6-4.8 indexes.
- */
- @Deprecated
- public void setGenUpdatesFiles(Map<Long,Set<String>> genUpdatesFiles) {
- this.genUpdatesFiles.clear();
- for (Map.Entry<Long,Set<String>> kv : genUpdatesFiles.entrySet()) {
- // rename the set
- Set<String> set = new HashSet<>();
- for (String file : kv.getValue()) {
- set.add(info.namedForThisSegment(file));
- }
- this.genUpdatesFiles.put(kv.getKey(), set);
- }
- }
/** Returns the per-field DocValues updates files. */
public Map<Integer,Set<String>> getDocValuesUpdatesFiles() {
@@ -248,12 +226,6 @@ public class SegmentCommitInfo {
// Must separately add any live docs files:
info.getCodec().liveDocsFormat().files(this, files);
-
- // Must separately add any per-gen updates files. This can go away when we
- // get rid of genUpdatesFiles (6.0)
- for (Set<String> updateFiles : genUpdatesFiles.values()) {
- files.addAll(updateFiles);
- }
// must separately add any field updates files
for (Set<String> updatefiles : dvUpdatesFiles.values()) {
@@ -378,11 +350,6 @@ public class SegmentCommitInfo {
other.nextWriteDocValuesGen = nextWriteDocValuesGen;
// deep clone
- for (Entry<Long,Set<String>> e : genUpdatesFiles.entrySet()) {
- other.genUpdatesFiles.put(e.getKey(), new HashSet<>(e.getValue()));
- }
-
- // deep clone
for (Entry<Integer,Set<String>> e : dvUpdatesFiles.entrySet()) {
other.dvUpdatesFiles.put(e.getKey(), new HashSet<>(e.getValue()));
}
Modified: lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java Sun Nov 30 11:27:18 2014
@@ -676,7 +676,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/lucene6005/lucene/core/src/java/org/apache/lucene/index/SortedDocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/SortedDocValues.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/SortedDocValues.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/SortedDocValues.java Sun Nov 30 11:27:18 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/lucene6005/lucene/core/src/java/org/apache/lucene/index/Terms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/Terms.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/Terms.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/Terms.java Sun Nov 30 11:27:18 2014
@@ -49,7 +49,7 @@ public abstract class Terms {
* documents that are accepted by the provided {@link
* CompiledAutomaton}. If the <code>startTerm</code> is
* provided then the returned enum will only return 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/lucene6005/lucene/core/src/java/org/apache/lucene/index/TermsHashPerField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/TermsHashPerField.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/TermsHashPerField.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/TermsHashPerField.java Sun Nov 30 11:27:18 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/lucene6005/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java Sun Nov 30 11:27:18 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/lucene6005/lucene/core/src/java/org/apache/lucene/search/FieldComparator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/FieldComparator.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/FieldComparator.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/FieldComparator.java Sun Nov 30 11:27:18 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/lucene6005/lucene/core/src/java/org/apache/lucene/search/FuzzyQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/FuzzyQuery.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/FuzzyQuery.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/FuzzyQuery.java Sun Nov 30 11:27:18 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/lucene6005/lucene/core/src/java/org/apache/lucene/search/LiveFieldValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/LiveFieldValues.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/LiveFieldValues.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/LiveFieldValues.java Sun Nov 30 11:27:18 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/lucene6005/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/TopDocsCollector.java Sun Nov 30 11:27:18 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/lucene6005/lucene/core/src/java/org/apache/lucene/search/similarities/SimilarityBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/similarities/SimilarityBase.java?rev=1642537&r1=1642536&r2=1642537&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/similarities/SimilarityBase.java (original)
+++ lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/similarities/SimilarityBase.java Sun Nov 30 11:27:18 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 {