revert changes to reader.cc

apache · Jul 11, 2019 · cf1c5be · cf1c5be
1 parent 5742db9
commit cf1c5be
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/cpp/src/arrow/ipc/reader.cc b/cpp/src/arrow/ipc/reader.cc
@@ -290,11 +290,12 @@ class ArrayLoader {
 
     RETURN_NOT_OK(LoadCommon());
     if (out_->length > 0) {
-      RETURN_NOT_OK(GetBuffer(context_->buffer_index++, &out_->buffers[1]));
+      RETURN_NOT_OK(GetBuffer(context_->buffer_index, &out_->buffers[1]));
       if (type.mode() == UnionMode::DENSE) {
-        RETURN_NOT_OK(GetBuffer(context_->buffer_index++, &out_->buffers[2]));
+        RETURN_NOT_OK(GetBuffer(context_->buffer_index + 1, &out_->buffers[2]));
       }
     }
+    context_->buffer_index += type.mode() == UnionMode::DENSE ? 2 : 1;
     return LoadChildren(type.children());
   }
 

diff --git a/python/pyarrow/tests/test_serialization.py b/python/pyarrow/tests/test_serialization.py
@@ -303,11 +303,13 @@ def custom_deserializer(serialized_obj):
 
 
 def test_primitive_serialization_notbroken(large_buffer):
-    serialization_roundtrip({(1,2): 2}, large_buffer)
+    serialization_roundtrip({(1, 2): 2}, large_buffer)
+
 
 def test_primitive_serialization_broken(large_buffer):
     serialization_roundtrip({(): 2}, large_buffer)
 
+
 def test_primitive_serialization(large_buffer):
     for obj in PRIMITIVE_OBJECTS:
         serialization_roundtrip(obj, large_buffer)