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

SQL: Reuse a registry meant to be shared (elastic/x-pack-elasticsearch#2838) 

The CLI and JDBC were meant to share the same named xcontent registry
but the cli action didn't reuse it by mistake.

Original commit: elastic/x-pack-elasticsearch@6c9af5a22a
This commit is contained in:
Nik Everett 2017-11-04 13:10:35 +00:00 committed by GitHub
parent d96317fbca
commit 44dc98385a
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
sql/server/src/main/java/org/elasticsearch/xpack/sql/plugin/RestSqlCliAction.java
View File

@ -40,8 +40,6 @@ import java.util.function.Consumer;
import static org.elasticsearch.rest.RestRequest.Method.POST; import static org.elasticsearch.rest.RestRequest.Method.POST;
public class RestSqlCliAction extends AbstractSqlProtocolRestAction { public class RestSqlCliAction extends AbstractSqlProtocolRestAction {
private final NamedWriteableRegistry cursorRegistry = new NamedWriteableRegistry(Cursor.getNamedWriteables());
public RestSqlCliAction(Settings settings, RestController controller) { public RestSqlCliAction(Settings settings, RestController controller) {
super(settings, Proto.INSTANCE); super(settings, Proto.INSTANCE);
controller.registerHandler(POST, "/_sql/cli", this); controller.registerHandler(POST, "/_sql/cli", this);
@ -91,9 +89,9 @@ public class RestSqlCliAction extends AbstractSqlProtocolRestAction {
private Consumer<RestChannel> queryInit(Client client, QueryInitRequest request) { private Consumer<RestChannel> queryInit(Client client, QueryInitRequest request) {
// TODO time zone support for CLI // TODO time zone support for CLI
SqlRequest sqlRequest = new SqlRequest(request.query, DateTimeZone.forTimeZone(request.timeZone), request.fetchSize, SqlRequest sqlRequest = new SqlRequest(request.query, DateTimeZone.forTimeZone(request.timeZone), request.fetchSize,
TimeValue.timeValueMillis(request.timeout.requestTimeout), TimeValue.timeValueMillis(request.timeout.requestTimeout),
TimeValue.timeValueMillis(request.timeout.pageTimeout), TimeValue.timeValueMillis(request.timeout.pageTimeout),
Cursor.EMPTY); Cursor.EMPTY);
long start = System.nanoTime(); long start = System.nanoTime();
return channel -> client.execute(SqlAction.INSTANCE, sqlRequest, toActionListener(request, channel, response -> { return channel -> client.execute(SqlAction.INSTANCE, sqlRequest, toActionListener(request, channel, response -> {
@ -106,7 +104,7 @@ public class RestSqlCliAction extends AbstractSqlProtocolRestAction {
private Consumer<RestChannel> queryPage(Client client, QueryPageRequest request) { private Consumer<RestChannel> queryPage(Client client, QueryPageRequest request) {
Cursor cursor; Cursor cursor;
CliFormatter formatter; CliFormatter formatter;
try (StreamInput in = new NamedWriteableAwareStreamInput(new BytesArray(request.cursor).streamInput(), cursorRegistry)) { try (StreamInput in = new NamedWriteableAwareStreamInput(new BytesArray(request.cursor).streamInput(), CURSOR_REGISTRY)) {
cursor = in.readNamedWriteable(Cursor.class); cursor = in.readNamedWriteable(Cursor.class);
formatter = new CliFormatter(in); formatter = new CliFormatter(in);
} catch (IOException e) { } catch (IOException e) {
@ -114,7 +112,7 @@ public class RestSqlCliAction extends AbstractSqlProtocolRestAction {
} }
SqlRequest sqlRequest = new SqlRequest("", SqlRequest.DEFAULT_TIME_ZONE, 0, SqlRequest sqlRequest = new SqlRequest("", SqlRequest.DEFAULT_TIME_ZONE, 0,
TimeValue.timeValueMillis(request.timeout.requestTimeout), TimeValue.timeValueMillis(request.timeout.requestTimeout),
TimeValue.timeValueMillis(request.timeout.pageTimeout), TimeValue.timeValueMillis(request.timeout.pageTimeout),
cursor); cursor);
long start = System.nanoTime(); long start = System.nanoTime();