You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ji...@apache.org on 2020/11/24 08:41:52 UTC

[iotdb] branch cluster_new updated (367ea84 -> 3aa359b)

This is an automated email from the ASF dual-hosted git repository.

jiangtian pushed a change to branch cluster_new
in repository https://gitbox.apache.org/repos/asf/iotdb.git.


    from 367ea84  fix test
     add a40842e  division by zero bug, when endtime - starttime < interval
     add d5df5c5  Merge pull request #2060 from haimeiguo/master_division_by_zero_bug
     add 6d8cdd0  [IOTDB-768] Extend more functions in aggregation group by level (#2088)
     add 157be8f  [IOTDB-937] change jdbc into session and don't need to create metadata (#1914)
     add 6ba41ba  Merge branch 'master' into cluster_new
     add 3aa359b  add config of wating for slow nodes

No new revisions were added by this update.

Summary of changes:
 README.md                                          |  63 +--
 README_ZH.md                                       |  67 +--
 cli/pom.xml                                        |   7 +-
 .../java/org/apache/iotdb/cli/AbstractCli.java     |  11 +-
 .../org/apache/iotdb/tool/AbstractCsvTool.java     |  44 +-
 .../main/java/org/apache/iotdb/tool/ExportCsv.java | 210 ++++-----
 .../main/java/org/apache/iotdb/tool/ImportCsv.java | 488 +++++++--------------
 .../java/org/apache/iotdb/cli/AbstractScript.java  |   4 +
 .../org/apache/iotdb/tool/CsvLineSplitTest.java    |  61 +--
 .../org/apache/iotdb/tool/ExportCsvTestIT.java     |  12 +-
 .../org/apache/iotdb/tool/ImportCsvTestIT.java     |  12 +-
 .../apache/iotdb/cluster/config/ClusterConfig.java |  15 +
 .../apache/iotdb/cluster/log/LogDispatcher.java    |  15 +-
 .../iotdb/cluster/log/catchup/CatchUpTask.java     |   6 +-
 .../cluster/log/catchup/SnapshotCatchUpTask.java   |  20 +-
 .../iotdb/cluster/log/snapshot/FileSnapshot.java   |  12 +-
 .../cluster/log/snapshot/PartitionedSnapshot.java  |   1 +
 .../cluster/server/member/DataGroupMember.java     |   5 +-
 .../tests/tools/importCsv/AbstractScript.java      |   4 +-
 .../tests/tools/importCsv/ExportCsvTestIT.java     | 193 ++++++++
 .../tests/tools/importCsv/ImportCsvTestIT.java     | 154 ++++++-
 .../DML Data Manipulation Language.md              |  37 +-
 docs/UserGuide/System Tools/CSV Tool.md            |  85 ++++
 .../DML Data Manipulation Language.md              |  37 +-
 docs/zh/UserGuide/System Tools/CSV Tool.md         |  88 ++++
 .../iotdb/db/qp/strategy/LogicalGenerator.java     |   1 +
 .../iotdb/db/qp/strategy/PhysicalGenerator.java    |  39 +-
 .../qp/strategy/optimizer/ConcatPathOptimizer.java |  10 +
 .../db/query/aggregation/AggregateResult.java      |  12 +-
 .../query/dataset/groupby/GroupByTimeDataSet.java  |  14 +-
 .../db/query/executor/AggregationExecutor.java     |  20 +-
 .../org/apache/iotdb/db/service/TSServiceImpl.java |  13 +-
 .../org/apache/iotdb/db/utils/FilePathUtils.java   | 131 ++++--
 .../org/apache/iotdb/db/utils/SerializeUtils.java  |   5 -
 .../db/integration/IoTDBAggregationByLevelIT.java  | 324 ++++++++++++++
 .../db/query/dataset/GroupByLevelDataSetTest.java  |  25 +-
 .../db/query/dataset/GroupByTimeDataSetTest.java   |  18 +-
 37 files changed, 1455 insertions(+), 808 deletions(-)
 copy server/src/test/java/org/apache/iotdb/db/query/control/QueryResourceManagerTest.java => cli/src/test/java/org/apache/iotdb/tool/CsvLineSplitTest.java (71%)
 create mode 100644 cross-tests/src/test/java/org/apache/iotdb/cross/tests/tools/importCsv/ExportCsvTestIT.java
 create mode 100644 docs/UserGuide/System Tools/CSV Tool.md
 create mode 100644 docs/zh/UserGuide/System Tools/CSV Tool.md
 create mode 100644 server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationByLevelIT.java