Skip to content

Commit 8cf2473

Browse files
author
Brian Hulette
committed
Merge remote-tracking branch 'origin/master' into table-scan-perf
2 parents 4a41b18 + 074eafc commit 8cf2473

Some content is hidden

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

87 files changed

+1970
-1041
lines changed

‎c_glib/configure.ac

+1-1
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ AC_CONFIG_FILES([
143143
arrow-gpu-glib/arrow-gpu-glib.pc
144144
doc/Makefile
145145
doc/reference/Makefile
146-
doc/reference/xml/Makefile
146+
doc/reference/entities.xml
147147
example/Makefile
148148
example/lua/Makefile
149149
tool/Makefile

‎c_glib/doc/reference/Makefile.am

+1-3
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,6 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
SUBDIRS = \
19-
xml
20-
2118
DOC_MODULE = arrow-glib
2219

2320
DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
@@ -72,4 +69,5 @@ CLEANFILES += \
7269
$(DOC_MODULE).types
7370

7471
EXTRA_DIST += \
72+
entities.xml.in \
7573
meson.build

‎c_glib/doc/reference/arrow-glib-docs.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
"http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
2222
[
2323
<!ENTITY % local.common.attrib "xmlns:xi CDATA #FIXED 'http://www.w3.org/2003/XInclude'">
24-
<!ENTITY % gtkdocentities SYSTEM "xml/gtkdocentities.ent">
24+
<!ENTITY % gtkdocentities SYSTEM "entities.xml">
2525
%gtkdocentities;
2626
]>
27-
<book id="index">
27+
<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
2828
<bookinfo>
2929
<title>&package_name; Reference Manual</title>
3030
<releaseinfo>

‎c_glib/doc/reference/xml/gtkdocentities.ent.in ‎c_glib/doc/reference/entities.xml.in

+6-6
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
specific language governing permissions and limitations
1717
under the License.
1818
-->
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@">
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/reference/meson.build

+12-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,18 @@
1717
# specific language governing permissions and limitations
1818
# under the License.
1919

20-
subdir('xml')
20+
entities_conf = configuration_data()
21+
entities_conf.set('PACKAGE', meson.project_name())
22+
entities_conf.set('PACKAGE_BUGREPORT',
23+
'https://issues.apache.org/jira/browse/ARROW')
24+
entities_conf.set('PACKAGE_NAME', meson.project_name())
25+
entities_conf.set('PACKAGE_STRING',
26+
' '.join([meson.project_name(), version]))
27+
entities_conf.set('PACKAGE_URL', 'https://arrow.apache.org/')
28+
entities_conf.set('PACKAGE_VERSION', version)
29+
configure_file(input: 'entities.xml.in',
30+
output: 'entities.xml',
31+
configuration: entities_conf)
2132

2233
private_headers = [
2334
]

‎c_glib/doc/reference/xml/Makefile.am

-20
This file was deleted.

‎c_glib/doc/reference/xml/meson.build

-31
This file was deleted.

‎ci/msvc-build.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ conda info -a
8181

8282
conda create -n arrow -q -y python=%PYTHON% ^
8383
six pytest setuptools numpy pandas cython ^
84-
thrift-cpp
84+
thrift-cpp=0.10.0
8585

8686
if "%JOB%" == "Toolchain" (
8787

‎ci/travis_before_script_cpp.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ if [ "$ARROW_TRAVIS_USE_TOOLCHAIN" == "1" ]; then
4747
zlib \
4848
cmake \
4949
curl \
50-
thrift-cpp \
50+
thrift-cpp=0.10.0 \
5151
ninja
5252

5353
# HACK(wesm): We started experiencing OpenSSL failures when Miniconda was

‎ci/travis_lint.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -35,10 +35,10 @@ popd
3535
# Fail fast on style checks
3636
sudo pip install flake8
3737

38-
PYARROW_DIR=$TRAVIS_BUILD_DIR/python/pyarrow
38+
PYTHON_DIR=$TRAVIS_BUILD_DIR/python
3939

40-
flake8 --count $PYARROW_DIR
40+
flake8 --count $PYTHON_DIR/pyarrow
4141

4242
# Check Cython files with some checks turned off
4343
flake8 --count --config=$PYTHON_DIR/.flake8.cython \
44-
$PYARROW_DIR
44+
$PYTHON_DIR/pyarrow

‎cpp/README.md

+18-1
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,11 @@ sudo apt-get install cmake \
3939
libboost-system-dev
4040
```
4141

42-
On OS X, you can use [Homebrew][1]:
42+
On macOS, you can use [Homebrew][1]:
4343

4444
```shell
45+
git clone https://github.com/apache/arrow.git
46+
cd arrow
4547
brew update && brew bundle --file=c_glib/Brewfile
4648
```
4749

@@ -250,6 +252,21 @@ Logging IWYU to /tmp/arrow-cpp-iwyu.gT7XXV
250252
...
251253
```
252254

255+
### Linting
256+
257+
We require that you follow a certain coding style in the C++ code base.
258+
You can check your code abides by that coding style by running:
259+
260+
make lint
261+
262+
You can also fix any formatting errors automatically:
263+
264+
make format
265+
266+
These commands require `clang-format-4.0` (and not any other version).
267+
You may find the required packages at http://releases.llvm.org/download.html
268+
or use the Debian/Ubuntu APT repositories on https://apt.llvm.org/.
269+
253270
## Continuous Integration
254271

255272
Pull requests are run through travis-ci for continuous integration. You can avoid

0 commit comments

Comments
 (0)