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/07/27 11:26:32 UTC
[iotdb] branch IOTDB-3883 updated (8938820afe -> 2818e0e969)
This is an automated email from the ASF dual-hosted git repository.
jackietien pushed a change to branch IOTDB-3883
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 8938820afe Merge branch 'IOTDB-3883' of github.com:apache/iotdb into IOTDB-3883
add 6d3c0cc4d0 [IOTDB-3945] Fix TTL doesn't take effect bug in mpp
add 5fa8a67f36 [IOTDB-3967]fix-bug for user permission info (#6776)
add f3c61e8543 [IOTDB-3958] Add error logging in thread pool (#6772)
add 975eaa5bd2 [IOTDB-3937] Fix the initialization of IoTDB Reporter in metric framework. (#6784)
add 91ce731bd8 Fix sendAsyncRequestToDataNode() method. (#6785)
add 7564963654 Fix bug in FunctionExpression updateStatisticsForMemoryAssigner
add 4f6b0e72e3 Fix IoTDBInsertWithoutTimeIT failure on CI (#6790)
add c31eb3cb34 [IOTDB-3934] Compatibility of Apache IoTDB with InfluxDB——example client (#6757)
add 9babfd35de [IOTDB-3952] Delete duplicated time filter in FilterOperator (#6780)
add 159f669103 [IOTDB-3942] Support count timeseries where tag1 = v1 (#6763)
add 323808c2e4 [IOTDB-3977] Solve the problem of permission type lower case execution failure when granting permission (#6794)
add 2818e0e969 resolve conflicts
No new revisions were added by this update.
Summary of changes:
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 12 +--
.../async/datanode/AsyncDataNodeClientPool.java | 7 ++
.../iotdb/confignode/persistence/AuthorInfo.java | 7 +-
docs/UserGuide/API/InfluxDB-Protocol.md | 2 +-
docs/UserGuide/Operate-Metadata/Timeseries.md | 48 ++++++++-
docs/zh/UserGuide/API/InfluxDB-Protocol.md | 2 +-
docs/zh/UserGuide/Operate-Metadata/Timeseries.md | 50 ++++++++-
.../{hadoop => inflxudb-protocol-example}/pom.xml | 8 +-
.../apache/iotdb/influxdb}/InfluxDBExample.java | 74 ++++++-------
.../iotdb/db/it/IoTDBInsertWithoutTimeIT.java | 5 +-
.../iotdb/db/it/schema/IoTDBMetadataFetchIT.java | 104 +++++++++++++++++++
.../metrics/dropwizard/reporter/IoTDBReporter.java | 5 +-
.../{MetricsUtils.java => IoTDBMetricsUtils.java} | 28 ++++-
.../micrometer/reporter/IoTDBMeterRegistry.java | 5 +-
.../{WrappedRunnable.java => WrappedCallable.java} | 32 +++---
.../iotdb/commons/concurrent/WrappedRunnable.java | 24 +++--
.../threadpool/ScheduledExecutorUtil.java | 7 ++
.../WrappedScheduledExecutorService.java | 31 +++---
.../WrappedSingleThreadExecutorService.java | 23 +++--
.../WrappedSingleThreadScheduledExecutor.java | 31 +++---
.../threadpool/WrappedThreadPoolExecutor.java | 25 +++++
.../schemaregion/rocksdb/RSchemaRegion.java | 64 ++++++++++++
.../iotdb/db/metadata/mtree/IMTreeBelowSG.java | 17 +++
.../db/metadata/mtree/MTreeBelowSGCachedImpl.java | 27 +++++
.../db/metadata/mtree/MTreeBelowSGMemoryImpl.java | 27 +++++
.../traverser/counter/MeasurementCounter.java | 24 +++++
.../counter/MeasurementGroupByLevelCounter.java | 24 +++++
.../db/metadata/schemaregion/ISchemaRegion.java | 13 +++
.../schemaregion/SchemaRegionMemoryImpl.java | 28 +++++
.../schemaregion/SchemaRegionSchemaFileImpl.java | 28 +++++
.../apache/iotdb/db/metadata/tag/TagManager.java | 39 +++++++
.../operator/process/last/LastQueryOperator.java | 4 +-
.../schema/LevelTimeSeriesCountOperator.java | 28 ++++-
.../operator/schema/TimeSeriesCountOperator.java | 26 ++++-
.../execution/operator/source/SeriesScanUtil.java | 8 +-
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 16 ++-
.../db/mpp/plan/analyze/ExpressionAnalyzer.java | 115 ++++++++++++++-------
.../iotdb/db/mpp/plan/expression/Expression.java | 4 +
.../expression/binary/CompareBinaryExpression.java | 5 +
.../plan/expression/multi/FunctionExpression.java | 2 +-
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 48 ++++++---
.../db/mpp/plan/planner/LocalExecutionPlanner.java | 13 ++-
.../db/mpp/plan/planner/LogicalPlanBuilder.java | 21 +++-
.../db/mpp/plan/planner/LogicalPlanVisitor.java | 11 +-
.../metedata/read/LevelTimeSeriesCountNode.java | 41 +++++++-
.../node/metedata/read/TimeSeriesCountNode.java | 40 ++++++-
.../metadata/CountLevelTimeSeriesStatement.java | 32 ++++++
.../metadata/CountTimeSeriesStatement.java | 30 ++++++
.../function/aggregator/InfluxSpreadFunction.java | 6 +-
.../db/protocol/influxdb/handler/QueryHandler.java | 4 +-
.../db/protocol/influxdb/meta/TagInfoRecords.java | 6 +-
.../apache/iotdb/db/qp/sql/IoTDBSqlVisitor.java | 10 +-
.../operator/schema/CountMergeOperatorTest.java | 21 +++-
.../operator/schema/SchemaCountOperatorTest.java | 21 +++-
.../iotdb/db/mpp/plan/analyze/AnalyzeTest.java | 103 ++++++++++++++++++
.../db/mpp/plan/plan/QueryLogicalPlanUtil.java | 26 ++---
.../metadata/read/SchemaCountNodeSerdeTest.java | 8 +-
57 files changed, 1236 insertions(+), 234 deletions(-)
copy example/{hadoop => inflxudb-protocol-example}/pom.xml (86%)
rename {influxdb-protocol/src/main/java/org/apache/iotdb/influxdb/example => example/inflxudb-protocol-example/src/main/java/org/apache/iotdb/influxdb}/InfluxDBExample.java (58%)
rename metrics/interface/src/main/java/org/apache/iotdb/metrics/utils/{MetricsUtils.java => IoTDBMetricsUtils.java} (63%)
copy node-commons/src/main/java/org/apache/iotdb/commons/concurrent/{WrappedRunnable.java => WrappedCallable.java} (56%)