Skip to content

Commit

Permalink
SOLR-17494: Remove language specific writer types (#2758)
Browse files Browse the repository at this point in the history
wt=python, ruby, php, and phps response writers are removed.
  • Loading branch information
epugh authored Oct 21, 2024
1 parent 943e022 commit 018e4f4
Show file tree
Hide file tree
Showing 19 changed files with 46 additions and 1,079 deletions.
2 changes: 0 additions & 2 deletions dev-tools/scripts/smokeTestRelease.py
Original file line number Diff line number Diff line change
Expand Up @@ -774,8 +774,6 @@ def testSolrExample(binaryDistPath, javaPath):
raise RuntimeError('Failed to run the techproducts example, check log for previous errors.')

os.chdir('example')
print(' test utf8...')
run('sh ./exampledocs/test_utf8.sh http://localhost:8983/solr/techproducts', 'utf8.log')
print(' run query...')
s = load('http://localhost:8983/solr/techproducts/select/?q=video')
if s.find('"numFound":3,') == -1:
Expand Down
2 changes: 2 additions & 0 deletions solr/CHANGES.txt
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ Deprecation Removals

* SOLR-17400: Remove deprecated script snapshotcli.sh. bin/solr snapshot-* commands have replaced this. (Eric Pugh)

* SOLR-17494: Remove language specific writer types (i.e wt= ruby, python, php, and phps). (Eric Pugh)

Dependency Upgrades
---------------------
(No changes)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,17 +59,7 @@ public class QueryResponseWriters {
public static class BenchState {

/** See {@link SolrCore#DEFAULT_RESPONSE_WRITERS} */
@Param({
CommonParams.JAVABIN,
CommonParams.JSON,
"cbor",
"smile",
"xml",
"python",
"phps",
"ruby",
"raw"
})
@Param({CommonParams.JAVABIN, CommonParams.JSON, "cbor", "smile", "xml", "raw"})
String wt;

private int docs = 100;
Expand Down
8 changes: 0 additions & 8 deletions solr/core/src/java/org/apache/solr/core/SolrCore.java
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,9 @@
import org.apache.solr.response.GeoJSONResponseWriter;
import org.apache.solr.response.GraphMLResponseWriter;
import org.apache.solr.response.JacksonJsonWriter;
import org.apache.solr.response.PHPResponseWriter;
import org.apache.solr.response.PHPSerializedResponseWriter;
import org.apache.solr.response.PrometheusResponseWriter;
import org.apache.solr.response.PythonResponseWriter;
import org.apache.solr.response.QueryResponseWriter;
import org.apache.solr.response.RawResponseWriter;
import org.apache.solr.response.RubyResponseWriter;
import org.apache.solr.response.SchemaXmlResponseWriter;
import org.apache.solr.response.SmileResponseWriter;
import org.apache.solr.response.SolrQueryResponse;
Expand Down Expand Up @@ -3015,10 +3011,6 @@ public PluginBag<QueryResponseWriter> getResponseWriters() {
m.put("standard", m.get(CommonParams.JSON));
m.put("geojson", new GeoJSONResponseWriter());
m.put("graphml", new GraphMLResponseWriter());
m.put("python", new PythonResponseWriter());
m.put("php", new PHPResponseWriter());
m.put("phps", new PHPSerializedResponseWriter());
m.put("ruby", new RubyResponseWriter());
m.put("raw", new RawResponseWriter());
m.put(CommonParams.JAVABIN, new BinaryResponseWriter());
m.put("cbor", new CborResponseWriter());
Expand Down
124 changes: 0 additions & 124 deletions solr/core/src/java/org/apache/solr/response/PHPResponseWriter.java

This file was deleted.

Loading

0 comments on commit 018e4f4

Please sign in to comment.