Improve UriParser

cpp/CMakeLists.txt

@@ -757,8 +757,10 @@ set(ARROW_LINK_LIBS ${double-conversion_LIBRARIES})
 set(ARROW_STATIC_LINK_LIBS ${double-conversion_LIBRARIES})
 set(ARROW_STATIC_INSTALL_INTERFACE_LIBS ${double-conversion_LIBRARIES})
 
-list(APPEND ARROW_STATIC_LINK_LIBS uriparser::uriparser)
-list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS uriparser::uriparser)
+if(ARROW_WITH_URIPARSER)
+  list(APPEND ARROW_STATIC_LINK_LIBS uriparser::uriparser)
+  list(APPEND ARROW_STATIC_INSTALL_INTERFACE_LIBS uriparser::uriparser)
+endif()
 
 if(ARROW_WITH_BROTLI)
   # Order is important for static linking

cpp/cmake_modules/ThirdpartyToolchain.cmake

@@ -171,6 +171,7 @@ endif()
 
 if(ARROW_FLIGHT)
   set(ARROW_WITH_GRPC ON)
+  set(ARROW_WITH_URIPARSER ON)
 endif()
 
 if(ARROW_FLIGHT OR ARROW_IPC)
@@ -578,16 +579,18 @@ macro(build_uriparser)
   add_dependencies(uriparser::uriparser uriparser_ep)
 endmacro()
 
-# Unless the user overrides uriparser_SOURCE, build uriparser ourselves
-if("${uriparser_SOURCE}" STREQUAL "")
-  set(uriparser_SOURCE "BUNDLED")
-endif()
+if (ARROW_WITH_URIPARSER)
+  # Unless the user overrides uriparser_SOURCE, build uriparser ourselves
+  if("${uriparser_SOURCE}" STREQUAL "")
+    set(uriparser_SOURCE "BUNDLED")
+  endif()
 
-resolve_dependency(uriparser)
+  resolve_dependency(uriparser)
 
-get_target_property(URIPARSER_INCLUDE_DIRS uriparser::uriparser
+  get_target_property(URIPARSER_INCLUDE_DIRS uriparser::uriparser
                     INTERFACE_INCLUDE_DIRECTORIES)
-include_directories(SYSTEM ${URIPARSER_INCLUDE_DIRS})
+  include_directories(SYSTEM ${URIPARSER_INCLUDE_DIRS})
+endif()
 
 # ----------------------------------------------------------------------
 # Snappy

cpp/src/arrow/CMakeLists.txt

@@ -132,10 +132,15 @@ set(ARROW_SRCS
     util/task-group.cc
     util/thread-pool.cc
     util/trie.cc
-    util/uri.cc
     util/utf8.cc
     vendored/datetime/tz.cpp)
 
+if(ARROW_WITH_URIPARSER)
+  set(ARROW_SRCS
+      ${ARROW_SRCS}
+      util/uri.cc)
+endif()
+
 if("${COMPILER_FAMILY}" STREQUAL "clang")
   set_property(SOURCE util/io-util.cc
                APPEND_STRING