You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by xu...@apache.org on 2020/11/30 01:08:36 UTC
[iotdb] branch memtable_sort_in_query updated (c9159f7 -> 03969d7)
This is an automated email from the ASF dual-hosted git repository.
xuekaifeng pushed a change to branch memtable_sort_in_query
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from c9159f7 fix bug
add 5e795c7 Fix userguid doc (#2105)
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 891d8b6 Change listener to visitor in antlr in order to improve prase speed. (#2034)
add bf03882 [IOTDB-23] providing some statistics info about the writing operations (#1725)
add 1bd93f1 format document. (#2118)
add ae9a4ab fix issue-2110
add 53e7143 [Issue-2110] Update start-client to start-cli
add b0812c0 add mods file changelist
add 7f36819 [IOTDB-1027] add mods file changelist
new 03969d7 Merge branch 'master' of https://github.com/apache/iotdb into memtable_sort_in_query
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
README.md | 63 +-
README_ZH.md | 67 +-
antlr/pom.xml | 4 +
.../iotdb/db/qp/{strategy => sql}/SqlBase.g4 | 45 +-
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 +-
.../tests/tools/importCsv/AbstractScript.java | 4 +-
.../tests/tools/importCsv/ExportCsvTestIT.java | 193 ++
.../tests/tools/importCsv/ImportCsvTestIT.java | 154 +-
docker/ReadMe.md | 10 +-
docs/Development/ContributeGuide.md | 6 +-
.../DML Data Manipulation Language.md | 37 +-
docs/UserGuide/Server/Config Manual.md | 27 -
docs/UserGuide/System Tools/CSV Tool.md | 85 +
.../System Tools/Monitor and Log Tools.md | 321 +--
docs/UserGuide/System Tools/Watermark Tool.md | 8 +-
docs/zh/Development/ContributeGuide.md | 2 +-
docs/zh/UserGuide/Get Started/Publication.md | 2 +-
.../DDL Data Definition Language.md | 2 +-
.../DML Data Manipulation Language.md | 37 +-
docs/zh/UserGuide/Server/Config Manual.md | 29 -
docs/zh/UserGuide/System Tools/CSV Tool.md | 88 +
.../System Tools/Monitor and Log Tools.md | 305 +--
docs/zh/UserGuide/System Tools/Watermark Tool.md | 8 +-
...mlog-changelist.md => TsFileMods-changelist.md} | 6 +-
.../resources/conf/iotdb-engine.properties | 21 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 47 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 25 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 19 +
.../apache/iotdb/db/engine/flush/FlushManager.java | 14 +
.../engine/storagegroup/StorageGroupProcessor.java | 41 +-
.../db/engine/storagegroup/TsFileProcessor.java | 2 +
.../org/apache/iotdb/db/metadata/MManager.java | 7 +-
.../org/apache/iotdb/db/metadata/PartialPath.java | 4 +
.../apache/iotdb/db/monitor/MonitorConstants.java | 94 +-
.../org/apache/iotdb/db/monitor/StatMonitor.java | 448 ++--
.../StatMonitorMBean.java} | 29 +-
.../iotdb/db/monitor/collector/FileSize.java | 162 --
.../monitor/collector/MemTableWriteTimeCost.java | 85 -
.../main/java/org/apache/iotdb/db/qp/Planner.java | 8 +-
.../apache/iotdb/db/qp/constant/SQLConstant.java | 2 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 22 +-
.../db/qp/logical/crud/QueryIndexOperator.java | 53 -
.../iotdb/db/qp/logical/crud/QueryOperator.java | 21 +
.../IoTDBSqlVisitor.java} | 2628 ++++++++++----------
.../iotdb/db/qp/strategy/LogicalGenerator.java | 1949 +--------------
.../apache/iotdb/db/qp/strategy/ParseDriver.java | 69 -
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 53 +-
...gicalGeneratorError.java => SQLParseError.java} | 4 +-
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 13 +-
.../db/query/aggregation/AggregateResult.java | 12 +-
.../query/dataset/groupby/GroupByTimeDataSet.java | 14 +-
.../db/query/executor/AggregationExecutor.java | 20 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 11 +-
.../java/org/apache/iotdb/db/service/Monitor.java | 150 --
.../org/apache/iotdb/db/service/TSServiceImpl.java | 13 +-
.../org/apache/iotdb/db/utils/FilePathUtils.java | 131 +-
.../db/integration/IoTDBAggregationByLevelIT.java | 324 +++
.../iotdb/db/monitor/collector/FileSizeTest.java | 93 -
.../iotdb/db/qp/plan/IndexLogicalPlanTest.java | 32 +-
.../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 110 +-
.../sql/DatetimeQueryDataSetUtilsTest.java | 2 +-
.../iotdb/db/qp/strategy/LogicalGeneratorTest.java | 26 +-
.../db/query/dataset/GroupByLevelDataSetTest.java | 25 +-
.../db/query/dataset/GroupByTimeDataSetTest.java | 18 +-
72 files changed, 3322 insertions(+), 5831 deletions(-)
rename antlr/src/main/antlr4/org/apache/iotdb/db/qp/{strategy => sql}/SqlBase.g4 (94%)
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
copy server/file-changelists/{mlog-changelist.md => TsFileMods-changelist.md} (93%)
rename server/src/main/java/org/apache/iotdb/db/{service/MonitorMBean.java => monitor/StatMonitorMBean.java} (69%)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/monitor/collector/FileSize.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/monitor/collector/MemTableWriteTimeCost.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/QueryIndexOperator.java
copy server/src/main/java/org/apache/iotdb/db/qp/{strategy/LogicalGenerator.java => sql/IoTDBSqlVisitor.java} (61%)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/strategy/ParseDriver.java
rename server/src/main/java/org/apache/iotdb/db/qp/strategy/{LogicalGeneratorError.java => SQLParseError.java} (89%)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/service/Monitor.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/integration/IoTDBAggregationByLevelIT.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/monitor/collector/FileSizeTest.java
rename server/src/test/java/org/apache/iotdb/db/{ => qp}/sql/DatetimeQueryDataSetUtilsTest.java (99%)
[iotdb] 01/01: Merge branch 'master' of
https://github.com/apache/iotdb into memtable_sort_in_query
Posted by xu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
xuekaifeng pushed a commit to branch memtable_sort_in_query
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 03969d7994db2935c876120f09cfad3d54f6f108
Merge: c9159f7 7f36819
Author: 151250176 <15...@smail.nju.edu.cn>
AuthorDate: Thu Nov 26 11:03:19 2020 +0800
Merge branch 'master' of https://github.com/apache/iotdb into memtable_sort_in_query
README.md | 63 +-
README_ZH.md | 67 +-
antlr/pom.xml | 4 +
.../iotdb/db/qp/{strategy => sql}/SqlBase.g4 | 45 +-
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 | 37 +-
.../org/apache/iotdb/tool/ExportCsvTestIT.java | 12 +-
.../org/apache/iotdb/tool/ImportCsvTestIT.java | 12 +-
.../tests/tools/importCsv/AbstractScript.java | 4 +-
.../tests/tools/importCsv/ExportCsvTestIT.java | 193 ++
.../tests/tools/importCsv/ImportCsvTestIT.java | 154 +-
docker/ReadMe.md | 10 +-
docs/Development/ContributeGuide.md | 6 +-
.../DML Data Manipulation Language.md | 37 +-
docs/UserGuide/Server/Config Manual.md | 27 -
docs/UserGuide/System Tools/CSV Tool.md | 85 +
.../System Tools/Monitor and Log Tools.md | 321 +--
docs/UserGuide/System Tools/Watermark Tool.md | 8 +-
docs/zh/Development/ContributeGuide.md | 2 +-
docs/zh/UserGuide/Get Started/Publication.md | 2 +-
.../DDL Data Definition Language.md | 2 +-
.../DML Data Manipulation Language.md | 37 +-
docs/zh/UserGuide/Server/Config Manual.md | 29 -
docs/zh/UserGuide/System Tools/CSV Tool.md | 88 +
.../System Tools/Monitor and Log Tools.md | 305 +--
docs/zh/UserGuide/System Tools/Watermark Tool.md | 8 +-
server/file-changelists/TsFileMods-changelist.md | 28 +
.../resources/conf/iotdb-engine.properties | 21 +-
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 47 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 25 +-
.../org/apache/iotdb/db/engine/StorageEngine.java | 19 +
.../apache/iotdb/db/engine/flush/FlushManager.java | 14 +
.../engine/storagegroup/StorageGroupProcessor.java | 41 +-
.../db/engine/storagegroup/TsFileProcessor.java | 2 +
.../org/apache/iotdb/db/metadata/MManager.java | 7 +-
.../org/apache/iotdb/db/metadata/PartialPath.java | 4 +
.../apache/iotdb/db/monitor/MonitorConstants.java | 94 +-
.../org/apache/iotdb/db/monitor/StatMonitor.java | 448 ++--
.../StatMonitorMBean.java} | 29 +-
.../iotdb/db/monitor/collector/FileSize.java | 162 --
.../monitor/collector/MemTableWriteTimeCost.java | 85 -
.../main/java/org/apache/iotdb/db/qp/Planner.java | 8 +-
.../apache/iotdb/db/qp/constant/SQLConstant.java | 2 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 22 +-
.../iotdb/db/qp/logical/crud/QueryOperator.java | 21 +
.../IoTDBSqlVisitor.java} | 2628 ++++++++++----------
.../iotdb/db/qp/strategy/LogicalGenerator.java | 1949 +--------------
.../apache/iotdb/db/qp/strategy/ParseDriver.java | 69 -
.../iotdb/db/qp/strategy/PhysicalGenerator.java | 53 +-
...gicalGeneratorError.java => SQLParseError.java} | 4 +-
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 13 +-
.../db/query/aggregation/AggregateResult.java | 12 +-
.../query/dataset/groupby/GroupByTimeDataSet.java | 14 +-
.../db/query/executor/AggregationExecutor.java | 20 +-
.../java/org/apache/iotdb/db/service/IoTDB.java | 11 +-
.../java/org/apache/iotdb/db/service/Monitor.java | 150 --
.../org/apache/iotdb/db/service/TSServiceImpl.java | 13 +-
.../org/apache/iotdb/db/utils/FilePathUtils.java | 131 +-
.../db/integration/IoTDBAggregationByLevelIT.java | 324 +++
.../iotdb/db/monitor/collector/FileSizeTest.java | 93 -
.../iotdb/db/qp/plan/IndexLogicalPlanTest.java | 32 +-
.../iotdb/db/qp/plan/LogicalPlanSmallTest.java | 110 +-
.../sql/DatetimeQueryDataSetUtilsTest.java | 2 +-
.../iotdb/db/qp/strategy/LogicalGeneratorTest.java | 26 +-
.../db/query/dataset/GroupByLevelDataSetTest.java | 25 +-
.../db/query/dataset/GroupByTimeDataSetTest.java | 18 +-
71 files changed, 3322 insertions(+), 5776 deletions(-)