This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/pinot.git
The following commit(s) were added to refs/heads/master by this push:
new 2dca1411fb Correct case of `useMultistageEngine` property reference in
`JsonAsyncHttpPinotClientTransportFactory` (#11820)
2dca1411fb is described below
commit 2dca1411fbe76ff56ec04d7c4222cd879c7aec51
Author: Tim Veil <3260845+timv...@users.noreply.github.com>
AuthorDate: Tue Oct 24 18:18:05 2023 -0400
Correct case of `useMultistageEngine` property reference in
`JsonAsyncHttpPinotClientTransportFactory` (#11820)
* fix for #11813;
* fix for #11819;
---
.../pinot/client/JsonAsyncHttpPinotClientTransport.java | 12 +++++++-----
.../client/JsonAsyncHttpPinotClientTransportFactory.java | 6 +++---
.../pinot/client/controller/PinotControllerTransport.java | 1 +
.../pinot/integration/tests/BaseClusterIntegrationTest.java | 2 +-
4 files changed, 12 insertions(+), 9 deletions(-)
diff --git
a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransport.java
b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransport.java
index 8e888ff915..ec10d44c69 100644
---
a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransport.java
+++
b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransport.java
@@ -58,7 +58,7 @@ public class JsonAsyncHttpPinotClientTransport implements
PinotClientTransport<C
private final int _brokerReadTimeout;
private final AsyncHttpClient _httpClient;
private final String _extraOptionStr;
- private final boolean _useMultiStageEngine;
+ private final boolean _useMultistageEngine;
public JsonAsyncHttpPinotClientTransport() {
_brokerReadTimeout = 60000;
@@ -66,17 +66,17 @@ public class JsonAsyncHttpPinotClientTransport implements
PinotClientTransport<C
_scheme = CommonConstants.HTTP_PROTOCOL;
_extraOptionStr = DEFAULT_EXTRA_QUERY_OPTION_STRING;
_httpClient =
Dsl.asyncHttpClient(Dsl.config().setRequestTimeout(_brokerReadTimeout));
- _useMultiStageEngine = false;
+ _useMultistageEngine = false;
}
public JsonAsyncHttpPinotClientTransport(Map<String, String> headers, String
scheme, String extraOptionString,
- boolean useMultiStageEngine, @Nullable SSLContext sslContext,
ConnectionTimeouts connectionTimeouts,
+ boolean useMultistageEngine, @Nullable SSLContext sslContext,
ConnectionTimeouts connectionTimeouts,
TlsProtocols tlsProtocols, @Nullable String appId) {
_brokerReadTimeout = connectionTimeouts.getReadTimeoutMs();
_headers = headers;
_scheme = scheme;
_extraOptionStr = StringUtils.isEmpty(extraOptionString) ?
DEFAULT_EXTRA_QUERY_OPTION_STRING : extraOptionString;
- _useMultiStageEngine = useMultiStageEngine;
+ _useMultistageEngine = useMultistageEngine;
Builder builder = Dsl.config();
if (sslContext != null) {
@@ -109,7 +109,9 @@ public class JsonAsyncHttpPinotClientTransport implements
PinotClientTransport<C
json.put("sql", query);
json.put("queryOptions", _extraOptionStr);
- String url = String.format("%s://%s%s", _scheme, brokerAddress,
_useMultiStageEngine ? "/query" : "/query/sql");
+ LOGGER.debug("Query will use Multistage Engine = {}",
_useMultistageEngine);
+
+ String url = String.format("%s://%s%s", _scheme, brokerAddress,
_useMultistageEngine ? "/query" : "/query/sql");
BoundRequestBuilder requestBuilder = _httpClient.preparePost(url);
if (_headers != null) {
diff --git
a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransportFactory.java
b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransportFactory.java
index 9539a5470b..6f4e390599 100644
---
a/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransportFactory.java
+++
b/pinot-clients/pinot-java-client/src/main/java/org/apache/pinot/client/JsonAsyncHttpPinotClientTransportFactory.java
@@ -45,14 +45,14 @@ public class JsonAsyncHttpPinotClientTransportFactory
implements PinotClientTran
private int _handshakeTimeoutMs =
Integer.parseInt(DEFAULT_BROKER_HANDSHAKE_TIMEOUT_MS);
private String _appId = null;
private String _extraOptionString;
- private boolean _useMultiStageEngine;
+ private boolean _useMultistageEngine;
@Override
public PinotClientTransport buildTransport() {
ConnectionTimeouts connectionTimeouts =
ConnectionTimeouts.create(_readTimeoutMs, _connectTimeoutMs,
_handshakeTimeoutMs);
TlsProtocols tlsProtocols = TlsProtocols.defaultProtocols(_tlsV10Enabled);
- return new JsonAsyncHttpPinotClientTransport(_headers, _scheme,
_extraOptionString, _useMultiStageEngine,
+ return new JsonAsyncHttpPinotClientTransport(_headers, _scheme,
_extraOptionString, _useMultistageEngine,
_sslContext, connectionTimeouts, tlsProtocols, _appId);
}
@@ -104,7 +104,7 @@ public class JsonAsyncHttpPinotClientTransportFactory
implements PinotClientTran
System.getProperties().getProperty("broker.tlsV10Enabled",
DEFAULT_BROKER_TLS_V10_ENABLED));
_extraOptionString = properties.getProperty("queryOptions", "");
- _useMultiStageEngine =
Boolean.parseBoolean(properties.getProperty("useMultiStageEngine", "false"));
+ _useMultistageEngine =
Boolean.parseBoolean(properties.getProperty("useMultistageEngine", "false"));
return this;
}
}
diff --git
a/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/controller/PinotControllerTransport.java
b/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/controller/PinotControllerTransport.java
index fdf2251af7..4216b04450 100644
---
a/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/controller/PinotControllerTransport.java
+++
b/pinot-clients/pinot-jdbc-client/src/main/java/org/apache/pinot/client/controller/PinotControllerTransport.java
@@ -131,6 +131,7 @@ public class PinotControllerTransport {
_headers.forEach((k, v) -> requestBuilder.addHeader(k, v));
}
+
final Future<Response> response =
requestBuilder.addHeader("Content-Type", "application/json;
charset=utf-8").execute();
diff --git
a/pinot-integration-test-base/src/test/java/org/apache/pinot/integration/tests/BaseClusterIntegrationTest.java
b/pinot-integration-test-base/src/test/java/org/apache/pinot/integration/tests/BaseClusterIntegrationTest.java
index 4d77be325b..25ff663951 100644
---
a/pinot-integration-test-base/src/test/java/org/apache/pinot/integration/tests/BaseClusterIntegrationTest.java
+++
b/pinot-integration-test-base/src/test/java/org/apache/pinot/integration/tests/BaseClusterIntegrationTest.java
@@ -464,7 +464,7 @@ public abstract class BaseClusterIntegrationTest extends
ClusterTest {
if (useMultiStageQueryEngine()) {
if (_pinotConnectionV2 == null) {
Properties properties = getPinotConnectionProperties();
- properties.put("useMultiStageEngine", "true");
+ properties.put("useMultistageEngine", "true");
_pinotConnectionV2 = ConnectionFactory.fromZookeeper(getZkUrl() + "/"
+ getHelixClusterName(),
new JsonAsyncHttpPinotClientTransportFactory()
.withConnectionProperties(properties)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
