Skip to content
This repository was archived by the owner on May 10, 2024. It is now read-only.

PARQUET-1104: Upgrade to Apache Arrow 0.7.0 RC0 #397

Closed
wesm wants to merge 4 commits into from
Closed

PARQUET-1104: Upgrade to Apache Arrow 0.7.0 RC0 #397

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7cd9702
Upgrade to Apache Arrow 0.7.0 RC0
wesm Sep 13, 2017
3cab00d
Change MutableBuffer to Buffer to account for deprecation in ARROW-1402
wesm Aug 29, 2017
005ee74
Account for internal API change in ARROW-1511
wesm Sep 11, 2017
4106c5b
Include boost_system in static toolchain until ARROW-1536 resolved
wesm Sep 13, 2017
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
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,8 @@ Check [Windows developer guide][1] for instructions to build parquet-cpp on Wind

## Third Party Dependencies

- Apache Arrow (memory management, compression, IO, optional columnar data adapters)
- Apache Arrow >= 0.7.0 (memory management, compression, IO, optional columnar
data adapters)
- Thrift 0.7+ [install instructions](https://thrift.apache.org/docs/install/)
- googletest 1.7.0 (cannot be installed with package managers)
- Google Benchmark (only required if building benchmarks)
Expand Down
2 changes: 1 addition & 1 deletion cmake_modules/ThirdpartyToolchain.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@ if (NOT ARROW_FOUND)
-DARROW_BUILD_TESTS=OFF)

if ("$ENV{PARQUET_ARROW_VERSION}" STREQUAL "")
set(ARROW_VERSION "939957f33ed0dd02013917b366ff85eb857c3947")
set(ARROW_VERSION "97f9029ce835dfc2655ca91b9820a2e6aed89107")
else()
set(ARROW_VERSION "$ENV{PARQUET_ARROW_VERSION}")
endif()
Expand Down
8 changes: 4 additions & 4 deletions src/parquet/arrow/reader.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,7 +334,7 @@ class PARQUET_NO_EXPORT StructImpl : public ColumnReader::Impl {
std::shared_ptr<Field> field_;
PoolBuffer def_levels_buffer_;

Status DefLevelsToNullArray(std::shared_ptr<MutableBuffer>* null_bitmap,
Status DefLevelsToNullArray(std::shared_ptr<Buffer>* null_bitmap,
int64_t* null_count);
void InitField(const NodePtr& node, const std::vector<std::shared_ptr<Impl>>& children);
};
Expand Down Expand Up @@ -1376,9 +1376,9 @@ Status ColumnReader::NextBatch(int batch_size, std::shared_ptr<Array>* out) {

// StructImpl methods

Status StructImpl::DefLevelsToNullArray(std::shared_ptr<MutableBuffer>* null_bitmap_out,
Status StructImpl::DefLevelsToNullArray(std::shared_ptr<Buffer>* null_bitmap_out,
int64_t* null_count_out) {
std::shared_ptr<MutableBuffer> null_bitmap;
std::shared_ptr<Buffer> null_bitmap;
auto null_count = 0;
ValueLevelsPtr def_levels_data;
size_t def_levels_length;
Expand Down Expand Up @@ -1460,7 +1460,7 @@ Status StructImpl::GetRepLevels(ValueLevelsPtr* data, size_t* length) {

Status StructImpl::NextBatch(int batch_size, std::shared_ptr<Array>* out) {
std::vector<std::shared_ptr<Array>> children_arrays;
std::shared_ptr<MutableBuffer> null_bitmap;
std::shared_ptr<Buffer> null_bitmap;
int64_t null_count;

// Gather children arrays and def levels
Expand Down