Address feedback

Author: justing-bq

cpp/src/arrow/flight/sql/odbc/tests/CMakeLists.txt

@@ -42,11 +42,6 @@ set(ARROW_FLIGHT_SQL_ODBC_TEST_SRCS
     # GH-46889: move protobuf_test_util to a more common location
     ../../../../engine/substrait/protobuf_test_util.cc)
 
-# Resolve segmentation fault error on Windows platform due to Arrow Compute Library Initialization
-if(WIN32)
-  list(APPEND ARROW_FLIGHT_SQL_ODBC_TEST_SRCS ../../../../compute/test_env.cc)
-endif()
-
 # GH-49651 Link ODBC tests statically on Linux and dynamically on macOS/Windows
 if(WIN32 OR APPLE)
   set(ARROW_FLIGHT_SQL_ODBC_TEST_LINK_LIBS arrow_flight_sql_odbc_shared

cpp/src/arrow/flight/sql/odbc/tests/odbc_test_suite.cc

@@ -19,6 +19,7 @@
 // with windows.h
 #include "arrow/flight/sql/odbc/odbc_impl/flight_sql_connection.h"
 
+#include "arrow/compute/api.h"
 #include "arrow/flight/sql/odbc/tests/odbc_test_suite.h"
 
 // For DSN registration
@@ -82,12 +83,28 @@ class OdbcTestEnvironment : public ::testing::Environment {
   }
 };
 
+#ifdef _WIN32
+// A global test "environment", to ensure Arrow compute kernel functions are registered
+class ComputeKernelEnvironment : public ::testing::Environment {
+ public:
+  void SetUp() override { ASSERT_OK(arrow::compute::Initialize()); }
+};
+
+::testing::Environment* compute_kernel_env =
+    ::testing::AddGlobalTestEnvironment(new ComputeKernelEnvironment);
+#endif  // _WIN32
+
 ::testing::Environment* mock_server_env =
     ::testing::AddGlobalTestEnvironment(new MockServerEnvironment);
 
 ::testing::Environment* odbc_test_env =
     ::testing::AddGlobalTestEnvironment(new OdbcTestEnvironment);
 
+SQLHENV FlightSQLOdbcEnvConnHandleRemoteTestBase::env_h = SQL_NULL_HENV;
+SQLHDBC FlightSQLOdbcEnvConnHandleRemoteTestBase::conn_h = SQL_NULL_HDBC;
+SQLHENV FlightSQLOdbcEnvConnHandleMockTestBase::env_h = SQL_NULL_HENV;
+SQLHDBC FlightSQLOdbcEnvConnHandleMockTestBase::conn_h = SQL_NULL_HDBC;
+
 void ODBCTestBase::AllocEnvConnHandles(SQLHENV& env_handle, SQLHDBC& conn_handle,
                                        SQLINTEGER odbc_ver) {
   // Allocate an environment handle
@@ -250,20 +267,19 @@ void FlightSQLOdbcEnvConnHandleRemoteTestBase::SetUpTestSuite() {
     return;
   }
 
-  AllocEnvConnHandles(remote_non_connection_handles.env,
-                      remote_non_connection_handles.conn);
-  env = remote_non_connection_handles.env;
-  conn = remote_non_connection_handles.conn;
-  stmt = remote_non_connection_handles.stmt;
+  env_h = SQL_NULL_HENV;
+  conn_h = SQL_NULL_HDBC;
+  AllocEnvConnHandles(env_h, conn_h);
+  env = env_h;
+  conn = conn_h;
 }
 
 void FlightSQLOdbcEnvConnHandleRemoteTestBase::TearDownTestSuite() {
   if (!RunningRemoteTests()) {
     return;
   }
 
-  FreeEnvConnHandles(remote_non_connection_handles.env,
-                     remote_non_connection_handles.conn);
+  FreeEnvConnHandles(env_h, conn_h);
 }
 
 std::string FindTokenInCallHeaders(const CallHeaders& incoming_headers) {
@@ -446,14 +462,15 @@ void FlightSQLOdbcV2MockTestBase::SetUpTestSuite() {
 }
 
 void FlightSQLOdbcEnvConnHandleMockTestBase::SetUpTestSuite() {
-  AllocEnvConnHandles(mock_non_connection_handles.env, mock_non_connection_handles.conn);
-  env = mock_non_connection_handles.env;
-  conn = mock_non_connection_handles.conn;
-  stmt = mock_non_connection_handles.stmt;
+  env_h = SQL_NULL_HENV;
+  conn_h = SQL_NULL_HDBC;
+  AllocEnvConnHandles(env_h, conn_h);
+  env = env_h;
+  conn = conn_h;
 }
 
 void FlightSQLOdbcEnvConnHandleMockTestBase::TearDownTestSuite() {
-  FreeEnvConnHandles(mock_non_connection_handles.env, mock_non_connection_handles.conn);
+  FreeEnvConnHandles(env_h, conn_h);
 }
 
 bool CompareConnPropertyMap(Connection::ConnPropertyMap map1,

cpp/src/arrow/flight/sql/odbc/tests/odbc_test_suite.h

@@ -73,7 +73,7 @@ inline OdbcHandles mock_odbcv3_handles;
 inline OdbcHandles mock_odbcv2_handles;
 inline OdbcHandles mock_non_connection_handles;
 
-// These handles are meant to point to to the relevant handle above
+// These handles are meant to point to the relevant handle above
 // depending on the test fixture.
 inline SQLHENV env = SQL_NULL_HENV;
 inline SQLHDBC conn = SQL_NULL_HDBC;
@@ -142,6 +142,10 @@ class FlightSQLOdbcEnvConnHandleRemoteTestBase : public FlightSQLODBCRemoteTestB
   static void TearDownTestSuite();
   void SetUp() override {}
   void TearDown() override {}
+
+ private:
+  static SQLHENV env_h;
+  static SQLHDBC conn_h;
 };
 
 static constexpr std::string_view kAuthorizationHeader = "authorization";
@@ -233,6 +237,10 @@ class FlightSQLOdbcEnvConnHandleMockTestBase : public FlightSQLODBCMockTestBase
   static void TearDownTestSuite();
   void SetUp() override {}
   void TearDown() override {}
+
+ private:
+  static SQLHENV env_h;
+  static SQLHDBC conn_h;
 };
 
 /** ODBC read buffer size. */