You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2017/01/24 08:59:31 UTC
lucene-solr:apiv2: fixing merge errors
Repository: lucene-solr
Updated Branches:
refs/heads/apiv2 8d05282be -> 065c0e215
fixing merge errors
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/065c0e21
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/065c0e21
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/065c0e21
Branch: refs/heads/apiv2
Commit: 065c0e215e9009ed220efc7af119e57e4bebff56
Parents: 8d05282
Author: Noble Paul <no...@apache.org>
Authored: Tue Jan 24 19:29:23 2017 +1030
Committer: Noble Paul <no...@apache.org>
Committed: Tue Jan 24 19:29:23 2017 +1030
----------------------------------------------------------------------
solr/core/src/java/org/apache/solr/schema/CollationField.java | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/065c0e21/solr/core/src/java/org/apache/solr/schema/CollationField.java
----------------------------------------------------------------------
diff --git a/solr/core/src/java/org/apache/solr/schema/CollationField.java b/solr/core/src/java/org/apache/solr/schema/CollationField.java
index 998db2a..805e204 100644
--- a/solr/core/src/java/org/apache/solr/schema/CollationField.java
+++ b/solr/core/src/java/org/apache/solr/schema/CollationField.java
@@ -36,7 +36,6 @@ import org.apache.lucene.collation.CollationKeyAnalyzer;
import org.apache.lucene.document.SortedDocValuesField;
import org.apache.lucene.document.SortedSetDocValuesField;
import org.apache.lucene.index.IndexableField;
-import org.apache.lucene.search.DocValuesRangeQuery;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.SortField;
import org.apache.lucene.search.TermRangeQuery;
@@ -242,7 +241,7 @@ public class CollationField extends FieldType {
BytesRef low = part1 == null ? null : getCollationKey(f, part1);
BytesRef high = part2 == null ? null : getCollationKey(f, part2);
if (!field.indexed() && field.hasDocValues()) {
- return DocValuesRangeQuery.newBytesRefRange(
+ return SortedSetDocValuesField.newRangeQuery(
field.getName(), low, high, minInclusive, maxInclusive);
} else {
return new TermRangeQuery(field.getName(), low, high, minInclusive, maxInclusive);