-
Notifications
You must be signed in to change notification settings - Fork 3.9k
GH-46522: [C++][FlightRPC] Add Arrow Flight SQL ODBC driver #40939
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
fbb59e1
f795885
b251d50
d85771f
4485696
f7d52d5
0983cb0
bf48db0
0851610
5ec1fdd
e716a08
1691897
dda37df
845131d
31c90bf
faca7ad
c788ba3
f435e15
141e900
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -2290,3 +2290,46 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | |
| LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
| OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
| THE SOFTWARE. | ||
|
|
||
| -------------------------------------------------------------------------------- | ||
| The files cpp/src/arrow/vendored/whereami/whereami.h, | ||
| cpp/src/arrow/vendored/whereami/whereami.cc are adapted from | ||
| Grégory Pakosz's whereami library (https://github.com/gpakosz/whereami) | ||
| It is dual licensed under both the WTFPLv2 and MIT licenses. | ||
|
|
||
| The WTFPLv2 License | ||
| DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE | ||
| Version 2, December 2004 | ||
|
|
||
| Copyright (C) 2004 Sam Hocevar <[email protected]> | ||
|
|
||
| Everyone is permitted to copy and distribute verbatim or modified | ||
| copies of this license document, and changing it is allowed as long | ||
| as the name is changed. | ||
|
|
||
| DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE | ||
| TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION | ||
|
|
||
| 0. You just DO WHAT THE FUCK YOU WANT TO. | ||
| 1. Bla bla bla | ||
| 2. Montesqieu et camembert, vive la France, zut alors! | ||
|
|
||
| The MIT License (MIT) | ||
| Copyright Gregory Pakosz | ||
|
|
||
| Permission is hereby granted, free of charge, to any person obtaining a copy of | ||
| this software and associated documentation files (the "Software"), to deal in | ||
| the Software without restriction, including without limitation the rights to | ||
| use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of | ||
| the Software, and to permit persons to whom the Software is furnished to do so, | ||
| subject to the following conditions: | ||
|
|
||
| The above copyright notice and this permission notice shall be included in all | ||
| copies or substantial portions of the Software. | ||
|
|
||
| THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
| IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS | ||
| FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR | ||
| COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER | ||
| IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN | ||
| CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. | ||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -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 | ||
|
Comment on lines
+80
to
+82
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Why do we need them?
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. The CLI/C++ support is being removed (#45810) to allow usage of
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
| arrow/python/iterators.h | ||
| arrow/util/hashing.h | ||
| arrow/util/macros.h | ||
|
|
||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,21 @@ | ||
| # Licensed to the Apache Software Foundation (ASF) under one | ||
| # or more contributor license agreements. See the NOTICE file | ||
| # distributed with this work for additional information | ||
| # regarding copyright ownership. The ASF licenses this file | ||
| # to you under the Apache License, Version 2.0 (the | ||
| # "License"); you may not use this file except in compliance | ||
| # with the License. You may obtain a copy of the License at | ||
| # | ||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||
| # | ||
| # Unless required by applicable law or agreed to in writing, | ||
| # software distributed under the License is distributed on an | ||
| # "AS IS" BASIS, 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_custom_target(arrow_flight_sql_odbc) | ||
|
|
||
| add_subdirectory(flight_sql) | ||
| add_subdirectory(odbcabstraction) |
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,140 @@ | ||||||
| # Licensed to the Apache Software Foundation (ASF) under one | ||||||
| # or more contributor license agreements. See the NOTICE file | ||||||
| # distributed with this work for additional information | ||||||
| # regarding copyright ownership. The ASF licenses this file | ||||||
| # to you under the Apache License, Version 2.0 (the | ||||||
| # "License"); you may not use this file except in compliance | ||||||
| # with the License. You may obtain a copy of the License at | ||||||
| # | ||||||
| # http://www.apache.org/licenses/LICENSE-2.0 | ||||||
| # | ||||||
| # Unless required by applicable law or agreed to in writing, | ||||||
| # software distributed under the License is distributed on an | ||||||
| # "AS IS" BASIS, 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(arrow_odbc_spi_impl | ||||||
|
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Could you use our arrow/cpp/cmake_modules/BuildUtils.cmake Line 190 in 5989387
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. We have an upcoming PR#46099 that uses
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Sorry, I may misunderstand your comment... What will be focused in #46099? Will #46099 focus on replacing
Could you explain why |
||||||
| include/flight_sql/flight_sql_driver.h | ||||||
| accessors/binary_array_accessor.cc | ||||||
| accessors/binary_array_accessor.h | ||||||
| accessors/boolean_array_accessor.cc | ||||||
| accessors/boolean_array_accessor.h | ||||||
| accessors/common.h | ||||||
| accessors/date_array_accessor.cc | ||||||
| accessors/date_array_accessor.h | ||||||
| accessors/decimal_array_accessor.cc | ||||||
| accessors/decimal_array_accessor.h | ||||||
| accessors/main.h | ||||||
| accessors/primitive_array_accessor.cc | ||||||
| accessors/primitive_array_accessor.h | ||||||
| accessors/string_array_accessor.cc | ||||||
| accessors/string_array_accessor.h | ||||||
| accessors/time_array_accessor.cc | ||||||
| accessors/time_array_accessor.h | ||||||
| accessors/timestamp_array_accessor.cc | ||||||
| accessors/timestamp_array_accessor.h | ||||||
| address_info.cc | ||||||
| address_info.h | ||||||
| flight_sql_auth_method.cc | ||||||
| flight_sql_auth_method.h | ||||||
| flight_sql_connection.cc | ||||||
| flight_sql_connection.h | ||||||
| flight_sql_driver.cc | ||||||
| flight_sql_get_tables_reader.cc | ||||||
| flight_sql_get_tables_reader.h | ||||||
| flight_sql_get_type_info_reader.cc | ||||||
| flight_sql_get_type_info_reader.h | ||||||
| flight_sql_result_set.cc | ||||||
| flight_sql_result_set.h | ||||||
| flight_sql_result_set_accessors.cc | ||||||
| flight_sql_result_set_accessors.h | ||||||
| flight_sql_result_set_column.cc | ||||||
| flight_sql_result_set_column.h | ||||||
| flight_sql_result_set_metadata.cc | ||||||
| flight_sql_result_set_metadata.h | ||||||
| flight_sql_ssl_config.cc | ||||||
| flight_sql_ssl_config.h | ||||||
| flight_sql_statement.cc | ||||||
| flight_sql_statement.h | ||||||
| flight_sql_statement_get_columns.cc | ||||||
| flight_sql_statement_get_columns.h | ||||||
| flight_sql_statement_get_tables.cc | ||||||
| flight_sql_statement_get_tables.h | ||||||
| flight_sql_statement_get_type_info.cc | ||||||
| flight_sql_statement_get_type_info.h | ||||||
| flight_sql_stream_chunk_buffer.cc | ||||||
| flight_sql_stream_chunk_buffer.h | ||||||
| get_info_cache.cc | ||||||
| get_info_cache.h | ||||||
| json_converter.cc | ||||||
| json_converter.h | ||||||
| record_batch_transformer.cc | ||||||
| record_batch_transformer.h | ||||||
| scalar_function_reporter.cc | ||||||
| scalar_function_reporter.h | ||||||
| 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 | ||||||
|
||||||
| target_sources(arrow_odbc_spi_impl | |
| target_sources(arrow_odbc_spi_impl PRIVATE |
According to cmake docs, target_sources need a INTERFACE, PUBLIC or PRIVATE keyword to be able to build. I feel PRIVATE might be suitable here
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Adding the keyword resolved some build issues from my local environment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We may be able to remove this by add_arrow_lib().
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
See #40939 (comment)
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,91 @@ | ||
| // Licensed to the Apache Software Foundation (ASF) under one | ||
| // or more contributor license agreements. See the NOTICE file | ||
| // distributed with this work for additional information | ||
| // regarding copyright ownership. The ASF licenses this file | ||
| // to you under the Apache License, Version 2.0 (the | ||
| // "License"); you may not use this file except in compliance | ||
| // with the License. You may obtain a copy of the License at | ||
| // | ||
| // http://www.apache.org/licenses/LICENSE-2.0 | ||
| // | ||
| // Unless required by applicable law or agreed to in writing, | ||
| // software distributed under the License is distributed on an | ||
| // "AS IS" BASIS, 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. | ||
|
|
||
| #include "arrow/flight/sql/odbc/flight_sql/accessors/binary_array_accessor.h" | ||
|
|
||
| #include <algorithm> | ||
| #include <cstdint> | ||
| #include "arrow/array.h" | ||
|
|
||
| namespace driver { | ||
| namespace flight_sql { | ||
|
|
||
| using arrow::BinaryArray; | ||
| using odbcabstraction::RowStatus; | ||
|
|
||
| namespace { | ||
|
|
||
| inline RowStatus MoveSingleCellToBinaryBuffer(ColumnBinding* binding, BinaryArray* array, | ||
| int64_t arrow_row, int64_t i, | ||
| int64_t& value_offset, | ||
| bool update_value_offset, | ||
| odbcabstraction::Diagnostics& diagnostics) { | ||
| RowStatus result = odbcabstraction::RowStatus_SUCCESS; | ||
|
|
||
| const char* value = array->Value(arrow_row).data(); | ||
| size_t size_in_bytes = array->value_length(arrow_row); | ||
|
|
||
| size_t remaining_length = static_cast<size_t>(size_in_bytes - value_offset); | ||
| size_t value_length = std::min(remaining_length, binding->buffer_length); | ||
|
|
||
| auto* byte_buffer = | ||
| static_cast<unsigned char*>(binding->buffer) + i * binding->buffer_length; | ||
| memcpy(byte_buffer, ((char*)value) + value_offset, value_length); | ||
|
|
||
| if (remaining_length > binding->buffer_length) { | ||
| result = odbcabstraction::RowStatus_SUCCESS_WITH_INFO; | ||
| diagnostics.AddTruncationWarning(); | ||
| if (update_value_offset) { | ||
| value_offset += value_length; | ||
| } | ||
| } else if (update_value_offset) { | ||
| value_offset = -1; | ||
| } | ||
|
|
||
| if (binding->strlen_buffer) { | ||
| binding->strlen_buffer[i] = static_cast<ssize_t>(remaining_length); | ||
| } | ||
|
|
||
| return result; | ||
| } | ||
|
|
||
| } // namespace | ||
|
|
||
| template <CDataType TARGET_TYPE> | ||
| BinaryArrayFlightSqlAccessor<TARGET_TYPE>::BinaryArrayFlightSqlAccessor(Array* array) | ||
| : FlightSqlAccessor<BinaryArray, TARGET_TYPE, | ||
| BinaryArrayFlightSqlAccessor<TARGET_TYPE>>(array) {} | ||
|
|
||
| template <> | ||
| 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, | ||
| value_offset, update_value_offset, diagnostics); | ||
| } | ||
|
|
||
| template <CDataType TARGET_TYPE> | ||
| size_t BinaryArrayFlightSqlAccessor<TARGET_TYPE>::GetCellLength_impl( | ||
| ColumnBinding* binding) const { | ||
| return binding->buffer_length; | ||
| } | ||
|
|
||
| template class BinaryArrayFlightSqlAccessor<odbcabstraction::CDataType_BINARY>; | ||
|
|
||
| } // namespace flight_sql | ||
| } // namespace driver |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I copied both WTFPLv2 and MIT licenses from gpakosz/whereami@e64e8b3