This is an automated email from the ASF dual-hosted git repository. xuekaifeng pushed a commit to branch xkf_idtable_recovery in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit b49bb01c5e4c94c8aaeeaa3eb92c979266e497c2 Merge: 540fc96 91428ba Author: 151250176 <[email protected]> AuthorDate: Wed Jan 19 10:30:39 2022 +0800 Merge branch 'master' of github.com:apache/iotdb into xkf_idtable_recovery .../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 2 +- .../org/apache/iotdb/cli/StartClientScriptIT.java | 1 - .../org/apache/iotdb/cluster/common/IoTDBTest.java | 1 - .../tests/tools/importCsv/ExportCsvTestIT.java | 1 - .../tests/tools/importCsv/ImportCsvTestIT.java | 2 - docs/UserGuide/API/Programming-JDBC.md | 5 + docs/UserGuide/API/Programming-Java-Native-API.md | 3 + docs/UserGuide/API/Status-Codes.md | 2 +- .../Cluster-Setup-Example.md | 0 .../{QuickStart => Cluster}/Cluster-Setup.md | 0 .../Maintenance-Tools/Monitor-and-Log-Tools.md | 151 +---- docs/UserGuide/Operate-Metadata/Timeseries.md | 8 +- docs/UserGuide/Process-Data/UDF-Data-Repair.md | 349 ----------- docs/UserGuide/Process-Data/UDF-Get-Started.md | 61 -- .../{UDF-Data-Quality.md => UDF-Library.md} | 418 ++++++++++++-- docs/UserGuide/Query-Data/Aggregate-Query.md | 431 ++++++++++++++ docs/UserGuide/Query-Data/Fill-Null-Value.md | 390 +++++++++++++ docs/UserGuide/Query-Data/Last-Query.md | 71 +++ docs/UserGuide/Query-Data/Overview.md | 215 +++++++ docs/UserGuide/Query-Data/Pagination.md | 376 ++++++++++++ docs/UserGuide/Query-Data/Query-Filter.md | 175 ++++++ docs/UserGuide/Query-Data/Result-Format.md | 76 +++ docs/UserGuide/Query-Data/Select-Expression.md | 607 ++++++++++++++++++++ .../Query-Data/Tracing-Tool.md} | 15 +- docs/UserGuide/Query-Data/Without-Null.md | 37 ++ docs/UserGuide/Reference/Config-Manual.md | 2 +- docs/UserGuide/Reference/SQL-Reference.md | 2 +- docs/UserGuide/Reference/Syntax-Conventions.md | 15 +- docs/UserGuide/Reference/TSDB-Comparison.md | 2 +- .../UserGuide/Write-And-Delete-Data/Delete-Data.md | 2 +- docs/zh/UserGuide/API/Programming-JDBC.md | 6 + .../UserGuide/API/Programming-Java-Native-API.md | 3 + docs/zh/UserGuide/API/RestService.md | 637 ++++++++++++++++++++- docs/zh/UserGuide/API/Status-Codes.md | 2 +- .../Cluster-Setup-Example.md | 0 .../{QuickStart => Cluster}/Cluster-Setup.md | 0 .../Maintenance-Tools/Monitor-and-Log-Tools.md | 181 +----- docs/zh/UserGuide/Operate-Metadata/Timeseries.md | 6 +- docs/zh/UserGuide/Process-Data/UDF-Data-Repair.md | 341 ----------- docs/zh/UserGuide/Process-Data/UDF-Get-Started.md | 58 -- .../{UDF-Data-Quality.md => UDF-Library.md} | 405 ++++++++++++- .../Process-Data/UDF-User-Defined-Function.md | 2 +- docs/zh/UserGuide/Query-Data/Aggregate-Query.md | 428 ++++++++++++++ docs/zh/UserGuide/Query-Data/Fill-Null-Value.md | 396 +++++++++++++ docs/zh/UserGuide/Query-Data/Last-Query.md | 69 +++ docs/zh/UserGuide/Query-Data/Overview.md | 222 +++++++ docs/zh/UserGuide/Query-Data/Pagination.md | 367 ++++++++++++ .../Query-Data/Performance-Tracing-Tool.md | 8 +- docs/zh/UserGuide/Query-Data/Query-Filter.md | 170 ++++++ docs/zh/UserGuide/Query-Data/Result-Format.md | 83 +++ docs/zh/UserGuide/Query-Data/Select-Expression.md | 612 ++++++++++++++++++++ ...Performance-Tracing-Tool.md => Tracing-Tool.md} | 11 +- docs/zh/UserGuide/Query-Data/Without-Null.md | 36 ++ .../UserGuide/QuickStart/Command-Line-Interface.md | 2 +- docs/zh/UserGuide/QuickStart/WayToGetIoTDB.md | 2 +- docs/zh/UserGuide/Reference/Config-Manual.md | 2 +- docs/zh/UserGuide/Reference/SQL-Reference.md | 2 +- docs/zh/UserGuide/Reference/Syntax-Conventions.md | 13 +- .../UserGuide/Write-And-Delete-Data/Delete-Data.md | 2 +- .../main/java/org/apache/iotdb/JDBCExample.java | 3 +- .../main/java/org/apache/iotdb/SessionExample.java | 9 +- .../apache/iotdb/tsfile/TsFileSequenceRead.java | 8 +- .../iotdb/db/integration/IoTDBAuthorizationIT.java | 1 - .../db/integration/IoTDBAutoCreateSchemaIT.java | 1 - .../iotdb/db/integration/IoTDBCheckConfigIT.java | 1 - .../db/integration/IoTDBContinuousQueryIT.java | 23 +- .../iotdb/db/integration/IoTDBEncodingIT.java | 1 - .../db/integration/IoTDBEngineTimeGeneratorIT.java | 1 - .../iotdb/db/integration/IoTDBFuzzyQueryIT.java | 1 - .../db/integration/IoTDBInsertMultiRowIT.java | 1 - .../db/integration/IoTDBInsertWithQueryIT.java | 3 - .../db/integration/IoTDBInsertWithoutTimeIT.java | 1 - .../apache/iotdb/db/integration/IoTDBLastIT.java | 1 - ...IoTDBLoadExternalTsFileWithTimePartitionIT.java | 1 - .../db/integration/IoTDBLoadExternalTsfileIT.java | 1 - .../integration/IoTDBManageTsFileResourceIT.java | 1 - .../db/integration/IoTDBNewTsFileCompactionIT.java | 1 - .../db/integration/IoTDBPathNumOverLimitIT.java | 1 - .../IoTDBQueryWithComplexValueFilterIT.java | 1 - .../iotdb/db/integration/IoTDBRecoverIT.java | 2 - .../db/integration/IoTDBRecoverUnclosedIT.java | 2 - .../db/integration/IoTDBRemovePartitionIT.java | 1 - .../iotdb/db/integration/IoTDBSeriesReaderIT.java | 2 - .../db/integration/IoTDBSessionTimeoutIT.java | 1 - .../apache/iotdb/db/integration/IoTDBSettleIT.java | 1 - .../db/integration/IoTDBSyntaxConventionIT.java | 35 +- .../IoTDBUserDefinedAggregationFunctionIT.java | 1 - .../aligned/IOTDBInsertAlignedValuesIT.java | 1 - .../aligned/IoTDBAggregationGroupByLevelIT.java | 1 - .../IoTDBAggregationWithValueFilter2IT.java | 1 - .../aligned/IoTDBAggregationWithValueFilterIT.java | 1 - ...BAggregationWithValueFilterWithDeletion2IT.java | 1 - ...DBAggregationWithValueFilterWithDeletionIT.java | 1 - .../IoTDBAggregationWithoutValueFilter2IT.java | 1 - .../IoTDBAggregationWithoutValueFilterIT.java | 1 - ...gregationWithoutValueFilterWithDeletion2IT.java | 1 - ...ggregationWithoutValueFilterWithDeletionIT.java | 1 - .../integration/aligned/IoTDBAlignByDevice2IT.java | 1 - .../integration/aligned/IoTDBAlignByDeviceIT.java | 1 - .../aligned/IoTDBDeleteTimeseriesIT.java | 1 - .../db/integration/aligned/IoTDBLastQuery2IT.java | 1 - .../db/integration/aligned/IoTDBLastQueryIT.java | 1 - .../aligned/IoTDBLastQueryWithDeletion2IT.java | 1 - .../aligned/IoTDBLastQueryWithDeletionIT.java | 1 - .../aligned/IoTDBLastQueryWithoutLastCache2IT.java | 1 - .../aligned/IoTDBLastQueryWithoutLastCacheIT.java | 1 - ...DBLastQueryWithoutLastCacheWithDeletion2IT.java | 1 - ...TDBLastQueryWithoutLastCacheWithDeletionIT.java | 1 - .../aligned/IoTDBLoadExternalAlignedTsFileIT.java | 1 - .../aligned/IoTDBRawQueryWithValueFilter2IT.java | 1 - .../aligned/IoTDBRawQueryWithValueFilterIT.java | 1 - ...oTDBRawQueryWithValueFilterWithDeletion2IT.java | 1 - ...IoTDBRawQueryWithValueFilterWithDeletionIT.java | 1 - .../IoTDBRawQueryWithoutValueFilter2IT.java | 1 - .../IoTDBRawQueryWithoutValueFilter3IT.java | 1 - .../aligned/IoTDBRawQueryWithoutValueFilterIT.java | 1 - ...BRawQueryWithoutValueFilterWithDeletion2IT.java | 1 - ...DBRawQueryWithoutValueFilterWithDeletionIT.java | 1 - .../iotdb/db/integration/env/StandaloneEnv.java | 3 +- .../iotdb/session/IoTDBSessionComplexIT.java | 1 - .../iotdb/session/IoTDBSessionIteratorIT.java | 1 - .../apache/iotdb/session/IoTDBSessionSimpleIT.java | 1 - openapi/src/main/openapi3/iotdb-rest.yaml | 4 + pom.xml | 2 +- .../resources/conf/iotdb-engine.properties | 12 - .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 16 - .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 9 - .../iotdb/db/conf/rest/IoTDBRestServiceConfig.java | 8 +- .../org/apache/iotdb/db/engine/StorageEngine.java | 51 +- .../apache/iotdb/db/engine/flush/FlushManager.java | 14 - .../memtable/AlignedWritableMemChunkGroup.java | 9 + .../db/engine/storagegroup/TsFileResource.java | 16 +- .../org/apache/iotdb/db/metadata/MManager.java | 4 - .../org/apache/iotdb/db/monitor/IStatistic.java | 54 -- .../apache/iotdb/db/monitor/MonitorConstants.java | 47 -- .../org/apache/iotdb/db/monitor/StatMonitor.java | 326 ----------- .../apache/iotdb/db/monitor/StatMonitorMBean.java | 38 -- .../db/protocol/rest/handler/ExceptionHandler.java | 8 +- .../handler/PhysicalPlanValidationHandler.java | 1 + .../protocol/rest/handler/QueryDataSetHandler.java | 248 ++++++-- .../protocol/rest/impl/GrafanaApiServiceImpl.java | 5 +- .../db/protocol/rest/impl/RestApiServiceImpl.java | 17 +- .../apache/iotdb/db/qp/executor/PlanExecutor.java | 15 - .../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 4 +- .../iotdb/db/query/control/FileReaderManager.java | 11 +- .../iotdb/db/query/control/SessionManager.java | 2 +- .../java/org/apache/iotdb/db/service/IoTDB.java | 3 - .../apache/iotdb/db/tools/TsFileSketchTool.java | 16 +- .../apache/iotdb/db/utils/EnvironmentUtils.java | 5 - .../datastructure/FixedPriorityBlockingQueue.java | 134 +++++ .../db/conf/adapter/CompressionRatioTest.java | 1 - .../compaction/utils/CompactionCheckerUtils.java | 17 +- .../engine/storagegroup/TsFileProcessorTest.java | 78 +++ .../iotdb/db/monitor/IoTDBStatMonitorTest.java | 177 ------ .../iotdb/db/protocol/mqtt/PublishHandlerTest.java | 1 - .../db/protocol/rest/GrafanaApiServiceIT.java | 1 - .../iotdb/db/protocol/rest/IoTDBRestServiceIT.java | 508 +++++++++++++++- .../dataset/groupby/GroupByLevelDataSetTest.java | 2 +- .../dataset/groupby/GroupByTimeDataSetTest.java | 2 +- .../db/sync/receiver/load/FileLoaderTest.java | 1 - .../recover/SyncReceiverLogAnalyzerTest.java | 1 - .../apache/iotdb/db/tools/IoTDBWatermarkTest.java | 1 - .../iotdb/db/tools/TsFileSketchToolTest.java | 69 ++- .../FixedPriorityBlockingQueueTest.java | 286 +++++++++ .../iotdb/db/writelog/IoTDBLogFileSizeTest.java | 1 - .../session/IoTDBSessionDisableMemControlIT.java | 1 - .../iotdb/session/IoTDBSessionVectorInsertIT.java | 1 - .../java/org/apache/iotdb/session/SessionTest.java | 1 - .../apache/iotdb/session/pool/SessionPoolTest.java | 1 - .../apache/iotdb/session/template/TemplateUT.java | 1 - site/src/main/.vuepress/config.js | 81 ++- .../apache/iotdb/spark/db/EnvironmentUtils.java | 9 - .../org/apache/iotdb/spark/db/IoTDBTest.scala | 1 - .../org/apache/iotdb/spark/db/IoTDBWriteTest.scala | 1 - .../iotdb/spark/db/unit/DataFrameToolsTest.scala | 1 - .../org/apache/iotdb/tsfile/file/MetaMarker.java | 18 + .../iotdb/tsfile/read/TsFileSequenceReader.java | 182 ++++-- .../iotdb/tsfile/write/TsFileIOWriterTest.java | 12 +- .../write/writer/AlignedChunkWriterImplTest.java | 17 +- .../tsfile/write/writer/TimeChunkWriterTest.java | 5 +- .../tsfile/write/writer/ValueChunkWriterTest.java | 4 +- .../zeppelin/iotdb/IoTDBInterpreterTest.java | 1 - 182 files changed, 7863 insertions(+), 2328 deletions(-)
