Skip to content

Commit a77c3aa

Browse files
laughingman7743laughingman7743
committed
Remove unnecessary cast methods
1 parent 1d1c4d1 commit a77c3aa

File tree

1 file changed

+66
-99
lines changed

1 file changed

+66
-99
lines changed

‎pyathena/result_set.py

Lines changed: 66 additions & 99 deletions
Original file line numberDiff line numberDiff line change
@@ -532,24 +532,21 @@ def has_result_set(self) -> bool:
532532
def description(
533533
self,
534534
) -> Optional[List[Tuple[str, str, None, None, int, int, str]]]:
535-
if not self.has_result_set:
535+
if not self.result_set:
536536
return None
537-
result_set = cast(AthenaResultSet, self.result_set)
538-
return result_set.description
537+
return self.result_set.description
539538

540539
@property
541540
def database(self) -> Optional[str]:
542-
if not self.has_result_set:
541+
if not self.result_set:
543542
return None
544-
result_set = cast(AthenaResultSet, self.result_set)
545-
return result_set.database
543+
return self.result_set.database
546544

547545
@property
548546
def catalog(self) -> Optional[str]:
549-
if not self.has_result_set:
547+
if not self.result_set:
550548
return None
551-
result_set = cast(AthenaResultSet, self.result_set)
552-
return result_set.catalog
549+
return self.result_set.catalog
553550

554551
@property # type: ignore
555552
@abstractmethod
@@ -563,210 +560,180 @@ def query_id(self, val: Optional[str]) -> None:
563560

564561
@property
565562
def query(self) -> Optional[str]:
566-
if not self.has_result_set:
563+
if not self.result_set:
567564
return None
568-
result_set = cast(AthenaResultSet, self.result_set)
569-
return result_set.query
565+
return self.result_set.query
570566

571567
@property
572568
def statement_type(self) -> Optional[str]:
573-
if not self.has_result_set:
569+
if not self.result_set:
574570
return None
575-
result_set = cast(AthenaResultSet, self.result_set)
576-
return result_set.statement_type
571+
return self.result_set.statement_type
577572

578573
@property
579574
def substatement_type(self) -> Optional[str]:
580-
if not self.has_result_set:
575+
if not self.result_set:
581576
return None
582-
result_set = cast(AthenaResultSet, self.result_set)
583-
return result_set.substatement_type
577+
return self.result_set.substatement_type
584578

585579
@property
586580
def work_group(self) -> Optional[str]:
587-
if not self.has_result_set:
581+
if not self.result_set:
588582
return None
589-
result_set = cast(AthenaResultSet, self.result_set)
590-
return result_set.work_group
583+
return self.result_set.work_group
591584

592585
@property
593586
def execution_parameters(self) -> List[str]:
594-
if not self.has_result_set:
587+
if not self.result_set:
595588
return []
596-
result_set = cast(AthenaResultSet, self.result_set)
597-
return result_set.execution_parameters
589+
return self.result_set.execution_parameters
598590

599591
@property
600592
def state(self) -> Optional[str]:
601-
if not self.has_result_set:
593+
if not self.result_set:
602594
return None
603-
result_set = cast(AthenaResultSet, self.result_set)
604-
return result_set.state
595+
return self.result_set.state
605596

606597
@property
607598
def state_change_reason(self) -> Optional[str]:
608-
if not self.has_result_set:
599+
if not self.result_set:
609600
return None
610-
result_set = cast(AthenaResultSet, self.result_set)
611-
return result_set.state_change_reason
601+
return self.result_set.state_change_reason
612602

613603
@property
614604
def submission_date_time(self) -> Optional[datetime]:
615-
if not self.has_result_set:
605+
if not self.result_set:
616606
return None
617-
result_set = cast(AthenaResultSet, self.result_set)
618-
return result_set.submission_date_time
607+
return self.result_set.submission_date_time
619608

620609
@property
621610
def completion_date_time(self) -> Optional[datetime]:
622-
if not self.has_result_set:
611+
if not self.result_set:
623612
return None
624-
result_set = cast(AthenaResultSet, self.result_set)
625-
return result_set.completion_date_time
613+
return self.result_set.completion_date_time
626614

627615
@property
628616
def error_category(self) -> Optional[int]:
629-
if not self.has_result_set:
617+
if not self.result_set:
630618
return None
631-
result_set = cast(AthenaResultSet, self.result_set)
632-
return result_set.error_category
619+
return self.result_set.error_category
633620

634621
@property
635622
def error_type(self) -> Optional[int]:
636-
if not self.has_result_set:
623+
if not self.result_set:
637624
return None
638-
result_set = cast(AthenaResultSet, self.result_set)
639-
return result_set.error_type
625+
return self.result_set.error_type
640626

641627
@property
642628
def retryable(self) -> Optional[bool]:
643-
if not self.has_result_set:
629+
if not self.result_set:
644630
return None
645-
result_set = cast(AthenaResultSet, self.result_set)
646-
return result_set.retryable
631+
return self.result_set.retryable
647632

648633
@property
649634
def error_message(self) -> Optional[str]:
650-
if not self.has_result_set:
635+
if not self.result_set:
651636
return None
652-
result_set = cast(AthenaResultSet, self.result_set)
653-
return result_set.error_message
637+
return self.result_set.error_message
654638

