Skip to content

Commit 3a68db6

Browse files
Consistency in param naming Athena (#1638)
* Update install page in docs with screenshot of new managed layer name (#1636) * Consistency in param naming * Black * changing name in tests Co-authored-by: Leon Luttenberger <[email protected]>
1 parent 94d6320 commit 3a68db6

File tree

4 files changed

+18
-15
lines changed

4 files changed

+18
-15
lines changed

awswrangler/athena/_read.py

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -404,7 +404,7 @@ def _resolve_query_without_cache(
404404
encryption: Optional[str],
405405
kms_key: Optional[str],
406406
keep_files: bool,
407-
ctas_database_name: Optional[str],
407+
ctas_database: Optional[str],
408408
ctas_temp_table_name: Optional[str],
409409
ctas_bucketing_info: Optional[Tuple[List[str], int]],
410410
use_threads: Union[bool, int],
@@ -434,7 +434,7 @@ def _resolve_query_without_cache(
434434
encryption=encryption,
435435
workgroup=workgroup,
436436
kms_key=kms_key,
437-
alt_database=ctas_database_name,
437+
alt_database=ctas_database,
438438
name=name,
439439
ctas_bucketing_info=ctas_bucketing_info,
440440
use_threads=use_threads,
@@ -443,9 +443,7 @@ def _resolve_query_without_cache(
443443
pyarrow_additional_kwargs=pyarrow_additional_kwargs,
444444
)
445445
finally:
446-
catalog.delete_table_if_exists(
447-
database=ctas_database_name or database, table=name, boto3_session=boto3_session
448-
)
446+
catalog.delete_table_if_exists(database=ctas_database or database, table=name, boto3_session=boto3_session)
449447
elif unload_approach is True:
450448
if unload_parameters is None:
451449
unload_parameters = {}
@@ -690,7 +688,7 @@ def read_sql_query(
690688
encryption: Optional[str] = None,
691689
kms_key: Optional[str] = None,
692690
keep_files: bool = True,
693-
ctas_database_name: Optional[str] = None,
691+
ctas_database: Optional[str] = None,
694692
ctas_temp_table_name: Optional[str] = None,
695693
ctas_bucketing_info: Optional[Tuple[List[str], int]] = None,
696694
use_threads: Union[bool, int] = True,
@@ -848,7 +846,7 @@ def read_sql_query(
848846
For SSE-KMS, this is the KMS key ARN or ID.
849847
keep_files : bool
850848
Whether staging files produced by Athena are retained. 'True' by default.
851-
ctas_database_name : str, optional
849+
ctas_database : str, optional
852850
The name of the alternative database where the CTAS temporary table is stored.
853851
If None, the default `database` is used.
854852
ctas_temp_table_name : str, optional
@@ -980,7 +978,7 @@ def read_sql_query(
980978
encryption=encryption,
981979
kms_key=kms_key,
982980
keep_files=keep_files,
983-
ctas_database_name=ctas_database_name,
981+
ctas_database=ctas_database,
984982
ctas_temp_table_name=ctas_temp_table_name,
985983
ctas_bucketing_info=ctas_bucketing_info,
986984
use_threads=use_threads,
@@ -1004,7 +1002,7 @@ def read_sql_table(
10041002
encryption: Optional[str] = None,
10051003
kms_key: Optional[str] = None,
10061004
keep_files: bool = True,
1007-
ctas_database_name: Optional[str] = None,
1005+
ctas_database: Optional[str] = None,
10081006
ctas_temp_table_name: Optional[str] = None,
10091007
ctas_bucketing_info: Optional[Tuple[List[str], int]] = None,
10101008
use_threads: Union[bool, int] = True,
@@ -1140,7 +1138,7 @@ def read_sql_table(
11401138
For SSE-KMS, this is the KMS key ARN or ID.
11411139
keep_files : bool
11421140
Should awswrangler delete or keep the staging files produced by Athena?
1143-
ctas_database_name : str, optional
1141+
ctas_database : str, optional
11441142
The name of the alternative database where the CTAS temporary table is stored.
11451143
If None, the default `database` is used.
11461144
ctas_temp_table_name : str, optional
@@ -1219,7 +1217,7 @@ def read_sql_table(
12191217
encryption=encryption,
12201218
kms_key=kms_key,
12211219
keep_files=keep_files,
1222-
ctas_database_name=ctas_database_name,
1220+
ctas_database=ctas_database,
12231221
ctas_temp_table_name=ctas_temp_table_name,
12241222
ctas_bucketing_info=ctas_bucketing_info,
12251223
use_threads=use_threads,
17.5 KB
Loading

docs/source/install.rst

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,13 @@ Managed Layer
3232

3333
AWS SDK for pandas is available as an AWS Lambda Managed layer in all AWS commercial regions.
3434

35-
It can be accessed in the AWS Lambda console directly,
36-
or via its ARN: ``arn:aws:lambda:<region>:336392948345:layer:AWSSDKPandas-Python<python-version>:<layer-version>``.
35+
It can be accessed in the AWS Lambda console directly:
36+
37+
.. image:: _static/aws_lambda_managed_layer.png
38+
:width: 400
39+
:alt: AWS Managed Lambda Layer
40+
41+
Or via its ARN: ``arn:aws:lambda:<region>:336392948345:layer:AWSSDKPandas-Python<python-version>:<layer-version>``.
3742

3843
For example: ``arn:aws:lambda:us-east-1:336392948345:layer:AWSSDKPandas-Python37:1``.
3944

tests/unit/test_athena.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ def test_athena_ctas(path, path2, path3, glue_table, glue_table2, glue_database,
108108
ctas_approach=True,
109109
chunksize=1,
110110
keep_files=False,
111-
ctas_database_name=glue_ctas_database,
111+
ctas_database=glue_ctas_database,
112112
ctas_temp_table_name=glue_table2,
113113
s3_output=path3,
114114
)
@@ -134,7 +134,7 @@ def test_athena_read_sql_ctas_bucketing(path, path2, glue_table, glue_table2, gl
134134
sql=f"SELECT * FROM {glue_table}",
135135
ctas_approach=True,
136136
database=glue_database,
137-
ctas_database_name=glue_ctas_database,
137+
ctas_database=glue_ctas_database,
138138
ctas_temp_table_name=glue_table2,
139139
ctas_bucketing_info=(["c0"], 1),
140140
s3_output=path2,

0 commit comments

Comments
 (0)