Skip to content

Remove deprecated code in GraphHandler for registering expressions #4100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
epugh merged 3 commits into from
Feb 5, 2026
+8 −40
Merged

Remove deprecated code in GraphHandler for registering expressions #4100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6983e97
Remove deprecated code
epugh Feb 4, 2026
8668d15
Doc the removal
epugh Feb 4, 2026
4afd8a5
add pr link
epugh Feb 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions changelog/unreleased/PR#4100-remove-deprecated-graphhandler-registration-support.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
# See https://github.com/apache/solr/blob/main/dev-docs/changelog.adoc
title: Remove deprecated streamFunctions in GraphHandler for registering streaming expressions.
type: removed # added, changed, fixed, deprecated, removed, dependency_update, security, other
authors:
- name: Eric Pugh
links:
- name: PR#4100
url: https://github.com/apache/solr/pull/4100
40 changes: 0 additions & 40 deletions solr/core/src/java/org/apache/solr/handler/GraphHandler.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,8 @@

import java.io.IOException;
import java.lang.invoke.MethodHandles;
import java.util.Collections;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
import org.apache.solr.client.solrj.io.SolrClientCache;
import org.apache.solr.client.solrj.io.Tuple;
import org.apache.solr.client.solrj.io.comp.StreamComparator;
Expand All @@ -32,16 +30,12 @@
import org.apache.solr.client.solrj.io.stream.TupleStream;
import org.apache.solr.client.solrj.io.stream.expr.DefaultStreamFactory;
import org.apache.solr.client.solrj.io.stream.expr.Explanation;
import org.apache.solr.client.solrj.io.stream.expr.Expressible;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
import org.apache.solr.common.params.CommonParams;
import org.apache.solr.common.params.ModifiableSolrParams;
import org.apache.solr.common.params.SolrParams;
import org.apache.solr.common.params.StreamParams;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.core.CoreContainer;
import org.apache.solr.core.PluginInfo;
import org.apache.solr.core.SolrConfig;
import org.apache.solr.core.SolrCore;
import org.apache.solr.request.SolrQueryRequest;
import org.apache.solr.response.SolrQueryResponse;
Expand All @@ -60,12 +54,6 @@
*
* <p>To add additional functions, just define them as plugins in solrconfig.xml via {@code
* <expressible name="count" class="org.apache.solr.client.solrj.io.stream.RecordCountStream" />}
*
* <p>The @deprecated configuration method as of Solr 8.5 is {@code <lst name="streamFunctions"><str
* name="group">org.apache.solr.client.solrj.io.stream.ReducerStream</str><str
* name="count">org.apache.solr.client.solrj.io.stream.RecordCountStream</str></lst> }
*
* @since 6.1.0
*/
public class GraphHandler extends RequestHandlerBase
implements SolrCoreAware, PermissionNameProvider {
Expand Down Expand Up @@ -97,34 +85,6 @@ public void inform(SolrCore core) {

// This pulls all the overrides and additions from the config
StreamHandler.addExpressiblePlugins(streamFactory, core);

// Check deprecated approach.
Object functionMappingsObj = initArgs.get("streamFunctions");
if (null != functionMappingsObj) {
log.warn(
"solrconfig.xml: <streamFunctions> is deprecated for adding additional streaming functions to GraphHandler.");
NamedList<?> functionMappings = (NamedList<?>) functionMappingsObj;
for (Entry<String, ?> functionMapping : functionMappings) {
String key = functionMapping.getKey();
PluginInfo pluginInfo =
new PluginInfo(key, Collections.singletonMap("class", functionMapping.getValue()));

if (pluginInfo.pkgName == null) {
Class<? extends Expressible> clazz =
core.getResourceLoader()
.findClass((String) functionMapping.getValue(), Expressible.class);
streamFactory.withFunctionName(key, clazz);
} else {
@SuppressWarnings("resource")
StreamHandler.ExpressibleHolder holder =
new StreamHandler.ExpressibleHolder(
pluginInfo,
core,
SolrConfig.classVsSolrPluginInfo.get(Expressible.class.getName()));
streamFactory.withFunctionName(key, holder);
}
}
}
}

@Override
Expand Down
Loading