Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 11 additions & 2 deletions src/simdjson_arrow.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -634,12 +634,21 @@ class ndjson_parser {
break;
}
case type::utf8: {
// Unescape straight into the column: the string is no longer than its
// token, and the unescaper may write up to SIMDJSON_PADDING bytes past it.
const size_t bound = value.raw_json_token().size();
sj::raw_json_string raw;
if (simdjson_unlikely(value.get_raw_json_string().get(raw))) return parse_other(c, value);
c.chars.reserve(bound + simdjson::SIMDJSON_PADDING);
uint8_t* end = c.chars.data() + c.chars.size();
std::string_view s;
if (simdjson_unlikely(value.get_string().get(s))) return parse_other(c, value);
if (simdjson_unlikely(parser_.unescape(raw, end).get(s))) {
return fail(c, "invalid JSON value");
}
if (simdjson_unlikely(c.chars.size() + s.size() > static_cast<size_t>(INT32_MAX))) {
return fail(c, "more than 2 GB of strings in one batch: use a smaller block_size");
}
c.chars.append(s.data(), s.size());
c.chars.advance(s.size());
c.values.push<int32_t>(static_cast<int32_t>(c.chars.size()));
break;
}
Expand Down
Loading