-
-
Notifications
You must be signed in to change notification settings - Fork 63
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
which contains the ogr_Arrow.so/dylib/dll and ogr_Parquet.so/dylib/dll plugins The libgdal-arrow-parquet build reuses the same build directory as libgdal, hence we just to have to turn on the required dependency and drivers in the build_arrow_parquet.sh/bat scripts. Fixes #628 Also improve build time of the Python bindings by doing a minimal build (relates to #662, but a better fix should be possible)
- Loading branch information
Showing
10 changed files
with
189 additions
and
8 deletions.
There are no files selected for viewing
25 changes: 25 additions & 0 deletions
25
recipe/0002-Parquet-make-sure-that-ArrowLayer-destructor-is-avai.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
From eee1b439437788e9ecb65b600b8cd33d2012be32 Mon Sep 17 00:00:00 2001 | ||
From: Even Rouault <even.rouault@spatialys.com> | ||
Date: Fri, 18 Nov 2022 02:09:18 +0100 | ||
Subject: [PATCH] Parquet: make sure that ArrowLayer destructor is available | ||
(for plugin) | ||
|
||
--- | ||
ogr/ogrsf_frmts/parquet/ogrparquetdriver.cpp | 1 + | ||
1 file changed, 1 insertion(+) | ||
|
||
diff --git a/ogr/ogrsf_frmts/parquet/ogrparquetdriver.cpp b/ogr/ogrsf_frmts/parquet/ogrparquetdriver.cpp | ||
index ff112586ed..3303f999f4 100644 | ||
--- a/ogr/ogrsf_frmts/parquet/ogrparquetdriver.cpp | ||
+++ b/ogr/ogrsf_frmts/parquet/ogrparquetdriver.cpp | ||
@@ -35,6 +35,7 @@ | ||
#include "../arrow_common/ograrrowrandomaccessfile.h" | ||
#include "../arrow_common/ograrrowwritablefile.h" | ||
#include "../arrow_common/ograrrowdataset.hpp" | ||
+#include "../arrow_common/ograrrowlayer.hpp" // for the destructor | ||
|
||
/************************************************************************/ | ||
/* Identify() */ | ||
-- | ||
2.25.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
cd build | ||
if errorlevel 1 exit 1 | ||
|
||
REM We reuse the same build directory as libgdal, so we just to have to | ||
REM turn on the required dependency and drivers | ||
cmake -DGDAL_USE_PARQUET=ON ^ | ||
-DGDAL_USE_ARROW=ON ^ | ||
-DGDAL_USE_ARROWDATASET=ON ^ | ||
-DOGR_ENABLE_DRIVER_ARROW=ON ^ | ||
-DOGR_ENABLE_DRIVER_ARROW_PLUGIN=ON ^ | ||
-DOGR_ENABLE_DRIVER_PARQUET=ON ^ | ||
-DOGR_ENABLE_DRIVER_PARQUET_PLUGIN=ON ^ | ||
"%SRC_DIR%" | ||
|
||
if errorlevel 1 exit /b 1 | ||
|
||
cmake --build . -j %CPU_COUNT% --verbose --config Release | ||
if errorlevel 1 exit /b 1 | ||
|
||
cmake --build . --target install --config Release | ||
if errorlevel 1 exit /b 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,19 @@ | ||
#!/bin/bash | ||
|
||
set -ex # Abort on error. | ||
|
||
cd build | ||
|
||
# We reuse the same build directory as libgdal, so we just to have to | ||
# turn on the required dependency and drivers | ||
cmake -DGDAL_USE_PARQUET=ON \ | ||
-DGDAL_USE_ARROW=ON \ | ||
-DGDAL_USE_ARROWDATASET=ON \ | ||
-DOGR_ENABLE_DRIVER_ARROW=ON \ | ||
-DOGR_ENABLE_DRIVER_ARROW_PLUGIN=ON \ | ||
-DOGR_ENABLE_DRIVER_PARQUET=ON \ | ||
-DOGR_ENABLE_DRIVER_PARQUET_PLUGIN=ON \ | ||
${SRC_DIR} | ||
|
||
cmake --build . -j ${CPU_COUNT} --config Release | ||
cmake --build . --target install |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
ogrinfo --format Arrow | ||
if errorlevel 1 exit 1 | ||
|
||
ogrinfo --format Parquet | ||
if errorlevel 1 exit 1 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,12 @@ | ||
#!/bin/bash | ||
|
||
# exit when any command fails | ||
set -e | ||
# print all commands | ||
set -x | ||
|
||
test -f ${PREFIX}/lib/gdalplugins/ogr_Arrow${SHLIB_EXT} | ||
test -f ${PREFIX}/lib/gdalplugins/ogr_Parquet${SHLIB_EXT} | ||
|
||
ogrinfo --format Arrow | ||
ogrinfo --format Parquet |