refactor(bigquery): reuse universe domain setup from main

Client.__init__ already sets _universe_domain, and
_ensure_bqstorage_client() adds the universe domain when no
client_options are passed. Drop the duplicate assignment and stop
building ClientOptions in _get_shared_bqstorage_client().

Author: ohmayr

packages/google-cloud-bigquery/google/cloud/bigquery/client.py

@@ -335,7 +335,6 @@ def __init__(
 
         # ARROW query results share one BigQuery Storage client. It's created
         # the first time a query needs a stream, and close() closes it.
-        self._universe_domain = _get_client_universe(client_options)
         self._shared_bqstorage_client: Optional[
             "google.cloud.bigquery_storage.BigQueryReadClient"
         ] = None
@@ -761,13 +760,7 @@ def _get_shared_bqstorage_client(
         """
         with self._shared_bqstorage_client_lock:
             if self._shared_bqstorage_client is None:
-                client_options = None
-                if self._universe_domain != _DEFAULT_UNIVERSE:
-                    client_options = google.api_core.client_options.ClientOptions(
-                        universe_domain=self._universe_domain
-                    )
                 self._shared_bqstorage_client = self._ensure_bqstorage_client(
-                    client_options=client_options,
                     transport=_create_bqstorage_transport,
                 )
             return self._shared_bqstorage_client

packages/google-cloud-bigquery/tests/unit/test_client.py

@@ -1145,9 +1145,7 @@ def test_get_shared_bqstorage_client_tries_again_if_unavailable(self):
             self.assertIsNone(client._get_shared_bqstorage_client())
             self.assertIsNone(client._get_shared_bqstorage_client())
 
-        expected = mock.call(
-            client_options=None, transport=client_module._create_bqstorage_transport
-        )
+        expected = mock.call(transport=client_module._create_bqstorage_transport)
         self.assertEqual(ensure.call_args_list, [expected, expected])
 
     def test_get_shared_bqstorage_client_creates_one_client_across_threads(self):
@@ -1178,7 +1176,7 @@ def get_client():
                 thread.join()
 
         ensure.assert_called_once_with(
-            client_options=None, transport=client_module._create_bqstorage_transport
+            transport=client_module._create_bqstorage_transport
         )
         self.assertEqual(len(results), 5)
         self.assertTrue(all(result is results[0] for result in results))