[JDBC] StatementImpl #2591
Merged
[JDBC] StatementImpl #2591
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… specific parameters.
Contributor
Author
|
/windsurf review |
There was a problem hiding this comment.
Pull Request Overview
This PR fixes issues with the JDBC StatementImpl related to maxRows handling and adds comprehensive test coverage. The main purpose is to replace the problematic max_result_rows server setting approach with a client-side row limiting mechanism that provides more reliable behavior.
- Implements client-side row limiting in
ResultSetImplto honormaxRowswithout relying on server settings - Adds feature management for unsupported JDBC operations with configurable behavior
- Enhances test coverage for
maxRows, unsupported operations, and fetch size functionality
Reviewed Changes
Copilot reviewed 5 out of 5 changed files in this pull request and generated 3 comments.
Show a summary per file
| File | Description |
|---|---|
| StatementTest.java | Comprehensive test suite for maxRows behavior, unsupported operations, and fetch size validation |
| JdbcConfiguration.java | Added utility methods for feature flag management and max result rows configuration |
| StatementImpl.java | Enhanced with feature manager integration and improved maxRows handling with server setting fallback |
| ResultSetImpl.java | Client-side maxRows enforcement and improved fetch direction handling |
| DriverProperties.java | New configuration properties for unsupported value handling and max result rows usage |
Tip: Customize your code reviews with copilot-instructions.md. Create the file or learn how to get started.
| return false; | ||
| } | ||
|
|
||
| if (maxRows > 0 && rowPos == maxRows) { |
There was a problem hiding this comment.
The condition rowPos == maxRows will prevent fetching the last allowed row. If maxRows is 5, this will stop at row 4 instead of row 5. The condition should be rowPos >= maxRows to correctly limit to the specified number of rows.
Suggested change
| if (maxRows > 0 && rowPos == maxRows) { | |
| if (maxRows > 0 && rowPos >= maxRows) { |
Contributor
Author
There was a problem hiding this comment.
Rows start with 1. 0 is before we do any next() call.
Lets say maxRows = 2
rowPos = 0
next() - ( rowPos < maxRows)
rowPos = 1 - we got first row
next() (rowPos < maxRows)
rowPos = 2 - we got second row
at this point should return isLast true
so it will not prevent reading row, but will make state not accurate
![windsurf-bot[bot]](https://avatars.githubusercontent.com/in/1066231?s=60&v=4){kind=small}
Contributor
There was a problem hiding this comment.
Other comments (1)
- jdbc-v2/src/test/java/com/clickhouse/jdbc/StatementTest.java (854-854) The expected count should use the `expectedRows` variable (100001) instead of the hardcoded value 1001 for consistency with the rest of the test and to make it more maintainable.
💡 To request another review, post a new comment with "/windsurf-review".
Comment on lines
+782
to
+784
| // https://clickhouse.com/docs/en/operations/settings/query-complexity#result-overflow-mode | ||
| assertTrue(count > 0 && count < 100001); | ||
| } |
Contributor
There was a problem hiding this comment.
The test is checking the count but not verifying that lastRow matches the count. For consistency, you should add an assertion to verify that lastRow == count since both should be equal when processing all rows.
Contributor
Author
There was a problem hiding this comment.
This assertion not applicable because no exact match expected.
Client V2 CoverageCoverage Report
Class Coverage
|
JDBC V2 CoverageCoverage Report
Class Coverage
|
JDBC V1 CoverageCoverage Report
Class Coverage
|
Client V1 CoverageCoverage Report
Class Coverage
|
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
maxRowsproblem usingmax_result_rowssetting that doesn't guarantee hard limit and may cause exception if user is not allowed to change settingsmaxRowsaddedCloses #2532
Closes #2582
Checklist
Delete items not relevant to your PR: