From c56bf14d41d366f292520c50b483b78cdbd51d01 Mon Sep 17 00:00:00 2001 From: zhixingheyi-tian Date: Mon, 29 Aug 2022 17:24:13 +0800 Subject: [PATCH 1/4] Change validate branch --- .github/workflows/unittests.yml | 12 ++++++------ arrow-data-source/script/build_arrow.sh | 2 +- native-sql-engine/cpp/src/CMakeLists.txt | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 2ff02d1b8..99dbef97f 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -53,8 +53,8 @@ jobs: - name: Install OAP optimized Arrow (C++ libs) run: | cd /tmp - git clone https://github.com/oap-project/arrow.git - cd arrow && git checkout arrow-4.0.0-oap && cd cpp + git clone https://github.com/zhixingheyi-tian/arrow.git + cd arrow && git checkout reuseBuffer-O3-branch-test && 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 sudo make install @@ -96,8 +96,8 @@ jobs: - name: Install OAP optimized Arrow (C++ libs) run: | cd /tmp - git clone https://github.com/oap-project/arrow.git - cd arrow && git checkout arrow-4.0.0-oap && cd cpp + git clone https://github.com/zhixingheyi-tian/arrow.git + cd arrow && git checkout reuseBuffer-O3-branch-test && 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 sudo make install @@ -141,8 +141,8 @@ jobs: - name: Install OAP optimized Arrow (C++ libs) run: | cd /tmp - git clone https://github.com/oap-project/arrow.git - cd arrow && git checkout arrow-4.0.0-oap && cd cpp + git clone https://github.com/zhixingheyi-tian/arrow.git + cd arrow && git checkout reuseBuffer-O3-branch-test && 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 sudo make install diff --git a/arrow-data-source/script/build_arrow.sh b/arrow-data-source/script/build_arrow.sh index d8ec40128..9b0ff1df2 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/zhixingheyi-tian/arrow.git --branch reuseBuffer-O3-branch-test $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 da7540651..c968caa8b 100644 --- a/native-sql-engine/cpp/src/CMakeLists.txt +++ b/native-sql-engine/cpp/src/CMakeLists.txt @@ -139,7 +139,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/zhixingheyi-tian/arrow.git SOURCE_DIR ${ARROW_SOURCE_DIR} GIT_TAG arrow-4.0.0-oap BUILD_IN_SOURCE 1 From 01f1d44e7c67c7e307fa5457516346aaa813252f Mon Sep 17 00:00:00 2001 From: zhixingheyi-tian Date: Mon, 29 Aug 2022 17:32:21 +0800 Subject: [PATCH 2/4] Modify --- native-sql-engine/cpp/src/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/native-sql-engine/cpp/src/CMakeLists.txt b/native-sql-engine/cpp/src/CMakeLists.txt index c968caa8b..25c0363bf 100644 --- a/native-sql-engine/cpp/src/CMakeLists.txt +++ b/native-sql-engine/cpp/src/CMakeLists.txt @@ -141,7 +141,7 @@ macro(build_arrow STATIC_ARROW) ExternalProject_Add(arrow_ep GIT_REPOSITORY https://github.com/zhixingheyi-tian/arrow.git SOURCE_DIR ${ARROW_SOURCE_DIR} - GIT_TAG arrow-4.0.0-oap + GIT_TAG reuseBuffer-O3-branch-test BUILD_IN_SOURCE 1 INSTALL_DIR ${ARROW_PREFIX} INSTALL_COMMAND make install From cb70f7b85ba0a568b134ca44ae57ce0b96aef3bc Mon Sep 17 00:00:00 2001 From: zhixingheyi-tian Date: Wed, 14 Sep 2022 10:29:17 +0800 Subject: [PATCH 3/4] Validate custom_memcpy branch --- .github/workflows/unittests.yml | 6 +++--- arrow-data-source/script/build_arrow.sh | 2 +- native-sql-engine/cpp/src/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 99dbef97f..8d9d13e2f 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -54,7 +54,7 @@ jobs: run: | cd /tmp git clone https://github.com/zhixingheyi-tian/arrow.git - cd arrow && git checkout reuseBuffer-O3-branch-test && cd cpp + cd arrow && git checkout custom_memcpy && 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 sudo make install @@ -97,7 +97,7 @@ jobs: run: | cd /tmp git clone https://github.com/zhixingheyi-tian/arrow.git - cd arrow && git checkout reuseBuffer-O3-branch-test && cd cpp + cd arrow && git checkout custom_memcpy && 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 sudo make install @@ -142,7 +142,7 @@ jobs: run: | cd /tmp git clone https://github.com/zhixingheyi-tian/arrow.git - cd arrow && git checkout reuseBuffer-O3-branch-test && cd cpp + cd arrow && git checkout custom_memcpy && 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 sudo make install diff --git a/arrow-data-source/script/build_arrow.sh b/arrow-data-source/script/build_arrow.sh index 9b0ff1df2..b8ef2d7a3 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/zhixingheyi-tian/arrow.git --branch reuseBuffer-O3-branch-test $ARROW_SOURCE_DIR +git clone https://github.com/zhixingheyi-tian/arrow.git --branch custom_memcpy $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 25c0363bf..06338f522 100644 --- a/native-sql-engine/cpp/src/CMakeLists.txt +++ b/native-sql-engine/cpp/src/CMakeLists.txt @@ -141,7 +141,7 @@ macro(build_arrow STATIC_ARROW) ExternalProject_Add(arrow_ep GIT_REPOSITORY https://github.com/zhixingheyi-tian/arrow.git SOURCE_DIR ${ARROW_SOURCE_DIR} - GIT_TAG reuseBuffer-O3-branch-test + GIT_TAG custom_memcpy BUILD_IN_SOURCE 1 INSTALL_DIR ${ARROW_PREFIX} INSTALL_COMMAND make install From 8c4102ddcca5a4d8440b1891bcaa21eeb8e95be1 Mon Sep 17 00:00:00 2001 From: zhixingheyi-tian Date: Fri, 16 Sep 2022 16:21:36 +0800 Subject: [PATCH 4/4] validate testjenkins --- .github/workflows/unittests.yml | 6 +++--- arrow-data-source/script/build_arrow.sh | 2 +- native-sql-engine/cpp/src/CMakeLists.txt | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/unittests.yml b/.github/workflows/unittests.yml index 8d9d13e2f..9070fbc12 100644 --- a/.github/workflows/unittests.yml +++ b/.github/workflows/unittests.yml @@ -54,7 +54,7 @@ jobs: run: | cd /tmp git clone https://github.com/zhixingheyi-tian/arrow.git - cd arrow && git checkout custom_memcpy && cd cpp + cd arrow && git checkout fix_buffer_length && 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 sudo make install @@ -97,7 +97,7 @@ jobs: run: | cd /tmp git clone https://github.com/zhixingheyi-tian/arrow.git - cd arrow && git checkout custom_memcpy && cd cpp + cd arrow && git checkout fix_buffer_length && 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 sudo make install @@ -142,7 +142,7 @@ jobs: run: | cd /tmp git clone https://github.com/zhixingheyi-tian/arrow.git - cd arrow && git checkout custom_memcpy && cd cpp + cd arrow && git checkout fix_buffer_length && 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 sudo make install diff --git a/arrow-data-source/script/build_arrow.sh b/arrow-data-source/script/build_arrow.sh index b8ef2d7a3..a42de4aea 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/zhixingheyi-tian/arrow.git --branch custom_memcpy $ARROW_SOURCE_DIR +git clone https://github.com/zhixingheyi-tian/arrow.git --branch fix_buffer_length $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 06338f522..57f57530b 100644 --- a/native-sql-engine/cpp/src/CMakeLists.txt +++ b/native-sql-engine/cpp/src/CMakeLists.txt @@ -141,7 +141,7 @@ macro(build_arrow STATIC_ARROW) ExternalProject_Add(arrow_ep GIT_REPOSITORY https://github.com/zhixingheyi-tian/arrow.git SOURCE_DIR ${ARROW_SOURCE_DIR} - GIT_TAG custom_memcpy + GIT_TAG fix_buffer_length BUILD_IN_SOURCE 1 INSTALL_DIR ${ARROW_PREFIX} INSTALL_COMMAND make install