Skip to content

impl(bigtable): update query plan refresh retry logic to pass conformance tests#15773

Merged
scotthart merged 3 commits intogoogleapis:mainfrom
scotthart:bigquery_conf_query_refresh_1
Nov 18, 2025
Merged

impl(bigtable): update query plan refresh retry logic to pass conformance tests#15773
scotthart merged 3 commits intogoogleapis:mainfrom
scotthart:bigquery_conf_query_refresh_1

Conversation

@scotthart
Copy link
Member

Also renamed the retry traits type used for the query plan refresh retry policy and added GCP_ERROR_INFO to a few Status to improve diagnostics.

@scotthart scotthart requested a review from a team November 17, 2025 21:41
@product-auto-label product-auto-label bot added the api: bigtable Issues related to the Bigtable API. label Nov 17, 2025
@gemini-code-assist
Copy link

Summary of Changes

Hello @scotthart, I'm Gemini Code Assist1! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request refines the Bigtable client's query execution by enhancing its retry logic for query plan refreshes and improving error reporting. The changes ensure that the client can more robustly handle situations where query plans expire or schema changes occur, leading to a more stable and diagnosable query experience. The update also includes a refactoring of internal retry traits and an expansion of conformance tests to validate these improvements.

Highlights

  • Enhanced Query Plan Refresh Retry Logic: The retry mechanism for query plan refreshes has been updated to correctly handle PREPARED_QUERY_EXPIRED errors, ensuring better resilience during query execution and passing conformance tests.
  • Improved Error Diagnostics: GCP_ERROR_INFO() is now included in Status objects for AbortedError and InternalError cases, providing richer diagnostic information when schema changes or empty responses occur.
  • Refactored Retry Traits: The SafeGrpcRetryAllowingQueryPlanRefresh trait has been renamed to QueryPlanRefreshRetry and its implementation moved to a .cc file, improving code organization and testability.
  • Updated Conformance Tests: New conformance tests specifically targeting ExecuteQuery plan refresh scenarios have been enabled, and some older, less relevant skips have been removed to validate the new retry logic.
Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature Command Description
Code Review /gemini review Performs a code review for the current pull request in its current state.
Pull Request Summary /gemini summary Provides a summary of the current pull request in its current state.
Comment @gemini-code-assist Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help /gemini help Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Footnotes

  1. Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution.

Copy link

@gemini-code-assist gemini-code-assist bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code Review

This pull request updates the retry logic for ExecuteQuery when a query plan expires. It introduces a more robust mechanism to detect expired query plans by inspecting the Status payload, in addition to the existing message-based check. The retry traits for this scenario have been renamed for clarity, and the transient failure detection has been broadened to include all kInternal errors, which is a key change to pass conformance tests. Additionally, GCP_ERROR_INFO has been added to some error statuses to improve diagnostics. The changes are well-tested and improve the reliability of the ExecuteQuery operation.

diegomarquezp
diegomarquezp previously approved these changes Nov 17, 2025
diegomarquezp
diegomarquezp previously approved these changes Nov 17, 2025
@codecov
Copy link

codecov bot commented Nov 17, 2025

Codecov Report

❌ Patch coverage is 96.66667% with 2 lines in your changes missing coverage. Please review.
✅ Project coverage is 92.94%. Comparing base (19851cb) to head (033e17c).
⚠️ Report is 1 commits behind head on main.

Files with missing lines Patch % Lines
...le/cloud/bigtable/internal/data_connection_impl.cc 60.00% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main   #15773      +/-   ##
==========================================
- Coverage   92.95%   92.94%   -0.01%     
==========================================
  Files        2448     2449       +1     
  Lines      226468   226518      +50     
==========================================
+ Hits       210514   210545      +31     
- Misses      15954    15973      +19     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:
  • ❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

@scotthart scotthart enabled auto-merge (squash) November 17, 2025 23:52
@scotthart scotthart merged commit ec4df78 into googleapis:main Nov 18, 2025
68 of 70 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

api: bigtable Issues related to the Bigtable API.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants