Fix

facebookincubator · May 9, 2024 · da7d81e · da7d81e
1 parent 80367be
commit da7d81e
Show file tree

Hide file tree

Showing 5 changed files with 3 additions and 285 deletions.
diff --git a/CMake/Findgrpc.cmake b/CMake/Findgrpc.cmake
@@ -68,39 +68,6 @@ if(cares_FOUND)
                                                 "${cares_lib}")
 endif()
 
-find_library(upb_json_lib_lib upb_json_lib)
-find_package_handle_standard_args(upb_json_lib REQUIRED_VARS upb_json_lib_lib)
-if(upb_json_lib_FOUND)
-  add_library(upb::upb_json_lib STATIC IMPORTED)
-  target_link_libraries(upb::upb_json_lib INTERFACE ${upb_json_lib_lib})
-  set_target_properties(upb::upb_json_lib PROPERTIES IMPORTED_LOCATION
-                                                     "${upb_json_lib_lib}")
-endif()
-
-find_library(upb_textformat_lib_lib upb_textformat_lib)
-find_package_handle_standard_args(upb_textformat_lib
-                                  REQUIRED_VARS upb_textformat_lib_lib)
-if(upb_textformat_lib_FOUND)
-  add_library(upb::upb_textformat_lib STATIC IMPORTED)
-  target_link_libraries(upb::upb_textformat_lib
-                        INTERFACE ${upb_textformat_lib_lib})
-  set_target_properties(
-    upb::upb_textformat_lib PROPERTIES IMPORTED_LOCATION
-                                       "${upb_textformat_lib_lib}")
-endif()
-
-find_library(upb_collections_lib_lib upb_collections_lib)
-find_package_handle_standard_args(upb_collections_lib
-                                  REQUIRED_VARS upb_collections_lib_lib)
-if(upb_collections_lib_FOUND)
-  add_library(upb::upb_collections_lib STATIC IMPORTED)
-  target_link_libraries(upb::upb_collections_lib
-                        INTERFACE ${upb_collections_lib_lib})
-  set_target_properties(
-    upb::upb_collections_lib PROPERTIES IMPORTED_LOCATION
-                                        "${upb_collections_lib_lib}")
-endif()
-
 find_library(upb_lib upb)
 find_package_handle_standard_args(upb REQUIRED_VARS upb_lib)
 if(upb_FOUND)
@@ -127,34 +94,6 @@ if(crypto_FOUND)
                                                      "${crypto_lib}")
 endif()
 
-find_library(utf8_range_lib utf8_range)
-find_package_handle_standard_args(utf8_range REQUIRED_VARS utf8_range_lib)
-if(utf8_range_FOUND)
-  add_library(utf8::utf8_range STATIC IMPORTED)
-  target_link_libraries(utf8::utf8_range INTERFACE ${utf8_range_lib})
-  set_target_properties(utf8::utf8_range PROPERTIES IMPORTED_LOCATION
-                                                    "${utf8_range_lib}")
-endif()
-
-find_library(utf8_validity_lib utf8_validity)
-find_package_handle_standard_args(utf8_validity REQUIRED_VARS utf8_validity_lib)
-if(utf8_validity_FOUND)
-  add_library(utf8::utf8_validity STATIC IMPORTED)
-  target_link_libraries(utf8::utf8_validity INTERFACE ${utf8_validity_lib})
-  set_target_properties(utf8::utf8_validity PROPERTIES IMPORTED_LOCATION
-                                                       "${utf8_validity_lib}")
-endif()
-
-find_library(utf8_range_lib_lib utf8_range_lib)
-find_package_handle_standard_args(utf8_range_lib
-                                  REQUIRED_VARS utf8_range_lib_lib)
-if(utf8_range_lib_FOUND)
-  add_library(utf8::utf8_range_lib STATIC IMPORTED)
-  target_link_libraries(utf8::utf8_range_lib INTERFACE ${utf8_range_lib_lib})
-  set_target_properties(utf8::utf8_range_lib PROPERTIES IMPORTED_LOCATION
-                                                        "${utf8_range_lib_lib}")
-endif()
-
 find_library(absl_synchronization_lib absl_synchronization)
 find_package_handle_standard_args(absl_synchronization
                                   REQUIRED_VARS absl_synchronization_lib)
