@@ -280,7 +280,7 @@ def test_create_table(
280280
281281 catalog ._client = MagicMock ()
282282 catalog ._client .__enter__ ().create_table .return_value = None
283- catalog ._client .__enter__ ().get_table .return_value = hive_table
283+ catalog ._client .__enter__ ().get_table_objects_by_name .return_value = [ hive_table ]
284284 catalog ._client .__enter__ ().get_database .return_value = hive_database
285285 catalog .create_table (("default" , "table" ), schema = table_schema_with_all_types , properties = {"owner" : "javaberg" })
286286
@@ -459,7 +459,7 @@ def test_create_table_with_given_location_removes_trailing_slash(
459459
460460 catalog ._client = MagicMock ()
461461 catalog ._client .__enter__ ().create_table .return_value = None
462- catalog ._client .__enter__ ().get_table .return_value = hive_table
462+ catalog ._client .__enter__ ().get_table_objects_by_name .return_value = [ hive_table ]
463463 catalog ._client .__enter__ ().get_database .return_value = hive_database
464464 catalog .create_table (
465465 ("default" , "table" ), schema = table_schema_with_all_types , properties = {"owner" : "javaberg" }, location = f"{ location } /"
@@ -633,7 +633,7 @@ def test_create_v1_table(table_schema_simple: Schema, hive_database: HiveDatabas
633633
634634 catalog ._client = MagicMock ()
635635 catalog ._client .__enter__ ().create_table .return_value = None
636- catalog ._client .__enter__ ().get_table .return_value = hive_table
636+ catalog ._client .__enter__ ().get_table_objects_by_name .return_value = [ hive_table ]
637637 catalog ._client .__enter__ ().get_database .return_value = hive_database
638638 catalog .create_table (
639639 ("default" , "table" ), schema = table_schema_simple , properties = {"owner" : "javaberg" , "format-version" : "1" }
@@ -684,10 +684,10 @@ def test_load_table(hive_table: HiveTable) -> None:
684684 catalog = HiveCatalog (HIVE_CATALOG_NAME , uri = HIVE_METASTORE_FAKE_URL )
685685
686686 catalog ._client = MagicMock ()
687- catalog ._client .__enter__ ().get_table .return_value = hive_table
687+ catalog ._client .__enter__ ().get_table_objects_by_name .return_value = [ hive_table ]
688688 table = catalog .load_table (("default" , "new_tabl2e" ))
689689
690- catalog ._client .__enter__ ().get_table .assert_called_with (dbname = "default" , tbl_name = "new_tabl2e" )
690+ catalog ._client .__enter__ ().get_table_objects_by_name .assert_called_with (dbname = "default" , tbl_names = [ "new_tabl2e" ] )
691691
692692 expected = TableMetadataV2 (
693693 location = "s3://bucket/test/location" ,
@@ -784,11 +784,11 @@ def test_load_table_from_self_identifier(hive_table: HiveTable) -> None:
784784 catalog = HiveCatalog (HIVE_CATALOG_NAME , uri = HIVE_METASTORE_FAKE_URL )
785785
786786 catalog ._client = MagicMock ()
787- catalog ._client .__enter__ ().get_table . return_value = hive_table
787+ catalog ._client .__enter__ ().get_table_objects_by_name . side_effect = lambda dbname , tbl_names : [ hive_table ]
788788 intermediate = catalog .load_table (("default" , "new_tabl2e" ))
789789 table = catalog .load_table (intermediate .name ())
790790
791- catalog ._client .__enter__ ().get_table .assert_called_with (dbname = "default" , tbl_name = "new_tabl2e" )
791+ catalog ._client .__enter__ ().get_table_objects_by_name .assert_called_with (dbname = "default" , tbl_names = [ "new_tabl2e" ] )
792792
793793 expected = TableMetadataV2 (
794794 location = "s3://bucket/test/location" ,
@@ -889,7 +889,7 @@ def test_rename_table(hive_table: HiveTable) -> None:
889889 renamed_table .tableName = "new_tabl3e"
890890
891891 catalog ._client = MagicMock ()
892- catalog ._client .__enter__ ().get_table .side_effect = [hive_table , renamed_table ]
892+ catalog ._client .__enter__ ().get_table_objects_by_name .side_effect = [[ hive_table ], [ renamed_table ] ]
893893 catalog ._client .__enter__ ().alter_table_with_environment_context .return_value = None
894894
895895 from_identifier = ("default" , "new_tabl2e" )
@@ -898,8 +898,8 @@ def test_rename_table(hive_table: HiveTable) -> None:
898898
899899 assert table .name () == to_identifier
900900
901- calls = [call (dbname = "default" , tbl_name = "new_tabl2e" ), call (dbname = "default" , tbl_name = "new_tabl3e" )]
902- catalog ._client .__enter__ ().get_table .assert_has_calls (calls )
901+ calls = [call (dbname = "default" , tbl_names = [ "new_tabl2e" ] ), call (dbname = "default" , tbl_names = [ "new_tabl3e" ] )]
902+ catalog ._client .__enter__ ().get_table_objects_by_name .assert_has_calls (calls )
903903 catalog ._client .__enter__ ().alter_table_with_environment_context .assert_called_with (
904904 dbname = "default" ,
905905 tbl_name = "new_tabl2e" ,
@@ -912,25 +912,25 @@ def test_rename_table_from_self_identifier(hive_table: HiveTable) -> None:
912912 catalog = HiveCatalog (HIVE_CATALOG_NAME , uri = HIVE_METASTORE_FAKE_URL )
913913
914914 catalog ._client = MagicMock ()
915- catalog ._client .__enter__ ().get_table .return_value = hive_table
915+ catalog ._client .__enter__ ().get_table_objects_by_name .return_value = [ hive_table ]
916916
917917 from_identifier = ("default" , "new_tabl2e" )
918918 from_table = catalog .load_table (from_identifier )
919- catalog ._client .__enter__ ().get_table .assert_called_with (dbname = "default" , tbl_name = "new_tabl2e" )
919+ catalog ._client .__enter__ ().get_table_objects_by_name .assert_called_with (dbname = "default" , tbl_names = [ "new_tabl2e" ] )
920920
921921 renamed_table = copy .deepcopy (hive_table )
922922 renamed_table .dbName = "default"
923923 renamed_table .tableName = "new_tabl3e"
924924
925- catalog ._client .__enter__ ().get_table .side_effect = [hive_table , renamed_table ]
925+ catalog ._client .__enter__ ().get_table_objects_by_name .side_effect = [[ hive_table ], [ renamed_table ] ]
926926 catalog ._client .__enter__ ().alter_table_with_environment_context .return_value = None
927927 to_identifier = ("default" , "new_tabl3e" )
928928 table = catalog .rename_table (from_table .name (), to_identifier )
929929
930930 assert table .name () == to_identifier
931931
932- calls = [call (dbname = "default" , tbl_name = "new_tabl2e" ), call (dbname = "default" , tbl_name = "new_tabl3e" )]
933- catalog ._client .__enter__ ().get_table .assert_has_calls (calls )
932+ calls = [call (dbname = "default" , tbl_names = [ "new_tabl2e" ] ), call (dbname = "default" , tbl_names = [ "new_tabl3e" ] )]
933+ catalog ._client .__enter__ ().get_table_objects_by_name .assert_has_calls (calls )
934934 catalog ._client .__enter__ ().alter_table_with_environment_context .assert_called_with (
935935 dbname = "default" ,
936936 tbl_name = "new_tabl2e" ,
@@ -1049,7 +1049,7 @@ def test_drop_table_from_self_identifier(hive_table: HiveTable) -> None:
10491049 catalog = HiveCatalog (HIVE_CATALOG_NAME , uri = HIVE_METASTORE_FAKE_URL )
10501050
10511051 catalog ._client = MagicMock ()
1052- catalog ._client .__enter__ ().get_table .return_value = hive_table
1052+ catalog ._client .__enter__ ().get_table_objects_by_name .return_value = [ hive_table ]
10531053 table = catalog .load_table (("default" , "new_tabl2e" ))
10541054
10551055 catalog ._client .__enter__ ().get_all_databases .return_value = ["namespace1" , "namespace2" ]
0 commit comments