Skip to content

Commit 276536c

Browse files
pcmoritzpcmoritz
authored
Merge branch 'master' into gandiva-cython
2 parents b415994 + e5122e3 commit 276536c

Some content is hidden

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

67 files changed

+2668
-204
lines changed

‎.travis.yml‎

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,18 @@ matrix:
4949
allow_failures:
5050
- jdk: oraclejdk9
5151
include:
52+
# Lint C++, Python, R
53+
- os: linux
54+
language: python
55+
python: "3.6"
56+
env:
57+
- ARROW_TRAVIS_CLANG_FORMAT=1
58+
before_script:
59+
# Always run RAT checks, in case another build in matrix breaks RAT
60+
- $TRAVIS_BUILD_DIR/ci/travis_release_audit.sh
61+
- $TRAVIS_BUILD_DIR/ci/travis_install_clang_tools.sh
62+
script:
63+
- $TRAVIS_BUILD_DIR/ci/travis_lint.sh
5264
# C++ & Python w/ clang 6.0
5365
- compiler: gcc
5466
language: cpp
@@ -59,7 +71,6 @@ matrix:
5971
- ARROW_TRAVIS_VALGRIND=1
6072
- ARROW_TRAVIS_PLASMA=1
6173
- ARROW_TRAVIS_ORC=1
62-
- ARROW_TRAVIS_CLANG_FORMAT=1
6374
- ARROW_TRAVIS_COVERAGE=1
6475
- ARROW_TRAVIS_PARQUET=1
6576
- ARROW_TRAVIS_PYTHON_DOCS=1
@@ -71,13 +82,9 @@ matrix:
7182
- CC="clang-6.0"
7283
- CXX="clang++-6.0"
7384
before_script:
74-
# Always run RAT checks, in case another build in matrix breaks RAT
75-
- $TRAVIS_BUILD_DIR/ci/travis_release_audit.sh
7685
# (ARROW_CI_CPP_AFFECTED implies ARROW_CI_PYTHON_AFFECTED)
7786
- if [ $ARROW_CI_PYTHON_AFFECTED != "1" ]; then exit; fi
7887
- $TRAVIS_BUILD_DIR/ci/travis_install_linux.sh
79-
- $TRAVIS_BUILD_DIR/ci/travis_install_clang_tools.sh
80-
- $TRAVIS_BUILD_DIR/ci/travis_lint.sh
8188
# If either C++ or Python changed, we must install the C++ libraries
8289
- git submodule update --init
8390
- $TRAVIS_BUILD_DIR/ci/travis_before_script_cpp.sh
@@ -102,15 +109,13 @@ matrix:
102109
- ARROW_TRAVIS_GANDIVA=1
103110
- ARROW_TRAVIS_USE_TOOLCHAIN=1
104111
- ARROW_TRAVIS_VALGRIND=1
105-
- ARROW_TRAVIS_CLANG_FORMAT=1
106112
- ARROW_BUILD_WARNING_LEVEL=CHECKIN
107113
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
108114
before_script:
109115
# Run if something changed in CPP or Java.
110116
- if [ $ARROW_CI_CPP_AFFECTED != "1" ] && [ $ARROW_CI_JAVA_AFFECTED != "1" ]; then exit; fi
111117
- $TRAVIS_BUILD_DIR/ci/travis_install_linux.sh
112118
- $TRAVIS_BUILD_DIR/ci/travis_install_clang_tools.sh
113-
- $TRAVIS_BUILD_DIR/ci/travis_lint.sh
114119
- $TRAVIS_BUILD_DIR/ci/travis_before_script_cpp.sh --only-library
115120
script:
116121
- $TRAVIS_BUILD_DIR/ci/travis_script_gandiva_cpp.sh
@@ -221,13 +226,15 @@ matrix:
221226
os: linux
222227
env:
223228
- ARROW_TRAVIS_ORC=1
229+
- ARROW_TRAVIS_GANDIVA=1
230+
- ARROW_TRAVIS_USE_VENDORED_BOOST=1
224231
- ARROW_TRAVIS_PARQUET=1
225232
- BUILD_TORCH_EXAMPLE=no
226-
- CC="gcc-4.9"
227-
- CXX="g++-4.9"
233+
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
228234
before_script:
229235
- if [ $ARROW_CI_RUBY_AFFECTED != "1" ]; then exit; fi
230236
- $TRAVIS_BUILD_DIR/ci/travis_install_linux.sh
237+
- $TRAVIS_BUILD_DIR/ci/travis_install_clang_tools.sh
231238
- $TRAVIS_BUILD_DIR/ci/travis_before_script_cpp.sh --only-library
232239
- $TRAVIS_BUILD_DIR/ci/travis_before_script_c_glib.sh
233240
- $TRAVIS_BUILD_DIR/ci/travis_before_script_ruby.sh
@@ -305,7 +312,6 @@ matrix:
305312
- $TRAVIS_BUILD_DIR/ci/travis_install_linux.sh
306313
- $TRAVIS_BUILD_DIR/ci/travis_before_script_cpp.sh --only-library
307314
- $TRAVIS_BUILD_DIR/ci/travis_install_clang_tools.sh
308-
- $TRAVIS_BUILD_DIR/ci/travis_lint.sh
309315
- export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$TRAVIS_BUILD_DIR/cpp-install/lib
310316
- export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$TRAVIS_BUILD_DIR/cpp-install/lib/pkgconfig
311317
- pushd ${TRAVIS_BUILD_DIR}/r

