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/21 02:09:46 UTC

[iotdb] 01/01: Merge branch 'master' of https://github.com/apache/iotdb into win_wf_fix

This is an automated email from the ASF dual-hosted git repository.

haonan pushed a commit to branch win_wf_fix
in repository https://gitbox.apache.org/repos/asf/iotdb.git

commit bdc6679fe7a620c0ac2931ec7c9b3fef7b94f74e
Merge: 0b392be 49938f4
Author: HTHou <hh...@outlook.com>
AuthorDate: Mon Mar 21 10:08:38 2022 +0800

    Merge branch 'master' of https://github.com/apache/iotdb into win_wf_fix

 .../apache/iotdb/db/qp/sql/InfluxDBSqlParser.g4    |   2 +
 .../org/apache/iotdb/cluster/ClusterIoTDB.java     |   2 +-
 .../cluster/ClusterIoTDBServerCommandLine.java     |   2 +-
 .../cluster/utils/nodetool/ClusterMonitor.java     |   2 +-
 .../resources/conf/iotdb-confignode.properties     |  30 +-
 .../iotdb/confignode/conf/ConfigNodeConf.java      |  38 +-
 .../iotdb/confignode/conf/ConfigNodeConfCheck.java |  31 +-
 .../confignode/conf/ConfigNodeDescriptor.java      | 117 ++-
 .../iotdb/confignode/service/ConfigNode.java       |   2 +-
 .../confignode/service/ConfigNodeCommandLine.java  |   5 +-
 .../iotdb/confignode/service/ConfigNodeMBean.java  |   7 +-
 .../service/thrift/server/ConfigNodeRPCServer.java |  16 +-
 .../thrift/server/ConfigNodeRPCServerMBean.java    |   6 +-
 .../server/ConfigNodeRPCServerProcessor.java       |  22 +-
 docs/Download/README.md                            |  22 +-
 docs/zh/Download/README.md                         |  22 +-
 .../org/apache/iotdb/influxdb/IoTDBInfluxDB.java   |   4 +-
 .../iotdb/influxdb/example/InfluxDBExample.java    |  38 +-
 .../protocol/impl/IoTDBInfluxDBService.java        |  22 +-
 .../iotdb/influxdb/session/InfluxDBSession.java    |  29 +
 .../influxdb/integration/IoTDBInfluxDBIT.java      |  77 +-
 .../iotdb/db/integration/IoTDBCheckConfigIT.java   |   2 +-
 .../iotdb/commons/concurrent/ThreadName.java       |   5 +-
 .../commons}/exception/ConfigurationException.java |   3 +-
 .../iotdb/commons/service/ThriftService.java       |   2 +-
 .../org/apache/iotdb/db/conf/IoTDBConfigCheck.java |   2 +-
 .../{WithoutPolicy.java => FilterNullPolicy.java}  |   2 +-
 .../mpp/common/{TreeNode.java => FragmentId.java}  |  40 +-
 .../{QueryId.java => FragmentInstanceId.java}      |  11 +-
 .../org/apache/iotdb/db/mpp/common/QueryId.java    |  90 +-
 .../org/apache/iotdb/db/mpp/common/TsBlock.java    |  25 +
 .../TreeNode.java => execution/FragmentInfo.java}  |  33 +-
 .../db/mpp/execution/FragmentInstanceContext.java  |  67 ++
 .../db/mpp/execution/FragmentInstanceState.java    |  68 ++
 .../iotdb/db/mpp/execution/FragmentState.java      |  71 ++
 .../iotdb/db/mpp/execution/QueryExecution.java     |  10 +-
 .../ClusterScheduler.java}                         |  34 +-
 .../scheduler/IScheduler.java}                     |  30 +-
 .../execution/scheduler/StandaloneScheduler.java   |  56 ++
 .../iotdb/db/mpp/operator/OperatorContext.java     |   6 +-
 .../process/AggregateOperator.java}                |  35 +-
 .../process/DeviceMergeOperator.java}              |  34 +-
 .../process/FillOperator.java}                     |  34 +-
 .../process/FilterNullOperator.java}               |  35 +-
 .../process/GroupByLevelOperator.java}             |  35 +-
 .../db/mpp/operator/process/LimitOperator.java     |  75 ++
 .../process/OffsetOperator.java}                   |  35 +-
 .../process/ProcessOperator.java}                  |  11 +-
 .../process/SortOperator.java}                     |  35 +-
 .../process/TimeJoinOperator.java}                 |  35 +-
 .../sink/FragmentSinkOperator.java}                |  51 +-
 .../sink/SinkOperator.java}                        |  29 +-
 .../source/SeriesAggregateScanOperator.java}       |  45 +-
 .../source/SeriesScanOperator.java}                |  46 +-
 .../source/SourceOperator.java}                    |  14 +-
 .../iotdb/db/mpp/plan/FragmentInstanceId.java      |  30 -
 .../db/mpp/plan/node/process/FilterNullNode.java   |  38 -
 .../db/mpp/sql/planner/LocalExecutionPlanner.java  | 132 +++
 .../planner/optimization}/PlanOptimizer.java       |   7 +-
 .../planner}/plan/DistributedQueryPlan.java        |   7 +-
 .../planner}/plan/DistributionPlanner.java         |   2 +-
 .../{ => sql/planner}/plan/FragmentInstance.java   |   4 +-
 .../mpp/{ => sql/planner}/plan/LogicalPlanner.java |   4 +-
 .../{ => sql/planner}/plan/LogicalQueryPlan.java   |   7 +-
 .../mpp/{ => sql/planner}/plan/PlanFragment.java   |   7 +-
 .../mpp/{ => sql/planner}/plan/PlanFragmentId.java |   2 +-
 .../mpp/{ => sql/planner}/plan/node/PlanNode.java  |  31 +-
 .../{ => sql/planner}/plan/node/PlanNodeId.java    |   2 +-
 .../planner}/plan/node/PlanNodeIdAllocator.java    |   2 +-
 .../db/mpp/sql/planner/plan/node/PlanVisitor.java  |  76 ++
 .../planner/plan/node/process/AggregateNode.java}  |  49 +-
 .../plan/node/process/DeviceMergeNode.java         |  38 +-
 .../planner}/plan/node/process/FillNode.java       |  27 +-
 .../sql/planner/plan/node/process/FilterNode.java  |  66 ++
 .../planner/plan/node/process/FilterNullNode.java  |  69 ++
 .../plan/node/process/GroupByLevelNode.java        |  48 +-
 .../planner}/plan/node/process/LimitNode.java      |  41 +-
 .../planner}/plan/node/process/OffsetNode.java     |  39 +-
 .../planner}/plan/node/process/ProcessNode.java    |  10 +-
 .../planner}/plan/node/process/SortNode.java       |  35 +-
 .../planner}/plan/node/process/TimeJoinNode.java   |  55 +-
 .../planner}/plan/node/sink/CsvSinkNode.java       |  17 +-
 .../planner}/plan/node/sink/FragmentSinkNode.java  |  17 +-
 .../{ => sql/planner}/plan/node/sink/SinkNode.java |   9 +-
 .../planner}/plan/node/sink/ThriftSinkNode.java    |  17 +-
 .../planner}/plan/node/source/CsvSourceNode.java   |  17 +-
 .../plan/node/source/SeriesAggregateScanNode.java} |  35 +-
 .../planner}/plan/node/source/SeriesScanNode.java  |  27 +-
 .../planner}/plan/node/source/SourceNode.java      |   9 +-
 .../tree/Expression.java}                          |   7 +-
 .../{InfluxDBConstant.java => InfluxConstant.java} |   6 +-
 .../influxdb/constant/InfluxSQLConstant.java       |   7 +
 .../protocol/influxdb/function/InfluxFunction.java |  58 ++
 .../influxdb/function/InfluxFunctionFactory.java   |  62 ++
 .../influxdb/function/InfluxFunctionValue.java     |  29 +-
 .../function/aggregator/InfluxAggregator.java}     |  22 +-
 .../function/aggregator/InfluxCountFunction.java   |  59 ++
 .../function/aggregator/InfluxMeanFunction.java    |  72 ++
 .../function/aggregator/InfluxMedianFunction.java  |  75 ++
 .../function/aggregator/InfluxModeFunction.java    |  88 ++
 .../function/aggregator/InfluxSpreadFunction.java  |  88 ++
 .../function/aggregator/InfluxStddevFunction.java  |  68 ++
 .../function/aggregator/InfluxSumFunction.java     |  68 ++
 .../function/selector/InfluxFirstFunction.java     |  73 ++
 .../function/selector/InfluxLastFunction.java      |  73 ++
 .../function/selector/InfluxMaxFunction.java       | 102 +++
 .../function/selector/InfluxMinFunction.java       | 102 +++
 .../influxdb/function/selector/InfluxSelector.java |  57 ++
 .../db/protocol/influxdb/handler/QueryHandler.java | 956 +++++++++++++++++++++
 .../influxdb/meta/InfluxDBMetaManager.java         |   8 +-
 .../influxdb/operator/InfluxSelectComponent.java   |   8 +-
 .../db/protocol/influxdb/util/CommonUtils.java     |  31 +-
 .../db/protocol/influxdb/util/FieldUtils.java      |  39 +-
 .../db/protocol/influxdb/util/FilterUtils.java     |  83 ++
 .../protocol/influxdb/util/QueryResultUtils.java   | 291 +++++++
 .../db/protocol/influxdb/util/StringUtils.java     |  97 +++
 .../db/query/dataset/AlignByDeviceDataSet.java     |   4 +
 .../java/org/apache/iotdb/db/service/IoTDB.java    |   2 +-
 .../org/apache/iotdb/db/service/IoTDBMBean.java    |   4 +-
 .../service/thrift/impl/InfluxDBServiceImpl.java   |  14 +
 .../java/org/apache/iotdb/db/utils/MathUtils.java  |  51 ++
 site/src/main/.vuepress/config.js                  |   3 +-
 .../src/main/thrift/confignode.thrift              |  29 +-
 thrift-influxdb/src/main/thrift/influxdb.thrift    |  19 +
 124 files changed, 4774 insertions(+), 559 deletions(-)