655639
@property
656640
def data_scanned_in_bytes(self) -> Optional[int]:
657-
if not self.has_result_set:
641+
if not self.result_set:
658642
return None
659-
result_set = cast(AthenaResultSet, self.result_set)
660-
return result_set.data_scanned_in_bytes
643+
return self.result_set.data_scanned_in_bytes
661644

662645
@property
663646
def engine_execution_time_in_millis(self) -> Optional[int]:
664-
if not self.has_result_set:
647+
if not self.result_set:
665648
return None
666-
result_set = cast(AthenaResultSet, self.result_set)
667-
return result_set.engine_execution_time_in_millis
649+
return self.result_set.engine_execution_time_in_millis
668650

669651
@property
670652
def query_queue_time_in_millis(self) -> Optional[int]:
671-
if not self.has_result_set:
653+
if not self.result_set:
672654
return None
673-
result_set = cast(AthenaResultSet, self.result_set)
674-
return result_set.query_queue_time_in_millis
655+
return self.result_set.query_queue_time_in_millis
675656

676657
@property
677658
def total_execution_time_in_millis(self) -> Optional[int]:
678-
if not self.has_result_set:
659+
if not self.result_set:
679660
return None
680-
result_set = cast(AthenaResultSet, self.result_set)
681-
return result_set.total_execution_time_in_millis
661+
return self.result_set.total_execution_time_in_millis
682662

683663
@property
684664
def query_planning_time_in_millis(self) -> Optional[int]:
685-
if not self.has_result_set:
665+
if not self.result_set:
686666
return None
687-
result_set = cast(AthenaResultSet, self.result_set)
688-
return result_set.query_planning_time_in_millis
667+
return self.result_set.query_planning_time_in_millis
689668

690669
@property
691670
def service_processing_time_in_millis(self) -> Optional[int]:
692-
if not self.has_result_set:
671+
if not self.result_set:
693672
return None
694-
result_set = cast(AthenaResultSet, self.result_set)
695-
return result_set.service_processing_time_in_millis
673+
return self.result_set.service_processing_time_in_millis
696674

697675
@property
698676
def output_location(self) -> Optional[str]:
699-
if not self.has_result_set:
677+
if not self.result_set:
700678
return None
701-
result_set = cast(AthenaResultSet, self.result_set)
702-
return result_set.output_location
679+
return self.result_set.output_location
703680

704681
@property
705682
def data_manifest_location(self) -> Optional[str]:
706-
if not self.has_result_set:
683+
if not self.result_set:
707684
return None
708-
result_set = cast(AthenaResultSet, self.result_set)
709-
return result_set.data_manifest_location
685+
return self.result_set.data_manifest_location
710686

711687
@property
712688
def reused_previous_result(self) -> Optional[bool]:
713-
if not self.has_result_set:
689+
if not self.result_set:
714690
return None
715-
result_set = cast(AthenaResultSet, self.result_set)
716-
return result_set.reused_previous_result
691+
return self.result_set.reused_previous_result
717692

718693
@property
719694
def encryption_option(self) -> Optional[str]:
720-
if not self.has_result_set:
695+
if not self.result_set:
721696
return None
722-
result_set = cast(AthenaResultSet, self.result_set)
723-
return result_set.encryption_option
697+
return self.result_set.encryption_option
724698

725699
@property
726700
def kms_key(self) -> Optional[str]:
727-
if not self.has_result_set:
701+
if not self.result_set:
728702
return None
729-
result_set = cast(AthenaResultSet, self.result_set)
730-
return result_set.kms_key
703+
return self.result_set.kms_key
731704

732705
@property
733706
def expected_bucket_owner(self) -> Optional[str]:
734-
if not self.has_result_set:
707+
if not self.result_set:
735708
return None
736-
result_set = cast(AthenaResultSet, self.result_set)
737-
return result_set.expected_bucket_owner
709+
return self.result_set.expected_bucket_owner
738710

739711
@property
740712
def s3_acl_option(self) -> Optional[str]:
741-
if not self.has_result_set:
713+
if not self.result_set:
742714
return None
743-
result_set = cast(AthenaResultSet, self.result_set)
744-
return result_set.s3_acl_option
715+
return self.result_set.s3_acl_option
745716

746717
@property
747718
def selected_engine_version(self) -> Optional[str]:
748-
if not self.has_result_set:
719+
if not self.result_set:
749720
return None
750-
result_set = cast(AthenaResultSet, self.result_set)
751-
return result_set.selected_engine_version
721+
return self.result_set.selected_engine_version
752722

753723
@property
754724
def effective_engine_version(self) -> Optional[str]:
755-
if not self.has_result_set:
725+
if not self.result_set:
756726
return None
757-
result_set = cast(AthenaResultSet, self.result_set)
758-
return result_set.effective_engine_version
727+
return self.result_set.effective_engine_version
759728

760729
@property
761730
def result_reuse_enabled(self) -> Optional[bool]:
762-
if not self.has_result_set:
731+
if not self.result_set:
763732
return None
764-
result_set = cast(AthenaResultSet, self.result_set)
765-
return result_set.result_reuse_enabled
733+
return self.result_set.result_reuse_enabled
766734

767735
@property
768736
def result_reuse_minutes(self) -> Optional[int]:
769-
if not self.has_result_set:
737+
if not self.result_set:
770738
return None
771-
result_set = cast(AthenaResultSet, self.result_set)
772-
return result_set.result_reuse_minutes
739+
return self.result_set.result_reuse_minutes

0 commit comments

Comments
 (0)