diff --git a/cpp/src/arrow/json/chunker.cc b/cpp/src/arrow/json/chunker.cc index c1397ba876c..a5528c3df96 100644 --- a/cpp/src/arrow/json/chunker.cc +++ b/cpp/src/arrow/json/chunker.cc @@ -101,6 +101,10 @@ class ParsingBoundaryFinder : public BoundaryFinder { auto data = buffer_->mutable_data(); std::memcpy(data, partial.data(), partial.size()); std::memcpy(data + partial.size(), block.data(), block.size()); + // simdjson >= 5.2.0 may look at bytes past the input when it delimits documents + // (simdjson/simdjson#3031), so stale padding contents could change where + // documents are cut. Zero the padding to make this deterministic. + std::memset(data + data_size, 0, simdjson::SIMDJSON_PADDING); auto view = simdjson::padded_string_view(data, /*len=*/data_size, /*capacity=*/buffer_->capacity()); DCHECK(view.has_sufficient_padding()); diff --git a/cpp/src/arrow/json/parser.cc b/cpp/src/arrow/json/parser.cc index 08d83f0c67f..bc5543d6f30 100644 --- a/cpp/src/arrow/json/parser.cc +++ b/cpp/src/arrow/json/parser.cc @@ -945,8 +945,9 @@ class ParseImpl : public BlockParser { RETURN_NOT_OK(struct_builder->Append()); ARROW_ASSIGN_OR_RAISE( - auto object, arrow::internal::ResolveSimdjsonResult(value.get_object(), - "Failed to get JSON object")); + auto object, + arrow::internal::ResolveSimdjsonResult( + value.get_object(), "JSON parse error: Failed to get JSON object")); for (auto field_result : object) { ARROW_ASSIGN_OR_RAISE(auto field, @@ -954,9 +955,10 @@ class ParseImpl : public BlockParser { std::move(field_result), "JSON parse error: Failed to iterate JSON object")); - ARROW_ASSIGN_OR_RAISE(auto key, - arrow::internal::ResolveSimdjsonResult( - field.unescaped_key(), "Failed to get JSON object key")); + ARROW_ASSIGN_OR_RAISE( + auto key, + arrow::internal::ResolveSimdjsonResult( + field.unescaped_key(), "JSON parse error: Failed to get JSON object key")); RETURN_NOT_OK(ParseObjectField(key, field.value())); }