mirror of https://github.com/apache/lucene.git
SOLR-12402: Factor out SolrDefaultStreamFactory class.
This commit is contained in:
parent
13960594e4
commit
4a1ee046c3
|
@ -129,6 +129,8 @@ New Features
|
||||||
future cluster operations whether they are invoked manually via the Collection API or by the Autoscaling framework.
|
future cluster operations whether they are invoked manually via the Collection API or by the Autoscaling framework.
|
||||||
(noble, shalin)
|
(noble, shalin)
|
||||||
|
|
||||||
|
* SOLR-12402: Factor out SolrDefaultStreamFactory class. (Christine Poerschke)
|
||||||
|
|
||||||
Bug Fixes
|
Bug Fixes
|
||||||
----------------------
|
----------------------
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,53 @@
|
||||||
|
/*
|
||||||
|
* Licensed to the Apache Software Foundation (ASF) under one or more
|
||||||
|
* contributor license agreements. See the NOTICE file distributed with
|
||||||
|
* this work for additional information regarding copyright ownership.
|
||||||
|
* The ASF licenses this file to You under the Apache License, Version 2.0
|
||||||
|
* (the "License"); you may not use this file except in compliance with
|
||||||
|
* the License. You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
package org.apache.solr.handler;
|
||||||
|
|
||||||
|
import org.apache.solr.client.solrj.io.Lang;
|
||||||
|
import org.apache.solr.client.solrj.io.stream.expr.DefaultStreamFactory;
|
||||||
|
import org.apache.solr.core.SolrResourceLoader;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* A default collection of mappings, used to convert strings into stream expressions.
|
||||||
|
* Same as {@link DefaultStreamFactory} plus functions that rely directly on either
|
||||||
|
* Lucene or Solr capabilities that are not part of {@link Lang}.
|
||||||
|
*
|
||||||
|
* @since 7.5
|
||||||
|
*/
|
||||||
|
public class SolrDefaultStreamFactory extends DefaultStreamFactory {
|
||||||
|
|
||||||
|
private SolrResourceLoader solrResourceLoader;
|
||||||
|
|
||||||
|
public SolrDefaultStreamFactory() {
|
||||||
|
super();
|
||||||
|
this.withFunctionName("analyze", AnalyzeEvaluator.class);
|
||||||
|
this.withFunctionName("classify", ClassifyStream.class);
|
||||||
|
}
|
||||||
|
|
||||||
|
public SolrDefaultStreamFactory withSolrResourceLoader(SolrResourceLoader solrResourceLoader) {
|
||||||
|
this.solrResourceLoader = solrResourceLoader;
|
||||||
|
return this;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setSolrResourceLoader(SolrResourceLoader solrResourceLoader) {
|
||||||
|
this.solrResourceLoader = solrResourceLoader;
|
||||||
|
}
|
||||||
|
|
||||||
|
public SolrResourceLoader getSolrResourceLoader() {
|
||||||
|
return solrResourceLoader;
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
|
@ -31,7 +31,6 @@ import org.apache.solr.client.solrj.io.SolrClientCache;
|
||||||
import org.apache.solr.client.solrj.io.Tuple;
|
import org.apache.solr.client.solrj.io.Tuple;
|
||||||
import org.apache.solr.client.solrj.io.comp.StreamComparator;
|
import org.apache.solr.client.solrj.io.comp.StreamComparator;
|
||||||
import org.apache.solr.client.solrj.io.stream.*;
|
import org.apache.solr.client.solrj.io.stream.*;
|
||||||
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.Explanation;
|
||||||
import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType;
|
import org.apache.solr.client.solrj.io.stream.expr.Explanation.ExpressionType;
|
||||||
import org.apache.solr.client.solrj.io.stream.expr.Expressible;
|
import org.apache.solr.client.solrj.io.stream.expr.Expressible;
|
||||||
|
@ -65,7 +64,7 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
|
||||||
|
|
||||||
static SolrClientCache clientCache = new SolrClientCache();
|
static SolrClientCache clientCache = new SolrClientCache();
|
||||||
static ModelCache modelCache = null;
|
static ModelCache modelCache = null;
|
||||||
private StreamFactory streamFactory = new DefaultStreamFactory();
|
private SolrDefaultStreamFactory streamFactory = new SolrDefaultStreamFactory();
|
||||||
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
|
||||||
private String coreName;
|
private String coreName;
|
||||||
private Map<String,DaemonStream> daemons = Collections.synchronizedMap(new HashMap());
|
private Map<String,DaemonStream> daemons = Collections.synchronizedMap(new HashMap());
|
||||||
|
@ -105,13 +104,7 @@ public class StreamHandler extends RequestHandlerBase implements SolrCoreAware,
|
||||||
defaultZkhost,
|
defaultZkhost,
|
||||||
clientCache);
|
clientCache);
|
||||||
}
|
}
|
||||||
|
streamFactory.withSolrResourceLoader(core.getResourceLoader());
|
||||||
/*
|
|
||||||
* Add the core functions. These are functions that rely directly on either Lucene or Solr
|
|
||||||
* capabilities that are not part of Lang.
|
|
||||||
*/
|
|
||||||
streamFactory.withFunctionName("analyze", AnalyzeEvaluator.class);
|
|
||||||
streamFactory.withFunctionName("classify", ClassifyStream.class);
|
|
||||||
|
|
||||||
// This pulls all the overrides and additions from the config
|
// This pulls all the overrides and additions from the config
|
||||||
List<PluginInfo> pluginInfos = core.getSolrConfig().getPluginInfos(Expressible.class.getName());
|
List<PluginInfo> pluginInfos = core.getSolrConfig().getPluginInfos(Expressible.class.getName());
|
||||||
|
|
Loading…
Reference in New Issue