Merge branch 'master' into jdbc-column-metadata

.dockerignore

@@ -17,6 +17,7 @@
 
 .git
 docker_cache
+docs/_build
 
 # IDE
 .vscode
@@ -49,7 +50,6 @@ python/dist
 python/*.egg-info
 python/*.egg
 python/*.pyc
-python/doc/_build
 __pycache__/
 */__pycache__/
 */*/__pycache__/

.gitignore

@@ -15,6 +15,9 @@
 # specific language governing permissions and limitations
 # under the License.
 
+apache-rat-*.jar
+arrow-src.tar
+
 # Compiled source
 *.a
 *.dll
@@ -34,7 +37,9 @@ MANIFEST
 *.iml
 
 cpp/.idea/
+cpp/apidoc/xml/
 python/.eggs/
+python/doc/
 .vscode
 .idea/
 .pytest_cache/

.pre-commit-config.yaml

@@ -21,6 +21,14 @@
 # To run all hooks on all files use `pre-commit run -a`
 
 repos:
+  - repo: local
+    hooks:
+      - id: rat
+        name: rat
+        language: system
+        entry: bash -c "git archive HEAD --prefix=apache-arrow/ --output=arrow-src.tar && ./dev/release/run-rat.sh arrow-src.tar"
+        always_run: true
+        pass_filenames: false
   - repo: git://github.com/pre-commit/pre-commit-hooks
     sha: v1.2.3
     hooks:

c_glib/.gitignore

@@ -51,12 +51,12 @@ Makefile.in
 /libtool
 /m4/
 /stamp-h1
+/arrow-cuda-glib/*.pc
 /arrow-glib/enums.c
 /arrow-glib/enums.h
 /arrow-glib/stamp-*
 /arrow-glib/version.h
 /arrow-glib/*.pc
-/arrow-gpu-glib/*.pc
 /gandiva-glib/*.pc
 /parquet-glib/*.pc
 /plasma-glib/*.pc

c_glib/Makefile.am

@@ -19,7 +19,7 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 
 SUBDIRS =					\
 	arrow-glib				\
-	arrow-gpu-glib				\
+	arrow-cuda-glib				\
 	gandiva-glib				\
 	parquet-glib				\
 	plasma-glib				\

c_glib/arrow-gpu-glib/Makefile.am → c_glib/arrow-cuda-glib/Makefile.am

@@ -24,51 +24,51 @@ AM_CPPFLAGS =					\
 	-I$(top_builddir)			\
 	-I$(top_srcdir)
 
-if HAVE_ARROW_GPU
+if HAVE_ARROW_CUDA
 lib_LTLIBRARIES =				\
-	libarrow-gpu-glib.la
+	libarrow-cuda-glib.la
 
-libarrow_gpu_glib_la_CXXFLAGS =			\
+libarrow_cuda_glib_la_CXXFLAGS =		\
 	$(GLIB_CFLAGS)				\
 	$(ARROW_CFLAGS)				\
-	$(ARROW_GPU_CFLAGS)			\
+	$(ARROW_CUDA_CFLAGS)			\
 	$(GARROW_CXXFLAGS)
 
-libarrow_gpu_glib_la_LDFLAGS =			\
+libarrow_cuda_glib_la_LDFLAGS =			\
 	-version-info $(LT_VERSION_INFO)	\
 	-no-undefined
 
-libarrow_gpu_glib_la_LIBADD =			\
+libarrow_cuda_glib_la_LIBADD =			\
 	$(GLIB_LIBS)				\
 	$(ARROW_LIBS)				\
-	$(ARROW_GPU_LIBS)			\
+	$(ARROW_CUDA_LIBS)			\
 	../arrow-glib/libarrow-glib.la
 
-libarrow_gpu_glib_la_headers =			\
-	arrow-gpu-glib.h			\
+libarrow_cuda_glib_la_headers =			\
+	arrow-cuda-glib.h			\
 	cuda.h
 
-libarrow_gpu_glib_la_sources =			\
+libarrow_cuda_glib_la_sources =			\
 	cuda.cpp				\
-	$(libarrow_gpu_glib_la_headers)
+	$(libarrow_cuda_glib_la_headers)
 
-libarrow_gpu_glib_la_cpp_headers =		\
-	arrow-gpu-glib.hpp			\
+libarrow_cuda_glib_la_cpp_headers =		\
+	arrow-cuda-glib.hpp			\
 	cuda.hpp
 
-libarrow_gpu_glib_la_SOURCES =			\
-	$(libarrow_gpu_glib_la_sources)		\
-	$(libarrow_gpu_glib_la_cpp_headers)
+libarrow_cuda_glib_la_SOURCES =			\
+	$(libarrow_cuda_glib_la_sources)	\
+	$(libarrow_cuda_glib_la_cpp_headers)
 
-arrow_gpu_glib_includedir =			\
-	$(includedir)/arrow-gpu-glib
-arrow_gpu_glib_include_HEADERS =		\
-	$(libarrow_gpu_glib_la_headers)		\
-	$(libarrow_gpu_glib_la_cpp_headers)
+arrow_cuda_glib_includedir =			\
+	$(includedir)/arrow-cuda-glib
+arrow_cuda_glib_include_HEADERS =		\
+	$(libarrow_cuda_glib_la_headers)	\
+	$(libarrow_cuda_glib_la_cpp_headers)
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA =				\
-	arrow-gpu-glib.pc
+	arrow-cuda-glib.pc
 
 if HAVE_INTROSPECTION
 -include $(INTROSPECTION_MAKEFILE)
@@ -85,39 +85,39 @@ endif
 INTROSPECTION_COMPILER_ARGS =			\
 	--includedir=$(abs_builddir)/../arrow-glib
 
-ArrowGPU-1.0.gir: libarrow-gpu-glib.la
-ArrowGPU_1_0_gir_PACKAGES =			\
+ArrowCUDA-1.0.gir: libarrow-cuda-glib.la
+ArrowCUDA_1_0_gir_PACKAGES =			\
 	arrow-glib
-ArrowGPU_1_0_gir_EXPORT_PACKAGES =		\
-	arrow-gpu-glib
-ArrowGPU_1_0_gir_INCLUDES =			\
+ArrowCUDA_1_0_gir_EXPORT_PACKAGES =		\
+	arrow-cuda-glib
+ArrowCUDA_1_0_gir_INCLUDES =			\
 	Arrow-1.0
-ArrowGPU_1_0_gir_CFLAGS =			\
+ArrowCUDA_1_0_gir_CFLAGS =			\
 	$(AM_CPPFLAGS)
-ArrowGPU_1_0_gir_LIBS =
-ArrowGPU_1_0_gir_FILES =			\
-	$(libarrow_gpu_glib_la_sources)
-ArrowGPU_1_0_gir_SCANNERFLAGS =					\
+ArrowCUDA_1_0_gir_LIBS =
+ArrowCUDA_1_0_gir_FILES =			\
+	$(libarrow_cuda_glib_la_sources)
+ArrowCUDA_1_0_gir_SCANNERFLAGS =				\
 	--library-path=$(ARROW_LIB_DIR)				\
 	--warn-all						\
 	--add-include-path=$(abs_builddir)/../arrow-glib	\
-	--identifier-prefix=GArrowGPU				\
-	--symbol-prefix=garrow_gpu
+	--identifier-prefix=GArrowCUDA				\
+	--symbol-prefix=garrow_cuda
 if OS_MACOS
-ArrowGPU_1_0_gir_LIBS +=			\
+ArrowCUDA_1_0_gir_LIBS +=			\
 	 arrow-glib				\
-	 arrow-gpu-glib
-ArrowGPU_1_0_gir_SCANNERFLAGS +=				\
+	 arrow-cuda-glib
+ArrowCUDA_1_0_gir_SCANNERFLAGS +=				\
 	--no-libtool						\
 	--library-path=$(abs_builddir)/../arrow-glib/.libs	\
 	--library-path=$(abs_builddir)/.libs
 else
-ArrowGPU_1_0_gir_LIBS +=				\
+ArrowCUDA_1_0_gir_LIBS +=				\
 	$(abs_builddir)/../arrow-glib/libarrow-glib.la	\
-	libarrow-gpu-glib.la
+	libarrow-cuda-glib.la
 endif
 
-INTROSPECTION_GIRS += ArrowGPU-1.0.gir
+INTROSPECTION_GIRS += ArrowCUDA-1.0.gir
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = $(INTROSPECTION_GIRS)

c_glib/arrow-gpu-glib/arrow-gpu-glib.h → c_glib/arrow-cuda-glib/arrow-cuda-glib.h

@@ -21,4 +21,4 @@
 
 #include <arrow-glib/arrow-glib.h>
 
-#include <arrow-gpu-glib/cuda.h>
+#include <arrow-cuda-glib/cuda.h>

c_glib/arrow-gpu-glib/arrow-gpu-glib.hpp → c_glib/arrow-cuda-glib/arrow-cuda-glib.hpp

@@ -21,4 +21,4 @@
 
 #include <arrow-glib/arrow-glib.hpp>
 
-#include <arrow-gpu-glib/cuda.hpp>
+#include <arrow-cuda-glib/cuda.hpp>

c_glib/arrow-gpu-glib/arrow-gpu-glib.pc.in → c_glib/arrow-cuda-glib/arrow-cuda-glib.pc.in

@@ -20,9 +20,9 @@ exec_prefix=@exec_prefix@
 libdir=@libdir@
 includedir=@includedir@
 
-Name: Apache Arrow GPU GLib
-Description: C API for Apache Arrow GPU based on GLib
+Name: Apache Arrow CUDA GLib
+Description: C API for Apache Arrow CUDA based on GLib
 Version: @VERSION@
-Libs: -L${libdir} -larrow-gpu-glib
+Libs: -L${libdir} -larrow-cuda-glib
 Cflags: -I${includedir}
-Requires: arrow-glib
+Requires: arrow-glib arrow-cuda