Merge branch 'master' into feature/leader-write

apache · May 22, 2024 · 3968c40 · 3968c40
2 parents 9a4bca0 + f1d8fce
commit 3968c40
Show file tree

Hide file tree

Showing 979 changed files with 20,958 additions and 43,099 deletions.
diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
@@ -2,3 +2,4 @@
 # To use it by default in git blame:
 # git config blame.ignoreRevsFile .git-blame-ignore-revs
 70fc76de8b5a032269b2d4f10b956d045b0e95ec
+352269f3ded6f27374b8bf77f155d1369b7513fb
diff --git a/.github/workflows/client-cpp.yml b/.github/workflows/client-cpp.yml
@@ -45,15 +45,14 @@ jobs:
         if: matrix.os == 'ubuntu-latest'
         shell: bash
         run: sudo apt-get update && sudo apt-get install libboost-all-dev
-      - name: Install CPP Dependencies (Mac)`
+      - name: Install CPP Dependencies (Mac)
         if: matrix.os == 'macos-latest'
         shell: bash
         run: |
           brew install boost
           brew install bison
-          echo 'export PATH="/usr/local/opt/bison/bin:$PATH"' >> ~/.bash_profile
-          source ~/.bash_profile && export LDFLAGS="-L/usr/local/opt/bison/lib"
-          brew install openssl
+          echo 'export PATH="/opt/homebrew/opt/bison/bin:$PATH"' >> ~/.bash_profile
+          source ~/.bash_profile && export LDFLAGS="-L/opt/homebrew/opt/bison/lib"
       - name: Cache Maven packages
         uses: actions/cache@v4
         with:

diff --git a/.github/workflows/grafana-plugin.yml b/.github/workflows/grafana-plugin.yml
diff --git a/.gitignore b/.gitignore
@@ -60,11 +60,7 @@ tsfile-jdbc/src/main/resources/output/queryRes.csv
 ### CSV ###
 *.csv
 ### Maven ###
-grafana/target/
-!grafana/.mvn/wrapper/maven-wrapper.jar
-grafana/.mvn/
 
-grafana/logs/
 *.log
 
 
@@ -83,13 +79,10 @@ grafana/logs/
 **/dist/
 **/nbdist/
 **/.nb-gradle/
-grafana/data/
 
 ### vscode project
 **/.vscode/
 
-
-grafana/data/test.csv
 **/lib/
 /target/
 *.tsfile

diff --git a/Jenkinsfile b/Jenkinsfile
@@ -169,7 +169,7 @@ pipeline {
             steps {
                 echo 'Deploying'
                 // Deploy the artifacts using the wagon-maven-plugin.
-                sh 'mvn -f jenkins.pom -X -P deploy-snapshots wagon:upload -P get-jar-with-dependencies'
+                sh 'until mvn -f jenkins.pom -X -P deploy-snapshots wagon:upload || (( count++ >= 5 )); do echo "Retrying to deploy"; done'
             }
         }
 

diff --git a/README.md b/README.md
@@ -496,7 +496,7 @@ The server can be stopped with "ctrl-C" or the following script:
 
 # The use of CSV Import and Export Tool
 
-see [The use of CSV Import and Export Tool](https://iotdb.apache.org/UserGuide/Master/Maintenance-Tools/CSV-Tool.html)
+see [The use of CSV Import and Export Tool](https://iotdb.apache.org/UserGuide/latest/Tools-System/Import-Export-Tool.html)
 
 # Frequent Questions for Compiling
 see [Frequent Questions when Compiling the Source Code](https://iotdb.apache.org/Development/ContributeGuide.html#_Frequent-Questions-when-Compiling-the-Source-Code)

diff --git a/README_ZH.md b/README_ZH.md
@@ -378,10 +378,10 @@ server 可以使用 "ctrl-C" 或者执行下面的脚本:
 
 # 导入导出CSV工具
 
-查看 [导入导出CSV工具](https://iotdb.apache.org/zh/UserGuide/Master/Maintenance-Tools/CSV-Tool.html)
+查看 [导入导出CSV工具](https://iotdb.apache.org/zh/UserGuide/latest/Tools-System/Import-Export-Tool.html)
 
 # 常见编译错误
-查看 [常见编译错误](https://iotdb.apache.org/zh/Development/ContributeGuide.html#%E5%B8%B8%E8%A7%81%E7%BC%96%E8%AF%91%E9%94%99%E8%AF%AF)
+查看 [常见编译错误](https://iotdb.apache.org/zh/Community/Development-Guide.html)
 
 # 联系我们
 ### QQ群

diff --git a/codecov.yml b/codecov.yml
@@ -35,7 +35,6 @@ ignore:
   #  - "*/interface/thrift/**/*.java"  # ignore thrift-gen folders and all its contents
   - "**/generated-classes/**/*.java"
   - "**/generated-sources/**/*.java"
-  - "grafana/**/*.java"
   - "spark/**/*.java"
   - "hadoop/**/*.java"
   - "**/pom.xml"

diff --git a/distribution/pom.xml b/distribution/pom.xml
@@ -53,16 +53,6 @@
             <artifactId>library-udf</artifactId>
             <version>1.3.2-SNAPSHOT</version>
         </dependency>
-        <dependency>
-            <groupId>org.apache.iotdb</groupId>
-            <artifactId>spark-iotdb-connector_2.11</artifactId>
-            <version>1.3.2-SNAPSHOT</version>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.iotdb</groupId>
-            <artifactId>spark-iotdb-connector_2.12</artifactId>
-            <version>1.3.2-SNAPSHOT</version>
-        </dependency>
     </dependencies>
     <build>
         <plugins>
@@ -84,8 +74,6 @@
                                 <descriptor>src/assembly/confignode.xml</descriptor>
                                 <descriptor>src/assembly/cli.xml</descriptor>
                                 <descriptor>src/assembly/library-udf.xml</descriptor>
-                                <descriptor>src/assembly/spark-connector.xml</descriptor>
-                                <descriptor>src/assembly/flink-sql-connector.xml</descriptor>
                             </descriptors>
                             <finalName>apache-iotdb-${project.version}</finalName>
                         </configuration>
@@ -119,80 +107,18 @@
                                         <include>apache-iotdb-${project.version}-cli-bin.zip</include>
                                         <include>apache-iotdb-${project.version}-confignode-bin.zip</include>
                                         <include>apache-iotdb-${project.version}-library-udf-bin.zip</include>
-                                        <include>apache-iotdb-${project.version}-spark-connector-bin.zip</include>
-                                        <include>apache-iotdb-${project.version}-flink-sql-connector-bin.zip</include>
                                     </includes>
                                 </fileSet>
                             </fileSets>
                         </configuration>
                     </execution>
                 </executions>
             </plugin>
-            <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-enforcer-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <id>enforce-ban-duplicate-classes</id>
-                        <configuration combine.children="append">
-                            <rules>
-                                <banDuplicateClasses>
-                                    <ignoreClasses>
-                                        <!-- We've got dependencies to both the scala 2.11 and 2.12 versions -->
-                                        <ignoreClass>org.apache.iotdb.spark.db.*</ignoreClass>
-                                    </ignoreClasses>
-                                </banDuplicateClasses>
-                            </rules>
-                            <fail>true</fail>
-                        </configuration>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
     <profiles>
         <profile>
             <id>with-cpp</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.iotdb</groupId>
-                    <artifactId>iotdb-server</artifactId>
-                    <version>${project.version}</version>
-                    <type>zip</type>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.iotdb</groupId>
-                    <artifactId>iotdb-cli</artifactId>
-                    <version>${project.version}</version>
-                    <type>zip</type>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.iotdb</groupId>
-                    <artifactId>iotdb-confignode</artifactId>
-                    <version>${project.version}</version>
-                    <type>zip</type>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.iotdb</groupId>
-                    <artifactId>library-udf</artifactId>
-                    <version>${project.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.iotdb</groupId>
-                    <artifactId>spark-iotdb-connector_2.11</artifactId>
-                    <version>${project.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.iotdb</groupId>
-                    <artifactId>spark-iotdb-connector_2.12</artifactId>
-                    <version>${project.version}</version>
-                </dependency>
-                <dependency>
-                    <groupId>org.apache.iotdb</groupId>
-                    <artifactId>flink-sql-iotdb-connector</artifactId>
-                    <version>${project.version}</version>
-                </dependency>
-            </dependencies>
             <build>
                 <plugins>
                     <plugin>
@@ -242,64 +168,5 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>with-grafana-plugin</id>
-            <dependencies>
-                <dependency>
-                    <groupId>org.apache.iotdb</groupId>
-                    <artifactId>iotdb-grafana-plugin</artifactId>
-                    <version>${project.version}</version>
-                    <type>pom</type>
-                </dependency>
-            </dependencies>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-assembly-plugin</artifactId>
-                        <executions>
-                            <!-- Package binaries-->
-                            <execution>
-                                <id>all-bin</id>
-                                <goals>
-                                    <goal>single</goal>
-                                </goals>
-                                <phase>package</phase>
-                                <configuration>
-                                    <descriptors combine.children="append">
-                                        <descriptor>src/assembly/grafana-plugin.xml</descriptor>
-                                    </descriptors>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                    <!--
-                      Create SHA512 checksum files for the release artifacts.
-                    -->
-                    <plugin>
-                        <groupId>net.nicoulaj.maven.plugins</groupId>
-                        <artifactId>checksum-maven-plugin</artifactId>
-                        <executions>
-                            <execution>
-                                <id>sign-source-release</id>
-                                <goals>
-                                    <goal>files</goal>
-                                </goals>
-                                <phase>package</phase>
-                                <configuration>
-                                    <fileSets>
-                                        <fileSet>
-                                            <includes combine.children="append">
-                                                <include>apache-iotdb-${project.version}-grafana-plugin-bin.zip</include>
-                                            </includes>
-                                        </fileSet>
-                                    </fileSets>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 </project>
diff --git a/distribution/src/assembly/all.xml b/distribution/src/assembly/all.xml
@@ -97,6 +97,13 @@
         <!--            <directory>${maven.multiModuleProjectDirectory}/distribution/target/apache-iotdb-${project.version}-all-bin/apache-iotdb-${project.version}-all-bin/confignode</directory>-->
         <!--        </fileSet>-->
     </fileSets>
+    <files>
+        <file>
+            <source>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/conf/logback-backup.xml</source>
+            <outputDirectory>conf</outputDirectory>
+            <fileMode>0755</fileMode>
+        </file>
+    </files>
     <!--    <files>-->
     <!--        <file>-->
     <!--            <source>${maven.multiModuleProjectDirectory}/server/src/assembly/resources/conf/datanode-env.sh</source>-->

diff --git a/distribution/src/assembly/cli.xml b/distribution/src/assembly/cli.xml
@@ -48,6 +48,13 @@
             <fileMode>0755</fileMode>
         </fileSet>
     </fileSets>
+    <files>
+        <file>
+            <source>${maven.multiModuleProjectDirectory}/iotdb-client/cli/src/assembly/resources/conf/logback-backup.xml</source>
+            <outputDirectory>conf</outputDirectory>
+            <fileMode>0755</fileMode>
+        </file>
+    </files>
     <componentDescriptors>
         <componentDescriptor>common-files.xml</componentDescriptor>
     </componentDescriptors>