Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion airflow/providers/google/cloud/hooks/bigquery.py
Original file line number Diff line number Diff line change
Expand Up @@ -3311,6 +3311,7 @@ async def get_job_output(
async def create_job_for_partition_get(
self,
dataset_id: str | None,
table_id: str | None = None,
project_id: str | None = None,
):
"""Create a new job and get the job_id using gcloud-aio."""
Expand All @@ -3320,7 +3321,8 @@ async def create_job_for_partition_get(

query_request = {
"query": "SELECT partition_id "
f"FROM `{project_id}.{dataset_id}.INFORMATION_SCHEMA.PARTITIONS`",
f"FROM `{project_id}.{dataset_id}.INFORMATION_SCHEMA.PARTITIONS`"
+ (f" WHERE table_id={table_id}" if table_id else ""),
"useLegacySql": False,
}
job_query_resp = await job_client.query(query_request, cast(Session, session))
Expand Down
4 changes: 3 additions & 1 deletion airflow/providers/google/cloud/triggers/bigquery.py
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,9 @@ async def run(self) -> AsyncIterator[TriggerEvent]: # type: ignore[override]
await asyncio.sleep(self.poll_interval)

else:
job_id = await hook.create_job_for_partition_get(self.dataset_id, project_id=self.project_id)
job_id = await hook.create_job_for_partition_get(
self.dataset_id, table_id=self.table_id, project_id=self.project_id
)
self.log.info("Sleeping for %s seconds.", self.poll_interval)
await asyncio.sleep(self.poll_interval)

Expand Down
36 changes: 36 additions & 0 deletions tests/providers/google/cloud/hooks/test_bigquery.py
Original file line number Diff line number Diff line change
Expand Up @@ -2181,6 +2181,42 @@ async def test_get_job_output_assert_once_with(self, mock_job_instance):
resp = await hook.get_job_output(job_id=JOB_ID, project_id=PROJECT_ID)
assert resp == response

@pytest.mark.asyncio
@mock.patch("airflow.providers.google.cloud.hooks.bigquery.ClientSession")
@mock.patch("airflow.providers.google.cloud.hooks.bigquery.BigQueryAsyncHook.get_job_instance")
async def test_create_job_for_partition_get_with_table(self, mock_job_instance, mock_client_session):
hook = BigQueryAsyncHook()
mock_job_client = AsyncMock(Job)
mock_job_instance.return_value = mock_job_client
mock_session = AsyncMock()
mock_client_session.return_value.__aenter__.return_value = mock_session
expected_query_request = {
"query": "SELECT partition_id "
f"FROM `{PROJECT_ID}.{DATASET_ID}.INFORMATION_SCHEMA.PARTITIONS`"
f" WHERE table_id={TABLE_ID}",
"useLegacySql": False,
}
await hook.create_job_for_partition_get(
dataset_id=DATASET_ID, table_id=TABLE_ID, project_id=PROJECT_ID
)
mock_job_client.query.assert_called_once_with(expected_query_request, mock_session)

@pytest.mark.asyncio
@mock.patch("airflow.providers.google.cloud.hooks.bigquery.ClientSession")
@mock.patch("airflow.providers.google.cloud.hooks.bigquery.BigQueryAsyncHook.get_job_instance")
async def test_create_job_for_partition_get(self, mock_job_instance, mock_client_session):
hook = BigQueryAsyncHook()
mock_job_client = AsyncMock(Job)
mock_job_instance.return_value = mock_job_client
mock_session = AsyncMock()
mock_client_session.return_value.__aenter__.return_value = mock_session
expected_query_request = {
"query": f"SELECT partition_id FROM `{PROJECT_ID}.{DATASET_ID}.INFORMATION_SCHEMA.PARTITIONS`",
"useLegacySql": False,
}
await hook.create_job_for_partition_get(dataset_id=DATASET_ID, project_id=PROJECT_ID)
mock_job_client.query.assert_called_once_with(expected_query_request, mock_session)

def test_interval_check_for_airflow_exception(self):
"""
Assert that check return AirflowException
Expand Down