This is an automated email from the ASF dual-hosted git repository. haonan pushed a commit to branch jira-768 in repository https://gitbox.apache.org/repos/asf/incubator-iotdb.git
commit 879c59c906f9841f15e426883ed0375c7aee379c Merge: 0428bd1 d8777ed Author: HTHou <[email protected]> AuthorDate: Tue Jul 14 17:39:22 2020 +0800 Merge branch 'master' of https://github.com/apache/incubator-iotdb into jira-768 docs/SystemDesign/DataQuery/QueryFundamentals.md | 43 +++++++++++++-- .../Concept/Data Model and Terminology.md | 4 +- docs/UserGuide/Operation Manual/SQL Reference.md | 14 ++++- .../System Tools/Performance Tracing Tool.md | 61 ++++++++++++++++++++++ .../zh/SystemDesign/DataQuery/QueryFundamentals.md | 38 +++++++++++++- .../Concept/Data Model and Terminology.md | 6 +-- .../zh/UserGuide/Operation Manual/SQL Reference.md | 18 +++++-- .../System Tools/Performance Tracing Tool.md | 61 ++++++++++++++++++++++ .../apache/iotdb/hadoop/tsfile/TSFInputFormat.java | 23 +++++--- .../iotdb/hadoop/tsfile/TSFRecordReader.java | 27 ++++++---- .../iotdb/hadoop/tsfile/TSFRecordWriter.java | 3 +- .../org/apache/iotdb/hive/TSFHiveInputFormat.java | 11 ++-- .../java/org/apache/iotdb/hive/TsFileSerDe.java | 18 +++++-- .../org/apache/iotdb/db/conf/IoTDBConfigCheck.java | 14 ++--- .../iotdb/db/integration/IoTDBRestartIT.java | 7 +++ site/src/main/.vuepress/config.js | 6 ++- 16 files changed, 300 insertions(+), 54 deletions(-)
