Merge branch 'table-scan-perf' of github.com:ccri/arrow into js-cpp-r…

…efactor
apache · Jan 27, 2018 · 10c48ad · 10c48ad
2 parents f7bb0ed + dbe7f81
commit 10c48ad
Show file tree

Hide file tree

Showing 91 changed files with 2,127 additions and 1,189 deletions.
diff --git a/c_glib/configure.ac b/c_glib/configure.ac
@@ -143,7 +143,7 @@ AC_CONFIG_FILES([
   arrow-gpu-glib/arrow-gpu-glib.pc
   doc/Makefile
   doc/reference/Makefile
-  doc/reference/xml/Makefile
+  doc/reference/entities.xml
   example/Makefile
   example/lua/Makefile
   tool/Makefile

diff --git a/c_glib/doc/reference/Makefile.am b/c_glib/doc/reference/Makefile.am
@@ -15,9 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-SUBDIRS =                                       \
-	xml
-
 DOC_MODULE = arrow-glib
 
 DOC_MAIN_SGML_FILE = $(DOC_MODULE)-docs.xml
@@ -72,4 +69,5 @@ CLEANFILES +=					\
 	$(DOC_MODULE).types
 
 EXTRA_DIST +=					\
+	entities.xml.in				\
 	meson.build
diff --git a/c_glib/doc/reference/arrow-glib-docs.xml b/c_glib/doc/reference/arrow-glib-docs.xml
@@ -21,10 +21,10 @@
                "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd"
 [
   <!ENTITY % local.common.attrib "xmlns:xi  CDATA  #FIXED 'http://www.w3.org/2003/XInclude'">
-  <!ENTITY % gtkdocentities SYSTEM "xml/gtkdocentities.ent">
+  <!ENTITY % gtkdocentities SYSTEM "entities.xml">
   %gtkdocentities;
 ]>
-<book id="index">
+<book id="index" xmlns:xi="http://www.w3.org/2003/XInclude">
   <bookinfo>
     <title>&package_name; Reference Manual</title>
     <releaseinfo>

diff --git a/...b/doc/reference/xml/gtkdocentities.ent.in → c_glib/doc/reference/entities.xml.in b/...b/doc/reference/xml/gtkdocentities.ent.in → c_glib/doc/reference/entities.xml.in
@@ -16,9 +16,9 @@
   specific language governing permissions and limitations
   under the License.
 -->
-<!ENTITY package "@package@">
-<!ENTITY package_bugreport "@package_bugreport@">
-<!ENTITY package_name "@package_name@">
-<!ENTITY package_string "@package_string@">
-<!ENTITY package_url "@package_url@">
-<!ENTITY package_version "@package_version@">
+<!ENTITY package "@PACKAGE@">
+<!ENTITY package_bugreport "@PACKAGE_BUGREPORT@">
+<!ENTITY package_name "@PACKAGE_NAME@">
+<!ENTITY package_string "@PACKAGE_STRING@">
+<!ENTITY package_url "@PACKAGE_URL@">
+<!ENTITY package_version "@PACKAGE_VERSION@">
diff --git a/c_glib/doc/reference/meson.build b/c_glib/doc/reference/meson.build
@@ -17,7 +17,18 @@
 # specific language governing permissions and limitations
 # under the License.
 
-subdir('xml')
+entities_conf = configuration_data()
+entities_conf.set('PACKAGE', meson.project_name())
+entities_conf.set('PACKAGE_BUGREPORT',
+                  'https://issues.apache.org/jira/browse/ARROW')
+entities_conf.set('PACKAGE_NAME', meson.project_name())
+entities_conf.set('PACKAGE_STRING',
+                  ' '.join([meson.project_name(), version]))
+entities_conf.set('PACKAGE_URL', 'https://arrow.apache.org/')
+entities_conf.set('PACKAGE_VERSION', version)
+configure_file(input: 'entities.xml.in',
+               output: 'entities.xml',
+               configuration: entities_conf)
 
 private_headers = [
 ]

diff --git a/c_glib/doc/reference/xml/Makefile.am b/c_glib/doc/reference/xml/Makefile.am
diff --git a/c_glib/doc/reference/xml/meson.build b/c_glib/doc/reference/xml/meson.build
diff --git a/ci/msvc-build.bat b/ci/msvc-build.bat
@@ -81,7 +81,7 @@ conda info -a
 
 conda create -n arrow -q -y python=%PYTHON% ^
       six pytest setuptools numpy pandas cython ^
-      thrift-cpp
+      thrift-cpp=0.10.0
 
 if "%JOB%" == "Toolchain" (
 

diff --git a/ci/travis_before_script_cpp.sh b/ci/travis_before_script_cpp.sh
@@ -47,7 +47,7 @@ if [ "$ARROW_TRAVIS_USE_TOOLCHAIN" == "1" ]; then
         zlib \
         cmake \
         curl \
-        thrift-cpp \
+        thrift-cpp=0.10.0 \
         ninja
 
   # HACK(wesm): We started experiencing OpenSSL failures when Miniconda was

diff --git a/ci/travis_lint.sh b/ci/travis_lint.sh
@@ -35,10 +35,10 @@ popd
 # Fail fast on style checks
 sudo pip install flake8
 
-PYARROW_DIR=$TRAVIS_BUILD_DIR/python/pyarrow
+PYTHON_DIR=$TRAVIS_BUILD_DIR/python
 
-flake8 --count $PYARROW_DIR
+flake8 --count $PYTHON_DIR/pyarrow
 
 # Check Cython files with some checks turned off
 flake8 --count --config=$PYTHON_DIR/.flake8.cython \
-       $PYARROW_DIR
+       $PYTHON_DIR/pyarrow
diff --git a/cpp/README.md b/cpp/README.md
@@ -39,9 +39,11 @@ sudo apt-get install cmake \
      libboost-system-dev
 ```
 
-On OS X, you can use [Homebrew][1]:
+On macOS, you can use [Homebrew][1]:
 
 ```shell
+git clone https://github.com/apache/arrow.git
+cd arrow
 brew update && brew bundle --file=c_glib/Brewfile
 ```
 
@@ -250,6 +252,21 @@ Logging IWYU to /tmp/arrow-cpp-iwyu.gT7XXV
 ...
 ```
 
+### Linting
+
+We require that you follow a certain coding style in the C++ code base.
+You can check your code abides by that coding style by running:
+
+    make lint
+
+You can also fix any formatting errors automatically:
+
+    make format
+
+These commands require `clang-format-4.0` (and not any other version).
+You may find the required packages at http://releases.llvm.org/download.html
+or use the Debian/Ubuntu APT repositories on https://apt.llvm.org/.
+
 ## Continuous Integration
 
 Pull requests are run through travis-ci for continuous integration.  You can avoid