Skip to content

Commit cd282a3

Browse files
pcmoritzpcmoritz
authored
Merge branch 'master' into gandiva-cython
2 parents 829f7a2 + c61f882 commit cd282a3

File tree

118 files changed

+6428
-579
lines changed

Some content is hidden

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

118 files changed

+6428
-579
lines changed

‎.travis.yml‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ matrix:
6262
- $TRAVIS_BUILD_DIR/ci/travis_install_clang_tools.sh
6363
script:
6464
- $TRAVIS_BUILD_DIR/ci/travis_lint.sh
65-
# C++ & Python w/ clang 6.0
65+
# C++ & Python w/ gcc 4.9
6666
- compiler: gcc
6767
language: cpp
6868
os: linux
@@ -81,7 +81,7 @@ matrix:
8181
- ARROW_TRAVIS_JAVA_BUILD_ONLY=1
8282
# ARROW-2999 Benchmarks are disabled in Travis CI for the time being
8383
# - ARROW_TRAVIS_PYTHON_BENCHMARKS=1
84-
- MATRIX_EVAL="CC=clang-6.0 && CXX=clang++-6.0"
84+
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
8585
before_script:
8686
# (ARROW_CI_CPP_AFFECTED implies ARROW_CI_PYTHON_AFFECTED)
8787
- if [ $ARROW_CI_PYTHON_AFFECTED != "1" ]; then exit; fi
@@ -232,6 +232,7 @@ matrix:
232232
- ARROW_TRAVIS_GANDIVA=1
233233
- ARROW_TRAVIS_USE_VENDORED_BOOST=1
234234
- ARROW_TRAVIS_PARQUET=1
235+
- ARROW_TRAVIS_PLASMA=1
235236
- BUILD_TORCH_EXAMPLE=no
236237
- MATRIX_EVAL="CC=gcc-4.9 && CXX=g++-4.9"
237238
before_script:

‎c_glib/Makefile.am‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@ SUBDIRS = \
2222
arrow-gpu-glib \
2323
gandiva-glib \
2424
parquet-glib \
25+
plasma-glib \
2526
doc \
2627
example \
2728
tool

‎c_glib/arrow-glib/error.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ garrow_error_code(const arrow::Status &status)
7474
case arrow::StatusCode::PlasmaObjectAlreadySealed:
7575
return GARROW_ERROR_PLASMA_OBJECT_ALREADY_SEALED;
7676
case arrow::StatusCode::CodeGenError:
77-
return GARROW_ERROR_CODEGEN;
77+
return GARROW_ERROR_CODE_GENERATION;
7878
case arrow::StatusCode::ArrowError:
7979
return GARROW_ERROR_ARROW;
8080
case arrow::StatusCode::ExpressionValidationError:

‎c_glib/arrow-glib/error.h‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ G_BEGIN_DECLS
3939
* @GARROW_ERROR_PLASMA_OBJECT_NONEXISTENT: Object doesn't exist on Plasma.
4040
* @GARROW_ERROR_PLASMA_STORE_FULL: Store full error on Plasma.
4141
* @GARROW_ERROR_PLASMA_OBJECT_ALREADY_SEALED: Object already sealed on Plasma.
42-
* @GARROW_ERROR_CODEGEN: Error generating code for expression evaluation in Gandiva.
42+
* @GARROW_ERROR_CODE_GENRATION: Error generating code for expression evaluation
43+
* in Gandiva.
4344
* @GARROW_ERROR_ARROW: Error in Gandiva-Arrow integration.
4445
* @GARROW_ERROR_EXPRESSION_VALIDATION: Validation errors in expression given for code generation.
4546
* @GARROW_ERROR_EXECUTION: Execution error while evaluating the expression against a record batch.
@@ -63,7 +64,7 @@ typedef enum {
6364
GARROW_ERROR_PLASMA_OBJECT_NONEXISTENT,
6465
GARROW_ERROR_PLASMA_STORE_FULL,
6566
GARROW_ERROR_PLASMA_OBJECT_ALREADY_SEALED,
66-
GARROW_ERROR_CODEGEN = 40,
67+
GARROW_ERROR_CODE_GENERATION = 40,
6768
GARROW_ERROR_ARROW,
6869
GARROW_ERROR_EXPRESSION_VALIDATION,
6970
GARROW_ERROR_EXECUTION,

‎c_glib/configure.ac‎

Lines changed: 27 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,10 @@ if test "x$GARROW_ARROW_CPP_BUILD_DIR" = "x"; then
142142
[parquet],
143143
[HAVE_PARQUET=yes],
144144
[HAVE_PARQUET=no])
145+
PKG_CHECK_MODULES([PLASMA],
146+
[plasma],
147+
[HAVE_PLASMA=yes],
148+
[HAVE_PLASMA=no])
145149
else
146150
USE_ARROW_BUILD_DIR=yes
147151

