From 104dc71082eab32b10ac7e16999d88daa913112d Mon Sep 17 00:00:00 2001
From: Christofer Dutz <cdutz@apache.org>
Date: Thu, 17 Aug 2023 11:31:18 +0200
Subject: [PATCH 1/4] fix: Hopefully fixed the build of the cpp-example on
 windows systems

---
 example/client-cpp-example/src/CMakeLists.txt | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/example/client-cpp-example/src/CMakeLists.txt b/example/client-cpp-example/src/CMakeLists.txt
index 6e9e60e089a86..b3b117c5dda76 100644
--- a/example/client-cpp-example/src/CMakeLists.txt
+++ b/example/client-cpp-example/src/CMakeLists.txt
@@ -33,12 +33,6 @@ IF (DEFINED BOOST_INCLUDEDIR)
     INCLUDE_DIRECTORIES(${Boost_INCLUDE_DIR})
 ENDIF()
 
-# Add the libs for thrift
-IF(MSVC)
-    SET(THRIFT_STATIC_LIB "${CMAKE_SOURCE_DIR}/thrift/lib/Release/thriftmd.lib")
-ELSE()
-    SET(THRIFT_STATIC_LIB "${CMAKE_SOURCE_DIR}/thrift/lib/libthrift.a")
-ENDIF()
 # Add the libs for the cpp-client
 LINK_DIRECTORIES(${CMAKE_SOURCE_DIR}/client/lib)
 
@@ -46,8 +40,8 @@ ADD_EXECUTABLE(SessionExample SessionExample.cpp)
 ADD_EXECUTABLE(AlignedTimeseriesSessionExample AlignedTimeseriesSessionExample.cpp)
 
 IF(MSVC)
-    TARGET_LINK_LIBRARIES(SessionExample iotdb_session thriftmd)
-    TARGET_LINK_LIBRARIES(AlignedTimeseriesSessionExample iotdb_session thriftmd)
+    TARGET_LINK_LIBRARIES(SessionExample iotdb_session "${CMAKE_SOURCE_DIR}/thrift/lib/Release/thriftmd.lib)
+    TARGET_LINK_LIBRARIES(AlignedTimeseriesSessionExample iotdb_session "${CMAKE_SOURCE_DIR}/thrift/lib/Release/thriftmd.lib)
 ELSE()
     TARGET_LINK_LIBRARIES(SessionExample iotdb_session pthread)
     TARGET_LINK_LIBRARIES(AlignedTimeseriesSessionExample iotdb_session pthread)

From e1c6f722e95736e64527b64758c7659f2eb6c379 Mon Sep 17 00:00:00 2001
From: Christofer Dutz <cdutz@apache.org>
Date: Tue, 7 Nov 2023 22:31:47 +0100
Subject: [PATCH 2/4] fix: Increase the timeout even more to finally make the
 build succeed.

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index cd3ba4c85997c..49d95a32a602b 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -38,7 +38,7 @@ pipeline {
     }
 
     options {
-        timeout(time: 4, unit: 'HOURS')
+        timeout(time: 8, unit: 'HOURS')
         // When we have test-fails e.g. we don't need to run the remaining steps
         skipStagesAfterUnstable()
     }

From 24f78424f5d7c72e1b6757166e95a5ec20c40407 Mon Sep 17 00:00:00 2001
From: Christofer Dutz <cdutz@apache.org>
Date: Thu, 14 Mar 2024 22:02:37 +0100
Subject: [PATCH 3/4] fix: Fix the build.

---
 .../src/test/java/org/apache/iotdb/tool/WriteCsvFileTest.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/iotdb-client/cli/src/test/java/org/apache/iotdb/tool/WriteCsvFileTest.java b/iotdb-client/cli/src/test/java/org/apache/iotdb/tool/WriteCsvFileTest.java
index 4b491f18cc888..c5b271916936d 100644
--- a/iotdb-client/cli/src/test/java/org/apache/iotdb/tool/WriteCsvFileTest.java
+++ b/iotdb-client/cli/src/test/java/org/apache/iotdb/tool/WriteCsvFileTest.java
@@ -38,7 +38,7 @@ public void writeCsvFileTest() {
     List<Object> row3 = new ArrayList<>(Arrays.asList(3, "100", "hello world!!!", false));
     ArrayList<List<Object>> records = new ArrayList<>(Arrays.asList(row1, row2, row3));
 
-    assertTrue(AbstractCsvTool.writeCsvFile(headerNames, records, "./test0.csv"));
-    assertTrue(AbstractCsvTool.writeCsvFile(null, records, "./test1.csv"));
+    assertTrue(AbstractCsvTool.writeCsvFile(headerNames, records, "./target/test0.csv"));
+    assertTrue(AbstractCsvTool.writeCsvFile(null, records, "./target/test1.csv"));
   }
 }

From 97ed2e8c9a5ad23ff4ecbbbc1d79454f43deb494 Mon Sep 17 00:00:00 2001
From: Christofer Dutz <cdutz@apache.org>
Date: Thu, 13 Jun 2024 11:27:34 +0200
Subject: [PATCH 4/4] chore: Fixed the assembly descriptor of the cpp-client to
 include the thrift libs and header files.

---
 iotdb-client/client-cpp/src/assembly/client-cpp.xml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/iotdb-client/client-cpp/src/assembly/client-cpp.xml b/iotdb-client/client-cpp/src/assembly/client-cpp.xml
index 9de99eae649a9..729fdadde235a 100644
--- a/iotdb-client/client-cpp/src/assembly/client-cpp.xml
+++ b/iotdb-client/client-cpp/src/assembly/client-cpp.xml
@@ -33,13 +33,19 @@
             <outputDirectory>include</outputDirectory>
         </fileSet>
         <fileSet>
-            <directory>${project.basedir}/../compile-tools/thrift/target/thrift-${thrift.version}/lib/cpp/src</directory>
+            <directory>${project.build.directory}/thrift/include</directory>
             <includes>
-                <include>**/*.h</include>
-                <include>**/*.tcc</include>
+                <include>**</include>
             </includes>
             <outputDirectory>include</outputDirectory>
         </fileSet>
+        <fileSet>
+            <directory>${project.build.directory}/thrift/lib</directory>
+            <includes>
+                <include>**</include>
+            </includes>
+            <outputDirectory>lib</outputDirectory>
+        </fileSet>
         <fileSet>
             <directory>${project.build.directory}/build/main</directory>
             <includes>