You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@arrow.apache.org by li...@apache.org on 2022/07/11 16:32:08 UTC
[arrow-adbc] branch main updated: Cleanly separate C/Java code (#35)
This is an automated email from the ASF dual-hosted git repository.
lidavidm pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/arrow-adbc.git
The following commit(s) were added to refs/heads/main by this push:
new f753dc9 Cleanly separate C/Java code (#35)
f753dc9 is described below
commit f753dc9a067d9effd3e9926f48342aa645fef11c
Author: David Li <li...@gmail.com>
AuthorDate: Mon Jul 11 12:32:03 2022 -0400
Cleanly separate C/Java code (#35)
Fixes #32.
---
.github/workflows/cpp.yml | 10 +++++-----
{cmake_modules => c/cmake_modules}/AdbcDefines.cmake | 0
{cmake_modules => c/cmake_modules}/BuildUtils.cmake | 0
{cmake_modules => c/cmake_modules}/DefineOptions.cmake | 0
{cmake_modules => c/cmake_modules}/README.md | 0
{cmake_modules => c/cmake_modules}/san-config.cmake | 0
{adbc_driver_manager => c/driver_manager}/CMakeLists.txt | 6 +++---
.../driver_manager}/adbc_driver_manager.cc | 0
.../driver_manager}/adbc_driver_manager.h | 0
.../driver_manager}/adbc_driver_manager_test.cc | 2 +-
{drivers => c/drivers}/flight_sql/CMakeLists.txt | 5 +++--
{drivers => c/drivers}/flight_sql/flight_sql.cc | 0
{drivers => c/drivers}/flight_sql/flight_sql_test.cc | 0
{drivers => c/drivers}/sqlite/CMakeLists.txt | 6 +++---
{drivers => c/drivers}/sqlite/sqlite.cc | 0
{drivers => c/drivers}/sqlite/sqlite_test.cc | 2 +-
{drivers => c/drivers}/test_util.h | 0
{drivers => c/drivers}/util.h | 0
{validation => c/validation}/adbc_validation.c | 0
{validation => c/validation}/adbc_validation.h | 0
python/adbc_driver_manager/setup.py | 4 ++--
21 files changed, 18 insertions(+), 17 deletions(-)
diff --git a/.github/workflows/cpp.yml b/.github/workflows/cpp.yml
index 213effd..db36354 100644
--- a/.github/workflows/cpp.yml
+++ b/.github/workflows/cpp.yml
@@ -78,7 +78,7 @@ jobs:
run: |
mkdir -p build/driver_sqlite
pushd build/driver_sqlite
- cmake ../../drivers/sqlite -DADBC_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DADBC_BUILD_SHARED=ON -DADBC_BUILD_STATIC=OFF -DADBC_USE_ASAN=ON -DADBC_USE_UBSAN=ON
+ cmake ../../c/drivers/sqlite -DADBC_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DADBC_BUILD_SHARED=ON -DADBC_BUILD_STATIC=OFF -DADBC_USE_ASAN=ON -DADBC_USE_UBSAN=ON
cmake --build .
export DYLD_LIBRARY_PATH=$(pwd)
# MacOS doesn't allow DYLD_LIBRARY_PATH to propagate through
@@ -90,7 +90,7 @@ jobs:
run: |
mkdir -p build/driver_manager
pushd build/driver_manager
- cmake ../../adbc_driver_manager -DADBC_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DADBC_BUILD_SHARED=ON -DADBC_BUILD_STATIC=OFF -DADBC_USE_ASAN=ON -DADBC_USE_UBSAN=ON
+ cmake ../../c/driver_manager -DADBC_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DADBC_BUILD_SHARED=ON -DADBC_BUILD_STATIC=OFF -DADBC_USE_ASAN=ON -DADBC_USE_UBSAN=ON
cmake --build .
export DYLD_LIBRARY_PATH=$(pwd):../driver_sqlite
export LD_LIBRARY_PATH=$(pwd):../driver_sqlite
@@ -102,7 +102,7 @@ jobs:
# Build a no-ASan version that Python can easily load
mkdir -p build/driver_sqlite_no_asan
pushd build/driver_sqlite_no_asan
- cmake ../../drivers/sqlite -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DADBC_BUILD_SHARED=ON -DADBC_BUILD_STATIC=OFF
+ cmake ../../c/drivers/sqlite -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=$CONDA_PREFIX -DADBC_BUILD_SHARED=ON -DADBC_BUILD_STATIC=OFF
cmake --build .
popd
- name: Build/Test Python Driver Manager
@@ -144,7 +144,7 @@ jobs:
run: |
mkdir build\driver_sqlite
cd build\driver_sqlite
- cmake -GNinja ..\..\drivers\sqlite -DADBC_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=%CONDA_PREFIX% -DADBC_BUILD_SHARED=ON -DADBC_BUILD_STATIC=OFF
+ cmake -GNinja ..\..\c\drivers\sqlite -DADBC_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=%CONDA_PREFIX% -DADBC_BUILD_SHARED=ON -DADBC_BUILD_STATIC=OFF
if %errorlevel% neq 0 then exit /b %errorlevel%
cmake --build .
if %errorlevel% neq 0 then exit /b %errorlevel%
@@ -156,7 +156,7 @@ jobs:
run: |
mkdir build\driver_manager
cd build\driver_manager
- cmake -GNinja ..\..\adbc_driver_manager -DADBC_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=%CONDA_PREFIX% -DADBC_BUILD_SHARED=ON -DADBC_BUILD_STATIC=OFF
+ cmake -GNinja ..\..\c\driver_manager -DADBC_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=%CONDA_PREFIX% -DADBC_BUILD_SHARED=ON -DADBC_BUILD_STATIC=OFF
if %errorlevel% neq 0 then exit /b %errorlevel%
cmake --build .
if %errorlevel% neq 0 then exit /b %errorlevel%
diff --git a/cmake_modules/AdbcDefines.cmake b/c/cmake_modules/AdbcDefines.cmake
similarity index 100%
rename from cmake_modules/AdbcDefines.cmake
rename to c/cmake_modules/AdbcDefines.cmake
diff --git a/cmake_modules/BuildUtils.cmake b/c/cmake_modules/BuildUtils.cmake
similarity index 100%
rename from cmake_modules/BuildUtils.cmake
rename to c/cmake_modules/BuildUtils.cmake
diff --git a/cmake_modules/DefineOptions.cmake b/c/cmake_modules/DefineOptions.cmake
similarity index 100%
rename from cmake_modules/DefineOptions.cmake
rename to c/cmake_modules/DefineOptions.cmake
diff --git a/cmake_modules/README.md b/c/cmake_modules/README.md
similarity index 100%
rename from cmake_modules/README.md
rename to c/cmake_modules/README.md
diff --git a/cmake_modules/san-config.cmake b/c/cmake_modules/san-config.cmake
similarity index 100%
rename from cmake_modules/san-config.cmake
rename to c/cmake_modules/san-config.cmake
diff --git a/adbc_driver_manager/CMakeLists.txt b/c/driver_manager/CMakeLists.txt
similarity index 91%
rename from adbc_driver_manager/CMakeLists.txt
rename to c/driver_manager/CMakeLists.txt
index b9ba012..b8a3a13 100644
--- a/adbc_driver_manager/CMakeLists.txt
+++ b/c/driver_manager/CMakeLists.txt
@@ -16,9 +16,9 @@
# under the License.
cmake_minimum_required(VERSION 3.10)
-get_filename_component(REPOSITORY_ROOT ".." ABSOLUTE)
+get_filename_component(REPOSITORY_ROOT "../.." ABSOLUTE)
message(STATUS "${REPOSITORY_ROOT}")
-list(APPEND CMAKE_MODULE_PATH "${REPOSITORY_ROOT}/cmake_modules/")
+list(APPEND CMAKE_MODULE_PATH "${REPOSITORY_ROOT}/c/cmake_modules/")
include(AdbcDefines)
include(BuildUtils)
include(DefineOptions)
@@ -34,6 +34,7 @@ add_arrow_lib(adbc_driver_manager
OUTPUTS
ADBC_LIBRARIES)
include_directories(SYSTEM ${REPOSITORY_ROOT})
+include_directories(SYSTEM ${REPOSITORY_ROOT}/c/)
foreach(LIB_TARGET ${ADBC_LIBRARIES})
target_compile_definitions(${LIB_TARGET} PRIVATE ADBC_EXPORTING)
endforeach()
@@ -47,7 +48,6 @@ if(ADBC_BUILD_TESTS)
else()
set(TEST_LINK_LIBS adbc_driver_manager_static arrow_static)
endif()
- include_directories(SYSTEM ${REPOSITORY_ROOT}/validation)
add_test_case(driver_manager_test
PREFIX
diff --git a/adbc_driver_manager/adbc_driver_manager.cc b/c/driver_manager/adbc_driver_manager.cc
similarity index 100%
rename from adbc_driver_manager/adbc_driver_manager.cc
rename to c/driver_manager/adbc_driver_manager.cc
diff --git a/adbc_driver_manager/adbc_driver_manager.h b/c/driver_manager/adbc_driver_manager.h
similarity index 100%
rename from adbc_driver_manager/adbc_driver_manager.h
rename to c/driver_manager/adbc_driver_manager.h
diff --git a/adbc_driver_manager/adbc_driver_manager_test.cc b/c/driver_manager/adbc_driver_manager_test.cc
similarity index 99%
rename from adbc_driver_manager/adbc_driver_manager_test.cc
rename to c/driver_manager/adbc_driver_manager_test.cc
index 74126c9..2adcdf2 100644
--- a/adbc_driver_manager/adbc_driver_manager_test.cc
+++ b/c/driver_manager/adbc_driver_manager_test.cc
@@ -29,8 +29,8 @@
#include "adbc.h"
#include "adbc_driver_manager.h"
-#include "adbc_validation.h"
#include "drivers/test_util.h"
+#include "validation/adbc_validation.h"
// Tests of the SQLite example driver, except using the driver manager
diff --git a/drivers/flight_sql/CMakeLists.txt b/c/drivers/flight_sql/CMakeLists.txt
similarity index 92%
rename from drivers/flight_sql/CMakeLists.txt
rename to c/drivers/flight_sql/CMakeLists.txt
index 33f53e1..f067911 100644
--- a/drivers/flight_sql/CMakeLists.txt
+++ b/c/drivers/flight_sql/CMakeLists.txt
@@ -16,8 +16,8 @@
# under the License.
cmake_minimum_required(VERSION 3.14)
-get_filename_component(REPOSITORY_ROOT "../.." ABSOLUTE)
-list(APPEND CMAKE_MODULE_PATH "${REPOSITORY_ROOT}/cmake_modules/")
+get_filename_component(REPOSITORY_ROOT "../../.." ABSOLUTE)
+list(APPEND CMAKE_MODULE_PATH "${REPOSITORY_ROOT}/c/cmake_modules/")
include(AdbcDefines)
include(BuildUtils)
@@ -45,6 +45,7 @@ add_arrow_lib(adbc_driver_flight_sql
arrow_flight_static
arrow_static)
include_directories(SYSTEM ${REPOSITORY_ROOT})
+include_directories(SYSTEM ${REPOSITORY_ROOT}/c/)
foreach(LIB_TARGET ${ADBC_LIBRARIES})
target_compile_definitions(${LIB_TARGET} PRIVATE ADBC_EXPORTING)
endforeach()
diff --git a/drivers/flight_sql/flight_sql.cc b/c/drivers/flight_sql/flight_sql.cc
similarity index 100%
rename from drivers/flight_sql/flight_sql.cc
rename to c/drivers/flight_sql/flight_sql.cc
diff --git a/drivers/flight_sql/flight_sql_test.cc b/c/drivers/flight_sql/flight_sql_test.cc
similarity index 100%
rename from drivers/flight_sql/flight_sql_test.cc
rename to c/drivers/flight_sql/flight_sql_test.cc
diff --git a/drivers/sqlite/CMakeLists.txt b/c/drivers/sqlite/CMakeLists.txt
similarity index 91%
rename from drivers/sqlite/CMakeLists.txt
rename to c/drivers/sqlite/CMakeLists.txt
index fb4a782..bcff24e 100644
--- a/drivers/sqlite/CMakeLists.txt
+++ b/c/drivers/sqlite/CMakeLists.txt
@@ -16,8 +16,8 @@
# under the License.
cmake_minimum_required(VERSION 3.14)
-get_filename_component(REPOSITORY_ROOT "../.." ABSOLUTE)
-list(APPEND CMAKE_MODULE_PATH "${REPOSITORY_ROOT}/cmake_modules/")
+get_filename_component(REPOSITORY_ROOT "../../../" ABSOLUTE)
+list(APPEND CMAKE_MODULE_PATH "${REPOSITORY_ROOT}/c/cmake_modules/")
include(AdbcDefines)
include(BuildUtils)
@@ -41,6 +41,7 @@ add_arrow_lib(adbc_driver_sqlite
SQLite::SQLite3
arrow_static)
include_directories(SYSTEM ${REPOSITORY_ROOT})
+include_directories(SYSTEM ${REPOSITORY_ROOT}/c/)
include_directories(SYSTEM ${SQLite3_INCLUDE_DIRS})
foreach(LIB_TARGET ${ADBC_LIBRARIES})
target_compile_definitions(${LIB_TARGET} PRIVATE ADBC_EXPORTING)
@@ -53,7 +54,6 @@ else()
endif()
if(ADBC_BUILD_TESTS)
- include_directories(SYSTEM ${REPOSITORY_ROOT}/validation)
add_test_case(driver_sqlite_test
PREFIX
adbc
diff --git a/drivers/sqlite/sqlite.cc b/c/drivers/sqlite/sqlite.cc
similarity index 100%
rename from drivers/sqlite/sqlite.cc
rename to c/drivers/sqlite/sqlite.cc
diff --git a/drivers/sqlite/sqlite_test.cc b/c/drivers/sqlite/sqlite_test.cc
similarity index 99%
rename from drivers/sqlite/sqlite_test.cc
rename to c/drivers/sqlite/sqlite_test.cc
index 6fa9d2e..40bc77c 100644
--- a/drivers/sqlite/sqlite_test.cc
+++ b/c/drivers/sqlite/sqlite_test.cc
@@ -27,8 +27,8 @@
#include <arrow/testing/matchers.h>
#include "adbc.h"
-#include "adbc_validation.h"
#include "drivers/test_util.h"
+#include "validation/adbc_validation.h"
// Tests of the SQLite example driver
diff --git a/drivers/test_util.h b/c/drivers/test_util.h
similarity index 100%
rename from drivers/test_util.h
rename to c/drivers/test_util.h
diff --git a/drivers/util.h b/c/drivers/util.h
similarity index 100%
rename from drivers/util.h
rename to c/drivers/util.h
diff --git a/validation/adbc_validation.c b/c/validation/adbc_validation.c
similarity index 100%
rename from validation/adbc_validation.c
rename to c/validation/adbc_validation.c
diff --git a/validation/adbc_validation.h b/c/validation/adbc_validation.h
similarity index 100%
rename from validation/adbc_validation.h
rename to c/validation/adbc_validation.h
diff --git a/python/adbc_driver_manager/setup.py b/python/adbc_driver_manager/setup.py
index 475b279..9a426a8 100644
--- a/python/adbc_driver_manager/setup.py
+++ b/python/adbc_driver_manager/setup.py
@@ -27,9 +27,9 @@ setup(
name="adbc_driver_manager._lib",
sources=[
"adbc_driver_manager/_lib.pyx",
- "../../adbc_driver_manager/adbc_driver_manager.cc",
+ "../../c/driver_manager/adbc_driver_manager.cc",
],
- include_dirs=["../../", "../../adbc_driver_manager"],
+ include_dirs=["../../", "../../c/driver_manager"],
# extra_compile_args=["-ggdb", "-Og"],
),
),