From 4be2532b0c874dac9c3d338911c74035f3e03f93 Mon Sep 17 00:00:00 2001
From: An Qi <aqnin@outlook.com>
Date: Fri, 12 Jul 2024 22:43:48 +0800
Subject: [PATCH 1/6] build: update netty and jackson version

---
 core/pom.xml |  3 ---
 pom.xml      | 21 ++++++++++++++++-----
 2 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 6b220e3345..b6965570e7 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -81,12 +81,10 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-core</artifactId>
-            <version>2.12.5</version>
         </dependency>
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-annotations</artifactId>
-            <version>2.12.5</version>
         </dependency>
         <dependency>
             <groupId>io.etcd</groupId>
@@ -118,7 +116,6 @@
         <dependency>
             <groupId>io.netty</groupId>
             <artifactId>netty-all</artifactId>
-            <version>4.1.59.Final</version>
         </dependency>
         <dependency>
             <groupId>org.apache.zookeeper</groupId>
diff --git a/pom.xml b/pom.xml
index d820ddfe0e..b651d5a166 100644
--- a/pom.xml
+++ b/pom.xml
@@ -155,9 +155,11 @@
                 <version>2.2</version>
             </dependency>
             <dependency>
-                <groupId>com.fasterxml.jackson.core</groupId>
-                <artifactId>jackson-databind</artifactId>
-                <version>2.13.4.2</version>
+                <groupId>com.fasterxml.jackson</groupId>
+                <artifactId>jackson-bom</artifactId>
+                <version>2.17.2</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>cn.hutool</groupId>
@@ -234,6 +236,13 @@
                 <artifactId>commons-email</artifactId>
                 <version>1.6.0</version>
             </dependency>
+            <dependency>
+                <groupId>io.netty</groupId>
+                <artifactId>netty-bom</artifactId>
+                <version>4.1.110.Final</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>org.apache.zookeeper</groupId>
                 <artifactId>zookeeper</artifactId>
@@ -309,8 +318,10 @@
             </dependency>
             <dependency>
                 <groupId>com.google.guava</groupId>
-                <artifactId>guava</artifactId>
-                <version>33.2.0-jre</version>
+                <artifactId>guava-bom</artifactId>
+                <version>33.2.1-jre</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
         </dependencies>
     </dependencyManagement>

From 592ad569be24eb3ad4fd9a59334dbace7804433d Mon Sep 17 00:00:00 2001
From: An Qi <aqnin@outlook.com>
Date: Tue, 16 Jul 2024 23:04:54 +0800
Subject: [PATCH 2/6] build: update arrow version

---
 core/pom.xml       |  14 ----
 dependency/pom.xml | 185 ---------------------------------------------
 pom.xml            |  36 +--------
 3 files changed, 4 insertions(+), 231 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index b6965570e7..451da63e78 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -160,15 +160,6 @@
             <groupId>cn.hutool</groupId>
             <artifactId>hutool-all</artifactId>
         </dependency>
-        <dependency>
-            <!-- Arrow dependencies -->
-            <groupId>com.google.flatbuffers</groupId>
-            <artifactId>flatbuffers-java</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-format</artifactId>
-        </dependency>
         <dependency>
             <groupId>org.apache.arrow</groupId>
             <artifactId>arrow-vector</artifactId>
@@ -182,11 +173,6 @@
             <artifactId>arrow-memory-netty</artifactId>
             <scope>runtime</scope>
         </dependency>
-        <dependency>
-            <groupId>org.apache.arrow</groupId>
-            <artifactId>arrow-memory-netty-buffer-patch</artifactId>
-            <scope>runtime</scope>
-        </dependency>
         <dependency>
             <groupId>org.apache.arrow</groupId>
             <artifactId>arrow-algorithm</artifactId>
diff --git a/dependency/pom.xml b/dependency/pom.xml
index 9f887753a7..9470722005 100644
--- a/dependency/pom.xml
+++ b/dependency/pom.xml
@@ -45,109 +45,6 @@
             </activation>
             <build>
                 <plugins>
