This repository was archived by the owner on Apr 26, 2024. It is now read-only.
Implement "event_fields" in filters #1638
Merged
Conversation
This file contains 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
Also make it an inclusive not exclusive filter, as the spec demands.
| for sub_field in field: | ||
| if sub_field not in sub_out_dict: | ||
| sub_out_dict[sub_field] = {} | ||
| sub_out_dict = sub_out_dict[sub_field] |
There was a problem hiding this comment.
You can replace the 3 lines with:
sub_out_dict = sub_out_dict.setdefault(sub_field, {})| # for each element of the output array of arrays: | ||
| # remove escaping so we can use the right key names. This purposefully avoids | ||
| # using list comprehensions to avoid needless allocations as this may be called | ||
| # on a lot of events. |
There was a problem hiding this comment.
I did a quick benchmark and the following list comprehension is actually quicker:
split_fields[:] = [ [field.replace(r'\.', r'.') for field in field_array] for field_array in split_fields]There was a problem hiding this comment.
And if we really cared about performance, we would pull this up to be calculated when we initially parsed the filter
| d = event_format(d) | ||
|
|
||
| if (only_event_fields and isinstance(only_event_fields, list) and | ||
| all(isinstance(f, basestring) for f in only_event_fields)): |
There was a problem hiding this comment.
If the args are incorrect this should raise an exception.
|
LGTM |
erikjohnston
approved these changes
Nov 22, 2016
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
http://matrix.org/docs/spec/client_server/r0.2.0.html#post-matrix-client-r0-user-userid-filter