Fix cursor management #1476
Merged
Fix cursor management #1476
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
This was referenced Feb 8, 2017
liuhelen10
reviewed
Feb 8, 2017
| key_list.append((key, direction)) | ||
|
|
||
| if self._cursor_obj and key_list: | ||
| self._cursor_obj.sort(key_list) |
There was a problem hiding this comment.
can you explain why this is being removed?
Member
Author
There was a problem hiding this comment.
Glad you asked :) Manipulating the cursor within this method makes for a poor separation of concerns. I would not expect to change the state of the cursor just by trying to convert MongoEngine-like sort keys to PyMongo-like sort tuples. That job is better left to BaseQuerySet.order_by, which is where I moved it (https://github.com/MongoEngine/mongoengine/pull/1476/files#diff-05c70acbd0634d6d05e4a6e3a9b7d66bR1007)
|
the chaining fixes re: broken |
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.
Fixes #1469 #1475 and reverses an invalid "fix" from #1049
Main changes:
BaseQuerySet.limit/skip/hint/batch_sizeare now chained properly.BaseQuerySet.order_bynow allows clearing a previously specified ordering (not just the default ordering as it used to).BaseQuerySet.clone_intomethod has been renamed to a private_clone_into(shouldn't have been public in the first place).BaseQuerySet._get_order_bymethod doesn't manipulate the cursor anymore (that was a poorly designed separation of concerns).