ARROW-14421: [C++] Implement Flight SQL#12013

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.

Sign up for GitHub

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

Closed
lidavidm wants to merge 5 commits into from
Closed

ARROW-14421: [C++] Implement Flight SQL #12013

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
645edf3
ARROW-12922: [Java] Add flight-sql to the flight package
rafael-telles Dec 15, 2021
22bd624
ARROW-14421: [C++] Implement Flight SQL
rafael-telles Dec 15, 2021
16a9df1
ARROW-15112: [Integration][C++][Java] Implement Flight SQL integratio…
rafael-telles Dec 21, 2021
dc3f919
ARROW-15187: [Java][FlightRPC] Fix pom.xml for Flight integration tests
rafael-telles Dec 22, 2021
31fb76c
ARROW-15198: [C++][FlightRPC] Fix conda-python-hdfs build error on fl…
rafael-telles Dec 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ci/docker/conda-cpp.dockerfile
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ ENV ARROW_BUILD_TESTS=ON \
ARROW_DATASET=ON \
ARROW_DEPENDENCY_SOURCE=CONDA \
ARROW_FLIGHT=ON \
ARROW_FLIGHT_SQL=ON \
ARROW_GANDIVA=ON \
ARROW_HOME=$CONDA_PREFIX \
ARROW_ORC=ON \
Expand Down
1 change: 1 addition & 0 deletions ci/scripts/cpp_build.sh
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,7 @@ cmake \
-DARROW_EXTRA_ERROR_CONTEXT=${ARROW_EXTRA_ERROR_CONTEXT:-OFF} \
-DARROW_FILESYSTEM=${ARROW_FILESYSTEM:-ON} \
-DARROW_FLIGHT=${ARROW_FLIGHT:-OFF} \
-DARROW_FLIGHT_SQL=${ARROW_FLIGHT_SQL:-OFF} \
-DARROW_FUZZING=${ARROW_FUZZING:-OFF} \
-DARROW_GANDIVA_JAVA=${ARROW_GANDIVA_JAVA:-OFF} \
-DARROW_GANDIVA_PC_CXX_FLAGS=${ARROW_GANDIVA_PC_CXX_FLAGS:-} \
Expand Down
8 changes: 8 additions & 0 deletions cpp/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -334,6 +334,14 @@ if(ARROW_GANDIVA)
set(ARROW_WITH_RE2 ON)
endif()

if(ARROW_BUILD_INTEGRATION AND ARROW_FLIGHT)
set(ARROW_FLIGHT_SQL ON)
endif()

if(ARROW_FLIGHT_SQL)
set(ARROW_FLIGHT ON)
endif()

