Merge remote-tracking branch 'upstream/branch-0.4.0' into branch-0.4.0

Former-commit-id: 2fc7b24448d516f5caf048b8a9840378a3548cfb

cpp/cmake/BuildUtils.cmake

+# Define a function that check last file modification
+function(Check_Last_Modify cache_ignore_file_path working_dir last_modified_commit_id)
+    if(EXISTS "${working_dir}")
+        if(EXISTS "${cache_ignore_file_path}")
+            set(GIT_LOG_SKIP_NUM 0)
+            set(_MATCH_ALL ON CACHE BOOL "Match all")
+            set(_LOOP_STATUS ON CACHE BOOL "Whether out of loop")
+            file(STRINGS ${cache_ignore_file_path} CACHE_IGNORE_TXT)
+            while(_LOOP_STATUS)
+                foreach(_IGNORE_ENTRY ${CACHE_IGNORE_TXT})
+                    if(NOT _IGNORE_ENTRY MATCHES "^[^#]+")
+                        continue()
+                    endif()
+
+                    set(_MATCH_ALL OFF)
+                    execute_process(COMMAND git log --no-merges -1 --skip=${GIT_LOG_SKIP_NUM} --name-status --pretty= WORKING_DIRECTORY ${working_dir} OUTPUT_VARIABLE CHANGE_FILES)
+                    if(NOT CHANGE_FILES STREQUAL "")
+                        string(REPLACE "\n" ";" _CHANGE_FILES ${CHANGE_FILES})
+                        foreach(_FILE_ENTRY ${_CHANGE_FILES})
+                            string(REGEX MATCH "[^ \t]+$" _FILE_NAME ${_FILE_ENTRY})
+                            execute_process(COMMAND sh -c "echo ${_FILE_NAME} | grep ${_IGNORE_ENTRY}" RESULT_VARIABLE return_code)
+                            if (return_code EQUAL 0)
+                                execute_process(COMMAND git log --no-merges -1 --skip=${GIT_LOG_SKIP_NUM} --pretty=%H WORKING_DIRECTORY ${working_dir} OUTPUT_VARIABLE LAST_MODIFIED_COMMIT_ID)
+                                set (${last_modified_commit_id} ${LAST_MODIFIED_COMMIT_ID} PARENT_SCOPE)
+                                set(_LOOP_STATUS OFF)
+                            endif()
+                        endforeach()
+                    else()
+                        set(_LOOP_STATUS OFF)
+                    endif()
+                endforeach()
+
+                if(_MATCH_ALL)
+                    execute_process(COMMAND git log --no-merges -1 --skip=${GIT_LOG_SKIP_NUM} --pretty=%H WORKING_DIRECTORY ${working_dir} OUTPUT_VARIABLE LAST_MODIFIED_COMMIT_ID)
+                    set (${last_modified_commit_id} ${LAST_MODIFIED_COMMIT_ID} PARENT_SCOPE)
+                    set(_LOOP_STATUS OFF)
+                endif()
+
+                math(EXPR GIT_LOG_SKIP_NUM "${GIT_LOG_SKIP_NUM} + 1")
+            endwhile(_LOOP_STATUS)
+        else()
+            execute_process(COMMAND git log --no-merges -1 --skip=${GIT_LOG_SKIP_NUM} --pretty=%H WORKING_DIRECTORY ${working_dir} OUTPUT_VARIABLE LAST_MODIFIED_COMMIT_ID)
+            set (${last_modified_commit_id} ${LAST_MODIFIED_COMMIT_ID} PARENT_SCOPE)
+        endif()
+    else()
+        message(FATAL_ERROR "The directory ${working_dir} does not exist")
+    endif()
+endfunction()
+
 # Define a function that extracts a cached package
 function(ExternalProject_Use_Cache project_name package_file install_path)
     message(STATUS "Will use cached package file: ${package_file}")

cpp/cmake/ThirdPartyPackages.cmake

@@ -460,6 +460,7 @@ else()
     set(GRPC_SOURCE_URL
             "http://git.zilliz.tech/kun.yu/grpc/-/archive/master/grpc-master.tar.gz")
 endif()
+set(GRPC_MD5 "7ec59ad54c85a12dcbbfede09bf413a9")
 
 # ----------------------------------------------------------------------
 # ARROW
@@ -2589,24 +2590,62 @@ macro(build_grpc)
     set(GRPC_PROTOBUF_STATIC_LIB "${GRPC_PROTOBUF_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}protobuf${CMAKE_STATIC_LIBRARY_SUFFIX}")
     set(GRPC_PROTOC_STATIC_LIB "${GRPC_PROTOBUF_LIB_DIR}/${CMAKE_STATIC_LIBRARY_PREFIX}protoc${CMAKE_STATIC_LIBRARY_SUFFIX}")
 
