mirrors/arrow
0
0 Fork 0
mirror of https://github.com/apache/arrow.git synced 2026-10-28 16:47:19 +08:00
Code Activity

Update arrow-glib after codebase consolidation

Browse Source 
Change-Id: Iac1c3cdce7d94fd2f49472bc511484d5e223f852
This commit is contained in:
Kouhei Sutou authored and Wes McKinney committed 2017-04-09 21:25:11 -04:00
1 parent 207749cc69
commit 7221e6683e
18 files changed
+117 -586
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

c_glib/arrow-glib/Makefile.am
+62 -233
View File
@@ -101,6 +101,25 @@ libarrow_glib_la_headers = \
uint64-array-builder.h \
uint64-data-type.h
libarrow_glib_la_headers += \
io-file.h \
io-file-mode.h \
io-file-output-stream.h \
io-input-stream.h \
io-memory-mapped-file.h \
io-output-stream.h \
io-random-access-file.h \
io-readable.h \
io-writeable.h \
io-writeable-file.h
libarrow_glib_la_headers += \
ipc-file-reader.h \
ipc-file-writer.h \
ipc-stream-reader.h \
ipc-stream-writer.h \
ipc-metadata-version.h
libarrow_glib_la_generated_headers = \
enums.h
@@ -170,6 +189,25 @@ libarrow_glib_la_sources = \
$(libarrow_glib_la_headers) \
$(libarrow_glib_la_generated_sources)
libarrow_glib_la_sources += \
io-file.cpp \
io-file-mode.cpp \
io-file-output-stream.cpp \
io-input-stream.cpp \
io-memory-mapped-file.cpp \
io-output-stream.cpp \
io-random-access-file.cpp \
io-readable.cpp \
io-writeable.cpp \
io-writeable-file.cpp
libarrow_glib_la_sources += \
ipc-file-reader.cpp \
ipc-file-writer.cpp \
ipc-metadata-version.cpp \
ipc-stream-reader.cpp \
ipc-stream-writer.cpp
libarrow_glib_la_cpp_headers = \
array.hpp \
array-builder.hpp \
@@ -184,6 +222,25 @@ libarrow_glib_la_cpp_headers = \
table.hpp \
type.hpp
libarrow_glib_la_cpp_headers += \
io-file.hpp \
io-file-mode.hpp \
io-file-output-stream.hpp \
io-input-stream.hpp \
io-memory-mapped-file.hpp \
io-output-stream.hpp \
io-random-access-file.hpp \
io-readable.hpp \
io-writeable.hpp \
io-writeable-file.hpp
libarrow_glib_la_cpp_headers += \
ipc-file-reader.hpp \
ipc-file-writer.hpp \
ipc-metadata-version.hpp \
ipc-stream-reader.hpp \
ipc-stream-writer.hpp
libarrow_glib_la_SOURCES = \
$(libarrow_glib_la_sources) \
$(libarrow_glib_la_cpp_headers)
@@ -221,205 +278,15 @@ stamp-enums.c: $(libarrow_glib_la_headers) enums.c.template
$(libarrow_glib_la_headers)) > enums.c
touch $@
# libarrow-io-glib
lib_LTLIBRARIES += \
libarrow-io-glib.la
libarrow_io_glib_la_CXXFLAGS = \
$(GLIB_CFLAGS) \
$(ARROW_IO_CFLAGS) \
$(GARROW_CXXFLAGS)
libarrow_io_glib_la_LIBADD = \
$(GLIB_LIBS) \
$(ARROW_IO_LIBS) \
libarrow-glib.la
libarrow_io_glib_la_headers = \
arrow-io-glib.h \
io-file.h \
io-file-mode.h \
io-file-output-stream.h \
io-input-stream.h \
io-memory-mapped-file.h \
io-output-stream.h \
io-random-access-file.h \
io-readable.h \
io-writeable.h \
io-writeable-file.h
libarrow_io_glib_la_generated_headers = \
io-enums.h
libarrow_io_glib_la_generated_sources = \
io-enums.c \
$(libarrow_io_glib_la_generated_headers)
libarrow_io_glib_la_sources = \
io-file.cpp \
io-file-mode.cpp \
io-file-output-stream.cpp \
io-input-stream.cpp \
io-memory-mapped-file.cpp \
io-output-stream.cpp \
io-random-access-file.cpp \
io-readable.cpp \
io-writeable.cpp \
io-writeable-file.cpp \
$(libarrow_io_glib_la_headers) \
$(libarrow_io_glib_la_generated_sources)
libarrow_io_glib_la_cpp_headers = \
arrow-io-glib.hpp \
io-file.hpp \
io-file-mode.hpp \
io-file-output-stream.hpp \
io-input-stream.hpp \
io-memory-mapped-file.hpp \
io-output-stream.hpp \
io-random-access-file.hpp \
io-readable.hpp \
io-writeable.hpp \
io-writeable-file.hpp
libarrow_io_glib_la_SOURCES = \
$(libarrow_io_glib_la_sources) \
$(libarrow_io_glib_la_cpp_headers)
BUILT_SOURCES += \
$(libarrow_io_glib_la_genearted_sources) \
stamp-io-enums.c \
stamp-io-enums.h
EXTRA_DIST += \
io-enums.c.template \
io-enums.h.template
io-enums.h: stamp-io-enums.h
@true
stamp-io-enums.h: $(libarrow_io_glib_la_headers) io-enums.h.template
$(AM_V_GEN) \
(cd $(srcdir) && \
$(GLIB_MKENUMS) \
--identifier-prefix GArrowIO \
--symbol-prefix garrow_io \
--template io-enums.h.template \
$(libarrow_io_glib_la_headers)) > io-enums.h
touch $@
io-enums.c: stamp-io-enums.c
@true
stamp-io-enums.c: $(libarrow_io_glib_la_headers) io-enums.c.template
$(AM_V_GEN) \
(cd $(srcdir) && \
$(GLIB_MKENUMS) \
--identifier-prefix GArrowIO \
--symbol-prefix garrow_io \
--template io-enums.c.template \
$(libarrow_io_glib_la_headers)) > io-enums.c
touch $@
# libarrow-ipc-glib
lib_LTLIBRARIES += \
libarrow-ipc-glib.la
libarrow_ipc_glib_la_CXXFLAGS = \
$(GLIB_CFLAGS) \
$(ARROW_IPC_CFLAGS) \
$(GARROW_CXXFLAGS)
libarrow_ipc_glib_la_LIBADD = \
$(GLIB_LIBS) \
$(ARROW_IPC_LIBS) \
libarrow-glib.la \
libarrow-io-glib.la
libarrow_ipc_glib_la_headers = \
arrow-ipc-glib.h \
ipc-file-reader.h \
ipc-file-writer.h \
ipc-stream-reader.h \
ipc-stream-writer.h \
ipc-metadata-version.h
libarrow_ipc_glib_la_generated_headers = \
ipc-enums.h
libarrow_ipc_glib_la_generated_sources = \
ipc-enums.c \
$(libarrow_ipc_glib_la_generated_headers)
libarrow_ipc_glib_la_sources = \
ipc-file-reader.cpp \
ipc-file-writer.cpp \
ipc-metadata-version.cpp \
ipc-stream-reader.cpp \
ipc-stream-writer.cpp \
$(libarrow_ipc_glib_la_headers) \
$(libarrow_ipc_glib_la_generated_sources)
libarrow_ipc_glib_la_cpp_headers = \
arrow-ipc-glib.hpp \
ipc-file-reader.hpp \
ipc-file-writer.hpp \
ipc-metadata-version.hpp \
ipc-stream-reader.hpp \
ipc-stream-writer.hpp
libarrow_ipc_glib_la_SOURCES = \
$(libarrow_ipc_glib_la_sources) \
$(libarrow_ipc_glib_la_cpp_headers)
BUILT_SOURCES += \
$(libarrow_ipc_glib_la_genearted_sources) \
stamp-ipc-enums.c \
stamp-ipc-enums.h
EXTRA_DIST += \
ipc-enums.c.template \
ipc-enums.h.template
ipc-enums.h: stamp-ipc-enums.h
@true
stamp-ipc-enums.h: $(libarrow_ipc_glib_la_headers) ipc-enums.h.template
$(AM_V_GEN) \
(cd $(srcdir) && \
$(GLIB_MKENUMS) \
--identifier-prefix GArrowIPC \
--symbol-prefix garrow_ipc \
--template ipc-enums.h.template \
$(libarrow_ipc_glib_la_headers)) > ipc-enums.h
touch $@
ipc-enums.c: stamp-ipc-enums.c
@true
stamp-ipc-enums.c: $(libarrow_ipc_glib_la_headers) ipc-enums.c.template
$(AM_V_GEN) \
(cd $(srcdir) && \
$(GLIB_MKENUMS) \
--identifier-prefix GArrowIPC \
--symbol-prefix garrow_ipc \
--template ipc-enums.c.template \
$(libarrow_ipc_glib_la_headers)) > ipc-enums.c
touch $@
arrow_glib_includedir = $(includedir)/arrow-glib
arrow_glib_include_HEADERS = \
$(libarrow_glib_la_headers) \
$(libarrow_glib_la_cpp_headers) \
$(libarrow_glib_la_generated_headers) \
$(libarrow_io_glib_la_headers) \
$(libarrow_io_glib_la_cpp_headers) \
$(libarrow_io_glib_la_generated_headers) \
$(libarrow_ipc_glib_la_headers) \
$(libarrow_ipc_glib_la_cpp_headers) \
$(libarrow_ipc_glib_la_generated_headers)
arrow_glib_include_HEADERS = \
$(libarrow_glib_la_headers) \
$(libarrow_glib_la_cpp_headers) \
$(libarrow_glib_la_generated_headers)
pkgconfigdir = $(libdir)/pkgconfig
pkgconfig_DATA = \
arrow-glib.pc \
arrow-io-glib.pc \
arrow-ipc-glib.pc
arrow-glib.pc
# GObject Introspection
-include $(INTROSPECTION_MAKEFILE)
@@ -443,44 +310,6 @@ Arrow_1_0_gir_SCANNERFLAGS = \
--symbol-prefix=garrow
INTROSPECTION_GIRS += Arrow-1.0.gir
ArrowIO-1.0.gir: libarrow-io-glib.la
ArrowIO-1.0.gir: Arrow-1.0.gir
ArrowIO_1_0_gir_PACKAGES = \
gobject-2.0
ArrowIO_1_0_gir_EXPORT_PACKAGES = arrow-io
ArrowIO_1_0_gir_INCLUDES = \
GObject-2.0
ArrowIO_1_0_gir_CFLAGS = \
$(AM_CPPFLAGS)
ArrowIO_1_0_gir_LIBS = libarrow-io-glib.la
ArrowIO_1_0_gir_FILES = $(libarrow_io_glib_la_sources)
ArrowIO_1_0_gir_SCANNERFLAGS = \
--include-uninstalled=$(builddir)/Arrow-1.0.gir \
--warn-all \
--identifier-prefix=GArrowIO \
--symbol-prefix=garrow_io
INTROSPECTION_GIRS += ArrowIO-1.0.gir
ArrowIPC-1.0.gir: libarrow-ipc-glib.la
ArrowIPC-1.0.gir: Arrow-1.0.gir
ArrowIPC-1.0.gir: ArrowIO-1.0.gir
ArrowIPC_1_0_gir_PACKAGES = \
gobject-2.0
ArrowIPC_1_0_gir_EXPORT_PACKAGES = arrow-ipc
ArrowIPC_1_0_gir_INCLUDES = \
GObject-2.0
ArrowIPC_1_0_gir_CFLAGS = \
$(AM_CPPFLAGS)
ArrowIPC_1_0_gir_LIBS = libarrow-ipc-glib.la
ArrowIPC_1_0_gir_FILES = $(libarrow_ipc_glib_la_sources)
ArrowIPC_1_0_gir_SCANNERFLAGS = \
--include-uninstalled=$(builddir)/Arrow-1.0.gir \
--include-uninstalled=$(builddir)/ArrowIO-1.0.gir \
--warn-all \
--identifier-prefix=GArrowIPC \
--symbol-prefix=garrow_ipc
INTROSPECTION_GIRS += ArrowIPC-1.0.gir
girdir = $(datadir)/gir-1.0
gir_DATA = $(INTROSPECTION_GIRS)
c_glib/arrow-glib/arrow-glib.h
+17
View File
@@ -78,3 +78,20 @@
#include <arrow-glib/uint64-array.h>
#include <arrow-glib/uint64-array-builder.h>
#include <arrow-glib/uint64-data-type.h>
#include <arrow-glib/io-file.h>
#include <arrow-glib/io-file-mode.h>
#include <arrow-glib/io-file-output-stream.h>
#include <arrow-glib/io-input-stream.h>
#include <arrow-glib/io-memory-mapped-file.h>
#include <arrow-glib/io-output-stream.h>
#include <arrow-glib/io-random-access-file.h>
#include <arrow-glib/io-readable.h>
#include <arrow-glib/io-writeable.h>
#include <arrow-glib/io-writeable-file.h>
#include <arrow-glib/ipc-file-reader.h>
#include <arrow-glib/ipc-file-writer.h>
#include <arrow-glib/ipc-metadata-version.h>
#include <arrow-glib/ipc-stream-reader.h>
#include <arrow-glib/ipc-stream-writer.h>
c_glib/arrow-glib/arrow-glib.hpp
+16
View File
@@ -35,3 +35,19 @@
#include <arrow-glib/schema.hpp>
#include <arrow-glib/table.hpp>
#include <arrow-glib/type.hpp>
#include <arrow-glib/io-file.hpp>
#include <arrow-glib/io-file-mode.hpp>
#include <arrow-glib/io-file-output-stream.hpp>
#include <arrow-glib/io-input-stream.hpp>
#include <arrow-glib/io-memory-mapped-file.hpp>
#include <arrow-glib/io-output-stream.hpp>
#include <arrow-glib/io-random-access-file.hpp>
#include <arrow-glib/io-readable.hpp>
#include <arrow-glib/io-writeable.hpp>
#include <arrow-glib/ipc-file-reader.hpp>
#include <arrow-glib/ipc-file-writer.hpp>
#include <arrow-glib/ipc-metadata-version.hpp>
#include <arrow-glib/ipc-stream-reader.hpp>
#include <arrow-glib/ipc-stream-writer.hpp>
c_glib/arrow-glib/arrow-io-glib.h
-32
View File
@@ -1,32 +0,0 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
#pragma once
#include <arrow-glib/io-enums.h>
#include <arrow-glib/io-file.h>
#include <arrow-glib/io-file-mode.h>
#include <arrow-glib/io-file-output-stream.h>
#include <arrow-glib/io-input-stream.h>
#include <arrow-glib/io-memory-mapped-file.h>
#include <arrow-glib/io-output-stream.h>
#include <arrow-glib/io-random-access-file.h>
#include <arrow-glib/io-readable.h>
#include <arrow-glib/io-writeable.h>
#include <arrow-glib/io-writeable-file.h>
c_glib/arrow-glib/arrow-io-glib.hpp
-30
View File
@@ -1,30 +0,0 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
#pragma once
#include <arrow-glib/io-file.hpp>
#include <arrow-glib/io-file-mode.hpp>
#include <arrow-glib/io-file-output-stream.hpp>
#include <arrow-glib/io-input-stream.hpp>
#include <arrow-glib/io-memory-mapped-file.hpp>
#include <arrow-glib/io-output-stream.hpp>
#include <arrow-glib/io-random-access-file.hpp>
#include <arrow-glib/io-readable.hpp>
#include <arrow-glib/io-writeable.hpp>
c_glib/arrow-glib/arrow-ipc-glib.h
-27
View File
@@ -1,27 +0,0 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
#pragma once
#include <arrow-glib/ipc-enums.h>
#include <arrow-glib/ipc-file-reader.h>
#include <arrow-glib/ipc-file-writer.h>
#include <arrow-glib/ipc-metadata-version.h>
#include <arrow-glib/ipc-stream-reader.h>
#include <arrow-glib/ipc-stream-writer.h>
c_glib/arrow-glib/arrow-ipc-glib.hpp
-30
View File
@@ -1,30 +0,0 @@
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
#pragma once
#include <arrow-glib/arrow-glib.hpp>
#include <arrow-glib/arrow-io-glib.hpp>
#include <arrow-glib/ipc-file-reader.hpp>
#include <arrow-glib/ipc-file-writer.hpp>
#include <arrow-glib/ipc-metadata-version.hpp>
#include <arrow-glib/ipc-stream-reader.hpp>
#include <arrow-glib/ipc-stream-writer.hpp>
c_glib/arrow-glib/io-enums.c.template
-56
View File
@@ -1,56 +0,0 @@
/*** BEGIN file-header ***/
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <arrow-glib/arrow-io-glib.h>
/*** END file-header ***/
/*** BEGIN file-production ***/
/* enumerations from "@filename@" */
/*** END file-production ***/
/*** BEGIN value-header ***/
GType
@enum_name@_get_type(void)
{
static GType etype = 0;
if (G_UNLIKELY(etype == 0)) {
static const G@Type@Value values[] = {
/*** END value-header ***/
/*** BEGIN value-production ***/
{@VALUENAME@, "@VALUENAME@", "@valuenick@"},
/*** END value-production ***/
/*** BEGIN value-tail ***/
{0, NULL, NULL}
};
etype = g_@type@_register_static(g_intern_static_string("@EnumName@"), values);
}
return etype;
}
/*** END value-tail ***/
/*** BEGIN file-tail ***/
/*** END file-tail ***/
c_glib/arrow-glib/io-enums.h.template
-41
View File
@@ -1,41 +0,0 @@
/*** BEGIN file-header ***/
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
#pragma once
#include <arrow-glib/io-file-mode.h>
G_BEGIN_DECLS
/*** END file-header ***/
/*** BEGIN file-production ***/
/* enumerations from "@filename@" */
/*** END file-production ***/
/*** BEGIN value-header ***/
GType @enum_name@_get_type(void) G_GNUC_CONST;
#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type())
/*** END value-header ***/
/*** BEGIN file-tail ***/
G_END_DECLS
/*** END file-tail ***/
c_glib/arrow-glib/ipc-enums.c.template
-56
View File
@@ -1,56 +0,0 @@
/*** BEGIN file-header ***/
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
#ifdef HAVE_CONFIG_H
# include <config.h>
#endif
#include <arrow-glib/arrow-ipc-glib.h>
/*** END file-header ***/
/*** BEGIN file-production ***/
/* enumerations from "@filename@" */
/*** END file-production ***/
/*** BEGIN value-header ***/
GType
@enum_name@_get_type(void)
{
static GType etype = 0;
if (G_UNLIKELY(etype == 0)) {
static const G@Type@Value values[] = {
/*** END value-header ***/
/*** BEGIN value-production ***/
{@VALUENAME@, "@VALUENAME@", "@valuenick@"},
/*** END value-production ***/
/*** BEGIN value-tail ***/
{0, NULL, NULL}
};
etype = g_@type@_register_static(g_intern_static_string("@EnumName@"), values);
}
return etype;
}
/*** END value-tail ***/
/*** BEGIN file-tail ***/
/*** END file-tail ***/
c_glib/arrow-glib/ipc-enums.h.template
-41
View File
@@ -1,41 +0,0 @@
/*** BEGIN file-header ***/
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
* distributed with this work for additional information
* regarding copyright ownership. The ASF licenses this file
* to you under the Apache License, Version 2.0 (the
* "License"); you may not use this file except in compliance
* with the License. You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing,
* software distributed under the License is distributed on an
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
* KIND, either express or implied. See the License for the
* specific language governing permissions and limitations
* under the License.
*/
#pragma once
#include <arrow-glib/ipc-metadata-version.h>
G_BEGIN_DECLS
/*** END file-header ***/
/*** BEGIN file-production ***/
/* enumerations from "@filename@" */
/*** END file-production ***/
/*** BEGIN value-header ***/
GType @enum_name@_get_type(void) G_GNUC_CONST;
#define @ENUMPREFIX@_TYPE_@ENUMSHORT@ (@enum_name@_get_type())
/*** END value-header ***/
/*** BEGIN file-tail ***/
G_END_DECLS
/*** END file-tail ***/
c_glib/configure.ac
-12
View File
@@ -74,27 +74,17 @@ AC_ARG_WITH(arrow-cpp-build-dir,
[GARROW_ARROW_CPP_BUILD_DIR=""])
if test "x$GARROW_ARROW_CPP_BUILD_DIR" = "x"; then
PKG_CHECK_MODULES([ARROW], [arrow])
PKG_CHECK_MODULES([ARROW_IO], [arrow-io])
PKG_CHECK_MODULES([ARROW_IPC], [arrow-ipc])
else
ARROW_INCLUDE_DIR="\$(abs_top_srcdir)/../cpp/src"
ARROW_LIB_DIR="${GARROW_ARROW_CPP_BUILD_DIR}/${GARROW_ARROW_CPP_BUILD_TYPE}"
ARROW_CFLAGS="-I${ARROW_INCLUDE_DIR}"
ARROW_IO_CFLAGS="-I${ARROW_INCLUDE_DIR}"
ARROW_IPC_CFLAGS="-I${ARROW_INCLUDE_DIR}"
ARROW_LIBS="-L${ARROW_LIB_DIR} -larrow"
ARROW_IO_LIBS="-L${ARROW_LIB_DIR} -larrow_io"
ARROW_IPC_LIBS="-L${ARROW_LIB_DIR} -larrow_ipc"
AC_SUBST(ARROW_LIB_DIR)
AC_SUBST(ARROW_CFLAGS)
AC_SUBST(ARROW_IO_CFLAGS)
AC_SUBST(ARROW_IPC_CFLAGS)
AC_SUBST(ARROW_LIBS)
AC_SUBST(ARROW_IO_LIBS)
AC_SUBST(ARROW_IPC_LIBS)
fi
@@ -102,8 +92,6 @@ AC_CONFIG_FILES([
Makefile
arrow-glib/Makefile
arrow-glib/arrow-glib.pc
arrow-glib/arrow-io-glib.pc
arrow-glib/arrow-ipc-glib.pc
doc/Makefile
doc/reference/Makefile
example/Makefile
c_glib/doc/reference/Makefile.am
+2 -6
View File
@@ -33,9 +33,7 @@ HFILE_GLOB = \
$(top_srcdir)/arrow-glib/*.h
IGNORE_HFILES = \
enums.h \
io-enums.h \
ipc-enums.h
enums.h
CFILE_GLOB = \
$(top_srcdir)/arrow-glib/*.cpp
@@ -49,9 +47,7 @@ AM_CFLAGS = \
$(ARROW_CFLAGS)
GTKDOC_LIBS = \
$(top_builddir)/arrow-glib/libarrow-glib.la \
$(top_builddir)/arrow-glib/libarrow-io-glib.la \
$(top_builddir)/arrow-glib/libarrow-ipc-glib.la
$(top_builddir)/arrow-glib/libarrow-glib.la
include $(srcdir)/gtk-doc.make
c_glib/test/run-test.rb
-2
View File
@@ -32,8 +32,6 @@ ENV["GI_TYPELIB_PATH"] = [
require "gi"
Arrow = GI.load("Arrow")
ArrowIO = GI.load("ArrowIO")
ArrowIPC = GI.load("ArrowIPC")
require "tempfile"
require_relative "helper/buildable"
c_glib/test/test-io-file-output-stream.rb
+2 -2
View File
@@ -21,7 +21,7 @@ class TestIOFileOutputStream < Test::Unit::TestCase
tempfile = Tempfile.open("arrow-io-file-output-stream")
tempfile.write("Hello")
tempfile.close
file = ArrowIO::FileOutputStream.open(tempfile.path, false)
file = Arrow::IOFileOutputStream.open(tempfile.path, false)
file.close
assert_equal("", File.read(tempfile.path))
end
@@ -30,7 +30,7 @@ class TestIOFileOutputStream < Test::Unit::TestCase
tempfile = Tempfile.open("arrow-io-file-output-stream")
tempfile.write("Hello")
tempfile.close
file = ArrowIO::FileOutputStream.open(tempfile.path, true)
file = Arrow::IOFileOutputStream.open(tempfile.path, true)
file.close
assert_equal("Hello", File.read(tempfile.path))
end
c_glib/test/test-io-memory-mapped-file.rb
+10 -10
View File
@@ -20,7 +20,7 @@ class TestIOMemoryMappedFile < Test::Unit::TestCase
tempfile = Tempfile.open("arrow-io-memory-mapped-file")
tempfile.write("Hello")
tempfile.close
file = ArrowIO::MemoryMappedFile.open(tempfile.path, :read)
file = Arrow::IOMemoryMappedFile.open(tempfile.path, :read)
begin
buffer = " " * 5
file.read(buffer)
@@ -34,7 +34,7 @@ class TestIOMemoryMappedFile < Test::Unit::TestCase
tempfile = Tempfile.open("arrow-io-memory-mapped-file")
tempfile.write("Hello")
tempfile.close
file = ArrowIO::MemoryMappedFile.open(tempfile.path, :read)
file = Arrow::IOMemoryMappedFile.open(tempfile.path, :read)
begin
assert_equal(5, file.size)
ensure
@@ -46,7 +46,7 @@ class TestIOMemoryMappedFile < Test::Unit::TestCase
tempfile = Tempfile.open("arrow-io-memory-mapped-file")
tempfile.write("Hello World")
tempfile.close
file = ArrowIO::MemoryMappedFile.open(tempfile.path, :read)
file = Arrow::IOMemoryMappedFile.open(tempfile.path, :read)
begin
buffer = " " * 5
_success, n_read_bytes = file.read(buffer)
@@ -60,7 +60,7 @@ class TestIOMemoryMappedFile < Test::Unit::TestCase
tempfile = Tempfile.open("arrow-io-memory-mapped-file")
tempfile.write("Hello World")
tempfile.close
file = ArrowIO::MemoryMappedFile.open(tempfile.path, :read)
file = Arrow::IOMemoryMappedFile.open(tempfile.path, :read)
begin
buffer = " " * 5
_success, n_read_bytes = file.read_at(6, buffer)
@@ -74,7 +74,7 @@ class TestIOMemoryMappedFile < Test::Unit::TestCase
tempfile = Tempfile.open("arrow-io-memory-mapped-file")
tempfile.write("Hello")
tempfile.close
file = ArrowIO::MemoryMappedFile.open(tempfile.path, :readwrite)
file = Arrow::IOMemoryMappedFile.open(tempfile.path, :readwrite)
begin
file.write("World")
ensure
@@ -87,7 +87,7 @@ class TestIOMemoryMappedFile < Test::Unit::TestCase
tempfile = Tempfile.open("arrow-io-memory-mapped-file")
tempfile.write("Hello")
tempfile.close
file = ArrowIO::MemoryMappedFile.open(tempfile.path, :readwrite)
file = Arrow::IOMemoryMappedFile.open(tempfile.path, :readwrite)
begin
file.write_at(2, "rld")
ensure
@@ -100,7 +100,7 @@ class TestIOMemoryMappedFile < Test::Unit::TestCase
tempfile = Tempfile.open("arrow-io-memory-mapped-file")
tempfile.write("Hello")
tempfile.close
file = ArrowIO::MemoryMappedFile.open(tempfile.path, :readwrite)
file = Arrow::IOMemoryMappedFile.open(tempfile.path, :readwrite)
begin
file.write("World")
file.flush
@@ -114,7 +114,7 @@ class TestIOMemoryMappedFile < Test::Unit::TestCase
tempfile = Tempfile.open("arrow-io-memory-mapped-file")
tempfile.write("Hello World")
tempfile.close
file = ArrowIO::MemoryMappedFile.open(tempfile.path, :read)
file = Arrow::IOMemoryMappedFile.open(tempfile.path, :read)
begin
buffer = " " * 5
file.read(buffer)
@@ -128,9 +128,9 @@ class TestIOMemoryMappedFile < Test::Unit::TestCase
tempfile = Tempfile.open("arrow-io-memory-mapped-file")
tempfile.write("Hello World")
tempfile.close
file = ArrowIO::MemoryMappedFile.open(tempfile.path, :readwrite)
file = Arrow::IOMemoryMappedFile.open(tempfile.path, :readwrite)
begin
assert_equal(ArrowIO::FileMode::READWRITE, file.mode)
assert_equal(Arrow::IOFileMode::READWRITE, file.mode)
ensure
file.close
end
c_glib/test/test-ipc-file-writer.rb
+4 -4
View File
@@ -18,11 +18,11 @@
class TestIPCFileWriter < Test::Unit::TestCase
def test_write_record_batch
tempfile = Tempfile.open("arrow-ipc-file-writer")
output = ArrowIO::FileOutputStream.open(tempfile.path, false)
output = Arrow::IOFileOutputStream.open(tempfile.path, false)
begin
field = Arrow::Field.new("enabled", Arrow::BooleanDataType.new)
schema = Arrow::Schema.new([field])
file_writer = ArrowIPC::FileWriter.open(output, schema)
file_writer = Arrow::IPCFileWriter.open(output, schema)
begin
record_batch = Arrow::RecordBatch.new(schema, 0, [])
file_writer.write_record_batch(record_batch)
@@ -33,9 +33,9 @@ class TestIPCFileWriter < Test::Unit::TestCase
output.close
end
input = ArrowIO::MemoryMappedFile.open(tempfile.path, :read)
input = Arrow::IOMemoryMappedFile.open(tempfile.path, :read)
begin
file_reader = ArrowIPC::FileReader.open(input)
file_reader = Arrow::IPCFileReader.open(input)
assert_equal(["enabled"],
file_reader.schema.fields.collect(&:name))
ensure
c_glib/test/test-ipc-stream-writer.rb
+4 -4
View File
@@ -20,11 +20,11 @@ class TestIPCStreamWriter < Test::Unit::TestCase
def test_write_record_batch
tempfile = Tempfile.open("arrow-ipc-stream-writer")
output = ArrowIO::FileOutputStream.open(tempfile.path, false)
output = Arrow::IOFileOutputStream.open(tempfile.path, false)
begin
field = Arrow::Field.new("enabled", Arrow::BooleanDataType.new)
schema = Arrow::Schema.new([field])
stream_writer = ArrowIPC::StreamWriter.open(output, schema)
stream_writer = Arrow::IPCStreamWriter.open(output, schema)
begin
columns = [
build_boolean_array([true]),
@@ -38,9 +38,9 @@ class TestIPCStreamWriter < Test::Unit::TestCase
output.close
end
input = ArrowIO::MemoryMappedFile.open(tempfile.path, :read)
input = Arrow::IOMemoryMappedFile.open(tempfile.path, :read)
begin
stream_reader = ArrowIPC::StreamReader.open(input)
stream_reader = Arrow::IPCStreamReader.open(input)
assert_equal(["enabled"],
stream_reader.schema.fields.collect(&:name))
assert_equal(true,