This is an automated email from the ASF dual-hosted git repository. jackietien pushed a commit to branch ty/packageRefactor in repository https://gitbox.apache.org/repos/asf/iotdb.git
commit 0b11bcee0e58e349da6b7029ed7aebc639634b66 Author: JackieTien97 <[email protected]> AuthorDate: Mon Jun 26 19:06:15 2023 +0800 done --- CONTRIBUTING.md | 10 ++-- LICENSE | 60 +++++++++++----------- docs/Development/HowtoContributeCode.md | 2 +- .../Operators-Functions/User-Defined-Function.md | 4 +- docs/zh/Development/HowtoContributeCode.md | 2 +- .../Operators-Functions/User-Defined-Function.md | 4 +- integration-test/src/assembly/mpp-test.xml | 16 +++--- iotdb-core/confignode/src/assembly/confignode.xml | 4 +- .../manager/pipe/runtime/PipeHeartbeatParser.java | 3 +- .../pipe/runtime/PipeRuntimeCoordinator.java | 2 +- iotdb-core/datanode/src/assembly/server.xml | 10 ++-- 11 files changed, 59 insertions(+), 58 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 2e5e96561e7..ed7f564b8e3 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -130,18 +130,18 @@ Recommended use Intellij idea. mvn clean package -DskipTests ``` -Mark `antlr/target/generated-sources/antlr4` and `thrift/target/generated-sources/thrift` as `Source Root`. +Mark `iotdb-core/antlr/target/generated-sources/antlr4` and `iotdb-protocol/thrift/target/generated-sources/thrift` as `Source Root`. -* Server main function：`server/src/main/java/org/apache/iotdb/db/service/IoTDB`, can be started in debug mode. -* Cli：`cli/src/main/java/org/apache/iotdb/cli/`，Use Cli for linux and WinCli for windows, you can start directly with the parameter "`-h 127.0.0.1 -p 6667 -u root -pw root`" -* Server rpc implementation (mainly used for cli and server communication, generally start interruption point here):`server/src/main/java/org/apache/iotdb/db/service/TSServiceImpl` +* Server main function：`iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/DataNode`, can be started in debug mode. +* Cli：`iotdb-client/cli/src/main/java/org/apache/iotdb/cli/`，Use Cli for linux and WinCli for windows, you can start directly with the parameter "`-h 127.0.0.1 -p 6667 -u root -pw root`" +* Server rpc implementation (mainly used for cli and server communication, generally start interruption point here):`iotdb-core/datanode/src/main/java/org/apache/iotdb/db/service/TSServiceImpl` * all jdbc statements：`executeStatement(TSExecuteStatementReq req)` * jdbc query：`executeQueryStatement(TSExecuteStatementReq req)` * native Write interface：`insertRecord(TSInsertRecordReq req)` `insertTablet(TSInsertTabletReq req)` * Storage engine`org.apache.iotdb.db.storageengine.StorageEngine` -* Query engine `org.apache.iotdb.db.qp.QueryProcessor` +* Query engine `org.apache.iotdb.db.queryengine` # Frequent Questions When Compiling the Source Code diff --git a/LICENSE b/LICENSE index 8aef993efae..ef267466d8a 100644 --- a/LICENSE +++ b/LICENSE @@ -213,23 +213,23 @@ mvnw files from https://github.com/apache/maven-wrapper Apache 2.0 The following class is modified from Apache commons-collections -./tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Murmur128Hash.java +./iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/utils/Murmur128Hash.java Relevant pr is: https://github.com/apache/commons-collections/pull/83/ -------------------------------------------------------------------------------- The following files include code modified from Michael Burman's gorilla-tsc project. -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/GorillaEncoderV2.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntGorillaEncoder.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongGorillaEncoder.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SinglePrecisionEncoderV2.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoublePrecisionEncoderV2.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoderV2.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntGorillaDecoder.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongGorillaDecoder.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/SinglePrecisionDecoderV2.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoublePrecisionDecoderV2.java +./iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/GorillaEncoderV2.java +./iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/IntGorillaEncoder.java +./iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/LongGorillaEncoder.java +./iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/SinglePrecisionEncoderV2.java +./iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/encoder/DoublePrecisionEncoderV2.java +./iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/GorillaDecoderV2.java +./iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/IntGorillaDecoder.java +./iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/LongGorillaDecoder.java +./iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/SinglePrecisionDecoderV2.java +./iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/encoding/decoder/DoublePrecisionDecoderV2.java Copyright: 2016-2018 Michael Burman and/or other contributors Project page: https://github.com/burmanm/gorilla-tsc @@ -239,11 +239,11 @@ License: http://www.apache.org/licenses/LICENSE-2.0 The following files include code modified from Apache HBase project. -./confignode/src/main/java/org/apache/iotdb/procedure/Procedure.java -./confignode/src/main/java/org/apache/iotdb/procedure/ProcedureExecutor.java -./confignode/src/main/java/org/apache/iotdb/procedure/StateMachineProcedure.java -./confignode/src/main/java/org/apache/iotdb/procedure/TimeoutExecutorThread.java -./confignode/src/main/java/org/apache/iotdb/procedure/StoppableThread.java +./iotdb-core/confignode/src/main/java/org/apache/iotdb/procedure/Procedure.java +./iotdb-core/confignode/src/main/java/org/apache/iotdb/procedure/ProcedureExecutor.java +./iotdb-core/confignode/src/main/java/org/apache/iotdb/procedure/StateMachineProcedure.java +./iotdb-core/confignode/src/main/java/org/apache/iotdb/procedure/TimeoutExecutorThread.java +./iotdb-core/confignode/src/main/java/org/apache/iotdb/procedure/StoppableThread.java Copyright: 2016-2018 Michael Burman and/or other contributors Project page: https://github.com/burmanm/gorilla-tsc @@ -263,13 +263,13 @@ License: https://github.com/eclipse/eclipse-collections/blob/master/LICENSE-EDL- The following files include code modified from Micrometer project. -./metrics/interface/src/main/java/org/apache/iotdb/metrics/predefined/jvm/JvmClassLoaderMetrics -./metrics/interface/src/main/java/org/apache/iotdb/metrics/predefined/jvm/JvmCompileMetrics -./metrics/interface/src/main/java/org/apache/iotdb/metrics/predefined/jvm/JvmGcMetrics -./metrics/interface/src/main/java/org/apache/iotdb/metrics/predefined/jvm/JvmMemoryMetrics -./metrics/interface/src/main/java/org/apache/iotdb/metrics/predefined/jvm/JvmThreadMetrics -./metrics/interface/src/main/java/org/apache/iotdb/metrics/predefined/logback/LogbackMetrics -./metrics/interface/src/main/java/org/apache/iotdb/metrics/utils/JvmUtils +./iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/predefined/jvm/JvmClassLoaderMetrics +./iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/predefined/jvm/JvmCompileMetrics +./iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/predefined/jvm/JvmGcMetrics +./iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/predefined/jvm/JvmMemoryMetrics +./iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/predefined/jvm/JvmThreadMetrics +./iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/predefined/logback/LogbackMetrics +./iotdb-core/metrics/interface/src/main/java/org/apache/iotdb/metrics/utils/JvmUtils Copyright: 2017 VMware Project page: https://github.com/micrometer-metrics/micrometer @@ -280,10 +280,10 @@ License: https://github.com/micrometer-metrics/micrometer/blob/main/LICENSE The following files include code modified from Trino project(https://github.com/trinodb/trino), which is under Apache License 2.0: -./server/src/main/java/org/apache/iotdb/db/mpp/execution/QueryState.java -./server/src/main/java/org/apache/iotdb/db/mpp/execution/StateMachine.java -./server/src/main/java/org/apache/iotdb/db/mpp/execution/driver/Driver.java -./server/src/main/java/org/apache/iotdb/db/mpp/execution/fragment/FragmentInstanceState.java -./server/src/main/java/org/apache/iotdb/db/mpp/execution/fragment/FragmentInstanceStateMachine.java -./server/src/main/java/org/apache/iotdb/db/mpp/plan/planner/LocalExecutionPlanner.java -./tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/* +./iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/QueryState.java +./iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/StateMachine.java +./iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/driver/Driver.java +./iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceState.java +./iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/execution/fragment/FragmentInstanceStateMachine.java +./iotdb-core/datanode/src/main/java/org/apache/iotdb/db/queryengine/plan/planner/LocalExecutionPlanner.java +./iotdb-core/tsfile/src/main/java/org/apache/iotdb/tsfile/read/common/block/* diff --git a/docs/Development/HowtoContributeCode.md b/docs/Development/HowtoContributeCode.md index bb6a5ae0019..fc2c1e4520c 100644 --- a/docs/Development/HowtoContributeCode.md +++ b/docs/Development/HowtoContributeCode.md @@ -76,7 +76,7 @@ Notes 2.To modify the configuration parameters, the following files need to be modified -a.Configuration file: server/src/assembly/resources/conf/iotdb-datanode.properties +a.Configuration file: iodtb-core/datanode/src/assembly/resources/conf/iotdb-datanode.properties b. Codes: IoTDBDescriptor, IoTDBConfig diff --git a/docs/UserGuide/Operators-Functions/User-Defined-Function.md b/docs/UserGuide/Operators-Functions/User-Defined-Function.md index 3221b296dba..23abab30eaa 100644 --- a/docs/UserGuide/Operators-Functions/User-Defined-Function.md +++ b/docs/UserGuide/Operators-Functions/User-Defined-Function.md @@ -573,8 +573,8 @@ This part mainly introduces how external users can contribute their own UDFs to #### UDF Source Code -1. Create the UDF main class and related classes in `node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin` or in its subfolders. -2. Register your UDF in `node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/BuiltinTimeSeriesGeneratingFunction.java`. +1. Create the UDF main class and related classes in `iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin` or in its subfolders. +2. Register your UDF in `iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/BuiltinTimeSeriesGeneratingFunction.java`. diff --git a/docs/zh/Development/HowtoContributeCode.md b/docs/zh/Development/HowtoContributeCode.md index 296dadacdac..433f91c96f4 100644 --- a/docs/zh/Development/HowtoContributeCode.md +++ b/docs/zh/Development/HowtoContributeCode.md @@ -75,7 +75,7 @@ master 分支作为当前主开发分支，对应下一个未发布的大版本 iotdb-datanode.properties 和 IoTDBConfig 默认值需要保持一致。 如果需要对配置参数进行改动。以下文件需要同时修改： - 1. 配置文件：server/src/assembly/resources/conf/iotdb-datanode.properties + 1. 配置文件：iotdb-core/datanode/src/assembly/resources/conf/iotdb-datanode.properties 2. 代码：IoTDBDescriptor、IoTDBConfig 3. 文档：docs/UserGuide/Reference/DataNode-Config-Manual.md、docs/zh/UserGuide/Reference/DataNode-Config-Manual.md diff --git a/docs/zh/UserGuide/Operators-Functions/User-Defined-Function.md b/docs/zh/UserGuide/Operators-Functions/User-Defined-Function.md index cb106ae09d0..249234e0045 100644 --- a/docs/zh/UserGuide/Operators-Functions/User-Defined-Function.md +++ b/docs/zh/UserGuide/Operators-Functions/User-Defined-Function.md @@ -516,8 +516,8 @@ SHOW FUNCTIONS ##### 源代码 -1. 在`node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin`中创建 UDF 主类和相关的辅助类。 -2. 在`node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/BuiltinTimeSeriesGeneratingFunction.java`中注册您编写的 UDF。 +1. 在`iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin`中创建 UDF 主类和相关的辅助类。 +2. 在`iotdb-core/node-commons/src/main/java/org/apache/iotdb/commons/udf/builtin/BuiltinTimeSeriesGeneratingFunction.java`中注册您编写的 UDF。 ##### 测试用例 diff --git a/integration-test/src/assembly/mpp-test.xml b/integration-test/src/assembly/mpp-test.xml index 9aa28218bea..509c38b745b 100644 --- a/integration-test/src/assembly/mpp-test.xml +++ b/integration-test/src/assembly/mpp-test.xml @@ -28,33 +28,33 @@ <fileSets> <fileSet> <outputDirectory>conf</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/conf</directory> + <directory>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/conf</directory> </fileSet> <fileSet> <outputDirectory>conf</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/confignode/src/assembly/resources/conf</directory> + <directory>${maven.multiModuleProjectDirectory}/iotdb-core/confignode/src/assembly/resources/conf</directory> </fileSet> <fileSet> <outputDirectory>conf</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/node-commons/src/assembly/resources/conf</directory> + <directory>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/conf</directory> </fileSet> <fileSet> <outputDirectory>conf</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/metrics/interface/src/main/assembly/resources/conf</directory> + <directory>${maven.multiModuleProjectDirectory}/iotdb-core/metrics/interface/src/main/assembly/resources/conf</directory> </fileSet> <fileSet> <outputDirectory>sbin</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/sbin</directory> + <directory>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/sbin</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>sbin</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/confignode/src/assembly/resources/sbin</directory> + <directory>${maven.multiModuleProjectDirectory}/iotdb-core/confignode/src/assembly/resources/sbin</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> <outputDirectory>tools</outputDirectory> - <directory>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/tools</directory> + <directory>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/tools</directory> <fileMode>0755</fileMode> </fileSet> <fileSet> @@ -70,7 +70,7 @@ </fileSets> <files> <file> - <source>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/conf/datanode-env.sh</source> + <source>${maven.multiModuleProjectDirectory}/iotdb-core/datanode/src/assembly/resources/conf/datanode-env.sh</source> <destName>conf/datanode-env.sh</destName> <fileMode>0755</fileMode> </file> diff --git a/iotdb-core/confignode/src/assembly/confignode.xml b/iotdb-core/confignode/src/assembly/confignode.xml index 8743b4c7d2a..7e858de63a0 100644 --- a/iotdb-core/confignode/src/assembly/confignode.xml +++ b/iotdb-core/confignode/src/assembly/confignode.xml @@ -44,11 +44,11 @@ </fileSets> <files> <file> - <source>${maven.multiModuleProjectDirectory}/node-commons/src/assembly/resources/conf/iotdb-common.properties</source> + <source>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-common.properties</source> <destName>conf/iotdb-common.properties</destName> </file> <file> - <source>${maven.multiModuleProjectDirectory}/node-commons/src/assembly/resources/sbin/iotdb-common.sh</source> + <source>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/sbin/iotdb-common.sh</source> <destName>sbin/iotdb-common.sh</destName> </file> </files> diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/runtime/PipeHeartbeatParser.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/runtime/PipeHeartbeatParser.java index 5e5564758dc..fabd2bca3e3 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/runtime/PipeHeartbeatParser.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/runtime/PipeHeartbeatParser.java @@ -30,10 +30,11 @@ import org.apache.iotdb.commons.pipe.task.meta.PipeTaskMeta; import org.apache.iotdb.confignode.consensus.response.pipe.task.PipeTableResp; import org.apache.iotdb.confignode.manager.ConfigManager; -import org.jetbrains.annotations.NotNull; import org.slf4j.Logger; import org.slf4j.LoggerFactory; +import javax.validation.constraints.NotNull; + import java.nio.ByteBuffer; import java.util.HashMap; import java.util.List; diff --git a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/runtime/PipeRuntimeCoordinator.java b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/runtime/PipeRuntimeCoordinator.java index 59ed8e5056c..c4ba7aefe25 100644 --- a/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/runtime/PipeRuntimeCoordinator.java +++ b/iotdb-core/confignode/src/main/java/org/apache/iotdb/confignode/manager/pipe/runtime/PipeRuntimeCoordinator.java @@ -26,7 +26,7 @@ import org.apache.iotdb.confignode.manager.load.subscriber.IClusterStatusSubscri import org.apache.iotdb.confignode.manager.load.subscriber.RouteChangeEvent; import org.apache.iotdb.confignode.manager.load.subscriber.StatisticsChangeEvent; -import org.jetbrains.annotations.NotNull; +import javax.validation.constraints.NotNull; import java.nio.ByteBuffer; import java.util.List; diff --git a/iotdb-core/datanode/src/assembly/server.xml b/iotdb-core/datanode/src/assembly/server.xml index 71e885c2853..b1a30259794 100644 --- a/iotdb-core/datanode/src/assembly/server.xml +++ b/iotdb-core/datanode/src/assembly/server.xml @@ -39,24 +39,24 @@ </fileSets> <files> <file> - <source>${maven.multiModuleProjectDirectory}/node-commons/src/assembly/resources/conf/iotdb-common.properties</source> + <source>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/conf/iotdb-common.properties</source> <destName>conf/iotdb-common.properties</destName> </file> <!-- copy iotdb-common.sh to different script folders--> <file> - <source>${maven.multiModuleProjectDirectory}/node-commons/src/assembly/resources/sbin/iotdb-common.sh</source> + <source>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/sbin/iotdb-common.sh</source> <destName>sbin/iotdb-common.sh</destName> </file> <file> - <source>${maven.multiModuleProjectDirectory}/node-commons/src/assembly/resources/sbin/iotdb-common.sh</source> + <source>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/sbin/iotdb-common.sh</source> <destName>tools/iotdb-common.sh</destName> </file> <file> - <source>${maven.multiModuleProjectDirectory}/node-commons/src/assembly/resources/sbin/iotdb-common.sh</source> + <source>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/sbin/iotdb-common.sh</source> <destName>tools/tsfileToolSet/iotdb-common.sh</destName> </file> <file> - <source>${maven.multiModuleProjectDirectory}/node-commons/src/assembly/resources/sbin/iotdb-common.sh</source> + <source>${maven.multiModuleProjectDirectory}/iotdb-core/node-commons/src/assembly/resources/sbin/iotdb-common.sh</source> <destName>tools/schema/iotdb-common.sh</destName> </file> </files>
