This is an automated email from the ASF dual-hosted git repository.
ishan pushed a commit to branch ishan/upgrade-to-lucene-10
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/ishan/upgrade-to-lucene-10 by
this push:
new 705fe9b54bd Changed rewrite method signature, added DV skip to
FieldInfo constructor, more scorerSupplier() fixes
705fe9b54bd is described below
commit 705fe9b54bd6c02e22f1fd6897ecd81d0a1abb5a
Author: Ishan Chattopadhyaya <[email protected]>
AuthorDate: Thu Jan 16 02:50:41 2025 +0530
Changed rewrite method signature, added DV skip to FieldInfo constructor,
more scorerSupplier() fixes
---
.../org/apache/solr/handler/component/QueryComponent.java | 1 -
.../apache/solr/handler/component/RealTimeGetComponent.java | 2 +-
.../core/src/java/org/apache/solr/query/SolrRangeQuery.java | 2 +-
solr/core/src/java/org/apache/solr/schema/SchemaField.java | 13 +++++++------
.../java/org/apache/solr/search/AbstractReRankQuery.java | 6 +++---
.../org/apache/solr/search/CollapsingQParserPlugin.java | 1 -
.../java/org/apache/solr/search/ExportQParserPlugin.java | 6 +++---
.../org/apache/solr/search/GraphTermsQParserPlugin.java | 2 +-
8 files changed, 16 insertions(+), 17 deletions(-)
diff --git
a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
index 0552c6a0c4e..ce9aa546484 100644
--- a/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
@@ -1755,7 +1755,6 @@ public class QueryComponent extends SearchComponent {
this.score = score;
}
- @Override
public int docID() {
return docid;
}
diff --git
a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
index 6118b21a086..11fae95d091 100644
---
a/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
+++
b/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
@@ -330,7 +330,7 @@ public class RealTimeGetComponent extends SearchComponent {
if (rb.getFilters() != null) {
for (Query raw : rb.getFilters()) {
raw = makeQueryable(raw);
- Query q =
raw.rewrite(searcherInfo.getSearcher().getIndexReader());
+ Query q = raw.rewrite(searcherInfo.getSearcher());
Scorer scorer =
searcherInfo
.getSearcher()
diff --git a/solr/core/src/java/org/apache/solr/query/SolrRangeQuery.java
b/solr/core/src/java/org/apache/solr/query/SolrRangeQuery.java
index 0ca17780ee0..2f69565fb82 100644
--- a/solr/core/src/java/org/apache/solr/query/SolrRangeQuery.java
+++ b/solr/core/src/java/org/apache/solr/query/SolrRangeQuery.java
@@ -141,7 +141,7 @@ public final class SolrRangeQuery extends ExtendedQueryBase
implements DocSetPro
}
@Override
- public Query rewrite(IndexReader reader) throws IOException {
+ public Query rewrite(IndexSearcher searcher) throws IOException {
return this;
}
diff --git a/solr/core/src/java/org/apache/solr/schema/SchemaField.java
b/solr/core/src/java/org/apache/solr/schema/SchemaField.java
index e40e1a98e06..081f193edd4 100644
--- a/solr/core/src/java/org/apache/solr/schema/SchemaField.java
+++ b/solr/core/src/java/org/apache/solr/schema/SchemaField.java
@@ -21,12 +21,8 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import org.apache.lucene.index.DocValuesType;
-import org.apache.lucene.index.IndexOptions;
-import org.apache.lucene.index.IndexableField;
-import org.apache.lucene.index.IndexableFieldType;
-import org.apache.lucene.index.VectorEncoding;
-import org.apache.lucene.index.VectorSimilarityFunction;
+
+import org.apache.lucene.index.*;
import org.apache.lucene.search.SortField;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.util.SimpleOrderedMap;
@@ -531,6 +527,11 @@ public final class SchemaField extends FieldProperties
implements IndexableField
return DocValuesType.NONE;
}
+ @Override
+ public DocValuesSkipIndexType docValuesSkipIndexType() {
+ return DocValuesSkipIndexType.NONE;
+ }
+
@Override
public int pointDimensionCount() {
return 0;
diff --git a/solr/core/src/java/org/apache/solr/search/AbstractReRankQuery.java
b/solr/core/src/java/org/apache/solr/search/AbstractReRankQuery.java
index 62c4bd98bbc..868555de187 100644
--- a/solr/core/src/java/org/apache/solr/search/AbstractReRankQuery.java
+++ b/solr/core/src/java/org/apache/solr/search/AbstractReRankQuery.java
@@ -97,12 +97,12 @@ public abstract class AbstractReRankQuery extends RankQuery
{
}
@Override
- public Query rewrite(IndexReader reader) throws IOException {
- Query q = mainQuery.rewrite(reader);
+ public Query rewrite(IndexSearcher searcher) throws IOException {
+ Query q = mainQuery.rewrite(searcher);
if (!q.equals(mainQuery)) {
return rewrite(q);
}
- return super.rewrite(reader);
+ return super.rewrite(searcher);
}
protected abstract Query rewrite(Query rewrittenMainQuery) throws
IOException;
diff --git
a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
index 05b50bba2a4..305ec074903 100644
--- a/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/CollapsingQParserPlugin.java
@@ -572,7 +572,6 @@ public class CollapsingQParserPlugin extends QParserPlugin {
return score;
}
- @Override
public int docID() {
return docId;
}
diff --git a/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.java
b/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.java
index 8529533dfb3..d2aa134047c 100644
--- a/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/ExportQParserPlugin.java
@@ -94,10 +94,10 @@ public class ExportQParserPlugin extends QParserPlugin {
}
@Override
- public Query rewrite(IndexReader reader) throws IOException {
- Query q = mainQuery.rewrite(reader);
+ public Query rewrite(IndexSearcher searcher) throws IOException {
+ Query q = mainQuery.rewrite(searcher);
if (q.equals(mainQuery)) {
- return super.rewrite(reader);
+ return super.rewrite(searcher);
} else {
return clone().wrap(q);
}
diff --git
a/solr/core/src/java/org/apache/solr/search/GraphTermsQParserPlugin.java
b/solr/core/src/java/org/apache/solr/search/GraphTermsQParserPlugin.java
index 48d4750f98e..634af17f5c0 100644
--- a/solr/core/src/java/org/apache/solr/search/GraphTermsQParserPlugin.java
+++ b/solr/core/src/java/org/apache/solr/search/GraphTermsQParserPlugin.java
@@ -188,7 +188,7 @@ public class GraphTermsQParserPlugin extends QParserPlugin {
public void setCost(int cost) {}
@Override
- public Query rewrite(IndexReader reader) throws IOException {
+ public Query rewrite(IndexSearcher searcher) throws IOException {
return this;
}