@@ -177,18 +116,6 @@ if(absl_time_zone_FOUND)
                                                         "${absl_time_zone_lib}")
 endif()
 
-find_library(absl_kernel_timeout_internal_lib absl_kernel_timeout_internal)
-find_package_handle_standard_args(
-  absl_kernel_timeout_internal REQUIRED_VARS absl_kernel_timeout_internal_lib)
-if(absl_kernel_timeout_internal_FOUND)
-  add_library(absl::absl_kernel_timeout_internal STATIC IMPORTED)
-  target_link_libraries(absl::absl_kernel_timeout_internal
-                        INTERFACE ${absl_kernel_timeout_internal_lib})
-  set_target_properties(
-    absl::absl_kernel_timeout_internal
-    PROPERTIES IMPORTED_LOCATION "${absl_kernel_timeout_internal_lib}")
-endif()
-
 find_library(absl_statusor_lib absl_statusor)
 find_package_handle_standard_args(absl_statusor REQUIRED_VARS absl_statusor_lib)
 if(absl_statusor_FOUND)
@@ -226,41 +153,6 @@ if(absl_cord_FOUND)
                                                    "${absl_cord_lib}")
 endif()
 
-find_library(absl_log_internal_message_lib absl_log_internal_message)
-find_package_handle_standard_args(absl_log_internal_message
-                                  REQUIRED_VARS absl_log_internal_message_lib)
-if(absl_log_internal_message_FOUND)
-  add_library(absl::absl_log_internal_message STATIC IMPORTED)
-  target_link_libraries(absl::absl_log_internal_message
-                        INTERFACE ${absl_log_internal_message_lib})
-  set_target_properties(
-    absl::absl_log_internal_message
-    PROPERTIES IMPORTED_LOCATION "${absl_log_internal_message_lib}")
-endif()
-
-find_library(absl_string_view_lib absl_string_view)
-find_package_handle_standard_args(absl_string_view
-                                  REQUIRED_VARS absl_string_view_lib)
-if(absl_string_view_FOUND)
-  add_library(absl::absl_string_view STATIC IMPORTED)
-  target_link_libraries(absl::absl_string_view
-                        INTERFACE ${absl_string_view_lib})
-  set_target_properties(absl::absl_string_view
-                        PROPERTIES IMPORTED_LOCATION "${absl_string_view_lib}")
-endif()
-
-find_library(absl_log_internal_proto_lib absl_log_internal_proto)
-find_package_handle_standard_args(absl_log_internal_proto
-                                  REQUIRED_VARS absl_log_internal_proto_lib)
-if(absl_log_internal_proto_FOUND)
-  add_library(absl::absl_log_internal_proto STATIC IMPORTED)
-  target_link_libraries(absl::absl_log_internal_proto
-                        INTERFACE ${absl_log_internal_proto_lib})
-  set_target_properties(
-    absl::absl_log_internal_proto PROPERTIES IMPORTED_LOCATION
-                                             "${absl_log_internal_proto_lib}")
-endif()
-
 find_library(absl_symbolize_lib absl_symbolize)
 find_package_handle_standard_args(absl_symbolize
                                   REQUIRED_VARS absl_symbolize_lib)
@@ -348,30 +240,6 @@ if(absl_bad_optional_access_FOUND)
                                               "${absl_bad_optional_access_lib}")
 endif()
 
