Fix deprecated API use

Change-Id: I47f93c7d8561b83414ab34f709fec66a6eb462d2
This commit is contained in:
Wes McKinney committed 2018-12-14 13:01:34 -06:00
1 parent 5fdbbb2613
commit 3669201bec
5 files changed
+15 -10

No files matched your search

+1 -1
View File
@@ -22,7 +22,7 @@ target_include_directories(parquet-low-level-example2 PRIVATE low-level-api/)
target_link_libraries(parquet-low-level-example parquet_static)
target_link_libraries(parquet-low-level-example2 parquet_static)
add_executable(parquet-arrow-example parquet-arrow/src/reader-writer.cc)
add_executable(parquet-arrow-example parquet-arrow/reader-writer.cc)
target_link_libraries(parquet-arrow-example parquet_shared)
add_dependencies(parquet
@@ -38,5 +38,5 @@ find_package(Parquet)
include_directories(SYSTEM ${ARROW_INCLUDE_DIR} ${PARQUET_INCLUDE_DIR})
add_executable(parquet-arrow-example src/reader-writer.cc)
add_executable(parquet-arrow-example reader-writer.cc)
target_link_libraries(parquet-arrow-example ${PARQUET_SHARED_LIB} ${ARROW_SHARED_LIB})
@@ -100,7 +100,7 @@ void read_single_column() {
std::unique_ptr<parquet::arrow::FileReader> reader;
PARQUET_THROW_NOT_OK(
parquet::arrow::OpenFile(infile, arrow::default_memory_pool(), &reader));
std::shared_ptr<arrow::Array> array;
std::shared_ptr<arrow::ChunkedArray> array;
PARQUET_THROW_NOT_OK(reader->ReadColumn(0, &array));
PARQUET_THROW_NOT_OK(arrow::PrettyPrint(*array, 4, &std::cout));
std::cout << std::endl;
@@ -119,7 +119,7 @@ void read_single_column_chunk() {
std::unique_ptr<parquet::arrow::FileReader> reader;
PARQUET_THROW_NOT_OK(
parquet::arrow::OpenFile(infile, arrow::default_memory_pool(), &reader));
std::shared_ptr<arrow::Array> array;
std::shared_ptr<arrow::ChunkedArray> array;
PARQUET_THROW_NOT_OK(reader->RowGroup(0)->Column(0)->Read(&array));
PARQUET_THROW_NOT_OK(arrow::PrettyPrint(*array, 4, &std::cout));
std::cout << std::endl;
+1 -1
View File
@@ -340,7 +340,7 @@ TEST_F(TestPrettyPrint, DictionaryType) {
TEST_F(TestPrettyPrint, ChunkedArrayPrimitiveType) {
auto array = ArrayFromJSON(int32(), "[0, 1, null, 3, null]");
ChunkedArray chunked_array({array});
ChunkedArray chunked_array(array);
static const char* expected = R"expected([
[
@@ -464,7 +464,11 @@ class TestParquetIO : public ::testing::Test {
ASSERT_OK_NO_THROW(file_reader->GetColumn(0, &column_reader));
ASSERT_NE(nullptr, column_reader.get());
ASSERT_OK(column_reader->NextBatch(SMALL_SIZE, out));
std::shared_ptr<ChunkedArray> chunked_out;
ASSERT_OK(column_reader->NextBatch(SMALL_SIZE, &chunked_out));
ASSERT_EQ(1, chunked_out->num_chunks());
*out = chunked_out->chunk(0);
ASSERT_NE(nullptr, out->get());
}
@@ -1745,10 +1749,11 @@ TEST(TestArrowReadWrite, ListLargeRecords) {
std::vector<std::shared_ptr<Array>> pieces;
for (int i = 0; i < num_rows; ++i) {
std::shared_ptr<Array> piece;
ASSERT_OK(col_reader->NextBatch(1, &piece));
ASSERT_EQ(1, piece->length());
pieces.push_back(piece);
std::shared_ptr<ChunkedArray> chunked_piece;
ASSERT_OK(col_reader->NextBatch(1, &chunked_piece));
ASSERT_EQ(1, chunked_piece->length());
ASSERT_EQ(1, chunked_piece->num_chunks());
pieces.push_back(chunked_piece->chunk(0));
}
auto chunked = std::make_shared<::arrow::ChunkedArray>(pieces);