@@ -196,6 +200,17 @@ else
196200
fi
197201
AC_SUBST(PARQUET_CFLAGS)
198202
AC_SUBST(PARQUET_LIBS)
203+
204+
PLASMA_CFLAGS=""
205+
if test -f "${GARROW_ARROW_CPP_BUILD_DIR}/src/plasma/plasma.pc"; then
206+
HAVE_PLASMA=yes
207+
PLASMA_LIBS="-lplasma"
208+
else
209+
HAVE_PLASMA=no
210+
PLASMA_LIBS=""
211+
fi
212+
AC_SUBST(PLASMA_CFLAGS)
213+
AC_SUBST(PLASMA_LIBS)
199214
fi
200215

201216
AM_CONDITIONAL([USE_ARROW_BUILD_DIR],
@@ -211,14 +226,19 @@ if test "$HAVE_ARROW_GPU" = "yes"; then
211226
AC_DEFINE(HAVE_ARROW_GPU, [1], [Define to 1 if Apache Arrow supports GPU.])
212227
fi
213228

229+
AM_CONDITIONAL([HAVE_GANDIVA], [test "$HAVE_GANDIVA" = "yes"])
230+
if test "$HAVE_GANDIVA" = "yes"; then
231+
AC_DEFINE(HAVE_GANDIVA, [1], [Define to 1 if Gandiva exists.])
232+
fi
233+
214234
AM_CONDITIONAL([HAVE_PARQUET], [test "$HAVE_PARQUET" = "yes"])
215235
if test "$HAVE_PARQUET" = "yes"; then
216236
AC_DEFINE(HAVE_PARQUET, [1], [Define to 1 if Apache Parquet exists.])
217237
fi
218238

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.])
239+
AM_CONDITIONAL([HAVE_PLASMA], [test "$HAVE_PLASMA" = "yes"])
240+
if test "$HAVE_PLASMA" = "yes"; then
241+
AC_DEFINE(HAVE_PLASMA, [1], [Define to 1 if Plasma exists.])
222242
fi
223243

