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 <[email protected]> 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(-)
