This is an automated email from the ASF dual-hosted git repository.
rongr 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 3cd195213e move back interface change (#9237)
3cd195213e is described below
commit 3cd195213e59ecfc5ab625cc89b83bf197819332
Author: Rong Rong <ro...@apache.org>
AuthorDate: Wed Aug 17 18:50:58 2022 -0700
move back interface change (#9237)
- changing the interface back to use `BrokerResponse`
- add getter/setter for `ResultTable`
---
.../apache/pinot/broker/broker/helix/BaseBrokerStarter.java | 2 +-
.../broker/requesthandler/BaseBrokerRequestHandler.java | 2 +-
.../pinot/broker/requesthandler/BrokerRequestHandler.java | 6 +++---
.../broker/requesthandler/BrokerRequestHandlerDelegate.java | 7 ++++---
.../requesthandler/MultiStageBrokerRequestHandler.java | 3 ++-
.../broker/requesthandler/LiteralOnlyBrokerRequestTest.java | 8 ++++----
.../org/apache/pinot/common/response/BrokerResponse.java | 13 +++++++++++++
.../pinot/common/response/broker/BrokerResponseNative.java | 2 ++
8 files changed, 30 insertions(+), 13 deletions(-)
diff --git
a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java
b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java
index 98bb188ccf..47cccc1cbb 100644
---
a/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java
+++
b/pinot-broker/src/main/java/org/apache/pinot/broker/broker/helix/BaseBrokerStarter.java
@@ -273,7 +273,7 @@ public abstract class BaseBrokerStarter implements
ServiceStartable {
}
}
- MultiStageBrokerRequestHandler multiStageBrokerRequestHandler = null;
+ BrokerRequestHandler multiStageBrokerRequestHandler = null;
if (_brokerConf.getProperty(Helix.CONFIG_OF_MULTI_STAGE_ENGINE_ENABLED,
Helix.DEFAULT_MULTI_STAGE_ENGINE_ENABLED)) {
// multi-stage request handler uses both Netty and GRPC ports.
// worker requires both the "Netty port" for protocol transport; and
"GRPC port" for mailbox transport.
diff --git
a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java
b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java
index f5dba937ba..d6d9060b2a 100644
---
a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java
+++
b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java
@@ -252,7 +252,7 @@ public abstract class BaseBrokerRequestHandler implements
BrokerRequestHandler {
}
@Override
- public BrokerResponseNative handleRequest(JsonNode request, @Nullable
SqlNodeAndOptions sqlNodeAndOptions,
+ public BrokerResponse handleRequest(JsonNode request, @Nullable
SqlNodeAndOptions sqlNodeAndOptions,
@Nullable RequesterIdentity requesterIdentity, RequestContext
requestContext)
throws Exception {
long requestId = _requestIdGenerator.incrementAndGet();
diff --git
a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BrokerRequestHandler.java
b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BrokerRequestHandler.java
index de42134a6a..873cb9e0a1 100644
---
a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BrokerRequestHandler.java
+++
b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BrokerRequestHandler.java
@@ -25,7 +25,7 @@ import javax.annotation.Nullable;
import javax.annotation.concurrent.ThreadSafe;
import org.apache.commons.httpclient.HttpConnectionManager;
import org.apache.pinot.broker.api.RequesterIdentity;
-import org.apache.pinot.common.response.broker.BrokerResponseNative;
+import org.apache.pinot.common.response.BrokerResponse;
import org.apache.pinot.spi.trace.RequestContext;
import org.apache.pinot.sql.parsers.SqlNodeAndOptions;
@@ -37,11 +37,11 @@ public interface BrokerRequestHandler {
void shutDown();
- BrokerResponseNative handleRequest(JsonNode request, @Nullable
SqlNodeAndOptions sqlNodeAndOptions,
+ BrokerResponse handleRequest(JsonNode request, @Nullable SqlNodeAndOptions
sqlNodeAndOptions,
@Nullable RequesterIdentity requesterIdentity, RequestContext
requestContext)
throws Exception;
- default BrokerResponseNative handleRequest(JsonNode request, @Nullable
RequesterIdentity requesterIdentity,
+ default BrokerResponse handleRequest(JsonNode request, @Nullable
RequesterIdentity requesterIdentity,
RequestContext requestContext)
throws Exception {
return handleRequest(request, null, requesterIdentity, requestContext);
diff --git
a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BrokerRequestHandlerDelegate.java
b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BrokerRequestHandlerDelegate.java
index 7a2a085273..ce10cb6c2f 100644
---
a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BrokerRequestHandlerDelegate.java
+++
b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BrokerRequestHandlerDelegate.java
@@ -27,6 +27,7 @@ import org.apache.pinot.broker.api.RequesterIdentity;
import org.apache.pinot.common.exception.QueryException;
import org.apache.pinot.common.metrics.BrokerMeter;
import org.apache.pinot.common.metrics.BrokerMetrics;
+import org.apache.pinot.common.response.BrokerResponse;
import org.apache.pinot.common.response.broker.BrokerResponseNative;
import org.apache.pinot.spi.exception.BadQueryRequestException;
import org.apache.pinot.spi.trace.RequestContext;
@@ -48,11 +49,11 @@ public class BrokerRequestHandlerDelegate implements
BrokerRequestHandler {
private static final Logger LOGGER =
LoggerFactory.getLogger(BrokerRequestHandlerDelegate.class);
private final BrokerRequestHandler _singleStageBrokerRequestHandler;
- private final MultiStageBrokerRequestHandler _multiStageWorkerRequestHandler;
+ private final BrokerRequestHandler _multiStageWorkerRequestHandler;
private final BrokerMetrics _brokerMetrics;
public BrokerRequestHandlerDelegate(BrokerRequestHandler
singleStageBrokerRequestHandler,
- @Nullable MultiStageBrokerRequestHandler multiStageWorkerRequestHandler,
BrokerMetrics brokerMetrics) {
+ @Nullable BrokerRequestHandler multiStageWorkerRequestHandler,
BrokerMetrics brokerMetrics) {
_singleStageBrokerRequestHandler = singleStageBrokerRequestHandler;
_multiStageWorkerRequestHandler = multiStageWorkerRequestHandler;
_brokerMetrics = brokerMetrics;
@@ -79,7 +80,7 @@ public class BrokerRequestHandlerDelegate implements
BrokerRequestHandler {
}
@Override
- public BrokerResponseNative handleRequest(JsonNode request, @Nullable
SqlNodeAndOptions sqlNodeAndOptions,
+ public BrokerResponse handleRequest(JsonNode request, @Nullable
SqlNodeAndOptions sqlNodeAndOptions,
@Nullable RequesterIdentity requesterIdentity, RequestContext
requestContext)
throws Exception {
if (sqlNodeAndOptions == null) {
diff --git
a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/MultiStageBrokerRequestHandler.java
b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/MultiStageBrokerRequestHandler.java
index babd76ab09..8e5546a9dd 100644
---
a/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/MultiStageBrokerRequestHandler.java
+++
b/pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/MultiStageBrokerRequestHandler.java
@@ -36,6 +36,7 @@ import org.apache.pinot.common.metrics.BrokerMeter;
import org.apache.pinot.common.metrics.BrokerMetrics;
import org.apache.pinot.common.proto.Mailbox;
import org.apache.pinot.common.request.BrokerRequest;
+import org.apache.pinot.common.response.BrokerResponse;
import org.apache.pinot.common.response.broker.BrokerResponseNative;
import org.apache.pinot.common.response.broker.ResultTable;
import org.apache.pinot.common.utils.DataSchema;
@@ -99,7 +100,7 @@ public class MultiStageBrokerRequestHandler extends
BaseBrokerRequestHandler {
}
@Override
- public BrokerResponseNative handleRequest(JsonNode request, @Nullable
SqlNodeAndOptions sqlNodeAndOptions,
+ public BrokerResponse handleRequest(JsonNode request, @Nullable
SqlNodeAndOptions sqlNodeAndOptions,
@Nullable RequesterIdentity requesterIdentity, RequestContext
requestContext)
throws Exception {
long requestId = _requestIdGenerator.incrementAndGet();
diff --git
a/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/LiteralOnlyBrokerRequestTest.java
b/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/LiteralOnlyBrokerRequestTest.java
index 516fe5fb65..11bcd3c0c3 100644
---
a/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/LiteralOnlyBrokerRequestTest.java
+++
b/pinot-broker/src/test/java/org/apache/pinot/broker/requesthandler/LiteralOnlyBrokerRequestTest.java
@@ -26,7 +26,7 @@ import java.util.concurrent.TimeUnit;
import org.apache.pinot.broker.broker.AccessControlFactory;
import org.apache.pinot.broker.broker.AllowAllAccessControlFactory;
import org.apache.pinot.common.metrics.BrokerMetrics;
-import org.apache.pinot.common.response.broker.BrokerResponseNative;
+import org.apache.pinot.common.response.BrokerResponse;
import org.apache.pinot.common.response.broker.ResultTable;
import org.apache.pinot.common.utils.DataSchema;
import org.apache.pinot.spi.env.PinotConfiguration;
@@ -169,7 +169,7 @@ public class LiteralOnlyBrokerRequestTest {
String ranStr = BytesUtils.toHexString(randBytes);
JsonNode request =
JsonUtils.stringToJsonNode(String.format("{\"sql\":\"SELECT %d, '%s'\"}",
randNum, ranStr));
RequestContext requestStats = Tracing.getTracer().createRequestScope();
- BrokerResponseNative brokerResponse =
requestHandler.handleRequest(request, null, requestStats);
+ BrokerResponse brokerResponse = requestHandler.handleRequest(request,
null, requestStats);
Assert.assertEquals(brokerResponse.getResultTable().getDataSchema().getColumnName(0),
String.format("%d", randNum));
Assert.assertEquals(brokerResponse.getResultTable().getDataSchema().getColumnDataType(0),
DataSchema.ColumnDataType.LONG);
@@ -194,7 +194,7 @@ public class LiteralOnlyBrokerRequestTest {
JsonNode request = JsonUtils.stringToJsonNode(
"{\"sql\":\"SELECT now() as currentTs, fromDateTime('2020-01-01 UTC',
'yyyy-MM-dd z') as firstDayOf2020\"}");
RequestContext requestStats = Tracing.getTracer().createRequestScope();
- BrokerResponseNative brokerResponse =
requestHandler.handleRequest(request, null, requestStats);
+ BrokerResponse brokerResponse = requestHandler.handleRequest(request,
null, requestStats);
long currentTsMax = System.currentTimeMillis();
Assert.assertEquals(brokerResponse.getResultTable().getDataSchema().getColumnName(0),
"currentTs");
Assert.assertEquals(brokerResponse.getResultTable().getDataSchema().getColumnDataType(0),
@@ -334,7 +334,7 @@ public class LiteralOnlyBrokerRequestTest {
// Test 1: select constant
JsonNode request = JsonUtils.stringToJsonNode("{\"sql\":\"EXPLAIN PLAN FOR
SELECT 1.5, 'test'\"}");
RequestContext requestStats = Tracing.getTracer().createRequestScope();
- BrokerResponseNative brokerResponse =
requestHandler.handleRequest(request, null, requestStats);
+ BrokerResponse brokerResponse = requestHandler.handleRequest(request,
null, requestStats);
checkExplainResultSchema(brokerResponse.getResultTable().getDataSchema(),
new String[]{"Operator", "Operator_Id", "Parent_Id"},
diff --git
a/pinot-common/src/main/java/org/apache/pinot/common/response/BrokerResponse.java
b/pinot-common/src/main/java/org/apache/pinot/common/response/BrokerResponse.java
index 41a4769cc3..e50ea2b2ee 100644
---
a/pinot-common/src/main/java/org/apache/pinot/common/response/BrokerResponse.java
+++
b/pinot-common/src/main/java/org/apache/pinot/common/response/BrokerResponse.java
@@ -20,6 +20,7 @@ package org.apache.pinot.common.response;
import java.util.List;
import org.apache.pinot.common.response.broker.QueryProcessingException;
+import org.apache.pinot.common.response.broker.ResultTable;
/**
@@ -137,6 +138,18 @@ public interface BrokerResponse {
*/
int getExceptionsSize();
+ /**
+ * set the result table.
+ * @param resultTable result table to be set.
+ */
+ void setResultTable(ResultTable resultTable);
+
+ /**
+ * Get the result table.
+ * @return result table.
+ */
+ ResultTable getResultTable();
+
/**
* Get the list of exceptions
*/
diff --git
a/pinot-common/src/main/java/org/apache/pinot/common/response/broker/BrokerResponseNative.java
b/pinot-common/src/main/java/org/apache/pinot/common/response/broker/BrokerResponseNative.java
index 99109f0691..9c06d54b76 100644
---
a/pinot-common/src/main/java/org/apache/pinot/common/response/broker/BrokerResponseNative.java
+++
b/pinot-common/src/main/java/org/apache/pinot/common/response/broker/BrokerResponseNative.java
@@ -312,11 +312,13 @@ public class BrokerResponseNative implements
BrokerResponse {
@JsonProperty("resultTable")
@JsonInclude(JsonInclude.Include.NON_NULL)
+ @Override
public ResultTable getResultTable() {
return _resultTable;
}
@JsonProperty("resultTable")
+ @Override
public void setResultTable(ResultTable resultTable) {
_resultTable = resultTable;
_numRowsResultSet = resultTable.getRows().size();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