‎c_glib/.gitignore‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,10 @@ Makefile.in
5757
/arrow-glib/version.h
5858
/arrow-glib/*.pc
5959
/arrow-gpu-glib/*.pc
60+
/gandiva-glib/gandiva-enums.c
61+
/gandiva-glib/gandiva-enums.h
62+
/gandiva-glib/stamp-*
63+
/gandiva-glib/*.pc
6064
/example/build
6165
/example/read-batch
6266
/example/read-stream

‎c_glib/Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
2020
SUBDIRS = \
2121
arrow-glib \
2222
arrow-gpu-glib \
23+
gandiva-glib \
2324
parquet-glib \
2425
doc \
2526
example \

‎c_glib/configure.ac‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,10 @@ if test "x$GARROW_ARROW_CPP_BUILD_DIR" = "x"; then
134134
[arrow-gpu],
135135
[HAVE_ARROW_GPU=yes],
136136
[HAVE_ARROW_GPU=no])
137+
PKG_CHECK_MODULES([GANDIVA],
138+
[gandiva],
139+
[HAVE_GANDIVA=yes],
140+
[HAVE_GANDIVA=no])
137141
PKG_CHECK_MODULES([PARQUET],
138142
[parquet],
139143
[HAVE_PARQUET=yes],
@@ -171,6 +175,17 @@ else
171175
AC_SUBST(ARROW_GPU_CFLAGS)
172176
AC_SUBST(ARROW_GPU_LIBS)
173177

178+
GANDIVA_CFLAGS=""
179+
if test -f "${GARROW_ARROW_CPP_BUILD_DIR}/src/gandiva/gandiva.pc"; then
180+
HAVE_GANDIVA=yes
181+
GANDIVA_LIBS="-lgandiva"
182+
else
183+
HAVE_GANDIVA=no
184+
GANDIVA_LIBS=""
185+
fi
186+
AC_SUBST(GANDIVA_CFLAGS)
187+
AC_SUBST(GANDIVA_LIBS)
188+
174189
PARQUET_CFLAGS=""
175190
if test -f "${GARROW_ARROW_CPP_BUILD_DIR}/src/parquet/parquet.pc"; then
176191
HAVE_PARQUET=yes
@@ -201,6 +216,11 @@ if test "$HAVE_PARQUET" = "yes"; then
201216
AC_DEFINE(HAVE_PARQUET, [1], [Define to 1 if Apache Parquet exists.])
202217
fi
203218

219+
AM_CONDITIONAL([HAVE_GANDIVA], [test "$HAVE_GANDIVA" = "yes"])
220+
if test "$HAVE_GANDIVA" = "yes"; then
221+
AC_DEFINE(HAVE_GANDIVA, [1], [Define to 1 if Gandiva exists.])
222+
fi
223+
204224
exampledir="\$(datadir)/arrow-glib/example"
205225
AC_SUBST(exampledir)
206226

@@ -212,11 +232,15 @@ AC_CONFIG_FILES([
212232
arrow-glib/version.h
213233
arrow-gpu-glib/Makefile
214234
arrow-gpu-glib/arrow-gpu-glib.pc
235+
gandiva-glib/Makefile
236+
gandiva-glib/gandiva-glib.pc
215237
parquet-glib/Makefile
216238
parquet-glib/parquet-glib.pc
217239
doc/Makefile
218240
doc/arrow-glib/Makefile
219241
doc/arrow-glib/entities.xml
242+
doc/gandiva-glib/Makefile
243+
doc/gandiva-glib/entities.xml
220244
doc/parquet-glib/Makefile
221245
doc/parquet-glib/entities.xml
222246
example/Makefile

‎c_glib/doc/Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,5 @@
1717

1818
SUBDIRS = \
1919
arrow-glib \
20+
gandiva-glib \
2021
parquet-glib

‎c_glib/doc/gandiva-glib/Makefile.am‎

Lines changed: 69 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,69 @@
1+
# Licensed to the Apache Software Foundation (ASF) under one
2+
# or more contributor license agreements. See the NOTICE file
3+
# distributed with this work for additional information
4+
# regarding copyright ownership. The ASF licenses this file
5+
# to you under the Apache License, Version 2.0 (the
6+
# "License"); you may not use this file except in compliance
7+
# with the License. You may obtain a copy of the License at
8+
#
9+
# http://www.apache.org/licenses/LICENSE-2.0
10+
#
11+
# Unless required by applicable law or agreed to in writing,
12+
# software distributed under the License is distributed on an
13+
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
14+
# KIND, either express or implied. See the License for the
15+
# specific language governing permissions and limitations
16+
# under the License.
17+
18+
if HAVE_GANDIVA
19+
DOC_MODULE = gandiva-glib
20+
21+
DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
22+
23+
DOC_SOURCE_DIR = \
24+
$(top_srcdir)/gandiva-glib \
25+
$(top_builddir)/gandiva-glib
26+
27+
SCAN_OPTIONS = \
28+
--deprecated-guards="GGANDIVA_DISABLE_DEPRECATED"
29+
30+
MKDB_OPTIONS = \
31+
--name-space=ggandiva \
32+
--source-suffixes="c,cpp,h"
33+
34+
HFILE_GLOB = \
35+
$(top_srcdir)/gandiva-glib/*.h
36+
37+
IGNORE_HFILES =
38+
39+
CFILE_GLOB = \
40+
$(top_srcdir)/gandiva-glib/*.cpp
41+
42+
AM_CPPFLAGS = \
43+
-I$(top_builddir) \
44+
-I$(top_srcdir)
45+
46+
AM_CFLAGS = \
47+
$(GLIB_CFLAGS) \
48+
$(ARROW_CFLAGS) \
49+
$(GANDIVA_CFLAGS)
50+
51+
GTKDOC_LIBS = \
52+
$(top_builddir)/arrow-glib/libarrow-glib.la \
53+
$(top_builddir)/gandiva-glib/libgandiva-glib.la
54+
55+
include $(top_srcdir)/gtk-doc.make
56+
57+
CLEANFILES += \
58+
$(DOC_MODULE)-decl-list.txt \
59+
$(DOC_MODULE)-decl.txt \
60+
$(DOC_MODULE)-overrides.txt \
61+
$(DOC_MODULE)-sections.txt \
62+
$(DOC_MODULE).types
63+
else
64+
EXTRA_DIST =
65+
endif
66+
67+
EXTRA_DIST += \
68+
entities.xml.in \
69+
meson.build

‎c_glib/doc/gandiva-glib/entities.xml.in‎

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<!--
2+
Licensed to the Apache Software Foundation (ASF) under one
3+
or more contributor license agreements. See the NOTICE file
4+
distributed with this work for additional information
5+
regarding copyright ownership. The ASF licenses this file
6+
to you under the Apache License, Version 2.0 (the
7+
"License"); you may not use this file except in compliance
8+
with the License. You may obtain a copy of the License at
9+
10+
http://www.apache.org/licenses/LICENSE-2.0
11+
12+
Unless required by applicable law or agreed to in writing,
13+
software distributed under the License is distributed on an
14+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
KIND, either express or implied. See the License for the
16+
specific language governing permissions and limitations
17+
under the License.
18+
-->
19+
<!ENTITY package "@PACKAGE@">
20+
<!ENTITY package_bugreport "@PACKAGE_BUGREPORT@">
21+
<!ENTITY package_name "@PACKAGE_NAME@">
22+
<!ENTITY package_string "@PACKAGE_STRING@">
23+
<!ENTITY package_url "@PACKAGE_URL@">
24+
<!ENTITY package_version "@PACKAGE_VERSION@">

‎c_glib/doc/gandiva-glib/gandiva-glib-docs.xml‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
Licensed to the Apache Software Foundation (ASF) under one
4+
or more contributor license agreements. See the NOTICE file
5+
distributed with this work for additional information
6+
regarding copyright ownership. The ASF licenses this file
7+
to you under the Apache License, Version 2.0 (the
8+
"License"); you may not use this file except in compliance
9+
with the License. You may obtain a copy of the License at
10+
11+
http://www.apache.org/licenses/LICENSE-2.0
12+
13+
Unless required by applicable law or agreed to in writing,
14+
software distributed under the License is distributed on an
15+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
16+
KIND, either express or implied. See the License for the
17+
specific language governing permissions and limitations
18+
under the License.
19+
-->
20+
<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.3//EN"
21+
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
22+
[
23+
<!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'">
24+
<!ENTITY % gtkdocentities SYSTEM "entities.xml">
25+
%gtkdocentities;
26+
]>
27+
<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
28+
<bookinfo>
29+
<title>&package_name; Reference Manual</title>
30+
<releaseinfo>
31+
for &package_string;.
32+
<!--
33+
The latest version of this documentation can be found on-line at
34+
<ulink role="online-location" url="http://[SERVER]/&package_name;/">http://[SERVER]/&package_name;/</ulink>.
35+
-->
36+
</releaseinfo>
37+
</bookinfo>
38+
39+
<part id="evaluate-expression">
40+
<title>Evaluate Expression</title>
41+
<chapter id="expression">
42+
<title>Expression</title>
43+
<xi:include href="xml/expression.xml"/>
44+
</chapter>
45+
<chapter id="projector">
46+
<title>Projector</title>
47+
<xi:include href="xml/projector.xml"/>
48+
</chapter>
49+
<chapter id="error">
50+
<title>Error</title>
51+
<xi:include href="xml/error.xml"/>
52+
</chapter>
53+
</part>
54+
55+
<chapter id="object-tree">
56+
<title>Object Hierarchy</title>
57+
<xi:include href="xml/tree_index.sgml"/>
58+
</chapter>
59+
<index id="api-index-full">
60+
<title>API Index</title>
61+
<xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
62+
</index>
63+
<index id="deprecated-api-index" role="deprecated">
64+
<title>Index of deprecated API</title>
65+
<xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
66+
</index>
67+
<index id="api-index-0-12-0" role="0.12.0">
68+
<title>Index of new symbols in 0.12.0</title>
69+
<xi:include href="xml/api-index-0.12.0.xml"><xi:fallback /></xi:include>
70+
</index>
71+
<xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
72+
</book>

0 commit comments

Comments
 (0)