-                    <plugin>
-                        <groupId>com.googlecode.maven-download-plugin</groupId>
-                        <artifactId>download-maven-plugin</artifactId>
-                        <version>1.9.0</version>
-                        <executions>
-                            <execution>
-                                <id>get-arrow-java-root</id>
-                                <goals>
-                                    <goal>wget</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <url>https://github.com/IGinX-THU/IGinX-resources/raw/main/arrow-snapshot/arrow-java-root-17.0.0-20240709.071332-1.pom</url>
-                                    <outputDirectory>target/remote-jars</outputDirectory>
-                                    <outputFileName>arrow-java-root-17.0.0-SNAPSHOT.pom</outputFileName>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>get-arrow-memory</id>
-                                <goals>
-                                    <goal>wget</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <url>https://github.com/IGinX-THU/IGinX-resources/raw/main/arrow-snapshot/arrow-memory-17.0.0-20240709.071332-1.pom</url>
-                                    <outputDirectory>target/remote-jars</outputDirectory>
-                                    <outputFileName>arrow-memory-17.0.0-SNAPSHOT.pom</outputFileName>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>get-arrow-memory-core-snapshot</id>
-                                <goals>
-                                    <goal>wget</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <url>https://github.com/IGinX-THU/IGinX-resources/raw/main/arrow-snapshot/arrow-memory-core-17.0.0-20240709.071332-1.jar</url>
-                                    <outputDirectory>target/remote-jars</outputDirectory>
-                                    <outputFileName>arrow-memory-core-17.0.0-SNAPSHOT.jar</outputFileName>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>get-arrow-memory-netty-snapshot</id>
-                                <goals>
-                                    <goal>wget</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <url>https://github.com/IGinX-THU/IGinX-resources/raw/main/arrow-snapshot/arrow-memory-netty-17.0.0-20240709.071332-1.jar</url>
-                                    <outputDirectory>target/remote-jars</outputDirectory>
-                                    <outputFileName>arrow-memory-netty-17.0.0-SNAPSHOT.jar</outputFileName>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>get-arrow-memory-netty-buffer-patch</id>
-                                <goals>
-                                    <goal>wget</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <url>https://github.com/IGinX-THU/IGinX-resources/raw/main/arrow-snapshot/arrow-memory-netty-buffer-patch-17.0.0-20240709.071332-1.jar</url>
-                                    <outputDirectory>target/remote-jars</outputDirectory>
-                                    <outputFileName>arrow-memory-netty-buffer-patch-17.0.0-SNAPSHOT.jar</outputFileName>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>get-arrow-format-snapshot</id>
-                                <goals>
-                                    <goal>wget</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <url>https://github.com/IGinX-THU/IGinX-resources/raw/main/arrow-snapshot/arrow-format-17.0.0-20240709.071332-1.jar</url>
-                                    <outputDirectory>target/remote-jars</outputDirectory>
-                                    <outputFileName>arrow-format-17.0.0-SNAPSHOT.jar</outputFileName>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>get-arrow-vector-snapshot</id>
-                                <goals>
-                                    <goal>wget</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <url>https://github.com/IGinX-THU/IGinX-resources/raw/main/arrow-snapshot/arrow-vector-17.0.0-20240709.071332-1.jar</url>
-                                    <outputDirectory>target/remote-jars</outputDirectory>
-                                    <outputFileName>arrow-vector-17.0.0-SNAPSHOT.jar</outputFileName>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>get-arrow-algorithm-snapshot</id>
-                                <goals>
-                                    <goal>wget</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <url>https://github.com/IGinX-THU/IGinX-resources/raw/main/arrow-snapshot/arrow-algorithm-17.0.0-20240709.071332-1.jar</url>
-                                    <outputDirectory>target/remote-jars</outputDirectory>
-                                    <outputFileName>arrow-algorithm-17.0.0-SNAPSHOT.jar</outputFileName>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
                     <plugin>
                         <groupId>org.apache.maven.plugins</groupId>
                         <artifactId>maven-install-plugin</artifactId>
@@ -163,88 +60,6 @@
                                     <file>src/main/resources/pemja-0.5-SNAPSHOT.jar</file>
                                 </configuration>
                             </execution>