-find_library(absl_log_internal_format_lib absl_log_internal_format)
-find_package_handle_standard_args(absl_log_internal_format
-                                  REQUIRED_VARS absl_log_internal_format_lib)
-if(absl_log_internal_format_FOUND)
-  add_library(absl::absl_log_internal_format STATIC IMPORTED)
-  target_link_libraries(absl::absl_log_internal_format
-                        INTERFACE ${absl_log_internal_format_lib})
-  set_target_properties(
-    absl::absl_log_internal_format PROPERTIES IMPORTED_LOCATION
-                                              "${absl_log_internal_format_lib}")
-endif()
-
-find_library(absl_log_internal_globals_lib absl_log_internal_globals)
-find_package_handle_standard_args(absl_log_internal_globals
-                                  REQUIRED_VARS absl_log_internal_globals_lib)
-if(absl_log_internal_globals_FOUND)
-  add_library(absl::absl_log_internal_globals STATIC IMPORTED)
-  target_link_libraries(absl::absl_log_internal_globals
-                        INTERFACE ${absl_log_internal_globals_lib})
-  set_target_properties(
-    absl::absl_log_internal_globals
-    PROPERTIES IMPORTED_LOCATION "${absl_log_internal_globals_lib}")
-endif()
-
 find_library(absl_throw_delegate_lib absl_throw_delegate)
 find_package_handle_standard_args(absl_throw_delegate
                                   REQUIRED_VARS absl_throw_delegate_lib)
@@ -488,49 +356,6 @@ if(absl_graphcycles_internal_FOUND)
     PROPERTIES IMPORTED_LOCATION "${absl_graphcycles_internal_lib}")
 endif()
 
-find_library(absl_log_internal_log_sink_set_lib absl_log_internal_log_sink_set)
-find_package_handle_standard_args(
-  absl_log_internal_log_sink_set
-  REQUIRED_VARS absl_log_internal_log_sink_set_lib)
-if(absl_log_internal_log_sink_set_FOUND)
-  add_library(absl::absl_log_internal_log_sink_set STATIC IMPORTED)
-  target_link_libraries(absl::absl_log_internal_log_sink_set
-                        INTERFACE ${absl_log_internal_log_sink_set_lib})
-  set_target_properties(
-    absl::absl_log_internal_log_sink_set
-    PROPERTIES IMPORTED_LOCATION "${absl_log_internal_log_sink_set_lib}")
-endif()
-
-find_library(absl_log_globals_lib absl_log_globals)
-find_package_handle_standard_args(absl_log_globals
-                                  REQUIRED_VARS absl_log_globals_lib)
-if(absl_log_globals_FOUND)
-  add_library(absl::absl_log_globals STATIC IMPORTED)
-  target_link_libraries(absl::absl_log_globals
-                        INTERFACE ${absl_log_globals_lib})
-  set_target_properties(absl::absl_log_globals
-                        PROPERTIES IMPORTED_LOCATION "${absl_log_globals_lib}")
-endif()
-
-find_library(absl_log_entry_lib absl_log_entry)
-find_package_handle_standard_args(absl_log_entry
-                                  REQUIRED_VARS absl_log_entry_lib)
-if(absl_log_entry_FOUND)
-  add_library(absl::absl_log_entry STATIC IMPORTED)
-  target_link_libraries(absl::absl_log_entry INTERFACE ${absl_log_entry_lib})
-  set_target_properties(absl::absl_log_entry PROPERTIES IMPORTED_LOCATION
-                                                        "${absl_log_entry_lib}")
-endif()
-
-find_library(absl_log_sink_lib absl_log_sink)
-find_package_handle_standard_args(absl_log_sink REQUIRED_VARS absl_log_sink_lib)
-if(absl_log_sink_FOUND)
-  add_library(absl::absl_log_sink STATIC IMPORTED)
-  target_link_libraries(absl::absl_log_sink INTERFACE ${absl_log_sink_lib})
-  set_target_properties(absl::absl_log_sink PROPERTIES IMPORTED_LOCATION
-                                                       "${absl_log_sink_lib}")
-endif()
-
 find_library(absl_examine_stack_lib absl_examine_stack)
 find_package_handle_standard_args(absl_examine_stack
                                   REQUIRED_VARS absl_examine_stack_lib)
@@ -632,42 +457,6 @@ if(absl_time_FOUND)
                                                    "${absl_time_lib}")
 endif()
 
