Lint and code style fixes

Re-add deleted submodule parquet-testing

clang-format lint fix

cpplint lint fix

Exclude whereami in rat exclude list

C++/CLI lint fix

Update parquet-testing to match commit from `main`

Address Kou's comments

ODBC directory lint fixes

Catching the lint fixes outside of `flightsql-odbc` code

Author: alinaliBQ

cpp/CMakePresets.json

@@ -122,14 +122,6 @@
         "ARROW_FLIGHT_SQL": "ON"
       }
     },
-    {
-      "name": "features-flight-sql-odbc",
-      "inherits": "features-flight-sql",
-      "hidden": true,
-      "cacheVariables": {
-        "ARROW_FLIGHT_SQL_ODBC": "ON"
-      }
-    },
     {
       "name": "features-gandiva",
       "inherits": "features-basic",
@@ -186,6 +178,7 @@
       "cacheVariables": {
         "ARROW_BUILD_EXAMPLES": "ON",
         "ARROW_BUILD_UTILITIES": "ON",
+        "ARROW_FLIGHT_SQL_ODBC": "ON",
         "ARROW_SKYHOOK": "ON",
         "ARROW_TENSORFLOW": "ON",
         "PARQUET_BUILD_EXAMPLES": "ON",
@@ -509,15 +502,6 @@
       "displayName": "Release build with Flight SQL",
       "cacheVariables": {}
     },
-    {
-      "name": "ninja-release-flight-sql-odbc",
-      "inherits": [
-        "features-flight-sql-odbc",
-        "base-release"
-      ],
-      "displayName": "Release build with Flight SQL ODBC",
-      "cacheVariables": {}
-    },
     {
       "name": "ninja-release-gandiva",
       "inherits": [

cpp/build-support/lint_cpp_cli.py

@@ -77,6 +77,9 @@ def lint_file(path):
 
 EXCLUSIONS = _paths('''\
     arrow/arrow-config.cmake
+    arrow/flight/sql/odbc/flight_sql/get_info_cache.h
+    arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/blocking_queue.h
+    arrow/flight/sql/odbc/odbcabstraction/include/odbcabstraction/odbc_impl/odbc_handle.h
     arrow/python/iterators.h
     arrow/util/hashing.h
     arrow/util/macros.h

cpp/cmake_modules/DefineOptions.cmake

@@ -343,7 +343,7 @@ takes precedence over ccache if a storage backend is configured" ON)
                 OFF
                 DEPENDS
                 ARROW_FLIGHT_SQL
-                ARROW_COMPUTE)                
+                ARROW_COMPUTE)
 
   define_option(ARROW_GANDIVA
                 "Build the Gandiva libraries"

cpp/cmake_modules/ThirdpartyToolchain.cmake

@@ -410,7 +410,7 @@ if(ARROW_AZURE)
   set(ARROW_WITH_AZURE_SDK ON)
 endif()
 
-if(ARROW_JSON)
+if(ARROW_JSON OR ARROW_FLIGHT_SQL_ODBC)
   set(ARROW_WITH_RAPIDJSON ON)
 endif()
 
@@ -1261,6 +1261,7 @@ endif()
 if(ARROW_BUILD_INTEGRATION
    OR ARROW_BUILD_TESTS
    OR (ARROW_FLIGHT AND (ARROW_TESTING OR ARROW_BUILD_BENCHMARKS))
+   OR ARROW_FLIGHT_SQL_ODBC
    OR (ARROW_S3 AND ARROW_BUILD_BENCHMARKS)
    OR (ARROW_TESTING AND ARROW_BUILD_SHARED))
   set(ARROW_USE_BOOST TRUE)
@@ -5562,3 +5563,13 @@ if(ARROW_WITH_AZURE_SDK)
 endif()
 
 message(STATUS "All bundled static libraries: ${ARROW_BUNDLED_STATIC_LIBS}")
+
+# ----------------------------------------------------------------------
+# Apache Flight SQL ODBC
+
+if(ARROW_FLIGHT_SQL_ODBC)
+  find_package(ODBC REQUIRED)
+  if(MSVC)
+    find_package(Boost REQUIRED COMPONENTS locale)
+  endif()
+endif()

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

@@ -15,36 +15,22 @@
 # specific language governing permissions and limitations
 # under the License.
 
-cmake_minimum_required(VERSION 3.16)
-set(CMAKE_CXX_STANDARD 17)
-
 add_custom_target(arrow_flight_sql_odbc)
 
-if(CMAKE_BUILD_TYPE STREQUAL "Release")
-  add_compile_definitions(NDEBUG)
-endif()
-
-# Add Boost dependencies. Should be pre-installed (Brew on Mac).
-find_package(Boost REQUIRED)
-find_package(ODBC REQUIRED)
-
 add_subdirectory(flight_sql)
 add_subdirectory(odbcabstraction)
 add_subdirectory(tests)
 
 arrow_install_all_headers("arrow/flight/sql/odbc")
 
-set(ARROW_FLIGHT_SQL_ODBC_SRCS
-    entry_points.cc
-    odbc_api.cc
-    )
+set(ARROW_FLIGHT_SQL_ODBC_SRCS entry_points.cc odbc_api.cc)
 
 if(WIN32)
   list(APPEND ARROW_FLIGHT_SQL_ODBC_SRCS odbc.def)
 endif()
 
 if(WIN32)
-  if (MSVC_VERSION GREATER_EQUAL 1900)
+  if(MSVC_VERSION GREATER_EQUAL 1900)
     set(ODBCINST legacy_stdio_definitions odbccp32 shlwapi)
   endif()
 elseif(APPLE)
@@ -54,17 +40,31 @@ else()
 endif()
 
 add_arrow_lib(arrow_flight_sql_odbc
-              CMAKE_PACKAGE_NAME ArrowFlightSqlOdbc
-              PKG_CONFIG_NAME arrow-flight-sql-odbc
-              OUTPUTS ARROW_FLIGHT_SQL_ODBC_LIBRARIES
-              SOURCES ${ARROW_FLIGHT_SQL_ODBC_SRCS}
-              DEPENDENCIES arrow_flight_sql
-              SHARED_LINK_FLAGS ${ARROW_VERSION_SCRIPT_FLAGS} # Defined in cpp/arrow/CMakeLists.txt
-              SHARED_LINK_LIBS arrow_flight_sql_shared
-              SHARED_INSTALL_INTERFACE_LIBS ArrowFlight::arrow_flight_sql_shared
-              STATIC_LINK_LIBS arrow_flight_sql_static
-              STATIC_INSTALL_INTERFACE_LIBS ArrowFlight::arrow_flight_sql_static
-              SHARED_PRIVATE_LINK_LIBS ${ODBC_LIBRARIES} ${ODBCINST} odbcabstraction arrow_odbc_spi_impl)
+              CMAKE_PACKAGE_NAME
+              ArrowFlightSqlOdbc
+              PKG_CONFIG_NAME
+              arrow-flight-sql-odbc
+              OUTPUTS
+              ARROW_FLIGHT_SQL_ODBC_LIBRARIES
+              SOURCES
+              ${ARROW_FLIGHT_SQL_ODBC_SRCS}
+              DEPENDENCIES
+              arrow_flight_sql
+              SHARED_LINK_FLAGS
+              ${ARROW_VERSION_SCRIPT_FLAGS} # Defined in cpp/arrow/CMakeLists.txt
+              SHARED_LINK_LIBS
+              arrow_flight_sql_shared
+              SHARED_INSTALL_INTERFACE_LIBS
+              ArrowFlight::arrow_flight_sql_shared
+              STATIC_LINK_LIBS
+              arrow_flight_sql_static
+              STATIC_INSTALL_INTERFACE_LIBS
+              ArrowFlight::arrow_flight_sql_static
+              SHARED_PRIVATE_LINK_LIBS
+              ${ODBC_LIBRARIES}
+              ${ODBCINST}
+              odbcabstraction
+              arrow_odbc_spi_impl)
 
 foreach(LIB_TARGET ${ARROW_FLIGHT_SQL_ODBC_LIBRARIES})
   target_compile_definitions(${LIB_TARGET} PRIVATE ARROW_FLIGHT_SQL_ODBC_EXPORTING)

cpp/src/arrow/flight/sql/odbc/entry_points.cc

@@ -20,15 +20,14 @@
 #endif
 
 #include <sql.h>
-#include <sqltypes.h>
 #include <sqlext.h>
+#include <sqltypes.h>
 #include <sqlucode.h>
 
 #include "arrow/flight/sql/odbc/odbc_api.h"
 #include "arrow/flight/sql/odbc/visibility.h"
 
-SQLRETURN SQL_API SQLAllocHandle(SQLSMALLINT type, SQLHANDLE parent,
-  SQLHANDLE* result) {
+SQLRETURN SQL_API SQLAllocHandle(SQLSMALLINT type, SQLHANDLE parent, SQLHANDLE* result) {
   return arrow::SQLAllocHandle(type, parent, result);
 }
 
@@ -53,12 +52,13 @@ SQLRETURN SQL_API SQLFreeConnect(SQLHDBC conn) {
 }
 
 SQLRETURN SQL_API SQLDriverConnect(SQLHDBC conn, SQLHWND windowHandle,
-  SQLWCHAR* inConnectionString,
-  SQLSMALLINT inConnectionStringLen,
-  SQLWCHAR* outConnectionString,
-  SQLSMALLINT outConnectionStringBufferLen,
-  SQLSMALLINT* outConnectionStringLen,
-  SQLUSMALLINT driverCompletion) {
-  // TODO: implement SQLDriverConnect by linking to `odbc_impl` //-AL- TODO: create GitHub issue for SQLDriverConnect implementation
+                                   SQLWCHAR* inConnectionString,
+                                   SQLSMALLINT inConnectionStringLen,
+                                   SQLWCHAR* outConnectionString,
+                                   SQLSMALLINT outConnectionStringBufferLen,
+                                   SQLSMALLINT* outConnectionStringLen,
+                                   SQLUSMALLINT driverCompletion) {
+  // TODO: implement SQLDriverConnect by linking to `odbc_impl` //-AL- TODO: create GitHub
+  // issue for SQLDriverConnect implementation
   return SQL_INVALID_HANDLE;
 }

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

@@ -15,28 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-cmake_minimum_required(VERSION 3.16)
-set(CMAKE_CXX_STANDARD 17)
-
-set(CMAKE_POSITION_INDEPENDENT_CODE ON)
-
-include_directories(include include/flight_sql
-                    ${CMAKE_SOURCE_DIR}/odbcabstraction/include)
-
-if(DEFINED CMAKE_TOOLCHAIN_FILE)
-  include(${CMAKE_TOOLCHAIN_FILE})
-endif()
-
-find_package(RapidJSON CONFIG REQUIRED)
-
-if(MSVC)
-  # the following definitions stop arrow from using __declspec when statically
-  # linking and will break on Windows without them
-  add_compile_definitions(ARROW_STATIC ARROW_FLIGHT_STATIC)
-endif()
-
-enable_testing()
-
 add_library(arrow_odbc_spi_impl
             include/flight_sql/flight_sql_driver.h
             accessors/binary_array_accessor.cc
@@ -99,42 +77,31 @@ add_library(arrow_odbc_spi_impl
             system_trust_store.cc
             system_trust_store.h
             utils.cc)
+target_include_directories(arrow_odbc_spi_impl
+                           PUBLIC include include/flight_sql
+                                  ${CMAKE_SOURCE_DIR}/odbcabstraction/include)
 target_include_directories(arrow_odbc_spi_impl PUBLIC ${CMAKE_CURRENT_LIST_DIR})
 
 if(WIN32)
-  target_sources(arrow_odbc_spi_impl PRIVATE
-                 include/flight_sql/config/configuration.h
-                 include/flight_sql/config/connection_string_parser.h
-                 include/flight_sql/ui/add_property_window.h
-                 include/flight_sql/ui/custom_window.h
-                 include/flight_sql/ui/dsn_configuration_window.h
-                 include/flight_sql/ui/window.h
-                 config/configuration.cc
-                 config/connection_string_parser.cc
-                 ui/custom_window.cc
-                 ui/window.cc
-                 ui/dsn_configuration_window.cc
-                 ui/add_property_window.cc
-                 system_dsn.cc)
+  target_sources(arrow_odbc_spi_impl
+                 PRIVATE include/flight_sql/config/configuration.h
+                         include/flight_sql/config/connection_string_parser.h
+                         include/flight_sql/ui/add_property_window.h
+                         include/flight_sql/ui/custom_window.h
+                         include/flight_sql/ui/dsn_configuration_window.h
+                         include/flight_sql/ui/window.h
+                         config/configuration.cc
+                         config/connection_string_parser.cc
+                         ui/custom_window.cc
+                         ui/window.cc
+                         ui/dsn_configuration_window.cc
+                         ui/add_property_window.cc
+                         system_dsn.cc)
 endif()
 
-find_package(ArrowFlightSql)
-
 target_link_libraries(arrow_odbc_spi_impl PUBLIC odbcabstraction arrow_flight_sql_shared)
 
 if(MSVC)
-  set(CMAKE_CXX_FLAGS_RELEASE "/MD")
-  set(CMAKE_CXX_FLAGS_DEBUG "/MDd")
-  # else
-  #   target_link_libraries(arrow_odbc_spi_impl PUBLIC ArrowFlightSql::arrow_flight_sql_static)
-endif()
-
-# set(ARROW_ODBC_SPI_THIRDPARTY_LIBS
-#     ${ARROW_LIBS} gRPC::grpc++ ${ZLIB_LIBRARIES} ${Protobuf_LIBRARIES}
-#     ${OPENSSL_LIBRARIES} ${RapidJSON_LIBRARIES})
-
-if(MSVC)
-  find_package(Boost REQUIRED COMPONENTS locale)
   target_link_libraries(arrow_odbc_spi_impl PUBLIC Boost::locale)
 endif()
 
@@ -146,9 +113,6 @@ set_target_properties(arrow_odbc_spi_impl
                                  RUNTIME_OUTPUT_DIRECTORY
                                  ${CMAKE_BINARY_DIR}/$<CONFIG>/lib)
 
-# target_include_directories(arrow_odbc_spi_impl
-#                            PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
-
 # CLI
 add_executable(arrow_odbc_spi_impl_cli main.cc)
 set_target_properties(arrow_odbc_spi_impl_cli

cpp/src/arrow/flight/sql/odbc/flight_sql/accessors/binary_array_accessor.cc

@@ -24,8 +24,8 @@
 namespace driver {
 namespace flight_sql {
 
-using namespace arrow;
-using namespace odbcabstraction;
+using arrow::BinaryArray;
+using odbcabstraction::RowStatus;
 
 namespace {
 
@@ -71,7 +71,8 @@ BinaryArrayFlightSqlAccessor<TARGET_TYPE>::BinaryArrayFlightSqlAccessor(Array* a
                         BinaryArrayFlightSqlAccessor<TARGET_TYPE>>(array) {}
 
 template <>
-RowStatus BinaryArrayFlightSqlAccessor<CDataType_BINARY>::MoveSingleCell_impl(
+RowStatus
+BinaryArrayFlightSqlAccessor<odbcabstraction::CDataType_BINARY>::MoveSingleCell_impl(
     ColumnBinding* binding, int64_t arrow_row, int64_t i, int64_t& value_offset,
     bool update_value_offset, odbcabstraction::Diagnostics& diagnostics) {
   return MoveSingleCellToBinaryBuffer(binding, this->GetArray(), arrow_row, i,

cpp/src/arrow/flight/sql/odbc/flight_sql/accessors/binary_array_accessor.h

@@ -24,8 +24,8 @@
 namespace driver {
 namespace flight_sql {
 
-using namespace arrow;
-using namespace odbcabstraction;
+using arrow::BinaryArray;
+using odbcabstraction::RowStatus;
 
 template <CDataType TARGET_TYPE>
 class BinaryArrayFlightSqlAccessor

cpp/src/arrow/flight/sql/odbc/flight_sql/accessors/binary_array_accessor_test.cc

@@ -23,22 +23,24 @@
 namespace driver {
 namespace flight_sql {
 
-using namespace arrow;
-using namespace odbcabstraction;
+using arrow::BinaryType;
+using odbcabstraction::OdbcVersion;
+
+using arrow::ArrayFromVector;
 
 TEST(BinaryArrayAccessor, Test_CDataType_BINARY_Basic) {
   std::vector<std::string> values = {"foo", "barx", "baz123"};
   std::shared_ptr<Array> array;
   ArrayFromVector<BinaryType, std::string>(values, &array);
 
-  BinaryArrayFlightSqlAccessor<CDataType_BINARY> accessor(array.get());
+  BinaryArrayFlightSqlAccessor<odbcabstraction::CDataType_BINARY> accessor(array.get());
 
   size_t max_strlen = 64;
   std::vector<char> buffer(values.size() * max_strlen);
   std::vector<ssize_t> strlen_buffer(values.size());
 
-  ColumnBinding binding(CDataType_BINARY, 0, 0, buffer.data(), max_strlen,
-                        strlen_buffer.data());
+  ColumnBinding binding(odbcabstraction::CDataType_BINARY, 0, 0, buffer.data(),
+                        max_strlen, strlen_buffer.data());
 
   int64_t value_offset = 0;
   odbcabstraction::Diagnostics diagnostics("Foo", "Foo", OdbcVersion::V_3);
@@ -61,14 +63,14 @@ TEST(BinaryArrayAccessor, Test_CDataType_BINARY_Truncation) {
   std::shared_ptr<Array> array;
   ArrayFromVector<BinaryType, std::string>(values, &array);
 
-  BinaryArrayFlightSqlAccessor<CDataType_BINARY> accessor(array.get());
+  BinaryArrayFlightSqlAccessor<odbcabstraction::CDataType_BINARY> accessor(array.get());
 
   size_t max_strlen = 8;
   std::vector<char> buffer(values.size() * max_strlen);
   std::vector<ssize_t> strlen_buffer(values.size());
 
-  ColumnBinding binding(CDataType_BINARY, 0, 0, buffer.data(), max_strlen,
-                        strlen_buffer.data());
+  ColumnBinding binding(odbcabstraction::CDataType_BINARY, 0, 0, buffer.data(),
+                        max_strlen, strlen_buffer.data());
 
   std::stringstream ss;
   int64_t value_offset = 0;