-    externalproject_add(grpc_ep
-            URL
-            ${GRPC_SOURCE_URL}
-            ${EP_LOG_OPTIONS}
-            CONFIGURE_COMMAND
-            ""
-            BUILD_IN_SOURCE
-            1
-            BUILD_COMMAND
-            ${MAKE} ${MAKE_BUILD_ARGS} prefix=${GRPC_PREFIX}
-            INSTALL_COMMAND
-            ${MAKE} install prefix=${GRPC_PREFIX}
-            BUILD_BYPRODUCTS
-            ${GRPC_STATIC_LIB}
-            ${GRPC++_STATIC_LIB}
-            ${GRPCPP_CHANNELZ_STATIC_LIB}
-            ${GRPC_PROTOBUF_STATIC_LIB}
-            ${GRPC_PROTOC_STATIC_LIB})
+    if(USE_JFROG_CACHE STREQUAL "ON")
+        set(GRPC_CACHE_PACKAGE_NAME "grpc_${GRPC_MD5}.tar.gz")
+        set(GRPC_CACHE_URL "${JFROG_ARTFACTORY_CACHE_URL}/${GRPC_CACHE_PACKAGE_NAME}")
+        set(GRPC_CACHE_PACKAGE_PATH "${THIRDPARTY_PACKAGE_CACHE}/${GRPC_CACHE_PACKAGE_NAME}")
+
+        execute_process(COMMAND wget -q --method HEAD ${GRPC_CACHE_URL} RESULT_VARIABLE return_code)
+        message(STATUS "Check the remote file ${GRPC_CACHE_URL}. return code = ${return_code}")
+        if (NOT return_code EQUAL 0)
+            externalproject_add(grpc_ep
+                    URL
+                    ${GRPC_SOURCE_URL}
+                    ${EP_LOG_OPTIONS}
+                    CONFIGURE_COMMAND
+                    ""
+                    BUILD_IN_SOURCE
+                    1
+                    BUILD_COMMAND
+                    ${MAKE} ${MAKE_BUILD_ARGS} prefix=${GRPC_PREFIX}
+                    INSTALL_COMMAND
+                    ${MAKE} install prefix=${GRPC_PREFIX}
+                    BUILD_BYPRODUCTS
+                    ${GRPC_STATIC_LIB}
+                    ${GRPC++_STATIC_LIB}
+                    ${GRPCPP_CHANNELZ_STATIC_LIB}
+                    ${GRPC_PROTOBUF_STATIC_LIB}
+                    ${GRPC_PROTOC_STATIC_LIB})
+
+            ExternalProject_Create_Cache(grpc_ep ${GRPC_CACHE_PACKAGE_PATH} "${CMAKE_CURRENT_BINARY_DIR}/grpc_ep-prefix" ${JFROG_USER_NAME} ${JFROG_PASSWORD} ${GRPC_CACHE_URL})
+        else()
+            file(DOWNLOAD ${GRPC_CACHE_URL} ${GRPC_CACHE_PACKAGE_PATH} STATUS status)
+            list(GET status 0 status_code)
+            message(STATUS "DOWNLOADING FROM ${GRPC_CACHE_URL} TO ${GRPC_CACHE_PACKAGE_PATH}. STATUS = ${status_code}")
+            if (status_code EQUAL 0)
+                ExternalProject_Use_Cache(grpc_ep ${GRPC_CACHE_PACKAGE_PATH} ${CMAKE_CURRENT_BINARY_DIR})
+            endif()
+        endif()
+    else()
+        externalproject_add(grpc_ep
+                URL
+                ${GRPC_SOURCE_URL}
+                ${EP_LOG_OPTIONS}
+                CONFIGURE_COMMAND
+                ""
+                BUILD_IN_SOURCE
+                1
+                BUILD_COMMAND
+                ${MAKE} ${MAKE_BUILD_ARGS} prefix=${GRPC_PREFIX}
+                INSTALL_COMMAND
+                ${MAKE} install prefix=${GRPC_PREFIX}
+                BUILD_BYPRODUCTS
+                ${GRPC_STATIC_LIB}
+                ${GRPC++_STATIC_LIB}
+                ${GRPCPP_CHANNELZ_STATIC_LIB}
+                ${GRPC_PROTOBUF_STATIC_LIB}
+                ${GRPC_PROTOC_STATIC_LIB})
+    endif()
 
     file(MAKE_DIRECTORY "${GRPC_INCLUDE_DIR}")