Skip to content

fix(bigquery): restore IF NOT EXISTS in create_search_index and clean up test mocks #14754

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
iennae wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix(bigquery): restore IF NOT EXISTS in create_search_index and clean up test mocks #14754

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 3 additions & 2 deletions bigquery/biglake/bigquery_query_manifest_external_table_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ def test_query_manifest_external_table_success(
mock_client = mock.MagicMock()
mock_job = mock.MagicMock()
mock_job.job_id = "example-job-123"
mock_job.statement_type = "SCRIPT"
mock_row = mock.MagicMock()
mock_job.result.return_value = [mock_row]
mock_client.query.return_value = mock_job
Expand Down Expand Up @@ -54,7 +53,9 @@ def test_query_manifest_external_table_error(
capsys: pytest.CaptureFixture[str],
) -> None:
mock_client = mock.MagicMock()
mock_client.query.side_effect = exceptions.NotFound("resource error")
mock_job = mock.MagicMock()
mock_job.result.side_effect = exceptions.NotFound("resource error")
mock_client.query.return_value = mock_job
monkeypatch.setattr(
bigquery_query_manifest_external_table.bigquery,
"Client",
Expand Down
8 changes: 4 additions & 4 deletions bigquery/search/bigquery_create_search_index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,18 +38,18 @@ def create_search_index(
table_ref = f"{project_id}.{dataset_id}.{table_id}"
# Indexing ALL COLUMNS enables full-text SEARCH queries across every STRING or JSON field.
sql = f"""
CREATE SEARCH INDEX `{index_name}`
CREATE SEARCH INDEX IF NOT EXISTS `{index_name}`
ON `{table_ref}`(ALL COLUMNS);
"""

try:
print(f"Creating search index {index_name} on table: {table_ref}")
query_job = client.query(sql)
query_job.result()
except exceptions.AlreadyExists as err:
except exceptions.NotFound as err:
print(
f"error: search index '{index_name}' already exists on table "
f"'{table_id}' in dataset '{dataset_id}' for project '{project_id}': {err.message}",
f"error: table '{table_id}' or dataset '{dataset_id}' not found "
f"for project '{project_id}': {err.message}",
file=sys.stderr,
)
return
Expand Down
7 changes: 4 additions & 3 deletions bigquery/search/bigquery_create_search_index_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ def test_create_search_index_success(
mock_job = mock.MagicMock()
mock_job.job_id = "example-job-123"
mock_job.statement_type = "SCRIPT"
mock_row = mock.MagicMock()
mock_job.result.return_value = [mock_row]
mock_job.result.return_value = []
mock_client.query.return_value = mock_job
monkeypatch.setattr(
bigquery_create_search_index.bigquery,
Expand All @@ -53,7 +52,9 @@ def test_create_search_index_error(
capsys: pytest.CaptureFixture[str],
) -> None:
mock_client = mock.MagicMock()
mock_client.query.side_effect = exceptions.AlreadyExists("resource error")
mock_job = mock.MagicMock()
mock_job.result.side_effect = exceptions.NotFound("resource error")
mock_client.query.return_value = mock_job
monkeypatch.setattr(
bigquery_create_search_index.bigquery,
"Client",
Expand Down
4 changes: 2 additions & 2 deletions bigquery/vector_search/bigquery_drop_vector_index.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ def drop_vector_index(
query_job.result()
except exceptions.NotFound as err:
print(
f"error: table '{table_id}' or vector index '{index_name}' not found in "
f"dataset '{dataset_id}' for project '{project_id}': {err.message}",
f"error: table '{table_id}' or dataset '{dataset_id}' not found in "
f"project '{project_id}': {err.message}",
file=sys.stderr,
)
return
Expand Down
7 changes: 4 additions & 3 deletions bigquery/vector_search/bigquery_drop_vector_index_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,7 @@ def test_drop_vector_index_success(
mock_job = mock.MagicMock()
mock_job.job_id = "example-job-123"
mock_job.statement_type = "SCRIPT"
mock_row = mock.MagicMock()
mock_job.result.return_value = [mock_row]
mock_job.result.return_value = []
mock_client.query.return_value = mock_job
monkeypatch.setattr(
bigquery_drop_vector_index.bigquery,
Expand All @@ -53,7 +52,9 @@ def test_drop_vector_index_error(
capsys: pytest.CaptureFixture[str],
) -> None:
mock_client = mock.MagicMock()
mock_client.query.side_effect = exceptions.NotFound("resource error")
mock_job = mock.MagicMock()
mock_job.result.side_effect = exceptions.NotFound("resource error")
mock_client.query.return_value = mock_job
monkeypatch.setattr(
bigquery_drop_vector_index.bigquery,
"Client",
Expand Down
Loading