Skip to content

Commit ade0655

Browse files
committed
Bump Apache Arrow
1 parent 109383f commit ade0655

File tree

5 files changed

+84
-17
lines changed

5 files changed

+84
-17
lines changed

ci_config.json

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,30 @@
4242
},
4343
"arrow-cpp": {
4444
"build_options": [
45-
"arrow-cpp:compute=enabled"
45+
"arrow-cpp:acero=enabled",
46+
"arrow-cpp:compute=enabled",
47+
"arrow-cpp:csv=enabled",
48+
"arrow-cpp:filesystem=enabled",
49+
"arrow-cpp:json=enabled",
50+
"arrow-cpp:testing=enabled",
51+
"arrow-cpp:tensorflow=enabled"
4652
],
4753
"alpine_packages": [
48-
"boost-dev"
54+
"boost-dev",
55+
"rapidjson"
4956
],
5057
"brew_packages": [
51-
"boost"
58+
59+
"rapidjson"
5260
],
5361
"debian_packages": [
5462
"libboost-filesystem-dev",
55-
"libboost-system-dev"
63+
"libboost-system-dev",
64+
"rapidjson-dev"
5665
],
5766
"msys_packages": [
58-
"boost"
67+
"boost",
68+
"rapidjson"
5969
]
6070
},
6171
"atomic_queue": {

releases.json

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -204,9 +204,16 @@
204204
"arrow-cpp": {
205205
"dependency_names": [
206206
"arrow",
207-
"arrow-compute"
207+
"arrow-acero",
208+
"arrow-compute",
209+
"arrow-csv",
210+
"arrow-filesystem",
211+
"arrow-json",
212+
"arrow-testing",
213+
"arrow-tensorflow"
208214
],
209215
"versions": [
216+
"22.0.0-1",
210217
"21.0.0-1"
211218
]
212219
},

subprojects/arrow-cpp.wrap

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
[wrap-file]
2-
directory = apache-arrow-21.0.0
3-
source_url = https://www.apache.org/dyn/closer.lua?action=download&filename=arrow/arrow-21.0.0/apache-arrow-21.0.0.tar.gz
4-
source_fallback_url = https://github.com/apache/arrow/releases/download/apache-arrow-21.0.0/apache-arrow-21.0.0.tar.gz
5-
source_filename = apache-arrow-21.0.0.tar.gz
6-
source_hash = 5d3f8db7e72fb9f65f4785b7a1634522e8d8e9657a445af53d4a34a3849857b5
2+
directory = apache-arrow-22.0.0
3+
source_url = https://www.apache.org/dyn/closer.lua?action=download&filename=arrow/arrow-22.0.0/apache-arrow-22.0.0.tar.gz
4+
source_fallback_url = https://github.com/apache/arrow/releases/download/apache-arrow-22.0.0/apache-arrow-22.0.0.tar.gz
5+
source_filename = apache-arrow-22.0.0.tar.gz
6+
source_hash = 131250cd24dec0cddde04e2ad8c9e2bc43edc5e84203a81cf71cf1a33a6e7e0f
77
patch_directory = arrow-cpp
88

99
[provide]
10-
arrow = arrow_dep
11-
arrow-compute = arrow_compute_dep
10+
dependency_names = arrow, arrow-acero, arrow-compute, arrow-csv, arrow-filesystem, arrow-json, arrow-testing, arrow-tensorflow

subprojects/packagefiles/arrow-cpp/meson.build

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ project(
2626
'arrow',
2727
'cpp',
2828
'c',
29-
version: '21.0.0',
29+
version: '22.0.0',
3030
license: 'Apache-2.0',
3131
meson_version: '>=1.3.0',
32-
default_options: ['c_std=gnu11,c11', 'warning_level=2', 'cpp_std=c++17'],
32+
default_options: ['c_std=c11', 'warning_level=2', 'cpp_std=c++17'],
3333
)
3434

3535
project_args = [
@@ -81,14 +81,37 @@ needs_csv = get_option('csv').enabled()
8181
needs_azure = get_option('azure').enabled()
8282
needs_gcs = get_option('gcs').enabled()
8383
needs_hdfs = get_option('hdfs').enabled()
84+
needs_parquet = get_option('parquet').enabled()
85+
needs_parquet_encryption = get_option('parquet_require_encryption').enabled()
8486
needs_s3 = get_option('s3').enabled()
85-
needs_filesystem = get_option('filesystem').enabled() or needs_azure or needs_gcs or needs_hdfs or needs_s3
87+
needs_filesystem = (get_option('filesystem').enabled()
88+
or needs_azure
89+
or needs_gcs
90+
or needs_hdfs
91+
or needs_parquet_encryption
92+
or needs_s3
93+
)
8694
needs_integration = get_option('integration').enabled()
8795
needs_tests = get_option('tests').enabled()
8896
needs_acero = get_option('acero').enabled()
8997
needs_flight = get_option('flight').enabled()
90-
needs_ipc = get_option('ipc').enabled() or needs_tests or needs_acero or needs_benchmarks or needs_flight
98+
needs_ipc = (get_option('ipc').enabled()
99+
or needs_tests
100+
or needs_acero
101+
or needs_benchmarks
102+
or needs_flight
103+
or needs_parquet
104+
)
105+
91106
needs_fuzzing = get_option('fuzzing').enabled()
107+
if needs_fuzzing
108+
if meson.version() < '1.8.0'
109+
error(
110+
f'Meson >= 1.8.0 is required for fuzzing support, found @meson.version()@',
111+
)
112+
endif
113+
endif
114+
92115
needs_testing = (get_option('testing').enabled()
93116
or needs_tests
94117
or needs_benchmarks
@@ -105,3 +128,11 @@ needs_zstd = get_option('zstd').enabled()
105128
needs_utilities = get_option('utilities').enabled()
106129

107130
subdir('cpp/src/arrow')
131+
132+
if needs_parquet
133+
subdir('cpp/src/parquet')
134+
subdir('cpp/tools/parquet')
135+
if get_option('parquet_build_examples').enabled()
136+
subdir('cpp/examples/parquet')
137+
endif
138+
endif

subprojects/packagefiles/arrow-cpp/meson.options

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,26 @@ option(
119119
type: 'string',
120120
description: 'Arbitrary string that identifies the kind of package (for informational purposes)',
121121
)
122+
option(
123+
'parquet',
124+
type: 'feature',
125+
description: 'Build the Parquet libraries',
126+
)
127+
option(
128+
'parquet_build_executables',
129+
type: 'feature',
130+
description: 'Build the Parquet executable CLI tools.',
131+
)
132+
option(
133+
'parquet_build_examples',
134+
type: 'feature',
135+
description: 'Build the Parquet examples.',
136+
)
137+
option(
138+
'parquet_require_encryption',
139+
type: 'feature',
140+
description: 'Build support for encryption. Fail if OpenSSL is not found',
141+
)
122142

123143
option(
124144
'snappy',

0 commit comments

Comments
 (0)