This is an automated email from the ASF dual-hosted git repository. qiaojialin pushed a commit to branch fix_timegenerator in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 12b7404cc47efcbde7f94ea1a99baddedb9bd558 Merge: 5d44648 bcd6c22 Author: qiaojialin <[email protected]> AuthorDate: Thu Feb 27 15:36:32 2020 +0800 Merge remote-tracking branch 'origin/master' .../2-DML (Data Manipulation Language).md | 23 ++++++++- .../5-Operation Manual/4-SQL Reference.md | 19 +++---- .../2-DML (Data Manipulation Language).md | 19 ++++++- .../5-Operation Manual/4-SQL Reference.md | 6 ++- .../main/java/org/apache/iotdb/JDBCExample.java | 2 +- .../org/apache/iotdb/jdbc/IoTDBResultMetadata.java | 7 +-- .../apache/iotdb/jdbc/IoTDBResultMetadataTest.java | 30 ++++++----- .../apache/iotdb/db/qp/executor/PlanExecutor.java | 6 ++- .../iotdb/db/qp/strategy/PhysicalGenerator.java | 6 --- .../db/query/aggregation/impl/AvgAggrResult.java | 6 +++ .../iotdb/db/integration/IoTDBSimpleQueryTest.java | 59 ++++++++++++++++++++++ .../db/query/aggregation/AggregateResultTest.java | 2 + .../tsfile/read/query/dataset/EmptyDataSet.java | 39 ++++++++++++++ 13 files changed, 184 insertions(+), 40 deletions(-)
