From 2e608e6e488d3180c7ef4226669a0d3a6699795f Mon Sep 17 00:00:00 2001 From: "xuyi556677@163.com" Date: Mon, 21 Jan 2019 20:38:14 +0800 Subject: [PATCH] fix datetime ut bug --- .../main/java/org/apache/iotdb/db/qp/QueryProcessor.java | 5 +++++ .../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 1ec75a75ddc7..1bd7ae074a15 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 PhysicalPlan parseSQLToPhysicalPlan(String sqlStr) 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 e6a2da20e060..38669cfd091c 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