You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/08/16 19:38:03 UTC
svn commit: r1373940 - in /lucene/dev/branches/lucene3312/lucene:
core/src/java/ core/src/java/org/apache/lucene/analysis/
core/src/java/org/apache/lucene/codecs/
core/src/java/org/apache/lucene/document/
core/src/java/org/apache/lucene/index/ test-fra...
Author: uschindler
Date: Thu Aug 16 17:38:02 2012
New Revision: 1373940
URL: http://svn.apache.org/viewvc?rev=1373940&view=rev
Log:
LUCENE-3312: Apply patch lucene-3312-patch-13.patch
Modified:
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/package.html
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/Document.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/lucene3312/lucene/core/src/java/overview.html
lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java
Modified: lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/package.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/package.html?rev=1373940&r1=1373939&r2=1373940&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/package.html (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/package.html Thu Aug 16 17:38:02 2012
@@ -168,7 +168,7 @@ and proximity searches (though sentence
<ul>
<li>
At indexing, as a consequence of
- {@link org.apache.lucene.index.IndexWriter#addDocument(Iterable) addDocument(doc)},
+ {@link org.apache.lucene.index.IndexWriter#addDocument(IndexDocument) addDocument(doc)},
the Analyzer in effect for indexing is invoked for each indexed field of the added document.
</li>
<li>
@@ -241,7 +241,7 @@ and proximity searches (though sentence
</p>
<h3>Field Section Boundaries</h3>
<p>
- When {@link org.apache.lucene.document.Document#add(org.apache.lucene.index.IndexableField) document.add(field)}
+ When {@link org.apache.lucene.document.Document#add(org.apache.lucene.document.Field) document.add(field)}
is called multiple times for the same field name, we could say that each such call creates a new
section for that field in that document.
In fact, a separate call to
Modified: lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java?rev=1373940&r1=1373939&r2=1373940&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java Thu Aug 16 17:38:02 2012
@@ -69,7 +69,7 @@ public abstract class StoredFieldsWriter
/** Merges in the stored fields from the readers in
* <code>mergeState</code>. The default implementation skips
* over deleted documents, and uses {@link #startDocument(int)},
- * {@link #writeField(FieldInfo, StorableField)}, and {@link #finish(int)},
+ * {@link #writeField(FieldInfo, StorableField)}, and {@link #finish(FieldInfos, int)},
* returning the number of documents that were written.
* Implementations can override this method for more sophisticated
* merging (bulk-byte copying, etc). */
Modified: lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/Document.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/Document.java?rev=1373940&r1=1373939&r2=1373940&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/Document.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/Document.java Thu Aug 16 17:38:02 2012
@@ -56,7 +56,6 @@ public final class Document implements I
* Creates a Document from StoredDocument so it that can be used e.g. for another
* round of indexing.
*
- * @return a new instance of Document representation of this StoredDocument
*/
public Document(StoredDocument storedDoc) {
for (StorableField field : storedDoc.getFields()) {
Modified: lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java?rev=1373940&r1=1373939&r2=1373940&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Thu Aug 16 17:38:02 2012
@@ -69,10 +69,10 @@ import org.apache.lucene.util.ThreadInte
new index if there is not already an index at the provided path
and otherwise open the existing index.</p>
- <p>In either case, documents are added with {@link #addDocument(Iterable)
+ <p>In either case, documents are added with {@link #addDocument(IndexDocument)
addDocument} and removed with {@link #deleteDocuments(Term)} or {@link
#deleteDocuments(Query)}. A document can be updated with {@link
- #updateDocument(Term, Iterable) updateDocument} (which just deletes
+ #updateDocument(Term, IndexDocument) updateDocument} (which just deletes
and then adds the entire document). When finished adding, deleting
and updating documents, {@link #close() close} should be called.</p>
@@ -1096,7 +1096,7 @@ public class IndexWriter implements Clos
* Adds a document to this index, using the provided analyzer instead of the
* value of {@link #getAnalyzer()}.
*
- * <p>See {@link #addDocument(Iterable)} for details on
+ * <p>See {@link #addDocument(IndexDocument)} for details on
* index and IndexWriter state after an Exception, and
* flushing/merging temporary free space requirements.</p>
*
@@ -1132,7 +1132,7 @@ public class IndexWriter implements Clos
* perhaps to obtain better index compression), in which case
* you may need to fully re-index your documents at that time.
*
- * <p>See {@link #addDocument(Iterable)} for details on
+ * <p>See {@link #addDocument(IndexDocument)} for details on
* index and IndexWriter state after an Exception, and
* flushing/merging temporary free space requirements.</p>
*
Modified: lucene/dev/branches/lucene3312/lucene/core/src/java/overview.html
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/java/overview.html?rev=1373940&r1=1373939&r2=1373940&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/java/overview.html (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/java/overview.html Thu Aug 16 17:38:02 2012
@@ -130,7 +130,7 @@ adding
<li>
Create an {@link org.apache.lucene.index.IndexWriter IndexWriter}
-and add documents to it with {@link org.apache.lucene.index.IndexWriter#addDocument(Iterable) addDocument()};</li>
+and add documents to it with {@link org.apache.lucene.index.IndexWriter#addDocument(org.apache.lucene.index.IndexDocument) addDocument()};</li>
<li>
Call <a href="../queryparser/org/apache/lucene/queryparser/classic/QueryParserBase.html#parse(java.lang.String)">QueryParser.parse()</a>
Modified: lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java?rev=1373940&r1=1373939&r2=1373940&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java (original)
+++ lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/index/RandomIndexWriter.java Thu Aug 16 17:38:02 2012
@@ -139,7 +139,7 @@ public class RandomIndexWriter implement
/**
* Adds a Document.
- * @see IndexWriter#addDocument(Iterable)
+ * @see IndexWriter#addDocument(org.apache.lucene.index.IndexDocument)
*/
public <T extends IndexableField> void addDocument(final IndexDocument doc) throws IOException {
addDocument(doc, w.getAnalyzer());
@@ -285,7 +285,7 @@ public class RandomIndexWriter implement
/**
* Updates a document.
- * @see IndexWriter#updateDocument(Term, Iterable)
+ * @see IndexWriter#updateDocument(Term, org.apache.lucene.index.IndexDocument)
*/
public <T extends IndexableField> void updateDocument(Term t, final IndexDocument doc) throws IOException {
if (doDocValues) {