Jackie-Jiang commented on a change in pull request #5513:
URL: https://github.com/apache/incubator-pinot/pull/5513#discussion_r437758422
##########
File path:
pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java
##########
@@ -435,6 +455,115 @@ static void handleQueryLimitOverride(BrokerRequest
brokerRequest, int queryLimit
}
}
+ /**
+ * Check if a SQL parsed BrokerRequest is a literal only query.
+ * @param brokerRequest
+ * @return true if this query selects only Literals
+ *
+ */
+ @VisibleForTesting
+ static boolean isLiteralOnlyQuery(BrokerRequest brokerRequest) {
+ if (brokerRequest.getPinotQuery() != null) {
+ for (Expression e: brokerRequest.getPinotQuery().getSelectList()) {
+ if (!CalciteSqlParser.isLiteralOnlyExpression(e)) {
+ return false;
+ }
+ }
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Compute BrokerResponse for literal only query.
+ *
+ * @param brokerRequest
+ * @param compilationStartTimeNs
+ * @param requestStatistics
+ * @return BrokerResponse
+ */
+ private BrokerResponse processLiteralOnlyBrokerRequest(BrokerRequest
brokerRequest, long compilationStartTimeNs,
+ RequestStatistics requestStatistics)
+ throws IllegalStateException {
+ BrokerResponseNative brokerResponse = new BrokerResponseNative();
+ List<String> columnNames = new ArrayList<>();
+ List<DataSchema.ColumnDataType> columnTypes = new ArrayList<>();
+ List<Object> row = new ArrayList<>();
+ for (Expression e : brokerRequest.getPinotQuery().getSelectList()) {
+ computeResultsForExpression(e, columnNames, columnTypes, row);
+ }
+ DataSchema dataSchema =
+ new DataSchema(columnNames.toArray(new String[0]),
columnTypes.toArray(new DataSchema.ColumnDataType[0]));
+ List<Object[]> rows = new ArrayList<>();
+ rows.add(row.toArray());
+ ResultTable resultTable = new ResultTable(dataSchema, rows);
+ brokerResponse.setResultTable(resultTable);
+
+ long totalTimeMs = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() -
compilationStartTimeNs);
+ brokerResponse.setTimeUsedMs(totalTimeMs);
+ requestStatistics.setQueryProcessingTime(totalTimeMs);
+ requestStatistics.setStatistics(brokerResponse);
+ return brokerResponse;
+ }
+
+ private void computeResultsForExpression(Expression e, List<String>
columnNames, List<DataSchema.ColumnDataType> columnTypes,
+ List<Object> row) {
+ if (e.getType() == ExpressionType.LITERAL) {
+ computeResultsForLiteral(e.getLiteral(), columnNames, columnTypes, row);
+ }
+ if (e.getType() == ExpressionType.FUNCTION) {
+ if
(e.getFunctionCall().getOperator().equalsIgnoreCase(SqlKind.AS.toString())) {
+ String columnName =
e.getFunctionCall().getOperands().get(1).getIdentifier().getName();
+ computeResultsForExpression(e.getFunctionCall().getOperands().get(0),
columnNames, columnTypes, row);
+ columnNames.set(columnNames.size() - 1, columnName);
+ } else {
+ throw new IllegalStateException(
+ "No able to compute results for function - " +
e.getFunctionCall().getOperator());
+ }
+ }
+ }
+
+ private void computeResultsForLiteral(Literal literal, List<String>
columnNames, List<DataSchema.ColumnDataType> columnTypes,
+ List<Object> row) {
+ Object fieldValue = literal.getFieldValue();
+ columnNames.add(fieldValue.toString());
Review comment:
Why putting literal String value as column name?
For functions, should we put function name here if alias is not provided?
##########
File path:
pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java
##########
@@ -435,6 +455,115 @@ static void handleQueryLimitOverride(BrokerRequest
brokerRequest, int queryLimit
}
}
+ /**
+ * Check if a SQL parsed BrokerRequest is a literal only query.
+ * @param brokerRequest
+ * @return true if this query selects only Literals
+ *
+ */
+ @VisibleForTesting
+ static boolean isLiteralOnlyQuery(BrokerRequest brokerRequest) {
+ if (brokerRequest.getPinotQuery() != null) {
+ for (Expression e: brokerRequest.getPinotQuery().getSelectList()) {
+ if (!CalciteSqlParser.isLiteralOnlyExpression(e)) {
+ return false;
+ }
+ }
+ return true;
+ }
+ return false;
+ }
+
+ /**
+ * Compute BrokerResponse for literal only query.
+ *
+ * @param brokerRequest
+ * @param compilationStartTimeNs
+ * @param requestStatistics
+ * @return BrokerResponse
+ */
+ private BrokerResponse processLiteralOnlyBrokerRequest(BrokerRequest
brokerRequest, long compilationStartTimeNs,
+ RequestStatistics requestStatistics)
+ throws IllegalStateException {
+ BrokerResponseNative brokerResponse = new BrokerResponseNative();
+ List<String> columnNames = new ArrayList<>();
+ List<DataSchema.ColumnDataType> columnTypes = new ArrayList<>();
+ List<Object> row = new ArrayList<>();
+ for (Expression e : brokerRequest.getPinotQuery().getSelectList()) {
+ computeResultsForExpression(e, columnNames, columnTypes, row);
+ }
+ DataSchema dataSchema =
+ new DataSchema(columnNames.toArray(new String[0]),
columnTypes.toArray(new DataSchema.ColumnDataType[0]));
+ List<Object[]> rows = new ArrayList<>();
+ rows.add(row.toArray());
+ ResultTable resultTable = new ResultTable(dataSchema, rows);
+ brokerResponse.setResultTable(resultTable);
+
+ long totalTimeMs = TimeUnit.NANOSECONDS.toMillis(System.nanoTime() -
compilationStartTimeNs);
+ brokerResponse.setTimeUsedMs(totalTimeMs);
+ requestStatistics.setQueryProcessingTime(totalTimeMs);
+ requestStatistics.setStatistics(brokerResponse);
+ return brokerResponse;
+ }
+
+ private void computeResultsForExpression(Expression e, List<String>
columnNames, List<DataSchema.ColumnDataType> columnTypes,
+ List<Object> row) {
+ if (e.getType() == ExpressionType.LITERAL) {
+ computeResultsForLiteral(e.getLiteral(), columnNames, columnTypes, row);
+ }
+ if (e.getType() == ExpressionType.FUNCTION) {
+ if
(e.getFunctionCall().getOperator().equalsIgnoreCase(SqlKind.AS.toString())) {
+ String columnName =
e.getFunctionCall().getOperands().get(1).getIdentifier().getName();
+ computeResultsForExpression(e.getFunctionCall().getOperands().get(0),
columnNames, columnTypes, row);
+ columnNames.set(columnNames.size() - 1, columnName);
+ } else {
+ throw new IllegalStateException(
+ "No able to compute results for function - " +
e.getFunctionCall().getOperator());
+ }
+ }
+ }
+
+ private void computeResultsForLiteral(Literal literal, List<String>
columnNames, List<DataSchema.ColumnDataType> columnTypes,
+ List<Object> row) {
+ Object fieldValue = literal.getFieldValue();
+ columnNames.add(fieldValue.toString());
+ switch (literal.getSetField()) {
+ case SHORT_VALUE:
+ columnTypes.add(DataSchema.ColumnDataType.INT);
+ row.add((int) literal.getShortValue());
+ break;
+ case INT_VALUE:
+ columnTypes.add(DataSchema.ColumnDataType.INT);
+ row.add(literal.getIntValue());
+ break;
+ case BYTE_VALUE:
Review comment:
(ocd) Can you put this in front of short so that we order them with the
size for readability?
##########
File path:
pinot-broker/src/main/java/org/apache/pinot/broker/requesthandler/BaseBrokerRequestHandler.java
##########
@@ -184,6 +192,18 @@ public BrokerResponse handleRequest(JsonNode request,
@Nullable RequesterIdentit
requestStatistics.setErrorCode(QueryException.PQL_PARSING_ERROR_CODE);
return new
BrokerResponseNative(QueryException.getException(QueryException.PQL_PARSING_ERROR,
e));
}
+ if (isLiteralOnlyQuery(brokerRequest)) {
+ LOGGER.info("Request {} contains only Literal, skipping server query:
{}", requestId, query);
+ try {
+ BrokerResponse brokerResponse =
+ processLiteralOnlyBrokerRequest(brokerRequest,
compilationStartTimeNs, requestStatistics);
+ return brokerResponse;
+ } catch (IllegalStateException e) {
Review comment:
IMO we should catch all `Exception` and fallback to the old behavior
instead of directly failing the query. What if
`processLiteralOnlyBrokerRequest()` somehow throws other type of exceptions?
##########
File path:
pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterIntegrationTest.java
##########
@@ -318,6 +317,37 @@ public void testTimeFunc()
assertEquals(todayStr, expectedTodayStr);
}
+ @Test
+ public void testLiteralOnlyFunc()
+ throws Exception {
+ long currentTsMin = System.currentTimeMillis();
+ String sqlQuery = "SELECT 1, now() as currentTs, 'abc', toDateTime(now(),
'yyyy-MM-dd z') as today";
Review comment:
Can you also add a function column without alias?
##########
File path:
pinot-common/src/main/java/org/apache/pinot/sql/parsers/CalciteSqlParser.java
##########
@@ -278,7 +278,9 @@ private static PinotQuery
compileCalciteSqlToPinotQuery(String sql) {
pinotQuery.setOffset(Integer.valueOf(((SqlNumericLiteral)
selectSqlNode.getOffset()).toValue()));
}
DataSource dataSource = new DataSource();
- dataSource.setTableName(selectSqlNode.getFrom().toString());
+ if (selectSqlNode.getFrom() != null) {
Review comment:
I don't quite follow. Why should we allow queries without the data
source (i.e. table name)?
How are we going to execute query `SELECT *` without `FROM`?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@pinot.apache.org
For additional commands, e-mail: commits-h...@pinot.apache.org
