From 17645fb09a360045112751926b03e6180e96809a Mon Sep 17 00:00:00 2001
From: quicksilver <zhifeng.zhang@zilliz.com>
Date: Fri, 2 Aug 2019 14:29:41 +0800
Subject: [PATCH 1/2] add arrow cache

Former-commit-id: 339a01b685a572dbcb9cf934932762d287f2f857
---
 cpp/cmake/ThirdPartyPackages.cmake | 84 ++++++++++++++++++++++--------
 1 file changed, 63 insertions(+), 21 deletions(-)

diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake
index 867e0aa2c5..bad87fabd6 100644
--- a/cpp/cmake/ThirdPartyPackages.cmake
+++ b/cpp/cmake/ThirdPartyPackages.cmake
@@ -469,28 +469,70 @@ macro(build_arrow)
             "-DCMAKE_LIBRARY_PATH=${CUDA_TOOLKIT_ROOT_DIR}/lib64/stubs"
             -DCMAKE_BUILD_TYPE=Release)
 
-    externalproject_add(arrow_ep
-            GIT_REPOSITORY
-            ${ARROW_SOURCE_URL}
-            GIT_TAG
-            ${ARROW_VERSION}
-            GIT_SHALLOW
-            TRUE
-            SOURCE_SUBDIR
-            cpp
-            ${EP_LOG_OPTIONS}
-            CMAKE_ARGS
-            ${ARROW_CMAKE_ARGS}
-            BUILD_COMMAND
-            ${MAKE}
-            ${MAKE_BUILD_ARGS}
-            INSTALL_COMMAND
-            ${MAKE} install
-            BUILD_BYPRODUCTS
-            "${ARROW_STATIC_LIB}"
-            )
+    if(USE_JFROG_CACHE STREQUAL "ON")
+        execute_process(COMMAND git ls-remote --heads ${ARROW_SOURCE_URL} ${ARROW_VERSION} OUTPUT_VARIABLE ARROW_LAST_COMMIT_ID)
+        if(${ARROW_LAST_COMMIT_ID} MATCHES "^[0-9a-z]+$")
+            string(MD5 ARROW_COMBINE_MD5 "${ARROW_LAST_COMMIT_ID}")
+            set(ARROW_CACHE_PACKAGE_NAME "arrow_${ARROW_COMBINE_MD5}.tar.gz")
+            set(ARROW_CACHE_URL "${JFROG_ARTFACTORY_CACHE_URL}/${ARROW_CACHE_PACKAGE_NAME}")
+            set(ARROW_CACHE_PACKAGE_PATH "${THIRDPARTY_PACKAGE_CACHE}/${ARROW_CACHE_PACKAGE_NAME}")
 
