-
-
Notifications
You must be signed in to change notification settings - Fork 664
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add heroes to the room summary #2373
Merged
Merged
Changes from 5 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
f216000
Implement room summary heroes
S7evinK 68e09a1
Add passing tests
S7evinK 036d96d
Move MembershipCount to addRoomSummary
S7evinK c429b41
Merge branch 'main' of github.com:matrix-org/dendrite into s7evink/ro…
S7evinK c1a4dd7
Merge branch 'main' of github.com:matrix-org/dendrite into s7evink/ro…
S7evinK 0175ded
Add comments, close Statement
S7evinK cd0060a
Merge branch 'main' of github.com:matrix-org/dendrite into s7evink/ro…
S7evinK File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
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
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
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
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
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -18,7 +18,9 @@ import ( | |
"context" | ||
"database/sql" | ||
"fmt" | ||
"strings" | ||
|
||
"github.com/matrix-org/dendrite/internal" | ||
"github.com/matrix-org/dendrite/internal/sqlutil" | ||
"github.com/matrix-org/dendrite/syncapi/storage/tables" | ||
"github.com/matrix-org/dendrite/syncapi/types" | ||
|
@@ -61,10 +63,14 @@ const selectMembershipCountSQL = "" + | |
" SELECT * FROM syncapi_memberships WHERE room_id = $1 AND stream_pos <= $2 GROUP BY user_id HAVING(max(stream_pos))" + | ||
") t WHERE t.membership = $3" | ||
|
||
const selectHeroesSQL = "" + | ||
"SELECT DISTINCT user_id FROM syncapi_memberships WHERE room_id = $1 AND user_id != $2 AND membership IN ($3) LIMIT 5" | ||
|
||
type membershipsStatements struct { | ||
db *sql.DB | ||
upsertMembershipStmt *sql.Stmt | ||
selectMembershipCountStmt *sql.Stmt | ||
selectHeroesStmt *sql.Stmt | ||
} | ||
|
||
func NewSqliteMembershipsTable(db *sql.DB) (tables.Memberships, error) { | ||
|
@@ -75,13 +81,11 @@ func NewSqliteMembershipsTable(db *sql.DB) (tables.Memberships, error) { | |
if err != nil { | ||
return nil, err | ||
} | ||
if s.upsertMembershipStmt, err = db.Prepare(upsertMembershipSQL); err != nil { | ||
return nil, err | ||
} | ||
if s.selectMembershipCountStmt, err = db.Prepare(selectMembershipCountSQL); err != nil { | ||
return nil, err | ||
} | ||
return s, nil | ||
return s, sqlutil.StatementList{ | ||
{&s.upsertMembershipStmt, upsertMembershipSQL}, | ||
{&s.selectMembershipCountStmt, selectMembershipCountSQL}, | ||
{&s.selectHeroesStmt, selectHeroesSQL}, | ||
}.Prepare(db) | ||
} | ||
|
||
func (s *membershipsStatements) UpsertMembership( | ||
|
@@ -111,3 +115,35 @@ func (s *membershipsStatements) SelectMembershipCount( | |
err = stmt.QueryRowContext(ctx, roomID, pos, membership).Scan(&count) | ||
return | ||
} | ||
|
||
func (s *membershipsStatements) SelectHeroes( | ||
ctx context.Context, txn *sql.Tx, roomID, userID string, memberships []string, | ||
) (heroes []string, err error) { | ||
stmtSQL := strings.Replace(selectHeroesSQL, "($3)", sqlutil.QueryVariadicOffset(len(memberships), 2), 1) | ||
stmt, err := s.db.Prepare(stmtSQL) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. You'll need to close this too, otherwise the prepared statements leak. |
||
if err != nil { | ||
return | ||
} | ||
params := []interface{}{ | ||
roomID, userID, | ||
} | ||
for _, membership := range memberships { | ||
params = append(params, membership) | ||
} | ||
|
||
stmt = sqlutil.TxStmt(txn, stmt) | ||
var rows *sql.Rows | ||
rows, err = stmt.QueryContext(ctx, params...) | ||
if err != nil { | ||
return | ||
} | ||
defer internal.CloseAndLogIfError(ctx, rows, "SelectHeroes: rows.close() failed") | ||
var hero string | ||
for rows.Next() { | ||
if err = rows.Scan(&hero); err != nil { | ||
return | ||
} | ||
heroes = append(heroes, hero) | ||
} | ||
return heroes, rows.Err() | ||
} |
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
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
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
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
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If we have to prepare to do variadics, there isn't much point in preparing it up front. Normally I just leave these commented out so that it's obvious there's something but we don't waste the effort preparing a statement we never use.