DX-61034: Arrow changes from apacheGH-34865 PR

dremio · Jan 24, 2024 · 5b85167 · 5b85167
1 parent 1fe109b
commit 5b85167
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/cpp/src/arrow/flight/sql/server.cc b/cpp/src/arrow/flight/sql/server.cc
@@ -831,11 +831,6 @@ Status FlightSqlServerBase::DoAction(const ServerCallContext& context,
     ARROW_ASSIGN_OR_RAISE(ActionEndTransactionRequest internal_command,
                           ParseActionEndTransactionRequest(any));
     ARROW_RETURN_NOT_OK(EndTransaction(context, internal_command));
-  } else if (action.type == FlightSqlServerBase::kCloseSessionActionType.type) {
-    ARROW_ASSIGN_OR_RAISE(ActionCloseSessionRequest internal_command,
-                          ParseActionCloseSessionRequest(any));
-    ARROW_ASSIGN_OR_RAISE(CloseSessionResult result, CloseSession(context, internal_command));
-    ARROW_ASSIGN_OR_RAISE(Result packed_result, PackActionResult(std::move(result)));
   } else if (action.type == ActionType::kSetSessionOptions.type) {
     std::string_view body(*action.body);
     ARROW_ASSIGN_OR_RAISE(auto request, SetSessionOptionsRequest::Deserialize(body));

diff --git a/cpp/src/arrow/flight/sql/server_session_middleware.h b/cpp/src/arrow/flight/sql/server_session_middleware.h
@@ -28,6 +28,7 @@
 
 #include "arrow/flight/server_middleware.h"
 #include "arrow/flight/sql/types.h"
+#include "arrow/flight/types.h"
 
 namespace arrow {
 namespace flight {