Skip to content

Inverting file format and file compression extensions (key prefix) #106

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

Merged
merged 1 commit into from
Jan 8, 2020
Merged

Inverting file format and file compression extensions (key prefix) #106

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
34 changes: 17 additions & 17 deletions awswrangler/pandas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -682,7 +682,7 @@ def to_csv(self,
"""
if serde not in Pandas.VALID_CSV_SERDES:
raise InvalidSerDe(f"{serde} in not in the valid SerDe list ({Pandas.VALID_CSV_SERDES})")
extra_args = {"sep": sep, "serde": serde, "escapechar": escapechar}
extra_args: Dict[str, Optional[str]] = {"sep": sep, "serde": serde, "escapechar": escapechar}
return self.to_s3(dataframe=dataframe,
path=path,
file_format="csv",
Expand Down Expand Up @@ -767,7 +767,7 @@ def to_s3(self,
procs_cpu_bound=None,
procs_io_bound=None,
cast_columns=None,
extra_args=None,
extra_args: Optional[Dict[str, Optional[str]]] = None,
inplace: bool = True,
description: Optional[str] = None,
parameters: Optional[Dict[str, str]] = None,
Expand Down Expand Up @@ -922,7 +922,7 @@ def _data_to_s3_dataset_writer(dataframe: pd.DataFrame,
session_primitives: "SessionPrimitives",
file_format: str,
cast_columns=None,
extra_args=None,
extra_args: Optional[Dict[str, Optional[str]]] = None,
isolated_dataframe: bool = False):
objects_paths = []
dataframe = Pandas._cast_pandas(dataframe=dataframe, cast_columns=cast_columns)
Expand Down Expand Up @@ -980,7 +980,7 @@ def _data_to_s3_dataset_writer_remote(send_pipe,
session_primitives: "SessionPrimitives",
file_format,
cast_columns=None,
extra_args=None):
extra_args: Optional[Dict[str, Optional[str]]] = None):
send_pipe.send(
Pandas._data_to_s3_dataset_writer(dataframe=dataframe,
path=path,
Expand All @@ -996,35 +996,35 @@ def _data_to_s3_dataset_writer_remote(send_pipe,

@staticmethod
def _data_to_s3_object_writer(dataframe: pd.DataFrame,
path: "str",
path: str,
preserve_index: bool,
compression,
compression: str,
session_primitives: "SessionPrimitives",
file_format,
cast_columns=None,
extra_args=None,
isolated_dataframe=False):
file_format: str,
cast_columns: Optional[List[str]] = None,
extra_args: Optional[Dict[str, Optional[str]]] = None,
isolated_dataframe=False) -> str:
fs = get_fs(session_primitives=session_primitives)
fs = pa.filesystem._ensure_filesystem(fs)
mkdir_if_not_exists(fs, path)

if compression is None:
compression_end = ""
compression_extension: str = ""
elif compression == "snappy":
compression_end = ".snappy"
compression_extension = ".snappy"
elif compression == "gzip":
compression_end = ".gz"
compression_extension = ".gz"
else:
raise InvalidCompression(compression)

guid = pa.compat.guid()
guid: str = pa.compat.guid()
if file_format == "parquet":
outfile = f"{guid}.parquet{compression_end}"
outfile: str = f"{guid}{compression_extension}.parquet"
elif file_format == "csv":
outfile = f"{guid}.csv{compression_end}"
outfile = f"{guid}{compression_extension}.csv"
else:
raise UnsupportedFileFormat(file_format)
object_path = "/".join([path, outfile])
object_path: str = "/".join([path, outfile])
if file_format == "parquet":
Pandas.write_parquet_dataframe(dataframe=dataframe,
path=object_path,
Expand Down
15 changes: 12 additions & 3 deletions testing/test_awswrangler/test_pandas.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1927,7 +1927,12 @@ def test_aurora_postgres_load_special(bucket, postgres_parameters):
"value": ["foo", "boo", "bar", "abc"],
"slashes": ["\\", "\"", "\\\\\\\\", "\"\"\"\""],
"floats": [1.0, 2.0, 3.0, 4.0],
"decimals": [Decimal((0, (1, 9, 9), -2)), Decimal((0, (1, 9, 9), -2)), Decimal((0, (1, 9, 0), -2)), Decimal((0, (3, 1, 2), -2))]
"decimals": [
Decimal((0, (1, 9, 9), -2)),
Decimal((0, (1, 9, 9), -2)),
Decimal((0, (1, 9, 0), -2)),
Decimal((0, (3, 1, 2), -2))
]
})

path = f"s3://{bucket}/test_aurora_postgres_special"
Expand Down Expand Up @@ -1977,8 +1982,12 @@ def test_aurora_mysql_load_special(bucket, mysql_parameters):
"value": ["foo", "boo", "bar", "abc"],
"slashes": ["\\", "\"", "\\\\\\\\", "\"\"\"\""],
"floats": [1.0, 2.0, 3.0, 4.0],
"decimals": [Decimal((0, (1, 9, 9), -2)), Decimal((0, (1, 9, 9), -2)), Decimal((0, (1, 9, 0), -2)),
Decimal((0, (3, 1, 2), -2))]
"decimals": [
Decimal((0, (1, 9, 9), -2)),
Decimal((0, (1, 9, 9), -2)),
Decimal((0, (1, 9, 0), -2)),
Decimal((0, (3, 1, 2), -2))
]
})

path = f"s3://{bucket}/test_aurora_mysql_special"
Expand Down