Remove JDBC dependency on ES lib core (#82162) (#82165)

As part of the effort of making JDBC driver self sufficient, remove the ES lib core dependencies by light cloning the couple the utility classes needed (and their dependencies). In additional provide a shim layer that adapts the sql-proto Protocol constant class by introducing a sql-action Protocol class, which is ES aware. To avoid name collision sql-proto has been renamed to CoreProtocol which is used at the driver level, while Protocol is used within ES. Relates #82077
elastic · Dec 31, 2021 · 27db2d2 · 27db2d2
1 parent 2fa2227
commit 27db2d2
Show file tree

Hide file tree

Showing 50 changed files with 555 additions and 205 deletions.
diff --git a/x-pack/plugin/sql/jdbc/build.gradle b/x-pack/plugin/sql/jdbc/build.gradle
@@ -23,7 +23,6 @@ dependencies {
   api(project(':libs:elasticsearch-geo')) {
     transitive = false
   }
-  api project(':libs:elasticsearch-core')
   api "com.fasterxml.jackson.dataformat:jackson-dataformat-cbor:${versions.jackson}"
   runtimeOnly "com.fasterxml.jackson.core:jackson-core:${versions.jackson}"
   testImplementation project(":test:framework")

diff --git a/x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/DefaultCursor.java b/x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/DefaultCursor.java
@@ -6,7 +6,7 @@
  */
 package org.elasticsearch.xpack.sql.jdbc;
 
-import org.elasticsearch.core.Tuple;
+import org.elasticsearch.xpack.sql.proto.core.Tuple;
 
 import java.sql.SQLException;
 import java.util.List;

diff --git a/x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/JdbcHttpClient.java b/x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/JdbcHttpClient.java
@@ -6,8 +6,6 @@
  */
 package org.elasticsearch.xpack.sql.jdbc;
 
-import org.elasticsearch.core.TimeValue;
-import org.elasticsearch.core.Tuple;
 import org.elasticsearch.xpack.sql.client.ClientVersion;
 import org.elasticsearch.xpack.sql.client.HttpClient;
 import org.elasticsearch.xpack.sql.proto.ColumnInfo;
@@ -18,6 +16,8 @@
 import org.elasticsearch.xpack.sql.proto.SqlQueryResponse;
 import org.elasticsearch.xpack.sql.proto.SqlTypedParamValue;
 import org.elasticsearch.xpack.sql.proto.SqlVersion;
+import org.elasticsearch.xpack.sql.proto.core.TimeValue;
+import org.elasticsearch.xpack.sql.proto.core.Tuple;
 
 import java.sql.SQLException;
 import java.util.ArrayList;

diff --git a/x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/JdbcResultSet.java b/x-pack/plugin/sql/jdbc/src/main/java/org/elasticsearch/xpack/sql/jdbc/JdbcResultSet.java
@@ -6,7 +6,7 @@
  */
 package org.elasticsearch.xpack.sql.jdbc;
 
-import org.elasticsearch.core.SuppressForbidden;
+import org.elasticsearch.xpack.sql.client.SuppressForbidden;
 
 import java.io.InputStream;
 import java.io.Reader;

diff --git a/...lugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/SqlProtocolTestCase.java b/...lugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/SqlProtocolTestCase.java
@@ -29,8 +29,8 @@
 import java.util.Locale;
 import java.util.Map;
 
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.SQL_QUERY_REST_ENDPOINT;
 import static org.elasticsearch.xpack.sql.proto.Mode.CLI;
-import static org.elasticsearch.xpack.sql.proto.Protocol.SQL_QUERY_REST_ENDPOINT;
 import static org.elasticsearch.xpack.sql.proto.RequestInfo.CLIENT_IDS;
 import static org.elasticsearch.xpack.sql.qa.rest.RestSqlTestCase.query;
 

diff --git a/.../sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/rest/BaseRestSqlTestCase.java b/.../sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/rest/BaseRestSqlTestCase.java
@@ -21,23 +21,23 @@
 import java.util.Locale;
 import java.util.Map;
 
-import static org.elasticsearch.xpack.sql.proto.Protocol.BINARY_FORMAT_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.CATALOG_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.CLIENT_ID_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.COLUMNAR_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.CURSOR_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.FETCH_SIZE_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.FIELD_MULTI_VALUE_LENIENCY_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.FILTER_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.KEEP_ALIVE_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.KEEP_ON_COMPLETION_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.MODE_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.PARAMS_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.QUERY_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.RUNTIME_MAPPINGS_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.TIME_ZONE_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.VERSION_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.WAIT_FOR_COMPLETION_TIMEOUT_NAME;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.BINARY_FORMAT_NAME;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.CATALOG_NAME;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.CLIENT_ID_NAME;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.COLUMNAR_NAME;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.CURSOR_NAME;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.FETCH_SIZE_NAME;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.FIELD_MULTI_VALUE_LENIENCY_NAME;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.FILTER_NAME;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.KEEP_ALIVE_NAME;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.KEEP_ON_COMPLETION_NAME;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.MODE_NAME;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.PARAMS_NAME;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.QUERY_NAME;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.RUNTIME_MAPPINGS_NAME;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.TIME_ZONE_NAME;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.VERSION_NAME;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.WAIT_FOR_COMPLETION_TIMEOUT_NAME;
 
 public abstract class BaseRestSqlTestCase extends RemoteClusterAwareSqlRestTestCase {
 

diff --git a/...ugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/rest/RestSqlTestCase.java b/...ugin/sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/rest/RestSqlTestCase.java
@@ -24,6 +24,7 @@
 import org.elasticsearch.test.NotEqualMessageBuilder;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.json.JsonXContent;
+import org.elasticsearch.xpack.sql.proto.CoreProtocol;
 import org.elasticsearch.xpack.sql.proto.Mode;
 import org.elasticsearch.xpack.sql.proto.StringUtils;
 import org.elasticsearch.xpack.sql.qa.ErrorsTestCase;
@@ -54,21 +55,21 @@
 import static java.util.Collections.unmodifiableMap;
 import static org.elasticsearch.common.Strings.hasText;
 import static org.elasticsearch.xpack.ql.TestUtils.getNumberOfSearchContexts;
-import static org.elasticsearch.xpack.sql.proto.Protocol.COLUMNS_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.HEADER_NAME_ASYNC_ID;
-import static org.elasticsearch.xpack.sql.proto.Protocol.HEADER_NAME_ASYNC_PARTIAL;
-import static org.elasticsearch.xpack.sql.proto.Protocol.HEADER_NAME_ASYNC_RUNNING;
-import static org.elasticsearch.xpack.sql.proto.Protocol.HEADER_NAME_CURSOR;
-import static org.elasticsearch.xpack.sql.proto.Protocol.ID_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.IS_PARTIAL_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.IS_RUNNING_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.ROWS_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.SQL_ASYNC_DELETE_REST_ENDPOINT;
-import static org.elasticsearch.xpack.sql.proto.Protocol.SQL_ASYNC_REST_ENDPOINT;
-import static org.elasticsearch.xpack.sql.proto.Protocol.SQL_ASYNC_STATUS_REST_ENDPOINT;
-import static org.elasticsearch.xpack.sql.proto.Protocol.URL_PARAM_DELIMITER;
-import static org.elasticsearch.xpack.sql.proto.Protocol.URL_PARAM_FORMAT;
-import static org.elasticsearch.xpack.sql.proto.Protocol.WAIT_FOR_COMPLETION_TIMEOUT_NAME;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.COLUMNS_NAME;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.HEADER_NAME_ASYNC_ID;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.HEADER_NAME_ASYNC_PARTIAL;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.HEADER_NAME_ASYNC_RUNNING;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.HEADER_NAME_CURSOR;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.ID_NAME;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.IS_PARTIAL_NAME;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.IS_RUNNING_NAME;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.ROWS_NAME;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.SQL_ASYNC_DELETE_REST_ENDPOINT;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.SQL_ASYNC_REST_ENDPOINT;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.SQL_ASYNC_STATUS_REST_ENDPOINT;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.URL_PARAM_DELIMITER;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.URL_PARAM_FORMAT;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.WAIT_FOR_COMPLETION_TIMEOUT_NAME;
 import static org.hamcrest.Matchers.containsString;
 
 /**
@@ -77,8 +78,8 @@
  */
 public abstract class RestSqlTestCase extends BaseRestSqlTestCase implements ErrorsTestCase {
 
-    public static String SQL_QUERY_REST_ENDPOINT = org.elasticsearch.xpack.sql.proto.Protocol.SQL_QUERY_REST_ENDPOINT;
-    private static String SQL_TRANSLATE_REST_ENDPOINT = org.elasticsearch.xpack.sql.proto.Protocol.SQL_TRANSLATE_REST_ENDPOINT;
+    public static String SQL_QUERY_REST_ENDPOINT = CoreProtocol.SQL_QUERY_REST_ENDPOINT;
+    private static String SQL_TRANSLATE_REST_ENDPOINT = CoreProtocol.SQL_TRANSLATE_REST_ENDPOINT;
 
     /**
      * Builds that map that is returned in the header for each column.

diff --git a/...sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/rest/RestSqlUsageTestCase.java b/...sql/qa/server/src/main/java/org/elasticsearch/xpack/sql/qa/rest/RestSqlUsageTestCase.java
@@ -27,9 +27,9 @@
 import java.util.Locale;
 import java.util.Map;
 
-import static org.elasticsearch.xpack.sql.proto.Protocol.SQL_QUERY_REST_ENDPOINT;
-import static org.elasticsearch.xpack.sql.proto.Protocol.SQL_STATS_REST_ENDPOINT;
-import static org.elasticsearch.xpack.sql.proto.Protocol.SQL_TRANSLATE_REST_ENDPOINT;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.SQL_QUERY_REST_ENDPOINT;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.SQL_STATS_REST_ENDPOINT;
+import static org.elasticsearch.xpack.sql.proto.CoreProtocol.SQL_TRANSLATE_REST_ENDPOINT;
 import static org.elasticsearch.xpack.sql.qa.rest.BaseRestSqlTestCase.toMap;
 import static org.elasticsearch.xpack.sql.qa.rest.RestSqlTestCase.query;
 

diff --git a/.../sql-action/src/main/java/org/elasticsearch/xpack/sql/action/AbstractSqlQueryRequest.java b/.../sql-action/src/main/java/org/elasticsearch/xpack/sql/action/AbstractSqlQueryRequest.java
@@ -26,7 +26,6 @@
 import org.elasticsearch.xcontent.XContentParser;
 import org.elasticsearch.xcontent.XContentParser.Token;
 import org.elasticsearch.xpack.sql.proto.Mode;
-import org.elasticsearch.xpack.sql.proto.Protocol;
 import org.elasticsearch.xpack.sql.proto.RequestInfo;
 import org.elasticsearch.xpack.sql.proto.SqlTypedParamValue;
 import org.elasticsearch.xpack.sql.proto.SqlVersion;
@@ -43,18 +42,18 @@
 import static java.util.Collections.emptyMap;
 import static org.elasticsearch.Version.CURRENT;
 import static org.elasticsearch.action.ValidateActions.addValidationError;
-import static org.elasticsearch.xpack.sql.proto.Protocol.CATALOG_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.CLIENT_ID_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.CURSOR_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.FETCH_SIZE_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.FILTER_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.MODE_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.PAGE_TIMEOUT_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.PARAMS_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.QUERY_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.REQUEST_TIMEOUT_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.TIME_ZONE_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.VERSION_NAME;
+import static org.elasticsearch.xpack.sql.action.Protocol.CATALOG_NAME;
+import static org.elasticsearch.xpack.sql.action.Protocol.CLIENT_ID_NAME;
+import static org.elasticsearch.xpack.sql.action.Protocol.CURSOR_NAME;
+import static org.elasticsearch.xpack.sql.action.Protocol.FETCH_SIZE_NAME;
+import static org.elasticsearch.xpack.sql.action.Protocol.FILTER_NAME;
+import static org.elasticsearch.xpack.sql.action.Protocol.MODE_NAME;
+import static org.elasticsearch.xpack.sql.action.Protocol.PAGE_TIMEOUT_NAME;
+import static org.elasticsearch.xpack.sql.action.Protocol.PARAMS_NAME;
+import static org.elasticsearch.xpack.sql.action.Protocol.QUERY_NAME;
+import static org.elasticsearch.xpack.sql.action.Protocol.REQUEST_TIMEOUT_NAME;
+import static org.elasticsearch.xpack.sql.action.Protocol.TIME_ZONE_NAME;
+import static org.elasticsearch.xpack.sql.action.Protocol.VERSION_NAME;
 
 /**
  * Base class for requests that contain sql queries (Query and Translate)

diff --git a/x-pack/plugin/sql/sql-action/src/main/java/org/elasticsearch/xpack/sql/action/ProtoShim.java b/x-pack/plugin/sql/sql-action/src/main/java/org/elasticsearch/xpack/sql/action/ProtoShim.java
@@ -0,0 +1,33 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.sql.action;
+
+import org.elasticsearch.core.TimeValue;
+
+/**
+ * Utility class that handles conversion of classes in sql-proto (without any Elasticsearch dependencies)
+ * into sql-action which do depend on Elasticsearch (since they are meant to be used in this environment).
+ */
+final class ProtoShim {
+
+    private ProtoShim() {}
+
+    static TimeValue fromProto(org.elasticsearch.xpack.sql.proto.core.TimeValue protoTimeValue) {
+        if (protoTimeValue == null) {
+            return null;
+        }
+        return new TimeValue(protoTimeValue.duration(), protoTimeValue.timeUnit());
+    }
+
+    static org.elasticsearch.xpack.sql.proto.core.TimeValue toProto(TimeValue timeValue) {
+        if (timeValue == null) {
+            return null;
+        }
+        return new org.elasticsearch.xpack.sql.proto.core.TimeValue(timeValue.duration(), timeValue.timeUnit());
+    }
+}
diff --git a/x-pack/plugin/sql/sql-action/src/main/java/org/elasticsearch/xpack/sql/action/Protocol.java b/x-pack/plugin/sql/sql-action/src/main/java/org/elasticsearch/xpack/sql/action/Protocol.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright Elasticsearch B.V. and/or licensed to Elasticsearch B.V. under one
+ * or more contributor license agreements. Licensed under the Elastic License
+ * 2.0; you may not use this file except in compliance with the Elastic License
+ * 2.0.
+ */
+
+package org.elasticsearch.xpack.sql.action;
+
+import org.elasticsearch.core.TimeValue;
+import org.elasticsearch.xpack.sql.proto.CoreProtocol;
+
+import static org.elasticsearch.xpack.sql.action.ProtoShim.fromProto;
+
+/**
+ * Sql protocol defaults used for sharding constants across the code base both in server and clients.
+ * Expands and converts some constants from the sql-proto CoreProtocol class which has NO dependencies to ES.
+ */
+public final class Protocol extends CoreProtocol {
+
+    /**
+     * Global choice for the default fetch size.
+     */
+    public static final TimeValue REQUEST_TIMEOUT = fromProto(CoreProtocol.REQUEST_TIMEOUT);
+    public static final TimeValue PAGE_TIMEOUT = fromProto(CoreProtocol.PAGE_TIMEOUT);
+
+    public static final TimeValue DEFAULT_KEEP_ALIVE = fromProto(CoreProtocol.DEFAULT_KEEP_ALIVE);
+    public static final TimeValue DEFAULT_WAIT_FOR_COMPLETION_TIMEOUT = fromProto(CoreProtocol.DEFAULT_WAIT_FOR_COMPLETION_TIMEOUT);
+    public static final TimeValue MIN_KEEP_ALIVE = fromProto(CoreProtocol.MIN_KEEP_ALIVE);
+}
diff --git a/...ugin/sql/sql-action/src/main/java/org/elasticsearch/xpack/sql/action/SqlQueryRequest.java b/...ugin/sql/sql-action/src/main/java/org/elasticsearch/xpack/sql/action/SqlQueryRequest.java
@@ -19,7 +19,6 @@
 import org.elasticsearch.xcontent.ParseField;
 import org.elasticsearch.xcontent.XContentBuilder;
 import org.elasticsearch.xcontent.XContentParser;
-import org.elasticsearch.xpack.sql.proto.Protocol;
 import org.elasticsearch.xpack.sql.proto.RequestInfo;
 import org.elasticsearch.xpack.sql.proto.SqlTypedParamValue;
 
@@ -30,17 +29,17 @@
 import java.util.Objects;
 
 import static org.elasticsearch.action.ValidateActions.addValidationError;
-import static org.elasticsearch.xpack.sql.proto.Protocol.BINARY_FORMAT_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.COLUMNAR_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.DEFAULT_KEEP_ALIVE;
-import static org.elasticsearch.xpack.sql.proto.Protocol.DEFAULT_KEEP_ON_COMPLETION;
-import static org.elasticsearch.xpack.sql.proto.Protocol.DEFAULT_WAIT_FOR_COMPLETION_TIMEOUT;
-import static org.elasticsearch.xpack.sql.proto.Protocol.FIELD_MULTI_VALUE_LENIENCY_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.INDEX_INCLUDE_FROZEN_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.KEEP_ALIVE_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.KEEP_ON_COMPLETION_NAME;
-import static org.elasticsearch.xpack.sql.proto.Protocol.MIN_KEEP_ALIVE;
-import static org.elasticsearch.xpack.sql.proto.Protocol.WAIT_FOR_COMPLETION_TIMEOUT_NAME;
+import static org.elasticsearch.xpack.sql.action.Protocol.BINARY_FORMAT_NAME;
+import static org.elasticsearch.xpack.sql.action.Protocol.COLUMNAR_NAME;
+import static org.elasticsearch.xpack.sql.action.Protocol.DEFAULT_KEEP_ALIVE;
+import static org.elasticsearch.xpack.sql.action.Protocol.DEFAULT_KEEP_ON_COMPLETION;
+import static org.elasticsearch.xpack.sql.action.Protocol.DEFAULT_WAIT_FOR_COMPLETION_TIMEOUT;
+import static org.elasticsearch.xpack.sql.action.Protocol.FIELD_MULTI_VALUE_LENIENCY_NAME;
+import static org.elasticsearch.xpack.sql.action.Protocol.INDEX_INCLUDE_FROZEN_NAME;
+import static org.elasticsearch.xpack.sql.action.Protocol.KEEP_ALIVE_NAME;
+import static org.elasticsearch.xpack.sql.action.Protocol.KEEP_ON_COMPLETION_NAME;
+import static org.elasticsearch.xpack.sql.action.Protocol.MIN_KEEP_ALIVE;
+import static org.elasticsearch.xpack.sql.action.Protocol.WAIT_FOR_COMPLETION_TIMEOUT_NAME;
 
 /**
  * Request to perform an sql query
@@ -315,8 +314,8 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             zoneId(),
             catalog(),
             fetchSize(),
-            requestTimeout(),
-            pageTimeout(),
+            ProtoShim.toProto(requestTimeout()),
+            ProtoShim.toProto(pageTimeout()),
             filter(),
             columnar(),
             cursor(),
@@ -325,9 +324,9 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             indexIncludeFrozen(),
             binaryCommunication(),
             runtimeMappings(),
-            waitForCompletionTimeout(),
+            ProtoShim.toProto(waitForCompletionTimeout()),
             keepOnCompletion(),
-            keepAlive()
+            ProtoShim.toProto(keepAlive())
         ).toXContent(builder, params);
     }
 

diff --git a/...l/sql-action/src/main/java/org/elasticsearch/xpack/sql/action/SqlQueryRequestBuilder.java b/...l/sql-action/src/main/java/org/elasticsearch/xpack/sql/action/SqlQueryRequestBuilder.java
@@ -11,7 +11,6 @@
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.xpack.sql.proto.Mode;
-import org.elasticsearch.xpack.sql.proto.Protocol;
 import org.elasticsearch.xpack.sql.proto.RequestInfo;
 import org.elasticsearch.xpack.sql.proto.SqlTypedParamValue;
 

diff --git a/...gin/sql/sql-action/src/main/java/org/elasticsearch/xpack/sql/action/SqlQueryResponse.java b/...gin/sql/sql-action/src/main/java/org/elasticsearch/xpack/sql/action/SqlQueryResponse.java
@@ -17,7 +17,6 @@
 import org.elasticsearch.xpack.ql.async.QlStatusResponse;
 import org.elasticsearch.xpack.sql.proto.ColumnInfo;
 import org.elasticsearch.xpack.sql.proto.Mode;
-import org.elasticsearch.xpack.sql.proto.Protocol;
 import org.elasticsearch.xpack.sql.proto.SqlVersion;
 import org.elasticsearch.xpack.sql.proto.StringUtils;
 

diff --git a/.../sql/sql-action/src/main/java/org/elasticsearch/xpack/sql/action/SqlTranslateRequest.java b/.../sql/sql-action/src/main/java/org/elasticsearch/xpack/sql/action/SqlTranslateRequest.java
@@ -82,8 +82,8 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
             zoneId(),
             null,
             fetchSize(),
-            requestTimeout(),
-            pageTimeout(),
+            ProtoShim.toProto(requestTimeout()),
+            ProtoShim.toProto(pageTimeout()),
             filter(),
             null,
             null,

diff --git a/...l-action/src/main/java/org/elasticsearch/xpack/sql/action/SqlTranslateRequestBuilder.java b/...l-action/src/main/java/org/elasticsearch/xpack/sql/action/SqlTranslateRequestBuilder.java
@@ -11,7 +11,6 @@
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.index.query.QueryBuilder;
 import org.elasticsearch.xpack.sql.proto.Mode;
-import org.elasticsearch.xpack.sql.proto.Protocol;
 import org.elasticsearch.xpack.sql.proto.RequestInfo;
 import org.elasticsearch.xpack.sql.proto.SqlTypedParamValue;