You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by ha...@apache.org on 2022/03/10 01:40:37 UTC
[iotdb] 01/01: Merge branch 'master' of https://github.com/apache/iotdb into new_cluster
This is an automated email from the ASF dual-hosted git repository.
haonan pushed a commit to branch new_cluster
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 9058ecba38a64b3a9b7ff7a9217e6de2bb19dd1b
Merge: c4e385d 064010c
Author: HTHou <hh...@outlook.com>
AuthorDate: Thu Mar 10 09:39:16 2022 +0800
Merge branch 'master' of https://github.com/apache/iotdb into new_cluster
Jenkinsfile | 2 +-
RELEASE_NOTES.md | 3 +-
.../apache/iotdb/db/qp/sql/InfluxDBSqlParser.g4 | 129 +++++++
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 2 +-
.../db/qp/sql/{IoTDBSqlLexer.g4 => SqlLexer.g4} | 2 +-
cli/src/assembly/resources/sbin/start-cli.bat | 2 +-
cli/src/assembly/resources/tools/export-csv.bat | 2 +-
cli/src/assembly/resources/tools/import-csv.bat | 2 +-
.../apache/iotdb/cli/IoTDBSyntaxHighlighter.java | 4 +-
.../org/apache/iotdb/cli/utils/JlineUtils.java | 6 +-
.../org/apache/iotdb/cli/StartClientScriptIT.java | 15 +-
.../iotdb/tool/integration/ExportCsvTestIT.java | 5 +-
.../iotdb/tool/integration/ImportCsvTestIT.java | 5 +-
client-py/SessionExample.py | 66 ++++
client-py/SessionTest.py | 62 +++
client-py/iotdb/Session.py | 20 +-
client-py/iotdb/utils/NumpyTablet.py | 107 ++++++
client-py/iotdb/utils/Tablet.py | 244 ++++++------
client-py/requirements.txt | 5 +-
client-py/setup.py | 3 +-
client-py/tests/tablet_performance_comparison.py | 13 +-
.../log/manage/PartitionedSnapshotLogManager.java | 2 +
.../server/handlers/caller/ElectionHandler.java | 2 +
.../iotdb/cluster/server/member/RaftMember.java | 8 +-
.../cluster/utils/nodetool/ClusterMonitor.java | 3 +
.../server/heartbeat/HeartbeatThreadTest.java | 1 +
docs/Download/README.md | 34 +-
.../UserGuide/API/Programming-Python-Native-API.md | 242 ++++++++++--
docs/UserGuide/Maintenance-Tools/Metric-Tool.md | 189 +++++-----
docs/UserGuide/Query-Data/Select-Expression.md | 116 ++++++
docs/UserGuide/Reference/Config-Manual.md | 17 +-
docs/UserGuide/UDF-Library/Quick-Start.md | 26 +-
docs/zh/Download/README.md | 34 +-
docs/zh/UserGuide/API/InfluxDB-Protocol.md | 2 +-
.../UserGuide/API/Programming-Python-Native-API.md | 254 +++++++++++--
.../Ecosystem Integration/Writing Data on HDFS.md | 2 +-
docs/zh/UserGuide/Maintenance-Tools/Metric-Tool.md | 181 ++++-----
docs/zh/UserGuide/Query-Data/Select-Expression.md | 113 ++++++
docs/zh/UserGuide/Reference/Config-Manual.md | 15 +-
docs/zh/UserGuide/UDF-Library/Quick-Start.md | 25 +-
grafana-plugin/pom.xml | 20 +
.../db/integration/IoTDBNewTsFileCompactionIT.java | 6 +-
.../IoTDBQueryWithComplexValueFilterIT.java | 64 ++--
.../IoTDBQueryWithRecreatedTimeseriesIT.java | 79 ++++
.../integration/IoTDBSizeTieredCompactionIT.java | 6 +-
.../db/integration/IoTDBUDTFBuiltinFunctionIT.java | 224 +++++++++++
.../db/integration/IoTDBWithoutAnyNullIT.java | 33 ++
.../aggregation/IoTDBAggregationByLevelIT.java | 160 ++++++++
.../integration/aligned/IoTDBAlignByDeviceIT.java | 275 ++++++++++++++
metrics/ReadMe.md | 28 +-
metrics/dropwizard-metrics/pom.xml | 5 +
.../dropwizard/DropwizardMetricManager.java | 99 ++---
.../iotdb/metrics/dropwizard/MetricName.java | 44 ++-
.../dropwizard/reporter/DropwizardJmxReporter.java | 4 +-
.../DropwizardMetricsExporter.java | 26 +-
.../reporter/DropwizardPrometheusReporter.java | 85 +++--
.../reporter/{prometheus => }/MetricType.java | 2 +-
.../{prometheus => }/PrometheusTextWriter.java | 2 +-
.../reporter/prometheus/PrometheusReporter.java | 231 ------------
.../reporter/prometheus/PrometheusSender.java | 63 ----
.../reporter/prometheus/PushGateway.java | 151 --------
... => org.apache.iotdb.metrics.reporter.Reporter} | 0
.../dropwizard/DropwizardMetricManagerTest.java | 134 ++++---
.../main/assembly/resources/conf/iotdb-metric.yml | 33 +-
.../org/apache/iotdb/metrics/MetricManager.java | 43 +--
.../org/apache/iotdb/metrics/MetricService.java | 25 +-
.../apache/iotdb/metrics/config/MetricConfig.java | 67 ++--
.../metrics/config/MetricConfigDescriptor.java | 1 +
.../iotdb/metrics/impl/DoNothingMetricManager.java | 31 +-
.../metrics/{ => reporter}/CompositeReporter.java | 2 +-
.../iotdb/metrics/{ => reporter}/Reporter.java | 3 +-
.../org/apache/iotdb/metrics/type/IMetric.java | 9 +-
.../apache/iotdb/metrics/utils/MetricLevel.java} | 25 +-
.../apache/iotdb/metrics/utils/MonitorType.java | 31 +-
.../apache/iotdb/metrics/utils/OutPutFormat.java} | 13 +-
.../iotdb/metrics/utils/PredefinedMetric.java | 9 +-
.../apache/iotdb/metrics/utils/ReporterType.java | 8 +-
.../iotdb/metrics/config/MetricConfigTest.java | 5 +-
.../interface/src/test/resources/iotdb-metric.yml | 36 +-
.../{MeterIdUtils.java => MetricName.java} | 42 ++-
.../micrometer/MicrometerMetricManager.java | 185 +++++----
.../micrometer/reporter/MicrometerJmxReporter.java | 4 +-
.../reporter/MicrometerPrometheusReporter.java | 11 +-
... => org.apache.iotdb.metrics.reporter.Reporter} | 0
.../micrometer/MicrometerMetricManagerTest.java | 10 +-
pom.xml | 2 +-
server/pom.xml | 2 +-
.../resources/conf/iotdb-engine.properties | 20 +-
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 1 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 40 +-
.../org/apache/iotdb/db/conf/IoTDBConstant.java | 6 +
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 16 +-
.../apache/iotdb/db/engine/cache/ChunkCache.java | 2 +
.../db/engine/cache/TimeSeriesMetadataCache.java | 3 +
.../engine/compaction/CompactionTaskManager.java | 3 +
.../db/engine/compaction/CompactionUtils.java | 50 ++-
.../db/engine/compaction/TsFileIdentifier.java | 49 ++-
.../cross/AbstractCrossSpaceCompactionTask.java | 16 +-
.../CrossSpaceCompactionExceptionHandler.java | 71 ++--
.../RewriteCrossSpaceCompactionSelector.java | 15 +-
...urce.java => CrossSpaceCompactionResource.java} | 7 +-
.../RewriteCrossSpaceCompactionLogAnalyzer.java | 118 ------
.../selector/RewriteCompactionFileSelector.java | 22 +-
.../task/RewriteCrossCompactionRecoverTask.java | 230 +++++++++++-
.../task/RewriteCrossSpaceCompactionTask.java | 31 +-
.../inner/AbstractInnerSpaceCompactionTask.java | 6 +
.../SizeTieredCompactionRecoverTask.java | 102 +++--
.../sizetiered/SizeTieredCompactionSelector.java | 3 +-
.../inner/sizetiered/SizeTieredCompactionTask.java | 29 +-
.../inner/utils/InnerSpaceCompactionUtils.java | 25 +-
.../inner/utils/MultiTsFileDeviceIterator.java | 31 +-
.../utils/SingleSeriesCompactionExecutor.java | 13 +-
.../utils/SizeTieredCompactionLogAnalyzer.java | 101 -----
.../inner/utils/SizeTieredCompactionLogger.java | 87 -----
.../compaction/task/AbstractCompactionTask.java | 4 +
.../compaction/task/CompactionRecoverTask.java | 32 +-
.../utils/log/CompactionLogAnalyzer.java | 163 ++++++++
.../log/CompactionLogger.java} | 55 ++-
.../org/apache/iotdb/db/engine/cq/CQLogReader.java | 40 +-
.../org/apache/iotdb/db/engine/cq/CQLogWriter.java | 74 ++++
.../iotdb/db/engine/cq/ContinuousQueryService.java | 120 ++++--
.../apache/iotdb/db/engine/flush/FlushManager.java | 3 +
.../iotdb/db/engine/flush/MemTableFlushTask.java | 2 +
.../iotdb/db/engine/memtable/AbstractMemTable.java | 27 +-
.../engine/storagegroup/TsFileNameGenerator.java | 2 +-
.../engine/storagegroup/TsFileProcessorInfo.java | 4 +
.../db/engine/storagegroup/TsFileResource.java | 4 +-
.../storagegroup/VirtualStorageGroupProcessor.java | 6 +-
.../org/apache/iotdb/db/metadata/MManager.java | 43 +--
.../iotdb/db/metadata/logfile/MLogWriter.java | 12 -
.../reporter/DropwizardIoTDBReporter.java | 4 +-
.../reporter/MicrometerIoTDBReporter.java | 4 +-
.../influxdb/constant/InfluxSQLConstant.java | 57 +++
.../iotdb/db/protocol/influxdb/dto/IoTDBPoint.java | 10 +-
.../influxdb/operator/InfluxQueryOperator.java | 26 +-
.../influxdb/operator/InfluxSelectComponent.java | 94 +++++
.../influxdb/sql/InfluxDBLogicalGenerator.java | 66 ++++
.../protocol/influxdb/sql/InfluxDBSqlVisitor.java | 297 +++++++++++++++
.../iotdb/db/qp/constant/FilterConstant.java | 20 +-
.../apache/iotdb/db/qp/constant/SQLConstant.java | 3 +-
.../apache/iotdb/db/qp/executor/PlanExecutor.java | 56 ++-
.../iotdb/db/qp/logical/crud/SelectComponent.java | 4 +-
.../iotdb/db/qp/physical/crud/AggregationPlan.java | 12 +-
.../iotdb/db/qp/strategy/LogicalGenerator.java | 6 +-
.../qp/strategy/optimizer/ConcatPathOptimizer.java | 6 +-
.../iotdb/db/qp/utils/GroupByLevelController.java | 89 ++++-
.../db/query/dataset/AlignByDeviceDataSet.java | 2 +-
.../dataset/RawQueryDataSetWithValueFilter.java | 5 +-
.../query/dataset/groupby/GroupByLevelDataSet.java | 3 +-
.../iotdb/db/query/expression/ResultColumn.java | 20 +-
.../db/query/pool/RawQueryReadTaskPoolManager.java | 3 +
.../iotdb/db/query/reader/series/SeriesReader.java | 2 +
.../db/query/udf/builtin/BuiltinFunction.java | 6 +
.../query/udf/builtin/UDTFContinuouslySatisfy.java | 239 ++++++++++++
.../iotdb/db/query/udf/builtin/UDTFInRange.java | 90 +++++
.../db/query/udf/builtin/UDTFNonZeroCount.java | 50 +--
.../db/query/udf/builtin/UDTFNonZeroDuration.java | 63 ++++
.../iotdb/db/query/udf/builtin/UDTFOnOff.java | 86 +++++
.../iotdb/db/query/udf/builtin/UDTFZeroCount.java | 50 +--
.../db/query/udf/builtin/UDTFZeroDuration.java | 63 ++++
.../iotdb/db/service/metrics/MetricsService.java | 13 +-
.../db/service/thrift/ProcessorWithMetrics.java | 9 +-
.../db/service/thrift/impl/TSServiceImpl.java | 12 +-
.../org/apache/iotdb/db/utils/CommonUtils.java | 5 +-
.../apache/iotdb/db/utils/TypeInferenceUtils.java | 4 +-
... => org.apache.iotdb.metrics.reporter.Reporter} | 0
.../engine/compaction/CompactionSchedulerTest.java | 90 ++---
.../compaction/CompactionTaskManagerTest.java | 104 +++++-
.../db/engine/compaction/CompactionUtilsTest.java | 10 +-
.../cross/CrossSpaceCompactionExceptionTest.java | 73 ++--
.../compaction/cross/CrossSpaceCompactionTest.java | 14 +-
.../engine/compaction/cross/MergeUpgradeTest.java | 5 +-
.../cross/RewriteCompactionFileSelectorTest.java | 286 +++++++++++++-
.../RewriteCrossSpaceCompactionRecoverTest.java | 279 +++++++++++---
.../compaction/inner/InnerCompactionLogTest.java | 4 +-
.../inner/InnerCompactionSchedulerTest.java | 8 +-
.../inner/InnerSpaceCompactionExceptionTest.java | 101 +++--
.../InnerSpaceCompactionUtilsNoAlignedTest.java | 9 +-
.../inner/InnerSpaceCompactionUtilsOldTest.java | 14 +-
.../SizeTieredCompactionRecoverTest.java | 393 ++++++++++++++-----
...eCrossSpaceCompactionRecoverCompatibleTest.java | 414 +++++++++++++++++++++
.../SizeTieredCompactionRecoverCompatibleTest.java | 8 +-
.../recover/SizeTieredCompactionRecoverTest.java | 83 ++---
.../compaction/utils/CompactionCheckerUtils.java | 5 +
.../compaction/utils/CompactionClearUtils.java | 7 +-
.../compaction/utils/CompactionConfigRestorer.java | 6 +-
.../storagegroup/StorageGroupProcessorTest.java | 6 +-
.../influxdb/sql/InfluxDBLogicalGeneratorTest.java | 68 ++++
.../java/org/apache/iotdb/db/qp/PlannerTest.java | 22 ++
.../iotdb/db/utils/TypeInferenceUtilsTest.java | 23 +-
site/src/main/.vuepress/config.js | 34 +-
thrift-influxdb/README.md | 2 +-
.../apache/iotdb/tsfile/read/common/RowRecord.java | 8 +
193 files changed, 6910 insertions(+), 2636 deletions(-)