honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

SQL: Remove getting named writeables from SqlPlugin (elastic/x-pack-elasticsearch#3627) 

Since we don't do any serialization of Cursor classes from the Transport
side (it is treated entirely as a string), we don't actually need to tell anyone
about SQL's writeables

Original commit: elastic/x-pack-elasticsearch@ad2c10e327
This commit is contained in:
Lee Hinman 2018-01-18 14:16:37 -07:00 committed by GitHub
parent b9dbb6d204
commit ed65987500
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugin/sql/src/main/java/org/elasticsearch/xpack/sql/plugin/SqlPlugin.java
View File

@ -20,7 +20,6 @@ import org.elasticsearch.rest.RestController;
import org.elasticsearch.rest.RestHandler; import org.elasticsearch.rest.RestHandler;
import org.elasticsearch.xpack.sql.analysis.index.IndexResolver; import org.elasticsearch.xpack.sql.analysis.index.IndexResolver;
import org.elasticsearch.xpack.sql.execution.PlanExecutor; import org.elasticsearch.xpack.sql.execution.PlanExecutor;
import org.elasticsearch.xpack.sql.session.Cursor;
import java.util.Arrays; import java.util.Arrays;
import java.util.Collection; import java.util.Collection;
@ -31,10 +30,6 @@ import static java.util.Collections.emptyList;
public class SqlPlugin implements ActionPlugin { public class SqlPlugin implements ActionPlugin {
public static List<NamedWriteableRegistry.Entry> getNamedWriteables() {
return Cursor.getNamedWriteables();
}
private final boolean enabled; private final boolean enabled;
private final SqlLicenseChecker sqlLicenseChecker; private final SqlLicenseChecker sqlLicenseChecker;
private IndexResolver indexResolver; private IndexResolver indexResolver;

1
plugin/src/main/java/org/elasticsearch/xpack/XPackPlugin.java
View File

@ -437,7 +437,6 @@ public class XPackPlugin extends Plugin implements ScriptPlugin, ActionPlugin, I
entries.addAll(machineLearning.getNamedWriteables()); entries.addAll(machineLearning.getNamedWriteables());
entries.addAll(licensing.getNamedWriteables()); entries.addAll(licensing.getNamedWriteables());
entries.addAll(Security.getNamedWriteables()); entries.addAll(Security.getNamedWriteables());
entries.addAll(SqlPlugin.getNamedWriteables());
entries.addAll(Monitoring.getNamedWriteables()); entries.addAll(Monitoring.getNamedWriteables());
entries.addAll(Graph.getNamedWriteables()); entries.addAll(Graph.getNamedWriteables());
return entries; return entries;