Backport to branch(3.16) : Add JDBC database permission test (Part 2) #2940
Conversation
Co-authored-by: Mitsunori Komatsu <[email protected]> Co-authored-by: Toshihiro Suzuki <[email protected]>
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Summary of Changes
Hello @feeblefakie, 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 backports changes to the 3.16 branch, primarily focusing on enhancing the robustness and compatibility of JDBC database permission integration tests. I've standardized the waiting mechanism for DDL operations, ensuring that tests properly account for the time it takes for schema changes to propagate, especially in systems like Yugabyte. Additionally, I've refined how user permissions are managed and granted within the test suite for DB2, addressing its unique user management characteristics. These changes aim to make the permission tests more reliable and broadly applicable across different JDBC-compliant databases.
Highlights
- Standardized DDL Wait Mechanism: The integration test base classes and specific Cassandra integration tests now use a more generic
waitForDdlCompletionmethod instead ofwaitForTableCreationto indicate waiting for any Data Definition Language operation to complete. - Improved JDBC Test Stability: Explicit waits have been added after DDL operations in JDBC integration tests, particularly for Yugabyte, to prevent potential schema or catalog version mismatch errors that can occur due to eventual consistency.
- Enhanced DB2 Compatibility in Permission Tests: The
JdbcPermissionTestUtilsnow handles user creation and dropping differently for DB2, skipping these operations as DB2 manages users via the operating system. Additionally, specificGRANTstatements for DB2 have been added for permission testing. - Adjusted Test Column Data Type: The data type for
COL_NAME3in theDistributedStorageAdminPermissionIntegrationTestBasehas been changed fromTEXTtoINT, which might be to align with specific test data requirements or scenarios.
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 in your pull request via creating an issue comment (i.e. comment on the pull request page) using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands.
| 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 issue 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 or fill out our survey to provide feedback.
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
-
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. ↩
There was a problem hiding this comment.
Code Review
This pull request is a backport that adds JDBC database permission tests, including support for DB2. The changes involve updates to test utilities for creating users and granting permissions, particularly for DB2, and adjustments to test classes to handle DDL completion waits, especially for YugabyteDB. A minor bug fix in a test base class is also included. My review focuses on improving code readability and maintainability in the new test utility methods. I've suggested using guard clauses to simplify the logic for handling DB2-specific cases.
| if (!JdbcTestUtils.isDb2(rdbEngine)) { | ||
| try (Connection connection = dataSource.getConnection()) { | ||
| String createUserSql = getCreateUserSql(userName, password); | ||
| try (Statement statement = connection.createStatement()) { | ||
| statement.execute(createUserSql); | ||
| } | ||
| } catch (SQLException e) { | ||
| throw new RuntimeException("Failed to create user: " + userName, e); | ||
| } | ||
| } catch (SQLException e) { | ||
| throw new RuntimeException("Failed to create user: " + userName, e); | ||
| } |
There was a problem hiding this comment.
For better readability, consider using a guard clause to handle the Db2 case at the beginning of the method. This reduces nesting and makes the main logic path clearer.
if (JdbcTestUtils.isDb2(rdbEngine)) {
return;
}
try (Connection connection = dataSource.getConnection()) {
String createUserSql = getCreateUserSql(userName, password);
try (Statement statement = connection.createStatement()) {
statement.execute(createUserSql);
}
} catch (SQLException e) {
throw new RuntimeException("Failed to create user: " + userName, e);
}| if (!JdbcTestUtils.isDb2(rdbEngine)) { | ||
| try (Connection connection = dataSource.getConnection()) { | ||
| String dropUserSql = getDropUserSql(userName); | ||
| try (Statement statement = connection.createStatement()) { | ||
| statement.execute(dropUserSql); | ||
| } | ||
| } catch (SQLException e) { | ||
| throw new RuntimeException("Failed to drop user: " + userName, e); | ||
| } | ||
| } catch (SQLException e) { | ||
| throw new RuntimeException("Failed to drop user: " + userName, e); | ||
| } |
There was a problem hiding this comment.
For better readability, consider using a guard clause to handle the Db2 case at the beginning of the method. This reduces nesting and makes the main logic path clearer.
if (JdbcTestUtils.isDb2(rdbEngine)) {
return;
}
try (Connection connection = dataSource.getConnection()) {
String dropUserSql = getDropUserSql(userName);
try (Statement statement = connection.createStatement()) {
statement.execute(dropUserSql);
}
} catch (SQLException e) {
throw new RuntimeException("Failed to drop user: " + userName, e);
}
2 participants
This is an automated backport of the following:
Please merge this PR after all checks have passed.