-find_library(absl_crc_cord_state_lib absl_crc_cord_state)
-find_package_handle_standard_args(absl_crc_cord_state
-                                  REQUIRED_VARS absl_crc_cord_state_lib)
-if(absl_crc_cord_state_FOUND)
-  add_library(absl::absl_crc_cord_state STATIC IMPORTED)
-  target_link_libraries(absl::absl_crc_cord_state
-                        INTERFACE ${absl_crc_cord_state_lib})
-  set_target_properties(
-    absl::absl_crc_cord_state PROPERTIES IMPORTED_LOCATION
-                                         "${absl_crc_cord_state_lib}")
-endif()
-
-find_library(absl_log_internal_check_op_lib absl_log_internal_check_op)
-find_package_handle_standard_args(absl_log_internal_check_op
-                                  REQUIRED_VARS absl_log_internal_check_op_lib)
-if(absl_log_internal_check_op_FOUND)
-  add_library(absl::absl_log_internal_check_op STATIC IMPORTED)
-  target_link_libraries(absl::absl_log_internal_check_op
-                        INTERFACE ${absl_log_internal_check_op_lib})
-  set_target_properties(
-    absl::absl_log_internal_check_op
-    PROPERTIES IMPORTED_LOCATION "${absl_log_internal_check_op_lib}")
-endif()
-
-find_library(absl_log_internal_nullguard_lib absl_log_internal_nullguard)
-find_package_handle_standard_args(absl_log_internal_nullguard
-                                  REQUIRED_VARS absl_log_internal_nullguard_lib)
-if(absl_log_internal_nullguard_FOUND)
-  add_library(absl::absl_log_internal_nullguard STATIC IMPORTED)
-  target_link_libraries(absl::absl_log_internal_nullguard
-                        INTERFACE ${absl_log_internal_nullguard_lib})
-  set_target_properties(
-    absl::absl_log_internal_nullguard
-    PROPERTIES IMPORTED_LOCATION "${absl_log_internal_nullguard_lib}")
-endif()
-
 find_library(absl_str_format_internal_lib absl_str_format_internal)
 find_package_handle_standard_args(absl_str_format_internal
                                   REQUIRED_VARS absl_str_format_internal_lib)
@@ -910,38 +699,6 @@ if(absl_flags_marshalling_FOUND)
                                             "${absl_flags_marshalling_lib}")
 endif()
 
-find_library(absl_crc32c_lib absl_crc32c)
-find_package_handle_standard_args(absl_crc32c REQUIRED_VARS absl_crc32c_lib)
-if(absl_flags_marshalling_FOUND)
-  add_library(absl::absl_crc32c STATIC IMPORTED)
-  target_link_libraries(absl::absl_crc32c INTERFACE ${absl_crc32c_lib})
-  set_target_properties(absl::absl_crc32c PROPERTIES IMPORTED_LOCATION
-                                                     "${absl_crc32c_lib}")
-endif()
-
-find_library(absl_crc_cpu_detect_lib absl_crc_cpu_detect)
-find_package_handle_standard_args(absl_crc_cpu_detect
-                                  REQUIRED_VARS absl_crc_cpu_detect_lib)
-if(absl_crc_cpu_detect_FOUND)
-  add_library(absl::absl_crc_cpu_detect STATIC IMPORTED)
-  target_link_libraries(absl::absl_crc_cpu_detect
-                        INTERFACE ${absl_crc_cpu_detect_lib})
-  set_target_properties(
-    absl::absl_crc_cpu_detect PROPERTIES IMPORTED_LOCATION
-                                         "${absl_crc_cpu_detect_lib}")
-endif()
-
-find_library(absl_crc_internal_lib absl_crc_internal)
-find_package_handle_standard_args(absl_crc_internal
-                                  REQUIRED_VARS absl_crc_internal_lib)
-if(absl_crc_internal_FOUND)
-  add_library(absl::absl_crc_internal STATIC IMPORTED)
-  target_link_libraries(absl::absl_crc_internal
-                        INTERFACE ${absl_crc_internal_lib})
-  set_target_properties(absl::absl_crc_internal
-                        PROPERTIES IMPORTED_LOCATION "${absl_crc_internal_lib}")
-endif()
-
 find_library(absl_spinlock_wait_lib absl_spinlock_wait)
 find_package_handle_standard_args(absl_spinlock_wait
                                   REQUIRED_VARS absl_spinlock_wait_lib)

