fix several build issues and optimize the cmake files

Author: wraymo

CMake/FindANTLR.cmake

@@ -156,7 +156,7 @@ if(ANTLR_EXECUTABLE AND Java_JAVA_EXECUTABLE)
       OUTPUT ${ANTLR_${Name}_OUTPUTS}
       COMMAND
         ${Java_JAVA_EXECUTABLE} -jar ${ANTLR_EXECUTABLE} ${InputFile} -o
-        ${ANTLR_${Name}_ORIGINAL_OUTPUT_DIR} -no-listener -Dlanguage=Cpp
+        ${ANTLR_${Name}_OUTPUT_DIR} -no-listener -Dlanguage=Cpp
         ${ANTLR_TARGET_COMPILE_FLAGS}
       DEPENDS ${InputFile} ${ANTLR_TARGET_DEPENDS}
       WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

velox/connectors/clp/CMakeLists.txt

@@ -21,21 +21,8 @@ velox_add_library(
   ClpDataSource.cpp
   ClpTableHandle.cpp)
 
-velox_link_libraries(
-  velox_clp_connector
-  PRIVATE
-    clp-s-search
-    velox_connector
-    simdjson::simdjson
-    msgpack-cxx
-    spdlog::spdlog
-    absl::flat_hash_map
-    Boost::filesystem
-    Boost::headers)
-
-velox_include_directories(
-  velox_clp_connector PUBLIC ${clp_SOURCE_DIR}/components/core/submodules
-                             ${CLP_SRC_DIR})
+velox_link_libraries(velox_clp_connector PRIVATE clp-s-search velox_connector
+                                                 simdjson::simdjson)
 
 target_compile_features(velox_clp_connector PRIVATE cxx_std_20)
 

velox/connectors/clp/ClpConnector.cpp

@@ -14,6 +14,8 @@
  * limitations under the License.
  */
 
+#include "clp_s/TimestampPattern.hpp"
+
 #include "velox/connectors/clp/ClpConnector.h"
 #include "velox/connectors/clp/ClpDataSource.h"
 
@@ -46,4 +48,14 @@ std::unique_ptr<DataSink> ClpConnector::createDataSink(
   VELOX_NYI("createDataSink for ClpConnector is not implemented!");
 }
 
+ClpConnectorFactory::ClpConnectorFactory()
+    : ConnectorFactory(kClpConnectorName) {
+  clp_s::TimestampPattern::init();
+}
+
+ClpConnectorFactory::ClpConnectorFactory(const char* connectorName)
+    : ConnectorFactory(connectorName) {
+  clp_s::TimestampPattern::init();
+}
+
 } // namespace facebook::velox::connector::clp

velox/connectors/clp/ClpConnector.h

@@ -16,7 +16,6 @@
 
 #pragma once
 
-#include "clp_s/TimestampPattern.hpp"
 #include "velox/connectors/Connector.h"
 #include "velox/connectors/clp/ClpConfig.h"
 
@@ -62,11 +61,8 @@ class ClpConnectorFactory : public ConnectorFactory {
  public:
   static constexpr const char* kClpConnectorName = "clp";
 
-  ClpConnectorFactory() : ConnectorFactory(kClpConnectorName) {}
-  explicit ClpConnectorFactory(const char* connectorName)
-      : ConnectorFactory(connectorName) {
-    clp_s::TimestampPattern::init();
-  }
+  ClpConnectorFactory();
+  explicit ClpConnectorFactory(const char* connectorName);
 
   std::shared_ptr<Connector> newConnector(
       const std::string& id,

velox/connectors/clp/search_lib/CMakeLists.txt

@@ -110,22 +110,20 @@ velox_include_directories(
 
 velox_link_libraries(
   clp-s-search
+  PUBLIC msgpack-cxx spdlog::spdlog
   PRIVATE
+    absl::flat_hash_map
     antlr4_static
     Boost::filesystem
     Boost::iostreams
     Boost::program_options
     Boost::url
-    absl::flat_hash_map
     clp::string_utils
     ${CURL_LIBRARIES}
     glog::glog
     OpenSSL::Crypto
     simdjson::simdjson
-    msgpack-cxx
+    velox_vector
     ystdlib::containers
     ystdlib::error_handling
-    zstd::zstd
-    spdlog::spdlog
-    velox_vector
-    velox_external_date)
+    zstd::zstd)