224244
exampledir="\$(datadir)/arrow-glib/example"
@@ -236,13 +256,17 @@ AC_CONFIG_FILES([
236256
gandiva-glib/gandiva-glib.pc
237257
parquet-glib/Makefile
238258
parquet-glib/parquet-glib.pc
259+
plasma-glib/Makefile
260+
plasma-glib/plasma-glib.pc
239261
doc/Makefile
240262
doc/arrow-glib/Makefile
241263
doc/arrow-glib/entities.xml
242264
doc/gandiva-glib/Makefile
243265
doc/gandiva-glib/entities.xml
244266
doc/parquet-glib/Makefile
245267
doc/parquet-glib/entities.xml
268+
doc/plasma-glib/Makefile
269+
doc/plasma-glib/entities.xml
246270
example/Makefile
247271
example/lua/Makefile
248272
tool/Makefile

‎c_glib/doc/Makefile.am‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,4 +18,5 @@
1818
SUBDIRS = \
1919
arrow-glib \
2020
gandiva-glib \
21-
parquet-glib
21+
parquet-glib \
22+
plasma-glib

‎c_glib/doc/plasma-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_PLASMA
19+
DOC_MODULE = plasma-glib
20+
21+
DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
22+
23+
DOC_SOURCE_DIR = \
24+
$(top_srcdir)/plasma-glib \
25+
$(top_builddir)/plasma-glib
26+
27+
SCAN_OPTIONS = \
28+
--deprecated-guards="GPLASMA_DISABLE_DEPRECATED"
29+
30+
MKDB_OPTIONS = \
31+
--name-space=gplasma \
32+
--source-suffixes="c,cpp,h"
33+
34+
HFILE_GLOB = \
35+
$(top_srcdir)/plasma-glib/*.h
36+
37+
IGNORE_HFILES =
38+
39+
CFILE_GLOB = \
40+
$(top_srcdir)/plasma-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+
$(PLASMA_CFLAGS)
50+
51+
GTKDOC_LIBS = \
52+
$(top_builddir)/arrow-glib/libarrow-glib.la \
53+
$(top_builddir)/plasma-glib/libplasma-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/plasma-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/plasma-glib/meson.build‎

Lines changed: 82 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,82 @@
1+
# -*- indent-tabs-mode: nil -*-
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+
project_name = 'plasma-glib'
21+
entities_conf = configuration_data()
22+
entities_conf.set('PACKAGE', project_name)
23+
entities_conf.set('PACKAGE_BUGREPORT',
24+
'https://issues.apache.org/jira/browse/ARROW')
25+
entities_conf.set('PACKAGE_NAME', project_name)
26+
entities_conf.set('PACKAGE_STRING',
27+
' '.join([project_name, version]))
28+
entities_conf.set('PACKAGE_URL', 'https://arrow.apache.org/')
29+
entities_conf.set('PACKAGE_VERSION', version)
30+
configure_file(input: 'entities.xml.in',
31+
output: 'entities.xml',
32+
configuration: entities_conf)
33+
34+
private_headers = [
35+
]
36+
37+
content_files = [
38+
]
39+
40+
html_images = [
41+
]
42+
43+
glib_prefix = dependency('glib-2.0').get_pkgconfig_variable('prefix')
44+
glib_doc_path = join_paths(glib_prefix, 'share', 'gtk-doc', 'html')
45+
arrow_glib_doc_path = join_paths(data_dir,
46+
'gtk-doc',
47+
'html',
48+
meson.project_name())
49+
doc_path = join_paths(data_dir, project_name, 'gtk-doc', 'html')
50+
51+
source_directories = [
52+
join_paths(meson.source_root(), 'plasma-glib'),
53+
join_paths(meson.build_root(), 'plasma-glib'),
54+
]
55+
dependencies = [
56+
arrow_glib,
57+
plasma_glib,
58+
]
59+
ignore_headers = []
60+
gnome.gtkdoc(project_name,
61+
main_xml: project_name + '-docs.xml',
62+
src_dir: source_directories,
63+
dependencies: dependencies,
64+
ignore_headers: ignore_headers,
65+
gobject_typesfile: project_name + '.types',
66+
scan_args: [
67+
'--rebuild-types',
68+
'--deprecated-guards=GPLASMA_DISABLE_DEPRECATED',
69+
],
70+
mkdb_args: [
71+
'--output-format=xml',
72+
'--name-space=gplasma',
73+
'--source-suffixes=c,cpp,h',
74+
],
75+
fixxref_args: [
76+
'--html-dir=' + doc_path,
77+
'--extra-dir=' + join_paths(glib_doc_path, 'glib'),
78+
'--extra-dir=' + join_paths(glib_doc_path, 'gobject'),
79+
'--extra-dir=' + arrow_glib_doc_path,
80+
],
81+
html_assets: html_images,
82+
install: true)

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

Lines changed: 64 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,64 @@
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="plasma-client">
40+
<title>PlasmaClient</title>
41+
<chapter id="client">
42+
<title>Client</title>
43+
<xi:include href="xml/client.xml"/>
44+
</chapter>
45+
</part>
46+
47+
<chapter id="object-tree">
48+
<title>Object Hierarchy</title>
49+
<xi:include href="xml/tree_index.sgml"/>
50+
</chapter>
51+
<index id="api-index-full">
52+
<title>API Index</title>
53+
<xi:include href="xml/api-index-full.xml"><xi:fallback /></xi:include>
54+
</index>
55+
<index id="deprecated-api-index" role="deprecated">
56+
<title>Index of deprecated API</title>
57+
<xi:include href="xml/api-index-deprecated.xml"><xi:fallback /></xi:include>
58+
</index>
59+
<index id="api-index-0-12-0" role="0.12.0">
60+
<title>Index of new symbols in 0.12.0</title>
61+
<xi:include href="xml/api-index-0.12.0.xml"><xi:fallback /></xi:include>
62+
</index>
63+
<xi:include href="xml/annotation-glossary.xml"><xi:fallback /></xi:include>
64+
</book>

0 commit comments

Comments
 (0)