-                            <execution>
-                                <id>install-arrow-java-root</id>
-                                <goals>
-                                    <goal>install-file</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <file>target/remote-jars/arrow-java-root-17.0.0-SNAPSHOT.pom</file>
-                                    <pomFile>target/remote-jars/arrow-java-root-17.0.0-SNAPSHOT.pom</pomFile>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>install-arrow-memory</id>
-                                <goals>
-                                    <goal>install-file</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <file>target/remote-jars/arrow-memory-17.0.0-SNAPSHOT.pom</file>
-                                    <pomFile>target/remote-jars/arrow-memory-17.0.0-SNAPSHOT.pom</pomFile>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>install-arrow-memory-core-snapshot</id>
-                                <goals>
-                                    <goal>install-file</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <file>target/remote-jars/arrow-memory-core-17.0.0-SNAPSHOT.jar</file>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>install-arrow-memory-netty-snapshot</id>
-                                <goals>
-                                    <goal>install-file</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <file>target/remote-jars/arrow-memory-netty-17.0.0-SNAPSHOT.jar</file>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>install-arrow-memory-netty-buffer-patch</id>
-                                <goals>
-                                    <goal>install-file</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <file>target/remote-jars/arrow-memory-netty-buffer-patch-17.0.0-SNAPSHOT.jar</file>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>install-arrow-format-snapshot</id>
-                                <goals>
-                                    <goal>install-file</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <file>target/remote-jars/arrow-format-17.0.0-SNAPSHOT.jar</file>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>install-arrow-vector-snapshot</id>
-                                <goals>
-                                    <goal>install-file</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <file>target/remote-jars/arrow-vector-17.0.0-SNAPSHOT.jar</file>
-                                </configuration>
-                            </execution>
-                            <execution>
-                                <id>install-arrow-algorithm-snapshot</id>
-                                <goals>
-                                    <goal>install-file</goal>
-                                </goals>
-                                <phase>generate-sources</phase>
-                                <configuration>
-                                    <file>target/remote-jars/arrow-algorithm-17.0.0-SNAPSHOT.jar</file>
-                                </configuration>
-                            </execution>
                         </executions>
                     </plugin>
                 </plugins>
diff --git a/pom.xml b/pom.xml
index b651d5a166..e7bdad8d49 100644
--- a/pom.xml
+++ b/pom.xml
@@ -166,40 +166,12 @@
                 <artifactId>hutool-all</artifactId>
                 <version>5.8.26</version>
             </dependency>
-            <dependency>
-                <groupId>com.google.flatbuffers</groupId>
-                <artifactId>flatbuffers-java</artifactId>
-                <version>23.5.26</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.arrow</groupId>
-                <artifactId>arrow-format</artifactId>
-                <version>17.0.0-SNAPSHOT</version>
-            </dependency>
             <dependency>
                 <groupId>org.apache.arrow</groupId>
-                <artifactId>arrow-vector</artifactId>
-                <version>17.0.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.arrow</groupId>
-                <artifactId>arrow-memory-core</artifactId>
-                <version>17.0.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.arrow</groupId>
-                <artifactId>arrow-memory-netty</artifactId>
-                <version>17.0.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.arrow</groupId>
-                <artifactId>arrow-memory-netty-buffer-patch</artifactId>
-                <version>17.0.0-SNAPSHOT</version>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.arrow</groupId>
-                <artifactId>arrow-algorithm</artifactId>
-                <version>17.0.0-SNAPSHOT</version>
+                <artifactId>arrow-bom</artifactId>
+                <version>17.0.0</version>
+                <type>pom</type>
+                <scope>import</scope>
             </dependency>
             <dependency>
                 <groupId>org.apache.commons</groupId>

From 8560f4aeedea4fad1f144f247a4cf400ebd0c270 Mon Sep 17 00:00:00 2001
From: An Qi <aqnin@outlook.com>
Date: Wed, 17 Jul 2024 16:09:58 +0800
Subject: [PATCH 3/6] build(core): update jetcd version

---
 core/pom.xml | 11 -----------
 pom.xml      | 13 +------------
 2 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/core/pom.xml b/core/pom.xml
index 451da63e78..b232c0c0d1 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -89,17 +89,6 @@
         <dependency>
             <groupId>io.etcd</groupId>
             <artifactId>jetcd-core</artifactId>
