Debug build option / Building against release pkgs / Query module / Default PEP regex (except/finally) (4-3-stable) - #273
Open
korydraughn wants to merge 4 commits into
Open
korydraughn wants to merge 4 commits into
korydraughn wants to merge 4 commits into
Conversation
When Query.total_rows() is called on a GenQuery1 query with a non-zero offset, genquery.py issues a second query with offset=0 so iRODS can return the full row count. That recount query was being built via Query(...) without passing through the original case_sensitive setting. Because Query.__init__() defaults case_sensitive to True, the recount path cleared UPPER_CASE_WHERE and skipped uppercasing the condition string. This allowed a case-insensitive fetch query to be paired with a case-sensitive recount query, producing total_rows() values smaller than the number of rows actually returned. Use self.copy(offset=0, limit=0, ...) for the recount path so the original query attributes are preserved, including case sensitivity and the rest of the query configuration. This keeps the recount query aligned with the fetch query while still forcing RETURN_TOTAL_ROW_COUNT for the manual recount.
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Cherry-pick of the following:
--debug_buildoption (main) #266Core tests passed against the released version of the iRODS 4.3.5 server.
Also verified that the test for #258 passed. This required copying the test from the main branch of irods/irods into an iRODS 4.3.5 server deployment and reviewing the test output.