rebase cleanup

bkietz · Nov 27, 2023 · b34ace5 · b34ace5
1 parent 591f163
commit b34ace5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 9 deletions.
diff --git a/cpp/src/arrow/array/util.cc b/cpp/src/arrow/array/util.cc
@@ -476,7 +476,11 @@ class NullArrayFactory {
   }
 
   Status Visit(const BinaryViewType&) {
-    out_->buffers.resize(2, *zero_buffer_);
+    if (presizing_zero_buffer_) {
+      ZeroBufferMustBeAtLeast(sizeof(BinaryViewType::c_type) * length_);
+      return Status::OK();
+    }
+    out_->buffers = {GetValidityBitmap(), *zero_buffer_};
     return Status::OK();
   }
 

diff --git a/cpp/src/arrow/array/validate.cc b/cpp/src/arrow/array/validate.cc
@@ -759,14 +759,9 @@ struct ValidateArrayImpl {
 
   template <typename ListViewType>
   Status ValidateListView(const ListViewType& type) {
-    const ArrayData& values = *data.child_data[0];
-    const Status child_valid = RecurseInto(values);
-    if (!child_valid.ok()) {
-      return Status::Invalid("List-view child array is invalid: ",
-                             child_valid.ToString());
-    }
+    RETURN_NOT_OK(RecurseIntoField(0, "List-view child array"));
     // For list-views, sizes are validated together with offsets.
-    return ValidateOffsetsAndSizes(type, /*offset_limit=*/values.length);
+    return ValidateOffsetsAndSizes(type, /*offset_limit=*/data.child_data[0]->length);
   }
 
   template <typename RunEndCType>

diff --git a/cpp/submodules/parquet-testing b/cpp/submodules/parquet-testing
+99 −2		data/README.md
+ −		data/concatenated_gzip_members.parquet
+ −		data/float16_nonzeros_and_nans.parquet
+ −		data/float16_zeros_and_nans.parquet