Skip to content

Commit 018e4f4

Browse files
authored
SOLR-17494: Remove language specific writer types (#2758)
wt=python, ruby, php, and phps response writers are removed.
1 parent 943e022 commit 018e4f4

File tree

19 files changed

+46
-1079
lines changed

19 files changed

+46
-1079
lines changed

dev-tools/scripts/smokeTestRelease.py

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -774,8 +774,6 @@ def testSolrExample(binaryDistPath, javaPath):
774774
raise RuntimeError('Failed to run the techproducts example, check log for previous errors.')
775775

776776
os.chdir('example')
777-
print(' test utf8...')
778-
run('sh ./exampledocs/test_utf8.sh http://localhost:8983/solr/techproducts', 'utf8.log')
779777
print(' run query...')
780778
s = load('http://localhost:8983/solr/techproducts/select/?q=video')
781779
if s.find('"numFound":3,') == -1:

solr/CHANGES.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,8 @@ Deprecation Removals
7373

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

76+
* SOLR-17494: Remove language specific writer types (i.e wt= ruby, python, php, and phps). (Eric Pugh)
77+
7678
Dependency Upgrades
7779
---------------------
7880
(No changes)

solr/benchmark/src/java/org/apache/solr/bench/search/QueryResponseWriters.java

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -59,17 +59,7 @@ public class QueryResponseWriters {
5959
public static class BenchState {
6060

6161
/** See {@link SolrCore#DEFAULT_RESPONSE_WRITERS} */
62-
@Param({
63-
CommonParams.JAVABIN,
64-
CommonParams.JSON,
65-
"cbor",
66-
"smile",
67-
"xml",
68-
"python",
69-
"phps",
70-
"ruby",
71-
"raw"
72-
})
62+
@Param({CommonParams.JAVABIN, CommonParams.JSON, "cbor", "smile", "xml", "raw"})
7363
String wt;
7464

7565
private int docs = 100;

solr/core/src/java/org/apache/solr/core/SolrCore.java

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -128,13 +128,9 @@
128128
import org.apache.solr.response.GeoJSONResponseWriter;
129129
import org.apache.solr.response.GraphMLResponseWriter;
130130
import org.apache.solr.response.JacksonJsonWriter;
131-
import org.apache.solr.response.PHPResponseWriter;
132-
import org.apache.solr.response.PHPSerializedResponseWriter;
133131
import org.apache.solr.response.PrometheusResponseWriter;
134-
import org.apache.solr.response.PythonResponseWriter;
135132
import org.apache.solr.response.QueryResponseWriter;
136133
import org.apache.solr.response.RawResponseWriter;
137-
import org.apache.solr.response.RubyResponseWriter;
138134
import org.apache.solr.response.SchemaXmlResponseWriter;
139135
import org.apache.solr.response.SmileResponseWriter;
140136
import org.apache.solr.response.SolrQueryResponse;
@@ -3015,10 +3011,6 @@ public PluginBag<QueryResponseWriter> getResponseWriters() {
30153011
m.put("standard", m.get(CommonParams.JSON));
30163012
m.put("geojson", new GeoJSONResponseWriter());
30173013
m.put("graphml", new GraphMLResponseWriter());
3018-
m.put("python", new PythonResponseWriter());
3019-
m.put("php", new PHPResponseWriter());
3020-
m.put("phps", new PHPSerializedResponseWriter());
3021-
m.put("ruby", new RubyResponseWriter());
30223014
m.put("raw", new RawResponseWriter());
30233015
m.put(CommonParams.JAVABIN, new BinaryResponseWriter());
30243016
m.put("cbor", new CborResponseWriter());

solr/core/src/java/org/apache/solr/response/PHPResponseWriter.java

Lines changed: 0 additions & 124 deletions
This file was deleted.

0 commit comments

Comments
 (0)