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.

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

[REVIEW] Drop force_nullable_schema from chunked parquet writer #12996

Merged
Merged
Show file tree
Hide file tree
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
23 changes: 6 additions & 17 deletions python/cudf/cudf/_lib/parquet.pyx
Original file line number Diff line number Diff line change
Expand Up @@ -470,16 +470,6 @@ cdef class ParquetWriter:
max_page_size_rows: int, default 20000
Maximum number of rows of each page of the output.
By default, 20000 will be used.
force_nullable_schema : bool, default True.
If True, writes all columns as `null` in schema.
If False, columns are written as `null` if they contain null values,
otherwise as `not null`.
Notes
-----
`DataFrame.to_parquet` and `ParquetWriter` differ in the default
value for `force_nullable_schema` to enable all the chunks being
written by chunked parquet writer to be schema identical.
See Also
--------
Expand All @@ -497,15 +487,13 @@ cdef class ParquetWriter:
cdef size_type row_group_size_rows
cdef size_t max_page_size_bytes
cdef size_type max_page_size_rows
cdef bool force_nullable_schema

def __cinit__(self, object filepath_or_buffer, object index=None,
object compression="snappy", str statistics="ROWGROUP",
int row_group_size_bytes=_ROW_GROUP_SIZE_BYTES_DEFAULT,
int row_group_size_rows=1000000,
int max_page_size_bytes=524288,
int max_page_size_rows=20000,
bool force_nullable_schema=True):
int max_page_size_rows=20000):
filepaths_or_buffers = (
list(filepath_or_buffer)
if is_list_like(filepath_or_buffer)
Expand All @@ -520,7 +508,6 @@ cdef class ParquetWriter:
self.row_group_size_rows = row_group_size_rows
self.max_page_size_bytes = max_page_size_bytes
self.max_page_size_rows = max_page_size_rows
self.force_nullable_schema = force_nullable_schema

def write_table(self, table, object partitions_info=None):
""" Writes a single table to the file """
Expand Down Expand Up @@ -615,7 +602,6 @@ cdef class ParquetWriter:
_set_col_metadata(
table[name]._column,
self.tbl_meta.get().column_metadata[i],
self.force_nullable_schema
)

index = (
Expand Down Expand Up @@ -696,9 +682,12 @@ cdef cudf_io_types.compression_type _get_comp_type(object compression):
cdef _set_col_metadata(
Column col,
column_in_metadata& col_meta,
bool force_nullable_schema
bool force_nullable_schema=False,
):
col_meta.set_nullability(force_nullable_schema or col.nullable)
if force_nullable_schema:
# Only set nullability if `force_nullable_schema`
# is true.
col_meta.set_nullability(True)

if is_struct_dtype(col):
for i, (child_col, name) in enumerate(
Expand Down
20 changes: 0 additions & 20 deletions python/cudf/cudf/tests/test_parquet.py
Original file line number Diff line number Diff line change
Expand Up @@ -2788,23 +2788,3 @@ def test_parquet_writer_schema_nullability(data, force_nullable_schema):
assert pa.parquet.read_schema(file_obj).field(0).nullable == (
force_nullable_schema or df.isnull().any().any()
)


@pytest.mark.parametrize("data", [{"a": [1, 2, 3, 4]}, {"b": [1, None, 2, 3]}])
@pytest.mark.parametrize("force_nullable_schema", [True, False])
def test_parquet_chunked_writer_schema_nullability(
data, force_nullable_schema
):
df = cudf.DataFrame(data)
file_obj = BytesIO()

writer = ParquetWriter(
file_obj, force_nullable_schema=force_nullable_schema
)

writer.write_table(df)

writer.close()
assert pa.parquet.read_schema(file_obj).field(0).nullable == (
force_nullable_schema or df.isnull().any().any()
)