Skip to content

Commit d14b8d5

Browse files
emkornfieldemkornfield
authored
Merge branch 'master' into fly_1217_style
2 parents 6d4fe3d + 4634c89 commit d14b8d5

File tree

396 files changed

+7875
-3707
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

396 files changed

+7875
-3707
lines changed

‎.dockerignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717

1818
# Turn .dockerignore to .dockerallow by excluding everything and explicitly
1919
# allowing specific files and directories. This enables us to quickly add
20-
# dependency files to the docker contect without scanning the whole directory.
20+
# dependency files to the docker content without scanning the whole directory.
2121
# This setup requires to all of our docker containers have arrow's source
2222
# as a mounted directory.
2323

‎.github/workflows/cpp.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,12 @@ name: C++
2121
on:
2222
push:
2323
paths:
24+
- '.github/workflows/cpp.yml'
2425
- 'ci/**'
2526
- 'cpp/**'
2627
pull_request:
2728
paths:
29+
- '.github/workflows/cpp.yml'
2830
- 'ci/**'
2931
- 'cpp/**'
3032

@@ -62,7 +64,7 @@ jobs:
6264
strategy:
6365
fail-fast: false
6466
matrix:
65-
ubuntu: [18.04]
67+
ubuntu: [16.04, 18.04]
6668
env:
6769
UBUNTU: ${{ matrix.ubuntu }}
6870
steps:
@@ -99,6 +101,7 @@ jobs:
99101
# TODO(kszucs): link error in the tests
100102
ARROW_ORC: OFF
101103
ARROW_FLIGHT: ON
104+
ARROW_HDFS: ON
102105
ARROW_PLASMA: ON
103106
ARROW_GANDIVA: ON
104107
ARROW_PARQUET: ON
@@ -143,6 +146,7 @@ jobs:
143146
CMAKE_INSTALL_PREFIX: /usr
144147
ARROW_HOME: /usr
145148
ARROW_FLIGHT: OFF
149+
ARROW_HDFS: ON
146150
ARROW_PARQUET: OFF
147151
ARROW_WITH_ZLIB: OFF
148152
ARROW_WITH_LZ4: OFF

‎.github/workflows/cpp_cron.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,12 @@
1919
name: C++ Cron
2020

2121
on:
22+
push:
23+
paths:
24+
- '.github/workflows/cpp_cron.yml'
25+
pull_request:
26+
paths:
27+
- '.github/workflows/cpp_cron.yml'
2228
schedule:
2329
- cron: |
2430
0 */12 * * *

‎.github/workflows/csharp.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@ name: C#
2020
on:
2121
push:
2222
paths:
23+
- '.github/workflows/csharp.yml'
2324
- 'ci/**'
2425
- 'csharp/**'
2526
pull_request:
2627
paths:
28+
- '.github/workflows/csharp.yml'
2729
- 'ci/**'
2830
- 'csharp/**'
2931

‎.github/workflows/dev.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
name: Dev
1919

2020
on:
21+
# always trigger
2122
push:
2223
pull_request:
2324

‎.github/workflows/go.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@ name: Go
2020
on:
2121
push:
2222
paths:
23+
- '.github/workflows/go.yml'
2324
- 'ci/**'
2425
- 'go/**'
2526
pull_request:
2627
paths:
28+
- '.github/workflows/go.yml'
2729
- 'ci/**'
2830
- 'go/**'
2931

‎.github/workflows/integration.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ name: Integration
2020
on:
2121
push:
2222
paths:
23+
- '.github/workflows/integration.yml'
2324
- 'ci/**'
2425
- 'go/**'
2526
- 'js/**'
@@ -28,6 +29,7 @@ on:
2829
- 'format/**'
2930
pull_request:
3031
paths:
32+
- '.github/workflows/integration.yml'
3133
- 'ci/**'
3234
- 'go/**'
3335
- 'js/**'

‎.github/workflows/java.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@ name: Java
2020
on:
2121
push:
2222
paths:
23+
- '.github/workflows/java.yml'
2324
- 'ci/**'
2425
- 'java/**'
2526
pull_request:
2627
paths:
28+
- '.github/workflows/java.yml'
2729
- 'ci/**'
2830
- 'java/**'
2931

‎.github/workflows/java_jni.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@ name: Java JNI
2020
on:
2121
push:
2222
paths:
23+
- '.github/workflows/java_jni.yml'
2324
- 'ci/**'
2425
- 'cpp/**'
2526
- 'java/**'
2627
pull_request:
2728
paths:
29+
- '.github/workflows/java_jni.yml'
2830
- 'ci/**'
2931
- 'cpp/**'
3032
- 'java/**'

‎.github/workflows/js.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,12 @@ name: NodeJS
2020
on:
2121
push:
2222
paths:
23+
- '.github/workflows/js.yml'
2324
- 'ci/**'
2425
- 'js/**'
2526
pull_request:
2627
paths:
28+
- '.github/workflows/js.yml'
2729
- 'ci/**'
2830
- 'js/**'
2931

