You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@iotdb.apache.org by hu...@apache.org on 2022/12/29 14:37:39 UTC
[iotdb] branch ml/thrift updated (4bb2deef68 -> 5524f781a2)
This is an automated email from the ASF dual-hosted git repository.
hui pushed a change to branch ml/thrift
in repository https://gitbox.apache.org/repos/asf/iotdb.git
from 4bb2deef68 add module
new a000b57b87 define req & resp
add 82ceb3586f Delete more stale query code (#8600)
add e8104a499e [IOTDB-5277] SchemaRegion throws NPE when loading snapshot (#8605)
add 30335b3a73 change docker images name from 1c1d to standalone, including docs (#8596)
add 1921b6d66d [IOTDB-5264] NumpyTablet supports insert with None values (#8576)
add daab49b61a [IOTDB-5260] Refactor ClientManager API and Exception (#8561)
add f73b73fd42 [IOTDB-5284] Fix some code smells (#8612)
add 65fb480844 [IOTDB-5208]Fix file handles increase when TsFileResource is degraded and compacted with fast performer (#8573)
add b1b17f971a change STARTUP_RETRY_INTERVAL_IN_MS from 30s to 3s (#8629)
add 8bb400d17a Fix Bug in NullColumn
add 8ad71667cd [IOTDB-5278] fix connection problem of dbeaver and supports more functions (#8624)
add dd7291dbf2 Bump wheel from 0.36.2 to 0.38.1 in /client-py (#8617)
add db38945c16 [IOTDB-5297] Add maxRetryTimes for IoTDBClusterNodeErrorStartUpIT to avoid infinite loop (#8628)
add 217e3d7747 [IOTDB-5106] Parse PathPattern to Deterministic Finite Automate (#8607)
add 905a356c8f [IOTDB-5306] Change default port of ConfigNode and DataNode (#8635)
add 14db9f8784 fix grafana-connector bug (#8636)
add 48bd8c9b68 [IOTDB-5290] Add retry failed tasks thread for sync and trigger(#8610)
add 15c9231120 [IOTDB-5300] Added node status check in migrate Region sql (#8641)
add 5a73bc30e9 [IOTDB-5282] Add SQL: show cluster parameter (#8643)
add 1af7fbe3c4 set isClosed to true after submitting close signal (#8623)
add 08f924c707 Add SHOW_CQ privilege (#8655)
add 6762bcb65c [IOTDB-5266] Refine the code of cross selector and fix the bug when using FileTimeIndex (#8579)
add 0fedffd303 [IOTDB-5313] Fix python client didn't handle redirection status code correctly (#8659)
new cee00e0ce2 Merge remote-tracking branch 'origin/master' into ml/thrift
new 6410f1d318 remove useless interface
new c68f535cbf enable source gen
new 5524f781a2 add empty implement
The 5 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../org/apache/iotdb/db/qp/sql/IdentifierParser.g4 | 1 +
.../apache/iotdb/db/qp/sql/InfluxDBSqlParser.g4 | 29 +-
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 9 +-
.../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 10 +-
.../main/java/org/apache/iotdb/tool/ImportCsv.java | 8 +-
client-py/README.md | 37 +-
client-py/SessionExample.py | 26 +
client-py/iotdb/Session.py | 5 +-
client-py/iotdb/dbapi/tests/test_connection.py | 1 +
client-py/iotdb/dbapi/tests/test_cursor.py | 1 +
client-py/iotdb/sqlalchemy/tests/test_dialect.py | 3 +-
client-py/iotdb/utils/BitMap.py | 9 +
client-py/iotdb/utils/NumpyTablet.py | 33 +-
client-py/requirements_dev.txt | 2 +-
client-py/tests/test_aligned_timeseries.py | 1 +
client-py/tests/test_delete_data.py | 1 +
client-py/tests/test_numpy_tablet.py | 47 +
client-py/tests/test_one_device.py | 1 +
client-py/tests/test_session.py | 31 +-
.../resources/conf/iotdb-confignode.properties | 8 +-
.../assembly/resources/sbin/start-confignode.bat | 4 +-
.../async/AsyncConfigNodeHeartbeatClientPool.java | 6 +-
.../client/async/AsyncDataNodeClientPool.java | 5 +-
.../async/AsyncDataNodeHeartbeatClientPool.java | 6 +-
.../client/sync/SyncConfigNodeClientPool.java | 6 +-
.../client/sync/SyncDataNodeClientPool.java | 8 +-
.../iotdb/confignode/conf/ConfigNodeConfig.java | 6 +-
.../confignode/conf/SystemPropertiesUtils.java | 9 +-
.../statemachine/ConfigNodeRegionStateMachine.java | 4 +-
.../iotdb/confignode/manager/ConfigManager.java | 121 +-
.../iotdb/confignode/manager/ConsensusManager.java | 2 +-
.../apache/iotdb/confignode/manager/IManager.java | 20 +
.../iotdb/confignode/manager/ProcedureManager.java | 50 +-
.../confignode/manager/RetryFailedTasksThread.java | 195 +++
.../iotdb/confignode/manager/SyncManager.java | 7 +-
.../iotdb/confignode/manager/node/NodeManager.java | 72 -
.../node/heartbeat/ConfigNodeHeartbeatCache.java | 2 +-
.../persistence/schema/ClusterSchemaInfo.java | 2 +-
.../impl/node/AddConfigNodeProcedure.java | 5 +-
.../OperatePipeProcedureRollbackProcessor.java | 122 --
.../iotdb/confignode/service/ConfigNode.java | 26 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 43 +
.../request/ConfigPhysicalPlanSerDeTest.java | 56 +-
.../load/balancer/router/RegionRouteMapTest.java | 8 +-
.../router/priority/GreedyPriorityTest.java | 8 +-
.../priority/LeaderPriorityBalancerTest.java | 16 +-
.../confignode/persistence/PartitionInfoTest.java | 8 +-
.../impl/CreateRegionGroupsProcedureTest.java | 16 +-
.../impl/node/AddConfigNodeProcedureTest.java | 2 +-
.../impl/node/RemoveConfigNodeProcedureTest.java | 2 +-
.../confignode1conf/iotdb-confignode.properties | 6 +-
.../confignode2conf/iotdb-confignode.properties | 6 +-
.../confignode3conf/iotdb-confignode.properties | 6 +-
.../consensus/iot/IoTConsensusServerImpl.java | 17 +-
.../consensus/iot/logdispatcher/LogDispatcher.java | 3 +-
.../iotdb/consensus/ratis/RatisConsensus.java | 21 +-
docker/ReadMe.md | 10 +-
docker/src/main/DockerCompose/do-docker-build.sh | 18 +-
.../DockerCompose/docker-compose-cluster-1c2d.yml | 6 +-
.../DockerCompose/docker-compose-cluster-3c3d.yml | 16 +-
.../DockerCompose/docker-compose-host-3c3d.yml | 16 +-
...pose-1c1d.yml => docker-compose-standalone.yml} | 6 +-
docker/src/main/Dockerfile-0.12.6-cluster | 6 +-
docker/src/main/Dockerfile-0.13.0-cluster | 6 +-
docker/src/main/Dockerfile-1.0.0-confignode | 4 +-
docker/src/main/Dockerfile-1.0.0-datanode | 4 +-
...file-1.0.0-1c1d => Dockerfile-1.0.0-standalone} | 0
.../UserGuide/API/Programming-Python-Native-API.md | 39 +-
.../Administration-Management/Administration.md | 65 +-
docs/UserGuide/Cluster/Cluster-Maintenance.md | 85 +-
docs/UserGuide/Cluster/Cluster-Setup.md | 44 +-
.../Edge-Cloud-Collaboration/Sync-Tool.md | 8 +-
docs/UserGuide/QuickStart/ClusterQuickStart.md | 92 +-
docs/UserGuide/QuickStart/WayToGetIoTDB.md | 32 +-
.../Reference/ConfigNode-Config-Manual.md | 6 +-
docs/UserGuide/Reference/DataNode-Config-Manual.md | 10 +-
.../UserGuide/API/Programming-Python-Native-API.md | 39 +-
.../Administration-Management/Administration.md | 65 +-
docs/zh/UserGuide/Cluster/Cluster-Concept.md | 24 +-
docs/zh/UserGuide/Cluster/Cluster-Maintenance.md | 85 +-
docs/zh/UserGuide/Cluster/Cluster-Setup.md | 42 +-
.../Edge-Cloud-Collaboration/Sync-Tool.md | 8 +-
docs/zh/UserGuide/QuickStart/ClusterQuickStart.md | 102 +-
docs/zh/UserGuide/QuickStart/WayToGetIoTDB.md | 30 +-
.../Reference/ConfigNode-Config-Manual.md | 6 +-
.../UserGuide/Reference/DataNode-Config-Manual.md | 10 +-
.../web/grafana/interceptor/LoginInterceptor.java | 3 +
integration-test/import-control.xml | 1 +
.../java/org/apache/iotdb/it/env/AbstractEnv.java | 28 +-
.../org/apache/iotdb/it/env/RemoteServerEnv.java | 34 +-
.../org/apache/iotdb/itbase/env/BaseConfig.java | 30 +-
.../java/org/apache/iotdb/itbase/env/BaseEnv.java | 3 +-
.../confignode/it/IoTDBConfigNodeSnapshotIT.java | 5 +-
.../iotdb/confignode/it/IoTDBStorageGroupIT.java | 8 +-
.../it/cluster/IoTDBClusterNodeErrorStartUpIT.java | 58 +-
.../it/cluster/IoTDBClusterNodeGetterIT.java | 81 +-
.../it/cluster/IoTDBClusterRestartIT.java | 2 +-
.../load/IoTDBClusterRegionLeaderBalancingIT.java | 6 +-
.../it/load/IoTDBConfigNodeSwitchLeaderIT.java | 7 +-
.../partition/IoTDBAutoRegionGroupExtensionIT.java | 4 +-
.../IoTDBCustomRegionGroupExtensionIT.java | 6 +-
.../it/partition/IoTDBPartitionDurableIT.java | 14 +-
.../it/partition/IoTDBPartitionGetterIT.java | 19 +-
.../partition/IoTDBPartitionInheritPolicyIT.java | 5 +-
.../confignode/it/utils/ConfigNodeTestUtils.java | 46 +-
.../java/org/apache/iotdb/db/it/cq/IoTDBCQIT.java | 88 ++
.../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 166 +--
node-commons/pom.xml | 4 +
.../src/assembly/resources/sbin/iotdb-common.sh | 12 +-
.../iotdb/commons/auth/entity/PrivilegeType.java | 3 +-
.../commons/client/ClientFactoryProperty.java | 7 +-
.../apache/iotdb/commons/client/ClientManager.java | 78 +-
.../iotdb/commons/client/ClientPoolProperty.java | 18 +-
.../iotdb/commons/client/IClientManager.java | 18 +-
.../iotdb/commons/client/IClientPoolFactory.java | 7 +-
.../client/exception/ClientManagerException.java | 12 +-
.../apache/iotdb/commons/conf/IoTDBConstant.java | 20 +-
.../apache/iotdb/commons/path/fa/FAFactory.java | 55 +
.../iotdb/commons/path/fa/IFATransition.java | 4 +-
.../apache/iotdb/commons/path/fa/IPatternFA.java | 58 +
.../apache/iotdb/commons/path/fa/dfa/DFAState.java | 44 +-
.../iotdb/commons/path/fa/dfa/PatternDFA.java | 152 +++
.../iotdb/commons/path/fa/dfa/graph/Closure.java | 46 +-
.../iotdb/commons/path/fa/dfa/graph/DFAGraph.java | 173 +++
.../iotdb/commons/path/fa/dfa/graph/NFAGraph.java | 126 ++
.../fa/dfa/transition/AbstractDFATransition.java | 34 +-
.../fa/dfa/transition/DFAPreciseTransition.java | 28 +-
.../fa/dfa/transition/DFAWildcardTransition.java | 45 +-
.../iotdb/commons/path/fa/{ => nfa}/SimpleNFA.java | 12 +-
.../commons/schema/tree/AbstractTreeVisitor.java | 32 +-
.../iotdb/commons/service/ThriftServiceThread.java | 2 +-
.../iotdb/commons/client/ClientManagerTest.java | 24 +-
.../apache/iotdb/commons/path/PatternDFATest.java | 153 +++
.../iotdb/commons/utils/NodeUrlUtilsTest.java | 8 +-
.../commons/utils/ThriftCommonsSerDeUtilsTest.java | 16 +-
.../utils/ThriftConfigNodeSerDeUtilsTest.java | 2 +-
pom.xml | 2 +-
.../resources/conf/iotdb-datanode.properties | 12 +-
.../src/assembly/resources/sbin/start-datanode.bat | 8 +-
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 4 +-
.../iotdb/db/auth/ClusterAuthorityFetcher.java | 10 +-
.../apache/iotdb/db/client/ConfigNodeClient.java | 59 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 10 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 4 +-
.../org/apache/iotdb/db/conf/IoTDBStartCheck.java | 3 +-
.../org/apache/iotdb/db/constant/SqlConstant.java | 66 +
.../db/engine/compaction/CompactionScheduler.java | 8 +-
.../db/engine/compaction/CompactionUtils.java | 14 +-
.../compaction/cross/CrossSpaceCompactionTask.java | 2 -
.../compaction/cross/ICrossSpaceSelector.java | 4 +-
.../cross/rewrite/CrossCompactionTaskResource.java | 119 ++
.../rewrite/CrossSpaceCompactionCandidate.java | 259 ++++
.../rewrite/CrossSpaceCompactionResource.java | 74 -
.../RewriteCrossSpaceCompactionSelector.java | 340 ++---
.../performer/impl/FastCompactionPerformer.java | 2 +-
.../compaction/task/ICompactionSelector.java | 4 +-
.../writer/AbstractCrossCompactionWriter.java | 10 +-
.../writer/FastCrossCompactionWriter.java | 14 +-
.../writer/ReadPointCrossCompactionWriter.java | 7 +
.../db/engine/querycontext/QueryDataSource.java | 2 +-
.../iotdb/db/engine/storagegroup/DataRegion.java | 2 +-
.../db/engine/storagegroup/TsFileResource.java | 33 +-
.../storagegroup/timeindex/DeviceTimeIndex.java | 4 +
.../apache/iotdb/db/exception/MergeException.java | 2 +-
.../exception/index/DistanceMetricException.java | 28 -
.../index/IllegalIndexParamException.java | 28 -
.../db/exception/index/IndexManagerException.java | 34 -
.../db/exception/index/IndexRuntimeException.java | 32 -
.../db/exception/index/QueryIndexException.java | 29 -
.../exception/query/LogicalOperatorException.java | 54 -
.../exception/query/LogicalOptimizeException.java | 46 -
.../db/exception/query/OutOfTTLException.java | 2 +-
.../exception/query/PathNumOverLimitException.java | 33 -
.../query/UnSupportedFillTypeException.java | 33 -
.../iotdb/db/exception/sql/SQLParserException.java | 35 -
.../exception/sql/StatementAnalyzeException.java | 13 -
.../iotdb/db/index/common/IndexConstant.java | 36 -
.../apache/iotdb/db/index/common/IndexType.java | 78 --
.../apache/iotdb/db/index/common/IndexUtils.java | 35 -
.../iotdb/db/localconfignode/LocalConfigNode.java | 2 +-
.../apache/iotdb/db/metadata/MetadataConstant.java | 4 +
.../mtree/snapshot/MemMTreeSnapshotUtil.java | 4 +-
.../metadata/template/ClusterTemplateManager.java | 6 +-
.../db/metadata/utils/ResourceByPathUtils.java | 151 ---
.../timerangeiterator/AggrWindowIterator.java | 4 +-
.../TimeRangeIteratorFactory.java | 2 +-
.../constant => common}/DataNodeEndPoints.java | 7 +-
.../db/mpp/common/filter/BasicFilterType.java | 189 ---
.../db/mpp/common/filter/BasicFunctionFilter.java | 191 ---
.../mpp/common/filter/FilterDeserializeUtil.java | 63 -
.../iotdb/db/mpp/common/filter/FunctionFilter.java | 91 --
.../iotdb/db/mpp/common/filter/InFilter.java | 230 ----
.../iotdb/db/mpp/common/filter/LikeFilter.java | 152 ---
.../iotdb/db/mpp/common/filter/QueryFilter.java | 354 -----
.../iotdb/db/mpp/common/filter/RegexpFilter.java | 150 --
.../db/mpp/common/header/ColumnHeaderConstant.java | 10 +-
.../db/mpp/common/header/DatasetHeaderFactory.java | 4 +
.../db/mpp/execution/exchange/SinkHandle.java | 4 +-
.../execution/operator/source/SeriesScanUtil.java | 17 +-
.../org/apache/iotdb/db/mpp/plan/Coordinator.java | 2 +-
.../apache/iotdb/db/mpp/plan/TestRPCClient.java | 63 +-
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 3 +-
.../mpp/plan/analyze/ClusterPartitionFetcher.java | 17 +-
.../db/mpp/plan/analyze/ExpressionAnalyzer.java | 10 +-
.../db/mpp/plan/analyze/cache/PartitionCache.java | 11 +-
.../iotdb/db/mpp/plan/constant/FilterConstant.java | 103 --
.../db/mpp/plan/execution/QueryExecution.java | 2 +-
.../plan/execution/config/ConfigTaskVisitor.java | 11 +-
.../config/executor/ClusterConfigTaskExecutor.java | 76 +-
.../config/executor/IConfigTaskExecutor.java | 2 +
.../config/metadata/ShowClusterDetailsTask.java | 4 +-
.../config/metadata/ShowClusterParametersTask.java | 136 ++
.../execution/config/sys/sync/ShowPipeTask.java | 2 +-
.../iotdb/db/mpp/plan/expression/ResultColumn.java | 146 --
.../visitor/OldIntermediateLayerVisitor.java | 461 -------
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 227 ++--
.../plan/parser/SqlParseError.java} | 7 +-
.../db/mpp/plan/parser/StatementGenerator.java | 13 +-
.../plan/planner/MemoryDistributionCalculator.java | 2 +-
.../db/mpp/plan/planner/OperatorTreeGenerator.java | 2 +-
.../SimpleFragmentParallelPlanner.java | 2 +-
.../db/mpp/plan/rewriter/DnfFilterOptimizer.java | 163 ---
.../db/mpp/plan/rewriter/IFilterOptimizer.java | 29 -
.../plan/rewriter/MergeSingleFilterOptimizer.java | 179 ---
.../db/mpp/plan/rewriter/RemoveNotOptimizer.java | 103 --
.../scheduler/AbstractFragInsStateTracker.java | 4 +-
.../scheduler/FixedRateFragInsStateTracker.java | 4 +-
.../scheduler/FragmentInstanceDispatcherImpl.java | 4 +-
.../mpp/plan/scheduler/SimpleQueryTerminator.java | 7 +-
.../scheduler/load/LoadTsFileDispatcherImpl.java | 6 +-
.../iotdb/db/mpp/plan/statement/Statement.java | 1 -
.../{constant => statement}/StatementType.java | 2 +-
.../plan/statement/component/SelectComponent.java | 2 +-
.../plan/statement/crud/DeleteDataStatement.java | 2 +-
.../crud/InsertMultiTabletsStatement.java | 2 +-
.../plan/statement/crud/InsertRowStatement.java | 2 +-
.../crud/InsertRowsOfOneDeviceStatement.java | 2 +-
.../plan/statement/crud/InsertRowsStatement.java | 2 +-
.../mpp/plan/statement/crud/InsertStatement.java | 2 +-
.../plan/statement/crud/InsertTabletStatement.java | 2 +-
.../plan/statement/crud/LoadTsFileStatement.java | 2 +-
.../db/mpp/plan/statement/crud/QueryStatement.java | 2 +-
.../InternalCreateTimeSeriesStatement.java | 2 +-
.../statement/internal/SchemaFetchStatement.java | 2 +-
.../metadata/AlterTimeSeriesStatement.java | 2 +-
.../plan/statement/metadata/CountStatement.java | 2 +-
.../metadata/CreateAlignedTimeSeriesStatement.java | 2 +-
.../metadata/CreateContinuousQueryStatement.java | 2 +-
.../metadata/CreateFunctionStatement.java | 2 +-
.../metadata/CreateMultiTimeSeriesStatement.java | 2 +-
.../metadata/CreateTimeSeriesStatement.java | 2 +-
.../statement/metadata/CreateTriggerStatement.java | 2 +-
.../metadata/DeleteStorageGroupStatement.java | 2 +-
.../metadata/DeleteTimeSeriesStatement.java | 2 +-
.../metadata/DropContinuousQueryStatement.java | 2 +-
.../statement/metadata/DropFunctionStatement.java | 2 +-
.../statement/metadata/DropTriggerStatement.java | 2 +-
.../metadata/SetStorageGroupStatement.java | 2 +-
.../plan/statement/metadata/SetTTLStatement.java | 2 +-
.../statement/metadata/ShowClusterStatement.java | 9 +
.../metadata/ShowContinuousQueriesStatement.java | 2 +-
.../mpp/plan/statement/metadata/ShowStatement.java | 2 +-
.../plan/statement/metadata/UnSetTTLStatement.java | 2 +-
.../template/ActivateTemplateStatement.java | 2 +-
.../template/CreateSchemaTemplateStatement.java | 2 +-
.../template/DeactivateTemplateStatement.java | 2 +-
.../template/DropSchemaTemplateStatement.java | 2 +-
.../template/SetSchemaTemplateStatement.java | 2 +-
.../ShowNodesInSchemaTemplateStatement.java | 2 +-
.../template/ShowPathSetTemplateStatement.java | 2 +-
.../template/ShowPathsUsingTemplateStatement.java | 2 +-
.../template/ShowSchemaTemplateStatement.java | 2 +-
.../template/UnsetSchemaTemplateStatement.java | 2 +-
.../db/mpp/plan/statement/sys/AuthorStatement.java | 2 +-
.../plan/statement/sys/ClearCacheStatement.java | 2 +-
.../db/mpp/plan/statement/sys/FlushStatement.java | 2 +-
.../statement/sys/LoadConfigurationStatement.java | 2 +-
.../db/mpp/plan/statement/sys/MergeStatement.java | 2 +-
.../statement/sys/SetSystemStatusStatement.java | 2 +-
.../sys/sync/CreatePipeSinkStatement.java | 2 +-
.../statement/sys/sync/CreatePipeStatement.java | 2 +-
.../statement/sys/sync/DropPipeSinkStatement.java | 2 +-
.../plan/statement/sys/sync/DropPipeStatement.java | 2 +-
.../statement/sys/sync/StartPipeStatement.java | 2 +-
.../plan/statement/sys/sync/StopPipeStatement.java | 2 +-
.../db/mpp/transformation/dag/udf/UDTFContext.java | 8 -
...fluxSQLConstant.java => InfluxSqlConstant.java} | 15 +-
.../influxdb/function/InfluxFunctionFactory.java | 24 +-
.../function/aggregator/InfluxCountFunction.java | 4 +-
.../function/aggregator/InfluxMeanFunction.java | 4 +-
.../function/aggregator/InfluxMedianFunction.java | 4 +-
.../function/aggregator/InfluxModeFunction.java | 4 +-
.../function/aggregator/InfluxSpreadFunction.java | 4 +-
.../function/aggregator/InfluxStddevFunction.java | 4 +-
.../function/aggregator/InfluxSumFunction.java | 4 +-
.../function/selector/InfluxFirstFunction.java | 4 +-
.../function/selector/InfluxLastFunction.java | 4 +-
.../function/selector/InfluxMaxFunction.java | 4 +-
.../function/selector/InfluxMinFunction.java | 4 +-
.../influxdb/handler/AbstractQueryHandler.java | 202 +--
.../protocol/influxdb/handler/NewQueryHandler.java | 20 +-
.../protocol/influxdb/input/InfluxLineParser.java | 2 +-
.../influxdb/operator/InfluxQueryOperator.java | 38 -
.../influxdb/parser/InfluxDBAstVisitor.java | 321 +++++
.../InfluxDBStatementGenerator.java} | 25 +-
.../protocol/influxdb/sql/InfluxDBSqlVisitor.java | 298 ----
.../influxdb/statement/InfluxQueryStatement.java | 57 +
.../InfluxSelectComponent.java | 21 +-
.../db/protocol/influxdb/util/FilterUtils.java | 20 +-
.../db/protocol/mqtt/PayloadFormatManager.java | 19 +-
.../db/protocol/rest/handler/ExceptionHandler.java | 3 +-
.../rest/handler/ExecuteStatementHandler.java | 2 +-
.../iotdb/db/qp/constant/FilterConstant.java | 114 --
.../apache/iotdb/db/qp/constant/SQLConstant.java | 285 ----
.../org/apache/iotdb/db/qp/logical/Operator.java | 200 ---
.../db/qp/logical/crud/BasicFunctionOperator.java | 172 ---
.../db/qp/logical/crud/BasicOperatorType.java | 191 ---
.../iotdb/db/qp/logical/crud/FilterOperator.java | 295 ----
.../iotdb/db/qp/logical/crud/FromComponent.java | 41 -
.../iotdb/db/qp/logical/crud/FunctionOperator.java | 48 -
.../iotdb/db/qp/logical/crud/QueryOperator.java | 106 --
.../iotdb/db/qp/logical/crud/SelectComponent.java | 139 --
.../db/qp/logical/crud/SpecialClauseComponent.java | 162 ---
.../iotdb/db/qp/logical/crud/WhereComponent.java | 40 -
.../iotdb/db/qp/utils/GroupByLevelController.java | 327 -----
.../iotdb/db/query/control/FileReaderManager.java | 11 +
.../db/query/control/QueryResourceManager.java | 14 -
.../apache/iotdb/db/query/filter/TsFileFilter.java | 31 -
.../query/reader/series/AlignedSeriesReader.java | 109 --
.../reader/series/SeriesRawDataBatchReader.java | 140 --
.../iotdb/db/query/reader/series/SeriesReader.java | 1430 --------------------
.../java/org/apache/iotdb/db/service/DataNode.java | 4 +-
.../impl/DataNodeInternalRPCServiceImpl.java | 30 +
.../thrift/impl/NewInfluxDBServiceImpl.java | 17 +-
.../java/org/apache/iotdb/db/sync/SyncService.java | 2 +-
.../apache/iotdb/db/tools/IoTDBDataDirViewer.java | 2 +-
.../iotdb/db/tools/TsFileResourcePrinter.java | 2 +-
.../db/tools/watermark/WatermarkDetector.java | 9 +-
.../db/trigger/executor/TriggerFireVisitor.java | 10 +-
.../iotdb/db/utils/AlignedValueIterator.java | 59 -
.../org/apache/iotdb/db/utils/CommonUtils.java | 10 +-
.../iotdb/db/{qp => }/utils/DateTimeUtils.java | 2 +-
.../apache/iotdb/db/utils/ErrorHandlingUtils.java | 4 -
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 15 -
.../java/org/apache/iotdb/db/utils/FilesUtils.java | 43 -
.../iotdb/db/utils/IExpressionDeserializeUtil.java | 51 -
.../apache/iotdb/db/utils/QueryDataSetUtils.java | 133 --
.../org/apache/iotdb/db/utils/SchemaUtils.java | 20 +-
.../apache/iotdb/db/utils/TypeInferenceUtils.java | 46 +-
.../org/apache/iotdb/db/utils/ValueIterator.java | 56 -
.../timerangeiterator/AggrWindowIterator.java | 165 ---
.../timerangeiterator/ITimeRangeIterator.java | 39 -
.../timerangeiterator/PreAggrWindowIterator.java | 158 ---
.../PreAggrWindowWithNaturalMonthIterator.java | 123 --
.../TimeRangeIteratorFactory.java | 69 -
.../org/apache/iotdb/db/wal/buffer/WALBuffer.java | 3 +-
.../FastCrossCompactionPerformerTest.java | 329 ++++-
.../FastInnerCompactionPerformerTest.java | 186 +++
.../ReadPointCompactionPerformerTest.java | 470 ++++++-
.../CrossSpaceCompactionWithFastPerformerTest.java | 21 +-
...eCompactionWithFastPerformerValidationTest.java | 906 ++++++-------
...sSpaceCompactionWithReadPointPerformerTest.java | 21 +-
...actionWithReadPointPerformerValidationTest.java | 906 ++++++-------
.../engine/compaction/cross/MergeUpgradeTest.java | 4 +-
.../cross/RewriteCompactionFileSelectorTest.java | 121 +-
...eCrossSpaceCompactionWithFastPerformerTest.java | 163 +--
...sSpaceCompactionWithReadPointPerformerTest.java | 163 +--
.../inner/InnerCompactionMoreDataTest.java | 28 +-
.../SizeTieredCompactionRecoverTest.java | 230 ++--
.../compaction/utils/CompactionCheckerUtils.java | 24 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 31 +-
.../schemaRegion/SchemaRegionManagementTest.java | 43 +
.../common/schematree/ClusterSchemaTreeTest.java | 86 ++
.../db/mpp/execution/exchange/SinkHandleTest.java | 9 +-
.../mpp/execution/exchange/SourceHandleTest.java | 12 +-
.../mpp/plan/plan/FragmentInstanceSerdeTest.java | 16 +-
.../influxdb/sql/InfluxDBLogicalGeneratorTest.java | 70 -
.../sql/InfluxDBStatementGeneratorTest.java | 87 ++
.../org/apache/iotdb/db/qp/sql/ASTVisitorTest.java | 10 +-
.../db/qp/utils/DatetimeQueryDataSetUtilsTest.java | 2 +
.../apache/iotdb/db/utils/EnvironmentUtils.java | 3 +
.../org/apache/iotdb/db/utils/SchemaUtilsTest.java | 12 +-
.../iotdb/db/utils/TimeRangeIteratorTest.java | 298 ----
.../datanode1conf/iotdb-datanode.properties | 10 +-
.../datanode2conf/iotdb-datanode.properties | 12 +-
.../datanode3conf/iotdb-datanode.properties | 12 +-
server/src/test/resources/logback-test.xml | 1 +
.../src/main/thrift/confignode.thrift | 95 +-
thrift-mlnode/src/main/thrift/mlnode.thrift | 43 +-
thrift/src/main/thrift/datanode.thrift | 77 +-
.../read/common/block/column/NullColumn.java | 19 +-
.../iotdb/tsfile/read/common/ColumnTest.java | 12 +
392 files changed, 7071 insertions(+), 12503 deletions(-)
create mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/manager/RetryFailedTasksThread.java
delete mode 100644 confignode/src/main/java/org/apache/iotdb/confignode/procedure/impl/sync/OperatePipeProcedureRollbackProcessor.java
rename docker/src/main/DockerCompose/{docker-compose-1c1d.yml => docker-compose-standalone.yml} (88%)
rename docker/src/main/{Dockerfile-1.0.0-1c1d => Dockerfile-1.0.0-standalone} (100%)
copy metrics/interface/src/main/java/org/apache/iotdb/metrics/utils/InternalReporterType.java => node-commons/src/main/java/org/apache/iotdb/commons/client/exception/ClientManagerException.java (81%)
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/path/fa/FAFactory.java
copy server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/read/ShowDevicesPlanImpl.java => node-commons/src/main/java/org/apache/iotdb/commons/path/fa/dfa/DFAState.java (58%)
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/path/fa/dfa/PatternDFA.java
copy server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/read/ShowDevicesPlanImpl.java => node-commons/src/main/java/org/apache/iotdb/commons/path/fa/dfa/graph/Closure.java (56%)
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/path/fa/dfa/graph/DFAGraph.java
create mode 100644 node-commons/src/main/java/org/apache/iotdb/commons/path/fa/dfa/graph/NFAGraph.java
copy server/src/main/java/org/apache/iotdb/db/metadata/plan/schemaregion/impl/read/ShowDevicesPlanImpl.java => node-commons/src/main/java/org/apache/iotdb/commons/path/fa/dfa/transition/AbstractDFATransition.java (58%)
copy spark-tsfile/src/main/java/org/apache/iotdb/spark/tsfile/qp/common/Operator.java => node-commons/src/main/java/org/apache/iotdb/commons/path/fa/dfa/transition/DFAPreciseTransition.java (65%)
mode change 100755 => 100644
copy server/src/main/java/org/apache/iotdb/db/mpp/common/NodeRef.java => node-commons/src/main/java/org/apache/iotdb/commons/path/fa/dfa/transition/DFAWildcardTransition.java (51%)
rename node-commons/src/main/java/org/apache/iotdb/commons/path/fa/{ => nfa}/SimpleNFA.java (97%)
create mode 100644 node-commons/src/test/java/org/apache/iotdb/commons/path/PatternDFATest.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/constant/SqlConstant.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/rewrite/CrossCompactionTaskResource.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/rewrite/CrossSpaceCompactionCandidate.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/engine/compaction/cross/rewrite/CrossSpaceCompactionResource.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/exception/index/DistanceMetricException.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/exception/index/IllegalIndexParamException.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/exception/index/IndexManagerException.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/exception/index/IndexRuntimeException.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/exception/index/QueryIndexException.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/exception/query/LogicalOperatorException.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/exception/query/LogicalOptimizeException.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/exception/query/PathNumOverLimitException.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/exception/query/UnSupportedFillTypeException.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/exception/sql/SQLParserException.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/index/common/IndexConstant.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/index/common/IndexType.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/index/common/IndexUtils.java
rename server/src/main/java/org/apache/iotdb/db/mpp/{plan/constant => common}/DataNodeEndPoints.java (93%)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/common/filter/BasicFilterType.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/common/filter/BasicFunctionFilter.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/common/filter/FilterDeserializeUtil.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/common/filter/FunctionFilter.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/common/filter/InFilter.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/common/filter/LikeFilter.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/common/filter/QueryFilter.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/common/filter/RegexpFilter.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/constant/FilterConstant.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/execution/config/metadata/ShowClusterParametersTask.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/ResultColumn.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/expression/visitor/OldIntermediateLayerVisitor.java
rename server/src/main/java/org/apache/iotdb/db/{qp/strategy/SQLParseError.java => mpp/plan/parser/SqlParseError.java} (93%)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/rewriter/DnfFilterOptimizer.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/rewriter/IFilterOptimizer.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/rewriter/MergeSingleFilterOptimizer.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/mpp/plan/rewriter/RemoveNotOptimizer.java
rename server/src/main/java/org/apache/iotdb/db/mpp/plan/{constant => statement}/StatementType.java (98%)
rename server/src/main/java/org/apache/iotdb/db/protocol/influxdb/constant/{InfluxSQLConstant.java => InfluxSqlConstant.java} (92%)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/influxdb/operator/InfluxQueryOperator.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/influxdb/parser/InfluxDBAstVisitor.java
rename server/src/main/java/org/apache/iotdb/db/protocol/influxdb/{sql/InfluxDBLogicalGenerator.java => parser/InfluxDBStatementGenerator.java} (76%)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/influxdb/sql/InfluxDBSqlVisitor.java
create mode 100644 server/src/main/java/org/apache/iotdb/db/protocol/influxdb/statement/InfluxQueryStatement.java
rename server/src/main/java/org/apache/iotdb/db/protocol/influxdb/{operator => statement}/InfluxSelectComponent.java (83%)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/constant/FilterConstant.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/constant/SQLConstant.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/Operator.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicFunctionOperator.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/BasicOperatorType.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/FilterOperator.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/FromComponent.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/FunctionOperator.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/QueryOperator.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/SelectComponent.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/SpecialClauseComponent.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/logical/crud/WhereComponent.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/qp/utils/GroupByLevelController.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/filter/TsFileFilter.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/series/AlignedSeriesReader.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesRawDataBatchReader.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/query/reader/series/SeriesReader.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/utils/AlignedValueIterator.java
rename server/src/main/java/org/apache/iotdb/db/{qp => }/utils/DateTimeUtils.java (99%)
delete mode 100644 server/src/main/java/org/apache/iotdb/db/utils/FilesUtils.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/utils/IExpressionDeserializeUtil.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/utils/ValueIterator.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/utils/timerangeiterator/AggrWindowIterator.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/utils/timerangeiterator/ITimeRangeIterator.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/utils/timerangeiterator/PreAggrWindowIterator.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/utils/timerangeiterator/PreAggrWindowWithNaturalMonthIterator.java
delete mode 100644 server/src/main/java/org/apache/iotdb/db/utils/timerangeiterator/TimeRangeIteratorFactory.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/protocol/influxdb/sql/InfluxDBLogicalGeneratorTest.java
create mode 100644 server/src/test/java/org/apache/iotdb/db/protocol/influxdb/sql/InfluxDBStatementGeneratorTest.java
delete mode 100644 server/src/test/java/org/apache/iotdb/db/utils/TimeRangeIteratorTest.java
[iotdb] 04/05: enable source gen
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hui pushed a commit to branch ml/thrift
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit c68f535cbf1cf0546f842002fd9b8fbe6f43cb3c
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Thu Dec 29 22:30:57 2022 +0800
enable source gen
---
pom.xml | 2 +-
thrift-mlnode/src/main/thrift/mlnode.thrift | 3 ++-
thrift/src/main/thrift/datanode.thrift | 1 +
3 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/pom.xml b/pom.xml
index 38ca520c3e..054a201048 100644
--- a/pom.xml
+++ b/pom.xml
@@ -1353,7 +1353,7 @@
<generator>py</generator>
<thriftExecutable>${thrift.exec.absolute.path}</thriftExecutable>
<thriftSourceRoot>${basedir}/src/main/thrift</thriftSourceRoot>
- <includes>**/common.thrift,**/client.thrift</includes>
+ <includes>**/common.thrift,**/client.thrift,**/datanode.thrift,**/confignode.thrift,**/mlnode.thrift</includes>
<outputDirectory>${project.build.directory}/generated-sources-python/</outputDirectory>
</configuration>
</execution>
diff --git a/thrift-mlnode/src/main/thrift/mlnode.thrift b/thrift-mlnode/src/main/thrift/mlnode.thrift
index 26e5267d16..5cd4412a25 100644
--- a/thrift-mlnode/src/main/thrift/mlnode.thrift
+++ b/thrift-mlnode/src/main/thrift/mlnode.thrift
@@ -18,7 +18,8 @@
*/
include "common.thrift"
-namespace py iotdb.thrift.mlnode
+namespace java org.apache.iotdb.mlnode.rpc.thrift
+namespace py iotdb.mlnode.service.thrift
struct TCreateTrainingTaskReq {
1: required string modelId
diff --git a/thrift/src/main/thrift/datanode.thrift b/thrift/src/main/thrift/datanode.thrift
index 1558755c45..ee5d39a2ee 100644
--- a/thrift/src/main/thrift/datanode.thrift
+++ b/thrift/src/main/thrift/datanode.thrift
@@ -18,6 +18,7 @@
*/
include "common.thrift"
namespace java org.apache.iotdb.mpp.rpc.thrift
+namespace py iotdb.thrift.datanode
struct TCreateSchemaRegionReq {
1: required common.TRegionReplicaSet regionReplicaSet
[iotdb] 01/05: define req & resp
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hui pushed a commit to branch ml/thrift
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit a000b57b87db9b0012d04829ce19a9c679f19a5b
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Thu Dec 29 22:09:05 2022 +0800
define req & resp
---
.../src/main/thrift/confignode.thrift | 59 ++++++++++++++---
thrift-mlnode/src/main/thrift/mlnode.thrift | 38 +++++++----
thrift/src/main/thrift/datanode.thrift | 76 ++++++++++++++++++++--
3 files changed, 147 insertions(+), 26 deletions(-)
diff --git a/thrift-confignode/src/main/thrift/confignode.thrift b/thrift-confignode/src/main/thrift/confignode.thrift
index 670104b1ee..81a2393e2d 100644
--- a/thrift-confignode/src/main/thrift/confignode.thrift
+++ b/thrift-confignode/src/main/thrift/confignode.thrift
@@ -654,23 +654,62 @@ struct TUnsetSchemaTemplateReq{
3: required string path
}
-struct TCreateModelReq {}
+struct TCreateModelReq {
+ 1: required string modelId
+ 2: required byte modelTask
+ 3: required bool isAuto
+ 4: required map<string, string> modelConfigs
+ 5: required list<string> queryExpressions
+ 6: optional string queryFilter
+}
+
+struct TDropModelReq {
+ 1: required string modelId
+}
+
+struct TShowModelReq {
+ 1: optional string queriedModelId
+}
-struct TDropModelReq {}
+struct TModelInfo {
+ 1: required string modelId
+ 2: required map<string, string> modelInfo
+}
-struct TShowModelReq {}
+struct TShowModelResp {
+ 1: required common.TSStatus status
+ 2: required list<TModelInfo> modelInfoList
+}
-struct TShowModelResp {}
+struct TShowTrailReq {
+ 1: required string modelId
+ 2: optional string trailId
+}
-struct TShowTrailReq {}
+struct TTrailInfo {
+ 1: required string modelId
+ 2: required string trailId
+ 3: required map<string, string> trailInfo
+}
-struct TShowTrailResp {}
+struct TShowTrailResp {
+ 1: required common.TSStatus status
+ 2: required list<TTrailInfo> trailInfoList
+}
-struct TGetModelInfoReq {}
+struct TGetModelInfoReq {
+ 1: required string modelId
+}
-struct TGetModelInfoResp {}
+struct TGetModelInfoResp {
+ 1: required common.TSStatus status
+ 2: required TModelInfo modelInfo
+}
-struct TUpdateModelInfoReq {}
+struct TUpdateModelInfoReq {
+ 1: required string modelId
+ 2: required map<string, string> modelInfo
+}
service IConfigNodeRPCService {
@@ -1190,7 +1229,7 @@ service IConfigNodeRPCService {
/**
* Return the model table
*/
- TShowModelResp showModel(TShowModelReq req)
+ TShowModelResp showModels(TShowModelReq req)
/**
* Return the trail table
diff --git a/thrift-mlnode/src/main/thrift/mlnode.thrift b/thrift-mlnode/src/main/thrift/mlnode.thrift
index 6d38dd7592..26e5267d16 100644
--- a/thrift-mlnode/src/main/thrift/mlnode.thrift
+++ b/thrift-mlnode/src/main/thrift/mlnode.thrift
@@ -20,23 +20,37 @@
include "common.thrift"
namespace py iotdb.thrift.mlnode
-struct TCreateTrainingTaskReq {}
-
-struct TDeleteModelReq {}
-
-struct TForecastReq {}
-
-struct TForecastResp {}
+struct TCreateTrainingTaskReq {
+ 1: required string modelId
+ 3: required bool isAuto
+ 4: required map<string, string> modelConfigs
+ 5: required list<string> queryExpressions
+ 6: optional string queryFilter
+}
+
+struct TDeleteModelReq {
+ 1: required string modelPath
+}
+
+struct TForecastReq {
+ 1: required string modelPath
+ 2: required list<binary> dataset
+}
+
+struct TForecastResp {
+ 1: required common.TSStatus status
+ 2: required binary forecastResult
+}
service IMLNodeRPCService {
- // -------------- For Config Node --------------
+ // -------------- For Config Node --------------
- common.TSStatus createTrainingTask(TCreateTrainingTaskReq req)
+ common.TSStatus createTrainingTask(TCreateTrainingTaskReq req)
- common.TSStatus deleteModel(TDeleteModelReq req)
+ common.TSStatus deleteModel(TDeleteModelReq req)
- // -------------- For Data Node --------------
+ // -------------- For Data Node --------------
- TForecastResp forecast(TForecastReq req)
+ TForecastResp forecast(TForecastReq req)
}
\ No newline at end of file
diff --git a/thrift/src/main/thrift/datanode.thrift b/thrift/src/main/thrift/datanode.thrift
index 87f6519a38..1558755c45 100644
--- a/thrift/src/main/thrift/datanode.thrift
+++ b/thrift/src/main/thrift/datanode.thrift
@@ -351,13 +351,67 @@ struct TExecuteCQ {
7: required string username
}
-struct TDeleteModelMetricsReq {}
+// ====================================================
+// ML Node
+// ====================================================
+struct TDeleteModelMetricsReq {
+ 1: required string modelId
+}
+
+struct TFetchTimeseriesReq {
+ 1: required i64 sessionId
+ 2: required i64 statementId
+ 3: required list<string> queryExpressions
+ 4: optional string queryFilter
+ 5: optional i32 fetchSize
+ 6: optional i64 timeout
+}
+
+struct TFetchTimeseriesResp {
+ 1: required common.TSStatus status
+ 2: required i64 queryId
+ 3: required list<string> columnNameList
+ 4: required list<string> columnTypeList
+ 5: required map<string, i32> columnNameIndexMap
+ 6: required list<binary> tsDataset
+ 7: required bool hasMoreData
+}
-struct TFetchWindowBatchReq {}
+struct TFetchWindowBatchReq {
+ 1: required i64 sessionId
+ 2: required i64 statementId
+ 3: required list<string> queryExpressions
+ 4: required TGroupByTimeParameter groupByTimeParameter
+ 5: optional string queryFilter
+ 6: optional i32 fetchSize
+ 7: optional i64 timeout
+}
-struct TFetchWindowBatchResp {}
+struct TGroupByTimeParameter {
+ 1: required i64 startTime
+ 2: required i64 endTime
+ 3: required i64 interval
+ 4: required i64 slidingStep
+ 5: optional list<i32> indexes
+}
-struct TRecordModelMetricsReq {}
+struct TFetchWindowBatchResp {
+ 1: required common.TSStatus status
+ 2: required i64 queryId
+ 3: required list<string> columnNameList
+ 4: required list<string> columnTypeList
+ 5: required map<string, i32> columnNameIndexMap
+ 6: required list<list<binary>> windowDataset
+ 7: required bool hasMoreData
+}
+
+struct TRecordModelMetricsReq {
+ 1: required string modelId
+ 2: required string trialId
+ 3: required list<string> metrics
+ 4: required i64 timestamp
+ 5: required list<double> values
+}
service IDataNodeRPCService {
@@ -651,12 +705,26 @@ service IDataNodeRPCService {
*/
common.TSStatus executeCQ(TExecuteCQ req)
+ /**
+ * Delete model training metrics on DataNode
+ */
common.TSStatus deleteModelMetrics(TDeleteModelMetricsReq req)
// ----------------------------------- For ML Node -----------------------------------------------
+ /**
+ * Fecth the data of the specified time series
+ */
+ TFetchTimeseriesResp fetchTimeseries(TFetchTimeseriesReq req)
+
+ /**
+ * Fecth window batches of the specified time series
+ */
TFetchWindowBatchResp fetchWindowBatch(TFetchWindowBatchReq req)
+ /**
+ * Record model training metrics on DataNode
+ */
common.TSStatus recordModelMetrics(TRecordModelMetricsReq req)
}
[iotdb] 02/05: Merge remote-tracking branch 'origin/master' into ml/thrift
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hui pushed a commit to branch ml/thrift
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit cee00e0ce2c102f2a9e7da8f347f1372a23b35df
Merge: a000b57b87 0fedffd303
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Thu Dec 29 22:09:15 2022 +0800
Merge remote-tracking branch 'origin/master' into ml/thrift
.../org/apache/iotdb/db/qp/sql/IdentifierParser.g4 | 1 +
.../apache/iotdb/db/qp/sql/InfluxDBSqlParser.g4 | 29 +-
.../org/apache/iotdb/db/qp/sql/IoTDBSqlParser.g4 | 9 +-
.../antlr4/org/apache/iotdb/db/qp/sql/SqlLexer.g4 | 10 +-
.../main/java/org/apache/iotdb/tool/ImportCsv.java | 8 +-
client-py/README.md | 37 +-
client-py/SessionExample.py | 26 +
client-py/iotdb/Session.py | 5 +-
client-py/iotdb/dbapi/tests/test_connection.py | 1 +
client-py/iotdb/dbapi/tests/test_cursor.py | 1 +
client-py/iotdb/sqlalchemy/tests/test_dialect.py | 3 +-
client-py/iotdb/utils/BitMap.py | 9 +
client-py/iotdb/utils/NumpyTablet.py | 33 +-
client-py/requirements_dev.txt | 2 +-
client-py/tests/test_aligned_timeseries.py | 1 +
client-py/tests/test_delete_data.py | 1 +
client-py/tests/test_numpy_tablet.py | 47 +
client-py/tests/test_one_device.py | 1 +
client-py/tests/test_session.py | 31 +-
.../resources/conf/iotdb-confignode.properties | 8 +-
.../assembly/resources/sbin/start-confignode.bat | 4 +-
.../async/AsyncConfigNodeHeartbeatClientPool.java | 6 +-
.../client/async/AsyncDataNodeClientPool.java | 5 +-
.../async/AsyncDataNodeHeartbeatClientPool.java | 6 +-
.../client/sync/SyncConfigNodeClientPool.java | 6 +-
.../client/sync/SyncDataNodeClientPool.java | 8 +-
.../iotdb/confignode/conf/ConfigNodeConfig.java | 6 +-
.../confignode/conf/SystemPropertiesUtils.java | 9 +-
.../statemachine/ConfigNodeRegionStateMachine.java | 4 +-
.../iotdb/confignode/manager/ConfigManager.java | 121 +-
.../iotdb/confignode/manager/ConsensusManager.java | 2 +-
.../apache/iotdb/confignode/manager/IManager.java | 20 +
.../iotdb/confignode/manager/ProcedureManager.java | 50 +-
.../confignode/manager/RetryFailedTasksThread.java | 195 +++
.../iotdb/confignode/manager/SyncManager.java | 7 +-
.../iotdb/confignode/manager/node/NodeManager.java | 72 -
.../node/heartbeat/ConfigNodeHeartbeatCache.java | 2 +-
.../persistence/schema/ClusterSchemaInfo.java | 2 +-
.../impl/node/AddConfigNodeProcedure.java | 5 +-
.../OperatePipeProcedureRollbackProcessor.java | 122 --
.../iotdb/confignode/service/ConfigNode.java | 26 +-
.../thrift/ConfigNodeRPCServiceProcessor.java | 6 +
.../request/ConfigPhysicalPlanSerDeTest.java | 56 +-
.../load/balancer/router/RegionRouteMapTest.java | 8 +-
.../router/priority/GreedyPriorityTest.java | 8 +-
.../priority/LeaderPriorityBalancerTest.java | 16 +-
.../confignode/persistence/PartitionInfoTest.java | 8 +-
.../impl/CreateRegionGroupsProcedureTest.java | 16 +-
.../impl/node/AddConfigNodeProcedureTest.java | 2 +-
.../impl/node/RemoveConfigNodeProcedureTest.java | 2 +-
.../confignode1conf/iotdb-confignode.properties | 6 +-
.../confignode2conf/iotdb-confignode.properties | 6 +-
.../confignode3conf/iotdb-confignode.properties | 6 +-
.../consensus/iot/IoTConsensusServerImpl.java | 17 +-
.../consensus/iot/logdispatcher/LogDispatcher.java | 3 +-
.../iotdb/consensus/ratis/RatisConsensus.java | 21 +-
docker/ReadMe.md | 10 +-
docker/src/main/DockerCompose/do-docker-build.sh | 18 +-
.../DockerCompose/docker-compose-cluster-1c2d.yml | 6 +-
.../DockerCompose/docker-compose-cluster-3c3d.yml | 16 +-
.../DockerCompose/docker-compose-host-3c3d.yml | 16 +-
...pose-1c1d.yml => docker-compose-standalone.yml} | 6 +-
docker/src/main/Dockerfile-0.12.6-cluster | 6 +-
docker/src/main/Dockerfile-0.13.0-cluster | 6 +-
docker/src/main/Dockerfile-1.0.0-confignode | 4 +-
docker/src/main/Dockerfile-1.0.0-datanode | 4 +-
...file-1.0.0-1c1d => Dockerfile-1.0.0-standalone} | 0
.../UserGuide/API/Programming-Python-Native-API.md | 39 +-
.../Administration-Management/Administration.md | 65 +-
docs/UserGuide/Cluster/Cluster-Maintenance.md | 85 +-
docs/UserGuide/Cluster/Cluster-Setup.md | 44 +-
.../Edge-Cloud-Collaboration/Sync-Tool.md | 8 +-
docs/UserGuide/QuickStart/ClusterQuickStart.md | 92 +-
docs/UserGuide/QuickStart/WayToGetIoTDB.md | 32 +-
.../Reference/ConfigNode-Config-Manual.md | 6 +-
docs/UserGuide/Reference/DataNode-Config-Manual.md | 10 +-
.../UserGuide/API/Programming-Python-Native-API.md | 39 +-
.../Administration-Management/Administration.md | 65 +-
docs/zh/UserGuide/Cluster/Cluster-Concept.md | 24 +-
docs/zh/UserGuide/Cluster/Cluster-Maintenance.md | 85 +-
docs/zh/UserGuide/Cluster/Cluster-Setup.md | 42 +-
.../Edge-Cloud-Collaboration/Sync-Tool.md | 8 +-
docs/zh/UserGuide/QuickStart/ClusterQuickStart.md | 102 +-
docs/zh/UserGuide/QuickStart/WayToGetIoTDB.md | 30 +-
.../Reference/ConfigNode-Config-Manual.md | 6 +-
.../UserGuide/Reference/DataNode-Config-Manual.md | 10 +-
.../web/grafana/interceptor/LoginInterceptor.java | 3 +
integration-test/import-control.xml | 1 +
.../java/org/apache/iotdb/it/env/AbstractEnv.java | 28 +-
.../org/apache/iotdb/it/env/RemoteServerEnv.java | 34 +-
.../org/apache/iotdb/itbase/env/BaseConfig.java | 30 +-
.../java/org/apache/iotdb/itbase/env/BaseEnv.java | 3 +-
.../confignode/it/IoTDBConfigNodeSnapshotIT.java | 5 +-
.../iotdb/confignode/it/IoTDBStorageGroupIT.java | 8 +-
.../it/cluster/IoTDBClusterNodeErrorStartUpIT.java | 58 +-
.../it/cluster/IoTDBClusterNodeGetterIT.java | 81 +-
.../it/cluster/IoTDBClusterRestartIT.java | 2 +-
.../load/IoTDBClusterRegionLeaderBalancingIT.java | 6 +-
.../it/load/IoTDBConfigNodeSwitchLeaderIT.java | 7 +-
.../partition/IoTDBAutoRegionGroupExtensionIT.java | 4 +-
.../IoTDBCustomRegionGroupExtensionIT.java | 6 +-
.../it/partition/IoTDBPartitionDurableIT.java | 14 +-
.../it/partition/IoTDBPartitionGetterIT.java | 19 +-
.../partition/IoTDBPartitionInheritPolicyIT.java | 5 +-
.../confignode/it/utils/ConfigNodeTestUtils.java | 46 +-
.../java/org/apache/iotdb/db/it/cq/IoTDBCQIT.java | 88 ++
.../apache/iotdb/jdbc/IoTDBDatabaseMetadata.java | 166 +--
node-commons/pom.xml | 4 +
.../src/assembly/resources/sbin/iotdb-common.sh | 12 +-
.../iotdb/commons/auth/entity/PrivilegeType.java | 3 +-
.../commons/client/ClientFactoryProperty.java | 7 +-
.../apache/iotdb/commons/client/ClientManager.java | 78 +-
.../iotdb/commons/client/ClientPoolProperty.java | 18 +-
.../iotdb/commons/client/IClientManager.java | 18 +-
.../iotdb/commons/client/IClientPoolFactory.java | 7 +-
.../client/exception/ClientManagerException.java | 10 +-
.../apache/iotdb/commons/conf/IoTDBConstant.java | 20 +-
.../apache/iotdb/commons/path/fa/FAFactory.java | 55 +
.../iotdb/commons/path/fa/IFATransition.java | 4 +-
.../apache/iotdb/commons/path/fa/IPatternFA.java | 58 +
.../apache/iotdb/commons/path/fa/dfa/DFAState.java | 66 +
.../iotdb/commons/path/fa/dfa/PatternDFA.java | 152 +++
.../iotdb/commons/path/fa/dfa/graph/Closure.java | 66 +
.../iotdb/commons/path/fa/dfa/graph/DFAGraph.java | 173 +++
.../iotdb/commons/path/fa/dfa/graph/NFAGraph.java | 126 ++
.../fa/dfa/transition/AbstractDFATransition.java | 54 +
.../fa/dfa/transition/DFAPreciseTransition.java | 28 +-
.../fa/dfa/transition/DFAWildcardTransition.java | 38 +-
.../iotdb/commons/path/fa/{ => nfa}/SimpleNFA.java | 12 +-
.../commons/schema/tree/AbstractTreeVisitor.java | 32 +-
.../iotdb/commons/service/ThriftServiceThread.java | 2 +-
.../iotdb/commons/client/ClientManagerTest.java | 24 +-
.../apache/iotdb/commons/path/PatternDFATest.java | 153 +++
.../iotdb/commons/utils/NodeUrlUtilsTest.java | 8 +-
.../commons/utils/ThriftCommonsSerDeUtilsTest.java | 16 +-
.../utils/ThriftConfigNodeSerDeUtilsTest.java | 2 +-
.../resources/conf/iotdb-datanode.properties | 12 +-
.../src/assembly/resources/sbin/start-datanode.bat | 8 +-
.../org/apache/iotdb/db/auth/AuthorityChecker.java | 4 +-
.../iotdb/db/auth/ClusterAuthorityFetcher.java | 10 +-
.../apache/iotdb/db/client/ConfigNodeClient.java | 22 +
.../java/org/apache/iotdb/db/conf/IoTDBConfig.java | 10 +-
.../org/apache/iotdb/db/conf/IoTDBDescriptor.java | 4 +-
.../org/apache/iotdb/db/conf/IoTDBStartCheck.java | 3 +-
.../org/apache/iotdb/db/constant/SqlConstant.java | 66 +
.../db/engine/compaction/CompactionScheduler.java | 8 +-
.../db/engine/compaction/CompactionUtils.java | 14 +-
.../compaction/cross/CrossSpaceCompactionTask.java | 2 -
.../compaction/cross/ICrossSpaceSelector.java | 4 +-
.../cross/rewrite/CrossCompactionTaskResource.java | 119 ++
.../rewrite/CrossSpaceCompactionCandidate.java | 259 ++++
.../rewrite/CrossSpaceCompactionResource.java | 74 -
.../RewriteCrossSpaceCompactionSelector.java | 340 ++---
.../performer/impl/FastCompactionPerformer.java | 2 +-
.../compaction/task/ICompactionSelector.java | 4 +-
.../writer/AbstractCrossCompactionWriter.java | 10 +-
.../writer/FastCrossCompactionWriter.java | 14 +-
.../writer/ReadPointCrossCompactionWriter.java | 7 +
.../db/engine/querycontext/QueryDataSource.java | 2 +-
.../iotdb/db/engine/storagegroup/DataRegion.java | 2 +-
.../db/engine/storagegroup/TsFileResource.java | 33 +-
.../storagegroup/timeindex/DeviceTimeIndex.java | 4 +
.../apache/iotdb/db/exception/MergeException.java | 2 +-
.../index/IllegalIndexParamException.java | 28 -
.../db/exception/index/IndexManagerException.java | 34 -
.../db/exception/index/IndexRuntimeException.java | 32 -
.../db/exception/index/QueryIndexException.java | 29 -
.../exception/query/LogicalOperatorException.java | 54 -
.../exception/query/LogicalOptimizeException.java | 46 -
.../db/exception/query/OutOfTTLException.java | 2 +-
.../exception/query/PathNumOverLimitException.java | 33 -
.../query/UnSupportedFillTypeException.java | 33 -
.../iotdb/db/exception/sql/SQLParserException.java | 35 -
.../exception/sql/StatementAnalyzeException.java | 13 -
.../iotdb/db/index/common/IndexConstant.java | 36 -
.../apache/iotdb/db/index/common/IndexType.java | 78 --
.../apache/iotdb/db/index/common/IndexUtils.java | 35 -
.../iotdb/db/localconfignode/LocalConfigNode.java | 2 +-
.../apache/iotdb/db/metadata/MetadataConstant.java | 4 +
.../mtree/snapshot/MemMTreeSnapshotUtil.java | 4 +-
.../metadata/template/ClusterTemplateManager.java | 6 +-
.../db/metadata/utils/ResourceByPathUtils.java | 151 ---
.../timerangeiterator/AggrWindowIterator.java | 4 +-
.../TimeRangeIteratorFactory.java | 2 +-
.../constant => common}/DataNodeEndPoints.java | 7 +-
.../db/mpp/common/filter/BasicFilterType.java | 189 ---
.../db/mpp/common/filter/BasicFunctionFilter.java | 191 ---
.../mpp/common/filter/FilterDeserializeUtil.java | 63 -
.../iotdb/db/mpp/common/filter/FunctionFilter.java | 91 --
.../iotdb/db/mpp/common/filter/InFilter.java | 230 ----
.../iotdb/db/mpp/common/filter/LikeFilter.java | 152 ---
.../iotdb/db/mpp/common/filter/QueryFilter.java | 354 -----
.../iotdb/db/mpp/common/filter/RegexpFilter.java | 150 --
.../db/mpp/common/header/ColumnHeaderConstant.java | 10 +-
.../db/mpp/common/header/DatasetHeaderFactory.java | 4 +
.../db/mpp/execution/exchange/SinkHandle.java | 4 +-
.../execution/operator/source/SeriesScanUtil.java | 17 +-
.../org/apache/iotdb/db/mpp/plan/Coordinator.java | 2 +-
.../apache/iotdb/db/mpp/plan/TestRPCClient.java | 63 +-
.../iotdb/db/mpp/plan/analyze/AnalyzeVisitor.java | 3 +-
.../mpp/plan/analyze/ClusterPartitionFetcher.java | 17 +-
.../db/mpp/plan/analyze/ExpressionAnalyzer.java | 10 +-
.../db/mpp/plan/analyze/cache/PartitionCache.java | 11 +-
.../iotdb/db/mpp/plan/constant/FilterConstant.java | 103 --
.../db/mpp/plan/execution/QueryExecution.java | 2 +-
.../plan/execution/config/ConfigTaskVisitor.java | 11 +-
.../config/executor/ClusterConfigTaskExecutor.java | 76 +-
.../config/executor/IConfigTaskExecutor.java | 2 +
.../config/metadata/ShowClusterDetailsTask.java | 4 +-
.../config/metadata/ShowClusterParametersTask.java | 136 ++
.../execution/config/sys/sync/ShowPipeTask.java | 2 +-
.../iotdb/db/mpp/plan/expression/ResultColumn.java | 146 --
.../visitor/OldIntermediateLayerVisitor.java | 461 -------
.../iotdb/db/mpp/plan/parser/ASTVisitor.java | 227 ++--
.../plan/parser/SqlParseError.java} | 7 +-
.../db/mpp/plan/parser/StatementGenerator.java | 13 +-
.../plan/planner/MemoryDistributionCalculator.java | 2 +-
.../db/mpp/plan/planner/OperatorTreeGenerator.java | 2 +-
.../SimpleFragmentParallelPlanner.java | 2 +-
.../db/mpp/plan/rewriter/DnfFilterOptimizer.java | 163 ---
.../db/mpp/plan/rewriter/IFilterOptimizer.java | 29 -
.../plan/rewriter/MergeSingleFilterOptimizer.java | 179 ---
.../db/mpp/plan/rewriter/RemoveNotOptimizer.java | 103 --
.../scheduler/AbstractFragInsStateTracker.java | 4 +-
.../scheduler/FixedRateFragInsStateTracker.java | 4 +-
.../scheduler/FragmentInstanceDispatcherImpl.java | 4 +-
.../mpp/plan/scheduler/SimpleQueryTerminator.java | 7 +-
.../scheduler/load/LoadTsFileDispatcherImpl.java | 6 +-
.../iotdb/db/mpp/plan/statement/Statement.java | 1 -
.../{constant => statement}/StatementType.java | 2 +-
.../plan/statement/component/SelectComponent.java | 2 +-
.../plan/statement/crud/DeleteDataStatement.java | 2 +-
.../crud/InsertMultiTabletsStatement.java | 2 +-
.../plan/statement/crud/InsertRowStatement.java | 2 +-
.../crud/InsertRowsOfOneDeviceStatement.java | 2 +-
.../plan/statement/crud/InsertRowsStatement.java | 2 +-
.../mpp/plan/statement/crud/InsertStatement.java | 2 +-
.../plan/statement/crud/InsertTabletStatement.java | 2 +-
.../plan/statement/crud/LoadTsFileStatement.java | 2 +-
.../db/mpp/plan/statement/crud/QueryStatement.java | 2 +-
.../InternalCreateTimeSeriesStatement.java | 2 +-
.../statement/internal/SchemaFetchStatement.java | 2 +-
.../metadata/AlterTimeSeriesStatement.java | 2 +-
.../plan/statement/metadata/CountStatement.java | 2 +-
.../metadata/CreateAlignedTimeSeriesStatement.java | 2 +-
.../metadata/CreateContinuousQueryStatement.java | 2 +-
.../metadata/CreateFunctionStatement.java | 2 +-
.../metadata/CreateMultiTimeSeriesStatement.java | 2 +-
.../metadata/CreateTimeSeriesStatement.java | 2 +-
.../statement/metadata/CreateTriggerStatement.java | 2 +-
.../metadata/DeleteStorageGroupStatement.java | 2 +-
.../metadata/DeleteTimeSeriesStatement.java | 2 +-
.../metadata/DropContinuousQueryStatement.java | 2 +-
.../statement/metadata/DropFunctionStatement.java | 2 +-
.../statement/metadata/DropTriggerStatement.java | 2 +-
.../metadata/SetStorageGroupStatement.java | 2 +-
.../plan/statement/metadata/SetTTLStatement.java | 2 +-
.../statement/metadata/ShowClusterStatement.java | 9 +
.../metadata/ShowContinuousQueriesStatement.java | 2 +-
.../mpp/plan/statement/metadata/ShowStatement.java | 2 +-
.../plan/statement/metadata/UnSetTTLStatement.java | 2 +-
.../template/ActivateTemplateStatement.java | 2 +-
.../template/CreateSchemaTemplateStatement.java | 2 +-
.../template/DeactivateTemplateStatement.java | 2 +-
.../template/DropSchemaTemplateStatement.java | 2 +-
.../template/SetSchemaTemplateStatement.java | 2 +-
.../ShowNodesInSchemaTemplateStatement.java | 2 +-
.../template/ShowPathSetTemplateStatement.java | 2 +-
.../template/ShowPathsUsingTemplateStatement.java | 2 +-
.../template/ShowSchemaTemplateStatement.java | 2 +-
.../template/UnsetSchemaTemplateStatement.java | 2 +-
.../db/mpp/plan/statement/sys/AuthorStatement.java | 2 +-
.../plan/statement/sys/ClearCacheStatement.java | 2 +-
.../db/mpp/plan/statement/sys/FlushStatement.java | 2 +-
.../statement/sys/LoadConfigurationStatement.java | 2 +-
.../db/mpp/plan/statement/sys/MergeStatement.java | 2 +-
.../statement/sys/SetSystemStatusStatement.java | 2 +-
.../sys/sync/CreatePipeSinkStatement.java | 2 +-
.../statement/sys/sync/CreatePipeStatement.java | 2 +-
.../statement/sys/sync/DropPipeSinkStatement.java | 2 +-
.../plan/statement/sys/sync/DropPipeStatement.java | 2 +-
.../statement/sys/sync/StartPipeStatement.java | 2 +-
.../plan/statement/sys/sync/StopPipeStatement.java | 2 +-
.../db/mpp/transformation/dag/udf/UDTFContext.java | 8 -
...fluxSQLConstant.java => InfluxSqlConstant.java} | 15 +-
.../influxdb/function/InfluxFunctionFactory.java | 24 +-
.../function/aggregator/InfluxCountFunction.java | 4 +-
.../function/aggregator/InfluxMeanFunction.java | 4 +-
.../function/aggregator/InfluxMedianFunction.java | 4 +-
.../function/aggregator/InfluxModeFunction.java | 4 +-
.../function/aggregator/InfluxSpreadFunction.java | 4 +-
.../function/aggregator/InfluxStddevFunction.java | 4 +-
.../function/aggregator/InfluxSumFunction.java | 4 +-
.../function/selector/InfluxFirstFunction.java | 4 +-
.../function/selector/InfluxLastFunction.java | 4 +-
.../function/selector/InfluxMaxFunction.java | 4 +-
.../function/selector/InfluxMinFunction.java | 4 +-
.../influxdb/handler/AbstractQueryHandler.java | 202 +--
.../protocol/influxdb/handler/NewQueryHandler.java | 20 +-
.../protocol/influxdb/input/InfluxLineParser.java | 2 +-
.../influxdb/operator/InfluxQueryOperator.java | 38 -
.../influxdb/parser/InfluxDBAstVisitor.java | 321 +++++
.../InfluxDBStatementGenerator.java} | 25 +-
.../protocol/influxdb/sql/InfluxDBSqlVisitor.java | 298 ----
.../influxdb/statement/InfluxQueryStatement.java | 57 +
.../InfluxSelectComponent.java | 21 +-
.../db/protocol/influxdb/util/FilterUtils.java | 20 +-
.../db/protocol/mqtt/PayloadFormatManager.java | 19 +-
.../db/protocol/rest/handler/ExceptionHandler.java | 3 +-
.../rest/handler/ExecuteStatementHandler.java | 2 +-
.../iotdb/db/qp/constant/FilterConstant.java | 114 --
.../apache/iotdb/db/qp/constant/SQLConstant.java | 285 ----
.../org/apache/iotdb/db/qp/logical/Operator.java | 200 ---
.../db/qp/logical/crud/BasicFunctionOperator.java | 172 ---
.../db/qp/logical/crud/BasicOperatorType.java | 191 ---
.../iotdb/db/qp/logical/crud/FilterOperator.java | 295 ----
.../iotdb/db/qp/logical/crud/FromComponent.java | 41 -
.../iotdb/db/qp/logical/crud/FunctionOperator.java | 48 -
.../iotdb/db/qp/logical/crud/QueryOperator.java | 106 --
.../iotdb/db/qp/logical/crud/SelectComponent.java | 139 --
.../db/qp/logical/crud/SpecialClauseComponent.java | 162 ---
.../iotdb/db/qp/utils/GroupByLevelController.java | 327 -----
.../iotdb/db/query/control/FileReaderManager.java | 11 +
.../db/query/control/QueryResourceManager.java | 14 -
.../apache/iotdb/db/query/filter/TsFileFilter.java | 31 -
.../query/reader/series/AlignedSeriesReader.java | 109 --
.../reader/series/SeriesRawDataBatchReader.java | 140 --
.../iotdb/db/query/reader/series/SeriesReader.java | 1430 --------------------
.../java/org/apache/iotdb/db/service/DataNode.java | 4 +-
.../thrift/impl/NewInfluxDBServiceImpl.java | 17 +-
.../java/org/apache/iotdb/db/sync/SyncService.java | 2 +-
.../apache/iotdb/db/tools/IoTDBDataDirViewer.java | 2 +-
.../iotdb/db/tools/TsFileResourcePrinter.java | 2 +-
.../db/tools/watermark/WatermarkDetector.java | 9 +-
.../db/trigger/executor/TriggerFireVisitor.java | 10 +-
.../iotdb/db/utils/AlignedValueIterator.java | 59 -
.../org/apache/iotdb/db/utils/CommonUtils.java | 10 +-
.../iotdb/db/{qp => }/utils/DateTimeUtils.java | 2 +-
.../apache/iotdb/db/utils/ErrorHandlingUtils.java | 4 -
.../org/apache/iotdb/db/utils/FileLoaderUtils.java | 15 -
.../java/org/apache/iotdb/db/utils/FilesUtils.java | 43 -
.../iotdb/db/utils/IExpressionDeserializeUtil.java | 51 -
.../apache/iotdb/db/utils/QueryDataSetUtils.java | 133 --
.../org/apache/iotdb/db/utils/SchemaUtils.java | 20 +-
.../apache/iotdb/db/utils/TypeInferenceUtils.java | 46 +-
.../org/apache/iotdb/db/utils/ValueIterator.java | 56 -
.../timerangeiterator/AggrWindowIterator.java | 165 ---
.../timerangeiterator/ITimeRangeIterator.java | 39 -
.../timerangeiterator/PreAggrWindowIterator.java | 158 ---
.../PreAggrWindowWithNaturalMonthIterator.java | 123 --
.../TimeRangeIteratorFactory.java | 69 -
.../org/apache/iotdb/db/wal/buffer/WALBuffer.java | 3 +-
.../FastCrossCompactionPerformerTest.java | 329 ++++-
.../FastInnerCompactionPerformerTest.java | 186 +++
.../ReadPointCompactionPerformerTest.java | 470 ++++++-
.../CrossSpaceCompactionWithFastPerformerTest.java | 21 +-
...eCompactionWithFastPerformerValidationTest.java | 906 ++++++-------
...sSpaceCompactionWithReadPointPerformerTest.java | 21 +-
...actionWithReadPointPerformerValidationTest.java | 906 ++++++-------
.../engine/compaction/cross/MergeUpgradeTest.java | 4 +-
.../cross/RewriteCompactionFileSelectorTest.java | 121 +-
...eCrossSpaceCompactionWithFastPerformerTest.java | 163 +--
...sSpaceCompactionWithReadPointPerformerTest.java | 163 +--
.../inner/InnerCompactionMoreDataTest.java | 28 +-
.../SizeTieredCompactionRecoverTest.java | 230 ++--
.../compaction/utils/CompactionCheckerUtils.java | 24 +-
.../iotdb/db/engine/storagegroup/TTLTest.java | 31 +-
.../schemaRegion/SchemaRegionManagementTest.java | 43 +
.../common/schematree/ClusterSchemaTreeTest.java | 86 ++
.../db/mpp/execution/exchange/SinkHandleTest.java | 9 +-
.../mpp/execution/exchange/SourceHandleTest.java | 12 +-
.../mpp/plan/plan/FragmentInstanceSerdeTest.java | 16 +-
.../influxdb/sql/InfluxDBLogicalGeneratorTest.java | 70 -
.../sql/InfluxDBStatementGeneratorTest.java | 87 ++
.../org/apache/iotdb/db/qp/sql/ASTVisitorTest.java | 10 +-
.../db/qp/utils/DatetimeQueryDataSetUtilsTest.java | 2 +
.../apache/iotdb/db/utils/EnvironmentUtils.java | 3 +
.../org/apache/iotdb/db/utils/SchemaUtilsTest.java | 12 +-
.../iotdb/db/utils/TimeRangeIteratorTest.java | 298 ----
.../datanode1conf/iotdb-datanode.properties | 10 +-
.../datanode2conf/iotdb-datanode.properties | 12 +-
.../datanode3conf/iotdb-datanode.properties | 12 +-
server/src/test/resources/logback-test.xml | 1 +
.../src/main/thrift/confignode.thrift | 42 +-
.../read/common/block/column/NullColumn.java | 19 +-
.../iotdb/tsfile/read/common/ColumnTest.java | 12 +
386 files changed, 6942 insertions(+), 12338 deletions(-)
[iotdb] 03/05: remove useless interface
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hui pushed a commit to branch ml/thrift
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 6410f1d3187498fb831b3f0f58f5c2c41b775ac4
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Thu Dec 29 22:12:51 2022 +0800
remove useless interface
---
thrift-confignode/src/main/thrift/confignode.thrift | 18 ++----------------
1 file changed, 2 insertions(+), 16 deletions(-)
diff --git a/thrift-confignode/src/main/thrift/confignode.thrift b/thrift-confignode/src/main/thrift/confignode.thrift
index a4c285d09a..a247d8616b 100644
--- a/thrift-confignode/src/main/thrift/confignode.thrift
+++ b/thrift-confignode/src/main/thrift/confignode.thrift
@@ -681,7 +681,7 @@ struct TDropModelReq {
}
struct TShowModelReq {
- 1: optional string queriedModelId
+ 1: optional string modelId
}
struct TModelInfo {
@@ -710,15 +710,6 @@ struct TShowTrailResp {
2: required list<TTrailInfo> trailInfoList
}
-struct TGetModelInfoReq {
- 1: required string modelId
-}
-
-struct TGetModelInfoResp {
- 1: required common.TSStatus status
- 2: required TModelInfo modelInfo
-}
-
struct TUpdateModelInfoReq {
1: required string modelId
2: required map<string, string> modelInfo
@@ -1245,18 +1236,13 @@ service IConfigNodeRPCService {
/**
* Return the model table
*/
- TShowModelResp showModels(TShowModelReq req)
+ TShowModelResp showModel(TShowModelReq req)
/**
* Return the trail table
*/
TShowTrailResp showTrail(TShowTrailReq req)
- /**
- * Return the model info by specific model id
- */
- TGetModelInfoResp getModelInfo(TGetModelInfoReq req)
-
/**
* Update the model info
*
[iotdb] 05/05: add empty implement
Posted by hu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
hui pushed a commit to branch ml/thrift
in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 5524f781a293d52cc36d6b2628c5a89ea0228ef7
Author: Minghui Liu <li...@foxmail.com>
AuthorDate: Thu Dec 29 22:37:16 2022 +0800
add empty implement
---
.../thrift/ConfigNodeRPCServiceProcessor.java | 37 ++++++++++++++++++++++
.../apache/iotdb/db/client/ConfigNodeClient.java | 37 ++++++++++++++++++++++
.../impl/DataNodeInternalRPCServiceImpl.java | 30 ++++++++++++++++++
3 files changed, 104 insertions(+)
diff --git a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
index 93075ea3b5..accfab2dbe 100644
--- a/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
+++ b/confignode/src/main/java/org/apache/iotdb/confignode/service/thrift/ConfigNodeRPCServiceProcessor.java
@@ -75,6 +75,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TConfigNodeRestartReq;
import org.apache.iotdb.confignode.rpc.thrift.TCountStorageGroupResp;
import org.apache.iotdb.confignode.rpc.thrift.TCreateCQReq;
import org.apache.iotdb.confignode.rpc.thrift.TCreateFunctionReq;
+import org.apache.iotdb.confignode.rpc.thrift.TCreateModelReq;
import org.apache.iotdb.confignode.rpc.thrift.TCreatePipeReq;
import org.apache.iotdb.confignode.rpc.thrift.TCreateSchemaTemplateReq;
import org.apache.iotdb.confignode.rpc.thrift.TCreateTriggerReq;
@@ -94,6 +95,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TDeleteStorageGroupsReq;
import org.apache.iotdb.confignode.rpc.thrift.TDeleteTimeSeriesReq;
import org.apache.iotdb.confignode.rpc.thrift.TDropCQReq;
import org.apache.iotdb.confignode.rpc.thrift.TDropFunctionReq;
+import org.apache.iotdb.confignode.rpc.thrift.TDropModelReq;
import org.apache.iotdb.confignode.rpc.thrift.TDropPipeSinkReq;
import org.apache.iotdb.confignode.rpc.thrift.TDropTriggerReq;
import org.apache.iotdb.confignode.rpc.thrift.TGetAllPipeInfoResp;
@@ -136,15 +138,20 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowClusterParametersResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowClusterResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowConfigNodesResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowDataNodesResp;
+import org.apache.iotdb.confignode.rpc.thrift.TShowModelReq;
+import org.apache.iotdb.confignode.rpc.thrift.TShowModelResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowPipeReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowPipeResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowStorageGroupResp;
+import org.apache.iotdb.confignode.rpc.thrift.TShowTrailReq;
+import org.apache.iotdb.confignode.rpc.thrift.TShowTrailResp;
import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchema;
import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchemaResp;
import org.apache.iotdb.confignode.rpc.thrift.TSystemConfigurationResp;
import org.apache.iotdb.confignode.rpc.thrift.TUnsetSchemaTemplateReq;
+import org.apache.iotdb.confignode.rpc.thrift.TUpdateModelInfoReq;
import org.apache.iotdb.confignode.service.ConfigNode;
import org.apache.iotdb.consensus.common.response.ConsensusGenericResponse;
import org.apache.iotdb.db.mpp.plan.statement.AuthorType;
@@ -816,4 +823,34 @@ public class ConfigNodeRPCServiceProcessor implements IConfigNodeRPCService.Ifac
public TShowCQResp showCQ() {
return configManager.showCQ();
}
+
+ @Override
+ public TSStatus createModel(TCreateModelReq req) throws TException {
+ // TODO
+ throw new TException(new UnsupportedOperationException().getCause());
+ }
+
+ @Override
+ public TSStatus dropModel(TDropModelReq req) throws TException {
+ // TODO
+ throw new TException(new UnsupportedOperationException().getCause());
+ }
+
+ @Override
+ public TShowModelResp showModel(TShowModelReq req) throws TException {
+ // TODO
+ throw new TException(new UnsupportedOperationException().getCause());
+ }
+
+ @Override
+ public TShowTrailResp showTrail(TShowTrailReq req) throws TException {
+ // TODO
+ throw new TException(new UnsupportedOperationException().getCause());
+ }
+
+ @Override
+ public TSStatus updateModelInfo(TUpdateModelInfoReq req) throws TException {
+ // TODO
+ throw new TException(new UnsupportedOperationException().getCause());
+ }
}
diff --git a/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java b/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java
index 8cea7a722d..3106627b8b 100644
--- a/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java
+++ b/server/src/main/java/org/apache/iotdb/db/client/ConfigNodeClient.java
@@ -43,6 +43,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TConfigNodeRestartReq;
import org.apache.iotdb.confignode.rpc.thrift.TCountStorageGroupResp;
import org.apache.iotdb.confignode.rpc.thrift.TCreateCQReq;
import org.apache.iotdb.confignode.rpc.thrift.TCreateFunctionReq;
+import org.apache.iotdb.confignode.rpc.thrift.TCreateModelReq;
import org.apache.iotdb.confignode.rpc.thrift.TCreatePipeReq;
import org.apache.iotdb.confignode.rpc.thrift.TCreateSchemaTemplateReq;
import org.apache.iotdb.confignode.rpc.thrift.TCreateTriggerReq;
@@ -62,6 +63,7 @@ import org.apache.iotdb.confignode.rpc.thrift.TDeleteStorageGroupsReq;
import org.apache.iotdb.confignode.rpc.thrift.TDeleteTimeSeriesReq;
import org.apache.iotdb.confignode.rpc.thrift.TDropCQReq;
import org.apache.iotdb.confignode.rpc.thrift.TDropFunctionReq;
+import org.apache.iotdb.confignode.rpc.thrift.TDropModelReq;
import org.apache.iotdb.confignode.rpc.thrift.TDropPipeSinkReq;
import org.apache.iotdb.confignode.rpc.thrift.TDropTriggerReq;
import org.apache.iotdb.confignode.rpc.thrift.TGetAllPipeInfoResp;
@@ -104,14 +106,19 @@ import org.apache.iotdb.confignode.rpc.thrift.TShowClusterParametersResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowClusterResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowConfigNodesResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowDataNodesResp;
+import org.apache.iotdb.confignode.rpc.thrift.TShowModelReq;
+import org.apache.iotdb.confignode.rpc.thrift.TShowModelResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowPipeReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowPipeResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionReq;
import org.apache.iotdb.confignode.rpc.thrift.TShowRegionResp;
import org.apache.iotdb.confignode.rpc.thrift.TShowStorageGroupResp;
+import org.apache.iotdb.confignode.rpc.thrift.TShowTrailReq;
+import org.apache.iotdb.confignode.rpc.thrift.TShowTrailResp;
import org.apache.iotdb.confignode.rpc.thrift.TStorageGroupSchemaResp;
import org.apache.iotdb.confignode.rpc.thrift.TSystemConfigurationResp;
import org.apache.iotdb.confignode.rpc.thrift.TUnsetSchemaTemplateReq;
+import org.apache.iotdb.confignode.rpc.thrift.TUpdateModelInfoReq;
import org.apache.iotdb.db.conf.IoTDBConfig;
import org.apache.iotdb.db.conf.IoTDBDescriptor;
import org.apache.iotdb.rpc.RpcTransportFactory;
@@ -1882,6 +1889,36 @@ public class ConfigNodeClient
throw new TException(MSG_RECONNECTION_FAIL);
}
+ @Override
+ public TSStatus createModel(TCreateModelReq req) throws TException {
+ // TODO
+ throw new TException(new UnsupportedOperationException().getCause());
+ }
+
+ @Override
+ public TSStatus dropModel(TDropModelReq req) throws TException {
+ // TODO
+ throw new TException(new UnsupportedOperationException().getCause());
+ }
+
+ @Override
+ public TShowModelResp showModel(TShowModelReq req) throws TException {
+ // TODO
+ throw new TException(new UnsupportedOperationException().getCause());
+ }
+
+ @Override
+ public TShowTrailResp showTrail(TShowTrailReq req) throws TException {
+ // TODO
+ throw new TException(new UnsupportedOperationException().getCause());
+ }
+
+ @Override
+ public TSStatus updateModelInfo(TUpdateModelInfoReq req) throws TException {
+ // TODO
+ throw new TException(new UnsupportedOperationException().getCause());
+ }
+
public static class Factory extends BaseClientFactory<ConfigNodeRegionId, ConfigNodeClient> {
public Factory(
diff --git a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
index 75f0bc0421..a0cf697979 100644
--- a/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
+++ b/server/src/main/java/org/apache/iotdb/db/service/thrift/impl/DataNodeInternalRPCServiceImpl.java
@@ -133,6 +133,7 @@ import org.apache.iotdb.mpp.rpc.thrift.TCreateSchemaRegionReq;
import org.apache.iotdb.mpp.rpc.thrift.TCreateTriggerInstanceReq;
import org.apache.iotdb.mpp.rpc.thrift.TDeactivateTemplateReq;
import org.apache.iotdb.mpp.rpc.thrift.TDeleteDataForDeleteSchemaReq;
+import org.apache.iotdb.mpp.rpc.thrift.TDeleteModelMetricsReq;
import org.apache.iotdb.mpp.rpc.thrift.TDeleteTimeSeriesReq;
import org.apache.iotdb.mpp.rpc.thrift.TDisableDataNodeReq;
import org.apache.iotdb.mpp.rpc.thrift.TDropFunctionInstanceReq;
@@ -141,6 +142,10 @@ import org.apache.iotdb.mpp.rpc.thrift.TExecuteCQ;
import org.apache.iotdb.mpp.rpc.thrift.TFetchFragmentInstanceInfoReq;
import org.apache.iotdb.mpp.rpc.thrift.TFetchSchemaBlackListReq;
import org.apache.iotdb.mpp.rpc.thrift.TFetchSchemaBlackListResp;
+import org.apache.iotdb.mpp.rpc.thrift.TFetchTimeseriesReq;
+import org.apache.iotdb.mpp.rpc.thrift.TFetchTimeseriesResp;
+import org.apache.iotdb.mpp.rpc.thrift.TFetchWindowBatchReq;
+import org.apache.iotdb.mpp.rpc.thrift.TFetchWindowBatchResp;
import org.apache.iotdb.mpp.rpc.thrift.TFireTriggerReq;
import org.apache.iotdb.mpp.rpc.thrift.TFireTriggerResp;
import org.apache.iotdb.mpp.rpc.thrift.TFragmentInstanceInfoResp;
@@ -155,6 +160,7 @@ import org.apache.iotdb.mpp.rpc.thrift.TLoadResp;
import org.apache.iotdb.mpp.rpc.thrift.TLoadSample;
import org.apache.iotdb.mpp.rpc.thrift.TMaintainPeerReq;
import org.apache.iotdb.mpp.rpc.thrift.TOperatePipeOnDataNodeReq;
+import org.apache.iotdb.mpp.rpc.thrift.TRecordModelMetricsReq;
import org.apache.iotdb.mpp.rpc.thrift.TRegionLeaderChangeReq;
import org.apache.iotdb.mpp.rpc.thrift.TRegionRouteReq;
import org.apache.iotdb.mpp.rpc.thrift.TRollbackSchemaBlackListReq;
@@ -898,6 +904,30 @@ public class DataNodeInternalRPCServiceImpl implements IDataNodeRPCService.Iface
}
}
+ @Override
+ public TSStatus deleteModelMetrics(TDeleteModelMetricsReq req) throws TException {
+ // TODO
+ throw new TException(new UnsupportedOperationException().getCause());
+ }
+
+ @Override
+ public TFetchTimeseriesResp fetchTimeseries(TFetchTimeseriesReq req) throws TException {
+ // TODO
+ throw new TException(new UnsupportedOperationException().getCause());
+ }
+
+ @Override
+ public TFetchWindowBatchResp fetchWindowBatch(TFetchWindowBatchReq req) throws TException {
+ // TODO
+ throw new TException(new UnsupportedOperationException().getCause());
+ }
+
+ @Override
+ public TSStatus recordModelMetrics(TRecordModelMetricsReq req) throws TException {
+ // TODO
+ throw new TException(new UnsupportedOperationException().getCause());
+ }
+
private PathPatternTree filterPathPatternTree(PathPatternTree patternTree, String storageGroup) {
PathPatternTree filteredPatternTree = new PathPatternTree();
try {