You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ja...@apache.org on 2022/01/18 10:55:30 UTC
[iotdb] branch ty-graduate updated (08bcbf0 -> 1bd084f)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch ty-graduate
in repository https://gitbox.apache.org/repos/asf/iotdb.git.
from 08bcbf0 format code
add 82928e9 [IOTDB-2377] Modify description of nested expressions in User Guide (#4857)
add 2695bc2 [IOTDB-2418][Doc] fix some doc problems in metric module (#4855)
add c982fa6 disable library-udf temporary because there is no codes under the module now
add 9412472 fix bug and add test (#4860)
add d8bb6d5 IOTDB-2414][IOTDB-2419]Fix partial insert failure exception message && Fix three level aligned path query bug (#4863)
add 3186a0c [IOTDB-2184] Update the code of Kafka example to use Session API and update kafka version from 0.8.2.0 to 2.8.0 (#4849)
add 289d23f [IOTDB-2396] Compatible with 0.12 on language structure (#4827)
add 30e5aa2 [IOTDB-2244] Support flush time management by ID table (#4776)
add 7b1f5c4 [IOTDB-2415] Slimit wrong result data in align by device
add 9e9c548 [IOTDB-2421] Optimize serialize method in PhysicalPlan class (#4861)
add 16349e9 [IOTDB-2417]Cross compaction selector bug (#4853)
add d67bd62 Fix IoTDBInsertMultiRowsIT bug and Spotless apply (#4866)
add 4519150 Enable display and deletion of schema templates (#4862)
add abde04b [ISSUE-4858] Fix incorrect configuration for TriggerLogWriter (#4868)
add 2659d1c [IOTDB-2423] Got an oom error when using iotdb (CQ?) (#4870)
add 34c2903 [IOTDB-2359] Refactor docs in 0.13 (#4865)
add f0562a1 [IOTDB-2424] Fix windows cpp compile doc and hide CLI history file (#4874)
add 5803a06 [IOTDB-2426] WAL deadlock caused by too many open files
add dfc6d39 [IOTDB-2412] Fetch Result Task is not taken account into query execution control (#4854)
new bc4f820 Merge remote-tracking branch 'origin/master' into ty-graduate
new 1bd084f add insert time cost
The 2 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:
.../org/apache/iotdb/db/qp/sql/IoTDBSqlLexer.g4 | 43 +-
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 81 +-
.../org/apache/iotdb/cli/utils/JlineUtils.java | 5 +-
docs/UserGuide/API/Programming-Cpp-Native-API.md | 6 +-
docs/UserGuide/API/Programming-Java-Native-API.md | 25 +-
.../Programming-MQTT.md | 0
.../Programming-Thrift.md | 0
docs/UserGuide/{Appendix => API}/Status-Codes.md | 0
.../Administration-Management/Administration.md | 2 +-
docs/UserGuide/Data-Concept/Compression.md | 4 +-
.../Data-Concept/Data-Model-and-Terminology.md | 2 +-
docs/UserGuide/Data-Concept/Data-Type.md | 2 +-
docs/UserGuide/Data-Concept/Time-Partition.md | 2 +-
docs/UserGuide/{API => Data-Concept}/Time-zone.md | 0
.../UserGuide/Data-Modeling/VirtualStorageGroup.md | 2 +-
.../DML-Data-Manipulation-Language.md | 2158 --------------------
.../IoTDB-SQL-Language/Syntax-Conventions.md | 128 --
.../JMX-Tool.md | 0
.../MLogParser-Tool.md | 0
.../Maintenance-Command.md | 0
.../Metric-Tool.md | 0
.../Monitor-and-Log-Tools.md | 0
.../NodeTool.md | 0
.../Sync-Tool.md | 0
.../TsFileSelfCheck-Tool.md | 0
.../Watermark-Tool.md | 0
.../Auto-Create-MetaData.md | 2 +-
docs/UserGuide/Operate-Metadata/Node.md | 209 ++
docs/UserGuide/Operate-Metadata/Storage-Group.md | 77 +
docs/UserGuide/Operate-Metadata/TTL.md | 59 +
docs/UserGuide/Operate-Metadata/Template.md | 60 +
.../Timeseries.md} | 328 +--
.../Alerting.md | 0
.../Continuous-Query.md | 2 +-
.../Select-Into.md | 0
.../Triggers.md | 0
.../UDF-Data-Quality.md} | 0
.../UDF-Data-Repair.md} | 0
.../UDF-Get-Started.md} | 0
.../UDF-User-Defined-Function.md | 0
.../Performance-Tracing-Tool.md | 0
.../Cluster-Setup-Example.md | 0
.../{Cluster => QuickStart}/Cluster-Setup.md | 0
.../{CLI => QuickStart}/Command-Line-Interface.md | 0
docs/UserGuide/QuickStart/Files.md | 8 +-
docs/UserGuide/QuickStart/QuickStart.md | 4 +-
.../{Appendix => Reference}/Config-Manual.md | 0
.../Frequently-asked-questions.md | 0
docs/UserGuide/Reference/Keywords.md | 212 ++
.../{Appendix => Reference}/SQL-Reference.md | 0
docs/UserGuide/Reference/Syntax-Conventions.md | 188 ++
.../{Comparison => Reference}/TSDB-Comparison.md | 0
.../CSV-Tool.md | 0
.../UserGuide/Write-And-Delete-Data/Delete-Data.md | 98 +
.../Load-External-Tsfile.md | 0
docs/UserGuide/Write-And-Delete-Data/Write-Data.md | 108 +
docs/zh/SystemDesign/TsFile/Format.md | 2 +-
.../zh/UserGuide/API/Programming-Cpp-Native-API.md | 2 +-
.../UserGuide/API/Programming-Java-Native-API.md | 19 +-
.../Programming-MQTT.md | 0
.../Programming-Thrift.md | 0
.../RestService.md | 0
.../zh/UserGuide/{Appendix => API}/Status-Codes.md | 0
docs/zh/UserGuide/Data-Concept/Compression.md | 4 +-
.../Data-Concept/Data-Model-and-Terminology.md | 2 +-
docs/zh/UserGuide/Data-Concept/Data-Type.md | 2 +-
docs/zh/UserGuide/Data-Concept/Encoding.md | 2 +-
docs/zh/UserGuide/Data-Concept/Time-Partition.md | 2 +-
.../UserGuide/{API => Data-Concept}/Time-zone.md | 0
.../UserGuide/Data-Modeling/VirtualStorageGroup.md | 2 +-
.../DML-Data-Manipulation-Language.md | 2152 -------------------
.../IoTDB-SQL-Language/Syntax-Conventions.md | 129 --
.../JMX-Tool.md | 0
.../MLogParser-Tool.md | 0
.../Maintenance-Command.md | 0
.../Metric-Tool.md | 0
.../Monitor-and-Log-Tools.md | 0
.../NodeTool.md | 0
.../Sync-Tool.md | 0
.../TsFileSelfCheck-Tool.md | 0
.../Watermark-Tool.md | 0
.../Auto-Create-MetaData.md | 2 +-
docs/zh/UserGuide/Operate-Metadata/Node.md | 213 ++
.../zh/UserGuide/Operate-Metadata/Storage-Group.md | 79 +
docs/zh/UserGuide/Operate-Metadata/TTL.md | 57 +
docs/zh/UserGuide/Operate-Metadata/Template.md | 60 +
.../Timeseries.md} | 332 +--
.../Alerting.md | 0
.../Continuous-Query.md | 2 +-
.../Select-Into.md | 0
.../Triggers.md | 0
.../UDF-Data-Quality.md} | 0
.../UDF-Data-Repair.md} | 0
.../UDF-Get-Started.md} | 2 +-
.../UDF-User-Defined-Function.md | 2 +-
.../Performance-Tracing-Tool.md | 0
.../Cluster-Setup-Example.md | 0
.../{Cluster => QuickStart}/Cluster-Setup.md | 0
.../{CLI => QuickStart}/Command-Line-Interface.md | 0
docs/zh/UserGuide/QuickStart/Files.md | 10 +-
docs/zh/UserGuide/QuickStart/QuickStart.md | 2 +-
docs/zh/UserGuide/QuickStart/WayToGetIoTDB.md | 2 +-
.../{Appendix => Reference}/Config-Manual.md | 0
.../Frequently-asked-questions.md | 0
docs/zh/UserGuide/Reference/Keywords.md | 212 ++
.../{Appendix => Reference}/SQL-Reference.md | 0
docs/zh/UserGuide/Reference/Syntax-Conventions.md | 187 ++
.../{Comparison => Reference}/TSDB-Comparison.md | 0
.../CSV-Tool.md | 0
.../UserGuide/Write-And-Delete-Data/Delete-Data.md | 93 +
.../Load-External-Tsfile.md | 0
.../UserGuide/Write-And-Delete-Data/Write-Data.md | 110 +
example/kafka/pom.xml | 8 +-
example/kafka/readme.md | 30 +-
.../main/java/org/apache/iotdb/kafka/Constant.java | 68 +-
.../main/java/org/apache/iotdb/kafka/Consumer.java | 129 ++
.../org/apache/iotdb/kafka/ConsumerThread.java | 159 ++
.../java/org/apache/iotdb/kafka/KafkaConsumer.java | 90 -
.../apache/iotdb/kafka/KafkaConsumerThread.java | 104 -
.../kafka/{KafkaProducer.java => Producer.java} | 34 +-
.../main/java/org/apache/iotdb/SessionExample.java | 94 +-
.../iotdb/db/integration/IoTDBAlignByDeviceIT.java | 46 +
.../iotdb/db/integration/IoTDBFuzzyQueryIT.java | 2 +-
.../iotdb/db/integration/IoTDBGroupByFillIT.java | 8 +-
.../db/integration/IoTDBInsertMultiRowIT.java | 18 +
.../db/integration/IoTDBQueryWithIDTableIT.java | 5 +-
.../db/integration/IoTDBSyntaxConventionIT.java | 288 +++
.../db/integration/IoTDBUDTFBuiltinFunctionIT.java | 2 +-
.../aggregation/IoTDBUDFNestAggregationIT.java | 8 +-
.../IoTDBUserDefinedAggregationFunctionIT.java | 17 +-
.../aligned/IOTDBInsertAlignedValuesIT.java | 14 +
.../IoTDBSyntaxConventionVersionAdaptionIT.java} | 46 +-
.../iotdb/session/IoTDBSessionComplexIT.java | 6 +-
.../src/main/java/org/apache/iotdb/jdbc/Utils.java | 2 +-
.../test/java/org/apache/iotdb/jdbc/UtilsTest.java | 8 +
metrics/ReadMe.md | 9 +-
.../main/assembly/resources/conf/iotdb-metric.yml | 3 +-
.../apache/iotdb/metrics/CompositeReporter.java | 4 +-
.../java/org/apache/iotdb/metrics/type/Gauge.java | 2 +
pom.xml | 2 +-
server/pom.xml | 6 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +-
.../cross/inplace/InplaceCompactionSelector.java | 41 +-
.../iotdb/db/engine/cq/ContinuousQueryTask.java | 3 +-
.../storagegroup/IDTableFlushTimeManager.java | 207 ++
.../engine/storagegroup/ILastFlushTimeManager.java | 12 +-
.../engine/storagegroup/LastFlushTimeManager.java | 12 +-
.../storagegroup/VirtualStorageGroupProcessor.java | 24 +-
.../engine/trigger/service/TriggerLogWriter.java | 2 +-
.../org/apache/iotdb/db/metadata/MManager.java | 54 +
.../apache/iotdb/db/metadata/idtable/IDTable.java | 16 +
.../db/metadata/idtable/IDTableHashmapImpl.java | 39 +-
.../db/metadata/idtable/entry/DeviceEntry.java | 68 +
.../db/metadata/idtable/entry/DeviceIDFactory.java | 16 +-
.../iotdb/db/metadata/logfile/MLogTxtWriter.java | 24 +
.../iotdb/db/metadata/logfile/MLogWriter.java | 5 +
.../db/metadata/logfile/MetadataOperationType.java | 2 +
.../org/apache/iotdb/db/metadata/mtree/MTree.java | 105 +-
.../apache/iotdb/db/metadata/path/AlignedPath.java | 5 +
.../db/metadata/template/TemplateManager.java | 10 +
.../db/metadata/template/TemplateQueryType.java | 5 +-
.../iotdb/db/metadata/utils/MetaFormatUtils.java | 4 +-
.../apache/iotdb/db/metadata/utils/MetaUtils.java | 40 +-
.../influxdb/meta/InfluxDBMetaManager.java | 3 +-
.../protocol/rest/impl/GrafanaApiServiceImpl.java | 5 +-
.../db/protocol/rest/impl/RestApiServiceImpl.java | 3 +-
.../main/java/org/apache/iotdb/db/qp/Planner.java | 2 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 12 +
.../org/apache/iotdb/db/qp/logical/Operator.java | 3 +-
.../iotdb/db/qp/logical/crud/InsertOperator.java | 2 +-
.../iotdb/db/qp/logical/crud/QueryOperator.java | 29 +-
.../apache/iotdb/db/qp/physical/PhysicalPlan.java | 13 +-
.../db/qp/physical/crud/AlignByDevicePlan.java | 14 +
...runeTemplatePlan.java => DropTemplatePlan.java} | 45 +-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 232 ++-
.../iotdb/db/qp/strategy/LogicalGenerator.java | 12 +-
.../db/service/thrift/impl/TSServiceImpl.java | 146 +-
.../org/apache/iotdb/db/tools/mlog/MLogParser.java | 8 +
.../db/writelog/node/ExclusiveWriteLogNode.java | 24 +-
.../org/apache/iotdb/db/metadata/TemplateTest.java | 135 +-
...eRestartTest.java => IDTableFlushTimeTest.java} | 177 +-
.../java/org/apache/iotdb/session/Session.java | 43 +
.../apache/iotdb/session/SessionConnection.java | 20 +
.../org/apache/iotdb/session/pool/SessionPool.java | 97 +
.../iotdb/session/template/TemplateQueryType.java | 5 +-
.../apache/iotdb/session/template/TemplateUT.java | 131 ++
site/src/main/.vuepress/config.js | 278 ++-
thrift/rpc-changelist.md | 3 +-
thrift/src/main/thrift/rpc.thrift | 7 +
189 files changed, 4673 insertions(+), 6182 deletions(-)
rename docs/UserGuide/{Communication-Service-Protocol => API}/Programming-MQTT.md (100%)
rename docs/UserGuide/{Communication-Service-Protocol => API}/Programming-Thrift.md (100%)
rename docs/UserGuide/{Appendix => API}/Status-Codes.md (100%)
rename docs/UserGuide/{API => Data-Concept}/Time-zone.md (100%)
delete mode 100644 docs/UserGuide/IoTDB-SQL-Language/DML-Data-Manipulation-Language.md
delete mode 100644 docs/UserGuide/IoTDB-SQL-Language/Syntax-Conventions.md
rename docs/UserGuide/{System-Tools => Maintenance-Tools}/JMX-Tool.md (100%)
rename docs/UserGuide/{System-Tools => Maintenance-Tools}/MLogParser-Tool.md (100%)
rename docs/UserGuide/{IoTDB-SQL-Language => Maintenance-Tools}/Maintenance-Command.md (100%)
rename docs/UserGuide/{System-Tools => Maintenance-Tools}/Metric-Tool.md (100%)
rename docs/UserGuide/{System-Tools => Maintenance-Tools}/Monitor-and-Log-Tools.md (100%)
rename docs/UserGuide/{System-Tools => Maintenance-Tools}/NodeTool.md (100%)
rename docs/UserGuide/{Collaboration-of-Edge-and-Cloud => Maintenance-Tools}/Sync-Tool.md (100%)
rename docs/UserGuide/{System-Tools => Maintenance-Tools}/TsFileSelfCheck-Tool.md (100%)
rename docs/UserGuide/{System-Tools => Maintenance-Tools}/Watermark-Tool.md (100%)
rename docs/UserGuide/{Data-Concept => Operate-Metadata}/Auto-Create-MetaData.md (98%)
create mode 100644 docs/UserGuide/Operate-Metadata/Node.md
create mode 100644 docs/UserGuide/Operate-Metadata/Storage-Group.md
create mode 100644 docs/UserGuide/Operate-Metadata/TTL.md
create mode 100644 docs/UserGuide/Operate-Metadata/Template.md
rename docs/UserGuide/{IoTDB-SQL-Language/DDL-Data-Definition-Language.md => Operate-Metadata/Timeseries.md} (60%)
rename docs/UserGuide/{Advanced-Features => Process-Data}/Alerting.md (100%)
rename docs/UserGuide/{Advanced-Features => Process-Data}/Continuous-Query.md (99%)
rename docs/UserGuide/{Advanced-Features => Process-Data}/Select-Into.md (100%)
rename docs/UserGuide/{Advanced-Features => Process-Data}/Triggers.md (100%)
rename docs/UserGuide/{Library-UDF/Data-Quality.md => Process-Data/UDF-Data-Quality.md} (100%)
rename docs/UserGuide/{Library-UDF/Data-Repair.md => Process-Data/UDF-Data-Repair.md} (100%)
rename docs/UserGuide/{Library-UDF/Get-Started.md => Process-Data/UDF-Get-Started.md} (100%)
rename docs/UserGuide/{Advanced-Features => Process-Data}/UDF-User-Defined-Function.md (100%)
rename docs/UserGuide/{System-Tools => Query-Data}/Performance-Tracing-Tool.md (100%)
rename docs/UserGuide/{Cluster => QuickStart}/Cluster-Setup-Example.md (100%)
rename docs/UserGuide/{Cluster => QuickStart}/Cluster-Setup.md (100%)
rename docs/UserGuide/{CLI => QuickStart}/Command-Line-Interface.md (100%)
rename docs/UserGuide/{Appendix => Reference}/Config-Manual.md (100%)
rename docs/UserGuide/{FAQ => Reference}/Frequently-asked-questions.md (100%)
create mode 100644 docs/UserGuide/Reference/Keywords.md
rename docs/UserGuide/{Appendix => Reference}/SQL-Reference.md (100%)
create mode 100644 docs/UserGuide/Reference/Syntax-Conventions.md
rename docs/UserGuide/{Comparison => Reference}/TSDB-Comparison.md (100%)
rename docs/UserGuide/{System-Tools => Write-And-Delete-Data}/CSV-Tool.md (100%)
create mode 100644 docs/UserGuide/Write-And-Delete-Data/Delete-Data.md
rename docs/UserGuide/{System-Tools => Write-And-Delete-Data}/Load-External-Tsfile.md (100%)
create mode 100644 docs/UserGuide/Write-And-Delete-Data/Write-Data.md
rename docs/zh/UserGuide/{Communication-Service-Protocol => API}/Programming-MQTT.md (100%)
rename docs/zh/UserGuide/{Communication-Service-Protocol => API}/Programming-Thrift.md (100%)
rename docs/zh/UserGuide/{Communication-Service-Protocol => API}/RestService.md (100%)
rename docs/zh/UserGuide/{Appendix => API}/Status-Codes.md (100%)
rename docs/zh/UserGuide/{API => Data-Concept}/Time-zone.md (100%)
delete mode 100644 docs/zh/UserGuide/IoTDB-SQL-Language/DML-Data-Manipulation-Language.md
delete mode 100644 docs/zh/UserGuide/IoTDB-SQL-Language/Syntax-Conventions.md
rename docs/zh/UserGuide/{System-Tools => Maintenance-Tools}/JMX-Tool.md (100%)
rename docs/zh/UserGuide/{System-Tools => Maintenance-Tools}/MLogParser-Tool.md (100%)
rename docs/zh/UserGuide/{IoTDB-SQL-Language => Maintenance-Tools}/Maintenance-Command.md (100%)
rename docs/zh/UserGuide/{System-Tools => Maintenance-Tools}/Metric-Tool.md (100%)
rename docs/zh/UserGuide/{System-Tools => Maintenance-Tools}/Monitor-and-Log-Tools.md (100%)
rename docs/zh/UserGuide/{System-Tools => Maintenance-Tools}/NodeTool.md (100%)
rename docs/zh/UserGuide/{Collaboration-of-Edge-and-Cloud => Maintenance-Tools}/Sync-Tool.md (100%)
rename docs/zh/UserGuide/{System-Tools => Maintenance-Tools}/TsFileSelfCheck-Tool.md (100%)
rename docs/zh/UserGuide/{System-Tools => Maintenance-Tools}/Watermark-Tool.md (100%)
rename docs/zh/UserGuide/{Data-Concept => Operate-Metadata}/Auto-Create-MetaData.md (99%)
create mode 100644 docs/zh/UserGuide/Operate-Metadata/Node.md
create mode 100644 docs/zh/UserGuide/Operate-Metadata/Storage-Group.md
create mode 100644 docs/zh/UserGuide/Operate-Metadata/TTL.md
create mode 100644 docs/zh/UserGuide/Operate-Metadata/Template.md
rename docs/zh/UserGuide/{IoTDB-SQL-Language/DDL-Data-Definition-Language.md => Operate-Metadata/Timeseries.md} (61%)
rename docs/zh/UserGuide/{Advanced-Features => Process-Data}/Alerting.md (100%)
rename docs/zh/UserGuide/{Advanced-Features => Process-Data}/Continuous-Query.md (99%)
rename docs/zh/UserGuide/{Advanced-Features => Process-Data}/Select-Into.md (100%)
rename docs/zh/UserGuide/{Advanced-Features => Process-Data}/Triggers.md (100%)
rename docs/zh/UserGuide/{Library-UDF/Data-Quality.md => Process-Data/UDF-Data-Quality.md} (100%)
rename docs/zh/UserGuide/{Library-UDF/Data-Repair.md => Process-Data/UDF-Data-Repair.md} (100%)
rename docs/zh/UserGuide/{Library-UDF/Get-Started.md => Process-Data/UDF-Get-Started.md} (99%)
rename docs/zh/UserGuide/{Advanced-Features => Process-Data}/UDF-User-Defined-Function.md (99%)
rename docs/zh/UserGuide/{System-Tools => Query-Data}/Performance-Tracing-Tool.md (100%)
rename docs/zh/UserGuide/{Cluster => QuickStart}/Cluster-Setup-Example.md (100%)
rename docs/zh/UserGuide/{Cluster => QuickStart}/Cluster-Setup.md (100%)
rename docs/zh/UserGuide/{CLI => QuickStart}/Command-Line-Interface.md (100%)
rename docs/zh/UserGuide/{Appendix => Reference}/Config-Manual.md (100%)
rename docs/zh/UserGuide/{FAQ => Reference}/Frequently-asked-questions.md (100%)
create mode 100644 docs/zh/UserGuide/Reference/Keywords.md
rename docs/zh/UserGuide/{Appendix => Reference}/SQL-Reference.md (100%)
create mode 100644 docs/zh/UserGuide/Reference/Syntax-Conventions.md
rename docs/zh/UserGuide/{Comparison => Reference}/TSDB-Comparison.md (100%)
rename docs/zh/UserGuide/{System-Tools => Write-And-Delete-Data}/CSV-Tool.md (100%)
create mode 100644 docs/zh/UserGuide/Write-And-Delete-Data/Delete-Data.md
rename docs/zh/UserGuide/{System-Tools => Write-And-Delete-Data}/Load-External-Tsfile.md (100%)
create mode 100644 docs/zh/UserGuide/Write-And-Delete-Data/Write-Data.md
create mode 100644 example/kafka/src/main/java/org/apache/iotdb/kafka/Consumer.java
create mode 100644 example/kafka/src/main/java/org/apache/iotdb/kafka/ConsumerThread.java
delete mode 100644 example/kafka/src/main/java/org/apache/iotdb/kafka/KafkaConsumer.java
delete mode 100644 example/kafka/src/main/java/org/apache/iotdb/kafka/KafkaConsumerThread.java
rename example/kafka/src/main/java/org/apache/iotdb/kafka/{KafkaProducer.java => Producer.java} (60%)
create mode 100644 integration/src/test/java/org/apache/iotdb/db/integration/IoTDBSyntaxConventionIT.java
copy integration/src/test/java/org/apache/iotdb/db/integration/{IoTDBKillQueryIT.java => versionadaption/IoTDBSyntaxConventionVersionAdaptionIT.java} (62%)
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/storagegroup/IDTableFlushTimeManager.java
copy server/src/main/java/org/apache/iotdb/db/qp/physical/sys/{PruneTemplatePlan.java => DropTemplatePlan.java} (61%)
copy server/src/test/java/org/apache/iotdb/db/metadata/idtable/{IDTableRestartTest.java => IDTableFlushTimeTest.java} (51%)
[iotdb] 01/02: Merge remote-tracking branch 'origin/master' into ty-graduate
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch ty-graduate
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit bc4f820bb4c06982d700e7093a05b6286292dddb
Merge: 08bcbf0 dfc6d39
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Tue Jan 18 17:12:27 2022 +0800
Merge remote-tracking branch 'origin/master' into ty-graduate
.../org/apache/iotdb/db/qp/sql/IoTDBSqlLexer.g4 | 43 +-
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 81 +-
.../org/apache/iotdb/cli/utils/JlineUtils.java | 5 +-
docs/UserGuide/API/Programming-Cpp-Native-API.md | 6 +-
docs/UserGuide/API/Programming-Java-Native-API.md | 25 +-
.../Programming-MQTT.md | 0
.../Programming-Thrift.md | 0
docs/UserGuide/{Appendix => API}/Status-Codes.md | 0
.../Administration-Management/Administration.md | 2 +-
docs/UserGuide/Data-Concept/Compression.md | 4 +-
.../Data-Concept/Data-Model-and-Terminology.md | 2 +-
docs/UserGuide/Data-Concept/Data-Type.md | 2 +-
docs/UserGuide/Data-Concept/Time-Partition.md | 2 +-
docs/UserGuide/{API => Data-Concept}/Time-zone.md | 0
.../UserGuide/Data-Modeling/VirtualStorageGroup.md | 2 +-
.../DML-Data-Manipulation-Language.md | 2158 --------------------
.../IoTDB-SQL-Language/Syntax-Conventions.md | 128 --
.../JMX-Tool.md | 0
.../MLogParser-Tool.md | 0
.../Maintenance-Command.md | 0
.../Metric-Tool.md | 0
.../Monitor-and-Log-Tools.md | 0
.../NodeTool.md | 0
.../Sync-Tool.md | 0
.../TsFileSelfCheck-Tool.md | 0
.../Watermark-Tool.md | 0
.../Auto-Create-MetaData.md | 2 +-
docs/UserGuide/Operate-Metadata/Node.md | 209 ++
docs/UserGuide/Operate-Metadata/Storage-Group.md | 77 +
docs/UserGuide/Operate-Metadata/TTL.md | 59 +
docs/UserGuide/Operate-Metadata/Template.md | 60 +
.../Timeseries.md} | 328 +--
.../Alerting.md | 0
.../Continuous-Query.md | 2 +-
.../Select-Into.md | 0
.../Triggers.md | 0
.../UDF-Data-Quality.md} | 0
.../UDF-Data-Repair.md} | 0
.../UDF-Get-Started.md} | 0
.../UDF-User-Defined-Function.md | 0
.../Performance-Tracing-Tool.md | 0
.../Cluster-Setup-Example.md | 0
.../{Cluster => QuickStart}/Cluster-Setup.md | 0
.../{CLI => QuickStart}/Command-Line-Interface.md | 0
docs/UserGuide/QuickStart/Files.md | 8 +-
docs/UserGuide/QuickStart/QuickStart.md | 4 +-
.../{Appendix => Reference}/Config-Manual.md | 0
.../Frequently-asked-questions.md | 0
docs/UserGuide/Reference/Keywords.md | 212 ++
.../{Appendix => Reference}/SQL-Reference.md | 0
docs/UserGuide/Reference/Syntax-Conventions.md | 188 ++
.../{Comparison => Reference}/TSDB-Comparison.md | 0
.../CSV-Tool.md | 0
.../UserGuide/Write-And-Delete-Data/Delete-Data.md | 98 +
.../Load-External-Tsfile.md | 0
docs/UserGuide/Write-And-Delete-Data/Write-Data.md | 108 +
docs/zh/SystemDesign/TsFile/Format.md | 2 +-
.../zh/UserGuide/API/Programming-Cpp-Native-API.md | 2 +-
.../UserGuide/API/Programming-Java-Native-API.md | 19 +-
.../Programming-MQTT.md | 0
.../Programming-Thrift.md | 0
.../RestService.md | 0
.../zh/UserGuide/{Appendix => API}/Status-Codes.md | 0
docs/zh/UserGuide/Data-Concept/Compression.md | 4 +-
.../Data-Concept/Data-Model-and-Terminology.md | 2 +-
docs/zh/UserGuide/Data-Concept/Data-Type.md | 2 +-
docs/zh/UserGuide/Data-Concept/Encoding.md | 2 +-
docs/zh/UserGuide/Data-Concept/Time-Partition.md | 2 +-
.../UserGuide/{API => Data-Concept}/Time-zone.md | 0
.../UserGuide/Data-Modeling/VirtualStorageGroup.md | 2 +-
.../DML-Data-Manipulation-Language.md | 2152 -------------------
.../IoTDB-SQL-Language/Syntax-Conventions.md | 129 --
.../JMX-Tool.md | 0
.../MLogParser-Tool.md | 0
.../Maintenance-Command.md | 0
.../Metric-Tool.md | 0
.../Monitor-and-Log-Tools.md | 0
.../NodeTool.md | 0
.../Sync-Tool.md | 0
.../TsFileSelfCheck-Tool.md | 0
.../Watermark-Tool.md | 0
.../Auto-Create-MetaData.md | 2 +-
docs/zh/UserGuide/Operate-Metadata/Node.md | 213 ++
.../zh/UserGuide/Operate-Metadata/Storage-Group.md | 79 +
docs/zh/UserGuide/Operate-Metadata/TTL.md | 57 +
docs/zh/UserGuide/Operate-Metadata/Template.md | 60 +
.../Timeseries.md} | 332 +--
.../Alerting.md | 0
.../Continuous-Query.md | 2 +-
.../Select-Into.md | 0
.../Triggers.md | 0
.../UDF-Data-Quality.md} | 0
.../UDF-Data-Repair.md} | 0
.../UDF-Get-Started.md} | 2 +-
.../UDF-User-Defined-Function.md | 2 +-
.../Performance-Tracing-Tool.md | 0
.../Cluster-Setup-Example.md | 0
.../{Cluster => QuickStart}/Cluster-Setup.md | 0
.../{CLI => QuickStart}/Command-Line-Interface.md | 0
docs/zh/UserGuide/QuickStart/Files.md | 10 +-
docs/zh/UserGuide/QuickStart/QuickStart.md | 2 +-
docs/zh/UserGuide/QuickStart/WayToGetIoTDB.md | 2 +-
.../{Appendix => Reference}/Config-Manual.md | 0
.../Frequently-asked-questions.md | 0
docs/zh/UserGuide/Reference/Keywords.md | 212 ++
.../{Appendix => Reference}/SQL-Reference.md | 0
docs/zh/UserGuide/Reference/Syntax-Conventions.md | 187 ++
.../{Comparison => Reference}/TSDB-Comparison.md | 0
.../CSV-Tool.md | 0
.../UserGuide/Write-And-Delete-Data/Delete-Data.md | 93 +
.../Load-External-Tsfile.md | 0
.../UserGuide/Write-And-Delete-Data/Write-Data.md | 110 +
example/kafka/pom.xml | 8 +-
example/kafka/readme.md | 30 +-
.../main/java/org/apache/iotdb/kafka/Constant.java | 68 +-
.../main/java/org/apache/iotdb/kafka/Consumer.java | 129 ++
.../org/apache/iotdb/kafka/ConsumerThread.java | 159 ++
.../java/org/apache/iotdb/kafka/KafkaConsumer.java | 90 -
.../apache/iotdb/kafka/KafkaConsumerThread.java | 104 -
.../kafka/{KafkaProducer.java => Producer.java} | 34 +-
.../iotdb/db/integration/IoTDBAlignByDeviceIT.java | 46 +
.../iotdb/db/integration/IoTDBFuzzyQueryIT.java | 2 +-
.../iotdb/db/integration/IoTDBGroupByFillIT.java | 8 +-
.../db/integration/IoTDBInsertMultiRowIT.java | 18 +
.../db/integration/IoTDBQueryWithIDTableIT.java | 5 +-
.../db/integration/IoTDBSyntaxConventionIT.java | 288 +++
.../db/integration/IoTDBUDTFBuiltinFunctionIT.java | 2 +-
.../aggregation/IoTDBUDFNestAggregationIT.java | 8 +-
.../IoTDBUserDefinedAggregationFunctionIT.java | 17 +-
.../aligned/IOTDBInsertAlignedValuesIT.java | 14 +
.../IoTDBSyntaxConventionVersionAdaptionIT.java | 84 +
.../iotdb/session/IoTDBSessionComplexIT.java | 6 +-
.../src/main/java/org/apache/iotdb/jdbc/Utils.java | 2 +-
.../test/java/org/apache/iotdb/jdbc/UtilsTest.java | 8 +
metrics/ReadMe.md | 9 +-
.../main/assembly/resources/conf/iotdb-metric.yml | 3 +-
.../apache/iotdb/metrics/CompositeReporter.java | 4 +-
.../java/org/apache/iotdb/metrics/type/Gauge.java | 2 +
pom.xml | 2 +-
server/pom.xml | 6 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 2 +-
.../cross/inplace/InplaceCompactionSelector.java | 41 +-
.../iotdb/db/engine/cq/ContinuousQueryTask.java | 3 +-
.../storagegroup/IDTableFlushTimeManager.java | 207 ++
.../engine/storagegroup/ILastFlushTimeManager.java | 12 +-
.../engine/storagegroup/LastFlushTimeManager.java | 12 +-
.../storagegroup/VirtualStorageGroupProcessor.java | 24 +-
.../engine/trigger/service/TriggerLogWriter.java | 2 +-
.../org/apache/iotdb/db/metadata/MManager.java | 54 +
.../apache/iotdb/db/metadata/idtable/IDTable.java | 16 +
.../db/metadata/idtable/IDTableHashmapImpl.java | 39 +-
.../db/metadata/idtable/entry/DeviceEntry.java | 68 +
.../db/metadata/idtable/entry/DeviceIDFactory.java | 16 +-
.../iotdb/db/metadata/logfile/MLogTxtWriter.java | 24 +
.../iotdb/db/metadata/logfile/MLogWriter.java | 5 +
.../db/metadata/logfile/MetadataOperationType.java | 2 +
.../org/apache/iotdb/db/metadata/mtree/MTree.java | 105 +-
.../apache/iotdb/db/metadata/path/AlignedPath.java | 5 +
.../db/metadata/template/TemplateManager.java | 10 +
.../db/metadata/template/TemplateQueryType.java | 5 +-
.../iotdb/db/metadata/utils/MetaFormatUtils.java | 4 +-
.../apache/iotdb/db/metadata/utils/MetaUtils.java | 40 +-
.../influxdb/meta/InfluxDBMetaManager.java | 3 +-
.../protocol/rest/impl/GrafanaApiServiceImpl.java | 5 +-
.../db/protocol/rest/impl/RestApiServiceImpl.java | 3 +-
.../main/java/org/apache/iotdb/db/qp/Planner.java | 2 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 12 +
.../org/apache/iotdb/db/qp/logical/Operator.java | 3 +-
.../iotdb/db/qp/logical/crud/InsertOperator.java | 2 +-
.../iotdb/db/qp/logical/crud/QueryOperator.java | 29 +-
.../apache/iotdb/db/qp/physical/PhysicalPlan.java | 13 +-
.../db/qp/physical/crud/AlignByDevicePlan.java | 14 +
.../iotdb/db/qp/physical/sys/DropTemplatePlan.java | 78 +
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 232 ++-
.../iotdb/db/qp/strategy/LogicalGenerator.java | 12 +-
.../db/service/thrift/impl/TSServiceImpl.java | 146 +-
.../org/apache/iotdb/db/tools/mlog/MLogParser.java | 8 +
.../db/writelog/node/ExclusiveWriteLogNode.java | 24 +-
.../org/apache/iotdb/db/metadata/TemplateTest.java | 135 +-
.../db/metadata/idtable/IDTableFlushTimeTest.java | 226 ++
.../java/org/apache/iotdb/session/Session.java | 43 +
.../apache/iotdb/session/SessionConnection.java | 20 +
.../org/apache/iotdb/session/pool/SessionPool.java | 97 +
.../iotdb/session/template/TemplateQueryType.java | 5 +-
.../apache/iotdb/session/template/TemplateUT.java | 131 ++
site/src/main/.vuepress/config.js | 278 ++-
thrift/rpc-changelist.md | 3 +-
thrift/src/main/thrift/rpc.thrift | 7 +
188 files changed, 4894 insertions(+), 5987 deletions(-)
[iotdb] 02/02: add insert time cost
Posted by ja...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a commit to branch ty-graduate
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 1bd084f47be5c2786c38eceb0b0558a25f996a56
Author: JackieTien97 <ja...@gmail.com>
AuthorDate: Tue Jan 18 18:54:52 2022 +0800
add insert time cost
---
.../main/java/org/apache/iotdb/SessionExample.java | 94 ++++++++--------------
1 file changed, 35 insertions(+), 59 deletions(-)
diff --git a/example/session/src/main/java/org/apache/iotdb/SessionExample.java b/example/session/src/main/java/org/apache/iotdb/SessionExample.java
index 19fcbc1..b2e86b3 100644
--- a/example/session/src/main/java/org/apache/iotdb/SessionExample.java
+++ b/example/session/src/main/java/org/apache/iotdb/SessionExample.java
@@ -62,56 +62,33 @@ public class SessionExample {
// set session fetchSize
session.setFetchSize(10000);
- // try {
- // session.setStorageGroup("root.sg1");
- // } catch (StatementExecutionException e) {
- // if (e.getStatusCode() != TSStatusCode.PATH_ALREADY_EXIST_ERROR.getStatusCode()) {
- // throw e;
- // }
- // }
-
- if ("aligned".equals(args[0])) {
- long totalRowNum = Long.parseLong(args[1]);
- insertTablet(totalRowNum);
- } else if ("nonAligned".equals(args[0])) {
- long totalRowNum = Long.parseLong(args[1]);
- insertAlignedTablet(totalRowNum);
- } else {
+ if ("query".equals(args[0])) {
String sql = args[1];
query(sql);
+ } else {
+ long totalRowNum = Long.parseLong(args[1]);
+ int sensorNum = Integer.parseInt(args[2]);
+ long startTime = System.currentTimeMillis();
+ if ("aligned".equals(args[0])) {
+ insertAlignedTablet(totalRowNum, sensorNum);
+ System.out.println(
+ "Insert aligned "
+ + totalRowNum
+ + " rows cost: "
+ + (System.currentTimeMillis() - startTime)
+ + "ms.");
+ } else if ("nonAligned".equals(args[0])) {
+ insertTablet(totalRowNum, sensorNum);
+ System.out.println(
+ "Insert nonAligned "
+ + totalRowNum
+ + " rows cost: "
+ + (System.currentTimeMillis() - startTime)
+ + "ms.");
+ } else {
+ throw new IllegalArgumentException("unknown command: " + args[0]);
+ }
}
-
- // createTemplate();
- // createTimeseries();
- // createMultiTimeseries();
- // insertRecord();
- // insertTablet();
- // insertAlignedTablet();
- // insertTabletWithNullValues();
- // insertTablets();
- // insertRecords();
- // selectInto();
- // createAndDropContinuousQueries();
- // nonQuery();
- // query();
- // queryWithTimeout();
- // rawDataQuery();
- // lastDataQuery();
- // queryByIterator();
- // deleteData();
- // deleteTimeseries();
- // setTimeout();
-
- // sessionEnableRedirect = new Session(LOCAL_HOST, 6667, "root", "root");
- // sessionEnableRedirect.setEnableQueryRedirection(true);
- // sessionEnableRedirect.open(false);
- //
- // // set session fetchSize
- // sessionEnableRedirect.setFetchSize(10000);
- //
- // insertRecord4Redirect();
- // query4Redirect();
- // sessionEnableRedirect.close();
session.close();
}
@@ -372,7 +349,7 @@ public class SessionExample {
*
* <p>Users need to control the count of Tablet and write a batch when it reaches the maxBatchSize
*/
- private static void insertTablet(long totalRowNum)
+ private static void insertTablet(long totalRowNum, int sensorNum)
throws IoTDBConnectionException, StatementExecutionException {
/*
* A Tablet example:
@@ -385,8 +362,8 @@ public class SessionExample {
// The schema of measurements of one device
// only measurementId and data type in MeasurementSchema take effects in Tablet
List<MeasurementSchema> schemaList = new ArrayList<>();
- for (int i = 0; i < 10; i++) {
- schemaList.add(new MeasurementSchema("s" + i, TSDataType.INT64));
+ for (int i = 0; i < sensorNum; i++) {
+ schemaList.add(new MeasurementSchema("s" + i, TSDataType.FLOAT));
}
Tablet tablet = new Tablet(ROOT_SG1_D1, schemaList, 10000);
@@ -397,8 +374,8 @@ public class SessionExample {
for (long row = 0; row < totalRowNum; row++) {
int rowIndex = tablet.rowSize++;
tablet.addTimestamp(rowIndex, timestamp);
- for (int s = 0; s < 10; s++) {
- long value = random.nextLong();
+ for (int s = 0; s < sensorNum; s++) {
+ float value = random.nextFloat();
tablet.addValue(schemaList.get(s).getMeasurementId(), rowIndex, value);
}
if (tablet.rowSize == tablet.getMaxRowNumber()) {
@@ -415,7 +392,7 @@ public class SessionExample {
}
}
- private static void insertAlignedTablet(long totalRowNum)
+ private static void insertAlignedTablet(long totalRowNum, int sensorNum)
throws IoTDBConnectionException, StatementExecutionException {
/*
* A Tablet example:
@@ -428,20 +405,19 @@ public class SessionExample {
// The schema of measurements of one device
// only measurementId and data type in MeasurementSchema take effects in Tablet
List<MeasurementSchema> schemaList = new ArrayList<>();
- for (int i = 0; i < 10; i++) {
- schemaList.add(new MeasurementSchema("s" + i, TSDataType.INT64));
+ for (int i = 0; i < sensorNum; i++) {
+ schemaList.add(new MeasurementSchema("s" + i, TSDataType.FLOAT));
}
- Tablet tablet = new Tablet(ROOT_SG1_D1, schemaList, 1000);
+ Tablet tablet = new Tablet(ROOT_SG1_D1, schemaList, 10000);
- // Method 1 to add tablet data
long timestamp = 0;
Random random = new Random(123456);
for (long row = 0; row < totalRowNum; row++) {
int rowIndex = tablet.rowSize++;
tablet.addTimestamp(rowIndex, timestamp);
- for (int s = 0; s < 10; s++) {
- long value = random.nextLong();
+ for (int s = 0; s < sensorNum; s++) {
+ float value = random.nextFloat();
tablet.addValue(schemaList.get(s).getMeasurementId(), rowIndex, value);
}
if (tablet.rowSize == tablet.getMaxRowNumber()) {