You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2016/10/04 17:12:58 UTC
lucene-solr:master: Fix compilation.
Repository: lucene-solr
Updated Branches:
refs/heads/master d50cf9761 -> cf18c45b8
Fix compilation.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/cf18c45b
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/cf18c45b
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/cf18c45b
Branch: refs/heads/master
Commit: cf18c45b8e528363c5102731cd53e4e8b209e610
Parents: d50cf97
Author: Adrien Grand <jp...@gmail.com>
Authored: Tue Oct 4 19:12:20 2016 +0200
Committer: Adrien Grand <jp...@gmail.com>
Committed: Tue Oct 4 19:12:20 2016 +0200
----------------------------------------------------------------------
.../perfield/TestPerFieldDocValuesFormat.java | 16 ++++++++--------
.../queryparser/classic/MultiFieldQueryParser.java | 1 -
.../classic/TestMultiFieldQueryParser.java | 1 -
3 files changed, 8 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cf18c45b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java
index 5b985a4..d3ededf 100644
--- a/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java
+++ b/lucene/core/src/test/org/apache/lucene/codecs/perfield/TestPerFieldDocValuesFormat.java
@@ -204,28 +204,28 @@ public class TestPerFieldDocValuesFormat extends BaseDocValuesFormatTestCase {
final DocValuesConsumer consumer = delegate.fieldsConsumer(state);
return new DocValuesConsumer() {
@Override
- public void addNumericField(FieldInfo field, Iterable<Number> values) throws IOException {
+ public void addNumericField(FieldInfo field, DocValuesProducer values) throws IOException {
consumer.addNumericField(field, values);
}
@Override
- public void addBinaryField(FieldInfo field, Iterable<BytesRef> values) throws IOException {
+ public void addBinaryField(FieldInfo field, DocValuesProducer values) throws IOException {
consumer.addBinaryField(field, values);
}
@Override
- public void addSortedField(FieldInfo field, Iterable<BytesRef> values, Iterable<Number> docToOrd) throws IOException {
- consumer.addSortedField(field, values, docToOrd);
+ public void addSortedField(FieldInfo field, DocValuesProducer values) throws IOException {
+ consumer.addSortedField(field, values);
}
@Override
- public void addSortedNumericField(FieldInfo field, Iterable<Number> docToValueCount, Iterable<Number> values) throws IOException {
- consumer.addSortedNumericField(field, docToValueCount, values);
+ public void addSortedNumericField(FieldInfo field, DocValuesProducer values) throws IOException {
+ consumer.addSortedNumericField(field, values);
}
@Override
- public void addSortedSetField(FieldInfo field, Iterable<BytesRef> values, Iterable<Number> docToOrdCount, Iterable<Number> ords) throws IOException {
- consumer.addSortedSetField(field, values, docToOrdCount, ords);
+ public void addSortedSetField(FieldInfo field, DocValuesProducer values) throws IOException {
+ consumer.addSortedSetField(field, values);
}
@Override
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cf18c45b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/MultiFieldQueryParser.java
----------------------------------------------------------------------
diff --git a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/MultiFieldQueryParser.java b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/MultiFieldQueryParser.java
index 2d8db0d..3ee9c6c 100644
--- a/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/MultiFieldQueryParser.java
+++ b/lucene/queryparser/src/java/org/apache/lucene/queryparser/classic/MultiFieldQueryParser.java
@@ -27,7 +27,6 @@ import org.apache.lucene.search.BoostQuery;
import org.apache.lucene.search.MultiPhraseQuery;
import org.apache.lucene.search.PhraseQuery;
import org.apache.lucene.search.Query;
-import org.apache.lucene.search.TermQuery;
/**
* A QueryParser which constructs queries to search multiple fields.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/cf18c45b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java
----------------------------------------------------------------------
diff --git a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java
index 86ef54b..ed76ff5 100644
--- a/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java
+++ b/lucene/queryparser/src/test/org/apache/lucene/queryparser/classic/TestMultiFieldQueryParser.java
@@ -28,7 +28,6 @@ import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Term;
-import org.apache.lucene.queryparser.util.QueryParserTestBase;
import org.apache.lucene.search.BooleanClause.Occur;
import org.apache.lucene.search.BooleanClause;
import org.apache.lucene.search.BooleanQuery;