From c3bcc935e8e93ad152caaef6776709e306f11d4d Mon Sep 17 00:00:00 2001
From: Hongze Zhang <hongze.zhang@intel.com>
Date: Wed, 12 Jan 2022 15:51:42 +0800
Subject: [PATCH] Test against oap-project/arrow/pull/77

---
 .github/workflows/tpch.yml               | 2 +-
 .github/workflows/unittests.yml          | 6 +++---
 arrow-data-source/script/build_arrow.sh  | 2 +-
 native-sql-engine/cpp/src/CMakeLists.txt | 5 +++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/tpch.yml b/.github/workflows/tpch.yml
index 55995e960..202626982 100644
--- a/.github/workflows/tpch.yml
+++ b/.github/workflows/tpch.yml
@@ -50,7 +50,7 @@ jobs:
       - name: Install OAP optimized Arrow
         run: |
           cd /tmp
-          git clone https://github.com/oap-project/arrow.git
+          git clone https://github.com/FelixYBW/arrow.git
           cd arrow && git checkout arrow-4.0.0-oap && cd cpp
           mkdir build && cd build
           cmake .. -DARROW_JNI=ON -DARROW_GANDIVA_JAVA=ON -DARROW_GANDIVA=ON -DARROW_PARQUET=ON -DARROW_ORC=ON -DARROW_CSV=ON -DARROW_HDFS=ON -DARROW_FILESYSTEM=ON -DARROW_WITH_SNAPPY=ON -DARROW_JSON=ON -DARROW_DATASET=ON -DARROW_WITH_LZ4=ON -DARROW_JEMALLOC=OFF && make -j2
diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml
index b8b83dd19..c56b37340 100644
--- a/.github/workflows/unittests.yml
+++ b/.github/workflows/unittests.yml
@@ -44,7 +44,7 @@ jobs:
       - name: Install OAP optimized Arrow (C++ libs)
         run: |
           cd /tmp
-          git clone https://github.com/oap-project/arrow.git
+          git clone https://github.com/FelixYBW/arrow.git
           cd arrow && git checkout arrow-4.0.0-oap && cd cpp
           mkdir build && cd build
           cmake .. -DARROW_JNI=ON -DARROW_GANDIVA_JAVA=ON -DARROW_GANDIVA=ON -DARROW_PARQUET=ON -DARROW_ORC=ON -DARROW_CSV=ON -DARROW_HDFS=ON -DARROW_FILESYSTEM=ON -DARROW_WITH_SNAPPY=ON -DARROW_JSON=ON -DARROW_DATASET=ON -DARROW_WITH_LZ4=ON -DGTEST_ROOT=/usr/src/gtest && make -j2
@@ -87,7 +87,7 @@ jobs:
       - name: Install OAP optimized Arrow (C++ libs)
         run: |
           cd /tmp
-          git clone https://github.com/oap-project/arrow.git
+          git clone https://github.com/FelixYBW/arrow.git
           cd arrow && git checkout arrow-4.0.0-oap && cd cpp
           mkdir build && cd build
           cmake .. -DARROW_JNI=ON -DARROW_GANDIVA_JAVA=ON -DARROW_GANDIVA=ON -DARROW_PARQUET=ON -DARROW_ORC=ON -DARROW_CSV=ON -DARROW_HDFS=ON -DARROW_FILESYSTEM=ON -DARROW_WITH_SNAPPY=ON -DARROW_JSON=ON -DARROW_DATASET=ON -DARROW_WITH_LZ4=ON -DGTEST_ROOT=/usr/src/gtest && make -j2
@@ -135,7 +135,7 @@ jobs:
       - name: Install OAP optimized Arrow (C++ libs)
         run: |
           cd /tmp
-          git clone https://github.com/oap-project/arrow.git
+          git clone https://github.com/FelixYBW/arrow.git
           cd arrow && git checkout arrow-4.0.0-oap && cd cpp
           mkdir build && cd build
           cmake .. -DARROW_JNI=ON -DARROW_GANDIVA_JAVA=ON -DARROW_GANDIVA=ON -DARROW_PARQUET=ON -DARROW_ORC=ON -DARROW_CSV=ON -DARROW_HDFS=ON -DARROW_FILESYSTEM=ON -DARROW_WITH_SNAPPY=ON -DARROW_JSON=ON -DARROW_DATASET=ON -DARROW_WITH_LZ4=ON -DGTEST_ROOT=/usr/src/gtest && make -j2
diff --git a/arrow-data-source/script/build_arrow.sh b/arrow-data-source/script/build_arrow.sh
index d8ec40128..ef3137be5 100755
--- a/arrow-data-source/script/build_arrow.sh
+++ b/arrow-data-source/script/build_arrow.sh
@@ -62,7 +62,7 @@ echo "ARROW_SOURCE_DIR=${ARROW_SOURCE_DIR}"
 echo "ARROW_INSTALL_DIR=${ARROW_INSTALL_DIR}"
 mkdir -p $ARROW_SOURCE_DIR
 mkdir -p $ARROW_INSTALL_DIR
-git clone https://github.com/oap-project/arrow.git  --branch arrow-4.0.0-oap $ARROW_SOURCE_DIR
+git clone https://github.com/FelixYBW/arrow.git  --branch arrow-4.0.0-oap $ARROW_SOURCE_DIR
 pushd $ARROW_SOURCE_DIR
 
 cmake ./cpp \
diff --git a/native-sql-engine/cpp/src/CMakeLists.txt b/native-sql-engine/cpp/src/CMakeLists.txt
index 225a762f3..c0bfda75d 100644
--- a/native-sql-engine/cpp/src/CMakeLists.txt
+++ b/native-sql-engine/cpp/src/CMakeLists.txt
@@ -11,7 +11,7 @@ set(CMAKE_CXX_STANDARD 14)
 
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 
-set(CMAKE_BUILD_TYPE  "Release")
+set(CMAKE_BUILD_TYPE  "Debug")
 
 set(ARROW_ROOT "/usr/local" CACHE PATH "Arrow Root dir")
 set(ARROW_BFS_INSTALL_DIR "/usr/local" CACHE PATH "Arrow Build from Source dir")
@@ -138,7 +138,7 @@ macro(build_arrow STATIC_ARROW)
   set(BINARY_RELEASE_DIR "${root_directory}/releases")
 
   ExternalProject_Add(arrow_ep
-                      GIT_REPOSITORY https://github.com/oap-project/arrow.git
+                      GIT_REPOSITORY https://github.com/FelixYBW/arrow.git
                       SOURCE_DIR ${ARROW_SOURCE_DIR}
                       GIT_TAG arrow-4.0.0-oap
                       BUILD_IN_SOURCE 1
@@ -444,6 +444,7 @@ macro(package_add_benchmark TESTNAME)
   add_executable(${TESTNAME} ${ARGN})
   target_link_libraries(${TESTNAME} gtest gtest_main spark_columnar_jni parquet ${CMAKE_THREAD_LIBS_INIT})
   target_include_directories(${TESTNAME} PUBLIC ${source_root_directory})
+  target_link_directories(${TESTNAME} PUBLIC "${ARROW_ROOT}/lib64")
   gtest_discover_tests(${TESTNAME}
     WORKING_DIRECTORY ${PROJECT_DIR}
     PROPERTIES VS_DEBUGGER_WORKING_DIRECTORY "${PROJECT_DIR}"