You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pinot.apache.org by xi...@apache.org on 2020/05/27 21:15:20 UTC
[incubator-pinot] branch
single_quote_string_literal_for_function_invoke_result created (now
948062a)
This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a change to branch single_quote_string_literal_for_function_invoke_result
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git.
at 948062a Single Quote String Literal for function invoker results
This branch includes the following new commits:
new 948062a Single Quote String Literal for function invoker results
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org
[incubator-pinot] 01/01: Single Quote String Literal for function
invoker results
Posted by xi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xiangfu pushed a commit to branch single_quote_string_literal_for_function_invoke_result
in repository https://gitbox.apache.org/repos/asf/incubator-pinot.git
commit 948062aa5f82a2fb508b5f3990e64bd10ccfa553
Author: Xiang Fu <fx...@gmail.com>
AuthorDate: Wed May 27 14:14:57 2020 -0700
Single Quote String Literal for function invoker results
---
.../org/apache/pinot/sql/parsers/CalciteSqlParser.java | 3 +++
.../apache/pinot/sql/parsers/CalciteSqlCompilerTest.java | 6 +++---
.../integration/tests/OfflineClusterIntegrationTest.java | 14 ++++++++++++++
3 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/pinot-common/src/main/java/org/apache/pinot/sql/parsers/CalciteSqlParser.java b/pinot-common/src/main/java/org/apache/pinot/sql/parsers/CalciteSqlParser.java
index 45b3274..2aec8ec 100644
--- a/pinot-common/src/main/java/org/apache/pinot/sql/parsers/CalciteSqlParser.java
+++ b/pinot-common/src/main/java/org/apache/pinot/sql/parsers/CalciteSqlParser.java
@@ -676,6 +676,9 @@ public class CalciteSqlParser {
try {
FunctionInvoker invoker = new FunctionInvoker(functionInfo);
Object result = invoker.process(arguments);
+ if (result instanceof String) {
+ result = String.format("'%s'", result);
+ }
return RequestUtils.getLiteralExpression(result);
} catch (Exception e) {
throw new SqlCompilationException(new IllegalArgumentException("Unsupported function - " + funcName, e));
diff --git a/pinot-common/src/test/java/org/apache/pinot/sql/parsers/CalciteSqlCompilerTest.java b/pinot-common/src/test/java/org/apache/pinot/sql/parsers/CalciteSqlCompilerTest.java
index ac0a5cf..aec7917 100644
--- a/pinot-common/src/test/java/org/apache/pinot/sql/parsers/CalciteSqlCompilerTest.java
+++ b/pinot-common/src/test/java/org/apache/pinot/sql/parsers/CalciteSqlCompilerTest.java
@@ -1534,7 +1534,7 @@ public class CalciteSqlCompilerTest {
Function greaterThan = pinotQuery.getFilterExpression().getFunctionCall();
String today = greaterThan.getOperands().get(1).getLiteral().getStringValue();
String expectedTodayStr =
- Instant.now().atZone(ZoneId.of("UTC")).format(DateTimeFormatter.ofPattern("yyyy-MM-dd z"));
+ "'" + Instant.now().atZone(ZoneId.of("UTC")).format(DateTimeFormatter.ofPattern("yyyy-MM-dd z")) + "'";
Assert.assertEquals(today, expectedTodayStr);
}
@@ -1557,7 +1557,7 @@ public class CalciteSqlCompilerTest {
Assert.assertTrue(expression.getLiteral() != null);
String today = expression.getLiteral().getStringValue();
String expectedTodayStr =
- Instant.now().atZone(ZoneId.of("UTC")).format(DateTimeFormatter.ofPattern("yyyy-MM-dd z"));
+ "'" + Instant.now().atZone(ZoneId.of("UTC")).format(DateTimeFormatter.ofPattern("yyyy-MM-dd z")) + "'";
Assert.assertEquals(today, expectedTodayStr);
expression = CalciteSqlParser.compileToExpression("toDateTime(playerName)");
Assert.assertTrue(expression.getFunctionCall() != null);
@@ -1575,7 +1575,7 @@ public class CalciteSqlCompilerTest {
Assert.assertTrue(expression.getFunctionCall() != null);
expression = CalciteSqlParser.invokeCompileTimeFunctionExpression(expression);
Assert.assertTrue(expression.getLiteral() != null);
- Assert.assertEquals(expression.getLiteral().getFieldValue(), "emaNreyalp");
+ Assert.assertEquals(expression.getLiteral().getFieldValue(), "'emaNreyalp'");
expression = CalciteSqlParser.compileToExpression("count(*)");
Assert.assertTrue(expression.getFunctionCall() != null);
expression = CalciteSqlParser.invokeCompileTimeFunctionExpression(expression);
diff --git a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterIntegrationTest.java b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterIntegrationTest.java
index f433a3e..223602c 100644
--- a/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterIntegrationTest.java
+++ b/pinot-integration-tests/src/test/java/org/apache/pinot/integration/tests/OfflineClusterIntegrationTest.java
@@ -24,6 +24,9 @@ import com.fasterxml.jackson.databind.node.ObjectNode;
import com.google.common.collect.ImmutableList;
import java.io.File;
import java.io.IOException;
+import java.time.Instant;
+import java.time.ZoneId;
+import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -309,6 +312,17 @@ public class OfflineClusterIntegrationTest extends BaseClusterIntegrationTestSet
}
@Test
+ public void testTimeFunc()
+ throws Exception {
+ String sqlQuery = "SELECT toDateTime(now(), 'yyyy-MM-dd z') FROM mytable";
+ JsonNode response = postSqlQuery(sqlQuery, _brokerBaseApiUrl);
+ String todayStr = response.get("resultTable").get("rows").get(0).get(0).asText();
+ String expectedTodayStr =
+ Instant.now().atZone(ZoneId.of("UTC")).format(DateTimeFormatter.ofPattern("yyyy-MM-dd z"));
+ Assert.assertEquals(todayStr, expectedTodayStr);
+ }
+
+ @Test
public void testRangeIndexTriggering()
throws Exception {
long numTotalDocs = getCountStarResult();
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@pinot.apache.org
For additional commands, e-mail: commits-help@pinot.apache.org