fix: Update native protocol code updates and apply format fixes missed in previous PRs. (#43)

Author: anlowee

presto-native-execution/CMakeLists.txt

@@ -30,7 +30,8 @@ message("Appending CMAKE_CXX_FLAGS with ${SCRIPT_CXX_FLAGS}")
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${SCRIPT_CXX_FLAGS}")
 
 # Known warnings that are benign can be disabled:
-# - `restrict` since it triggers a bug in gcc 12. See
+#
+# * `restrict` since it triggers a bug in gcc 12. See
 #   https://gcc.gnu.org/bugzilla/show_bug.cgi?id=105651
 set(DISABLED_WARNINGS
     "-Wno-nullability-completeness \
@@ -69,9 +70,10 @@ option(PRESTO_ENABLE_JWT "Enable JWT (JSON Web Token) authentication" OFF)
 
 option(PRESTO_ENABLE_ARROW_FLIGHT_CONNECTOR "Enable Arrow Flight connector" OFF)
 
-# Set all Velox options below
-# Make sure that if we include folly headers or other dependency headers
-# that include folly headers we turn off the coroutines and turn on int128.
+# Set all Velox options below.
+
+# Make sure that if we include folly headers or other dependency headers that
+# include folly headers we turn off the coroutines and turn on int128.
 add_compile_definitions(FOLLY_HAVE_INT128_T=1 FOLLY_CFG_NO_COROUTINES)
 
 if(PRESTO_ENABLE_S3)
@@ -199,7 +201,8 @@ find_package(wangle CONFIG)
 find_package(FBThrift)
 include_directories(SYSTEM ${FBTHRIFT_INCLUDE_DIR})
 
-set(PROXYGEN_LIBRARIES ${PROXYGEN_HTTP_SERVER} ${PROXYGEN} ${WANGLE} ${FIZZ} ${MVFST_EXCEPTION})
+set(PROXYGEN_LIBRARIES ${PROXYGEN_HTTP_SERVER} ${PROXYGEN} ${WANGLE} ${FIZZ}
+                       ${MVFST_EXCEPTION})
 find_path(PROXYGEN_DIR NAMES include/proxygen)
 set(PROXYGEN_INCLUDE_DIR "${PROXYGEN_DIR}/include/proxygen")
 

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

@@ -111,10 +111,12 @@ set_property(TARGET presto_server_lib PROPERTY JOB_POOL_LINK
 
 add_executable(presto_server PrestoMain.cpp)
 
-# velox_tpch_connector is an OBJECT target in Velox and so needs to be linked
-# to the executable or use TARGET_OBJECT linkage for the presto_server_lib target.
+# velox_tpch_connector is an OBJECT target in Velox and so needs to be linked to
+# the executable or use TARGET_OBJECT linkage for the presto_server_lib target.
 # However, we also would need to add its dependencies (tpch_gen etc).
-# TODO change the target in Velox to a library target then we can move this to the
+#
+# TODO change the target in Velox to a library target then we can move this to
+# the presto_server_lib.
 # presto_server_lib.
 target_link_libraries(presto_server presto_server_lib velox_tpch_connector)
 

presto-native-execution/presto_cpp/presto_protocol/connector/hive/presto_protocol_hive.cpp

@@ -790,6 +790,8 @@ namespace facebook::presto::protocol::hive {
 
 void to_json(json& j, const Table& p) {
   j = json::object();
+  to_json_key(
+      j, "catalogName", p.catalogName, "Table", "String", "catalogName");
   to_json_key(
       j, "databaseName", p.databaseName, "Table", "String", "databaseName");
   to_json_key(j, "tableName", p.tableName, "Table", "String", "tableName");
@@ -830,6 +832,8 @@ void to_json(json& j, const Table& p) {
 }
 
 void from_json(const json& j, Table& p) {
+  from_json_key(
+      j, "catalogName", p.catalogName, "Table", "String", "catalogName");
   from_json_key(
       j, "databaseName", p.databaseName, "Table", "String", "databaseName");
   from_json_key(j, "tableName", p.tableName, "Table", "String", "tableName");

presto-native-execution/presto_cpp/presto_protocol/connector/hive/presto_protocol_hive.h

@@ -180,6 +180,7 @@ void from_json(const json& j, Storage& p);
 } // namespace facebook::presto::protocol::hive
 namespace facebook::presto::protocol::hive {
 struct Table {
+  std::shared_ptr<String> catalogName = {};
   String databaseName = {};
   String tableName = {};
   String owner = {};