Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Make the cache objects be per instance rather than being global | Mark Haines | 2016-04-06 | 3 | -5/+5 |
| | |||||
* | Merge pull request #691 from matrix-org/erikj/member | Erik Johnston | 2016-04-05 | 2 | -1/+21 |
|\ | | | | | Fix stuck invites | ||||
| * | Fix stuck invites | Erik Johnston | 2016-04-05 | 2 | -1/+21 |
| | | | | | | | | | | | | | | | | If rejecting a remote invite fails with an error response don't fail the entire request; instead mark the invite as locally rejected. This fixes the bug where users can get stuck invites which they can neither accept nor reject. | ||||
* | | Merge pull request #690 from matrix-org/erikj/member | Erik Johnston | 2016-04-05 | 4 | -31/+151 |
|\| | | | | | Store invites in a separate table. | ||||
| * | Docs and indents | Erik Johnston | 2016-04-04 | 2 | -13/+27 |
| | | |||||
| * | Add upgrade path, rename table | Erik Johnston | 2016-04-04 | 2 | -6/+20 |
| | | |||||
| * | Store invites in a separate table. | Erik Johnston | 2016-04-04 | 4 | -31/+123 |
| | | |||||
* | | Merge pull request #689 from matrix-org/erikj/member | Erik Johnston | 2016-04-04 | 1 | -0/+16 |
|\| | | | | | Do checks for memberships before creating events | ||||
| * | Use computed prev event ids | Erik Johnston | 2016-04-01 | 1 | -0/+16 |
| | | |||||
* | | Merge pull request #686 from matrix-org/markjh/doc_strings | Mark Haines | 2016-04-01 | 3 | -13/+20 |
|\ \ | |/ |/| | Use google style doc strings. | ||||
| * | Use google style doc strings. | Mark Haines | 2016-04-01 | 3 | -13/+20 |
| | | | | | | | | | | | | | | pycharm supports them so there is no need to use the other format. Might as well convert the existing strings to reduce the risk of people accidentally cargo culting the wrong doc string format. | ||||
* | | Merge pull request #684 from matrix-org/markjh/backfill_id_gen | Mark Haines | 2016-04-01 | 11 | -61/+71 |
|\ \ | | | | | | | Use a stream id generator for backfilled ids | ||||
| * | | Assert that the step != 0 | Mark Haines | 2016-04-01 | 1 | -0/+1 |
| | | | |||||
| * | | use google style doc strings | Mark Haines | 2016-04-01 | 1 | -11/+12 |
| | | | |||||
| * | | Rename direction to step, apply checks consistently | Mark Haines | 2016-04-01 | 2 | -16/+16 |
| | | | |||||
| * | | Use a stream id generator for backfilled ids | Mark Haines | 2016-04-01 | 11 | -61/+69 |
| |/ | |||||
* / | Fix the invalidation of the names and aliases cache | Mark Haines | 2016-04-01 | 1 | -1/+1 |
|/ | |||||
* | Move the check for backfilled outside the for loop | Mark Haines | 2016-03-31 | 1 | -5/+5 |
| | |||||
* | Remove the is_new_state argument to persist event. | Mark Haines | 2016-03-31 | 1 | -40/+50 |
| | | | | | | | | | Move the checks for whether an event is new state inside persist event itself. This was harder than expected because there wasn't enough information passed to persist event to correctly handle invites from remote servers for new rooms. | ||||
* | Merge pull request #676 from matrix-org/markjh/replicate_stateIII | Mark Haines | 2016-03-31 | 2 | -2/+114 |
|\ | | | | | Add replication streams for ex outliers and current state resets | ||||
| * | Use a namedtuple rather than tuple unpacking | Mark Haines | 2016-03-31 | 1 | -2/+9 |
| | | |||||
| * | Add replication streams for ex outliers and current state resets | Mark Haines | 2016-03-30 | 2 | -1/+97 |
| | | |||||
| * | Add a entry to current_state_resets table when the current state is reset | Mark Haines | 2016-03-30 | 1 | -0/+9 |
| | | |||||
* | | return the state_group for backfill | Mark Haines | 2016-03-30 | 1 | -1/+2 |
|/ | |||||
* | Add a replication stream for state groups | Mark Haines | 2016-03-30 | 2 | -1/+35 |
| | |||||
* | Use a stream id generator to assign state group ids | Mark Haines | 2016-03-30 | 3 | -49/+59 |
| | |||||
* | Don't bother interning keys that are already interned | Erik Johnston | 2016-03-23 | 1 | -3/+1 |
| | |||||
* | Intern all the things | Erik Johnston | 2016-03-23 | 3 | -17/+17 |
| | |||||
* | String intern | Erik Johnston | 2016-03-23 | 1 | -3/+9 |
| | |||||
* | Merge pull request #664 from matrix-org/erikj/public_room_list | Erik Johnston | 2016-03-23 | 1 | -0/+23 |
|\ | | | | | Don't require alias in public room list. | ||||
| * | Comment about weird SQL | Erik Johnston | 2016-03-23 | 1 | -1/+3 |
| | | |||||
| * | SQLite and postgres doesn't share a true literal | Erik Johnston | 2016-03-23 | 1 | -1/+1 |
| | | |||||
| * | Ensure all old public rooms have aliases | Erik Johnston | 2016-03-23 | 1 | -0/+21 |
| | | |||||
* | | Merge pull request #663 from matrix-org/erikj/invite_for_user | Erik Johnston | 2016-03-23 | 1 | -6/+4 |
|\ \ | | | | | | | Make get_invites return RoomsForUser | ||||
| * | | Make get_invites return RoomsForUser | Erik Johnston | 2016-03-23 | 1 | -6/+4 |
| |/ | |||||
* | | Merge pull request #665 from matrix-org/erikj/dont_cache_events | Erik Johnston | 2016-03-23 | 3 | -23/+30 |
|\ \ | | | | | | | Only cache events in the event cache | ||||
| * | | Don't cache events in get_recent_events_for_room | Erik Johnston | 2016-03-23 | 1 | -14/+19 |
| | | | |||||
| * | | Don't cache events in get_current_state_for_key | Erik Johnston | 2016-03-23 | 2 | -9/+11 |
| |/ | |||||
* / | Make StateHandler._state_cache only store event_ids. | Erik Johnston | 2016-03-22 | 1 | -0/+25 |
|/ | |||||
* | Bump get_unread_event_push_actions_by_room_for_user cache | Erik Johnston | 2016-03-22 | 1 | -1/+1 |
| | |||||
* | Bump get_aliases_for_room cache | Erik Johnston | 2016-03-22 | 1 | -1/+1 |
| | |||||
* | Merge pull request #660 from matrix-org/erikj/state_cache | Erik Johnston | 2016-03-22 | 1 | -60/+48 |
|\ | | | | | Don't cache events in _state_group_cache | ||||
| * | Don't cache events in _state_group_cache | Erik Johnston | 2016-03-22 | 1 | -60/+48 |
| | | | | | | | | | | | | | | | | | | Instead, simply cache the event ids, relying on the event cache to cache the actual events. The problem was that while the state groups cache was limited in the number of groups it could hold, each individual group could consist of thousands of events. | ||||
* | | Merge pull request #659 from matrix-org/erikj/state_cache_factor | Erik Johnston | 2016-03-22 | 1 | -1/+7 |
|\ \ | | | | | | | Make stateGroupCache honour CACHE_SIZE_FACTOR | ||||
| * | | Make stateGroupCache honour CACHE_SIZE_FACTOR | Erik Johnston | 2016-03-22 | 1 | -1/+7 |
| |/ | |||||
* | | Merge pull request #657 from matrix-org/erikj/roomlist | Erik Johnston | 2016-03-22 | 1 | -0/+8 |
|\ \ | |/ |/| | Add published room list edit API | ||||
| * | Add published room list edit API | Erik Johnston | 2016-03-21 | 1 | -0/+8 |
| | | |||||
* | | Remove unused backfilled parameter from persist_event | Mark Haines | 2016-03-21 | 1 | -18/+4 |
|/ | |||||
* | Dedupe requested event list in _get_events | Erik Johnston | 2016-03-18 | 1 | -14/+12 |
| | |||||
* | Remove dead code left over from presence changes | Mark Haines | 2016-03-17 | 1 | -24/+0 |
| | |||||
* | Add a comment to offer a hint to an explanation for why we have a unique ↵ | Mark Haines | 2016-03-16 | 1 | -0/+1 |
| | | | | constraint on (app_id, pushkey, user_id) | ||||
* | Fix a couple of errors when deleting pushers | Mark Haines | 2016-03-15 | 1 | -2/+2 |
| | |||||
* | Add replication stream for pushers | Mark Haines | 2016-03-15 | 4 | -17/+82 |
| | |||||
* | Thats not how transactions work. | Erik Johnston | 2016-03-11 | 1 | -13/+16 |
| | |||||
* | Implement logout | Erik Johnston | 2016-03-11 | 1 | -14/+35 |
| | |||||
* | Fix SQL statement | Erik Johnston | 2016-03-11 | 1 | -1/+1 |
| | |||||
* | Merge pull request #641 from matrix-org/dbkr/fix_change_password | Erik Johnston | 2016-03-11 | 1 | -21/+18 |
|\ | | | | | Fix logout on password change | ||||
| * | more pep8 | David Baker | 2016-03-11 | 1 | -1/+1 |
| | | |||||
| * | Make select more sensible when dseleting access tokens, rename pusher ↵ | David Baker | 2016-03-11 | 1 | -5/+3 |
| | | | | | | | | deletion to match access token deletion and make exception arg optional. | ||||
| * | Delete old, unused methods and rename new one to just be ↵ | David Baker | 2016-03-11 | 1 | -15/+2 |
| | | | | | | | | `user_delete_access_tokens` with an `except_token_ids` argument doing what it says on the tin. | ||||
| * | Dear PyCharm, please indent sensibly for me. Thx. | David Baker | 2016-03-11 | 1 | -1/+1 |
| | | |||||
| * | Fix cache invalidation so deleting access tokens (which we did when changing ↵ | David Baker | 2016-03-11 | 1 | -8/+20 |
| | | | | | | | | password) actually takes effect without HS restart. Reinstate the code to avoid logging out the session that changed the password, removed in 415c2f05491ce65a4fc34326519754cd1edd9c54 | ||||
* | | Merge pull request #635 from matrix-org/erikj/sync_order | Erik Johnston | 2016-03-11 | 1 | -3/+6 |
|\ \ | |/ |/| | Use topological orders for initial sync timeline | ||||
| * | Add comment | Erik Johnston | 2016-03-09 | 1 | -0/+3 |
| | | |||||
| * | Return the correct token form | Erik Johnston | 2016-03-09 | 1 | -1/+1 |
| | | |||||
| * | Use topological orders for initial sync timeline | Erik Johnston | 2016-03-09 | 1 | -2/+2 |
| | | |||||
* | | Store appservice ID on register | Daniel Wagner-Hall | 2016-03-10 | 1 | -6/+34 |
| | | |||||
* | | Update users table in a batched manner | Erik Johnston | 2016-03-10 | 1 | -9/+14 |
|/ | |||||
* | Ensure integer is an integer | Erik Johnston | 2016-03-09 | 1 | -1/+1 |
| | |||||
* | Merge pull request #632 from matrix-org/markjh/py3v2 | Mark Haines | 2016-03-08 | 6 | -6/+6 |
|\ | | | | | Fix relative imports so they work in both py3 and py27 | ||||
| * | Fix relative imports so they work in both py3 and py27 | Mark Haines | 2016-03-08 | 6 | -6/+6 |
| | | |||||
* | | Merge branch 'develop' into daniel/ick | Daniel Wagner-Hall | 2016-03-08 | 7 | -86/+302 |
|\| | |||||
| * | Prefill from the correct stream | Mark Haines | 2016-03-04 | 1 | -1/+1 |
| | | |||||
| * | prefill the push rules stream change cache | Mark Haines | 2016-03-04 | 1 | -2/+9 |
| | | |||||
| * | s/stream_ordering/event_stream_ordering/ in push | Mark Haines | 2016-03-04 | 2 | -26/+30 |
| | | |||||
| * | /FNARG/d | Mark Haines | 2016-03-04 | 1 | -1/+0 |
| | | |||||
| * | Merge branch 'develop' into markjh/pushrule_stream | Mark Haines | 2016-03-04 | 8 | -26/+126 |
| |\ | |||||
| | * | Merge pull request #614 from matrix-org/erikj/alias_delete | Erik Johnston | 2016-03-04 | 2 | -1/+30 |
| | |\ | | | | | | | | | Allow alias creators to delete aliases | ||||
| | | * | Allow alias creators to delete aliases | Erik Johnston | 2016-03-01 | 2 | -1/+30 |
| | | | | |||||
| * | | | Hook up the push rules stream to account_data in /sync | Mark Haines | 2016-03-04 | 2 | -68/+62 |
| | | | | |||||
| * | | | Hook push rules up to the replication API | Mark Haines | 2016-03-02 | 1 | -0/+6 |
| | | | | |||||
| * | | | Add a stream for push rule updates | Mark Haines | 2016-03-01 | 5 | -74/+251 |
| | | | | |||||
* | | | | Idempotent-ise schema update script | Daniel Wagner-Hall | 2016-03-08 | 1 | -1/+5 |
| |/ / |/| | | | | | | | | | | | If any ASes don't have an ID, the schema will fail, and then it will error when trying to add the column again. | ||||
* | | | Merge pull request #571 from matrix-org/daniel/asids | Daniel Wagner-Hall | 2016-03-03 | 6 | -25/+96 |
|\ \ \ | |/ / |/| | | Mark AS users with their AS's ID | ||||
| * | | Mark AS users with their AS's ID | Daniel Wagner-Hall | 2016-02-11 | 6 | -26/+97 |
| | | | |||||
* | | | Merge pull request #489 from matrix-org/markjh/replication | Mark Haines | 2016-03-01 | 5 | -2/+164 |
|\ \ \ | | | | | | | | | Add a /replication API for extracting the updates that happened on synapse. | ||||
| * | | | Add a /replication API for extracting the updates that happened on | Mark Haines | 2016-03-01 | 5 | -2/+164 |
| | |/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | synapse This is necessary for replicating the data in synapse to be visible to a separate service because presence and typing notifications aren't stored in a database so won't be visible to another process. This API can be used to either get the raw data by requesting the tables themselves or to just receive notifications for updates by following the streams meta-stream. Returns updates for each table requested a JSON array of arrays with a row for each row in the table. Each table is prefixed by a header row with the: name of the table, current stream_id position for the table, number of rows, number of columns and the names of the columns. This is followed by the rows that have been added to the server since the requester last asked. The API has a timeout and is hooked up to the notifier so that a slave can long poll for updates. | ||||
* / | | Load the current id in the IdGenerator constructor | Mark Haines | 2016-03-01 | 12 | -77/+52 |
|/ / | | | | | | | | | | | | | | | | | Rather than loading them lazily. This allows us to remove all the yield statements and spurious arguments for the get_next methods. It also allows us to replace all instances of get_next_txn with get_next since get_next no longer needs to access the db. | ||||
* | | Add support for changing the actions for default rules | Mark Haines | 2016-02-26 | 1 | -0/+25 |
| | | | | | | | | | | | | See matrix-org/matrix-doc#283 Works by adding dummy rules to the push rules table with a negative priority class and then using those rules to clobber the default rule actions when adding the default rules in ``list_with_base_rules`` | ||||
* | | Generate guest access token on 3pid invites | Daniel Wagner-Hall | 2016-02-24 | 2 | -0/+68 |
| | | | | | | | | | | | | | | | | | | This means that following the same link across multiple sessions or devices can re-use the same guest account. Note that this is somewhat of an abuse vector; we can't throw up captchas on this flow, so this is a way of registering ephemeral accounts for spam, whose sign-up we don't rate limit. | ||||
* | | Create a new stream_id per presence update | Erik Johnston | 2016-02-23 | 1 | -6/+9 |
| | | |||||
* | | Merge pull request #582 from matrix-org/erikj/presence | Erik Johnston | 2016-02-19 | 10 | -65/+211 |
|\ \ | | | | | | | Rewrite presence for performance. | ||||
| * | | Close cursor | Erik Johnston | 2016-02-18 | 1 | -0/+1 |
| | | | |||||
| * | | Remove unused param from get_max_token | Erik Johnston | 2016-02-18 | 6 | -13/+11 |
| | | | |||||
| * | | Prefix TS fields with _ts | Erik Johnston | 2016-02-18 | 3 | -16/+17 |
| | | | |||||
| * | | Initial cut | Erik Johnston | 2016-02-17 | 5 | -55/+201 |
| | | | |||||
* | | | Remove dead code for setting device specific rules. | Mark Haines | 2016-02-18 | 2 | -7/+6 |
| | | | | | | | | | | | | | | | | | | It wasn't possible to hit the code from the API because of a typo in parsing the request path. Since no-one was using the feature we might as well remove the dead code. | ||||
* | | | Merge branch 'develop' into daniel/roomcleanupincremental | Daniel Wagner-Hall | 2016-02-17 | 1 | -82/+86 |
|\| | | | | | | | | | | | | | | Conflicts: synapse/rest/client/v1/room.py | ||||
| * | | Make adding push rules idempotent | Mark Haines | 2016-02-16 | 1 | -82/+86 |
| | | | | | | | | | | | | | | | | | | Also remove the **kwargs from the add_push_rule method. Fixes https://matrix.org/jira/browse/SYN-391 | ||||
* | | | Respond to federated invite with non-empty context | Daniel Wagner-Hall | 2016-02-17 | 1 | -4/+4 |
|/ / | | | | | | | | | | | | | Currently, we magically perform an extra database hit to find the inviter, and use this to guess where we should send the event. Instead, fill in a valid context, so that other callers relying on the context actually have one. | ||||
* | | Fix SYN-627, events are in incorrect room in /sync | Erik Johnston | 2016-02-11 | 1 | -1/+1 |
| | | |||||
* | | Return events in correct order for /events | Erik Johnston | 2016-02-11 | 1 | -8/+11 |
|/ | |||||
* | Batch fetch _get_state_groups_from_groups | Erik Johnston | 2016-02-10 | 1 | -32/+34 |
| | |||||
* | Use _simple_select_many for _get_state_group_for_events | Erik Johnston | 2016-02-10 | 1 | -16/+10 |
| | |||||
* | Merge pull request #568 from matrix-org/erikj/unread_notif | Erik Johnston | 2016-02-10 | 2 | -39/+32 |
|\ | | | | | Atomically persit push actions when we persist the event | ||||
| * | Rename functions | Erik Johnston | 2016-02-10 | 2 | -4/+4 |
| | | |||||
| * | Atomically persit push actions when we persist the event | Erik Johnston | 2016-02-09 | 2 | -39/+32 |
| | | |||||
* | | Change a log from debug to info | Erik Johnston | 2016-02-09 | 1 | -1/+1 |
|/ | |||||
* | Invalidate get_last_receipt_event_id_for_user cache | Erik Johnston | 2016-02-09 | 1 | -0/+5 |
| | |||||
* | Don't load all ephemeral state for a room on every sync | Erik Johnston | 2016-02-09 | 1 | -0/+14 |
| | |||||
* | Fix up logcontexts | Erik Johnston | 2016-02-08 | 4 | -29/+37 |
| | |||||
* | Allocate guest user IDs numericcally | Daniel Wagner-Hall | 2016-02-05 | 1 | -0/+36 |
| | | | | | | | | | The current random IDs are ugly and confusing when presented in UIs. This makes them prettier and easier to read. Also, disable non-automated registration of numeric IDs so that we don't need to worry so much about people carving out our automated address space and us needing to keep retrying ID registration. | ||||
* | Actually return something sensible | Erik Johnston | 2016-02-03 | 1 | -1/+1 |
| | |||||
* | We return dicts now. | Erik Johnston | 2016-02-03 | 1 | -1/+1 |
| | |||||
* | Add descriptions | Erik Johnston | 2016-02-03 | 4 | -1/+5 |
| | |||||
* | Merge pull request #554 from matrix-org/erikj/event_push | Erik Johnston | 2016-02-03 | 3 | -16/+64 |
|\ | | | | | Change event_push_actions_rm_tokens schema | ||||
| * | Change event_push_actions_rm_tokens schema | Erik Johnston | 2016-02-03 | 3 | -16/+64 |
| | | |||||
* | | Simplify get_rooms | Erik Johnston | 2016-02-03 | 1 | -77/+7 |
| | | |||||
* | | Merge branch 'develop' of github.com:matrix-org/synapse into ↵ | Erik Johnston | 2016-02-03 | 6 | -36/+42 |
|\| | | | | | | | erikj/public_room_fix | ||||
| * | Fix flake8 warnings for new flake8 | Daniel Wagner-Hall | 2016-02-02 | 6 | -9/+12 |
| | | |||||
| * | s/get_room_changes_for_user/get_membership_changes_for_user/ | Erik Johnston | 2016-02-02 | 1 | -2/+2 |
| | | |||||
| * | Fetch events in a separate transaction. | Erik Johnston | 2016-02-02 | 1 | -26/+29 |
| | | | | | | | | | | | | | | | | | | This has a couple of benefits: - It reduces the time of transactions, allowing other database requests to run. - Fetching events is given a dedicated database thread, and so can't starve other database requests. | ||||
* | | Unused import | Erik Johnston | 2016-02-03 | 1 | -1/+1 |
| | | |||||
* | | Change the way we do public room list fetching | Erik Johnston | 2016-02-02 | 2 | -1/+17 |
|/ | |||||
* | Order things correctly | Erik Johnston | 2016-02-01 | 1 | -0/+4 |
| | |||||
* | Switch over /events to use per room caches | Erik Johnston | 2016-02-01 | 1 | -2/+2 |
| | |||||
* | Merge pull request #543 from matrix-org/erikj/sync | Erik Johnston | 2016-02-01 | 3 | -0/+15 |
|\ | | | | | Cache get_room_changes_for_user | ||||
| * | Cache get_room_changes_for_user | Erik Johnston | 2016-01-29 | 3 | -0/+15 |
| | | |||||
* | | Only use room_ids if in get_room_events_stream if is_guest | Erik Johnston | 2016-02-01 | 1 | -5/+0 |
|/ | |||||
* | Invalidate _account_data_stream_cache correctly | Erik Johnston | 2016-01-29 | 1 | -0/+4 |
| | |||||
* | Comment. Remove superfluous order by | Erik Johnston | 2016-01-29 | 1 | -1/+3 |
| | |||||
* | Don't prefill account data | Erik Johnston | 2016-01-29 | 1 | -8/+1 |
| | |||||
* | Actually use cache | Erik Johnston | 2016-01-29 | 1 | -7/+13 |
| | |||||
* | Max is not a function | Erik Johnston | 2016-01-29 | 1 | -1/+1 |
| | |||||
* | Convert param style | Erik Johnston | 2016-01-29 | 1 | -0/+3 |
| | |||||
* | Prefill stream change caches | Erik Johnston | 2016-01-29 | 3 | -18/+48 |
| | |||||
* | Bump AccountDataAndTagsChangeCache size | Erik Johnston | 2016-01-29 | 1 | -1/+1 |
| | |||||
* | Merge pull request #536 from matrix-org/erikj/sync | Erik Johnston | 2016-01-29 | 6 | -74/+218 |
|\ | | | | | Make /sync "better". | ||||
| * | Amalgamate tags and account data stream caches | Erik Johnston | 2016-01-28 | 2 | -12/+9 |
| | | |||||
| * | Don't use defer.returnValue | Erik Johnston | 2016-01-28 | 1 | -1/+1 |
| | | |||||
| * | Add events index | Erik Johnston | 2016-01-28 | 1 | -0/+16 |
| | | |||||
| * | Change name and doc has_entity_changed | Erik Johnston | 2016-01-28 | 3 | -3/+3 |
| | | |||||
| * | Cache tags and account data | Erik Johnston | 2016-01-28 | 5 | -10/+42 |
| | | |||||
| * | Ensure keys to RoomStreamChangeCache are ints | Erik Johnston | 2016-01-28 | 1 | -5/+6 |
| | | |||||
| * | Invalidate caches properly. Remove unused arg | Erik Johnston | 2016-01-28 | 3 | -8/+13 |
| | | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync | Erik Johnston | 2016-01-28 | 1 | -18/+9 |
| |\ | |||||
| * | | Allow paginating backwards from stream token | Erik Johnston | 2016-01-28 | 1 | -2/+14 |
| | | | |||||
| * | | Return correct type of token | Erik Johnston | 2016-01-28 | 1 | -3/+6 |
| | | | |||||
| * | | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/sync | Erik Johnston | 2016-01-28 | 1 | -1/+1 |
| |\ \ | |||||
| * | | | PEP8 | Erik Johnston | 2016-01-27 | 3 | -6/+9 |
| | | | | |||||
| * | | | Use the same path for incremental with gap or without gap | Erik Johnston | 2016-01-27 | 2 | -4/+3 |
| | | | | |||||
| * | | | Add cache to room stream | Erik Johnston | 2016-01-27 | 3 | -62/+138 |
| | | | | |||||
* | | | | Cache filters | Erik Johnston | 2016-01-28 | 1 | -1/+2 |
| |_|/ |/| | | |||||
* | | | Merge pull request #534 from matrix-org/erikj/setup | Erik Johnston | 2016-01-28 | 7 | -89/+74 |
|\ \ \ | |_|/ |/| | | Add a Homeserver.setup method | ||||
| * | | Clean up a bit. Add comment | Erik Johnston | 2016-01-28 | 1 | -18/+9 |
| |/ | |||||
| * | Merge branch 'develop' of github.com:matrix-org/synapse into erikj/setup | Erik Johnston | 2016-01-27 | 1 | -1/+2 |
| |\ | |||||
| * | | Add a Homeserver.setup method. | Erik Johnston | 2016-01-26 | 7 | -89/+83 |
| | | | | | | | | | | | | | | | | | | This is for setting up dependencies that require work on startup. This is useful for the DataStore that wants to read a bunch from the database before initiliazing. | ||||
* | | | Up get_rooms_for_user cache size | Erik Johnston | 2016-01-28 | 1 | -1/+1 |
| |/ |/| | |||||
* | | Fix adding push rules relative to other rules | Mark Haines | 2016-01-27 | 1 | -1/+2 |
|/ | |||||
* | Merge pull request #525 from matrix-org/erikj/select_many | Erik Johnston | 2016-01-25 | 3 | -60/+110 |
|\ | | | | | Implement a `_simple_select_many_batch` | ||||
| * | Guard against empty iterables | Erik Johnston | 2016-01-25 | 1 | -0/+6 |
| | | |||||
| * | Correct docstring | Erik Johnston | 2016-01-25 | 1 | -1/+0 |
| | | |||||
| * | Implement a _simple_select_many_batch | Erik Johnston | 2016-01-25 | 3 | -60/+105 |
| | | |||||
* | | Merge pull request #527 from matrix-org/erikj/push_cache | Erik Johnston | 2016-01-25 | 1 | -0/+1 |
|\ \ | | | | | | | Push: Use storage apis that are cached | ||||
| * | | Push: Use storage apis that are cached | Erik Johnston | 2016-01-25 | 1 | -0/+1 |
| |/ | |||||
* / | Add index to event_push_actions | Erik Johnston | 2016-01-25 | 1 | -0/+1 |
|/ | |||||
* | Overlay the push_rules_enabled map for users, otherwise they won't be able ↵ | David Baker | 2016-01-22 | 1 | -0/+29 |
| | | | | to disable server default rules. | ||||
* | Make LRU cache not default to treecache & add options to use it | David Baker | 2016-01-22 | 1 | -1/+1 |
| | |||||
* | Use new invalidate_many cache invalidation to invalidate the ↵ | David Baker | 2016-01-22 | 1 | -4/+15 |
| | | | | event_push_actions cache appropriately. | ||||
* | Cache get_unread_event_push_actions_by_room_for_user | Erik Johnston | 2016-01-21 | 1 | -1/+2 |
| | |||||
* | peppate | David Baker | 2016-01-20 | 1 | -3/+2 |
| | |||||
* | Add index by user id on receipts_linearized | David Baker | 2016-01-20 | 1 | -0/+18 |
| | |||||
* | Add storage function to get all receipts for a user. Also add some cache ↵ | David Baker | 2016-01-20 | 1 | -21/+34 |
| | | | | invalidation to the receipts storage because there wasn't any, and remove a method that was unused. | ||||
* | Add regex cache. Only caculate push actions for users that have sent read ↵ | Erik Johnston | 2016-01-19 | 1 | -1/+13 |
| | | | | receipts, and are on that server | ||||
* | Return highlight_count in /sync | Erik Johnston | 2016-01-19 | 1 | -2/+3 |
| | |||||
* | Remove dead code | Erik Johnston | 2016-01-18 | 1 | -22/+1 |
| | |||||
* | Make unit tests work | Erik Johnston | 2016-01-18 | 1 | -1/+1 |
| | |||||
* | Make notifications go quicker | Erik Johnston | 2016-01-18 | 2 | -4/+45 |
| | |||||
* | Allow filtering events for multiple users at once | Erik Johnston | 2016-01-18 | 1 | -0/+13 |
| | |||||
* | Require ID and as_token be unique for ASs | Daniel Wagner-Hall | 2016-01-14 | 1 | -1/+25 |
| | | | | | Defaults ID to as_token if not specified. This will change when IDs are fully supported. | ||||
* | Merge pull request #494 from matrix-org/daniel/2 | Daniel Wagner-Hall | 2016-01-14 | 1 | -0/+1 |
|\ | | | | | Don't start server if ASes are invalidly configured | ||||
| * | Don't start server if ASes are invalidly configured | Daniel Wagner-Hall | 2016-01-13 | 1 | -0/+1 |
| | | |||||
* | | Merge pull request #493 from matrix-org/daniel/1 | Daniel Wagner-Hall | 2016-01-14 | 1 | -59/+0 |
|\ \ | | | | | | | Delete unused code | ||||
| * | | Delete unused code | Daniel Wagner-Hall | 2016-01-13 | 1 | -59/+0 |
| |/ | |||||
* / | Rename 'user_name' to 'user_id' in push to make it consistent with the rest ↵ | Mark Haines | 2016-01-13 | 2 | -38/+38 |
|/ | | | | of the code | ||||
* | Merge remote-tracking branch 'origin/erikj/bulk_get_push_rules' into ↵ | Mark Haines | 2016-01-13 | 1 | -18/+8 |
|\ | | | | | | | | | | | | | markjh/table_name Conflicts: synapse/storage/push_rule.py | ||||
| * | bulk_get_push_rules should handle empty lists | Erik Johnston | 2016-01-13 | 1 | -21/+13 |
| | | |||||
* | | Delete the table objects from TransactionStore | Mark Haines | 2016-01-13 | 1 | -58/+10 |
| | | |||||
* | | Remove the RoomsTable object | Mark Haines | 2016-01-13 | 1 | -13/+3 |
| | | |||||
* | | Remove the PushersTable and EventPushActionsTable objects | Mark Haines | 2016-01-12 | 2 | -14/+6 |
| | | |||||
* | | Remove the PushRuleTable and PushRuleEnableTable objects | Mark Haines | 2016-01-12 | 1 | -50/+33 |
|/ | |||||
* | Postgres doesn't like booleans | David Baker | 2016-01-11 | 1 | -2/+2 |
| | |||||
* | Remove rogue 'admin' | David Baker | 2016-01-11 | 1 | -1/+1 |
| | |||||
* | Merge pull request #456 from matrix-org/store_event_actions | David Baker | 2016-01-08 | 6 | -11/+230 |
|\ | | | | | Send unread notification counts | ||||
| * | This comma is actually important | David Baker | 2016-01-07 | 1 | -1/+1 |
| | | |||||
| * | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2016-01-06 | 1 | -1/+10 |
| |\ | |||||
| * | | Adding is_guest here won't work because it just constructs a dict of uid -> ↵ | David Baker | 2016-01-06 | 1 | -1/+1 |
| | | | | | | | | | | | | password hash | ||||
| * | | Delete notifications for redacted events | David Baker | 2016-01-06 | 1 | -0/+12 |
| | | | |||||
| * | | Add schema change file for is_guest flag | David Baker | 2016-01-06 | 1 | -0/+22 |
| | | | |||||
| * | | Add is_guest flag to users db to track whether a user is a guest user or ↵ | David Baker | 2016-01-06 | 3 | -13/+31 |
| | | | | | | | | | | | | not. Use this so we can run _filter_events_for_client when calculating event_push_actions. | ||||
| * | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2016-01-05 | 3 | -9/+39 |
| |\ \ | |||||
| * | | | = not == in sql | David Baker | 2016-01-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Rename event-actions to event_push_actions as per PR request | David Baker | 2016-01-04 | 3 | -14/+14 |
| | | | | |||||
| * | | | Address minor PR issues | David Baker | 2016-01-04 | 3 | -16/+4 |
| | | | | |||||
| * | | | Insert push actions in a single db query rather than one per user/profile_tag | David Baker | 2015-12-22 | 1 | -13/+18 |
| | | | | |||||
| * | | | Add bulk push rule evaluator which actually still evaluates rules one by ↵ | David Baker | 2015-12-22 | 1 | -0/+41 |
| | | | | | | | | | | | | | | | | one, but does far fewer db queries to fetch the rules | ||||
| * | | | Merge remote-tracking branch 'origin/develop' into store_event_actions | David Baker | 2015-12-21 | 3 | -14/+81 |
| |\ \ \ | |||||
| * | | | | pep8 | David Baker | 2015-12-21 | 1 | -6/+6 |
| | | | | | |||||
| * | | | | Make unread notification count sending work: put the correct count in ↵ | David Baker | 2015-12-18 | 1 | -9/+12 |
| | | | | | | | | | | | | | | | | | | | | incremental syncs too, where necessary, and fix silly bugs like only select the event actions for that user... | ||||
| * | | | | still very WIP, but now sends unread_notifications_count in the room object ↵ | David Baker | 2015-12-16 | 2 | -4/+54 |
| | | | | | | | | | | | | | | | | | | | | on sync (only actually corrrect in a full sync: hardcoded to 0 in incremental syncs). | ||||
| * | | | | Save event actions to the db | David Baker | 2015-12-10 | 3 | -0/+68 |
| | | | | | |||||
| * | | | | Very first cut of calculating actions for events as they come in. Doesn't ↵ | David Baker | 2015-12-10 | 1 | -0/+12 |
| | | | | | | | | | | | | | | | | | | | | store them yet. Not very efficient. | ||||
* | | | | | copyrights | Matthew Hodgson | 2016-01-07 | 85 | -85/+85 |
| |_|_|/ |/| | | | |||||
* | | | | Log when we skip daily messages | Daniel Wagner-Hall | 2016-01-06 | 1 | -1/+10 |
| |_|/ |/| | | |||||
* | | | Allow guests to upgrade their accounts | Daniel Wagner-Hall | 2016-01-05 | 3 | -9/+39 |
| |/ |/| | |||||
* | | Fix 500 error when back-paginating search results | Richard van der Hoff | 2015-12-17 | 1 | -2/+4 |
| | | | | | | | | | | We were mistakenly adding pagination clauses to the count query, which then failed because the count query doesn't join to the events table. | ||||
* | | Merge branch 'release-v0.12.0' into develop | Mark Haines | 2015-12-16 | 1 | -1/+1 |
|\ \ | |||||
| * | | Allow users to change which account a 3pid is bound to | Mark Haines | 2015-12-15 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'release-v0.12.0' into develop | Mark Haines | 2015-12-14 | 1 | -0/+5 |
|\| | | |||||
| * | | Skip events that where the body, name or topic isn't a string when back ↵ | Mark Haines | 2015-12-14 | 1 | -0/+5 |
| | | | | | | | | | | | | populating the FTS index | ||||
* | | | Fix typo | Daniel Wagner-Hall | 2015-12-14 | 1 | -1/+1 |
| | | | |||||
* | | | Fix typo in sql for full text search on sqlite3 | Mark Haines | 2015-12-14 | 1 | -1/+1 |
| | | | |||||
* | | | Merge branch 'release-v0.12.0' into develop | Mark Haines | 2015-12-12 | 1 | -4/+7 |
|\| | | |||||
| * | | Add caches for whether a room has been forgotten by a user | Mark Haines | 2015-12-10 | 1 | -4/+7 |
| |/ | |||||
* | | Include approximate count of search results | Erik Johnston | 2015-12-11 | 1 | -2/+54 |
| | | |||||
* | | Use more efficient query form | Erik Johnston | 2015-12-11 | 1 | -8/+13 |
|/ | |||||
* | Track the time spent in the database per request. | Mark Haines | 2015-12-07 | 2 | -3/+8 |
| | | | | and track the number of transactions that request started. | ||||
* | Bump schema version. | Mark Haines | 2015-12-04 | 5 | -24/+37 |
| | | | | As we released version 26 in v0.11.1 | ||||
* | Merge pull request #414 from matrix-org/erikj/if_not_exists | Erik Johnston | 2015-12-03 | 1 | -1/+1 |
|\ | | | | | Older versions of SQLite don't like IF NOT EXISTS in virtual tables | ||||
| * | Older versions of SQLite don't like IF NOT EXISTS in virtual tables | Erik Johnston | 2015-12-02 | 1 | -1/+1 |
| | | |||||
* | | Just replace the table definition with the one from full_schema 16 | David Baker | 2015-12-02 | 1 | -11/+10 |
| | | |||||
* | | Fix schema delta 15 on postgres in the very unlikley event that anyone ↵ | David Baker | 2015-12-02 | 1 | -1/+1 |
| | | | | | | | | upgrades to 15... | ||||
* | | Merge pull request #412 from matrix-org/erikj/search | Erik Johnston | 2015-12-02 | 1 | -11/+36 |
|\ \ | |/ |/| | Search: Add prefix matching support | ||||
| * | Throw if unrecognized DB type | Erik Johnston | 2015-12-02 | 1 | -1/+4 |
| | | |||||
| * | Fix so highlight matching works again | Erik Johnston | 2015-12-02 | 1 | -8/+13 |
| | | |||||
| * | Remove deuplication. Add comment about regex. | Erik Johnston | 2015-12-02 | 1 | -21/+11 |
| | | |||||
| * | Search: Add prefix matching support | Erik Johnston | 2015-12-02 | 1 | -5/+32 |
| | | |||||
* | | Add API for setting account_data globaly or on a per room basis | Mark Haines | 2015-12-01 | 4 | -2/+238 |
|/ | |||||
* | Allow paginating search ordered by recents | Erik Johnston | 2015-11-30 | 3 | -16/+159 |
| | |||||
* | Return words to highlight in search results | Erik Johnston | 2015-11-27 | 1 | -19/+104 |
| | |||||
* | Fix SQL for postgres again | Daniel Wagner-Hall | 2015-11-23 | 1 | -1/+1 |
| | |||||
* | Fix SQL for postgres | Daniel Wagner-Hall | 2015-11-23 | 1 | -1/+1 |
| | |||||
* | Remove size specifier for database column | Daniel Wagner-Hall | 2015-11-23 | 1 | -1/+3 |
| | | | | | | Postgres doesn't support them like this. We don't have a bool type in common between postgres and sqlite. | ||||
* | Merge branch 'daniel/forgetrooms' of github.com:matrix-org/synapse into ↵ | Daniel Wagner-Hall | 2015-11-19 | 2 | -9/+26 |
|\ | | | | | | | daniel/forgetrooms | ||||
| * | Merge branch 'develop' into daniel/forgetrooms | Paul "LeoNerd" Evans | 2015-11-19 | 2 | -9/+26 |
| |\ | |||||
| | * | Rename the database table | Mark Haines | 2015-11-18 | 1 | -0/+17 |
| | | | |||||
| | * | s/private_user_data/account_data/ | Mark Haines | 2015-11-18 | 2 | -10/+10 |
| | | | |||||
* | | | Ignore forgotten rooms in v2 sync | Daniel Wagner-Hall | 2015-11-19 | 1 | -1/+1 |
|/ / | |||||
* | | Simplify code | Daniel Wagner-Hall | 2015-11-19 | 1 | -7/+5 |
| | | |||||
* | | Apply forgetting properly to historical events | Daniel Wagner-Hall | 2015-11-18 | 1 | -2/+32 |
| | |