You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by do...@apache.org on 2019/01/21 12:39:29 UTC
[incubator-iotdb] branch master updated: fix datetime ut bug
This is an automated email from the ASF dual-hosted git repository.
dope pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
The following commit(s) were added to refs/heads/master by this push:
new 2e608e6 fix datetime ut bug
new c306192 fix datetime ut bug and add debug info
2e608e6 is described below
commit 2e608e6e488d3180c7ef4226669a0d3a6699795f
Author: xuyi556677@163.com <xu...@163.com>
AuthorDate: Mon Jan 21 20:38:14 2019 +0800
fix datetime ut bug
---
iotdb/src/main/java/org/apache/iotdb/db/qp/QueryProcessor.java | 5 +++++
iotdb/src/test/java/org/apache/iotdb/db/sql/DatetimeUtilsTest.java | 7 ++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/iotdb/src/main/java/org/apache/iotdb/db/qp/QueryProcessor.java b/iotdb/src/main/java/org/apache/iotdb/db/qp/QueryProcessor.java
index 1ec75a7..1bd7ae0 100644
--- a/iotdb/src/main/java/org/apache/iotdb/db/qp/QueryProcessor.java
+++ b/iotdb/src/main/java/org/apache/iotdb/db/qp/QueryProcessor.java
@@ -67,10 +67,15 @@ public class QueryProcessor {
public PhysicalPlan parseSQLToPhysicalPlan(String sqlStr, ZoneId zoneId)
throws QueryProcessorException, ArgsErrorException, ProcessorException {
+ System.out.println("parseSQLToAST");
AstNode astNode = parseSQLToAST(sqlStr);
+ System.out.println("parseASTToOperator");
Operator operator = parseASTToOperator(astNode, zoneId);
+ System.out.println("logicalOptimize");
operator = logicalOptimize(operator, executor);
+ System.out.println("transformToPhysicalPlan");
PhysicalGenerator physicalGenerator = new PhysicalGenerator(executor);
+ System.out.println("transformToPhysicalPlan");
return physicalGenerator.transformToPhysicalPlan(operator);
}
diff --git a/iotdb/src/test/java/org/apache/iotdb/db/sql/DatetimeUtilsTest.java b/iotdb/src/test/java/org/apache/iotdb/db/sql/DatetimeUtilsTest.java
index e6a2da2..38669cf 100644
--- a/iotdb/src/test/java/org/apache/iotdb/db/sql/DatetimeUtilsTest.java
+++ b/iotdb/src/test/java/org/apache/iotdb/db/sql/DatetimeUtilsTest.java
@@ -42,7 +42,12 @@ public class DatetimeUtilsTest {
public void setUp() throws Exception {
zoneOffset = ZonedDateTime.now().getOffset();
zoneId = ZoneId.systemDefault();
- delta = (8 - Long.parseLong(zoneOffset.toString().split(":")[0])) * 3600000;
+ System.out.println(zoneOffset.toString());
+ if(zoneOffset.toString().equals("Z")){
+ delta = 8 * 3600000;
+ } else {
+ delta = (8 - Long.parseLong(zoneOffset.toString().split(":")[0])) * 3600000;
+ }
}
@After