parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject [parquet-cpp] branch master updated: PARQUET-1175: Fix arrow::ArrayData method rename from ShallowCopy to Copy
Date Mon, 11 Dec 2017 20:20:41 GMT
This is an automated email from the ASF dual-hosted git repository.

wesm pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/parquet-cpp.git


The following commit(s) were added to refs/heads/master by this push:
     new 09927ae  PARQUET-1175: Fix arrow::ArrayData method rename from ShallowCopy to Copy
09927ae is described below

commit 09927aec69eaa9ef65a3e5f76e4f0d3c662196cc
Author: Wes McKinney <wes.mckinney@twosigma.com>
AuthorDate: Mon Dec 11 15:20:37 2017 -0500

    PARQUET-1175: Fix arrow::ArrayData method rename from ShallowCopy to Copy
    
    Author: Wes McKinney <wes.mckinney@twosigma.com>
    
    Closes #423 from wesm/PARQUET-1175 and squashes the following commits:
    
    675ed33 [Wes McKinney] Bump Arrow version to master
    9a1e53f [Wes McKinney] Fix arrow::ArrayData method rename from ShallowCopy to Copy
---
 cmake_modules/ThirdpartyToolchain.cmake | 2 +-
 src/parquet/arrow/reader.cc             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
index 13ece43..52ab7a8 100644
--- a/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cmake_modules/ThirdpartyToolchain.cmake
@@ -366,7 +366,7 @@ if (NOT ARROW_FOUND)
     -DARROW_BUILD_TESTS=OFF)
 
   if ("$ENV{PARQUET_ARROW_VERSION}" STREQUAL "")
-    set(ARROW_VERSION "fc4e2c36d2c56a8bd5d1ab17eeb406826924d3e5")
+    set(ARROW_VERSION "501d60e918bd4d10c429ab34e0b8e8a87dffb732")
   else()
     set(ARROW_VERSION "$ENV{PARQUET_ARROW_VERSION}")
   endif()
diff --git a/src/parquet/arrow/reader.cc b/src/parquet/arrow/reader.cc
index e13a094..dd60d29 100644
--- a/src/parquet/arrow/reader.cc
+++ b/src/parquet/arrow/reader.cc
@@ -868,7 +868,7 @@ struct TransferFunctor<
 
     if (type->id() == ::arrow::Type::STRING) {
       // Convert from BINARY type to STRING
-      auto new_data = (*out)->data()->ShallowCopy();
+      auto new_data = (*out)->data()->Copy();
       new_data->type = type;
       *out = ::arrow::MakeArray(new_data);
     }

-- 
To stop receiving notification emails like this one, please contact
['"commits@parquet.apache.org" <commits@parquet.apache.org>'].

Mime
View raw message