@@ -82,7 +84,7 @@ jobs:
8284
shell: bash
8385
run: ci/scripts/js_test.sh $(pwd)
8486

85-
# TODO(kszucs): the windows build fails with platform speficic npm error
87+
# TODO(kszucs): the windows build fails with platform specific npm error
8688
# windows:
8789
# name: AMD64 Windows 2019 NodeJS ${{ matrix.node }}
8890
# runs-on: windows-latest

‎.github/workflows/python.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,17 @@ name: Python
2020
on:
2121
push:
2222
paths:
23+
- '.github/workflows/python.yml'
2324
- 'ci/**'
2425
- 'cpp/**'
2526
- 'python/**'
2627
pull_request:
2728
paths:
29+
- '.github/workflows/python.yml'
2830
- 'ci/**'
2931
- 'cpp/**'
3032
- 'python/**'
3133

32-
3334
jobs:
3435

3536
ubuntu:

‎.github/workflows/python_cron.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,12 @@
1818
name: Python Cron
1919

2020
on:
21+
push:
22+
paths:
23+
- '.github/workflows/python_cron.yml'
24+
pull_request:
25+
paths:
26+
- '.github/workflows/python_cron.yml'
2127
schedule:
2228
- cron: |
2329
0 */12 * * *

‎.github/workflows/r.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,11 +20,13 @@ name: R
2020
on:
2121
push:
2222
paths:
23+
- '.github/workflows/r.yml'
2324
- 'ci/**'
2425
- 'cpp/**'
2526
- 'r/**'
2627
pull_request:
2728
paths:
29+
- '.github/workflows/r.yml'
2830
- 'ci/**'
2931
- 'cpp/**'
3032
- 'r/**'

‎.github/workflows/ruby.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,14 @@ name: C GLib & Ruby
2020
on:
2121
push:
2222
paths:
23+
- '.github/workflows/ruby.yml'
2324
- 'ci/**'
2425
- 'cpp/**'
2526
- 'c_glib/**'
2627
- 'ruby/**'
2728
pull_request:
2829
paths:
30+
- '.github/workflows/ruby.yml'
2931
- 'ci/**'
3032
- 'cpp/**'
3133
- 'c_glib/**'

‎.github/workflows/rust.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,14 +20,14 @@ name: Rust
2020
on:
2121
push:
2222
paths:
23+
- '.github/workflows/rust.yml'
2324
- 'ci/**'
2425
- 'rust/**'
25-
- '.github/workflows/rust.yml'
2626
pull_request:
2727
paths:
28+
- '.github/workflows/rust.yml'
2829
- 'ci/**'
2930
- 'rust/**'
30-
- '.github/workflows/rust.yml'
3131

3232
jobs:
3333

‎CONTRIBUTING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ lists more easy to navigate, and we'd be grateful if you did the same.
4040
## Did you write a patch that fixes a bug or brings an improvement?
4141

4242
First create a JIRA entry as described above. Then, submit your changes
43-
as a Github Pull Request. We'll ask you to prefix the pull request title
43+
as a GitHub Pull Request. We'll ask you to prefix the pull request title
4444
with the JIRA issue number and the component name in brackets.
4545
(for example: "ARROW-2345: [C++] Fix crash in Array::Frobnicate()").
4646
Respecting this convention makes it easier for us to process the backlog

‎c_glib/README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ We support two build systems, GNU Autotools and Meson. If you find problems when
5757

5858
### Package
5959

