You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ro...@apache.org on 2016/01/25 11:36:51 UTC
lucene-solr git commit: LUCENE-6988: IndexableField.tokenStream() no
longer throws IOException
Repository: lucene-solr
Updated Branches:
refs/heads/master b62c6715d -> 75dd5e9f9
LUCENE-6988: IndexableField.tokenStream() no longer throws IOException
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/75dd5e9f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/75dd5e9f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/75dd5e9f
Branch: refs/heads/master
Commit: 75dd5e9f9e13c72890f1e5b1695f8281fe990d94
Parents: b62c671
Author: Alan Woodward <ro...@apache.org>
Authored: Mon Jan 25 10:04:41 2016 +0000
Committer: Alan Woodward <ro...@apache.org>
Committed: Mon Jan 25 10:04:41 2016 +0000
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +++
.../java/org/apache/lucene/codecs/StoredFieldsWriter.java | 2 +-
lucene/core/src/java/org/apache/lucene/document/Field.java | 3 +--
.../src/java/org/apache/lucene/index/IndexableField.java | 8 +++-----
.../src/test/org/apache/lucene/index/TestFieldReuse.java | 2 +-
.../org/apache/lucene/index/TestIndexWriterExceptions.java | 2 +-
.../src/test/org/apache/lucene/index/TestIndexableField.java | 3 +--
.../src/java/org/apache/lucene/document/LazyDocument.java | 2 +-
.../lucene/codecs/idversion/StringAndPayloadField.java | 4 +---
.../apache/lucene/search/suggest/document/SuggestField.java | 6 ++++--
10 files changed, 17 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75dd5e9f/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 775f5f4..22d4f85 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -164,6 +164,9 @@ API Changes
* LUCENE-6932: IndexInput.seek implementations now throw EOFException
if you seek beyond the end of the file (Adrien Grand, Mike McCandless)
+* LUCENE-6988: IndexableField.tokenStream() no longer throws IOException
+ (Alan Woodward)
+
Optimizations
* LUCENE-6951: Improve GeoPointInPolygonQuery using point orientation based
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75dd5e9f/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java b/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java
index ce7feac..109ae5c 100644
--- a/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java
+++ b/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsWriter.java
@@ -225,7 +225,7 @@ public abstract class StoredFieldsWriter implements Closeable {
}
@Override
- public TokenStream tokenStream(Analyzer analyzer, TokenStream reuse) throws IOException {
+ public TokenStream tokenStream(Analyzer analyzer, TokenStream reuse) {
return null;
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75dd5e9f/lucene/core/src/java/org/apache/lucene/document/Field.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/document/Field.java b/lucene/core/src/java/org/apache/lucene/document/Field.java
index 9f3ae5c..68f1699 100644
--- a/lucene/core/src/java/org/apache/lucene/document/Field.java
+++ b/lucene/core/src/java/org/apache/lucene/document/Field.java
@@ -28,7 +28,6 @@ import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.analysis.tokenattributes.OffsetAttribute;
import org.apache.lucene.index.IndexOptions;
import org.apache.lucene.index.IndexableField;
-import org.apache.lucene.index.IndexableField;
import org.apache.lucene.index.IndexableFieldType;
import org.apache.lucene.util.BytesRef;
@@ -497,7 +496,7 @@ public class Field implements IndexableField {
}
@Override
- public TokenStream tokenStream(Analyzer analyzer, TokenStream reuse) throws IOException {
+ public TokenStream tokenStream(Analyzer analyzer, TokenStream reuse) {
if (fieldType().indexOptions() == IndexOptions.NONE) {
// Not indexed
return null;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75dd5e9f/lucene/core/src/java/org/apache/lucene/index/IndexableField.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/java/org/apache/lucene/index/IndexableField.java b/lucene/core/src/java/org/apache/lucene/index/IndexableField.java
index 6de06c3..2045f45 100644
--- a/lucene/core/src/java/org/apache/lucene/index/IndexableField.java
+++ b/lucene/core/src/java/org/apache/lucene/index/IndexableField.java
@@ -17,13 +17,12 @@ package org.apache.lucene.index;
* limitations under the License.
*/
-import java.io.IOException;
import java.io.Reader;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.search.similarities.ClassicSimilarity; // javadocs
-import org.apache.lucene.search.similarities.Similarity; // javadocs
+import org.apache.lucene.search.similarities.ClassicSimilarity;
+import org.apache.lucene.search.similarities.Similarity;
import org.apache.lucene.util.BytesRef;
// TODO: how to handle versioning here...?
@@ -55,9 +54,8 @@ public interface IndexableField {
* check.
* @return TokenStream value for indexing the document. Should always return
* a non-null value if the field is to be indexed
- * @throws IOException Can be thrown while creating the TokenStream
*/
- public TokenStream tokenStream(Analyzer analyzer, TokenStream reuse) throws IOException;
+ public TokenStream tokenStream(Analyzer analyzer, TokenStream reuse);
/**
* Returns the field's index-time boost.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75dd5e9f/lucene/core/src/test/org/apache/lucene/index/TestFieldReuse.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestFieldReuse.java b/lucene/core/src/test/org/apache/lucene/index/TestFieldReuse.java
index fd87b7d..2fdabad 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestFieldReuse.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestFieldReuse.java
@@ -117,7 +117,7 @@ public class TestFieldReuse extends BaseTokenStreamTestCase {
}
@Override
- public TokenStream tokenStream(Analyzer analyzer, TokenStream reuse) throws IOException {
+ public TokenStream tokenStream(Analyzer analyzer, TokenStream reuse) {
lastSeen = reuse;
return lastReturned = new CannedTokenStream(new Token("unimportant", 0, 10));
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75dd5e9f/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
index d858b52..055fc5a 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
@@ -1786,7 +1786,7 @@ public class TestIndexWriterExceptions extends LuceneTestCase {
}
@Override
- public TokenStream tokenStream(Analyzer analyzer, TokenStream reuse) throws IOException {
+ public TokenStream tokenStream(Analyzer analyzer, TokenStream reuse) {
return null;
}
});
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75dd5e9f/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java b/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
index 28a9eaf..de2f60c 100644
--- a/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
+++ b/lucene/core/src/test/org/apache/lucene/index/TestIndexableField.java
@@ -17,7 +17,6 @@ package org.apache.lucene.index;
* limitations under the License.
*/
-import java.io.IOException;
import java.io.Reader;
import java.io.StringReader;
import java.util.Collections;
@@ -159,7 +158,7 @@ public class TestIndexableField extends LuceneTestCase {
}
@Override
- public TokenStream tokenStream(Analyzer analyzer, TokenStream previous) throws IOException {
+ public TokenStream tokenStream(Analyzer analyzer, TokenStream previous) {
return readerValue() != null ? analyzer.tokenStream(name(), readerValue()) :
analyzer.tokenStream(name(), new StringReader(stringValue()));
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75dd5e9f/lucene/misc/src/java/org/apache/lucene/document/LazyDocument.java
----------------------------------------------------------------------
diff --git a/lucene/misc/src/java/org/apache/lucene/document/LazyDocument.java b/lucene/misc/src/java/org/apache/lucene/document/LazyDocument.java
index cfc24b5..be8e07d 100644
--- a/lucene/misc/src/java/org/apache/lucene/document/LazyDocument.java
+++ b/lucene/misc/src/java/org/apache/lucene/document/LazyDocument.java
@@ -191,7 +191,7 @@ public class LazyDocument {
}
@Override
- public TokenStream tokenStream(Analyzer analyzer, TokenStream reuse) throws IOException {
+ public TokenStream tokenStream(Analyzer analyzer, TokenStream reuse) {
return getRealValue().tokenStream(analyzer, reuse);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75dd5e9f/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/StringAndPayloadField.java
----------------------------------------------------------------------
diff --git a/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/StringAndPayloadField.java b/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/StringAndPayloadField.java
index 4514351..41624f3 100644
--- a/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/StringAndPayloadField.java
+++ b/lucene/sandbox/src/test/org/apache/lucene/codecs/idversion/StringAndPayloadField.java
@@ -17,8 +17,6 @@ package org.apache.lucene.codecs.idversion;
* limitations under the License.
*/
-import java.io.IOException;
-
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
@@ -50,7 +48,7 @@ class StringAndPayloadField extends Field {
}
@Override
- public TokenStream tokenStream(Analyzer analyzer, TokenStream reuse) throws IOException {
+ public TokenStream tokenStream(Analyzer analyzer, TokenStream reuse) {
SingleTokenWithPayloadTokenStream ts;
if (reuse instanceof SingleTokenWithPayloadTokenStream) {
ts = (SingleTokenWithPayloadTokenStream) reuse;
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/75dd5e9f/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestField.java
----------------------------------------------------------------------
diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestField.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestField.java
index c6d1a4a..00a733f 100644
--- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestField.java
+++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/document/SuggestField.java
@@ -100,7 +100,7 @@ public class SuggestField extends Field {
}
@Override
- public TokenStream tokenStream(Analyzer analyzer, TokenStream reuse) throws IOException {
+ public TokenStream tokenStream(Analyzer analyzer, TokenStream reuse) {
CompletionTokenStream completionStream = wrapTokenStream(super.tokenStream(analyzer, reuse));
completionStream.setPayload(buildSuggestPayload());
return completionStream;
@@ -126,13 +126,15 @@ public class SuggestField extends Field {
return TYPE;
}
- private BytesRef buildSuggestPayload() throws IOException {
+ private BytesRef buildSuggestPayload() {
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
try (OutputStreamDataOutput output = new OutputStreamDataOutput(byteArrayOutputStream)) {
output.writeVInt(surfaceForm.length);
output.writeBytes(surfaceForm.bytes, surfaceForm.offset, surfaceForm.length);
output.writeVInt(weight + 1);
output.writeByte(type());
+ } catch (IOException e) {
+ throw new RuntimeException(e); // not possible, it's a ByteArrayOutputStream!
}
return new BytesRef(byteArrayOutputStream.toByteArray());
}