Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Ignore byte_range in read_json when the size is not smaller than the input data #15180

Merged
merged 5 commits into from
Mar 5, 2024
Merged

Ignore byte_range in read_json when the size is not smaller than the input data #15180

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
25b5692
load whole source when range size too big
vuule Feb 28, 2024
6a42feb
Merge branch 'branch-24.04' into bug-json-load-whole-file
vuule Feb 28, 2024
15f7054
Merge branch 'branch-24.04' into bug-json-load-whole-file
vuule Feb 29, 2024
5eacd55
Merge branch 'branch-24.04' into bug-json-load-whole-file
vuule Mar 1, 2024
b468820
Merge branch 'branch-24.04' into bug-json-load-whole-file
vuule Mar 5, 2024
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
11 changes: 6 additions & 5 deletions cpp/src/io/json/read_json.cu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,10 +140,11 @@ size_type find_first_delimiter_in_chunk(host_span<std::unique_ptr<cudf::io::data
return find_first_delimiter(buffer, delimiter, stream);
}

bool should_load_whole_source(json_reader_options const& reader_opts)
bool should_load_whole_source(json_reader_options const& opts, size_t source_size)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason this shouldn't be const?

Suggested change
bool should_load_whole_source(json_reader_options const& opts, size_t source_size)
bool should_load_whole_source(json_reader_options const& opts, size_t const source_size)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We don't usually mark parameters passed by value as const, since it does not impact the caller in any way.

{
return reader_opts.get_byte_range_offset() == 0 and //
reader_opts.get_byte_range_size() == 0;
auto const range_offset = opts.get_byte_range_offset();
auto const range_size = opts.get_byte_range_size();
return range_offset == 0 and (range_size == 0 or range_size >= source_size);
}

/**
Expand All @@ -168,7 +169,7 @@ auto get_record_range_raw_input(host_span<std::unique_ptr<datasource>> sources,
reader_opts.get_byte_range_offset(),
reader_opts.get_byte_range_size(),
stream);
if (should_load_whole_source(reader_opts)) return buffer;
if (should_load_whole_source(reader_opts, sources[0]->size())) return buffer;
auto first_delim_pos =
reader_opts.get_byte_range_offset() == 0 ? 0 : find_first_delimiter(buffer, '\n', stream);
if (first_delim_pos == -1) {
Expand Down Expand Up @@ -212,7 +213,7 @@ table_with_metadata read_json(host_span<std::unique_ptr<datasource>> sources,
return legacy::read_json(sources, reader_opts, stream, mr);
}

if (not should_load_whole_source(reader_opts)) {
if (reader_opts.get_byte_range_offset() != 0 or reader_opts.get_byte_range_size() != 0) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we not need a range_size < source_size check here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

In that case we would allow users to pass giant byte_range when reading non-JSONLines files. I'm not sure this is something we want to do, since failing with byte_range + no JSONLines would become less obvious ("but it works sometimes!").
The change here keeps the original behavior.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Makes sense, thanks for clarifying!

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

should_load_whole_source changed meaning from "is byte_range used" to "does byte_range have any impact" but the name stayed the same, so I understand the confusion.

CUDF_EXPECTS(reader_opts.is_enabled_lines(),
"Specifying a byte range is supported only for JSON Lines");
CUDF_EXPECTS(sources.size() == 1,
Expand Down
Loading