Skip to content
This repository was archived by the owner on Apr 26, 2024. It is now read-only.

Master #15881

Closed
wants to merge 31 commits into from
Closed

Master #15881

wants to merge 31 commits into from

Conversation

@hi-anshul
Copy link
Contributor

Pull Request Checklist

  • Pull request is based on the develop branch
  • Pull request includes a changelog file. The entry should:
    • Be a short description of your change which makes sense to users. "Fixed a bug that prevented receiving messages from other servers." instead of "Moved X method from EventStore to EventWorkerStore.".
    • Use markdown where necessary, mostly for code blocks.
    • End with either a period (.) or an exclamation mark (!).
    • Start with a capital letter.
    • Feel free to credit yourself, by adding a sentence "Contributed by @github_username." or "Contributed by [Your Name]." to the end of the entry.
  • Pull request includes a sign off
  • Code style is correct
    (run the linters)

hi-anshul and others added 30 commits May 3, 2023 12:46
@hi-anshul
Fixing SQL Query
5cfdae4 
Fixing that SQLite query according to 3.27.0
@hi-anshul
Inline SQL queries using boolean parameters matrix-org#15515
cd4359a 
Updated Inline SQL queries according so SQLite 3.27
@hi-anshul
Update purge_events.py
3857478
@hi-anshul
Merge branch 'develop' into develop
2ea3b58
@hi-anshul
Merge branch 'matrix-org:develop' into develop
44aedd8
@hi-anshul
Updated all Inline SQL queries using boolean parameters as supported …
7d60307 
…in sqlite 3.27

Signed-off-by: Anshul Madnawat <[email protected]>
@hi-anshul
Updated all Inline SQL queries using boolean parameters as supported …
36c4012 
…in sqlite 3.27

Signed-off-by: Anshul Madnawat <[email protected]>
@hi-anshul
Merge branch 'develop' into develop
e5c5d35
@hi-anshul
Merge branch 'matrix-org:develop' into develop
07e90d4
@hi-anshul
Merge branch 'matrix-org:develop' into develop
c29c05f
@hi-anshul
Merge branch 'matrix-org:develop' into develop
be3fbc1
@hi-anshul
Updated Inline SQL queries using boolean parameters as supported in S…
8737a24 
…QLite 3.27

Signed-off-by: Anshul Madnawat <[email protected]>
@hi-anshul
Merge branch 'develop' into develop
24f4de0
@hi-anshul
Update 15515.misc
7eb4f91 
Update changelog.d
@hi-anshul
Merge branch 'matrix-org:develop' into develop
e5a668d
@hi-anshul
Merge branch 'develop' into develop
aa97aa2
@hi-anshul
Update event_federation.py
f733e25 
Update event_federation.py to FALSE instead of False
@hi-anshul
Update stream.py
7ae7fef 
Updated event.outlier to False
@hi-anshul
Merge branch 'matrix-org:develop' into develop
b33a4d2
@dependabot
Bump authlib from 1.2.0 to 1.2.1 (matrix-org#15864)
9345361 
Bumps [authlib](https://github.com/lepture/authlib) from 1.2.0 to 1.2.1.
- [Release notes](https://github.com/lepture/authlib/releases)
- [Changelog](https://github.com/lepture/authlib/blob/master/docs/changelog.rst)
- [Commits](authlib/authlib@v1.2.0...v1.2.1)

---
updated-dependencies:
- dependency-name: authlib
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump importlib-metadata from 6.6.0 to 6.7.0 (matrix-org#15865)
aea94ca 
Bumps [importlib-metadata](https://github.com/python/importlib_metadata) from 6.6.0 to 6.7.0.
- [Release notes](https://github.com/python/importlib_metadata/releases)
- [Changelog](https://github.com/python/importlib_metadata/blob/main/NEWS.rst)
- [Commits](python/importlib_metadata@v6.6.0...v6.7.0)

---
updated-dependencies:
- dependency-name: importlib-metadata
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump types-pyopenssl from 23.2.0.0 to 23.2.0.1 (matrix-org#15866)
411ba44 
Bumps [types-pyopenssl](https://github.com/python/typeshed) from 23.2.0.0 to 23.2.0.1.
- [Commits](https://github.com/python/typeshed/commits)

---
updated-dependencies:
- dependency-name: types-pyopenssl
  dependency-type: direct:development
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@dependabot
Bump sentry-sdk from 1.25.1 to 1.26.0 (matrix-org#15867)
a587de9 
Bumps [sentry-sdk](https://github.com/getsentry/sentry-python) from 1.25.1 to 1.26.0.
- [Release notes](https://github.com/getsentry/sentry-python/releases)
- [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md)
- [Commits](getsentry/sentry-python@1.25.1...1.26.0)

---
updated-dependencies:
- dependency-name: sentry-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
@reivilibre
Add a timeout that aborts any Postgres statement taking more than 1 h…
53aa26e 
…our. (matrix-org#15853)

* Add a timeout to Postgres statements

* Newsfile

Signed-off-by: Olivier Wilkinson (reivilibre) <[email protected]>

---------

Signed-off-by: Olivier Wilkinson (reivilibre) <[email protected]>
@reivilibre
Fix the devenv up configuration which was ignoring the config overr…
cd8b73a 
…ides. (matrix-org#15854)

* Fix use of config override directory in `devenv up`

`--config-directory` is for the generate config script; `-c` is for usage

* Add homeserver config override directory to gitignore

* Newsfile

Signed-off-by: Olivier Wilkinson (reivilibre) <[email protected]>

---------

Signed-off-by: Olivier Wilkinson (reivilibre) <[email protected]>
@pacien
devices: use combined ANY clause for faster cleanup (matrix-org#15861)
07d7cbf 
Old device entries for the same user were being removed in individual
SQL commands, making the batch take way longer than necessary.

This combines the commands into a single one with a IN/ANY clause.

Example of log entry before the change, regularly observed with
"log_min_duration_statement = 10000" in PostgreSQL's config:

    LOG:  duration: 42538.282 ms  statement:
    DELETE FROM device_lists_stream
    WHERE user_id = '@Someone' AND device_id = 'someid1'
    AND stream_id < 123456789
    ;
    DELETE FROM device_lists_stream
    WHERE user_id = '@Someone' AND device_id = 'someid2'
    AND stream_id < 123456789
    ;
    [repeated for each device ID of that user, potentially a lot...]

With the patch applied on my instance for the past couple of days, I
no longer notice overly long statements of that particular kind.

Signed-off-by: pacien <[email protected]>
@PaarthShah
Pin pydantic to <2.0.0 (matrix-org#15862)
670d590 
Signed-off-by: Paarth Shah <[email protected]>
@reivilibre
Merge branch 'master' into develop
861752b
@weeman1337
Add not_user_type param to the list accounts admin API (matrix-org#15844
c8e8189 
)

Signed-off-by: Michael Weimann <[email protected]>
@hi-anshul
Merge branch 'matrix-org:develop' into develop
152e015
@hi-anshul hi-anshul requested a review from a team as a code owner July 5, 2023 07:43
@hi-anshul hi-anshul closed this Jul 5, 2023
@hi-anshul hi-anshul deleted the master branch July 5, 2023 07:47
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Reviewers

No reviews

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@hi-anshul @reivilibre @pacien @PaarthShah @weeman1337