60-
See [install document](../site/install.md) for details.
60+
See [install document](https://arrow.apache.org/install/) for details.
6161

6262
### How to build by users
6363

@@ -192,7 +192,7 @@ You can find example codes in the `example/` directory.
192192

193193
### Language bindings
194194

195-
You can use Arrow GLib with non C languages with GObject Introspection
195+
You can use Arrow GLib with non-C languages with GObject Introspection
196196
based bindings. Here are languages that support GObject Introspection:
197197

198198
* Ruby: [red-arrow gem](https://rubygems.org/gems/red-arrow) should be used.
@@ -297,7 +297,7 @@ gobject-introspection requires libffi, and it's automatically installed with gob
297297

298298
### build failed - /usr/bin/ld: cannot find -larrow
299299

300-
Arrow C++ must be installed to build Arrow GLib. Run `make install` on Arrow C++ build directory. In addtion, on linux, you may need to run `sudo ldconfig`.
300+
Arrow C++ must be installed to build Arrow GLib. Run `make install` on Arrow C++ build directory. In addition, on linux, you may need to run `sudo ldconfig`.
301301

302302
### build failed - unable to load http://docbook.sourceforge.net/release/xsl/current/html/chunk.xsl
303303

‎c_glib/arrow-cuda-glib/meson.build

Lines changed: 22 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -57,23 +57,25 @@ pkgconfig.generate(libarrow_cuda_glib,
5757
version: version,
5858
requires: ['arrow-glib', 'arrow-cuda'])
5959

60-
gir_dependencies = [
61-
declare_dependency(sources: arrow_glib_gir),
62-
]
63-
gir_extra_args = [
64-
'--warn-all',
65-
'--include-uninstalled=./arrow-glib/Arrow-1.0.gir',
66-
]
67-
arrow_cuda_glib_gir = gnome.generate_gir(libarrow_cuda_glib,
68-
dependencies: gir_dependencies,
69-
sources: sources + c_headers,
70-
namespace: 'ArrowCUDA',
71-
nsversion: api_version,
72-
identifier_prefix: 'GArrowCUDA',
73-
symbol_prefix: 'garrow_cuda',
74-
export_packages: 'arrow-cuda-glib',
75-
includes: [
76-
'Arrow-1.0',
77-
],
78-
install: true,
79-
extra_args: gir_extra_args)
60+
if have_gi
61+
gir_dependencies = [
62+
declare_dependency(sources: arrow_glib_gir),
63+
]
64+
gir_extra_args = [
65+
'--warn-all',
66+
'--include-uninstalled=./arrow-glib/Arrow-1.0.gir',
67+
]
68+
arrow_cuda_glib_gir = gnome.generate_gir(libarrow_cuda_glib,
69+
dependencies: gir_dependencies,
70+
sources: sources + c_headers,
71+
namespace: 'ArrowCUDA',
72+
nsversion: api_version,
73+
identifier_prefix: 'GArrowCUDA',
74+
symbol_prefix: 'garrow_cuda',
75+
export_packages: 'arrow-cuda-glib',
76+
includes: [
77+
'Arrow-1.0',
78+
],
79+
install: true,
80+
extra_args: gir_extra_args)
81+
endif

‎c_glib/arrow-glib/Makefile.am

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -193,8 +193,8 @@ libarrow_glib_la_SOURCES = \
193193
$(libarrow_glib_la_cpp_internal_headers)
194194

195195
BUILT_SOURCES = \
196-
$(libarrow_glib_la_genearted_headers) \
197-
$(libarrow_glib_la_genearted_sources) \
196+
$(libarrow_glib_la_generated_headers) \
197+
$(libarrow_glib_la_generated_sources) \
198198
stamp-enums.c \
199199
stamp-enums.h
200200

‎c_glib/arrow-glib/basic-data-type.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,9 +1018,9 @@ garrow_timestamp_data_type_get_unit(GArrowTimestampDataType *timestamp_data_type
10181018
}
10191019

10201020

1021-
G_DEFINE_TYPE(GArrowTimeDataType,
1022-
garrow_time_data_type,
1023-
GARROW_TYPE_DATA_TYPE)
1021+
G_DEFINE_ABSTRACT_TYPE(GArrowTimeDataType,
1022+
garrow_time_data_type,
1023+
GARROW_TYPE_DATA_TYPE)
10241024

10251025
static void
10261026
garrow_time_data_type_init(GArrowTimeDataType *object)

‎c_glib/arrow-glib/input-stream.cpp

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -290,11 +290,9 @@ garrow_input_stream_read_tensor(GArrowInputStream *input_stream,
290290
{
291291
auto arrow_input_stream = garrow_input_stream_get_raw(input_stream);
292292

293-
std::shared_ptr<arrow::Tensor> arrow_tensor;
294-
auto status = arrow::ipc::ReadTensor(arrow_input_stream.get(),
295-
&arrow_tensor);
296-
if (garrow_error_check(error, status, "[input-stream][read-tensor]")) {
297-
return garrow_tensor_new_raw(&arrow_tensor);
293+
auto arrow_tensor = arrow::ipc::ReadTensor(arrow_input_stream.get());
294+
if (garrow::check(error, arrow_tensor, "[input-stream][read-tensor]")) {
295+
return garrow_tensor_new_raw(&(arrow_tensor.ValueOrDie()));
298296
} else {
299297
return NULL;
300298
}

‎c_glib/arrow-glib/meson.build

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -223,18 +223,20 @@ if have_arrow_orc
223223
requires: ['arrow-glib'])
224224
endif
225225

226-
arrow_glib_gir = gnome.generate_gir(libarrow_glib,
227-
sources: sources + c_headers + enums,
228-
namespace: 'Arrow',
229-
nsversion: api_version,
230-
identifier_prefix: 'GArrow',
231-
symbol_prefix: 'garrow',
232-
export_packages: 'arrow-glib',
233-
includes: [
234-
'GObject-2.0',
235-
'Gio-2.0',
236-
],
237-
install: true,
238-
extra_args: [
239-
'--warn-all',
240-
])
226+
if have_gi
227+
arrow_glib_gir = gnome.generate_gir(libarrow_glib,
228+
sources: sources + c_headers + enums,
229+
namespace: 'Arrow',
230+
nsversion: api_version,
231+
identifier_prefix: 'GArrow',
232+
symbol_prefix: 'garrow',
233+
export_packages: 'arrow-glib',
234+
includes: [
235+
'GObject-2.0',
236+
'Gio-2.0',
237+
],
238+
install: true,
239+
extra_args: [
240+
'--warn-all',
241+
])
242+
endif

0 commit comments

Comments
 (0)