-            <optional>true</optional>
-            <exclusions>
-                <exclusion>
-                    <groupId>org.slf4j</groupId>
-                    <artifactId>slf4j-log4j12</artifactId>
-                </exclusion>
-                <exclusion>
-                    <groupId>log4j</groupId>
-                    <artifactId>log4j</artifactId>
-                </exclusion>
-            </exclusions>
         </dependency>
         <dependency>
             <groupId>io.moquette</groupId>
diff --git a/pom.xml b/pom.xml
index e7bdad8d49..7c24f91384 100644
--- a/pom.xml
+++ b/pom.xml
@@ -248,18 +248,7 @@
             <dependency>
                 <groupId>io.etcd</groupId>
                 <artifactId>jetcd-core</artifactId>
-                <version>0.5.7</version>
-                <optional>true</optional>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.slf4j</groupId>
-                        <artifactId>slf4j-log4j12</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>log4j</groupId>
-                        <artifactId>log4j</artifactId>
-                    </exclusion>
-                </exclusions>
+                <version>0.5.11</version>
             </dependency>
             <dependency>
                 <groupId>com.influxdb</groupId>

From cdfccf6c8a59fd9459b1ea43954d74b0ab913043 Mon Sep 17 00:00:00 2001
From: An Qi <aqnin@outlook.com>
Date: Thu, 18 Jul 2024 10:29:06 +0800
Subject: [PATCH 4/6] build(core): update grpc version

---
 pom.xml | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/pom.xml b/pom.xml
index 7c24f91384..e3f5552497 100644
--- a/pom.xml
+++ b/pom.xml
@@ -250,6 +250,14 @@
                 <artifactId>jetcd-core</artifactId>
                 <version>0.5.11</version>
             </dependency>
+            <!-- jetcd-core requires grpc version not exceeding 1.57 -->
+            <dependency>
+                <groupId>io.grpc</groupId>
+                <artifactId>grpc-bom</artifactId>
+                <version>1.57.2</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
             <dependency>
                 <groupId>com.influxdb</groupId>
                 <artifactId>influxdb-client-java</artifactId>

From 698cbcc07ecbcec6d3a9491497bc194ee38c67ca Mon Sep 17 00:00:00 2001
From: An Qi <aqnin@outlook.com>
Date: Thu, 18 Jul 2024 10:29:42 +0800
Subject: [PATCH 5/6] test etcd

---
 .github/workflows/standard-test-suite.yml | 58 +++++++++++------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/standard-test-suite.yml b/.github/workflows/standard-test-suite.yml
index 67e41e0f75..d997dd230a 100644
--- a/.github/workflows/standard-test-suite.yml
+++ b/.github/workflows/standard-test-suite.yml
@@ -11,34 +11,34 @@ concurrency:
     cancel-in-progress: true
 
 jobs:
-    unit-test:
-        uses: ./.github/workflows/unit-test.yml
+    #    unit-test:
+    #        uses: ./.github/workflows/unit-test.yml
     unit-mds:
         uses: ./.github/workflows/unit-mds.yml
-    case-regression:
-        uses: ./.github/workflows/case-regression.yml
-        with:
-            metadata-matrix: '["zookeeper"]'
-    standalone-test:
-        uses: ./.github/workflows/standalone-test.yml
-        with:
-            metadata-matrix: '["zookeeper"]'
-    standalone-test-pushdown:
-        uses: ./.github/workflows/standalone-test-pushdown.yml
-        with:
-            metadata-matrix: '["zookeeper"]'
-    db-ce:
-        uses: ./.github/workflows/DB-CE.yml
-        with:
-            metadata-matrix: '["zookeeper"]'
-    remote-test:
-        uses: ./.github/workflows/remote-test.yml
-        with:
-            metadata-matrix: '["zookeeper"]'
-    assemebly-test:
-        uses: ./.github/workflows/assembly-test.yml
-    tpc-h-regression-test:
-        uses: ./.github/workflows/tpc-h.yml
-        with:
-            os-matrix: '["ubuntu-latest"]'
-            metadata-matrix: '["zookeeper"]'
+#    case-regression:
+#        uses: ./.github/workflows/case-regression.yml
+#        with:
+#            metadata-matrix: '["zookeeper"]'
+#    standalone-test:
+#        uses: ./.github/workflows/standalone-test.yml
+#        with:
+#            metadata-matrix: '["zookeeper"]'
+#    standalone-test-pushdown:
+#        uses: ./.github/workflows/standalone-test-pushdown.yml
+#        with:
+#            metadata-matrix: '["zookeeper"]'
+#    db-ce:
+#        uses: ./.github/workflows/DB-CE.yml
+#        with:
+#            metadata-matrix: '["zookeeper"]'
+#    remote-test:
+#        uses: ./.github/workflows/remote-test.yml
+#        with:
+#            metadata-matrix: '["zookeeper"]'
+#    assemebly-test:
+#        uses: ./.github/workflows/assembly-test.yml
+#    tpc-h-regression-test:
+#        uses: ./.github/workflows/tpc-h.yml
+#        with:
+#            os-matrix: '["ubuntu-latest"]'
+#            metadata-matrix: '["zookeeper"]'