if(ARROW_CUDA
OR ARROW_FLIGHT
OR ARROW_PARQUET
Expand Down
2 changes: 2 additions & 0 deletions cpp/cmake_modules/DefineOptions.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -226,6 +226,8 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
define_option(ARROW_FLIGHT
"Build the Arrow Flight RPC System (requires GRPC, Protocol Buffers)" OFF)

define_option(ARROW_FLIGHT_SQL "Build the Arrow Flight SQL extension" OFF)

define_option(ARROW_GANDIVA "Build the Gandiva libraries" OFF)

define_option(ARROW_GCS
Expand Down
93 changes: 93 additions & 0 deletions cpp/cmake_modules/FindArrowFlightSql.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
# 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.

# - Find Arrow Flight SQL
#
# This module requires Arrow from which it uses
# arrow_find_package()
#
# This module defines
# ARROW_FLIGHT_SQL_FOUND, whether Flight has been found
# ARROW_FLIGHT_SQL_IMPORT_LIB,
# path to libarrow_flight's import library (Windows only)
# ARROW_FLIGHT_SQL_INCLUDE_DIR, directory containing headers
# ARROW_FLIGHT_SQL_LIBS, deprecated. Use ARROW_FLIGHT_SQL_LIB_DIR instead
# ARROW_FLIGHT_SQL_LIB_DIR, directory containing Flight libraries
# ARROW_FLIGHT_SQL_SHARED_IMP_LIB, deprecated. Use ARROW_FLIGHT_SQL_IMPORT_LIB instead
# ARROW_FLIGHT_SQL_SHARED_LIB, path to libarrow_flight's shared library
# ARROW_FLIGHT_SQL_STATIC_LIB, path to libarrow_flight.a

if(DEFINED ARROW_FLIGHT_SQL_FOUND)
return()
endif()

set(find_package_arguments)
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION)
list(APPEND find_package_arguments "${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION}")
endif()
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
list(APPEND find_package_arguments REQUIRED)
endif()
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
list(APPEND find_package_arguments QUIET)
endif()
find_package(Arrow ${find_package_arguments})

if(ARROW_FOUND)
arrow_find_package(ARROW_FLIGHT_SQL
"${ARROW_HOME}"
arrow_flight_sql
arrow/flight/sql/api.h
ArrowFlightSql
arrow-flight-sql)
if(NOT ARROW_FLIGHT_SQL_VERSION)
set(ARROW_FLIGHT_SQL_VERSION "${ARROW_VERSION}")
endif()
endif()

if("${ARROW_FLIGHT_SQL_VERSION}" VERSION_EQUAL "${ARROW_VERSION}")
set(ARROW_FLIGHT_SQL_VERSION_MATCH TRUE)
else()
set(ARROW_FLIGHT_SQL_VERSION_MATCH FALSE)
endif()

mark_as_advanced(ARROW_FLIGHT_SQL_IMPORT_LIB
ARROW_FLIGHT_SQL_INCLUDE_DIR
ARROW_FLIGHT_SQL_LIBS
ARROW_FLIGHT_SQL_LIB_DIR
ARROW_FLIGHT_SQL_SHARED_IMP_LIB
ARROW_FLIGHT_SQL_SHARED_LIB
ARROW_FLIGHT_SQL_STATIC_LIB
ARROW_FLIGHT_SQL_VERSION
ARROW_FLIGHT_SQL_VERSION_MATCH)

find_package_handle_standard_args(
ArrowFlightSql
REQUIRED_VARS ARROW_FLIGHT_SQL_INCLUDE_DIR ARROW_FLIGHT_SQL_LIB_DIR
ARROW_FLIGHT_SQL_VERSION_MATCH
VERSION_VAR ARROW_FLIGHT_SQL_VERSION)
set(ARROW_FLIGHT_SQL_FOUND ${ArrowFlightSql_FOUND})

if(ArrowFlightSql_FOUND AND NOT ArrowFlightSql_FIND_QUIETLY)
message(STATUS "Found the Arrow Flight SQL by ${ARROW_FLIGHT_SQL_FIND_APPROACH}")
message(STATUS "Found the Arrow Flight SQL shared library: ${ARROW_FLIGHT_SQL_SHARED_LIB}"
)
message(STATUS "Found the Arrow Flight SQL import library: ${ARROW_FLIGHT_SQL_IMPORT_LIB}"
)
message(STATUS "Found the Arrow Flight SQL static library: ${ARROW_FLIGHT_SQL_STATIC_LIB}"
)
endif()
43 changes: 43 additions & 0 deletions cpp/cmake_modules/FindSQLite3Alt.cmake
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
# 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.

# Once done this will define
# - FindSQLite3Alt
#
# This module will set the following variables if found:
# SQLite3_INCLUDE_DIRS - SQLite3 include dir.
# SQLite3_LIBRARIES - List of libraries when using SQLite3.
# SQLite3_FOUND - True if SQLite3 found.
#
# Usage of this module as follows:
# find_package(SQLite3Alt)

find_path(SQLite3_INCLUDE_DIR sqlite3.h)
find_library(SQLite3_LIBRARY NAMES sqlite3)

# handle the QUIETLY and REQUIRED arguments and set SQLite3_FOUND to TRUE if
# all listed variables are TRUE
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(SQLite3Alt REQUIRED_VARS SQLite3_LIBRARY
SQLite3_INCLUDE_DIR)

mark_as_advanced(SQLite3_LIBRARY SQLite3_INCLUDE_DIR)

if(SQLite3Alt_FOUND)
set(SQLite3_INCLUDE_DIRS ${SQLite3_INCLUDE_DIR})
set(SQLite3_LIBRARIES ${SQLite3_LIBRARY})
endif()
10 changes: 10 additions & 0 deletions cpp/src/arrow/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -732,6 +732,16 @@ if(ARROW_FLIGHT)
add_subdirectory(flight)
endif()

if(ARROW_FLIGHT_SQL)
add_subdirectory(flight/sql)
endif()

if(ARROW_FLIGHT
AND ARROW_FLIGHT_SQL
AND ARROW_BUILD_INTEGRATION)
add_subdirectory(flight/integration_tests)
endif()

if(ARROW_HIVESERVER2)
add_subdirectory(dbi/hiveserver2)
endif()
Expand Down
34 changes: 17 additions & 17 deletions cpp/src/arrow/flight/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,23 @@ if(WIN32)
list(APPEND ARROW_FLIGHT_LINK_LIBS ws2_32.lib)
endif()

if(ARROW_TEST_LINKAGE STREQUAL "static")
set(ARROW_FLIGHT_TEST_LINKAGE
"${ARROW_TEST_LINKAGE}"
PARENT_SCOPE)
if(Protobuf_USE_STATIC_LIBS)
message(STATUS "Linking Arrow Flight tests statically due to static Protobuf")
set(ARROW_FLIGHT_TEST_LINKAGE
"static"
PARENT_SCOPE)
endif()
if(NOT ARROW_GRPC_USE_SHARED)
message(STATUS "Linking Arrow Flight tests statically due to static gRPC")
set(ARROW_FLIGHT_TEST_LINKAGE
"static"
PARENT_SCOPE)
endif()

if(ARROW_FLIGHT_TEST_LINKAGE STREQUAL "static")
set(ARROW_FLIGHT_TEST_LINK_LIBS
arrow_flight_static arrow_flight_testing_static ${ARROW_FLIGHT_STATIC_LINK_LIBS}
${ARROW_TEST_LINK_LIBS})
Expand DownExpand Up@@ -186,7 +202,6 @@ if(ARROW_TESTING)
OUTPUTS
ARROW_FLIGHT_TESTING_LIBRARIES
SOURCES
test_integration.cc
test_util.cc
DEPENDENCIES
GTest::gtest
Expand DownExpand Up@@ -230,21 +245,6 @@ if(ARROW_BUILD_TESTS OR ARROW_BUILD_BENCHMARKS)
add_dependencies(arrow_flight flight-test-server)
endif()

if(ARROW_BUILD_INTEGRATION)
add_executable(flight-test-integration-server test_integration_server.cc)
target_link_libraries(flight-test-integration-server ${ARROW_FLIGHT_TEST_LINK_LIBS}
${GFLAGS_LIBRARIES} GTest::gtest)

add_executable(flight-test-integration-client test_integration_client.cc)
target_link_libraries(flight-test-integration-client ${ARROW_FLIGHT_TEST_LINK_LIBS}
${GFLAGS_LIBRARIES} GTest::gtest)

add_dependencies(arrow_flight flight-test-integration-client
flight-test-integration-server)
add_dependencies(arrow-integration flight-test-integration-client
flight-test-integration-server)
endif()

if(ARROW_BUILD_BENCHMARKS)
# Perf server for benchmarks
set(PERF_PROTO_GENERATED_FILES "${CMAKE_CURRENT_BINARY_DIR}/perf.pb.cc"
Expand Down
47 changes: 47 additions & 0 deletions cpp/src/arrow/flight/integration_tests/CMakeLists.txt
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
# 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_integration_tests)

if(ARROW_FLIGHT_TEST_LINKAGE STREQUAL "static")
set(ARROW_FLIGHT_TEST_LINK_LIBS
arrow_flight_static
arrow_flight_testing_static
arrow_flight_sql_static
${ARROW_FLIGHT_STATIC_LINK_LIBS}
${ARROW_TEST_LINK_LIBS})
else()
set(ARROW_FLIGHT_TEST_LINK_LIBS
arrow_flight_shared
arrow_flight_testing_shared
arrow_flight_sql_shared
${ARROW_TEST_LINK_LIBS}
${ARROW_FLIGHT_SQL_TEST_LINK_LIBS})
endif()

add_executable(flight-test-integration-server test_integration_server.cc
test_integration.cc)
target_link_libraries(flight-test-integration-server ${ARROW_FLIGHT_TEST_LINK_LIBS}
${GFLAGS_LIBRARIES} GTest::gtest)

add_executable(flight-test-integration-client test_integration_client.cc
test_integration.cc)
target_link_libraries(flight-test-integration-client ${ARROW_FLIGHT_TEST_LINK_LIBS}
${GFLAGS_LIBRARIES} GTest::gtest)

add_dependencies(arrow-integration flight-test-integration-client
flight-test-integration-server)
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ARROW-14421: [C++] Implement Flight SQL#12013

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.

 Sign up for GitHub

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

 Closed

lidavidm
wants to merge
5
commits into

from

 Closed


ARROW-14421: [C++] Implement Flight SQL
#12013
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
645edf3

ARROW-12922: [Java] Add flight-sql to the flight package


rafael-telles Dec 15, 2021
22bd624

ARROW-14421: [C++] Implement Flight SQL


rafael-telles Dec 15, 2021
16a9df1

ARROW-15112: [Integration][C++][Java] Implement Flight SQL integratio…


rafael-telles Dec 21, 2021
dc3f919

ARROW-15187: [Java][FlightRPC] Fix pom.xml for Flight integration tests


rafael-telles Dec 22, 2021
31fb76c

ARROW-15198: [C++][FlightRPC] Fix conda-python-hdfs build error on fl…


rafael-telles Dec 23, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
ci/docker/conda-cpp.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ ENV ARROW_BUILD_TESTS=ON \
 ARROW_DATASET=ON \
 ARROW_DEPENDENCY_SOURCE=CONDA \
 ARROW_FLIGHT=ON \
 ARROW_FLIGHT_SQL=ON \
 ARROW_GANDIVA=ON \
 ARROW_HOME=$CONDA_PREFIX \
 ARROW_ORC=ON \
Expand Down

1 change: 1 addition & 0 deletions
ci/scripts/cpp_build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,7 @@ cmake \
 -DARROW_EXTRA_ERROR_CONTEXT=${ARROW_EXTRA_ERROR_CONTEXT:-OFF} \
 -DARROW_FILESYSTEM=${ARROW_FILESYSTEM:-ON} \
 -DARROW_FLIGHT=${ARROW_FLIGHT:-OFF} \
 -DARROW_FLIGHT_SQL=${ARROW_FLIGHT_SQL:-OFF} \
 -DARROW_FUZZING=${ARROW_FUZZING:-OFF} \
 -DARROW_GANDIVA_JAVA=${ARROW_GANDIVA_JAVA:-OFF} \
 -DARROW_GANDIVA_PC_CXX_FLAGS=${ARROW_GANDIVA_PC_CXX_FLAGS:-} \
Expand Down

8 changes: 8 additions & 0 deletions
cpp/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -334,6 +334,14 @@ if(ARROW_GANDIVA)
 set(ARROW_WITH_RE2 ON)
endif()

if(ARROW_BUILD_INTEGRATION AND ARROW_FLIGHT)
 set(ARROW_FLIGHT_SQL ON)
endif()

if(ARROW_FLIGHT_SQL)
 set(ARROW_FLIGHT ON)
endif()

if(ARROW_CUDA
 OR ARROW_FLIGHT
 OR ARROW_PARQUET
Expand Down

2 changes: 2 additions & 0 deletions
cpp/cmake_modules/DefineOptions.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,6 +226,8 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 define_option(ARROW_FLIGHT
 "Build the Arrow Flight RPC System (requires GRPC, Protocol Buffers)" OFF)

 define_option(ARROW_FLIGHT_SQL "Build the Arrow Flight SQL extension" OFF)

 define_option(ARROW_GANDIVA "Build the Gandiva libraries" OFF)

 define_option(ARROW_GCS
Expand Down

93 changes: 93 additions & 0 deletions
cpp/cmake_modules/FindArrowFlightSql.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
# 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.

# - Find Arrow Flight SQL
#
# This module requires Arrow from which it uses
# arrow_find_package()
#
# This module defines
# ARROW_FLIGHT_SQL_FOUND, whether Flight has been found
# ARROW_FLIGHT_SQL_IMPORT_LIB,
# path to libarrow_flight's import library (Windows only)
# ARROW_FLIGHT_SQL_INCLUDE_DIR, directory containing headers
# ARROW_FLIGHT_SQL_LIBS, deprecated. Use ARROW_FLIGHT_SQL_LIB_DIR instead
# ARROW_FLIGHT_SQL_LIB_DIR, directory containing Flight libraries
# ARROW_FLIGHT_SQL_SHARED_IMP_LIB, deprecated. Use ARROW_FLIGHT_SQL_IMPORT_LIB instead
# ARROW_FLIGHT_SQL_SHARED_LIB, path to libarrow_flight's shared library
# ARROW_FLIGHT_SQL_STATIC_LIB, path to libarrow_flight.a

if(DEFINED ARROW_FLIGHT_SQL_FOUND)
 return()
endif()

set(find_package_arguments)
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION)
 list(APPEND find_package_arguments "${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION}")
endif()
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
 list(APPEND find_package_arguments REQUIRED)
endif()
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
 list(APPEND find_package_arguments QUIET)
endif()
find_package(Arrow ${find_package_arguments})

if(ARROW_FOUND)
 arrow_find_package(ARROW_FLIGHT_SQL
 "${ARROW_HOME}"
 arrow_flight_sql
 arrow/flight/sql/api.h
 ArrowFlightSql
 arrow-flight-sql)
 if(NOT ARROW_FLIGHT_SQL_VERSION)
 set(ARROW_FLIGHT_SQL_VERSION "${ARROW_VERSION}")
 endif()
endif()

if("${ARROW_FLIGHT_SQL_VERSION}" VERSION_EQUAL "${ARROW_VERSION}")
 set(ARROW_FLIGHT_SQL_VERSION_MATCH TRUE)
else()
 set(ARROW_FLIGHT_SQL_VERSION_MATCH FALSE)
endif()

mark_as_advanced(ARROW_FLIGHT_SQL_IMPORT_LIB
 ARROW_FLIGHT_SQL_INCLUDE_DIR
 ARROW_FLIGHT_SQL_LIBS
 ARROW_FLIGHT_SQL_LIB_DIR
 ARROW_FLIGHT_SQL_SHARED_IMP_LIB
 ARROW_FLIGHT_SQL_SHARED_LIB
 ARROW_FLIGHT_SQL_STATIC_LIB
 ARROW_FLIGHT_SQL_VERSION
 ARROW_FLIGHT_SQL_VERSION_MATCH)

find_package_handle_standard_args(
 ArrowFlightSql
 REQUIRED_VARS ARROW_FLIGHT_SQL_INCLUDE_DIR ARROW_FLIGHT_SQL_LIB_DIR
 ARROW_FLIGHT_SQL_VERSION_MATCH
 VERSION_VAR ARROW_FLIGHT_SQL_VERSION)
set(ARROW_FLIGHT_SQL_FOUND ${ArrowFlightSql_FOUND})

if(ArrowFlightSql_FOUND AND NOT ArrowFlightSql_FIND_QUIETLY)
 message(STATUS "Found the Arrow Flight SQL by ${ARROW_FLIGHT_SQL_FIND_APPROACH}")
 message(STATUS "Found the Arrow Flight SQL shared library: ${ARROW_FLIGHT_SQL_SHARED_LIB}"
 )
 message(STATUS "Found the Arrow Flight SQL import library: ${ARROW_FLIGHT_SQL_IMPORT_LIB}"
 )
 message(STATUS "Found the Arrow Flight SQL static library: ${ARROW_FLIGHT_SQL_STATIC_LIB}"
 )
endif()

43 changes: 43 additions & 0 deletions
cpp/cmake_modules/FindSQLite3Alt.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
# 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.

# Once done this will define
# - FindSQLite3Alt
#
# This module will set the following variables if found:
# SQLite3_INCLUDE_DIRS - SQLite3 include dir.
# SQLite3_LIBRARIES - List of libraries when using SQLite3.
# SQLite3_FOUND - True if SQLite3 found.
#
# Usage of this module as follows:
# find_package(SQLite3Alt)

find_path(SQLite3_INCLUDE_DIR sqlite3.h)
find_library(SQLite3_LIBRARY NAMES sqlite3)

# handle the QUIETLY and REQUIRED arguments and set SQLite3_FOUND to TRUE if
# all listed variables are TRUE
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(SQLite3Alt REQUIRED_VARS SQLite3_LIBRARY
 SQLite3_INCLUDE_DIR)

mark_as_advanced(SQLite3_LIBRARY SQLite3_INCLUDE_DIR)

if(SQLite3Alt_FOUND)
 set(SQLite3_INCLUDE_DIRS ${SQLite3_INCLUDE_DIR})
 set(SQLite3_LIBRARIES ${SQLite3_LIBRARY})
endif()

10 changes: 10 additions & 0 deletions
cpp/src/arrow/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -732,6 +732,16 @@ if(ARROW_FLIGHT)
 add_subdirectory(flight)
endif()

if(ARROW_FLIGHT_SQL)
 add_subdirectory(flight/sql)
endif()

if(ARROW_FLIGHT
 AND ARROW_FLIGHT_SQL
 AND ARROW_BUILD_INTEGRATION)
 add_subdirectory(flight/integration_tests)
endif()

if(ARROW_HIVESERVER2)
 add_subdirectory(dbi/hiveserver2)
endif()
Expand Down

34 changes: 17 additions & 17 deletions
cpp/src/arrow/flight/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,23 @@ if(WIN32)
 list(APPEND ARROW_FLIGHT_LINK_LIBS ws2_32.lib)
endif()

if(ARROW_TEST_LINKAGE STREQUAL "static")
set(ARROW_FLIGHT_TEST_LINKAGE
 "${ARROW_TEST_LINKAGE}"
 PARENT_SCOPE)
if(Protobuf_USE_STATIC_LIBS)
 message(STATUS "Linking Arrow Flight tests statically due to static Protobuf")
 set(ARROW_FLIGHT_TEST_LINKAGE
 "static"
 PARENT_SCOPE)
endif()
if(NOT ARROW_GRPC_USE_SHARED)
 message(STATUS "Linking Arrow Flight tests statically due to static gRPC")
 set(ARROW_FLIGHT_TEST_LINKAGE
 "static"
 PARENT_SCOPE)
endif()

if(ARROW_FLIGHT_TEST_LINKAGE STREQUAL "static")
 set(ARROW_FLIGHT_TEST_LINK_LIBS
 arrow_flight_static arrow_flight_testing_static ${ARROW_FLIGHT_STATIC_LINK_LIBS}
 ${ARROW_TEST_LINK_LIBS})
Expand DownExpand Up@@ -186,7 +202,6 @@ if(ARROW_TESTING)
 OUTPUTS
 ARROW_FLIGHT_TESTING_LIBRARIES
 SOURCES
 test_integration.cc
 test_util.cc
 DEPENDENCIES
 GTest::gtest
Expand DownExpand Up@@ -230,21 +245,6 @@ if(ARROW_BUILD_TESTS OR ARROW_BUILD_BENCHMARKS)
 add_dependencies(arrow_flight flight-test-server)
endif()

if(ARROW_BUILD_INTEGRATION)
 add_executable(flight-test-integration-server test_integration_server.cc)
 target_link_libraries(flight-test-integration-server ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

 add_executable(flight-test-integration-client test_integration_client.cc)
 target_link_libraries(flight-test-integration-client ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

 add_dependencies(arrow_flight flight-test-integration-client
 flight-test-integration-server)
 add_dependencies(arrow-integration flight-test-integration-client
 flight-test-integration-server)
endif()

if(ARROW_BUILD_BENCHMARKS)
 # Perf server for benchmarks
 set(PERF_PROTO_GENERATED_FILES "${CMAKE_CURRENT_BINARY_DIR}/perf.pb.cc"
Expand Down

47 changes: 47 additions & 0 deletions
cpp/src/arrow/flight/integration_tests/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
# 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_integration_tests)

if(ARROW_FLIGHT_TEST_LINKAGE STREQUAL "static")
 set(ARROW_FLIGHT_TEST_LINK_LIBS
 arrow_flight_static
 arrow_flight_testing_static
 arrow_flight_sql_static
 ${ARROW_FLIGHT_STATIC_LINK_LIBS}
 ${ARROW_TEST_LINK_LIBS})
else()
 set(ARROW_FLIGHT_TEST_LINK_LIBS
 arrow_flight_shared
 arrow_flight_testing_shared
 arrow_flight_sql_shared
 ${ARROW_TEST_LINK_LIBS}
 ${ARROW_FLIGHT_SQL_TEST_LINK_LIBS})
endif()

add_executable(flight-test-integration-server test_integration_server.cc
 test_integration.cc)
target_link_libraries(flight-test-integration-server ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

add_executable(flight-test-integration-client test_integration_client.cc
 test_integration.cc)
target_link_libraries(flight-test-integration-client ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

add_dependencies(arrow-integration flight-test-integration-client
 flight-test-integration-server)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-14421: [C++] Implement Flight SQL#12013

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.

 Sign up for GitHub

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

 Closed

lidavidm
wants to merge
5
commits into

from

 Closed


ARROW-14421: [C++] Implement Flight SQL
#12013
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
645edf3

ARROW-12922: [Java] Add flight-sql to the flight package


rafael-telles Dec 15, 2021
22bd624

ARROW-14421: [C++] Implement Flight SQL


rafael-telles Dec 15, 2021
16a9df1

ARROW-15112: [Integration][C++][Java] Implement Flight SQL integratio…


rafael-telles Dec 21, 2021
dc3f919

ARROW-15187: [Java][FlightRPC] Fix pom.xml for Flight integration tests


rafael-telles Dec 22, 2021
31fb76c

ARROW-15198: [C++][FlightRPC] Fix conda-python-hdfs build error on fl…


rafael-telles Dec 23, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
ci/docker/conda-cpp.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ ENV ARROW_BUILD_TESTS=ON \
 ARROW_DATASET=ON \
 ARROW_DEPENDENCY_SOURCE=CONDA \
 ARROW_FLIGHT=ON \
 ARROW_FLIGHT_SQL=ON \
 ARROW_GANDIVA=ON \
 ARROW_HOME=$CONDA_PREFIX \
 ARROW_ORC=ON \
Expand Down

1 change: 1 addition & 0 deletions
ci/scripts/cpp_build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,7 @@ cmake \
 -DARROW_EXTRA_ERROR_CONTEXT=${ARROW_EXTRA_ERROR_CONTEXT:-OFF} \
 -DARROW_FILESYSTEM=${ARROW_FILESYSTEM:-ON} \
 -DARROW_FLIGHT=${ARROW_FLIGHT:-OFF} \
 -DARROW_FLIGHT_SQL=${ARROW_FLIGHT_SQL:-OFF} \
 -DARROW_FUZZING=${ARROW_FUZZING:-OFF} \
 -DARROW_GANDIVA_JAVA=${ARROW_GANDIVA_JAVA:-OFF} \
 -DARROW_GANDIVA_PC_CXX_FLAGS=${ARROW_GANDIVA_PC_CXX_FLAGS:-} \
Expand Down

8 changes: 8 additions & 0 deletions
cpp/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -334,6 +334,14 @@ if(ARROW_GANDIVA)
 set(ARROW_WITH_RE2 ON)
endif()

if(ARROW_BUILD_INTEGRATION AND ARROW_FLIGHT)
 set(ARROW_FLIGHT_SQL ON)
endif()

if(ARROW_FLIGHT_SQL)
 set(ARROW_FLIGHT ON)
endif()

if(ARROW_CUDA
 OR ARROW_FLIGHT
 OR ARROW_PARQUET
Expand Down

2 changes: 2 additions & 0 deletions
cpp/cmake_modules/DefineOptions.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,6 +226,8 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 define_option(ARROW_FLIGHT
 "Build the Arrow Flight RPC System (requires GRPC, Protocol Buffers)" OFF)

 define_option(ARROW_FLIGHT_SQL "Build the Arrow Flight SQL extension" OFF)

 define_option(ARROW_GANDIVA "Build the Gandiva libraries" OFF)

 define_option(ARROW_GCS
Expand Down

93 changes: 93 additions & 0 deletions
cpp/cmake_modules/FindArrowFlightSql.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
# 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.

# - Find Arrow Flight SQL
#
# This module requires Arrow from which it uses
# arrow_find_package()
#
# This module defines
# ARROW_FLIGHT_SQL_FOUND, whether Flight has been found
# ARROW_FLIGHT_SQL_IMPORT_LIB,
# path to libarrow_flight's import library (Windows only)
# ARROW_FLIGHT_SQL_INCLUDE_DIR, directory containing headers
# ARROW_FLIGHT_SQL_LIBS, deprecated. Use ARROW_FLIGHT_SQL_LIB_DIR instead
# ARROW_FLIGHT_SQL_LIB_DIR, directory containing Flight libraries
# ARROW_FLIGHT_SQL_SHARED_IMP_LIB, deprecated. Use ARROW_FLIGHT_SQL_IMPORT_LIB instead
# ARROW_FLIGHT_SQL_SHARED_LIB, path to libarrow_flight's shared library
# ARROW_FLIGHT_SQL_STATIC_LIB, path to libarrow_flight.a

if(DEFINED ARROW_FLIGHT_SQL_FOUND)
 return()
endif()

set(find_package_arguments)
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION)
 list(APPEND find_package_arguments "${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION}")
endif()
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
 list(APPEND find_package_arguments REQUIRED)
endif()
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
 list(APPEND find_package_arguments QUIET)
endif()
find_package(Arrow ${find_package_arguments})

if(ARROW_FOUND)
 arrow_find_package(ARROW_FLIGHT_SQL
 "${ARROW_HOME}"
 arrow_flight_sql
 arrow/flight/sql/api.h
 ArrowFlightSql
 arrow-flight-sql)
 if(NOT ARROW_FLIGHT_SQL_VERSION)
 set(ARROW_FLIGHT_SQL_VERSION "${ARROW_VERSION}")
 endif()
endif()

if("${ARROW_FLIGHT_SQL_VERSION}" VERSION_EQUAL "${ARROW_VERSION}")
 set(ARROW_FLIGHT_SQL_VERSION_MATCH TRUE)
else()
 set(ARROW_FLIGHT_SQL_VERSION_MATCH FALSE)
endif()

mark_as_advanced(ARROW_FLIGHT_SQL_IMPORT_LIB
 ARROW_FLIGHT_SQL_INCLUDE_DIR
 ARROW_FLIGHT_SQL_LIBS
 ARROW_FLIGHT_SQL_LIB_DIR
 ARROW_FLIGHT_SQL_SHARED_IMP_LIB
 ARROW_FLIGHT_SQL_SHARED_LIB
 ARROW_FLIGHT_SQL_STATIC_LIB
 ARROW_FLIGHT_SQL_VERSION
 ARROW_FLIGHT_SQL_VERSION_MATCH)

find_package_handle_standard_args(
 ArrowFlightSql
 REQUIRED_VARS ARROW_FLIGHT_SQL_INCLUDE_DIR ARROW_FLIGHT_SQL_LIB_DIR
 ARROW_FLIGHT_SQL_VERSION_MATCH
 VERSION_VAR ARROW_FLIGHT_SQL_VERSION)
set(ARROW_FLIGHT_SQL_FOUND ${ArrowFlightSql_FOUND})

if(ArrowFlightSql_FOUND AND NOT ArrowFlightSql_FIND_QUIETLY)
 message(STATUS "Found the Arrow Flight SQL by ${ARROW_FLIGHT_SQL_FIND_APPROACH}")
 message(STATUS "Found the Arrow Flight SQL shared library: ${ARROW_FLIGHT_SQL_SHARED_LIB}"
 )
 message(STATUS "Found the Arrow Flight SQL import library: ${ARROW_FLIGHT_SQL_IMPORT_LIB}"
 )
 message(STATUS "Found the Arrow Flight SQL static library: ${ARROW_FLIGHT_SQL_STATIC_LIB}"
 )
endif()

43 changes: 43 additions & 0 deletions
cpp/cmake_modules/FindSQLite3Alt.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
# 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.

# Once done this will define
# - FindSQLite3Alt
#
# This module will set the following variables if found:
# SQLite3_INCLUDE_DIRS - SQLite3 include dir.
# SQLite3_LIBRARIES - List of libraries when using SQLite3.
# SQLite3_FOUND - True if SQLite3 found.
#
# Usage of this module as follows:
# find_package(SQLite3Alt)

find_path(SQLite3_INCLUDE_DIR sqlite3.h)
find_library(SQLite3_LIBRARY NAMES sqlite3)

# handle the QUIETLY and REQUIRED arguments and set SQLite3_FOUND to TRUE if
# all listed variables are TRUE
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(SQLite3Alt REQUIRED_VARS SQLite3_LIBRARY
 SQLite3_INCLUDE_DIR)

mark_as_advanced(SQLite3_LIBRARY SQLite3_INCLUDE_DIR)

if(SQLite3Alt_FOUND)
 set(SQLite3_INCLUDE_DIRS ${SQLite3_INCLUDE_DIR})
 set(SQLite3_LIBRARIES ${SQLite3_LIBRARY})
endif()

10 changes: 10 additions & 0 deletions
cpp/src/arrow/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -732,6 +732,16 @@ if(ARROW_FLIGHT)
 add_subdirectory(flight)
endif()

if(ARROW_FLIGHT_SQL)
 add_subdirectory(flight/sql)
endif()

if(ARROW_FLIGHT
 AND ARROW_FLIGHT_SQL
 AND ARROW_BUILD_INTEGRATION)
 add_subdirectory(flight/integration_tests)
endif()

if(ARROW_HIVESERVER2)
 add_subdirectory(dbi/hiveserver2)
endif()
Expand Down

34 changes: 17 additions & 17 deletions
cpp/src/arrow/flight/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,23 @@ if(WIN32)
 list(APPEND ARROW_FLIGHT_LINK_LIBS ws2_32.lib)
endif()

if(ARROW_TEST_LINKAGE STREQUAL "static")
set(ARROW_FLIGHT_TEST_LINKAGE
 "${ARROW_TEST_LINKAGE}"
 PARENT_SCOPE)
if(Protobuf_USE_STATIC_LIBS)
 message(STATUS "Linking Arrow Flight tests statically due to static Protobuf")
 set(ARROW_FLIGHT_TEST_LINKAGE
 "static"
 PARENT_SCOPE)
endif()
if(NOT ARROW_GRPC_USE_SHARED)
 message(STATUS "Linking Arrow Flight tests statically due to static gRPC")
 set(ARROW_FLIGHT_TEST_LINKAGE
 "static"
 PARENT_SCOPE)
endif()

if(ARROW_FLIGHT_TEST_LINKAGE STREQUAL "static")
 set(ARROW_FLIGHT_TEST_LINK_LIBS
 arrow_flight_static arrow_flight_testing_static ${ARROW_FLIGHT_STATIC_LINK_LIBS}
 ${ARROW_TEST_LINK_LIBS})
Expand DownExpand Up@@ -186,7 +202,6 @@ if(ARROW_TESTING)
 OUTPUTS
 ARROW_FLIGHT_TESTING_LIBRARIES
 SOURCES
 test_integration.cc
 test_util.cc
 DEPENDENCIES
 GTest::gtest
Expand DownExpand Up@@ -230,21 +245,6 @@ if(ARROW_BUILD_TESTS OR ARROW_BUILD_BENCHMARKS)
 add_dependencies(arrow_flight flight-test-server)
endif()

if(ARROW_BUILD_INTEGRATION)
 add_executable(flight-test-integration-server test_integration_server.cc)
 target_link_libraries(flight-test-integration-server ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

 add_executable(flight-test-integration-client test_integration_client.cc)
 target_link_libraries(flight-test-integration-client ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

 add_dependencies(arrow_flight flight-test-integration-client
 flight-test-integration-server)
 add_dependencies(arrow-integration flight-test-integration-client
 flight-test-integration-server)
endif()

if(ARROW_BUILD_BENCHMARKS)
 # Perf server for benchmarks
 set(PERF_PROTO_GENERATED_FILES "${CMAKE_CURRENT_BINARY_DIR}/perf.pb.cc"
Expand Down

47 changes: 47 additions & 0 deletions
cpp/src/arrow/flight/integration_tests/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
# 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_integration_tests)

if(ARROW_FLIGHT_TEST_LINKAGE STREQUAL "static")
 set(ARROW_FLIGHT_TEST_LINK_LIBS
 arrow_flight_static
 arrow_flight_testing_static
 arrow_flight_sql_static
 ${ARROW_FLIGHT_STATIC_LINK_LIBS}
 ${ARROW_TEST_LINK_LIBS})
else()
 set(ARROW_FLIGHT_TEST_LINK_LIBS
 arrow_flight_shared
 arrow_flight_testing_shared
 arrow_flight_sql_shared
 ${ARROW_TEST_LINK_LIBS}
 ${ARROW_FLIGHT_SQL_TEST_LINK_LIBS})
endif()

add_executable(flight-test-integration-server test_integration_server.cc
 test_integration.cc)
target_link_libraries(flight-test-integration-server ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

add_executable(flight-test-integration-client test_integration_client.cc
 test_integration.cc)
target_link_libraries(flight-test-integration-client ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

add_dependencies(arrow-integration flight-test-integration-client
 flight-test-integration-server)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-14421: [C++] Implement Flight SQL#12013

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.

 Sign up for GitHub

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

 Closed

lidavidm
wants to merge
5
commits into

from

 Closed


ARROW-14421: [C++] Implement Flight SQL
#12013
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
645edf3

ARROW-12922: [Java] Add flight-sql to the flight package


rafael-telles Dec 15, 2021
22bd624

ARROW-14421: [C++] Implement Flight SQL


rafael-telles Dec 15, 2021
16a9df1

ARROW-15112: [Integration][C++][Java] Implement Flight SQL integratio…


rafael-telles Dec 21, 2021
dc3f919

ARROW-15187: [Java][FlightRPC] Fix pom.xml for Flight integration tests


rafael-telles Dec 22, 2021
31fb76c

ARROW-15198: [C++][FlightRPC] Fix conda-python-hdfs build error on fl…


rafael-telles Dec 23, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
ci/docker/conda-cpp.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ ENV ARROW_BUILD_TESTS=ON \
 ARROW_DATASET=ON \
 ARROW_DEPENDENCY_SOURCE=CONDA \
 ARROW_FLIGHT=ON \
 ARROW_FLIGHT_SQL=ON \
 ARROW_GANDIVA=ON \
 ARROW_HOME=$CONDA_PREFIX \
 ARROW_ORC=ON \
Expand Down

1 change: 1 addition & 0 deletions
ci/scripts/cpp_build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,7 @@ cmake \
 -DARROW_EXTRA_ERROR_CONTEXT=${ARROW_EXTRA_ERROR_CONTEXT:-OFF} \
 -DARROW_FILESYSTEM=${ARROW_FILESYSTEM:-ON} \
 -DARROW_FLIGHT=${ARROW_FLIGHT:-OFF} \
 -DARROW_FLIGHT_SQL=${ARROW_FLIGHT_SQL:-OFF} \
 -DARROW_FUZZING=${ARROW_FUZZING:-OFF} \
 -DARROW_GANDIVA_JAVA=${ARROW_GANDIVA_JAVA:-OFF} \
 -DARROW_GANDIVA_PC_CXX_FLAGS=${ARROW_GANDIVA_PC_CXX_FLAGS:-} \
Expand Down

8 changes: 8 additions & 0 deletions
cpp/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -334,6 +334,14 @@ if(ARROW_GANDIVA)
 set(ARROW_WITH_RE2 ON)
endif()

if(ARROW_BUILD_INTEGRATION AND ARROW_FLIGHT)
 set(ARROW_FLIGHT_SQL ON)
endif()

if(ARROW_FLIGHT_SQL)
 set(ARROW_FLIGHT ON)
endif()

if(ARROW_CUDA
 OR ARROW_FLIGHT
 OR ARROW_PARQUET
Expand Down

2 changes: 2 additions & 0 deletions
cpp/cmake_modules/DefineOptions.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,6 +226,8 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 define_option(ARROW_FLIGHT
 "Build the Arrow Flight RPC System (requires GRPC, Protocol Buffers)" OFF)

 define_option(ARROW_FLIGHT_SQL "Build the Arrow Flight SQL extension" OFF)

 define_option(ARROW_GANDIVA "Build the Gandiva libraries" OFF)

 define_option(ARROW_GCS
Expand Down

93 changes: 93 additions & 0 deletions
cpp/cmake_modules/FindArrowFlightSql.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
# 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.

# - Find Arrow Flight SQL
#
# This module requires Arrow from which it uses
# arrow_find_package()
#
# This module defines
# ARROW_FLIGHT_SQL_FOUND, whether Flight has been found
# ARROW_FLIGHT_SQL_IMPORT_LIB,
# path to libarrow_flight's import library (Windows only)
# ARROW_FLIGHT_SQL_INCLUDE_DIR, directory containing headers
# ARROW_FLIGHT_SQL_LIBS, deprecated. Use ARROW_FLIGHT_SQL_LIB_DIR instead
# ARROW_FLIGHT_SQL_LIB_DIR, directory containing Flight libraries
# ARROW_FLIGHT_SQL_SHARED_IMP_LIB, deprecated. Use ARROW_FLIGHT_SQL_IMPORT_LIB instead
# ARROW_FLIGHT_SQL_SHARED_LIB, path to libarrow_flight's shared library
# ARROW_FLIGHT_SQL_STATIC_LIB, path to libarrow_flight.a

if(DEFINED ARROW_FLIGHT_SQL_FOUND)
 return()
endif()

set(find_package_arguments)
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION)
 list(APPEND find_package_arguments "${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION}")
endif()
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
 list(APPEND find_package_arguments REQUIRED)
endif()
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
 list(APPEND find_package_arguments QUIET)
endif()
find_package(Arrow ${find_package_arguments})

if(ARROW_FOUND)
 arrow_find_package(ARROW_FLIGHT_SQL
 "${ARROW_HOME}"
 arrow_flight_sql
 arrow/flight/sql/api.h
 ArrowFlightSql
 arrow-flight-sql)
 if(NOT ARROW_FLIGHT_SQL_VERSION)
 set(ARROW_FLIGHT_SQL_VERSION "${ARROW_VERSION}")
 endif()
endif()

if("${ARROW_FLIGHT_SQL_VERSION}" VERSION_EQUAL "${ARROW_VERSION}")
 set(ARROW_FLIGHT_SQL_VERSION_MATCH TRUE)
else()
 set(ARROW_FLIGHT_SQL_VERSION_MATCH FALSE)
endif()

mark_as_advanced(ARROW_FLIGHT_SQL_IMPORT_LIB
 ARROW_FLIGHT_SQL_INCLUDE_DIR
 ARROW_FLIGHT_SQL_LIBS
 ARROW_FLIGHT_SQL_LIB_DIR
 ARROW_FLIGHT_SQL_SHARED_IMP_LIB
 ARROW_FLIGHT_SQL_SHARED_LIB
 ARROW_FLIGHT_SQL_STATIC_LIB
 ARROW_FLIGHT_SQL_VERSION
 ARROW_FLIGHT_SQL_VERSION_MATCH)

find_package_handle_standard_args(
 ArrowFlightSql
 REQUIRED_VARS ARROW_FLIGHT_SQL_INCLUDE_DIR ARROW_FLIGHT_SQL_LIB_DIR
 ARROW_FLIGHT_SQL_VERSION_MATCH
 VERSION_VAR ARROW_FLIGHT_SQL_VERSION)
set(ARROW_FLIGHT_SQL_FOUND ${ArrowFlightSql_FOUND})

if(ArrowFlightSql_FOUND AND NOT ArrowFlightSql_FIND_QUIETLY)
 message(STATUS "Found the Arrow Flight SQL by ${ARROW_FLIGHT_SQL_FIND_APPROACH}")
 message(STATUS "Found the Arrow Flight SQL shared library: ${ARROW_FLIGHT_SQL_SHARED_LIB}"
 )
 message(STATUS "Found the Arrow Flight SQL import library: ${ARROW_FLIGHT_SQL_IMPORT_LIB}"
 )
 message(STATUS "Found the Arrow Flight SQL static library: ${ARROW_FLIGHT_SQL_STATIC_LIB}"
 )
endif()

43 changes: 43 additions & 0 deletions
cpp/cmake_modules/FindSQLite3Alt.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
# 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.

# Once done this will define
# - FindSQLite3Alt
#
# This module will set the following variables if found:
# SQLite3_INCLUDE_DIRS - SQLite3 include dir.
# SQLite3_LIBRARIES - List of libraries when using SQLite3.
# SQLite3_FOUND - True if SQLite3 found.
#
# Usage of this module as follows:
# find_package(SQLite3Alt)

find_path(SQLite3_INCLUDE_DIR sqlite3.h)
find_library(SQLite3_LIBRARY NAMES sqlite3)

# handle the QUIETLY and REQUIRED arguments and set SQLite3_FOUND to TRUE if
# all listed variables are TRUE
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(SQLite3Alt REQUIRED_VARS SQLite3_LIBRARY
 SQLite3_INCLUDE_DIR)

mark_as_advanced(SQLite3_LIBRARY SQLite3_INCLUDE_DIR)

if(SQLite3Alt_FOUND)
 set(SQLite3_INCLUDE_DIRS ${SQLite3_INCLUDE_DIR})
 set(SQLite3_LIBRARIES ${SQLite3_LIBRARY})
endif()

10 changes: 10 additions & 0 deletions
cpp/src/arrow/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -732,6 +732,16 @@ if(ARROW_FLIGHT)
 add_subdirectory(flight)
endif()

if(ARROW_FLIGHT_SQL)
 add_subdirectory(flight/sql)
endif()

if(ARROW_FLIGHT
 AND ARROW_FLIGHT_SQL
 AND ARROW_BUILD_INTEGRATION)
 add_subdirectory(flight/integration_tests)
endif()

if(ARROW_HIVESERVER2)
 add_subdirectory(dbi/hiveserver2)
endif()
Expand Down

34 changes: 17 additions & 17 deletions
cpp/src/arrow/flight/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,23 @@ if(WIN32)
 list(APPEND ARROW_FLIGHT_LINK_LIBS ws2_32.lib)
endif()

if(ARROW_TEST_LINKAGE STREQUAL "static")
set(ARROW_FLIGHT_TEST_LINKAGE
 "${ARROW_TEST_LINKAGE}"
 PARENT_SCOPE)
if(Protobuf_USE_STATIC_LIBS)
 message(STATUS "Linking Arrow Flight tests statically due to static Protobuf")
 set(ARROW_FLIGHT_TEST_LINKAGE
 "static"
 PARENT_SCOPE)
endif()
if(NOT ARROW_GRPC_USE_SHARED)
 message(STATUS "Linking Arrow Flight tests statically due to static gRPC")
 set(ARROW_FLIGHT_TEST_LINKAGE
 "static"
 PARENT_SCOPE)
endif()

if(ARROW_FLIGHT_TEST_LINKAGE STREQUAL "static")
 set(ARROW_FLIGHT_TEST_LINK_LIBS
 arrow_flight_static arrow_flight_testing_static ${ARROW_FLIGHT_STATIC_LINK_LIBS}
 ${ARROW_TEST_LINK_LIBS})
Expand DownExpand Up@@ -186,7 +202,6 @@ if(ARROW_TESTING)
 OUTPUTS
 ARROW_FLIGHT_TESTING_LIBRARIES
 SOURCES
 test_integration.cc
 test_util.cc
 DEPENDENCIES
 GTest::gtest
Expand DownExpand Up@@ -230,21 +245,6 @@ if(ARROW_BUILD_TESTS OR ARROW_BUILD_BENCHMARKS)
 add_dependencies(arrow_flight flight-test-server)
endif()

if(ARROW_BUILD_INTEGRATION)
 add_executable(flight-test-integration-server test_integration_server.cc)
 target_link_libraries(flight-test-integration-server ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

 add_executable(flight-test-integration-client test_integration_client.cc)
 target_link_libraries(flight-test-integration-client ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

 add_dependencies(arrow_flight flight-test-integration-client
 flight-test-integration-server)
 add_dependencies(arrow-integration flight-test-integration-client
 flight-test-integration-server)
endif()

if(ARROW_BUILD_BENCHMARKS)
 # Perf server for benchmarks
 set(PERF_PROTO_GENERATED_FILES "${CMAKE_CURRENT_BINARY_DIR}/perf.pb.cc"
Expand Down

47 changes: 47 additions & 0 deletions
cpp/src/arrow/flight/integration_tests/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
# 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_integration_tests)

if(ARROW_FLIGHT_TEST_LINKAGE STREQUAL "static")
 set(ARROW_FLIGHT_TEST_LINK_LIBS
 arrow_flight_static
 arrow_flight_testing_static
 arrow_flight_sql_static
 ${ARROW_FLIGHT_STATIC_LINK_LIBS}
 ${ARROW_TEST_LINK_LIBS})
else()
 set(ARROW_FLIGHT_TEST_LINK_LIBS
 arrow_flight_shared
 arrow_flight_testing_shared
 arrow_flight_sql_shared
 ${ARROW_TEST_LINK_LIBS}
 ${ARROW_FLIGHT_SQL_TEST_LINK_LIBS})
endif()

add_executable(flight-test-integration-server test_integration_server.cc
 test_integration.cc)
target_link_libraries(flight-test-integration-server ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

add_executable(flight-test-integration-client test_integration_client.cc
 test_integration.cc)
target_link_libraries(flight-test-integration-client ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

add_dependencies(arrow-integration flight-test-integration-client
 flight-test-integration-server)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ARROW-14421: [C++] Implement Flight SQL#12013

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.

 Sign up for GitHub

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

 Closed

lidavidm
wants to merge
5
commits into

from

 Closed


ARROW-14421: [C++] Implement Flight SQL
#12013
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
645edf3

ARROW-12922: [Java] Add flight-sql to the flight package


rafael-telles Dec 15, 2021
22bd624

ARROW-14421: [C++] Implement Flight SQL


rafael-telles Dec 15, 2021
16a9df1

ARROW-15112: [Integration][C++][Java] Implement Flight SQL integratio…


rafael-telles Dec 21, 2021
dc3f919

ARROW-15187: [Java][FlightRPC] Fix pom.xml for Flight integration tests


rafael-telles Dec 22, 2021
31fb76c

ARROW-15198: [C++][FlightRPC] Fix conda-python-hdfs build error on fl…


rafael-telles Dec 23, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
ci/docker/conda-cpp.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ ENV ARROW_BUILD_TESTS=ON \
 ARROW_DATASET=ON \
 ARROW_DEPENDENCY_SOURCE=CONDA \
 ARROW_FLIGHT=ON \
 ARROW_FLIGHT_SQL=ON \
 ARROW_GANDIVA=ON \
 ARROW_HOME=$CONDA_PREFIX \
 ARROW_ORC=ON \
Expand Down

1 change: 1 addition & 0 deletions
ci/scripts/cpp_build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,7 @@ cmake \
 -DARROW_EXTRA_ERROR_CONTEXT=${ARROW_EXTRA_ERROR_CONTEXT:-OFF} \
 -DARROW_FILESYSTEM=${ARROW_FILESYSTEM:-ON} \
 -DARROW_FLIGHT=${ARROW_FLIGHT:-OFF} \
 -DARROW_FLIGHT_SQL=${ARROW_FLIGHT_SQL:-OFF} \
 -DARROW_FUZZING=${ARROW_FUZZING:-OFF} \
 -DARROW_GANDIVA_JAVA=${ARROW_GANDIVA_JAVA:-OFF} \
 -DARROW_GANDIVA_PC_CXX_FLAGS=${ARROW_GANDIVA_PC_CXX_FLAGS:-} \
Expand Down

8 changes: 8 additions & 0 deletions
cpp/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -334,6 +334,14 @@ if(ARROW_GANDIVA)
 set(ARROW_WITH_RE2 ON)
endif()

if(ARROW_BUILD_INTEGRATION AND ARROW_FLIGHT)
 set(ARROW_FLIGHT_SQL ON)
endif()

if(ARROW_FLIGHT_SQL)
 set(ARROW_FLIGHT ON)
endif()

if(ARROW_CUDA
 OR ARROW_FLIGHT
 OR ARROW_PARQUET
Expand Down

2 changes: 2 additions & 0 deletions
cpp/cmake_modules/DefineOptions.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,6 +226,8 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 define_option(ARROW_FLIGHT
 "Build the Arrow Flight RPC System (requires GRPC, Protocol Buffers)" OFF)

 define_option(ARROW_FLIGHT_SQL "Build the Arrow Flight SQL extension" OFF)

 define_option(ARROW_GANDIVA "Build the Gandiva libraries" OFF)

 define_option(ARROW_GCS
Expand Down

93 changes: 93 additions & 0 deletions
cpp/cmake_modules/FindArrowFlightSql.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
# 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.

# - Find Arrow Flight SQL
#
# This module requires Arrow from which it uses
# arrow_find_package()
#
# This module defines
# ARROW_FLIGHT_SQL_FOUND, whether Flight has been found
# ARROW_FLIGHT_SQL_IMPORT_LIB,
# path to libarrow_flight's import library (Windows only)
# ARROW_FLIGHT_SQL_INCLUDE_DIR, directory containing headers
# ARROW_FLIGHT_SQL_LIBS, deprecated. Use ARROW_FLIGHT_SQL_LIB_DIR instead
# ARROW_FLIGHT_SQL_LIB_DIR, directory containing Flight libraries
# ARROW_FLIGHT_SQL_SHARED_IMP_LIB, deprecated. Use ARROW_FLIGHT_SQL_IMPORT_LIB instead
# ARROW_FLIGHT_SQL_SHARED_LIB, path to libarrow_flight's shared library
# ARROW_FLIGHT_SQL_STATIC_LIB, path to libarrow_flight.a

if(DEFINED ARROW_FLIGHT_SQL_FOUND)
 return()
endif()

set(find_package_arguments)
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION)
 list(APPEND find_package_arguments "${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION}")
endif()
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
 list(APPEND find_package_arguments REQUIRED)
endif()
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
 list(APPEND find_package_arguments QUIET)
endif()
find_package(Arrow ${find_package_arguments})

if(ARROW_FOUND)
 arrow_find_package(ARROW_FLIGHT_SQL
 "${ARROW_HOME}"
 arrow_flight_sql
 arrow/flight/sql/api.h
 ArrowFlightSql
 arrow-flight-sql)
 if(NOT ARROW_FLIGHT_SQL_VERSION)
 set(ARROW_FLIGHT_SQL_VERSION "${ARROW_VERSION}")
 endif()
endif()

if("${ARROW_FLIGHT_SQL_VERSION}" VERSION_EQUAL "${ARROW_VERSION}")
 set(ARROW_FLIGHT_SQL_VERSION_MATCH TRUE)
else()
 set(ARROW_FLIGHT_SQL_VERSION_MATCH FALSE)
endif()

mark_as_advanced(ARROW_FLIGHT_SQL_IMPORT_LIB
 ARROW_FLIGHT_SQL_INCLUDE_DIR
 ARROW_FLIGHT_SQL_LIBS
 ARROW_FLIGHT_SQL_LIB_DIR
 ARROW_FLIGHT_SQL_SHARED_IMP_LIB
 ARROW_FLIGHT_SQL_SHARED_LIB
 ARROW_FLIGHT_SQL_STATIC_LIB
 ARROW_FLIGHT_SQL_VERSION
 ARROW_FLIGHT_SQL_VERSION_MATCH)

find_package_handle_standard_args(
 ArrowFlightSql
 REQUIRED_VARS ARROW_FLIGHT_SQL_INCLUDE_DIR ARROW_FLIGHT_SQL_LIB_DIR
 ARROW_FLIGHT_SQL_VERSION_MATCH
 VERSION_VAR ARROW_FLIGHT_SQL_VERSION)
set(ARROW_FLIGHT_SQL_FOUND ${ArrowFlightSql_FOUND})

if(ArrowFlightSql_FOUND AND NOT ArrowFlightSql_FIND_QUIETLY)
 message(STATUS "Found the Arrow Flight SQL by ${ARROW_FLIGHT_SQL_FIND_APPROACH}")
 message(STATUS "Found the Arrow Flight SQL shared library: ${ARROW_FLIGHT_SQL_SHARED_LIB}"
 )
 message(STATUS "Found the Arrow Flight SQL import library: ${ARROW_FLIGHT_SQL_IMPORT_LIB}"
 )
 message(STATUS "Found the Arrow Flight SQL static library: ${ARROW_FLIGHT_SQL_STATIC_LIB}"
 )
endif()

43 changes: 43 additions & 0 deletions
cpp/cmake_modules/FindSQLite3Alt.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
# 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.

# Once done this will define
# - FindSQLite3Alt
#
# This module will set the following variables if found:
# SQLite3_INCLUDE_DIRS - SQLite3 include dir.
# SQLite3_LIBRARIES - List of libraries when using SQLite3.
# SQLite3_FOUND - True if SQLite3 found.
#
# Usage of this module as follows:
# find_package(SQLite3Alt)

find_path(SQLite3_INCLUDE_DIR sqlite3.h)
find_library(SQLite3_LIBRARY NAMES sqlite3)

# handle the QUIETLY and REQUIRED arguments and set SQLite3_FOUND to TRUE if
# all listed variables are TRUE
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(SQLite3Alt REQUIRED_VARS SQLite3_LIBRARY
 SQLite3_INCLUDE_DIR)

mark_as_advanced(SQLite3_LIBRARY SQLite3_INCLUDE_DIR)

if(SQLite3Alt_FOUND)
 set(SQLite3_INCLUDE_DIRS ${SQLite3_INCLUDE_DIR})
 set(SQLite3_LIBRARIES ${SQLite3_LIBRARY})
endif()

10 changes: 10 additions & 0 deletions
cpp/src/arrow/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -732,6 +732,16 @@ if(ARROW_FLIGHT)
 add_subdirectory(flight)
endif()

if(ARROW_FLIGHT_SQL)
 add_subdirectory(flight/sql)
endif()

if(ARROW_FLIGHT
 AND ARROW_FLIGHT_SQL
 AND ARROW_BUILD_INTEGRATION)
 add_subdirectory(flight/integration_tests)
endif()

if(ARROW_HIVESERVER2)
 add_subdirectory(dbi/hiveserver2)
endif()
Expand Down

34 changes: 17 additions & 17 deletions
cpp/src/arrow/flight/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,23 @@ if(WIN32)
 list(APPEND ARROW_FLIGHT_LINK_LIBS ws2_32.lib)
endif()

if(ARROW_TEST_LINKAGE STREQUAL "static")
set(ARROW_FLIGHT_TEST_LINKAGE
 "${ARROW_TEST_LINKAGE}"
 PARENT_SCOPE)
if(Protobuf_USE_STATIC_LIBS)
 message(STATUS "Linking Arrow Flight tests statically due to static Protobuf")
 set(ARROW_FLIGHT_TEST_LINKAGE
 "static"
 PARENT_SCOPE)
endif()
if(NOT ARROW_GRPC_USE_SHARED)
 message(STATUS "Linking Arrow Flight tests statically due to static gRPC")
 set(ARROW_FLIGHT_TEST_LINKAGE
 "static"
 PARENT_SCOPE)
endif()

if(ARROW_FLIGHT_TEST_LINKAGE STREQUAL "static")
 set(ARROW_FLIGHT_TEST_LINK_LIBS
 arrow_flight_static arrow_flight_testing_static ${ARROW_FLIGHT_STATIC_LINK_LIBS}
 ${ARROW_TEST_LINK_LIBS})
Expand DownExpand Up@@ -186,7 +202,6 @@ if(ARROW_TESTING)
 OUTPUTS
 ARROW_FLIGHT_TESTING_LIBRARIES
 SOURCES
 test_integration.cc
 test_util.cc
 DEPENDENCIES
 GTest::gtest
Expand DownExpand Up@@ -230,21 +245,6 @@ if(ARROW_BUILD_TESTS OR ARROW_BUILD_BENCHMARKS)
 add_dependencies(arrow_flight flight-test-server)
endif()

if(ARROW_BUILD_INTEGRATION)
 add_executable(flight-test-integration-server test_integration_server.cc)
 target_link_libraries(flight-test-integration-server ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

 add_executable(flight-test-integration-client test_integration_client.cc)
 target_link_libraries(flight-test-integration-client ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

 add_dependencies(arrow_flight flight-test-integration-client
 flight-test-integration-server)
 add_dependencies(arrow-integration flight-test-integration-client
 flight-test-integration-server)
endif()

if(ARROW_BUILD_BENCHMARKS)
 # Perf server for benchmarks
 set(PERF_PROTO_GENERATED_FILES "${CMAKE_CURRENT_BINARY_DIR}/perf.pb.cc"
Expand Down

47 changes: 47 additions & 0 deletions
cpp/src/arrow/flight/integration_tests/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
# 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_integration_tests)

if(ARROW_FLIGHT_TEST_LINKAGE STREQUAL "static")
 set(ARROW_FLIGHT_TEST_LINK_LIBS
 arrow_flight_static
 arrow_flight_testing_static
 arrow_flight_sql_static
 ${ARROW_FLIGHT_STATIC_LINK_LIBS}
 ${ARROW_TEST_LINK_LIBS})
else()
 set(ARROW_FLIGHT_TEST_LINK_LIBS
 arrow_flight_shared
 arrow_flight_testing_shared
 arrow_flight_sql_shared
 ${ARROW_TEST_LINK_LIBS}
 ${ARROW_FLIGHT_SQL_TEST_LINK_LIBS})
endif()

add_executable(flight-test-integration-server test_integration_server.cc
 test_integration.cc)
target_link_libraries(flight-test-integration-server ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

add_executable(flight-test-integration-client test_integration_client.cc
 test_integration.cc)
target_link_libraries(flight-test-integration-client ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

add_dependencies(arrow-integration flight-test-integration-client
 flight-test-integration-server)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-14421: [C++] Implement Flight SQL#12013

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.

 Sign up for GitHub

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

 Closed

lidavidm
wants to merge
5
commits into

from

 Closed


ARROW-14421: [C++] Implement Flight SQL
#12013
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
645edf3

ARROW-12922: [Java] Add flight-sql to the flight package


rafael-telles Dec 15, 2021
22bd624

ARROW-14421: [C++] Implement Flight SQL


rafael-telles Dec 15, 2021
16a9df1

ARROW-15112: [Integration][C++][Java] Implement Flight SQL integratio…


rafael-telles Dec 21, 2021
dc3f919

ARROW-15187: [Java][FlightRPC] Fix pom.xml for Flight integration tests


rafael-telles Dec 22, 2021
31fb76c

ARROW-15198: [C++][FlightRPC] Fix conda-python-hdfs build error on fl…


rafael-telles Dec 23, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
ci/docker/conda-cpp.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ ENV ARROW_BUILD_TESTS=ON \
 ARROW_DATASET=ON \
 ARROW_DEPENDENCY_SOURCE=CONDA \
 ARROW_FLIGHT=ON \
 ARROW_FLIGHT_SQL=ON \
 ARROW_GANDIVA=ON \
 ARROW_HOME=$CONDA_PREFIX \
 ARROW_ORC=ON \
Expand Down

1 change: 1 addition & 0 deletions
ci/scripts/cpp_build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,7 @@ cmake \
 -DARROW_EXTRA_ERROR_CONTEXT=${ARROW_EXTRA_ERROR_CONTEXT:-OFF} \
 -DARROW_FILESYSTEM=${ARROW_FILESYSTEM:-ON} \
 -DARROW_FLIGHT=${ARROW_FLIGHT:-OFF} \
 -DARROW_FLIGHT_SQL=${ARROW_FLIGHT_SQL:-OFF} \
 -DARROW_FUZZING=${ARROW_FUZZING:-OFF} \
 -DARROW_GANDIVA_JAVA=${ARROW_GANDIVA_JAVA:-OFF} \
 -DARROW_GANDIVA_PC_CXX_FLAGS=${ARROW_GANDIVA_PC_CXX_FLAGS:-} \
Expand Down

8 changes: 8 additions & 0 deletions
cpp/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -334,6 +334,14 @@ if(ARROW_GANDIVA)
 set(ARROW_WITH_RE2 ON)
endif()

if(ARROW_BUILD_INTEGRATION AND ARROW_FLIGHT)
 set(ARROW_FLIGHT_SQL ON)
endif()

if(ARROW_FLIGHT_SQL)
 set(ARROW_FLIGHT ON)
endif()

if(ARROW_CUDA
 OR ARROW_FLIGHT
 OR ARROW_PARQUET
Expand Down

2 changes: 2 additions & 0 deletions
cpp/cmake_modules/DefineOptions.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,6 +226,8 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 define_option(ARROW_FLIGHT
 "Build the Arrow Flight RPC System (requires GRPC, Protocol Buffers)" OFF)

 define_option(ARROW_FLIGHT_SQL "Build the Arrow Flight SQL extension" OFF)

 define_option(ARROW_GANDIVA "Build the Gandiva libraries" OFF)

 define_option(ARROW_GCS
Expand Down

93 changes: 93 additions & 0 deletions
cpp/cmake_modules/FindArrowFlightSql.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
# 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.

# - Find Arrow Flight SQL
#
# This module requires Arrow from which it uses
# arrow_find_package()
#
# This module defines
# ARROW_FLIGHT_SQL_FOUND, whether Flight has been found
# ARROW_FLIGHT_SQL_IMPORT_LIB,
# path to libarrow_flight's import library (Windows only)
# ARROW_FLIGHT_SQL_INCLUDE_DIR, directory containing headers
# ARROW_FLIGHT_SQL_LIBS, deprecated. Use ARROW_FLIGHT_SQL_LIB_DIR instead
# ARROW_FLIGHT_SQL_LIB_DIR, directory containing Flight libraries
# ARROW_FLIGHT_SQL_SHARED_IMP_LIB, deprecated. Use ARROW_FLIGHT_SQL_IMPORT_LIB instead
# ARROW_FLIGHT_SQL_SHARED_LIB, path to libarrow_flight's shared library
# ARROW_FLIGHT_SQL_STATIC_LIB, path to libarrow_flight.a

if(DEFINED ARROW_FLIGHT_SQL_FOUND)
 return()
endif()

set(find_package_arguments)
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION)
 list(APPEND find_package_arguments "${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION}")
endif()
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
 list(APPEND find_package_arguments REQUIRED)
endif()
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
 list(APPEND find_package_arguments QUIET)
endif()
find_package(Arrow ${find_package_arguments})

if(ARROW_FOUND)
 arrow_find_package(ARROW_FLIGHT_SQL
 "${ARROW_HOME}"
 arrow_flight_sql
 arrow/flight/sql/api.h
 ArrowFlightSql
 arrow-flight-sql)
 if(NOT ARROW_FLIGHT_SQL_VERSION)
 set(ARROW_FLIGHT_SQL_VERSION "${ARROW_VERSION}")
 endif()
endif()

if("${ARROW_FLIGHT_SQL_VERSION}" VERSION_EQUAL "${ARROW_VERSION}")
 set(ARROW_FLIGHT_SQL_VERSION_MATCH TRUE)
else()
 set(ARROW_FLIGHT_SQL_VERSION_MATCH FALSE)
endif()

mark_as_advanced(ARROW_FLIGHT_SQL_IMPORT_LIB
 ARROW_FLIGHT_SQL_INCLUDE_DIR
 ARROW_FLIGHT_SQL_LIBS
 ARROW_FLIGHT_SQL_LIB_DIR
 ARROW_FLIGHT_SQL_SHARED_IMP_LIB
 ARROW_FLIGHT_SQL_SHARED_LIB
 ARROW_FLIGHT_SQL_STATIC_LIB
 ARROW_FLIGHT_SQL_VERSION
 ARROW_FLIGHT_SQL_VERSION_MATCH)

find_package_handle_standard_args(
 ArrowFlightSql
 REQUIRED_VARS ARROW_FLIGHT_SQL_INCLUDE_DIR ARROW_FLIGHT_SQL_LIB_DIR
 ARROW_FLIGHT_SQL_VERSION_MATCH
 VERSION_VAR ARROW_FLIGHT_SQL_VERSION)
set(ARROW_FLIGHT_SQL_FOUND ${ArrowFlightSql_FOUND})

if(ArrowFlightSql_FOUND AND NOT ArrowFlightSql_FIND_QUIETLY)
 message(STATUS "Found the Arrow Flight SQL by ${ARROW_FLIGHT_SQL_FIND_APPROACH}")
 message(STATUS "Found the Arrow Flight SQL shared library: ${ARROW_FLIGHT_SQL_SHARED_LIB}"
 )
 message(STATUS "Found the Arrow Flight SQL import library: ${ARROW_FLIGHT_SQL_IMPORT_LIB}"
 )
 message(STATUS "Found the Arrow Flight SQL static library: ${ARROW_FLIGHT_SQL_STATIC_LIB}"
 )
endif()

43 changes: 43 additions & 0 deletions
cpp/cmake_modules/FindSQLite3Alt.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
# 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.

# Once done this will define
# - FindSQLite3Alt
#
# This module will set the following variables if found:
# SQLite3_INCLUDE_DIRS - SQLite3 include dir.
# SQLite3_LIBRARIES - List of libraries when using SQLite3.
# SQLite3_FOUND - True if SQLite3 found.
#
# Usage of this module as follows:
# find_package(SQLite3Alt)

find_path(SQLite3_INCLUDE_DIR sqlite3.h)
find_library(SQLite3_LIBRARY NAMES sqlite3)

# handle the QUIETLY and REQUIRED arguments and set SQLite3_FOUND to TRUE if
# all listed variables are TRUE
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(SQLite3Alt REQUIRED_VARS SQLite3_LIBRARY
 SQLite3_INCLUDE_DIR)

mark_as_advanced(SQLite3_LIBRARY SQLite3_INCLUDE_DIR)

if(SQLite3Alt_FOUND)
 set(SQLite3_INCLUDE_DIRS ${SQLite3_INCLUDE_DIR})
 set(SQLite3_LIBRARIES ${SQLite3_LIBRARY})
endif()

10 changes: 10 additions & 0 deletions
cpp/src/arrow/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -732,6 +732,16 @@ if(ARROW_FLIGHT)
 add_subdirectory(flight)
endif()

if(ARROW_FLIGHT_SQL)
 add_subdirectory(flight/sql)
endif()

if(ARROW_FLIGHT
 AND ARROW_FLIGHT_SQL
 AND ARROW_BUILD_INTEGRATION)
 add_subdirectory(flight/integration_tests)
endif()

if(ARROW_HIVESERVER2)
 add_subdirectory(dbi/hiveserver2)
endif()
Expand Down

34 changes: 17 additions & 17 deletions
cpp/src/arrow/flight/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,23 @@ if(WIN32)
 list(APPEND ARROW_FLIGHT_LINK_LIBS ws2_32.lib)
endif()

if(ARROW_TEST_LINKAGE STREQUAL "static")
set(ARROW_FLIGHT_TEST_LINKAGE
 "${ARROW_TEST_LINKAGE}"
 PARENT_SCOPE)
if(Protobuf_USE_STATIC_LIBS)
 message(STATUS "Linking Arrow Flight tests statically due to static Protobuf")
 set(ARROW_FLIGHT_TEST_LINKAGE
 "static"
 PARENT_SCOPE)
endif()
if(NOT ARROW_GRPC_USE_SHARED)
 message(STATUS "Linking Arrow Flight tests statically due to static gRPC")
 set(ARROW_FLIGHT_TEST_LINKAGE
 "static"
 PARENT_SCOPE)
endif()

if(ARROW_FLIGHT_TEST_LINKAGE STREQUAL "static")
 set(ARROW_FLIGHT_TEST_LINK_LIBS
 arrow_flight_static arrow_flight_testing_static ${ARROW_FLIGHT_STATIC_LINK_LIBS}
 ${ARROW_TEST_LINK_LIBS})
Expand DownExpand Up@@ -186,7 +202,6 @@ if(ARROW_TESTING)
 OUTPUTS
 ARROW_FLIGHT_TESTING_LIBRARIES
 SOURCES
 test_integration.cc
 test_util.cc
 DEPENDENCIES
 GTest::gtest
Expand DownExpand Up@@ -230,21 +245,6 @@ if(ARROW_BUILD_TESTS OR ARROW_BUILD_BENCHMARKS)
 add_dependencies(arrow_flight flight-test-server)
endif()

if(ARROW_BUILD_INTEGRATION)
 add_executable(flight-test-integration-server test_integration_server.cc)
 target_link_libraries(flight-test-integration-server ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

 add_executable(flight-test-integration-client test_integration_client.cc)
 target_link_libraries(flight-test-integration-client ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

 add_dependencies(arrow_flight flight-test-integration-client
 flight-test-integration-server)
 add_dependencies(arrow-integration flight-test-integration-client
 flight-test-integration-server)
endif()

if(ARROW_BUILD_BENCHMARKS)
 # Perf server for benchmarks
 set(PERF_PROTO_GENERATED_FILES "${CMAKE_CURRENT_BINARY_DIR}/perf.pb.cc"
Expand Down

47 changes: 47 additions & 0 deletions
cpp/src/arrow/flight/integration_tests/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
# 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_integration_tests)

if(ARROW_FLIGHT_TEST_LINKAGE STREQUAL "static")
 set(ARROW_FLIGHT_TEST_LINK_LIBS
 arrow_flight_static
 arrow_flight_testing_static
 arrow_flight_sql_static
 ${ARROW_FLIGHT_STATIC_LINK_LIBS}
 ${ARROW_TEST_LINK_LIBS})
else()
 set(ARROW_FLIGHT_TEST_LINK_LIBS
 arrow_flight_shared
 arrow_flight_testing_shared
 arrow_flight_sql_shared
 ${ARROW_TEST_LINK_LIBS}
 ${ARROW_FLIGHT_SQL_TEST_LINK_LIBS})
endif()

add_executable(flight-test-integration-server test_integration_server.cc
 test_integration.cc)
target_link_libraries(flight-test-integration-server ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

add_executable(flight-test-integration-client test_integration_client.cc
 test_integration.cc)
target_link_libraries(flight-test-integration-client ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

add_dependencies(arrow-integration flight-test-integration-client
 flight-test-integration-server)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ARROW-14421: [C++] Implement Flight SQL#12013

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.

 Sign up for GitHub

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

 Closed

lidavidm
wants to merge
5
commits into

from

 Closed


ARROW-14421: [C++] Implement Flight SQL
#12013
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
645edf3

ARROW-12922: [Java] Add flight-sql to the flight package


rafael-telles Dec 15, 2021
22bd624

ARROW-14421: [C++] Implement Flight SQL


rafael-telles Dec 15, 2021
16a9df1

ARROW-15112: [Integration][C++][Java] Implement Flight SQL integratio…


rafael-telles Dec 21, 2021
dc3f919

ARROW-15187: [Java][FlightRPC] Fix pom.xml for Flight integration tests


rafael-telles Dec 22, 2021
31fb76c

ARROW-15198: [C++][FlightRPC] Fix conda-python-hdfs build error on fl…


rafael-telles Dec 23, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
ci/docker/conda-cpp.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ ENV ARROW_BUILD_TESTS=ON \
 ARROW_DATASET=ON \
 ARROW_DEPENDENCY_SOURCE=CONDA \
 ARROW_FLIGHT=ON \
 ARROW_FLIGHT_SQL=ON \
 ARROW_GANDIVA=ON \
 ARROW_HOME=$CONDA_PREFIX \
 ARROW_ORC=ON \
Expand Down

1 change: 1 addition & 0 deletions
ci/scripts/cpp_build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,7 @@ cmake \
 -DARROW_EXTRA_ERROR_CONTEXT=${ARROW_EXTRA_ERROR_CONTEXT:-OFF} \
 -DARROW_FILESYSTEM=${ARROW_FILESYSTEM:-ON} \
 -DARROW_FLIGHT=${ARROW_FLIGHT:-OFF} \
 -DARROW_FLIGHT_SQL=${ARROW_FLIGHT_SQL:-OFF} \
 -DARROW_FUZZING=${ARROW_FUZZING:-OFF} \
 -DARROW_GANDIVA_JAVA=${ARROW_GANDIVA_JAVA:-OFF} \
 -DARROW_GANDIVA_PC_CXX_FLAGS=${ARROW_GANDIVA_PC_CXX_FLAGS:-} \
Expand Down

8 changes: 8 additions & 0 deletions
cpp/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -334,6 +334,14 @@ if(ARROW_GANDIVA)
 set(ARROW_WITH_RE2 ON)
endif()

if(ARROW_BUILD_INTEGRATION AND ARROW_FLIGHT)
 set(ARROW_FLIGHT_SQL ON)
endif()

if(ARROW_FLIGHT_SQL)
 set(ARROW_FLIGHT ON)
endif()

if(ARROW_CUDA
 OR ARROW_FLIGHT
 OR ARROW_PARQUET
Expand Down

2 changes: 2 additions & 0 deletions
cpp/cmake_modules/DefineOptions.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,6 +226,8 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 define_option(ARROW_FLIGHT
 "Build the Arrow Flight RPC System (requires GRPC, Protocol Buffers)" OFF)

 define_option(ARROW_FLIGHT_SQL "Build the Arrow Flight SQL extension" OFF)

 define_option(ARROW_GANDIVA "Build the Gandiva libraries" OFF)

 define_option(ARROW_GCS
Expand Down

93 changes: 93 additions & 0 deletions
cpp/cmake_modules/FindArrowFlightSql.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
# 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.

# - Find Arrow Flight SQL
#
# This module requires Arrow from which it uses
# arrow_find_package()
#
# This module defines
# ARROW_FLIGHT_SQL_FOUND, whether Flight has been found
# ARROW_FLIGHT_SQL_IMPORT_LIB,
# path to libarrow_flight's import library (Windows only)
# ARROW_FLIGHT_SQL_INCLUDE_DIR, directory containing headers
# ARROW_FLIGHT_SQL_LIBS, deprecated. Use ARROW_FLIGHT_SQL_LIB_DIR instead
# ARROW_FLIGHT_SQL_LIB_DIR, directory containing Flight libraries
# ARROW_FLIGHT_SQL_SHARED_IMP_LIB, deprecated. Use ARROW_FLIGHT_SQL_IMPORT_LIB instead
# ARROW_FLIGHT_SQL_SHARED_LIB, path to libarrow_flight's shared library
# ARROW_FLIGHT_SQL_STATIC_LIB, path to libarrow_flight.a

if(DEFINED ARROW_FLIGHT_SQL_FOUND)
 return()
endif()

set(find_package_arguments)
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION)
 list(APPEND find_package_arguments "${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION}")
endif()
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
 list(APPEND find_package_arguments REQUIRED)
endif()
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
 list(APPEND find_package_arguments QUIET)
endif()
find_package(Arrow ${find_package_arguments})

if(ARROW_FOUND)
 arrow_find_package(ARROW_FLIGHT_SQL
 "${ARROW_HOME}"
 arrow_flight_sql
 arrow/flight/sql/api.h
 ArrowFlightSql
 arrow-flight-sql)
 if(NOT ARROW_FLIGHT_SQL_VERSION)
 set(ARROW_FLIGHT_SQL_VERSION "${ARROW_VERSION}")
 endif()
endif()

if("${ARROW_FLIGHT_SQL_VERSION}" VERSION_EQUAL "${ARROW_VERSION}")
 set(ARROW_FLIGHT_SQL_VERSION_MATCH TRUE)
else()
 set(ARROW_FLIGHT_SQL_VERSION_MATCH FALSE)
endif()

mark_as_advanced(ARROW_FLIGHT_SQL_IMPORT_LIB
 ARROW_FLIGHT_SQL_INCLUDE_DIR
 ARROW_FLIGHT_SQL_LIBS
 ARROW_FLIGHT_SQL_LIB_DIR
 ARROW_FLIGHT_SQL_SHARED_IMP_LIB
 ARROW_FLIGHT_SQL_SHARED_LIB
 ARROW_FLIGHT_SQL_STATIC_LIB
 ARROW_FLIGHT_SQL_VERSION
 ARROW_FLIGHT_SQL_VERSION_MATCH)

find_package_handle_standard_args(
 ArrowFlightSql
 REQUIRED_VARS ARROW_FLIGHT_SQL_INCLUDE_DIR ARROW_FLIGHT_SQL_LIB_DIR
 ARROW_FLIGHT_SQL_VERSION_MATCH
 VERSION_VAR ARROW_FLIGHT_SQL_VERSION)
set(ARROW_FLIGHT_SQL_FOUND ${ArrowFlightSql_FOUND})

if(ArrowFlightSql_FOUND AND NOT ArrowFlightSql_FIND_QUIETLY)
 message(STATUS "Found the Arrow Flight SQL by ${ARROW_FLIGHT_SQL_FIND_APPROACH}")
 message(STATUS "Found the Arrow Flight SQL shared library: ${ARROW_FLIGHT_SQL_SHARED_LIB}"
 )
 message(STATUS "Found the Arrow Flight SQL import library: ${ARROW_FLIGHT_SQL_IMPORT_LIB}"
 )
 message(STATUS "Found the Arrow Flight SQL static library: ${ARROW_FLIGHT_SQL_STATIC_LIB}"
 )
endif()

43 changes: 43 additions & 0 deletions
cpp/cmake_modules/FindSQLite3Alt.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
# 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.

# Once done this will define
# - FindSQLite3Alt
#
# This module will set the following variables if found:
# SQLite3_INCLUDE_DIRS - SQLite3 include dir.
# SQLite3_LIBRARIES - List of libraries when using SQLite3.
# SQLite3_FOUND - True if SQLite3 found.
#
# Usage of this module as follows:
# find_package(SQLite3Alt)

find_path(SQLite3_INCLUDE_DIR sqlite3.h)
find_library(SQLite3_LIBRARY NAMES sqlite3)

# handle the QUIETLY and REQUIRED arguments and set SQLite3_FOUND to TRUE if
# all listed variables are TRUE
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(SQLite3Alt REQUIRED_VARS SQLite3_LIBRARY
 SQLite3_INCLUDE_DIR)

mark_as_advanced(SQLite3_LIBRARY SQLite3_INCLUDE_DIR)

if(SQLite3Alt_FOUND)
 set(SQLite3_INCLUDE_DIRS ${SQLite3_INCLUDE_DIR})
 set(SQLite3_LIBRARIES ${SQLite3_LIBRARY})
endif()

10 changes: 10 additions & 0 deletions
cpp/src/arrow/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -732,6 +732,16 @@ if(ARROW_FLIGHT)
 add_subdirectory(flight)
endif()

if(ARROW_FLIGHT_SQL)
 add_subdirectory(flight/sql)
endif()

if(ARROW_FLIGHT
 AND ARROW_FLIGHT_SQL
 AND ARROW_BUILD_INTEGRATION)
 add_subdirectory(flight/integration_tests)
endif()

if(ARROW_HIVESERVER2)
 add_subdirectory(dbi/hiveserver2)
endif()
Expand Down

34 changes: 17 additions & 17 deletions
cpp/src/arrow/flight/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,23 @@ if(WIN32)
 list(APPEND ARROW_FLIGHT_LINK_LIBS ws2_32.lib)
endif()

if(ARROW_TEST_LINKAGE STREQUAL "static")
set(ARROW_FLIGHT_TEST_LINKAGE
 "${ARROW_TEST_LINKAGE}"
 PARENT_SCOPE)
if(Protobuf_USE_STATIC_LIBS)
 message(STATUS "Linking Arrow Flight tests statically due to static Protobuf")
 set(ARROW_FLIGHT_TEST_LINKAGE
 "static"
 PARENT_SCOPE)
endif()
if(NOT ARROW_GRPC_USE_SHARED)
 message(STATUS "Linking Arrow Flight tests statically due to static gRPC")
 set(ARROW_FLIGHT_TEST_LINKAGE
 "static"
 PARENT_SCOPE)
endif()

if(ARROW_FLIGHT_TEST_LINKAGE STREQUAL "static")
 set(ARROW_FLIGHT_TEST_LINK_LIBS
 arrow_flight_static arrow_flight_testing_static ${ARROW_FLIGHT_STATIC_LINK_LIBS}
 ${ARROW_TEST_LINK_LIBS})
Expand DownExpand Up@@ -186,7 +202,6 @@ if(ARROW_TESTING)
 OUTPUTS
 ARROW_FLIGHT_TESTING_LIBRARIES
 SOURCES
 test_integration.cc
 test_util.cc
 DEPENDENCIES
 GTest::gtest
Expand DownExpand Up@@ -230,21 +245,6 @@ if(ARROW_BUILD_TESTS OR ARROW_BUILD_BENCHMARKS)
 add_dependencies(arrow_flight flight-test-server)
endif()

if(ARROW_BUILD_INTEGRATION)
 add_executable(flight-test-integration-server test_integration_server.cc)
 target_link_libraries(flight-test-integration-server ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

 add_executable(flight-test-integration-client test_integration_client.cc)
 target_link_libraries(flight-test-integration-client ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

 add_dependencies(arrow_flight flight-test-integration-client
 flight-test-integration-server)
 add_dependencies(arrow-integration flight-test-integration-client
 flight-test-integration-server)
endif()

if(ARROW_BUILD_BENCHMARKS)
 # Perf server for benchmarks
 set(PERF_PROTO_GENERATED_FILES "${CMAKE_CURRENT_BINARY_DIR}/perf.pb.cc"
Expand Down

47 changes: 47 additions & 0 deletions
cpp/src/arrow/flight/integration_tests/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
# 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_integration_tests)

if(ARROW_FLIGHT_TEST_LINKAGE STREQUAL "static")
 set(ARROW_FLIGHT_TEST_LINK_LIBS
 arrow_flight_static
 arrow_flight_testing_static
 arrow_flight_sql_static
 ${ARROW_FLIGHT_STATIC_LINK_LIBS}
 ${ARROW_TEST_LINK_LIBS})
else()
 set(ARROW_FLIGHT_TEST_LINK_LIBS
 arrow_flight_shared
 arrow_flight_testing_shared
 arrow_flight_sql_shared
 ${ARROW_TEST_LINK_LIBS}
 ${ARROW_FLIGHT_SQL_TEST_LINK_LIBS})
endif()

add_executable(flight-test-integration-server test_integration_server.cc
 test_integration.cc)
target_link_libraries(flight-test-integration-server ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

add_executable(flight-test-integration-client test_integration_client.cc
 test_integration.cc)
target_link_libraries(flight-test-integration-client ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

add_dependencies(arrow-integration flight-test-integration-client
 flight-test-integration-server)
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
ARROW-14421: [C++] Implement Flight SQL#12013

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.

 Sign up for GitHub

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

 Closed

lidavidm
wants to merge
5
commits into

from

 Closed


ARROW-14421: [C++] Implement Flight SQL
#12013
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


5 commits


Select commit
Hold shift + click to select a range
645edf3

ARROW-12922: [Java] Add flight-sql to the flight package


rafael-telles Dec 15, 2021
22bd624

ARROW-14421: [C++] Implement Flight SQL


rafael-telles Dec 15, 2021
16a9df1

ARROW-15112: [Integration][C++][Java] Implement Flight SQL integratio…


rafael-telles Dec 21, 2021
dc3f919

ARROW-15187: [Java][FlightRPC] Fix pom.xml for Flight integration tests


rafael-telles Dec 22, 2021
31fb76c

ARROW-15198: [C++][FlightRPC] Fix conda-python-hdfs build error on fl…


rafael-telles Dec 23, 2021

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


1 change: 1 addition & 0 deletions
ci/docker/conda-cpp.dockerfile

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -41,6 +41,7 @@ ENV ARROW_BUILD_TESTS=ON \
 ARROW_DATASET=ON \
 ARROW_DEPENDENCY_SOURCE=CONDA \
 ARROW_FLIGHT=ON \
 ARROW_FLIGHT_SQL=ON \
 ARROW_GANDIVA=ON \
 ARROW_HOME=$CONDA_PREFIX \
 ARROW_ORC=ON \
Expand Down

1 change: 1 addition & 0 deletions
ci/scripts/cpp_build.sh

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,7 @@ cmake \
 -DARROW_EXTRA_ERROR_CONTEXT=${ARROW_EXTRA_ERROR_CONTEXT:-OFF} \
 -DARROW_FILESYSTEM=${ARROW_FILESYSTEM:-ON} \
 -DARROW_FLIGHT=${ARROW_FLIGHT:-OFF} \
 -DARROW_FLIGHT_SQL=${ARROW_FLIGHT_SQL:-OFF} \
 -DARROW_FUZZING=${ARROW_FUZZING:-OFF} \
 -DARROW_GANDIVA_JAVA=${ARROW_GANDIVA_JAVA:-OFF} \
 -DARROW_GANDIVA_PC_CXX_FLAGS=${ARROW_GANDIVA_PC_CXX_FLAGS:-} \
Expand Down

8 changes: 8 additions & 0 deletions
cpp/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -334,6 +334,14 @@ if(ARROW_GANDIVA)
 set(ARROW_WITH_RE2 ON)
endif()

if(ARROW_BUILD_INTEGRATION AND ARROW_FLIGHT)
 set(ARROW_FLIGHT_SQL ON)
endif()

if(ARROW_FLIGHT_SQL)
 set(ARROW_FLIGHT ON)
endif()

if(ARROW_CUDA
 OR ARROW_FLIGHT
 OR ARROW_PARQUET
Expand Down

2 changes: 2 additions & 0 deletions
cpp/cmake_modules/DefineOptions.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -226,6 +226,8 @@ if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_CURRENT_SOURCE_DIR}")
 define_option(ARROW_FLIGHT
 "Build the Arrow Flight RPC System (requires GRPC, Protocol Buffers)" OFF)

 define_option(ARROW_FLIGHT_SQL "Build the Arrow Flight SQL extension" OFF)

 define_option(ARROW_GANDIVA "Build the Gandiva libraries" OFF)

 define_option(ARROW_GCS
Expand Down

93 changes: 93 additions & 0 deletions
cpp/cmake_modules/FindArrowFlightSql.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
# 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.

# - Find Arrow Flight SQL
#
# This module requires Arrow from which it uses
# arrow_find_package()
#
# This module defines
# ARROW_FLIGHT_SQL_FOUND, whether Flight has been found
# ARROW_FLIGHT_SQL_IMPORT_LIB,
# path to libarrow_flight's import library (Windows only)
# ARROW_FLIGHT_SQL_INCLUDE_DIR, directory containing headers
# ARROW_FLIGHT_SQL_LIBS, deprecated. Use ARROW_FLIGHT_SQL_LIB_DIR instead
# ARROW_FLIGHT_SQL_LIB_DIR, directory containing Flight libraries
# ARROW_FLIGHT_SQL_SHARED_IMP_LIB, deprecated. Use ARROW_FLIGHT_SQL_IMPORT_LIB instead
# ARROW_FLIGHT_SQL_SHARED_LIB, path to libarrow_flight's shared library
# ARROW_FLIGHT_SQL_STATIC_LIB, path to libarrow_flight.a

if(DEFINED ARROW_FLIGHT_SQL_FOUND)
 return()
endif()

set(find_package_arguments)
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION)
 list(APPEND find_package_arguments "${${CMAKE_FIND_PACKAGE_NAME}_FIND_VERSION}")
endif()
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_REQUIRED)
 list(APPEND find_package_arguments REQUIRED)
endif()
if(${CMAKE_FIND_PACKAGE_NAME}_FIND_QUIETLY)
 list(APPEND find_package_arguments QUIET)
endif()
find_package(Arrow ${find_package_arguments})

if(ARROW_FOUND)
 arrow_find_package(ARROW_FLIGHT_SQL
 "${ARROW_HOME}"
 arrow_flight_sql
 arrow/flight/sql/api.h
 ArrowFlightSql
 arrow-flight-sql)
 if(NOT ARROW_FLIGHT_SQL_VERSION)
 set(ARROW_FLIGHT_SQL_VERSION "${ARROW_VERSION}")
 endif()
endif()

if("${ARROW_FLIGHT_SQL_VERSION}" VERSION_EQUAL "${ARROW_VERSION}")
 set(ARROW_FLIGHT_SQL_VERSION_MATCH TRUE)
else()
 set(ARROW_FLIGHT_SQL_VERSION_MATCH FALSE)
endif()

mark_as_advanced(ARROW_FLIGHT_SQL_IMPORT_LIB
 ARROW_FLIGHT_SQL_INCLUDE_DIR
 ARROW_FLIGHT_SQL_LIBS
 ARROW_FLIGHT_SQL_LIB_DIR
 ARROW_FLIGHT_SQL_SHARED_IMP_LIB
 ARROW_FLIGHT_SQL_SHARED_LIB
 ARROW_FLIGHT_SQL_STATIC_LIB
 ARROW_FLIGHT_SQL_VERSION
 ARROW_FLIGHT_SQL_VERSION_MATCH)

find_package_handle_standard_args(
 ArrowFlightSql
 REQUIRED_VARS ARROW_FLIGHT_SQL_INCLUDE_DIR ARROW_FLIGHT_SQL_LIB_DIR
 ARROW_FLIGHT_SQL_VERSION_MATCH
 VERSION_VAR ARROW_FLIGHT_SQL_VERSION)
set(ARROW_FLIGHT_SQL_FOUND ${ArrowFlightSql_FOUND})

if(ArrowFlightSql_FOUND AND NOT ArrowFlightSql_FIND_QUIETLY)
 message(STATUS "Found the Arrow Flight SQL by ${ARROW_FLIGHT_SQL_FIND_APPROACH}")
 message(STATUS "Found the Arrow Flight SQL shared library: ${ARROW_FLIGHT_SQL_SHARED_LIB}"
 )
 message(STATUS "Found the Arrow Flight SQL import library: ${ARROW_FLIGHT_SQL_IMPORT_LIB}"
 )
 message(STATUS "Found the Arrow Flight SQL static library: ${ARROW_FLIGHT_SQL_STATIC_LIB}"
 )
endif()

43 changes: 43 additions & 0 deletions
cpp/cmake_modules/FindSQLite3Alt.cmake

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
# 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.

# Once done this will define
# - FindSQLite3Alt
#
# This module will set the following variables if found:
# SQLite3_INCLUDE_DIRS - SQLite3 include dir.
# SQLite3_LIBRARIES - List of libraries when using SQLite3.
# SQLite3_FOUND - True if SQLite3 found.
#
# Usage of this module as follows:
# find_package(SQLite3Alt)

find_path(SQLite3_INCLUDE_DIR sqlite3.h)
find_library(SQLite3_LIBRARY NAMES sqlite3)

# handle the QUIETLY and REQUIRED arguments and set SQLite3_FOUND to TRUE if
# all listed variables are TRUE
include(FindPackageHandleStandardArgs)
find_package_handle_standard_args(SQLite3Alt REQUIRED_VARS SQLite3_LIBRARY
 SQLite3_INCLUDE_DIR)

mark_as_advanced(SQLite3_LIBRARY SQLite3_INCLUDE_DIR)

if(SQLite3Alt_FOUND)
 set(SQLite3_INCLUDE_DIRS ${SQLite3_INCLUDE_DIR})
 set(SQLite3_LIBRARIES ${SQLite3_LIBRARY})
endif()

10 changes: 10 additions & 0 deletions
cpp/src/arrow/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -732,6 +732,16 @@ if(ARROW_FLIGHT)
 add_subdirectory(flight)
endif()

if(ARROW_FLIGHT_SQL)
 add_subdirectory(flight/sql)
endif()

if(ARROW_FLIGHT
 AND ARROW_FLIGHT_SQL
 AND ARROW_BUILD_INTEGRATION)
 add_subdirectory(flight/integration_tests)
endif()

if(ARROW_HIVESERVER2)
 add_subdirectory(dbi/hiveserver2)
endif()
Expand Down

34 changes: 17 additions & 17 deletions
cpp/src/arrow/flight/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,23 @@ if(WIN32)
 list(APPEND ARROW_FLIGHT_LINK_LIBS ws2_32.lib)
endif()

if(ARROW_TEST_LINKAGE STREQUAL "static")
set(ARROW_FLIGHT_TEST_LINKAGE
 "${ARROW_TEST_LINKAGE}"
 PARENT_SCOPE)
if(Protobuf_USE_STATIC_LIBS)
 message(STATUS "Linking Arrow Flight tests statically due to static Protobuf")
 set(ARROW_FLIGHT_TEST_LINKAGE
 "static"
 PARENT_SCOPE)
endif()
if(NOT ARROW_GRPC_USE_SHARED)
 message(STATUS "Linking Arrow Flight tests statically due to static gRPC")
 set(ARROW_FLIGHT_TEST_LINKAGE
 "static"
 PARENT_SCOPE)
endif()

if(ARROW_FLIGHT_TEST_LINKAGE STREQUAL "static")
 set(ARROW_FLIGHT_TEST_LINK_LIBS
 arrow_flight_static arrow_flight_testing_static ${ARROW_FLIGHT_STATIC_LINK_LIBS}
 ${ARROW_TEST_LINK_LIBS})
Expand DownExpand Up@@ -186,7 +202,6 @@ if(ARROW_TESTING)
 OUTPUTS
 ARROW_FLIGHT_TESTING_LIBRARIES
 SOURCES
 test_integration.cc
 test_util.cc
 DEPENDENCIES
 GTest::gtest
Expand DownExpand Up@@ -230,21 +245,6 @@ if(ARROW_BUILD_TESTS OR ARROW_BUILD_BENCHMARKS)
 add_dependencies(arrow_flight flight-test-server)
endif()

if(ARROW_BUILD_INTEGRATION)
 add_executable(flight-test-integration-server test_integration_server.cc)
 target_link_libraries(flight-test-integration-server ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

 add_executable(flight-test-integration-client test_integration_client.cc)
 target_link_libraries(flight-test-integration-client ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

 add_dependencies(arrow_flight flight-test-integration-client
 flight-test-integration-server)
 add_dependencies(arrow-integration flight-test-integration-client
 flight-test-integration-server)
endif()

if(ARROW_BUILD_BENCHMARKS)
 # Perf server for benchmarks
 set(PERF_PROTO_GENERATED_FILES "${CMAKE_CURRENT_BINARY_DIR}/perf.pb.cc"
Expand Down

47 changes: 47 additions & 0 deletions
cpp/src/arrow/flight/integration_tests/CMakeLists.txt

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,47 @@
# 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_integration_tests)

if(ARROW_FLIGHT_TEST_LINKAGE STREQUAL "static")
 set(ARROW_FLIGHT_TEST_LINK_LIBS
 arrow_flight_static
 arrow_flight_testing_static
 arrow_flight_sql_static
 ${ARROW_FLIGHT_STATIC_LINK_LIBS}
 ${ARROW_TEST_LINK_LIBS})
else()
 set(ARROW_FLIGHT_TEST_LINK_LIBS
 arrow_flight_shared
 arrow_flight_testing_shared
 arrow_flight_sql_shared
 ${ARROW_TEST_LINK_LIBS}
 ${ARROW_FLIGHT_SQL_TEST_LINK_LIBS})
endif()

add_executable(flight-test-integration-server test_integration_server.cc
 test_integration.cc)
target_link_libraries(flight-test-integration-server ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

add_executable(flight-test-integration-client test_integration_client.cc
 test_integration.cc)
target_link_libraries(flight-test-integration-client ${ARROW_FLIGHT_TEST_LINK_LIBS}
 ${GFLAGS_LIBRARIES} GTest::gtest)

add_dependencies(arrow-integration flight-test-integration-client
 flight-test-integration-server)
Loading