diff --git a/velox/functions/sparksql/fuzzer/CMakeLists.txt b/velox/functions/sparksql/fuzzer/CMakeLists.txt
@@ -113,25 +113,16 @@ target_link_libraries(
   upb::upb
   boringssl::ssl
   boringssl::crypto
-  utf8::utf8_range
-  utf8::utf8_validity
-  utf8::utf8_range_lib
-  absl::absl_kernel_timeout_internal
   absl::absl_statusor
   absl::absl_status
   absl::absl_cordz_info
   absl::absl_cord
-  absl::absl_log_internal_message
-  absl::absl_string_view
-  absl::absl_log_internal_proto
   absl::absl_symbolize
   absl::absl_demangle_internal
   absl::absl_flags_parse
   absl::absl_flags
   absl::absl_cord_internal
   absl::absl_bad_optional_access
-  absl::absl_log_internal_format
-  absl::absl_log_internal_globals
   absl::absl_throw_delegate
   absl::absl_bad_variant_access
   absl::absl_random_internal_pool_urbg
@@ -143,10 +134,6 @@ target_link_libraries(
   absl::absl_graphcycles_internal
   absl::absl_base
   absl::absl_malloc_internal
-  absl::absl_log_internal_log_sink_set
-  absl::absl_log_globals
-  absl::absl_log_entry
-  absl::absl_log_sink
   absl::absl_examine_stack
   absl::absl_debugging_internal
   absl::absl_exponential_biased
@@ -155,10 +142,7 @@ target_link_libraries(
   absl::absl_stacktrace
   absl::absl_time
   absl::absl_cordz_functions
-  absl::absl_crc_cord_state
   absl::absl_raw_logging_internal
-  absl::absl_log_internal_check_op
-  absl::absl_log_internal_nullguard
   absl::absl_str_format_internal
   absl::absl_strerror
   absl::absl_strings
@@ -180,9 +164,6 @@ target_link_libraries(
   absl::absl_flags_config
   absl::absl_flags_program_name
   absl::absl_flags_marshalling
-  absl::absl_crc32c
-  absl::absl_crc_cpu_detect
-  absl::absl_crc_internal
   absl::absl_synchronization
   absl::absl_time_zone
   absl::absl_spinlock_wait

diff --git a/velox/functions/sparksql/fuzzer/SparkQueryRunner.cpp b/velox/functions/sparksql/fuzzer/SparkQueryRunner.cpp
@@ -27,12 +27,11 @@
 #include "grpc/grpc.h"
 #include "velox/common/base/Fs.h"
 #include "velox/dwio/common/WriterFactory.h"
-#include "velox/exec/fuzzer/proto/spark/connect/base.pb.h"
-#include "velox/exec/fuzzer/proto/spark/connect/relations.pb.h"
+#include "velox/functions/sparksql/fuzzer/proto/spark/connect/base.pb.h"
+#include "velox/functions/sparksql/fuzzer/proto/spark/connect/relations.pb.h"
 #include "velox/exec/tests/utils/QueryAssertions.h"
 #include "velox/exec/tests/utils/TempFilePath.h"
 #include "velox/functions/sparksql/fuzzer/SparkQueryRunner.h"
-#include "velox/vector/arrow/Abi.h"
 #include "velox/vector/arrow/Bridge.h"
 
 using namespace spark::connect;

diff --git a/velox/functions/sparksql/fuzzer/SparkQueryRunner.h b/velox/functions/sparksql/fuzzer/SparkQueryRunner.h
@@ -19,7 +19,7 @@
 #include "grpc++/client_context.h"
 #include "velox/common/memory/Memory.h"
 #include "velox/exec/fuzzer/ReferenceQueryRunner.h"
-#include "velox/exec/fuzzer/proto/spark/connect/base.grpc.pb.h"
+#include "velox/functions/sparksql/fuzzer/proto/spark/connect/base.grpc.pb.h"
 #include "velox/functions/sparksql/fuzzer/SparkQueryTranslator.h"
 #include "velox/vector/ComplexVector.h"