From d13ea4e9eafe0da41392af134764d7e919901559 Mon Sep 17 00:00:00 2001
From: An Qi <aqnin@outlook.com>
Date: Thu, 18 Jul 2024 10:58:37 +0800
Subject: [PATCH 6/6] Revert "test etcd"

This reverts commit 698cbcc07ecbcec6d3a9491497bc194ee38c67ca.
---
 .github/workflows/standard-test-suite.yml | 58 +++++++++++------------
 1 file changed, 29 insertions(+), 29 deletions(-)

diff --git a/.github/workflows/standard-test-suite.yml b/.github/workflows/standard-test-suite.yml
index d997dd230a..67e41e0f75 100644
--- a/.github/workflows/standard-test-suite.yml
+++ b/.github/workflows/standard-test-suite.yml
@@ -11,34 +11,34 @@ concurrency:
     cancel-in-progress: true
 
 jobs:
-    #    unit-test:
-    #        uses: ./.github/workflows/unit-test.yml
+    unit-test:
+        uses: ./.github/workflows/unit-test.yml
     unit-mds:
         uses: ./.github/workflows/unit-mds.yml
-#    case-regression:
-#        uses: ./.github/workflows/case-regression.yml
-#        with:
-#            metadata-matrix: '["zookeeper"]'
-#    standalone-test:
-#        uses: ./.github/workflows/standalone-test.yml
-#        with:
-#            metadata-matrix: '["zookeeper"]'
-#    standalone-test-pushdown:
-#        uses: ./.github/workflows/standalone-test-pushdown.yml
-#        with:
-#            metadata-matrix: '["zookeeper"]'
-#    db-ce:
-#        uses: ./.github/workflows/DB-CE.yml
-#        with:
-#            metadata-matrix: '["zookeeper"]'
-#    remote-test:
-#        uses: ./.github/workflows/remote-test.yml
-#        with:
-#            metadata-matrix: '["zookeeper"]'
-#    assemebly-test:
-#        uses: ./.github/workflows/assembly-test.yml
-#    tpc-h-regression-test:
-#        uses: ./.github/workflows/tpc-h.yml
-#        with:
-#            os-matrix: '["ubuntu-latest"]'
-#            metadata-matrix: '["zookeeper"]'
+    case-regression:
+        uses: ./.github/workflows/case-regression.yml
+        with:
+            metadata-matrix: '["zookeeper"]'
+    standalone-test:
+        uses: ./.github/workflows/standalone-test.yml
+        with:
+            metadata-matrix: '["zookeeper"]'
+    standalone-test-pushdown:
+        uses: ./.github/workflows/standalone-test-pushdown.yml
+        with:
+            metadata-matrix: '["zookeeper"]'
+    db-ce:
+        uses: ./.github/workflows/DB-CE.yml
+        with:
+            metadata-matrix: '["zookeeper"]'
+    remote-test:
+        uses: ./.github/workflows/remote-test.yml
+        with:
+            metadata-matrix: '["zookeeper"]'
+    assemebly-test:
+        uses: ./.github/workflows/assembly-test.yml
+    tpc-h-regression-test:
+        uses: ./.github/workflows/tpc-h.yml
+        with:
+            os-matrix: '["ubuntu-latest"]'
+            metadata-matrix: '["zookeeper"]'