[native] Use Velox::TypeParser instead of Antlr and remove Antlr

presto-native-execution/CMakeLists.txt

@@ -123,13 +123,6 @@ include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 
 find_package(gflags COMPONENTS shared)
 
-find_library(ANTLR4_RUNTIME antlr4-runtime)
-find_path(
-  ANTLR4_RUNTIME_INCLUDE_DIR
-  NAMES antlr4-runtime.h
-  PATH_SUFFIXES antlr4-runtime)
-include_directories(SYSTEM ${ANTLR4_RUNTIME_INCLUDE_DIR})
-
 find_library(GLOG glog)
 
 find_library(FMT fmt)

presto-native-execution/presto_cpp/main/CMakeLists.txt

@@ -58,14 +58,14 @@ target_link_libraries(
   velox_presto_serializer
   velox_serialization
   velox_time
+  velox_type_parser
   velox_type
   velox_type_fbhive
   velox_type_tz
   velox_vector
   velox_window
   ${RE2}
   ${FOLLY_WITH_DEPENDENCIES}
-  ${ANTLR4_RUNTIME}
   ${GLOG}
   ${GFLAGS_LIBRARIES}
   pthread)

presto-native-execution/presto_cpp/main/operators/tests/CMakeLists.txt

@@ -36,7 +36,6 @@ target_link_libraries(
   velox_exec
   gmock
   gtest
-  ${ANTLR4_RUNTIME}
   gtest_main)
 
 set_property(TARGET presto_operators_test PROPERTY JOB_POOL_LINK

presto-native-execution/presto_cpp/main/tests/CMakeLists.txt

@@ -77,13 +77,8 @@ add_test(
   WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_libraries(
-  presto_query_runner_test
-  presto_http
-  velox_presto_serializer
-  presto_type_converter
-  ${ANTLR4_RUNTIME}
-  velox_dwio_dwrf_writer
-  velox_exec_test_lib)
+  presto_query_runner_test presto_http velox_presto_serializer
+  presto_type_converter velox_dwio_dwrf_writer velox_exec_test_lib)
 
 set_property(TARGET presto_query_runner_test PROPERTY JOB_POOL_LINK
                                                       presto_link_job_pool)

presto-native-execution/presto_cpp/main/tests/PrestoQueryRunner.cpp

@@ -22,11 +22,7 @@
 #include "velox/exec/tests/utils/QueryAssertions.h"
 #include "velox/serializers/PrestoSerializer.h"
 
-// ANTLR defines an INVALID_INDEX macro, and DuckDB has a constant variable of
-// the same name.  So we have to include TypeParser.h after Velox.
-// clang-format off
 #include "presto_cpp/main/types/TypeParser.h"
-// clang-format on
 
 using namespace facebook::velox;
 

presto-native-execution/presto_cpp/main/types/CMakeLists.txt

@@ -9,11 +9,10 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-add_library(
-  presto_type_converter OBJECT TypeParser.cpp antlr/TypeSignatureLexer.cpp
-                               antlr/TypeSignatureParser.cpp)
 
-target_link_libraries(presto_type_converter velox_type)
+add_library(presto_type_converter OBJECT TypeParser.cpp)
+
+target_link_libraries(presto_type_converter velox_type_parser)
 
 add_library(presto_types OBJECT PrestoToVeloxQueryPlan.cpp
                                 PrestoToVeloxExpr.cpp PrestoToVeloxSplit.cpp)

presto-native-execution/presto_cpp/main/types/PrestoToVeloxExpr.h

@@ -14,12 +14,8 @@
 #pragma once
 
 #include <stdexcept>
-// antlr-common.h undefines the EOF macro that external/json/nlohmann/json.hpp
-// relies on, so include presto_protcol.h before TypeParser.h
-// clang-format off
-#include "presto_cpp/presto_protocol/presto_protocol.h"
 #include "presto_cpp/main/types/TypeParser.h"
-// clang-format on
+#include "presto_cpp/presto_protocol/presto_protocol.h"
 #include "velox/core/Expressions.h"
 
 namespace facebook::presto {

presto-native-execution/presto_cpp/main/types/PrestoToVeloxQueryPlan.cpp

@@ -27,17 +27,19 @@
 #include "velox/expression/Expr.h"
 #include "velox/vector/ComplexVector.h"
 #include "velox/vector/FlatVector.h"
-#include "presto_cpp/main/operators/BroadcastWrite.h"
-#include "presto_cpp/main/operators/PartitionAndSerialize.h"
-#include "presto_cpp/main/operators/ShuffleWrite.h"
-#include "presto_cpp/main/operators/ShuffleRead.h"
-#include <velox/core/Expressions.h>
+#include "velox/core/Expressions.h"
 #include "velox/common/compression/Compression.h"
 // clang-format on
 
 #include <folly/String.h>
 #include <folly/container/F14Set.h>
 
+#include "presto_cpp/main/operators/BroadcastWrite.h"
+#include "presto_cpp/main/operators/PartitionAndSerialize.h"
+#include "presto_cpp/main/operators/ShuffleRead.h"
+#include "presto_cpp/main/operators/ShuffleWrite.h"
+#include "presto_cpp/main/types/TypeParser.h"
+
 using namespace facebook::velox;
 using namespace facebook::velox::exec;
 using namespace facebook::velox::connector::hive;

presto-native-execution/presto_cpp/main/types/PrestoToVeloxQueryPlan.h

@@ -23,12 +23,8 @@
 
 #include "presto_cpp/main/types/PrestoTaskId.h"
 #include "presto_cpp/main/types/PrestoToVeloxExpr.h"
-// antlr-common.h undefines the EOF macro that external/json/nlohmann/json.hpp
-// relies on, so include presto_protcol.h before TypeParser.h
-// clang-format off
-#include "presto_cpp/presto_protocol/presto_protocol.h"
 #include "presto_cpp/main/types/TypeParser.h"
-// clang-format on
+#include "presto_cpp/presto_protocol/presto_protocol.h"
 
 namespace facebook::presto {