Skip to content

Commit 3233ef3

Browse files
committed
Minor - Fixing to_text bucketing
1 parent 2c549ca commit 3233ef3

File tree

4 files changed

+4
-4
lines changed

4 files changed

+4
-4
lines changed

awswrangler/s3/_write_parquet.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,14 +143,14 @@ def _to_parquet(
143143
index: bool,
144144
compression: Optional[str],
145145
compression_ext: str,
146-
filename_prefix: str,
147146
cpus: int,
148147
dtype: Dict[str, str],
149148
boto3_session: Optional[boto3.Session],
150149
s3_additional_kwargs: Optional[Dict[str, str]],
151150
use_threads: bool,
152151
path: Optional[str] = None,
153152
path_root: Optional[str] = None,
153+
filename_prefix: Optional[str] = uuid.uuid4().hex,
154154
max_rows_by_file: Optional[int] = 0,
155155
) -> List[str]:
156156
if path is None and path_root is not None:
@@ -538,7 +538,6 @@ def to_parquet( # pylint: disable=too-many-arguments,too-many-locals
538538
df=df,
539539
path=path,
540540
schema=schema,
541-
filename_prefix=filename_prefix,
542541
index=index,
543542
cpus=cpus,
544543
compression=compression,

awswrangler/s3/_write_text.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,12 @@ def _to_text(
3737
s3_additional_kwargs: Optional[Dict[str, str]],
3838
path: Optional[str] = None,
3939
path_root: Optional[str] = None,
40-
filename_prefix: Optional[str] = None,
40+
filename_prefix: Optional[str] = uuid.uuid4().hex,
4141
**pandas_kwargs: Any,
4242
) -> List[str]:
4343
if df.empty is True:
4444
raise exceptions.EmptyDataFrame()
4545
if path is None and path_root is not None:
46-
filename_prefix = filename_prefix + uuid.uuid4().hex if filename_prefix else uuid.uuid4().hex
4746
file_path: str = (
4847
f"{path_root}{filename_prefix}.{file_format}{_COMPRESSION_2_EXT.get(pandas_kwargs.get('compression'))}"
4948
)

tests/test_s3_parquet.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -232,6 +232,7 @@ def test_to_parquet_filename_prefix(compare_filename_prefix, path, filename_pref
232232
use_threads=use_threads,
233233
)["paths"][0].split("/")[-1]
234234
compare_filename_prefix(filename, filename_prefix, test_prefix)
235+
assert filename.endswith("bucket-00000.snappy.parquet")
235236

236237

237238
def test_read_parquet_map_types(path):

tests/test_s3_text.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ def test_to_text_filename_prefix(compare_filename_prefix, path, filename_prefix,
173173
use_threads=use_threads,
174174
)["paths"][0].split("/")[-1]
175175
compare_filename_prefix(filename, filename_prefix, test_prefix)
176+
assert filename.endswith("bucket-00000.csv")
176177

177178

178179
def test_fwf(path):

0 commit comments

Comments
 (0)