summary refs log tree commit diff
path: root/synapse/storage (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #110 from matrix-org/fix_banErik Johnston2015-03-161-1/+1
|\ | | | | Fix ban
| * Copy dict of context.current_state before changing it.Erik Johnston2015-03-161-1/+1
| |
* | Bugfix to sql_txn_timer increment - add only the per-TXN duration, not the ↵Paul "LeoNerd" Evans2015-03-121-7/+5
| | | | | | | | total time ever spent since boot
* | Rename the timer metrics exported by synapse.storage to append _time, so the ↵Paul "LeoNerd" Evans2015-03-121-3/+3
| | | | | | | | meaning of ':total' is clearer
* | Rename TimerMetric to DistributionMetric; as it could count more than just timePaul "LeoNerd" Evans2015-03-121-7/+7
| |
* | Pretend the 'getEvent' cache is just another cache in the set of all the ↵Paul "LeoNerd" Evans2015-03-121-6/+5
| | | | | | | | others for metric
* | Use _ instead of . as a metric namespacing separator, for PrometheusPaul "LeoNerd" Evans2015-03-121-5/+13
| |
* | Rename Metrics' "keys" to "labels"Paul "LeoNerd" Evans2015-03-121-3/+3
| |
* | Add TimerMetrics to shadow the PerformanceCounters in synapse.storage; with ↵Paul "LeoNerd" Evans2015-03-121-3/+20
| | | | | | | | the view to eventually replacing them entirely
* | Collect per-SQL-verb timer stats on query execution timePaul "LeoNerd" Evans2015-03-121-5/+11
| |
* | Delete a couple of TODO markers of monitoring stats now donePaul "LeoNerd" Evans2015-03-121-1/+0
| |
* | Rename CacheCounterMetric to just CacheMetric; add a CallbackMetric ↵Paul "LeoNerd" Evans2015-03-121-3/+3
| | | | | | | | component to give the size of the cache
* | Sprinkle some CacheCounterMetrics around the synapse.storage layerPaul "LeoNerd" Evans2015-03-121-1/+15
| |
* | Appease pep8Paul "LeoNerd" Evans2015-03-111-2/+2
| |
* | Also give _execute() a descriptionPaul "LeoNerd" Evans2015-03-116-12/+10
| |
* | Add a description to storage layer's _execute_and_decode()Paul "LeoNerd" Evans2015-03-115-6/+9
| |
* | Add the master push rule for the break-my-push button. Allow server default ↵David Baker2015-03-101-22/+5
| | | | | | | | rules to be disabled by default.
* | These aren't defined for redacted events so don't crashDavid Baker2015-03-101-2/+4
|/
* Schema change as delta in v14David Baker2015-03-061-0/+0
|
* Merge branch 'develop' into pushrules2David Baker2015-03-0429-606/+325
|\ | | | | | | | | Conflicts: synapse/storage/schema/pusher.sql
| * Note that we don't specify execution orderErik Johnston2015-03-041-0/+4
| |
| * s/schema_deltas/applied_schema_deltas/Erik Johnston2015-03-042-9/+11
| |
| * s/%r/%s/Erik Johnston2015-03-041-1/+1
| |
| * Add example directory structures in docErik Johnston2015-03-041-1/+36
| |
| * Don't assume db conn is a Context Manager.Erik Johnston2015-03-041-1/+5
| | | | | | | | Twisted adbapi wrapped connections aren't context managers.
| * Add unique constraint on schema_version.lock schema. Use conflict clause in sql.Erik Johnston2015-03-042-4/+5
| |
| * Change to use logger in db upgrade scriptErik Johnston2015-03-041-1/+4
| |
| * Use context manager with db conn to correctly commit and rollbackErik Johnston2015-03-041-11/+11
| |
| * Actually add full_schemas dirErik Johnston2015-03-0412-0/+645
| |
| * More docs. Rename 'schema/current' to 'schema/full_schemas'Erik Johnston2015-03-0413-652/+23
| |
| * Add some docs and remove unused variablesErik Johnston2015-03-041-8/+10
| |
| * SYN-67: Finish up implementing new database schema managementErik Johnston2015-03-0428-567/+161
| |
| * SYN-67: Begin changing the way we handle schema versioningErik Johnston2015-03-021-38/+106
| |
* | Merge branch 'develop' into pushrules2David Baker2015-03-046-33/+279
|\|
| * Add missing commaErik Johnston2015-03-021-1/+1
| |
| * We purposefully don't have a version 14 delta script.Erik Johnston2015-03-021-1/+1
| |
| * Merge pull request #93 from matrix-org/application-services-exclusiveKegsay2015-03-022-4/+14
| |\ | | | | | | Application services exclusive flag support
| | * Run deltas and bump user_version in upgrade scriptKegan Dougal2015-03-021-1/+1
| | |
| | * Convert expected format for AS regex to include exclusivity.Kegan Dougal2015-02-271-3/+13
| | | | | | | | | | | | | | | Previously you just specified the regex as a string, now it expects a JSON object with a 'regex' key and an 'exclusive' boolean, as per spec.
| * | Merge branch 'develop' of github.com:matrix-org/synapse into batched_get_pduErik Johnston2015-03-025-91/+279
| |\ \
| | * | PEP8Kegan Dougal2015-03-021-1/+1
| | | |
| | * | Wrap all of get_app_service_rooms in a txn.Kegan Dougal2015-03-026-88/+67
| | | |
| | * | JOIN state_events rather than parsing unrecognized_keys to pull out member ↵Kegan Dougal2015-03-022-11/+5
| | | | | | | | | | | | | | | | state_keys
| | * | Modify _simple_select_list to allow an empty WHERE clause. Use it for ↵Kegan Dougal2015-03-024-17/+21
| | | | | | | | | | | | | | | | get_all_rooms and get_all_users.
| | * | PR tweaks: set earlier on and use 'as json' for compatKegan Dougal2015-03-023-16/+12
| | | |
| | * | PEP8Kegan Dougal2015-02-271-1/+0
| | | |
| | * | Check for membership invite events correctly.Kegan Dougal2015-02-261-2/+21
| | | |
| | * | Finish impl to get new events for AS. ASes should now be able to poll /eventsKegan Dougal2015-02-261-7/+55
| | | |
| | * | Finish impl to extract all room IDs an AS may be interested in when polling ↵Kegan Dougal2015-02-262-6/+36
| | | | | | | | | | | | | | | | the event stream.
| | * | PEP8 and pyflakesKegan Dougal2015-02-252-6/+3
| | | |
| | * | Comment unused variables.Kegan Dougal2015-02-251-2/+2
| | | |
| | * | Fix alias query.Kegan Dougal2015-02-251-6/+5
| | | |
| | * | Add support for extracting matching room_ids and room_aliases for a given AS.Kegan Dougal2015-02-253-2/+82
| | | |
| | * | Add stub functions and work out execution flow to implement AS event stream ↵Kegan Dougal2015-02-252-0/+40
| | |/ | | | | | | | | | polling.
| * | Revert get_auth_chain changesErik Johnston2015-02-231-7/+5
| | |
| * | Initial stab at implementing a batched get_missing_pdus requestErik Johnston2015-02-191-5/+58
| | |
* | | Use if not results rather than len, as per feedback.David Baker2015-03-041-1/+1
| | |
* | | s/user_name/user/ as per mjark's commentDavid Baker2015-03-021-3/+3
| | |
* | | Blank linesDavid Baker2015-03-021-0/+1
| | |
* | | Add API for getting/setting enabled-ness of push rules.David Baker2015-02-261-0/+24
| | |
* | | whitespaceDavid Baker2015-02-261-1/+2
| | |
* | | Add enable/disable overlay for push rules (REST API not yet hooked up)David Baker2015-02-253-0/+39
| |/ |/|
* | Use OrderedDict for @cached backing store, so we can evict the oldest key ↵Paul "LeoNerd" Evans2015-02-231-7/+4
| | | | | | | | unbiased
* | Use cache.pop() instead of a separate membership test + del []Paul "LeoNerd" Evans2015-02-231-2/+1
| |
* | Fix code style warningMark Haines2015-02-231-1/+1
| |
* | Remove unused importMark Haines2015-02-231-2/+0
| |
* | Pull the _get_event_cache.setdefault() call out of the try block, as it ↵Paul "LeoNerd" Evans2015-02-231-1/+2
| | | | | | | | doesn't need to be there and is confusing
* | Use the @cached decorator to implement the destination_retry_timings cachePaul "LeoNerd" Evans2015-02-231-9/+5
| |
* | RoomMemberStore no longer needs a _user_rooms_cache memberPaul "LeoNerd" Evans2015-02-231-5/+0
| |
* | Allow @cached-wrapped functions to have a prefill method for setting entriesPaul "LeoNerd" Evans2015-02-231-8/+15
| |
* | Squash out the now-redundant ApplicationServicesCache object classPaul "LeoNerd" Evans2015-02-231-20/+8
| |
* | Remove a TODO notePaul "LeoNerd" Evans2015-02-191-1/+0
| |
* | Take named arguments to @cached() decorator, add a 'max_entries' limitPaul "LeoNerd" Evans2015-02-192-16/+25
| |
* | Move @cached decorator out into synapse.storage._base; add minimal docsPaul "LeoNerd" Evans2015-02-192-27/+36
| |
* | Pull out the 'get_rooms_for_user' cache logic into a reüsable @cached decoratorPaul "LeoNerd" Evans2015-02-191-24/+29
|/
* Use absolute path when loading delta sql filesErik Johnston2015-02-171-1/+2
|
* Bump schema versionErik Johnston2015-02-172-1/+1
|
* Merge branch 'consumeErrors' of github.com:matrix-org/synapse into developErik Johnston2015-02-171-1/+1
|\
| * Use consumeErrors=True on all DeferredLists.Erik Johnston2015-02-171-1/+1
| | | | | | | | | | | | This is so that the DeferredLists actually consume the error instead of propogating down the non-existent errback chain. This should reduce the number of unhandled errors we are seeing.
* | Merge branch 'hotfixes-0.7.0e' into developDavid Baker2015-02-131-6/+6
|\|
| * Update pushers by app id and pushkey, not user id and pushkeyDavid Baker2015-02-131-6/+6
| |
* | Merge pull request #50 from matrix-org/application-servicesMark Haines2015-02-134-0/+315
|\ \ | | | | | | Application Services
| * \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-113-22/+75
| |\ \
| * | | PEP8-ifyKegan Dougal2015-02-111-3/+0
| | | |
| * | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-112-3/+70
| |\ \ \
| * \ \ \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-093-24/+36
| |\ \ \ \
| * | | | | Modify auth.get_user_by_req for authing appservices directly.Kegan Dougal2015-02-091-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add logic to map the appservice token to the autogenned appservice user ID. Add unit tests for all forms of get_user_by_req (user/appservice, valid/bad/missing tokens)
| * | | | | Register a user account for the AS when the AS registers. Add 'sender' ↵Kegan Dougal2015-02-093-2/+5
| | | | | | | | | | | | | | | | | | | | | | | | column to AS table.
| * | | | | Add delta sql file.Kegan Dougal2015-02-051-0/+33
| | | | | |
| * | | | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-051-2/+5
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'develop' into application-servicesKegan Dougal2015-02-054-84/+145
| |\ \ \ \ \ \
| * | | | | | | Add hs_token column and generate a different token f.e application service.Kegan Dougal2015-02-052-5/+13
| | | | | | | |
| * | | | | | | Fix bug in store defer. Add more unit tests.Kegan Dougal2015-02-041-4/+14
| | | | | | | |
| * | | | | | | Add stub ApplicationServiceApi and glue it with the handler.Kegan Dougal2015-02-041-0/+1
| | | | | | | |
| * | | | | | | Add appservice package and move ApplicationService into it.Kegan Dougal2015-02-031-104/+1
| | | | | | | |
| * | | | | | | Implement restricted namespace checks. Begin fleshing out the main hook for ↵Kegan Dougal2015-02-031-5/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | notifying application services.
| * | | | | | | Add namespace constants. Add restrict_to option to limit namespace checks.Kegan Dougal2015-02-031-17/+24
| | | | | | | |
| * | | | | | | Everyone loves SQL typosKegan Dougal2015-02-031-1/+1
| | | | | | | |
| * | | | | | | Implement regex checks for app services.Kegan Dougal2015-02-031-27/+44
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Expose handler.get_services_for_event which manages the checks for all services.
| * | | | | | | Add defers in the right places.Kegan Dougal2015-02-021-0/+2
| | | | | | | |
| * | | | | | | Implement txns for AS (un)registration.Kegan Dougal2015-02-022-22/+100
| | | | | | | |
| * | | | | | | Actually merge into develop.Kegan Dougal2015-02-021-8/+1
| | | | | | | |
| * | | | | | | Merge branch 'develop' into application-servicesKegan Dougal2015-02-0213-29/+867
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/handlers/__init__.py synapse/storage/__init__.py
| * | | | | | | | Add basic application_services SQL, and hook up parts of the appservice ↵Kegan Dougal2015-01-283-11/+111
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | store to read from it.
| * | | | | | | | Remove unused importKegan Dougal2015-01-281-2/+0
| | | | | | | | |
| * | | | | | | | Log when ASes are registered/unregistered.Kegan Dougal2015-01-271-1/+3
| | | | | | | | |
| * | | | | | | | Use ApplicationService when registering.Kegan Dougal2015-01-271-10/+6
| | | | | | | | |
| * | | | | | | | Add stub methods, TODOs and docstrings for application services.Kegan Dougal2015-01-271-2/+50
| | | | | | | | |
| * | | | | | | | Add AS specific classes with docstrings.Kegan Dougal2015-01-271-1/+59
| | | | | | | | |
| * | | | | | | | Add appservice handler and store. Glue together rest > handler > store.Kegan Dougal2015-01-272-2/+48
| | | | | | | | |
* | | | | | | | | Prepare the database whenever a connection is opened from the db_pool so ↵Mark Haines2015-02-131-0/+3
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | that in-memory databases will work
* | | | | | | | Merge branch 'fix' of github.com:matrix-org/synapse into hotfixes-v0.7.0aErik Johnston2015-02-121-7/+6
|\ \ \ \ \ \ \ \
| * | | | | | | | Get an auth query one at a timeErik Johnston2015-02-121-7/+6
| | | | | | | | |
* | | | | | | | | Set database schema version in deltaErik Johnston2015-02-121-0/+2
|/ / / / / / / /
* | | | | | | | Convert get_rooms to use runInteraction so the transacion has a more helpful ↵Erik Johnston2015-02-111-30/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | description
* | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into use-simplejsonErik Johnston2015-02-113-22/+75
|\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | Merge branch 'bugs/SYN-264' into developPaul "LeoNerd" Evans2015-02-111-18/+50
| |\ \ \ \ \ \ \
| | * | | | | | | Added another TODO notePaul "LeoNerd" Evans2015-02-111-0/+3
| | | | | | | | |
| | * | | | | | | Cache the result of a get_rooms_for_user query, to make ↵Paul "LeoNerd" Evans2015-02-111-7/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | user_rooms_intersect() much lighter in the read-common case
| | * | | | | | | First step of making user_rooms_intersect() faster - implement in ↵Paul "LeoNerd" Evans2015-02-111-18/+20
| | | |_|_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | intersection logic in Python code terms of a DB query that is cacheable per user
| * | | | | | | Invalidate the cache for an event if it is redactedMark Haines2015-02-111-0/+2
| | | | | | | |
| * | | | | | | Fix formattingMark Haines2015-02-111-2/+0
| | | | | | | |
| * | | | | | | Add a cache for get_eventMark Haines2015-02-112-3/+24
| |/ / / / / /
* | | | | | | pyflakesErik Johnston2015-02-111-1/+0
| | | | | | |
* | | | | | | Don't unfreeze when using FreezeEvent.get_dict, as we are using a ↵Erik Johnston2015-02-111-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | JSONEncoder that understands FrozenDict
* | | | | | | Blunty replace json with simplejsonErik Johnston2015-02-114-4/+4
|/ / / / / /
* | | | | | Code-style fixesMark Haines2015-02-102-4/+6
| | | | | |
* | | | | | Fix pyflakesMark Haines2015-02-101-3/+3
| | | | | |
* | | | | | Add performance counters for different stages of loading eventsMark Haines2015-02-101-24/+60
| | | | | |
* | | | | | Use the transaction 'desc' rather than 'name', increment the txn_ids inMark Haines2015-02-091-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | txn names
* | | | | | FormattingMark Haines2015-02-091-1/+0
| | | | | |
* | | | | | Performance counters for database transaction namesMark Haines2015-02-091-1/+31
| |_|_|_|/ |/| | | |
* | | | | Fix typoErik Johnston2015-02-091-1/+1
| | | | |
* | | | | Log database time every 10s and log as percentageErik Johnston2015-02-091-2/+2
| | | | |
* | | | | Time how long we're spending on the database threadErik Johnston2015-02-091-0/+25
| | | | |
* | | | | Move delta/v13.sql to delta/v12.sqlErik Johnston2015-02-062-24/+11
| |_|_|/ |/| | |
* | | | Give server default rules the 'default' attribute and fix various brokenness.David Baker2015-02-051-2/+5
| |_|/ |/| |
* | | Merge pull request #47 from matrix-org/signature_failuresErik Johnston2015-02-051-75/+136
|\ \ \ | | | | | | | | Federation fixes.
| * | | Brief comment on why we do some things on every call to persist_event and ↵Erik Johnston2015-02-041-0/+6
| | | | | | | | | | | | | | | | not others
| * | | Rearrange persist_event so that do all the queries that need to be done ↵Erik Johnston2015-02-041-71/+74
| | | | | | | | | | | | | | | | before returning early if we have already persisted that event.
| * | | Add doc to get_eventErik Johnston2015-02-031-0/+15
| | | |
| * | | Try to ensure we don't persist an event we have already persisted. In ↵Erik Johnston2015-02-031-4/+36
| | | | | | | | | | | | | | | | persist_event check if we already have the event, if so then update instead of replacing so that we don't cause a bump of the stream_ordering.
| * | | Don't fail an entire request if one of the returned events fails a signature ↵Erik Johnston2015-02-021-8/+13
| | |/ | |/| | | | | | | check. If an event does fail a signature check, look in the local database and request it from the originator.
* / | s/instance_handle/profile_tag/David Baker2015-02-033-9/+9
|/ /
* | Merge pull request #43 from matrix-org/rejectionsErik Johnston2015-01-301-1/+11
|\ \ | | | | | | Rejections
| * \ Merge branch 'develop' of github.com:matrix-org/synapse into rejectionsErik Johnston2015-01-308-11/+141
| |\ \ | | | | | | | | | | | | | | | | Conflicts: synapse/storage/schema/im.sql
| * \ \ Merge branch 'replication_split' of github.com:matrix-org/synapse into ↵Erik Johnston2015-01-301-5/+0
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | rejections Conflicts: synapse/storage/schema/delta/v12.sql
| * \ \ \ Merge branch 'develop' of github.com:matrix-org/synapse into rejectionsErik Johnston2015-01-308-6/+562
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql
| * | | | | Initial implementation of auth conflict resolutionErik Johnston2015-01-291-2/+2
| | | | | |
| * | | | | Start implementing auth conflict resErik Johnston2015-01-282-0/+11
| | | | | |
* | | | | | Merge pull request #41 from matrix-org/client_v2_syncMark Haines2015-01-301-11/+49
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | Client v2 sync
| * | | | | Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-301-4/+0
| |\ \ \ \ \
| * | | | | | Fix token formattingMark Haines2015-01-301-2/+2
| | | | | | |
| * | | | | | Filter the recent events before applying the limit when doing an incremental ↵Mark Haines2015-01-301-6/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | sync with a gap
| * | | | | | Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-292-5/+6
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'client_v2_filter' into client_v2_syncMark Haines2015-01-296-12/+132
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/rest/client/v2_alpha/__init__.py
| * | | | | | | | Use get_room_events_stream to get changes to the rooms if the number of ↵Mark Haines2015-01-291-0/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | changes is small
| * | | | | | | | Merge branch 'develop' into client_v2_syncMark Haines2015-01-287-4/+563
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix FormattingMark Haines2015-01-271-1/+0
| | | | | | | | | |
| * | | | | | | | | Start implementing incremental initial syncMark Haines2015-01-271-9/+32
| | |_|_|_|_|_|_|/ | |/| | | | | | |
* | | | | | | | | Merge pull request #42 from matrix-org/replication_splitMark Haines2015-01-301-0/+29
|\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | Replication split
| * | | | | | | | Merge branch 'rejections_storage' of github.com:matrix-org/synapse into ↵Erik Johnston2015-01-308-6/+556
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | replication_split
| * | | | | | | | Split up replication_layer module into client, server and transaction queueErik Johnston2015-01-261-1/+1
| | | | | | | | |
| * | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejectionsErik Johnston2015-01-231-2/+3
| |\ \ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | |
| * | | | | | | | Add storage method have_eventsErik Johnston2015-01-231-0/+29
| | | | | | | | |
* | | | | | | | | Remove merge conflictErik Johnston2015-01-301-3/+0
| | | | | | | | |
* | | | | | | | | Remember to add schema file to listErik Johnston2015-01-301-0/+1
| | | | | | | | |
* | | | | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storageErik Johnston2015-01-304-1/+121
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/__init__.py
| * \ \ \ \ \ \ \ \ Merge pull request #37 from matrix-org/client_v2_filterErik Johnston2015-01-304-1/+114
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|/ / | | |/| | | | | | | Client v2 filter
| | * | | | | | | | Use 'in' to test if the key exists, remove unused _filters_for_userMark Haines2015-01-301-4/+0
| | | |_|_|_|_|/ / | | |/| | | | | |
| | * | | | | | | Merge branch 'develop' into client_v2_filterMark Haines2015-01-292-5/+6
| | |\ \ \ \ \ \ \ | | | |_|_|_|_|/ / | | |/| | | | | / | | | | |_|_|_|/ | | | |/| | | |
| | * | | | | | Merge changes from developMark Haines2015-01-298-6/+568
| | |\ \ \ \ \ \
| | * | | | | | | Move bump schema deltaMark Haines2015-01-291-0/+0
| | | | | | | | |
| | * | | | | | | Also edit the filter column on the delta SQLKegan Dougal2015-01-291-1/+1
| | | | | | | | |
| | * | | | | | | s/definition/filter_json/ since definition is now used to mean a component ↵Kegan Dougal2015-01-282-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | of the filter, rather than the complete json
| | * | | | | | | Add filter JSON sanity checks.Kegan Dougal2015-01-281-2/+2
| | | | | | | | |
| | * | | | | | | Created schema deltaPaul "LeoNerd" Evans2015-01-272-1/+25
| | | | | | | | |
| | * | | | | | | Initial stab at real SQL storage implementation of user filter definitionsPaul "LeoNerd" Evans2015-01-273-14/+60
| | | | | | | | |
| | * | | | | | | Move storage of user filters into real datastore layer; now have to mock it ↵Paul "LeoNerd" Evans2015-01-272-1/+48
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | out in the REST-level tests
| * | | | | | | Add room member count condition and default rule to make a noise on rooms of ↵David Baker2015-01-301-1/+4
| | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | only 2 people.
* | | | | | | Be more specific in naming columns in selects.Erik Johnston2015-01-301-1/+1
| | | | | | |
* | | | | | | Put CREATE rejections into seperate .sqlErik Johnston2015-01-302-7/+21
| |_|_|_|/ / |/| | | | |
* | | | | | Merge branch 'develop' of github.com:matrix-org/synapse into rejections_storageErik Johnston2015-01-309-8/+559
|\| | | | | | |_|_|/ / |/| | | | | | | | | | | | | | | | | | | Conflicts: synapse/storage/__init__.py synapse/storage/schema/delta/v12.sql
| * | | | Code style fixes.Mark Haines2015-01-292-5/+6
| | |/ / | |/| |
| * | | SYN-252: Supply the stream and topological parts in the correct order to the ↵Mark Haines2015-01-291-3/+3
| | | | | | | | | | | | | | | | constructor
| * | | Allow the push rule delete method to take more specifiers.David Baker2015-01-281-8/+11
| | |/ | |/|
| * | Merge pull request #36 from matrix-org/device_id_from_access_tokenMark Haines2015-01-281-1/+2
| |\ \ | | | | | | | | Extract the device id and token id from the access token when autheniticating users
| | * | Extract the id token of the token when authing users, include the token and ↵Mark Haines2015-01-281-1/+2
| | |/ | | | | | | | | | device_id in the internal meta data for the event along with the transaction id when sending events
| * | Move pushers delta to v12 and bump schema versionDavid Baker2015-01-282-1/+1
| | |
| * | Use %s instead of +David Baker2015-01-281-2/+2
| | |
| * | NewlineDavid Baker2015-01-281-0/+1
| | |
| * | Redundant parensDavid Baker2015-01-281-1/+1
| | |
| * | unnecessary newlinesDavid Baker2015-01-281-2/+0
| | |
| * | More magic commas (including the place I copied it from...)David Baker2015-01-281-4/+4
| | |
| * | Google doc styleDavid Baker2015-01-281-4/+5
| | |
| * | Merge branch 'develop' into pushersDavid Baker2015-01-281-2/+3
| |\| | | | | | | | | | | | | | | | Conflicts: synapse/handlers/events.py synapse/server.py
| | * Replace hs.parse_userid with UserID.from_stringMark Haines2015-01-231-2/+3
| | |
| * | Add brackets to make get room name / alias workDavid Baker2015-01-261-2/+2
| | |
| * | Add API to delete push rules.David Baker2015-01-231-0/+9
| | |
| * | Fix adding rules without before/after & add the rule that we couldn't find ↵David Baker2015-01-231-3/+5
| | | | | | | | | | | | to the error
| * | As yet fairly untested GET API for push rulesDavid Baker2015-01-221-4/+4
| | |
| * | oops, this is not its own schema fileDavid Baker2015-01-221-1/+0
| | |
| * | Insufficient newlinesDavid Baker2015-01-221-0/+1
| | |
| * | Merge branch 'develop' into pushersDavid Baker2015-01-223-114/+100
| |\| | | | | | | | | | | | | Conflicts: synapse/rest/__init__.py
| * | Oops: second part of commit dc938606David Baker2015-01-223-0/+29
| | |
| * | Add rest API & store for creating push rulesDavid Baker2015-01-221-0/+196
| | | | | | | | | | | | | | | Also make unrecognised request error look more like synapse errors because it makes it easier to throw them from within rest classes.
| * | add instance_handles to pushers so we have a way to refer to them even if ↵David Baker2015-01-203-21/+27
| | | | | | | | | | | | the push token changes.
| * | Require device language when adding a pusher.David Baker2015-01-163-1/+4
| | | | | | | | | | | | | | | Because this seems like it might be useful to do sooner rather than later.
| * | Send room name and first alias in notification poke.David Baker2015-01-151-0/+35
| | |
| * | Honour the 'rejected' return from push gatewaysDavid Baker2015-01-133-11/+25
| | | | | | | | | | | | | | | | | | | | | Add a timestamp to push tokens so we know the last time they we got them from the device. Send it to the push gateways so it can determine whether its failure is more recent than the token. Stop and remove pushers that have been rejected.
| * | Merge branch 'develop' into pushersDavid Baker2015-01-1336-183/+294
| |\ \
| * \ \ Merge branch 'develop' into pushersDavid Baker2014-12-1812-243/+561
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: synapse/api/errors.py synapse/server.py synapse/storage/__init__.py
| * | | | schema version is now 10David Baker2014-12-182-1/+1
| | | | |
| * | | | Merge branch 'master' into pushersDavid Baker2014-12-181-1/+3
| |\ \ \ \
| * | | | | Thank you, pyflakesDavid Baker2014-12-181-1/+0
| | | | | |
| * | | | | ...and bump SCHEMA_VERSIONDavid Baker2014-12-181-1/+1
| | | | | |
| * | | | | Rename the pusher SQL delta to v9 which the next free oneDavid Baker2014-12-181-0/+0
| | | | | |
| * | | | | after a few rethinks, a working implementation of pushers.David Baker2014-12-184-30/+104
| | | | | |
| * | | | | Update to app_id / app_instance_id (partially) and mangle to be PEP8 compliant.David Baker2014-12-033-26/+38
| | | | | |
| * | | | | Merge branch 'develop' into pushersDavid Baker2014-12-026-24/+90
| |\ \ \ \ \
| * | | | | | More work on pushers. Attempt to do HTTP pokes. Not sure if the actual HTTP ↵David Baker2014-11-213-4/+26
| | | | | | | | | | | | | | | | | | | | | | | | | | | | pokes work or not yet but the retry semantics are pretty good.
| * | | | | | Merge branch 'develop' into pushersDavid Baker2014-11-207-23/+28
| |\ \ \ \ \ \
| * | | | | | | Start creating a module to do generic notifications (just prints them to ↵David Baker2014-11-194-2/+158
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | stdout currently!)
* | | | | | | | Add support for storing rejected events in EventContext and data storesErik Johnston2015-01-225-11/+82
| |_|_|_|_|_|/ |/| | | | | |
* | | | | | | Remove unused functionsMark Haines2015-01-132-13/+0
| | | | | | |
* | | | | | | get_room_events isn't called anywhereMark Haines2015-01-131-30/+0
| | | | | | |
* | | | | | | Fix stream token orderingMark Haines2015-01-131-72/+101
| |_|_|_|_|/ |/| | | | |
* | | | | | SYN-178: Fix off by one.Kegan Dougal2015-01-121-2/+6
| | | | | |
* | | | | | Use time.time() instead of time.clock()Erik Johnston2015-01-061-4/+4
| | | | | |
* | | | | | Only fetch the columns we need.Erik Johnston2015-01-061-1/+1
| | | | | |
* | | | | | Add delta and bump DB versionErik Johnston2015-01-062-1/+17
| | | | | |
* | | | | | Add index on transaction_id to sent_transcationsErik Johnston2015-01-062-4/+1
| | | | | |
* | | | | | Actually time that functionErik Johnston2015-01-061-0/+1
| | | | | |
* | | | | | Time how long calls to _get_destination_retry_timings takeErik Johnston2015-01-061-0/+3
| | | | | |
* | | | | | Don't include None's in _get_events_txnErik Johnston2015-01-061-1/+3
| | | | | |
* | | | | | Merge branch 'erikj-perf' of github.com:matrix-org/synapse into developErik Johnston2015-01-061-21/+49
|\ \ \ \ \ \
| * | | | | | Name 'user_rooms_intersect' transactionErik Johnston2015-01-061-16/+18
| | | | | | |
| * | | | | | We don't need the full events for get_rooms_for_user_where_membership_isErik Johnston2015-01-061-5/+31
| | | | | | |
* | | | | | | Merge pull request #28 from matrix-org/erikj-perfMark Haines2015-01-064-103/+113
|\| | | | | | | | | | | | | | | | | | | | Database performance improvements.
| * | | | | | PEP8Erik Johnston2015-01-062-3/+4
| | | | | | |
| * | | | | | Remove debug linesErik Johnston2015-01-061-7/+0
| | | | | | |
| * | | | | | Don't do batching when getting events.Erik Johnston2015-01-061-35/+4
| | | | | | |
| * | | | | | Only fetch prev_content when a client is streaming/paginating. Use ↵Erik Johnston2015-01-062-86/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | transactions for event streams.
| * | | | | | Temporarily turn off 'redacted_because' and 'prev_content' keysErik Johnston2015-01-061-0/+2
| | | | | | |
| * | | | | | More debug loggingErik Johnston2015-01-061-0/+4
| | | | | | |
| * | | | | | Add some debug loggingErik Johnston2015-01-061-0/+12
| | | | | | |
| * | | | | | ReformatErik Johnston2015-01-061-13/+14
| | | | | | |
| * | | | | | Add RoomMemberStore.get_users_in_room, so that we can get the list of joined ↵Erik Johnston2015-01-061-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | users without having to retrieve the full events
| * | | | | | Merge branch 'hotfixes-v0.6.0' of github.com:matrix-org/synapse into erikj-perfErik Johnston2014-12-191-4/+4
| |\ \ \ \ \ \
| * | | | | | | Test some ideas that might help performance a bitErik Johnston2014-12-173-21/+30
| | | | | | | |