-    file(MAKE_DIRECTORY "${ARROW_PREFIX}/include")
+            file(DOWNLOAD ${ARROW_CACHE_URL} ${ARROW_CACHE_PACKAGE_PATH} STATUS status)
+            list(GET status 0 status_code)
+            message(STATUS "DOWNLOADING FROM ${ARROW_CACHE_URL} TO ${ARROW_CACHE_PACKAGE_PATH}. STATUS = ${status_code}")
+            if (NOT status_code EQUAL 0)
+                externalproject_add(arrow_ep
+                        GIT_REPOSITORY
+                        ${ARROW_SOURCE_URL}
+                        GIT_TAG
+                        ${ARROW_VERSION}
+                        GIT_SHALLOW
+                        TRUE
+                        SOURCE_SUBDIR
+                        cpp
+                        ${EP_LOG_OPTIONS}
+                        CMAKE_ARGS
+                        ${ARROW_CMAKE_ARGS}
+                        BUILD_COMMAND
+                        ${MAKE}
+                        ${MAKE_BUILD_ARGS}
+                        INSTALL_COMMAND
+                        ${MAKE} install
+                        BUILD_BYPRODUCTS
+                        "${ARROW_STATIC_LIB}"
+                        )
+
+                ExternalProject_Create_Cache(arrow_ep ${ARROW_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/arrow_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${ARROW_CACHE_URL})
+            else()
+                ExternalProject_Use_Cache(arrow_ep ${ARROW_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR})
+            endif()
+        else()
+            message(FATAL_ERROR "The last commit ID of \"${ARROW_SOURCE_URL}\" repository don't match!")
+        endif()
+    else()
+        externalproject_add(arrow_ep
+                GIT_REPOSITORY
+                ${ARROW_SOURCE_URL}
+                GIT_TAG
+                ${ARROW_VERSION}
+                GIT_SHALLOW
+                TRUE
+                SOURCE_SUBDIR
+                cpp
+                ${EP_LOG_OPTIONS}
+                CMAKE_ARGS
+                ${ARROW_CMAKE_ARGS}
+                BUILD_COMMAND
+                ${MAKE}
+                ${MAKE_BUILD_ARGS}
+                INSTALL_COMMAND
+                ${MAKE} install
+                BUILD_BYPRODUCTS
+                "${ARROW_STATIC_LIB}"
+                )
+    endif()
+
+    file(MAKE_DIRECTORY "${ARROW_INCLUDE_DIR}")
     add_library(arrow STATIC IMPORTED)
     set_target_properties(arrow
             PROPERTIES IMPORTED_LOCATION "${ARROW_STATIC_LIB}"

From 30d25631aa339c68621e2c1d735a0ee1d3320f57 Mon Sep 17 00:00:00 2001
From: "zhifeng.zhang" <zhifeng.zhang@zilliz.com>
Date: Fri, 2 Aug 2019 07:09:20 +0000
Subject: [PATCH 2/2] fix arrow cache bug

Former-commit-id: 1ee10f7dcb5c8aee7d31ea29bff8218ab2142c92
---
 cpp/cmake/ThirdPartyPackages.cmake | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cpp/cmake/ThirdPartyPackages.cmake b/cpp/cmake/ThirdPartyPackages.cmake
index bad87fabd6..f7a1bf4a53 100644
--- a/cpp/cmake/ThirdPartyPackages.cmake
+++ b/cpp/cmake/ThirdPartyPackages.cmake
@@ -165,7 +165,7 @@ if(NOT DEFINED USE_JFROG_CACHE)
     set(USE_JFROG_CACHE "ON")
 endif()
 if(USE_JFROG_CACHE STREQUAL "ON")    
-    set(JFROG_ARTFACTORY_CACHE_URL "http://192.168.1.201:80/artifactory/generic-local/milvus/thirdparty/cache/${CMAKE_OS_NAME}/${MILVUS_BUILD_ARCH}")
+    set(JFROG_ARTFACTORY_CACHE_URL "http://192.168.1.201:80/artifactory/generic-local/milvus/thirdparty/cache/${CMAKE_OS_NAME}/${MILVUS_BUILD_ARCH}/${BUILD_TYPE}")
     set(JFROG_USER_NAME "test")
     set(JFROG_PASSWORD "Fantast1c")
     set(THIRDPARTY_PACKAGE_CACHE "${THIRDPARTY_DIR}/cache")
@@ -470,8 +470,8 @@ macro(build_arrow)
             -DCMAKE_BUILD_TYPE=Release)
 
     if(USE_JFROG_CACHE STREQUAL "ON")
-        execute_process(COMMAND git ls-remote --heads ${ARROW_SOURCE_URL} ${ARROW_VERSION} OUTPUT_VARIABLE ARROW_LAST_COMMIT_ID)
-        if(${ARROW_LAST_COMMIT_ID} MATCHES "^[0-9a-z]+$")
+        execute_process(COMMAND sh -c "git ls-remote --heads ${ARROW_SOURCE_URL} ${ARROW_VERSION} | cut -f 1" OUTPUT_VARIABLE ARROW_LAST_COMMIT_ID)
+        if(${ARROW_LAST_COMMIT_ID} MATCHES "^[^#][a-z0-9]+")
             string(MD5 ARROW_COMBINE_MD5 "${ARROW_LAST_COMMIT_ID}")
             set(ARROW_CACHE_PACKAGE_NAME "arrow_${ARROW_COMBINE_MD5}.tar.gz")
             set(ARROW_CACHE_URL "${JFROG_ARTFACTORY_CACHE_URL}/${ARROW_CACHE_PACKAGE_NAME}")