parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From w...@apache.org
Subject parquet-cpp git commit: PARQUET-1079: Remove Arrow offset shift unneeded after ARROW-1335
Date Tue, 08 Aug 2017 05:13:31 GMT
Repository: parquet-cpp
Updated Branches:
  refs/heads/master aa6a3c6e8 -> 25cda53f6


PARQUET-1079: Remove Arrow offset shift unneeded after ARROW-1335

cc @cpcloud @majetideepak to take a look. If this looks good, I will merge https://github.com/apache/arrow/pull/949,
then update the Arrow version hash in this PR to get a passing build, then merge this (unfortunately
Arrow builds will be broken for that brief window).

Author: Wes McKinney <wes.mckinney@twosigma.com>

Closes #381 from wesm/PARQUET-1079 and squashes the following commits:

9df41b7 [Wes McKinney] Update Arrow version
7f1b837 [Wes McKinney] Remove offset shift unneeded after ARROW-1335


Project: http://git-wip-us.apache.org/repos/asf/parquet-cpp/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-cpp/commit/25cda53f
Tree: http://git-wip-us.apache.org/repos/asf/parquet-cpp/tree/25cda53f
Diff: http://git-wip-us.apache.org/repos/asf/parquet-cpp/diff/25cda53f

Branch: refs/heads/master
Commit: 25cda53f627390a94589b1451083360a963ad788
Parents: aa6a3c6
Author: Wes McKinney <wes.mckinney@twosigma.com>
Authored: Tue Aug 8 01:13:27 2017 -0400
Committer: Wes McKinney <wes.mckinney@twosigma.com>
Committed: Tue Aug 8 01:13:27 2017 -0400

----------------------------------------------------------------------
 cmake_modules/ThirdpartyToolchain.cmake | 2 +-
 src/parquet/arrow/writer.cc             | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/25cda53f/cmake_modules/ThirdpartyToolchain.cmake
----------------------------------------------------------------------
diff --git a/cmake_modules/ThirdpartyToolchain.cmake b/cmake_modules/ThirdpartyToolchain.cmake
index 74e6603..b1ea10a 100644
--- a/cmake_modules/ThirdpartyToolchain.cmake
+++ b/cmake_modules/ThirdpartyToolchain.cmake
@@ -339,7 +339,7 @@ if (NOT ARROW_FOUND)
     -DARROW_BUILD_TESTS=OFF)
 
   if ("$ENV{PARQUET_ARROW_VERSION}" STREQUAL "")
-    set(ARROW_VERSION "aa5d417bbd32fcdf96462181791f6c044ab3215d")
+    set(ARROW_VERSION "939957f33ed0dd02013917b366ff85eb857c3947")
   else()
     set(ARROW_VERSION "$ENV{PARQUET_ARROW_VERSION}")
   endif()

http://git-wip-us.apache.org/repos/asf/parquet-cpp/blob/25cda53f/src/parquet/arrow/writer.cc
----------------------------------------------------------------------
diff --git a/src/parquet/arrow/writer.cc b/src/parquet/arrow/writer.cc
index b3ed7dc..076a4b7 100644
--- a/src/parquet/arrow/writer.cc
+++ b/src/parquet/arrow/writer.cc
@@ -339,12 +339,12 @@ Status FileWriter::Impl::TypedWriteBatch(ColumnWriter* column_writer,
     // no nulls, just dump the data
     RETURN_NOT_OK((WriteNonNullableBatch<ParquetType, ArrowType>(
         writer, static_cast<const ArrowType&>(*array->type()), array->length(),
-        num_levels, def_levels, rep_levels, data_ptr + data->offset())));
+        num_levels, def_levels, rep_levels, data_ptr)));
   } else {
     const uint8_t* valid_bits = data->null_bitmap_data();
     RETURN_NOT_OK((WriteNullableBatch<ParquetType, ArrowType>(
         writer, static_cast<const ArrowType&>(*array->type()), data->length(),
num_levels,
-        def_levels, rep_levels, valid_bits, data->offset(), data_ptr + data->offset())));
+        def_levels, rep_levels, valid_bits, data->offset(), data_ptr)));
   }
   PARQUET_CATCH_NOT_OK(writer->Close());
   return Status::OK();
@@ -602,7 +602,6 @@ Status FileWriter::Impl::WriteTimestampsCoerce(ColumnWriter* column_writer,
 
   const auto& data = static_cast<const ::arrow::TimestampArray&>(*array);
 
-  // TimestampArray::raw_values accounts for offset
   auto data_ptr = data.raw_values();
   auto writer = reinterpret_cast<TypedColumnWriter<Int64Type>*>(column_writer);
 


Mime
View raw message