Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
a7344a8
Stage 1 of cutting away Column
wesm Jul 9, 2019
93e3cad
arrow-tests all passing again
wesm Jul 9, 2019
c161a9a
Fix up Parquet, too
wesm Jul 9, 2019
f0d48cc
Adapt Python bindings [skip ci]
wesm Jul 10, 2019
fcaaf8c
Add pyarrow.ChunkedArray.flatten method. Remove Column from glib, but
wesm Jul 10, 2019
ac6f372
Remove use of arrow::Column from feather_reader.cc. Remove use of dep…
kevingurney Jul 10, 2019
795b6c1
[GLib] Follow arrow::Column remove
kou Jul 11, 2019
179aa67
[GLib] Use "column_data" instead of "column"
kou Jul 13, 2019
c4ff972
[GLib] Remove backward compatible column API from GArrowRecordBatch
kou Jul 14, 2019
60dfb0c
[GLib] Add garrow_schema_get_field_index()
kou Jul 14, 2019
fb5ad1c
[GLib] Add garrow_chunked_array_get_n_rows() for consistency
kou Jul 14, 2019
335d7b6
[Ruby] Implement Arrow::Column in Ruby
kou Jul 14, 2019
bd6002a
[GLib] Remove entries
kou Jul 14, 2019
0090051
[GLib] Add API index for 1.0.0
kou Jul 14, 2019
62f3649
[C++] Remove unused lambda captures
kou Jul 14, 2019
f120a7d
[C++] Suppress a warning with MSVC
kou Jul 14, 2019
41dd1fe
[GLib] Revert needless style change
kou Jul 14, 2019
f092f1b
[GLib] Add missing available annotations
kou Jul 14, 2019
3099328
[GLib][Lua] Follow API change
kou Jul 14, 2019
983d378
[C++] Follow API change
kou Jul 14, 2019
d89366a
[GLib][Lua] Follow API change
kou Jul 14, 2019
d30a365
[C++] Remove unused variable
kou Jul 14, 2019
244d2a7
Begin refactoring R library. Change Feather to return ChunkedArray from
wesm Jul 16, 2019
fd4473e
Fix up R C++ code and unit tests
wesm Jul 16, 2019
020f52a
Re-render R README
wesm Jul 16, 2019
2c7c51e
code review comments
wesm Jul 16, 2019
a5ee7b6
Fix MATLAB code (I hope)
wesm Jul 16, 2019
9b5a61e
Try to fix unicode issue
wesm Jul 16, 2019
4be8d5a
UTF-8 py2/3 compatibility issues
wesm Jul 16, 2019
cc34548
Fix non-deterministic Table.from_pydict behavior. Add unicode/utf8 te…
wesm Jul 17, 2019
b389d42
Fix up Python/C++ docs to remove references to arrow::Column
wesm Jul 17, 2019
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions c_glib/arrow-glib/Makefile.am
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,6 @@ libarrow_glib_la_headers = \
buffer.h \
chunked-array.h \
codec.h \
column.h \
composite-array.h \
composite-data-type.h \
data-type.h \
Expand Down Expand Up @@ -107,7 +106,6 @@ libarrow_glib_la_sources = \
buffer.cpp \
chunked-array.cpp \
codec.cpp \
column.cpp \
composite-array.cpp \
composite-data-type.cpp \
decimal128.cpp \
Expand Down Expand Up @@ -153,7 +151,6 @@ libarrow_glib_la_cpp_headers = \
buffer.hpp \
chunked-array.hpp \
codec.hpp \
column.hpp \
data-type.hpp \
decimal128.hpp \
error.hpp \
Expand Down Expand Up @@ -187,9 +184,13 @@ libarrow_glib_la_cpp_headers += \
orc-file-reader.hpp
endif

libarrow_glib_la_cpp_internal_headers = \
internal-index.hpp

libarrow_glib_la_SOURCES = \
$(libarrow_glib_la_sources) \
$(libarrow_glib_la_cpp_headers)
$(libarrow_glib_la_cpp_headers) \
$(libarrow_glib_la_cpp_internal_headers)

BUILT_SOURCES = \
$(libarrow_glib_la_genearted_headers) \
Expand Down
1 change: 0 additions & 1 deletion c_glib/arrow-glib/arrow-glib.h
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include <arrow-glib/array-builder.h>
#include <arrow-glib/chunked-array.h>
#include <arrow-glib/codec.h>
#include <arrow-glib/column.h>
#include <arrow-glib/compute.h>
#include <arrow-glib/data-type.h>
#include <arrow-glib/enums.h>
Expand Down
1 change: 0 additions & 1 deletion c_glib/arrow-glib/arrow-glib.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@
#include <arrow-glib/buffer.hpp>
#include <arrow-glib/chunked-array.hpp>
#include <arrow-glib/codec.hpp>
#include <arrow-glib/column.hpp>
#include <arrow-glib/data-type.hpp>
#include <arrow-glib/error.hpp>
#include <arrow-glib/field.hpp>
Expand Down
16 changes: 16 additions & 0 deletions c_glib/arrow-glib/chunked-array.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -206,9 +206,25 @@ garrow_chunked_array_get_value_type(GArrowChunkedArray *chunked_array)
* @chunked_array: A #GArrowChunkedArray.
*
* Returns: The total number of rows in the chunked array.
*
* Deprecated: 1.0.0: Use garrow_chunked_array_get_n_rows() instead.
*/
guint64
garrow_chunked_array_get_length(GArrowChunkedArray *chunked_array)
{
return garrow_chunked_array_get_n_rows(chunked_array);
}

/**
* garrow_chunked_array_get_n_rows:
* @chunked_array: A #GArrowChunkedArray.
*
* Returns: The total number of rows in the chunked array.
*
* Since: 1.0.0
*/
guint64
garrow_chunked_array_get_n_rows(GArrowChunkedArray *chunked_array)
{
const auto arrow_chunked_array = garrow_chunked_array_get_raw(chunked_array);
return arrow_chunked_array->length();
Expand Down
3 changes: 3 additions & 0 deletions c_glib/arrow-glib/chunked-array.h
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,10 @@ garrow_chunked_array_get_value_data_type(GArrowChunkedArray *chunked_array);
GArrowType
garrow_chunked_array_get_value_type(GArrowChunkedArray *chunked_array);

GARROW_DEPRECATED_IN_1_0_FOR(garrow_chunked_array_get_n_rows)
guint64 garrow_chunked_array_get_length (GArrowChunkedArray *chunked_array);
GARROW_AVAILABLE_IN_1_0
guint64 garrow_chunked_array_get_n_rows (GArrowChunkedArray *chunked_array);
guint64 garrow_chunked_array_get_n_nulls(GArrowChunkedArray *chunked_array);
guint garrow_chunked_array_get_n_chunks (GArrowChunkedArray *chunked_array);

Expand Down
Loading