Skip to content

armgit / solr

Public Imported from GitHub
0

Apache Solr open-source search software

SOLR-17738: DocTransformer, remove deprecated methods (#3320)

Abhishek Umarjikar55bbdcde42d5
diff --git a/solr/CHANGES.txt b/solr/CHANGES.txt
index c33e9af28b3..827010c59c1 100644
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@ -123,6 +123,8 @@ Deprecation Removals
* SOLR-17683: Removed deprecated CurrencyField field type. (Eric Pugh)
+* SOLR-17738: Removed deprecated `transform()` from `DocTransformer`. (Abhishek Umarjikar, Houston Putman)
+
Dependency Upgrades
---------------------
(No changes)
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..4b48198cc3c 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
@@ -82,6 +82,7 @@ import org.apache.solr.response.transform.DocTransformer;
import org.apache.solr.schema.FieldType;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.schema.SchemaField;
+import org.apache.solr.search.DocIterationInfo;
import org.apache.solr.search.DocList;
import org.apache.solr.search.DocValuesIteratorCache;
import org.apache.solr.search.QueryUtils;
@@ -279,7 +280,7 @@ public class RealTimeGetComponent extends SearchComponent {
(SolrInputDocument) entry.get(entry.size() - 1), core.getLatestSchema());
// toSolrDoc filtered copy-field targets already
if (transformer != null) {
- transformer.transform(doc, -1); // unknown docID
+ transformer.transform(doc, -1, DocIterationInfo.NONE); // unknown docID
}
} else if (oper == UpdateLog.UPDATE_INPLACE) {
assert entry.size() == 5;
@@ -364,7 +365,7 @@ public class RealTimeGetComponent extends SearchComponent {
transformer.setContext(
resultContext); // we avoid calling setContext unless searcher is new/changed
}
- transformer.transform(doc, docid);
+ transformer.transform(doc, docid, DocIterationInfo.NONE);
}
docList.add(doc);
} // loop on ids
@@ -511,7 +512,7 @@ public class RealTimeGetComponent extends SearchComponent {
toSolrDoc(partialDoc, schema, forInPlaceUpdate); // filters copy-field targets TODO don't
DocTransformer transformer = returnFields.getTransformer();
if (transformer != null && !transformer.needsSolrIndexSearcher()) {
- transformer.transform(solrDoc, -1); // no docId when from the ulog
+ transformer.transform(solrDoc, -1, DocIterationInfo.NONE); // no docId when from the ulog
} // if needs searcher, it must be [child]; tlog docs already have children
return solrDoc;
}
@@ -622,7 +623,7 @@ public class RealTimeGetComponent extends SearchComponent {
if (transformer != null) {
transformer.setContext(
new RTGResultContext(returnFields, searcher, null)); // we get away with null req
- transformer.transform(solrDoc, docId);
+ transformer.transform(solrDoc, docId, DocIterationInfo.NONE);
}
return solrDoc;
}
diff --git a/solr/core/src/java/org/apache/solr/response/DocsStreamer.java b/solr/core/src/java/org/apache/solr/response/DocsStreamer.java
index 08761b4c2aa..475b5cb2f73 100644
--- a/solr/core/src/java/org/apache/solr/response/DocsStreamer.java
+++ b/solr/core/src/java/org/apache/solr/response/DocsStreamer.java
@@ -100,11 +100,7 @@ public class DocsStreamer implements Iterator<SolrDocument> {
if (transformer != null) {
try {
- if (docs.hasScores()) {
- transformer.transform(sdoc, id, docIterator);
- } else {
- transformer.transform(sdoc, id);
- }
+ transformer.transform(sdoc, id, docIterator);
} catch (IOException e) {
throw new SolrException(
SolrException.ErrorCode.SERVER_ERROR, "Error applying transformer", e);
diff --git a/solr/core/src/java/org/apache/solr/response/transform/BaseEditorialTransformer.java b/solr/core/src/java/org/apache/solr/response/transform/BaseEditorialTransformer.java
index 3ff7c639f5d..62317a98b6e 100644
--- a/solr/core/src/java/org/apache/solr/response/transform/BaseEditorialTransformer.java
+++ b/solr/core/src/java/org/apache/solr/response/transform/BaseEditorialTransformer.java
@@ -22,6 +22,7 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.BytesRefBuilder;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.schema.FieldType;
+import org.apache.solr.search.DocIterationInfo;
/** */
public abstract class BaseEditorialTransformer extends DocTransformer {
@@ -42,7 +43,7 @@ public abstract class BaseEditorialTransformer extends DocTransformer {
}
@Override
- public void transform(SolrDocument doc, int docid) {
+ public void transform(SolrDocument doc, int docid, DocIterationInfo docInfo) {
// this only gets added if QueryElevationParams.MARK_EXCLUDED is true
Set<BytesRef> ids = getIdSet();
if (ids != null && ids.isEmpty() == false) {
diff --git a/solr/core/src/java/org/apache/solr/response/transform/ChildDocTransformer.java b/solr/core/src/java/org/apache/solr/response/transform/ChildDocTransformer.java
index d8a4f084226..204aa7a6190 100644
--- a/solr/core/src/java/org/apache/solr/response/transform/ChildDocTransformer.java
+++ b/solr/core/src/java/org/apache/solr/response/transform/ChildDocTransformer.java
@@ -44,6 +44,7 @@ import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrException;
import org.apache.solr.schema.IndexSchema;
import org.apache.solr.search.BitsFilteredPostingsEnum;
+import org.apache.solr.search.DocIterationInfo;
import org.apache.solr.search.DocSet;
import org.apache.solr.search.SolrDocumentFetcher;
import org.apache.solr.search.SolrIndexSearcher;
@@ -125,11 +126,10 @@ class ChildDocTransformer extends DocTransformer {
}
@Override
- public void transform(SolrDocument rootDoc, int rootDocId) {
+ public void transform(SolrDocument rootDoc, int rootDocId, DocIterationInfo docInfo) {
// note: this algorithm works if both if we have have _nest_path_ and also if we don't!
try {
-
// lookup what the *previous* rootDocId is, and figure which segment this is
final SolrIndexSearcher searcher = context.getSearcher();
final List<LeafReaderContext> leaves = searcher.getIndexReader().leaves();
@@ -214,7 +214,7 @@ class ChildDocTransformer extends DocTransformer {
if (childReturnFields.getTransformer().context == null) {
childReturnFields.getTransformer().setContext(context);
}
- childReturnFields.getTransformer().transform(doc, docId);
+ childReturnFields.getTransformer().transform(doc, docId, docInfo);
}
if (isAncestor) {
diff --git a/solr/core/src/java/org/apache/solr/response/transform/DocIdAugmenterFactory.java b/solr/core/src/java/org/apache/solr/response/transform/DocIdAugmenterFactory.java
index d384390af81..d22e6a43d0b 100644
--- a/solr/core/src/java/org/apache/solr/response/transform/DocIdAugmenterFactory.java
+++ b/solr/core/src/java/org/apache/solr/response/transform/DocIdAugmenterFactory.java
@@ -19,6 +19,7 @@ package org.apache.solr.response.transform;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.search.DocIterationInfo;
/**
* Augments the document with a <code>[docid]</code> integer containing it's current (internal) id
@@ -46,7 +47,7 @@ public class DocIdAugmenterFactory extends TransformerFactory {
}
@Override
- public void transform(SolrDocument doc, int docid) {
+ public void transform(SolrDocument doc, int docid, DocIterationInfo docInfo) {
assert -1 <= docid;
doc.setField(name, docid);
}
diff --git a/solr/core/src/java/org/apache/solr/response/transform/DocTransformer.java b/solr/core/src/java/org/apache/solr/response/transform/DocTransformer.java
index 5ce18a4b3bc..0acd9e95026 100644
--- a/solr/core/src/java/org/apache/solr/response/transform/DocTransformer.java
+++ b/solr/core/src/java/org/apache/solr/response/transform/DocTransformer.java
@@ -90,42 +90,6 @@ public abstract class DocTransformer {
return false;
}
- /**
- * This is where implementations do the actual work. If implementations require a valid docId and
- * index access, the {@link #needsSolrIndexSearcher} method must return true
- *
- * <p>Default implementation calls {@link #transform(SolrDocument, int)}.
- *
- * @param doc The document to alter
- * @param docid The Lucene internal doc id, or -1 in cases where the <code>doc</code> did not come
- * from the index
- * @param score the score for this document
- * @throws IOException If there is a low-level I/O error.
- * @see #needsSolrIndexSearcher
- * @deprecated use {@link #transform(SolrDocument, int, DocIterationInfo)} instead
- */
- @Deprecated(forRemoval = true, since = "9.9.0")
- public void transform(SolrDocument doc, int docid, float score) throws IOException {
- transform(doc, docid);
- }
-
- /**
- * This is where implementations do the actual work. If implementations require a valid docId and
- * index access, the {@link #needsSolrIndexSearcher} method must return true
- *
- * <p>Default implementation calls {@link #transform(SolrDocument, int)}.
- *
- * @param doc The document to alter
- * @param docid The Lucene internal doc id, or -1 in cases where the <code>doc</code> did not come
- * from the index
- * @param docInfo the document information for this document, including the score
- * @throws IOException If there is a low-level I/O error.
- * @see #needsSolrIndexSearcher
- */
- public void transform(SolrDocument doc, int docid, DocIterationInfo docInfo) throws IOException {
- transform(doc, docid, docInfo.score());
- }
-
/**
* This is where implementations do the actual work. If implementations require a valid docId and
* index access, the {@link #needsSolrIndexSearcher} method must return true
@@ -133,12 +97,13 @@ public abstract class DocTransformer {
* @param doc The document to alter
* @param docid The Lucene internal doc id, or -1 in cases where the <code>doc</code> did not come
* from the index
+ * @param docInfo the document information for this document, including the score. Do not pass
+ * <code>null</code>, instead use {@link DocIterationInfo#NONE}.
* @throws IOException If there is a low-level I/O error.
* @see #needsSolrIndexSearcher
- * @deprecated use {@link #transform(SolrDocument, int, DocIterationInfo)} instead
*/
- @Deprecated(since = "9.9.0")
- public abstract void transform(SolrDocument doc, int docid) throws IOException;
+ public abstract void transform(SolrDocument doc, int docid, DocIterationInfo docInfo)
+ throws IOException;
/**
* When a transformer needs access to fields that are not automatically derived from the input
@@ -183,7 +148,7 @@ public abstract class DocTransformer {
}
@Override
- public void transform(SolrDocument doc, int docid) {
+ public void transform(SolrDocument doc, int docid, DocIterationInfo docInfo) {
// No-Op
}
}
diff --git a/solr/core/src/java/org/apache/solr/response/transform/DocTransformers.java b/solr/core/src/java/org/apache/solr/response/transform/DocTransformers.java
index 62785c0a759..1c70b7d1780 100644
--- a/solr/core/src/java/org/apache/solr/response/transform/DocTransformers.java
+++ b/solr/core/src/java/org/apache/solr/response/transform/DocTransformers.java
@@ -79,13 +79,6 @@ public class DocTransformers extends DocTransformer {
}
}
- @Override
- public void transform(SolrDocument doc, int docid) throws IOException {
- for (DocTransformer a : children) {
- a.transform(doc, docid);
- }
- }
-
/** Returns true if and only if at least 1 child transformer returns true */
@Override
public boolean needsSolrIndexSearcher() {
diff --git a/solr/core/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java b/solr/core/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java
index fa11d016573..24fa062eb1f 100644
--- a/solr/core/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java
+++ b/solr/core/src/java/org/apache/solr/response/transform/ExplainAugmenterFactory.java
@@ -24,6 +24,7 @@ import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.search.DocIterationInfo;
import org.apache.solr.util.SolrPluginUtils;
/**
@@ -96,7 +97,8 @@ public class ExplainAugmenterFactory extends TransformerFactory {
}
@Override
- public void transform(SolrDocument doc, int docid) throws IOException {
+ public void transform(SolrDocument doc, int docid, DocIterationInfo docInfo)
+ throws IOException {
if (context != null && context.getQuery() != null) {
Explanation exp = context.getSearcher().explain(context.getQuery(), docid);
if (style == Style.nl) {
diff --git a/solr/core/src/java/org/apache/solr/response/transform/GeoTransformerFactory.java b/solr/core/src/java/org/apache/solr/response/transform/GeoTransformerFactory.java
index 725a2d2b52a..2324f890459 100644
--- a/solr/core/src/java/org/apache/solr/response/transform/GeoTransformerFactory.java
+++ b/solr/core/src/java/org/apache/solr/response/transform/GeoTransformerFactory.java
@@ -41,6 +41,7 @@ import org.apache.solr.response.JacksonJsonWriter;
import org.apache.solr.response.QueryResponseWriter;
import org.apache.solr.schema.AbstractSpatialFieldType;
import org.apache.solr.schema.SchemaField;
+import org.apache.solr.search.DocIterationInfo;
import org.locationtech.spatial4j.io.GeoJSONWriter;
import org.locationtech.spatial4j.io.ShapeWriter;
import org.locationtech.spatial4j.io.SupportedFormats;
@@ -141,7 +142,8 @@ public class GeoTransformerFactory extends TransformerFactory
if (shapes != null) {
return new GeoDocTransformer(updater) {
@Override
- public void transform(SolrDocument doc, int docid) throws IOException {
+ public void transform(SolrDocument doc, int docid, DocIterationInfo docInfo)
+ throws IOException {
int leafOrd =
ReaderUtil.subIndex(docid, context.getSearcher().getTopReaderContext().leaves());
LeafReaderContext ctx = context.getSearcher().getTopReaderContext().leaves().get(leafOrd);
@@ -167,7 +169,8 @@ public class GeoTransformerFactory extends TransformerFactory
return new GeoDocTransformer(updater) {
@Override
- public void transform(SolrDocument doc, int docid) throws IOException {
+ public void transform(SolrDocument doc, int docid, DocIterationInfo docInfo)
+ throws IOException {
Object val = copy ? doc.get(updater.field) : doc.remove(updater.field);
if (val != null) {
updater.setValue(doc, val);
diff --git a/solr/core/src/java/org/apache/solr/response/transform/MatchScoreAugmenter.java b/solr/core/src/java/org/apache/solr/response/transform/MatchScoreAugmenter.java
index 441c18dd285..3b92b53695b 100644
--- a/solr/core/src/java/org/apache/solr/response/transform/MatchScoreAugmenter.java
+++ b/solr/core/src/java/org/apache/solr/response/transform/MatchScoreAugmenter.java
@@ -40,9 +40,4 @@ public class MatchScoreAugmenter extends DocTransformer {
public void transform(SolrDocument doc, int docid, DocIterationInfo docInfo) {
doc.setField(name, docInfo.matchScore());
}
-
- @Override
- public void transform(SolrDocument doc, int docid) {
- // No-op
- }
}
diff --git a/solr/core/src/java/org/apache/solr/response/transform/RawValueTransformerFactory.java b/solr/core/src/java/org/apache/solr/response/transform/RawValueTransformerFactory.java
index 67cbb7a7cd2..7f671ad3102 100644
--- a/solr/core/src/java/org/apache/solr/response/transform/RawValueTransformerFactory.java
+++ b/solr/core/src/java/org/apache/solr/response/transform/RawValueTransformerFactory.java
@@ -27,6 +27,7 @@ import org.apache.solr.common.util.NamedList;
import org.apache.solr.common.util.StrUtils;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.QueryResponseWriter;
+import org.apache.solr.search.DocIterationInfo;
/**
* @since solr 5.2
@@ -126,7 +127,7 @@ public class RawValueTransformerFactory extends TransformerFactory
}
@Override
- public void transform(SolrDocument doc, int docid) {
+ public void transform(SolrDocument doc, int docid, DocIterationInfo docInfo) {
Object val = copy ? doc.get(field) : doc.remove(field);
if (val != null) {
doc.setField(display, val);
diff --git a/solr/core/src/java/org/apache/solr/response/transform/RenameFieldTransformer.java b/solr/core/src/java/org/apache/solr/response/transform/RenameFieldTransformer.java
index 3bc93f6f9b6..b8453195e74 100644
--- a/solr/core/src/java/org/apache/solr/response/transform/RenameFieldTransformer.java
+++ b/solr/core/src/java/org/apache/solr/response/transform/RenameFieldTransformer.java
@@ -17,6 +17,7 @@
package org.apache.solr.response.transform;
import org.apache.solr.common.SolrDocument;
+import org.apache.solr.search.DocIterationInfo;
/**
* Return a field with a name that is different that what is indexed
@@ -43,7 +44,7 @@ public class RenameFieldTransformer extends DocTransformer {
}
@Override
- public void transform(SolrDocument doc, int docid) {
+ public void transform(SolrDocument doc, int docid, DocIterationInfo docInfo) {
Object v = (copy) ? doc.get(from) : doc.remove(from);
if (v != null) {
doc.setField(to, v);
diff --git a/solr/core/src/java/org/apache/solr/response/transform/ScoreAugmenter.java b/solr/core/src/java/org/apache/solr/response/transform/ScoreAugmenter.java
index 049ed2a9bec..6dbf02b7da1 100644
--- a/solr/core/src/java/org/apache/solr/response/transform/ScoreAugmenter.java
+++ b/solr/core/src/java/org/apache/solr/response/transform/ScoreAugmenter.java
@@ -42,11 +42,4 @@ public class ScoreAugmenter extends DocTransformer {
doc.setField(name, docInfo.score());
}
}
-
- @Override
- public void transform(SolrDocument doc, int docid) {
- if (context != null && context.wantsScores()) {
- doc.setField(name, 0.0f);
- }
- }
}
diff --git a/solr/core/src/java/org/apache/solr/response/transform/SubQueryAugmenterFactory.java b/solr/core/src/java/org/apache/solr/response/transform/SubQueryAugmenterFactory.java
index a750e6fcde5..4a60804a522 100644
--- a/solr/core/src/java/org/apache/solr/response/transform/SubQueryAugmenterFactory.java
+++ b/solr/core/src/java/org/apache/solr/response/transform/SubQueryAugmenterFactory.java
@@ -36,6 +36,7 @@ import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.ResultContext;
+import org.apache.solr.search.DocIterationInfo;
import org.apache.solr.search.DocList;
import org.apache.solr.search.DocSlice;
import org.apache.solr.search.JoinQParserPlugin;
@@ -340,7 +341,7 @@ class SubQueryAugmenter extends DocTransformer {
}
@Override
- public void transform(SolrDocument doc, int docid) {
+ public void transform(SolrDocument doc, int docid, DocIterationInfo docInfo) {
final SolrParams docWithDeprefixed =
SolrParams.wrapDefaults(new DocRowParams(doc, prefix, separator), baseSubParams);
diff --git a/solr/core/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java b/solr/core/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java
index e186619758b..03b0d4b1663 100644
--- a/solr/core/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java
+++ b/solr/core/src/java/org/apache/solr/response/transform/ValueAugmenterFactory.java
@@ -22,6 +22,7 @@ import org.apache.solr.common.SolrException.ErrorCode;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.request.SolrQueryRequest;
+import org.apache.solr.search.DocIterationInfo;
import org.apache.solr.util.DateMathParser;
/**
@@ -87,7 +88,7 @@ public class ValueAugmenterFactory extends TransformerFactory {
}
@Override
- public void transform(SolrDocument doc, int docid) {
+ public void transform(SolrDocument doc, int docid, DocIterationInfo docInfo) {
doc.setField(name, value);
}
}
diff --git a/solr/core/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.java b/solr/core/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.java
index 993af34770a..2b5af93e56b 100644
--- a/solr/core/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.java
+++ b/solr/core/src/java/org/apache/solr/response/transform/ValueSourceAugmenter.java
@@ -26,6 +26,7 @@ import org.apache.lucene.queries.function.ValueSource;
import org.apache.solr.common.SolrDocument;
import org.apache.solr.common.SolrException;
import org.apache.solr.response.ResultContext;
+import org.apache.solr.search.DocIterationInfo;
import org.apache.solr.search.QParser;
import org.apache.solr.search.SolrIndexSearcher;
@@ -70,7 +71,7 @@ public class ValueSourceAugmenter extends DocTransformer {
List<LeafReaderContext> readerContexts;
@Override
- public void transform(SolrDocument doc, int docid) {
+ public void transform(SolrDocument doc, int docid, DocIterationInfo docInfo) {
// This is only good for random-access functions
try {
diff --git a/solr/core/src/java/org/apache/solr/search/DocIterationInfo.java b/solr/core/src/java/org/apache/solr/search/DocIterationInfo.java
index d67165738c3..b5b66f8045e 100644
--- a/solr/core/src/java/org/apache/solr/search/DocIterationInfo.java
+++ b/solr/core/src/java/org/apache/solr/search/DocIterationInfo.java
@@ -19,20 +19,29 @@ package org.apache.solr.search;
/** Information for the current document in the <code>DocIterator</code>. */
public interface DocIterationInfo {
+ DocIterationInfo NONE = new NoDocIterationInfo();
+
/**
* Returns the score for the document just returned by <code>nextDoc()</code>
*
* <p>The value returned may be meaningless depending on the context in which the DocIterator
* instance was retrieved.
*/
- public float score();
+ float score();
/**
* Returns the query match score in case of rerank queries
*
* @return the query match score in case of a rerank query, null otherwise.
*/
- public default Float matchScore() {
+ default Float matchScore() {
return null;
}
+
+ class NoDocIterationInfo implements DocIterationInfo {
+ @Override
+ public float score() {
+ return 0;
+ }
+ }
}
diff --git a/solr/core/src/test/org/apache/solr/response/TestCustomDocTransformer.java b/solr/core/src/test/org/apache/solr/response/TestCustomDocTransformer.java
index d9c5c6db8bd..6ce7a748cdc 100644
--- a/solr/core/src/test/org/apache/solr/response/TestCustomDocTransformer.java
+++ b/solr/core/src/test/org/apache/solr/response/TestCustomDocTransformer.java
@@ -24,6 +24,7 @@ import org.apache.solr.common.params.SolrParams;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.transform.DocTransformer;
import org.apache.solr.response.transform.TransformerFactory;
+import org.apache.solr.search.DocIterationInfo;
import org.junit.After;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -101,7 +102,7 @@ public class TestCustomDocTransformer extends SolrTestCaseJ4 {
/** This transformer simply concatenates the values of multiple fields */
@Override
- public void transform(SolrDocument doc, int docid) {
+ public void transform(SolrDocument doc, int docid, DocIterationInfo docInfo) {
str.setLength(0);
for (String s : extra) {
String v = getAsString(s, doc);
diff --git a/solr/modules/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.java
index 8c2a92c9484..21ead475609 100644
--- a/solr/modules/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.java
+++ b/solr/modules/ltr/src/java/org/apache/solr/ltr/response/transform/LTRFeatureLoggerTransformerFactory.java
@@ -192,6 +192,7 @@ public class LTRFeatureLoggerTransformerFactory extends TransformerFactory {
private LTRScoringQuery.ModelWeight[] modelWeights;
private FeatureLogger featureLogger;
private boolean docsWereReranked;
+ private boolean docsHaveScores;
/**
* @param name Name of the field to be added in a document representing the feature vectors
@@ -235,6 +236,7 @@ public class LTRFeatureLoggerTransformerFactory extends TransformerFactory {
rerankingQueriesFromContext = SolrQueryRequestContextUtils.getScoringQueries(req);
docsWereReranked =
(rerankingQueriesFromContext != null && rerankingQueriesFromContext.length != 0);
+ docsHaveScores = context.wantsScores();
String transformerFeatureStore = SolrQueryRequestContextUtils.getFvStoreName(req);
FeatureLogger featureLogger = SolrQueryRequestContextUtils.getFeatureLogger(req);
@@ -408,11 +410,6 @@ public class LTRFeatureLoggerTransformerFactory extends TransformerFactory {
implTransform(doc, docid, docInfo);
}
- @Override
- public void transform(SolrDocument doc, int docid) throws IOException {
- implTransform(doc, docid, null);
- }
-
private void implTransform(SolrDocument doc, int docid, DocIterationInfo docInfo)
throws IOException {
LTRScoringQuery rerankingQuery = rerankingQueries[0];
@@ -433,7 +430,7 @@ public class LTRFeatureLoggerTransformerFactory extends TransformerFactory {
LTRRescorer.extractFeaturesInfo(
rerankingModelWeight,
docid,
- (!docsWereReranked && docInfo != null) ? docInfo.score() : null,
+ (!docsWereReranked && docsHaveScores) ? docInfo.score() : null,
leafContexts));
}
doc.addField(name, featureVector);
diff --git a/solr/modules/ltr/src/java/org/apache/solr/ltr/response/transform/LTRInterleavingTransformerFactory.java b/solr/modules/ltr/src/java/org/apache/solr/ltr/response/transform/LTRInterleavingTransformerFactory.java
index 8105777b857..b393576ce96 100644
--- a/solr/modules/ltr/src/java/org/apache/solr/ltr/response/transform/LTRInterleavingTransformerFactory.java
+++ b/solr/modules/ltr/src/java/org/apache/solr/ltr/response/transform/LTRInterleavingTransformerFactory.java
@@ -27,6 +27,7 @@ import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.ResultContext;
import org.apache.solr.response.transform.DocTransformer;
import org.apache.solr.response.transform.TransformerFactory;
+import org.apache.solr.search.DocIterationInfo;
import org.apache.solr.util.SolrPluginUtils;
public class LTRInterleavingTransformerFactory extends TransformerFactory {
@@ -88,7 +89,8 @@ public class LTRInterleavingTransformerFactory extends TransformerFactory {
}
@Override
- public void transform(SolrDocument doc, int docid) throws IOException {
+ public void transform(SolrDocument doc, int docid, DocIterationInfo docInfo)
+ throws IOException {
implTransform(doc, docid);
}