Skip to content

Commit 7303758

Browse files
JackieTien97JackieTien97
authored
[IOTDB-5917] Refactor module hierarchy (#9930)
1 parent 1392e03 commit 7303758

File tree

713 files changed

+112
-34291
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

713 files changed

+112
-34291
lines changed

‎.github/workflows/client-cpp.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ jobs:
6565
- name: Build IoTDB server
6666
run: mvn clean package -pl distribution -am -DskipTests
6767
- name: Test with Maven
68-
run: mvn clean verify -pl client-cpp -am -P compile-cpp -P cppTest
68+
run: mvn clean verify -pl iotdb-client/client-cpp -am -P compile-cpp -P cppTest
6969
- name: Show test result
70-
run: cat client-cpp/target/build/test/Testing/Temporary/LastTest_*.log
70+
run: cat iotdb-client/client-cpp/target/build/test/Testing/Temporary/LastTest_*.log
7171

7272
build-win:
7373
strategy:
@@ -110,11 +110,11 @@ jobs:
110110
run: source ~/.bash_profile && mvn clean package -pl distribution -am -DskipTests
111111
- name: Test with Maven
112112
shell: bash
113-
run: source ~/.bash_profile && mvn clean verify -pl client-cpp -am -P compile-cpp -P cppTest -Dboost.include.dir=/c/local/boost_1_78_0 -Dboost.library.dir=/c/local/boost_1_78_0/stage/lib -Dcmake.url="https://github.com/Kitware/CMake/releases/download/v3.21.6/cmake-3.21.6-windows-x86_64.zip" -Dcmake.root.dir=/D/a/iotdb/iotdb/compile-tools/thrift/target/cmake-3.21.6-windows-x86_64/ -Dcmake.generator="Visual Studio 17 2022"
113+
run: source ~/.bash_profile && mvn clean verify -pl iotdb-client/client-cpp -am -P compile-cpp -P cppTest -Dboost.include.dir=/c/local/boost_1_78_0 -Dboost.library.dir=/c/local/boost_1_78_0/stage/lib -Dcmake.url="https://github.com/Kitware/CMake/releases/download/v3.21.6/cmake-3.21.6-windows-x86_64.zip" -Dcmake.root.dir=/D/a/iotdb/iotdb/iotdb-client/compile-tools/thrift/target/cmake-3.21.6-windows-x86_64/ -Dcmake.generator="Visual Studio 17 2022"
114114
- name: Upload Artifact
115115
if: failure()
116116
uses: actions/upload-artifact@v3
117117
with:
118118
name: cpp-IT-${{ runner.os }}
119-
path: client-cpp/target/build/test/Testing
119+
path: iotdb-client/client-cpp/target/build/test/Testing
120120
retention-days: 1

‎.github/workflows/client-go.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,4 +52,4 @@ jobs:
5252
- name: Integration test
5353
shell: bash
5454
run: |
55-
cd client-go && make e2e_test_for_parent_git_repo e2e_test_clean_for_parent_git_repo
55+
cd iotdb-client/client-go/ && make e2e_test_for_parent_git_repo e2e_test_clean_for_parent_git_repo

‎.github/workflows/client-python.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -45,14 +45,14 @@ jobs:
4545
key: ${{ runner.os }}-m2-${{ hashFiles('**/pom.xml') }}
4646
restore-keys: ${{ runner.os }}-m2-
4747
- name: Build IoTDB server distribution zip and python client
48-
run: mvn -B clean install -pl distribution,client-py -am -DskipTests
48+
run: mvn -B clean install -pl distribution,iotdb-client/client-py -am -DskipTests
4949
- name: Build IoTDB server docker image
5050
run: |
5151
docker build . -f docker/src/main/Dockerfile-1c1d -t "iotdb:dev"
5252
docker images
5353
- name: Install IoTDB python client requirements
54-
run: pip3 install -r client-py/requirements_dev.txt
54+
run: pip3 install -r iotdb-client/client-py/requirements_dev.txt
5555
- name: Integration test
5656
shell: bash
5757
run: |
58-
cd client-py && pytest .
58+
cd iotdb-client/client-py/ && pytest .

‎.github/workflows/grafana-plugin.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -55,11 +55,11 @@ jobs:
5555
5656
- name: Install dependencies and Build and test frontend
5757
run: |
58-
cd ./grafana-plugin
58+
cd iotdb-connector/grafana-plugin/
5959
yarn install --frozen-lockfile
6060
yarn build
6161
6262
- name: Install dependencies and Build backend
6363
run: |
64-
cd ./grafana-plugin
64+
cd iotdb-connector/grafana-plugin/
6565
./backend-compile.sh

‎.github/workflows/influxdb-protocol.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,4 +64,4 @@ jobs:
6464
- name: IT Test
6565
shell: bash
6666
run: |
67-
cd influxdb-protocol && mvn -B clean compile post-integration-test -Dtest.port.closed=true -Dinfluxdb.test.skip=false
67+
cd iotdb-connector/influxdb-protocol && mvn -B clean compile post-integration-test -Dtest.port.closed=true -Dinfluxdb.test.skip=false

‎.gitignore

+9
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,15 @@ src/main/resources/metadata/mlog.txt
3838
tsfile-jdbc/src/main/resources/output/queryRes.csv
3939

4040
*.txt
41+
!iotdb-client/client-py/requirements.txt
42+
!iotdb-client/client-py/requirements_dev.txt
43+
!iotdb-client/client-cpp/src/main/CMakeLists.txt
44+
!iotdb-client/client-cpp/src/test/CMakeLists.txt
45+
!example/rest-client-c-example/CMakeLists.txt
46+
!example/client-cpp-example/src/CMakeLists.txt
47+
!mlnode/requirements.txt
48+
!mlnode/requirements_dev.txt
49+
4150

4251
*.jar
4352
!trigger-example.jar

‎.gitmodules

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
[submodule "client-go"]
2-
path = client-go
3-
url = https://github.com/apache/iotdb-client-go.git
1+
[submodule "iotdb-client/client-go"]
2+
path = iotdb-client/client-go
3+
url = https://github.com/apache/iotdb-client-go

‎client-go

-1
This file was deleted.

‎distribution/src/assembly/all.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -80,12 +80,12 @@
8080
</fileSet>
8181
<fileSet>
8282
<outputDirectory>sbin</outputDirectory>
83-
<directory>${maven.multiModuleProjectDirectory}/cli/src/assembly/resources/sbin</directory>
83+
<directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/sbin</directory>
8484
<fileMode>0755</fileMode>
8585
</fileSet>
8686
<fileSet>
8787
<outputDirectory>tools</outputDirectory>
88-
<directory>${maven.multiModuleProjectDirectory}/cli/src/assembly/resources/tools</directory>
88+
<directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/tools</directory>
8989
<fileMode>0755</fileMode>
9090
</fileSet>
9191
<!-- <fileSet>-->

‎distribution/src/assembly/cli.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,12 @@
3939
<fileSets>
4040
<fileSet>
4141
<outputDirectory>sbin</outputDirectory>
42-
<directory>${maven.multiModuleProjectDirectory}/cli/src/assembly/resources/sbin</directory>
42+
<directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/sbin</directory>
4343
<fileMode>0755</fileMode>
4444
</fileSet>
4545
<fileSet>
4646
<outputDirectory>tools</outputDirectory>
47-
<directory>${maven.multiModuleProjectDirectory}/cli/src/assembly/resources/tools</directory>
47+
<directory>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/tools</directory>
4848
<fileMode>0755</fileMode>
4949
</fileSet>
5050
</fileSets>

‎distribution/src/assembly/client-cpp.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<baseDirectory>apache-iotdb-${project.version}-client-cpp-bin</baseDirectory>
2929
<fileSets>
3030
<fileSet>
31-
<directory>${maven.multiModuleProjectDirectory}/client-cpp/target/client-cpp-${project.version}-cpp-${os.classifier}</directory>
31+
<directory>${maven.multiModuleProjectDirectory}/iotdb-client/client-cpp/target/client-cpp-${project.version}-cpp-${os.classifier}</directory>
3232
<outputDirectory>${file.separator}</outputDirectory>
3333
</fileSet>
3434
</fileSets>

‎distribution/src/assembly/grafana-connector.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
</dependencySets>
3939
<files>
4040
<file>
41-
<source>${maven.multiModuleProjectDirectory}/grafana-connector/src/main/resources/application.properties</source>
41+
<source>${maven.multiModuleProjectDirectory}/iotdb-connector/grafana-connector/src/main/resources/application.properties</source>
4242
<destName>application.properties</destName>
4343
</file>
4444
</files>

‎distribution/src/assembly/grafana-plugin.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
<baseDirectory>apache-iotdb-${project.version}-grafana-plugin-bin</baseDirectory>
2929
<fileSets>
3030
<fileSet>
31-
<directory>${maven.multiModuleProjectDirectory}/grafana-plugin/dist</directory>
31+
<directory>${maven.multiModuleProjectDirectory}/iotdb-connector/grafana-plugin/dist</directory>
3232
<outputDirectory>iotdb-grafana-plugin/${file.separator}</outputDirectory>
3333
</fileSet>
3434
</fileSets>

‎distribution/src/assembly/spark-connector.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@
2828
<baseDirectory>apache-iotdb-${project.version}-spark-connector-bin</baseDirectory>
2929
<fileSets>
3030
<fileSet>
31-
<directory>${maven.multiModuleProjectDirectory}/spark-iotdb-connector/scala_2.11/target/</directory>
31+
<directory>${maven.multiModuleProjectDirectory}/iotdb-connector/spark-iotdb-connector/scala_2.11/target/</directory>
3232
<outputDirectory>${file.separator}</outputDirectory>
3333
<includes>
3434
<include>*jar-with-dependencies.jar</include>
3535
</includes>
3636
</fileSet>
3737
<fileSet>
38-
<directory>${maven.multiModuleProjectDirectory}/spark-iotdb-connector/scala_2.12/target/</directory>
38+
<directory>${maven.multiModuleProjectDirectory}/iotdb-connector/spark-iotdb-connector/scala_2.12/target/</directory>
3939
<outputDirectory>${file.separator}</outputDirectory>
4040
<includes>
4141
<include>*jar-with-dependencies.jar</include>

‎docker/src/main/DockerCompose/start-1c1d.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,5 +18,5 @@
1818
# under the License.
1919
#
2020
nohup /iotdb/sbin/start-confignode.sh > /dev/null 2>&1 &
21-
sleep 5
21+
sleep 10
2222
/iotdb/sbin/start-datanode.sh

0 commit comments

Comments
 (0)