Skip to content

Commit c9453ab

Browse files
CritasWangCritasWang
authored
pref: Adjustments to sbin and tools Scripts (#15402)
* pref: Adjustments to sbin and tools Scripts 1. Script Central Management: Migrate scripts scattered across different projects to the scripts/sbin and scripts/tools directories under the root directory. 2. Script Functional Classification: Categorize and move scripts to different files or subdirectories based on their functionality. For frequently used scripts, their current locations will be preserved to minimize the impact on existing workflows. 3. Create a Windows subfolder under the sbin directory (sbin, sbin/windows). * fix some error * fix please check tips * fix integration-test build * fix schema it * restore ainode version
1 parent 665e18f commit c9453ab

92 files changed

Lines changed: 556 additions & 339 deletions

File tree

Some content is hidden

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

‎distribution/src/assembly/ainode.xml‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,17 @@
3434
<fileSet>
3535
<directory>${project.basedir}/../iotdb-core/ainode/target/apache-iotdb-ainode-${project.version}/apache-iotdb-ainode-${project.version}/sbin</directory>
3636
<outputDirectory>${file.separator}/sbin</outputDirectory>
37+
<fileMode>0755</fileMode>
3738
</fileSet>
3839
<fileSet>
3940
<directory>${project.basedir}/../iotdb-core/ainode/target/apache-iotdb-ainode-${project.version}/apache-iotdb-ainode-${project.version}/lib</directory>
4041
<outputDirectory>${file.separator}/lib</outputDirectory>
4142
</fileSet>
43+
<fileSet>
44+
<directory>${project.basedir}/../iotdb-core/ainode/target/apache-iotdb-ainode-${project.version}/apache-iotdb-ainode-${project.version}/tools</directory>
45+
<outputDirectory>${file.separator}/tools</outputDirectory>
46+
<fileMode>0755</fileMode>
47+
</fileSet>
4248
</fileSets>
4349
<componentDescriptors>
4450
<componentDescriptor>common-files.xml</componentDescriptor>

‎distribution/src/assembly/all.xml‎

Lines changed: 16 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -59,43 +59,32 @@
5959
<directory>${project.basedir}/../iotdb-core/node-commons/src/assembly/resources/conf</directory>
6060
</fileSet>
6161
<fileSet>
62-
<outputDirectory>sbin</outputDirectory>
63-
<directory>${project.basedir}/../iotdb-core/datanode/src/assembly/resources/sbin</directory>
64-
<fileMode>0755</fileMode>
65-
</fileSet>
66-
<fileSet>
67-
<outputDirectory>sbin</outputDirectory>
68-
<directory>${project.basedir}/../iotdb-core/confignode/src/assembly/resources/sbin</directory>
69-
<fileMode>0755</fileMode>
70-
</fileSet>
71-
<fileSet>
72-
<outputDirectory>sbin</outputDirectory>
73-
<directory>${project.basedir}/../iotdb-core/node-commons/src/assembly/resources/sbin</directory>
74-
<fileMode>0755</fileMode>
75-
</fileSet>
76-
<fileSet>
77-
<outputDirectory>tools</outputDirectory>
78-
<directory>${project.basedir}/../iotdb-core/datanode/src/assembly/resources/tools</directory>
62+
<outputDirectory>conf</outputDirectory>
63+
<directory>${project.basedir}/../scripts/conf</directory>
64+
<excludes>
65+
<exclude>ainode-env.*</exclude>
66+
<exclude>**/ainode-env.*</exclude>
67+
</excludes>
7968
<fileMode>0755</fileMode>
8069
</fileSet>
8170
<fileSet>
8271
<outputDirectory>sbin</outputDirectory>
83-
<directory>${project.basedir}/../iotdb-client/cli/src/assembly/resources/sbin</directory>
72+
<directory>${project.basedir}/../scripts/sbin</directory>
73+
<excludes>
74+
<exclude>*ainode.*</exclude>
75+
<exclude>**/*ainode.*</exclude>
76+
</excludes>
8477
<fileMode>0755</fileMode>
8578
</fileSet>
8679
<fileSet>
8780
<outputDirectory>tools</outputDirectory>
88-
<directory>${project.basedir}/../iotdb-client/cli/src/assembly/resources/tools</directory>
81+
<directory>${project.basedir}/../scripts/tools</directory>
82+
<excludes>
83+
<exclude>*ainode.*</exclude>
84+
<exclude>**/*ainode.*</exclude>
85+
</excludes>
8986
<fileMode>0755</fileMode>
9087
</fileSet>
91-
<!-- <fileSet>-->
92-
<!-- <outputDirectory>datanode</outputDirectory>-->
93-
<!-- <directory>${project.basedir}/../distribution/target/apache-iotdb-${project.version}-all-bin/apache-iotdb-${project.version}-all-bin/datanode</directory>-->
94-
<!-- </fileSet>-->
95-
<!-- <fileSet>-->
96-
<!-- <outputDirectory>confignode</outputDirectory>-->
97-
<!-- <directory>${project.basedir}/../distribution/target/apache-iotdb-${project.version}-all-bin/apache-iotdb-${project.version}-all-bin/confignode</directory>-->
98-
<!-- </fileSet>-->
9988
</fileSets>
10089
<files>
10190
<file>
@@ -104,13 +93,6 @@
10493
<fileMode>0755</fileMode>
10594
</file>
10695
</files>
107-
<!-- <files>-->
108-
<!-- <file>-->
109-
<!-- <source>${project.basedir}/../server/src/assembly/resources/conf/datanode-env.sh</source>-->
110-
<!-- <destName>datanode/conf/datanode-env.sh</destName>-->
111-
<!-- <fileMode>0755</fileMode>-->
112-
<!-- </file>-->
113-
<!-- </files>-->
11496
<componentDescriptors>
11597
<componentDescriptor>common-files.xml</componentDescriptor>
11698
</componentDescriptors>

‎distribution/src/assembly/cli.xml‎

Lines changed: 15 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,26 @@
3838
</dependencySets>
3939
<fileSets>
4040
<fileSet>
41+
<directory>${project.basedir}/../scripts/sbin</directory>
4142
<outputDirectory>sbin</outputDirectory>
42-
<directory>${project.basedir}/../iotdb-client/cli/src/assembly/resources/sbin</directory>
43+
<includes>
44+
<include>*cli.*</include>
45+
<include>**/*cli.*</include>
46+
<include>**/*cli-table.*</include>
47+
</includes>
4348
<fileMode>0755</fileMode>
4449
</fileSet>
4550
<fileSet>
51+
<directory>${project.basedir}/../scripts/tools</directory>
4652
<outputDirectory>tools</outputDirectory>
47-
<directory>${project.basedir}/../iotdb-client/cli/src/assembly/resources/tools</directory>
53+
<includes>
54+
<include>*data.*</include>
55+
<include>*schema.*</include>
56+
<include>*tsfile.*</include>
57+
<include>**/*data.*</include>
58+
<include>**/*schema.*</include>
59+
<include>**/*tsfile.*</include>
60+
</includes>
4861
<fileMode>0755</fileMode>
4962
</fileSet>
5063
</fileSets>

‎distribution/src/assembly/confignode.xml‎

Lines changed: 27 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -38,28 +38,41 @@
3838
</dependencySets>
3939
<fileSets>
4040
<fileSet>
41-
<directory>${project.basedir}/../iotdb-core/confignode/src/assembly/resources/sbin</directory>
42-
<outputDirectory>sbin</outputDirectory>
43-
<fileMode>0755</fileMode>
41+
<directory>${project.basedir}/../iotdb-core/confignode/src/assembly/resources/conf</directory>
42+
<outputDirectory>conf</outputDirectory>
4443
</fileSet>
4544
<fileSet>
46-
<outputDirectory>sbin</outputDirectory>
47-
<directory>${project.basedir}/../iotdb-core/node-commons/src/assembly/resources/sbin</directory>
48-
<fileMode>0755</fileMode>
45+
<outputDirectory>conf</outputDirectory>
46+
<directory>${project.basedir}/../iotdb-core/node-commons/src/assembly/resources/conf</directory>
4947
</fileSet>
5048
<fileSet>
51-
<directory>${project.basedir}/../iotdb-core/confignode/src/assembly/resources/conf</directory>
49+
<directory>${project.basedir}/../scripts/conf</directory>
5250
<outputDirectory>conf</outputDirectory>
51+
<includes>
52+
<include>iotdb-common.*</include>
53+
<include>confignode-env.*</include>
54+
<include>**/confignode-env.*</include>
55+
</includes>
56+
<fileMode>0755</fileMode>
5357
</fileSet>
5458
<fileSet>
55-
<outputDirectory>conf</outputDirectory>
56-
<directory>${project.basedir}/../iotdb-core/node-commons/src/assembly/resources/conf</directory>
59+
<directory>${project.basedir}/../scripts/sbin</directory>
60+
<outputDirectory>sbin</outputDirectory>
61+
<includes>
62+
<include>*confignode.*</include>
63+
<include>**/*confignode.*</include>
64+
</includes>
65+
<fileMode>0755</fileMode>
66+
</fileSet>
67+
<fileSet>
68+
<directory>${project.basedir}/../scripts/tools</directory>
69+
<outputDirectory>tools</outputDirectory>
70+
<includes>
71+
<include>*confignode.*</include>
72+
<include>**/*confignode.*</include>
73+
</includes>
74+
<fileMode>0755</fileMode>
5775
</fileSet>
58-
<!-- <fileSet>-->
59-
<!-- <directory>${project.basedir}/../confignode/src/assembly/resources/tools</directory>-->
60-
<!-- <outputDirectory>tools</outputDirectory>-->
61-
<!-- <fileMode>0755</fileMode>-->
62-
<!-- </fileSet>-->
6376
</fileSets>
6477
<componentDescriptors>
6578
<componentDescriptor>common-files.xml</componentDescriptor>

‎distribution/src/assembly/datanode.xml‎

Lines changed: 20 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -38,47 +38,42 @@
3838
</dependencySet>
3939
</dependencySets>
4040
<fileSets>
41-
<!-- <fileSet>-->
42-
<!-- <outputDirectory>conf</outputDirectory>-->
43-
<!-- <directory>${project.basedir}/../server/src/assembly/resources/conf</directory>-->
44-
<!-- </fileSet>-->
4541
<fileSet>
4642
<outputDirectory>conf</outputDirectory>
4743
<directory>${project.basedir}/../iotdb-core/node-commons/src/assembly/resources/conf</directory>
4844
</fileSet>
4945
<fileSet>
50-
<outputDirectory>sbin</outputDirectory>
51-
<directory>${project.basedir}/../iotdb-core/datanode/src/assembly/resources/sbin</directory>
52-
<fileMode>0755</fileMode>
53-
</fileSet>
54-
<fileSet>
55-
<outputDirectory>sbin</outputDirectory>
56-
<directory>${project.basedir}/../iotdb-core/node-commons/src/assembly/resources/sbin</directory>
57-
<fileMode>0755</fileMode>
58-
</fileSet>
59-
<fileSet>
60-
<outputDirectory>tools</outputDirectory>
61-
<directory>${project.basedir}/../iotdb-core/datanode/src/assembly/resources/tools</directory>
46+
<directory>${project.basedir}/../scripts/conf</directory>
47+
<outputDirectory>conf</outputDirectory>
48+
<includes>
49+
<include>datanode-env.*</include>
50+
<include>**/datanode-env.*</include>
51+
</includes>
6252
<fileMode>0755</fileMode>
6353
</fileSet>
6454
<fileSet>
55+
<directory>${project.basedir}/../scripts/sbin</directory>
6556
<outputDirectory>sbin</outputDirectory>
66-
<directory>${project.basedir}/../iotdb-client/cli/src/assembly/resources/sbin</directory>
57+
<includes>
58+
<include>*datanode.*</include>
59+
<include>**/*datanode.*</include>
60+
<include>*cli.*</include>
61+
<include>**/*cli.*</include>
62+
<include>**/*cli-table.*</include>
63+
</includes>
6764
<fileMode>0755</fileMode>
6865
</fileSet>
6966
<fileSet>
67+
<directory>${project.basedir}/../scripts/tools</directory>
7068
<outputDirectory>tools</outputDirectory>
71-
<directory>${project.basedir}/../iotdb-client/cli/src/assembly/resources/tools</directory>
69+
<excludes>
70+
<exclude>**/*confignode.*</exclude>
71+
<exclude>**/*all.*</exclude>
72+
<exclude>**/*ainode.*</exclude>
73+
</excludes>
7274
<fileMode>0755</fileMode>
7375
</fileSet>
7476
</fileSets>
75-
<files>
76-
<file>
77-
<source>${project.basedir}/../iotdb-core/datanode/src/assembly/resources/conf/datanode-env.sh</source>
78-
<destName>conf/datanode-env.sh</destName>
79-
<fileMode>0755</fileMode>
80-
</file>
81-
</files>
8277
<componentDescriptors>
8378
<componentDescriptor>common-files.xml</componentDescriptor>
8479
</componentDescriptors>

‎integration-test/src/assembly/mpp-test.xml‎

Lines changed: 5 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -47,51 +47,29 @@
4747
<directory>${project.basedir}/../iotdb-core/ainode/resources/conf</directory>
4848
</fileSet>
4949
<fileSet>
50-
<outputDirectory>sbin</outputDirectory>
51-
<directory>${project.basedir}/../iotdb-core/datanode/src/assembly/resources/sbin</directory>
50+
<outputDirectory>conf</outputDirectory>
51+
<directory>${project.basedir}/../scripts/conf</directory>
5252
<fileMode>0755</fileMode>
5353
</fileSet>
5454
<fileSet>
5555
<outputDirectory>sbin</outputDirectory>
56-
<directory>${project.basedir}/../iotdb-core/confignode/src/assembly/resources/sbin</directory>
56+
<directory>${project.basedir}/../scripts/sbin</directory>
5757
<fileMode>0755</fileMode>
5858
</fileSet>
5959
<fileSet>
60-
<outputDirectory>sbin</outputDirectory>
61-
<directory>${project.basedir}/../iotdb-core/ainode/resources/sbin</directory>
60+
<outputDirectory>tools</outputDirectory>
61+
<directory>${project.basedir}/../scripts/tools</directory>
6262
<fileMode>0755</fileMode>
6363
</fileSet>
6464
<fileSet>
6565
<outputDirectory>venv</outputDirectory>
6666
<directory>${project.basedir}/../iotdb-core/ainode/venv</directory>
6767
<fileMode>0755</fileMode>
6868
</fileSet>
69-
<fileSet>
70-
<outputDirectory>tools</outputDirectory>
71-
<directory>${project.basedir}/../iotdb-core/datanode/src/assembly/resources/tools</directory>
72-
<fileMode>0755</fileMode>
73-
</fileSet>
74-
<fileSet>
75-
<outputDirectory>sbin</outputDirectory>
76-
<directory>${project.basedir}/../iotdb-client/cli/src/assembly/resources/sbin</directory>
77-
<fileMode>0755</fileMode>
78-
</fileSet>
79-
<fileSet>
80-
<outputDirectory>tools</outputDirectory>
81-
<directory>${project.basedir}/../iotdb-client/cli/src/assembly/resources/tools</directory>
82-
<fileMode>0755</fileMode>
83-
</fileSet>
8469
<fileSet>
8570
<outputDirectory>lib</outputDirectory>
8671
<directory>${project.basedir}/../iotdb-core/ainode/dist/</directory>
8772
<fileMode>0755</fileMode>
8873
</fileSet>
8974
</fileSets>
90-
<files>
91-
<file>
92-
<source>${project.basedir}/../iotdb-core/datanode/src/assembly/resources/conf/datanode-env.sh</source>
93-
<destName>conf/datanode-env.sh</destName>
94-
<fileMode>0755</fileMode>
95-
</file>
96-
</files>
9775
</assembly>

‎integration-test/src/test/java/org/apache/iotdb/cli/it/StartClientScriptIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ protected void testOnWindows() throws IOException {
8383
new ProcessBuilder(
8484
"cmd.exe",
8585
"/c",
86-
sbinPath + File.separator + "start-cli.bat",
86+
sbinPath + File.separator + "windows" + File.separator + "start-cli.bat",
8787
"-h",
8888
ip,
8989
"-p",
@@ -103,7 +103,7 @@ protected void testOnWindows() throws IOException {
103103
new ProcessBuilder(
104104
"cmd.exe",
105105
"/c",
106-
sbinPath + File.separator + "start-cli.bat",
106+
sbinPath + File.separator + "windows" + File.separator + "start-cli.bat",
107107
"-h",
108108
ip,
109109
"-p",

‎integration-test/src/test/java/org/apache/iotdb/tools/it/ExportDataTestIT.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ protected void testOnWindows() throws IOException {
8181
new ProcessBuilder(
8282
"cmd.exe",
8383
"/c",
84-
toolsPath + File.separator + "export-data.bat",
84+
toolsPath + File.separator + "windows" + File.separator + "export-data.bat",
8585
"-h",
8686
ip,
8787
"-p",
@@ -109,7 +109,7 @@ protected void testOnWindows() throws IOException {
109109
new ProcessBuilder(
110110
"cmd.exe",
111111
"/c",
112-
toolsPath + File.separator + "export-data.bat",
112+
toolsPath + File.separator + "windows" + File.separator + "export-data.bat",
113113
"-h",
114114
ip,
115115
"-p",
@@ -137,7 +137,7 @@ protected void testOnWindows() throws IOException {
137137
new ProcessBuilder(
138138
"cmd.exe",
139139
"/c",
140-
toolsPath + File.separator + "export-data.bat",
140+
toolsPath + File.separator + "windows" + File.separator + "export-data.bat",
141141
"-h",
142142
ip,
143143
"-p",

‎integration-test/src/test/java/org/apache/iotdb/tools/it/ExportSchemaTestIT.java‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,13 @@ protected void testOnWindows() throws IOException {
8787
new ProcessBuilder(
8888
"cmd.exe",
8989
"/c",
90-
toolsPath + File.separator + "export-schema.bat",
90+
toolsPath
91+
+ File.separator
92+
+ "windows"
93+
+ File.separator
94+
+ "schema"
95+
+ File.separator
96+
+ "export-schema.bat",
9197
"-h",
9298
ip,
9399
"-p",
@@ -114,7 +120,7 @@ protected void testOnUnix() throws IOException {
114120
ProcessBuilder builder =
115121
new ProcessBuilder(
116122
"bash",
117-
toolsPath + File.separator + "export-schema.sh",
123+
toolsPath + File.separator + "schema" + File.separator + "export-schema.sh",
118124
"-h",
119125
ip,
120126
"-p",

‎integration-test/src/test/java/org/apache/iotdb/tools/it/ExportTsFileTestIT.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ protected void testOnWindows() throws IOException {
8181
new ProcessBuilder(
8282
"cmd.exe",
8383
"/c",
84-
toolsPath + File.separator + "export-tsfile.bat",
84+
toolsPath + File.separator + "windows" + File.separator + "export-tsfile.bat",
8585
"-h",
8686
ip,
8787
"-p",
@@ -105,7 +105,7 @@ protected void testOnWindows() throws IOException {
105105
new ProcessBuilder(
106106
"cmd.exe",
107107
"/c",
108-
toolsPath + File.separator + "export-tsfile.bat",
108+
toolsPath + File.separator + "windows" + File.separator + "export-tsfile.bat",
109109
"-h",
110110
ip,
111111
"-p",

0 commit comments

Comments
 (0)