This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch new-compaction in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit a87ec252477d00180c8f4cff5b95de90a90bb2fa Merge: 8862cfa 478b9bd Author: JackieTien97 <[email protected]> AuthorDate: Mon Jan 17 09:45:45 2022 +0800 Merge remote-tracking branch 'origin/master' into new-compaction .../org/apache/iotdb/db/qp/sql/IoTDBSqlLexer.g4 | 4 + .../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 4 +- cli/src/main/java/org/apache/iotdb/cli/Cli.java | 18 +- .../org/apache/iotdb/cli/utils/JlineUtils.java | 15 +- .../main/java/org/apache/iotdb/tool/ExportCsv.java | 2 +- client-cpp/src/main/Session.cpp | 426 +++++++++++++++-- client-cpp/src/main/Session.h | 529 +++++++++++++++------ client-cpp/src/test/cpp/sessionIT.cpp | 469 +++++++++--------- client-py/iotdb/Session.py | 1 + .../resources/conf/iotdb-cluster.properties | 21 +- .../org/apache/iotdb/cluster/ClusterIoTDB.java | 26 +- .../iotdb/cluster/client/ClientPoolFactory.java | 3 + .../apache/iotdb/cluster/config/ClusterConfig.java | 51 ++ .../iotdb/cluster/config/ClusterDescriptor.java | 26 +- .../cluster/query/ClusterUDTFQueryExecutor.java | 21 +- .../iotdb/cluster/query/LocalQueryExecutor.java | 3 +- .../cluster/query/reader/ClusterReaderFactory.java | 2 +- .../org/apache/iotdb/cluster/server/Response.java | 3 +- .../server/handlers/caller/LogCatchUpHandler.java | 11 +- .../iotdb/cluster/server/member/RaftMember.java | 158 ++++-- .../cluster/client/ClientPoolFactoryTest.java | 31 ++ docs/SystemDesign/SchemaManager/SchemaManager.md | 8 +- docs/UserGuide/API/Programming-Cpp-Native-API.md | 422 ++++++++++------ .../Advanced-Features/Continuous-Query.md | 97 +++- docs/UserGuide/Advanced-Features/Select-Into.md | 3 +- .../Advanced-Features/UDF-User-Defined-Function.md | 6 + docs/UserGuide/Appendix/Config-Manual.md | 391 +++++++++++++-- docs/UserGuide/Appendix/SQL-Reference.md | 2 +- docs/UserGuide/Data-Concept/Schema-Template.md | 36 +- .../DDL-Data-Definition-Language.md | 15 +- .../DML-Data-Manipulation-Language.md | 14 + docs/UserGuide/System-Tools/Metric-Tool.md | 85 ++-- .../UserGuide/System-Tools/TsFileSelfCheck-Tool.md | 42 ++ .../zh/SystemDesign/SchemaManager/SchemaManager.md | 2 +- .../zh/UserGuide/API/Programming-Cpp-Native-API.md | 417 +++++++++++----- .../UserGuide/API/Programming-Java-Native-API.md | 37 +- .../Advanced-Features/Continuous-Query.md | 114 ++++- docs/zh/UserGuide/Advanced-Features/Select-Into.md | 3 +- .../Advanced-Features/UDF-User-Defined-Function.md | 6 +- docs/zh/UserGuide/Appendix/Config-Manual.md | 310 ++++++++---- docs/zh/UserGuide/Appendix/SQL-Reference.md | 2 +- .../Collaboration-of-Edge-and-Cloud/Sync-Tool.md | 2 +- .../Communication-Service-Protocol/RestService.md | 45 +- .../Data-Concept/Data-Model-and-Terminology.md | 6 +- docs/zh/UserGuide/Data-Concept/Schema-Template.md | 81 +++- .../DDL-Data-Definition-Language.md | 12 +- .../DML-Data-Manipulation-Language.md | 14 + docs/zh/UserGuide/Library-UDF/Data-Quality.md | 6 +- docs/zh/UserGuide/Library-UDF/Data-Repair.md | 4 +- docs/zh/UserGuide/QuickStart/Files.md | 6 +- docs/zh/UserGuide/System-Tools/Metric-Tool.md | 90 ++-- .../UserGuide/System-Tools/TsFileSelfCheck-Tool.md | 42 ++ .../src/AlignedTimeseriesSessionExample.cpp | 52 +- example/client-cpp-example/src/SessionExample.cpp | 47 +- .../java/org/apache/iotdb/mqtt/MQTTClient.java | 2 + .../apache/iotdb/pulsar/PulsarConsumerThread.java | 1 + .../db/integration/IoTDBContinuousQueryIT.java | 191 +++++++- .../db/integration/IoTDBLoadExternalTsfileIT.java | 204 ++++++++ .../iotdb/db/integration/IoTDBMetadataFetchIT.java | 2 +- .../db/integration/IoTDBNewTsFileCompactionIT.java | 4 + .../iotdb/db/integration/IoTDBTagAlterIT.java | 7 +- .../apache/iotdb/db/integration/IoTDBTagIT.java | 15 +- .../integration/IoTDBUDTFAlignByTimeQueryIT.java | 25 + .../aligned/IOTDBInsertAlignedValuesIT.java | 3 + .../aligned/IoTDBLoadExternalAlignedTsFileIT.java | 211 +++++++- .../IoTDBRawQueryWithoutValueFilter3IT.java | 64 +++ .../main/java/org/apache/iotdb/jdbc/Config.java | 3 + .../main/java/org/apache/iotdb/jdbc/Constant.java | 6 + .../org/apache/iotdb/jdbc/IoTDBConnection.java | 1 + .../apache/iotdb/jdbc/IoTDBConnectionParams.java | 11 + .../src/main/java/org/apache/iotdb/jdbc/Utils.java | 3 + metrics/ReadMe.md | 73 ++- .../dropwizard/DropwizardMetricManager.java | 29 +- .../reporter/prometheus/PrometheusReporter.java | 4 +- .../reporter/prometheus/PushGateway.java | 13 +- .../dropwizard/DropwizardMetricManagerTest.java | 22 +- .../metrics/dropwizard/DropwizardMetricTest.java | 181 ------- .../dropwizard/DropwizardMetricTestPlan.java | 62 --- .../src/test/resources/iotdb-metric.yml | 42 -- .../main/assembly/resources/conf/iotdb-metric.yml | 12 +- .../apache/iotdb/metrics/CompositeReporter.java | 18 +- .../iotdb/metrics/DoNothingMetricService.java} | 28 +- .../org/apache/iotdb/metrics/MetricManager.java | 12 - .../org/apache/iotdb/metrics/MetricService.java | 88 ++-- .../apache/iotdb/metrics/config/MetricConfig.java | 46 ++ .../metrics/config/MetricConfigDescriptor.java | 43 +- .../ReloadLevel.java} | 11 +- .../iotdb/metrics/impl/DoNothingMetricManager.java | 20 - .../iotdb/metrics/utils/PredefinedMetric.java | 4 +- .../apache/iotdb/metrics/utils/ReporterType.java | 2 +- .../iotdb/metrics/config/MetricConfigTest.java | 13 +- .../src/{main => }/test/resources/iotdb-metric.yml | 3 +- .../micrometer/MicrometerMetricManager.java | 66 +-- .../micrometer/reporter/MicrometerJmxReporter.java | 9 +- .../reporter/MicrometerPrometheusReporter.java | 21 +- .../org.apache.iotdb.metrics.MetricManager | 2 +- .../micrometer/MicrometerMetricManagerTest.java | 15 +- .../metrics/micrometer/MicrometerMetricTest.java | 181 ------- .../micrometer/MicrometerMetricTestPlan.java | 62 --- .../src/test/resources/iotdb-metric.yml | 42 -- openapi/src/main/openapi3/iotdb-rest.yaml | 2 + server/pom.xml | 5 + .../resources/conf/iotdb-engine.properties | 13 +- .../assembly/resources/conf/iotdb-rest.properties | 5 +- .../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 24 +- .../org/apache/iotdb/db/conf/IoTDBConstant.java | 7 + .../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 15 +- .../iotdb/db/conf/rest/IoTDBRestServiceConfig.java | 10 + .../db/conf/rest/IoTDBRestServiceDescriptor.java | 5 + .../cross/inplace/manage/MergeManager.java | 3 +- .../engine/cq/ContinuousQuerySchemaCheckTask.java | 99 ++++ .../db/{ => engine}/cq/ContinuousQueryService.java | 50 +- .../db/{ => engine}/cq/ContinuousQueryTask.java | 177 ++----- .../cq/ContinuousQueryTaskPoolManager.java | 2 +- .../selectinto/InsertTabletPlansIterator.java | 51 +- .../storagegroup/VirtualStorageGroupProcessor.java | 45 +- .../trigger/sink/mqtt/MQTTConfiguration.java | 31 ++ .../db/engine/trigger/sink/mqtt/MQTTHandler.java | 2 + .../TsFileTimeseriesMetadataException.java | 15 +- .../org/apache/iotdb/db/metadata/MManager.java | 30 +- .../db/metadata/lastCache/LastCacheManager.java | 4 +- .../org/apache/iotdb/db/metadata/mtree/MTree.java | 6 +- .../mtree/traverser/collector/MNodeCollector.java | 30 +- .../mtree/traverser/counter/MNodeLevelCounter.java | 29 +- .../apache/iotdb/db/metadata/path/AlignedPath.java | 18 + .../iotdb/db/metadata/path/MeasurementPath.java | 3 + .../apache/iotdb/db/metadata/tag/TagManager.java | 13 +- .../apache/iotdb/db/metadata/utils/MetaUtils.java | 2 +- .../reporter/DropwizardIoTDBReporter.java | 74 +++ .../metrics/dropwizard/reporter/IoTDBReporter.java | 233 +++++++++ .../org/apache/iotdb/db/metrics/metricsUtils.java | 61 +++ .../micrometer/registry/IoTDBMeterRegistry.java | 150 ++++++ .../micrometer/registry/IoTDBRegistryConfig.java | 16 +- .../reporter/MicrometerIoTDBReporter.java | 36 +- .../handler/PhysicalPlanValidationHandler.java | 78 +++ .../protocol/rest/handler/QueryDataSetHandler.java | 23 +- .../rest/handler/RequestValidationHandler.java | 5 + .../protocol/rest/impl/GrafanaApiServiceImpl.java | 7 +- .../db/protocol/rest/impl/RestApiServiceImpl.java | 23 +- .../main/java/org/apache/iotdb/db/qp/Planner.java | 38 ++ .../apache/iotdb/db/qp/executor/PlanExecutor.java | 6 +- .../logical/sys/CreateContinuousQueryOperator.java | 8 +- .../apache/iotdb/db/qp/physical/crud/UDTFPlan.java | 12 + .../qp/physical/sys/CreateContinuousQueryPlan.java | 24 +- .../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 6 +- .../iotdb/db/query/context/QueryContext.java | 9 - .../db/query/control/QueryResourceManager.java | 4 +- .../iotdb/db/query/control/SessionManager.java | 10 +- .../dataset/RawQueryDataSetWithValueFilter.java | 52 +- .../query/dataset/ShowContinuousQueriesResult.java | 21 +- .../db/query/dataset/UDTFAlignByTimeDataSet.java | 2 + .../apache/iotdb/db/query/dataset/UDTFDataSet.java | 2 + .../db/query/dataset/UDTFNonAlignDataSet.java | 2 + .../query/dataset/groupby/GroupByFillDataSet.java | 20 +- .../groupby/GroupByWithValueFilterDataSet.java | 3 +- .../groupby/LocalAlignedGroupByExecutor.java | 2 +- .../dataset/groupby/LocalGroupByExecutor.java | 2 +- .../db/query/executor/AggregationExecutor.java | 20 +- .../iotdb/db/query/executor/FillQueryExecutor.java | 18 +- .../iotdb/db/query/executor/LastQueryExecutor.java | 4 +- .../iotdb/db/query/executor/QueryRouter.java | 10 +- .../db/query/executor/RawDataQueryExecutor.java | 83 +++- .../iotdb/db/query/executor/UDFQueryExecutor.java | 21 +- .../iotdb/db/query/executor/fill/LinearFill.java | 8 +- .../iotdb/db/query/executor/fill/PreviousFill.java | 5 +- .../iotdb/db/query/expression/ResultColumn.java | 5 + .../iotdb/db/query/reader/series/SeriesReader.java | 19 +- .../query/timegenerator/ServerTimeGenerator.java | 3 +- .../query/udf/core/layer/RawQueryInputLayer.java | 4 +- .../java/org/apache/iotdb/db/service/IoTDB.java | 8 +- .../org/apache/iotdb/db/service/SettleService.java | 1 - .../iotdb/db/service/basic/ServiceProvider.java | 18 +- .../iotdb/db/service/metrics/MetricsService.java | 164 ++----- .../db/service/thrift/impl/TSServiceImpl.java | 23 +- .../iotdb/db/sync/sender/transfer/SyncClient.java | 2 + .../apache/iotdb/db/tools/TsFileSelfCheckTool.java | 190 ++++++++ .../apache/iotdb/db/tools/TsFileSketchTool.java | 1 + .../apache/iotdb/db/utils/EnvironmentUtils.java | 2 +- .../org/apache/iotdb/db/utils/FileLoaderUtils.java | 3 - .../services/org.apache.iotdb.metrics.Reporter | 3 +- .../SizeTieredCompactionRecoverTest.java | 11 +- .../engine/modification/DeletionFileNodeTest.java | 4 +- .../storagegroup/StorageGroupProcessorTest.java | 19 +- .../iotdb/db/metadata/MManagerBasicTest.java | 75 +++ .../org/apache/iotdb/db/metadata/MTreeTest.java | 13 +- .../iotdb/db/tools/TsFileSelfCheckToolTest.java | 239 ++++++++++ server/src/test/resources/iotdb-rest.properties | 5 +- .../main/java/org/apache/iotdb/session/Config.java | 4 + .../java/org/apache/iotdb/session/Session.java | 66 ++- .../apache/iotdb/session/SessionConnection.java | 1 + .../org/apache/iotdb/session/util/Version.java | 8 +- .../apache/iotdb/session/SessionCacheLeaderUT.java | 3 +- .../java/org/apache/iotdb/session/SessionTest.java | 4 + session/src/test/resources/iotdb-rest.properties | 5 +- .../test/java/org/apache/iotdb/db/sql/Cases.java | 12 +- .../TsFileStatisticsMistakesException.java} | 10 +- .../file/metadata/statistics/BinaryStatistics.java | 15 + .../metadata/statistics/BooleanStatistics.java | 17 + .../file/metadata/statistics/DoubleStatistics.java | 20 + .../file/metadata/statistics/FloatStatistics.java | 20 + .../metadata/statistics/IntegerStatistics.java | 19 + .../file/metadata/statistics/LongStatistics.java | 19 + .../iotdb/tsfile/read/TsFileCheckStatus.java | 7 +- .../iotdb/tsfile/read/TsFileSequenceReader.java | 135 ++++++ .../apache/iotdb/tsfile/read/common/RowRecord.java | 18 + 205 files changed, 6525 insertions(+), 2584 deletions(-)
