mirrors/dendrite
1
0
Fork 0
mirror of https://github.com/matrix-org/dendrite.git synced 2025-12-16 19:33:09 -06:00
Code Issues Packages Projects Releases Wiki Activity

SQLite for public rooms API (although with some slight differences in behaviour)

Browse source
This commit is contained in:
Neil Alexander 2020-02-14 12:51:03 +00:00
parent 64312f383a
commit b0c1137786
2 changed files with 14 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
publicroomsapi/storage/sqlite3/public_rooms_table.go
View file

@ -39,26 +39,15 @@ var editableAttributes = []string{
const publicRoomsSchema = ` const publicRoomsSchema = `
-- Stores all of the rooms with data needed to create the server's room directory -- Stores all of the rooms with data needed to create the server's room directory
CREATE TABLE IF NOT EXISTS publicroomsapi_public_rooms( CREATE TABLE IF NOT EXISTS publicroomsapi_public_rooms(
-- The room's ID
room_id TEXT NOT NULL PRIMARY KEY, room_id TEXT NOT NULL PRIMARY KEY,
-- Number of joined members in the room
joined_members INTEGER NOT NULL DEFAULT 0, joined_members INTEGER NOT NULL DEFAULT 0,
-- Aliases of the room (empty array if none) aliases TEXT NOT NULL DEFAULT '',
aliases TEXT[] NOT NULL DEFAULT '{}'::TEXT[],
-- Canonical alias of the room (empty string if none)
canonical_alias TEXT NOT NULL DEFAULT '', canonical_alias TEXT NOT NULL DEFAULT '',
-- Name of the room (empty string if none)
name TEXT NOT NULL DEFAULT '', name TEXT NOT NULL DEFAULT '',
-- Topic of the room (empty string if none)
topic TEXT NOT NULL DEFAULT '', topic TEXT NOT NULL DEFAULT '',
-- Is the room world readable?
world_readable BOOLEAN NOT NULL DEFAULT false, world_readable BOOLEAN NOT NULL DEFAULT false,
-- Can guest join the room?
guest_can_join BOOLEAN NOT NULL DEFAULT false, guest_can_join BOOLEAN NOT NULL DEFAULT false,
-- URL of the room avatar (empty string if none)
avatar_url TEXT NOT NULL DEFAULT '', avatar_url TEXT NOT NULL DEFAULT '',
-- Visibility of the room: true means the room is publicly visible, false
-- means the room is private
visibility BOOLEAN NOT NULL DEFAULT false visibility BOOLEAN NOT NULL DEFAULT false
); );
` `
@ -71,33 +60,33 @@ const selectPublicRoomsSQL = "" +
"SELECT room_id, joined_members, aliases, canonical_alias, name, topic, world_readable, guest_can_join, avatar_url" + "SELECT room_id, joined_members, aliases, canonical_alias, name, topic, world_readable, guest_can_join, avatar_url" +
" FROM publicroomsapi_public_rooms WHERE visibility = true" + " FROM publicroomsapi_public_rooms WHERE visibility = true" +
" ORDER BY joined_members DESC" + " ORDER BY joined_members DESC" +
" OFFSET $1" " LIMIT 30 OFFSET $1"
const selectPublicRoomsWithLimitSQL = "" + const selectPublicRoomsWithLimitSQL = "" +
"SELECT room_id, joined_members, aliases, canonical_alias, name, topic, world_readable, guest_can_join, avatar_url" + "SELECT room_id, joined_members, aliases, canonical_alias, name, topic, world_readable, guest_can_join, avatar_url" +
" FROM publicroomsapi_public_rooms WHERE visibility = true" + " FROM publicroomsapi_public_rooms WHERE visibility = true" +
" ORDER BY joined_members DESC" + " ORDER BY joined_members DESC" +
" OFFSET $1 LIMIT $2" " LIMIT $2 OFFSET $1"
const selectPublicRoomsWithFilterSQL = "" + const selectPublicRoomsWithFilterSQL = "" +
"SELECT room_id, joined_members, aliases, canonical_alias, name, topic, world_readable, guest_can_join, avatar_url" + "SELECT room_id, joined_members, aliases, canonical_alias, name, topic, world_readable, guest_can_join, avatar_url" +
" FROM publicroomsapi_public_rooms" + " FROM publicroomsapi_public_rooms" +
" WHERE visibility = true" + " WHERE visibility = true" +
" AND (LOWER(name) LIKE LOWER($1)" + " AND (LOWER(name) LIKE LOWER($1)" +
" OR LOWER(topic) LIKE LOWER($1)" + " OR LOWER(topic) LIKE LOWER($1))" +
" OR LOWER(ARRAY_TO_STRING(aliases, ',')) LIKE LOWER($1))" + //" OR LOWER(ARRAY_TO_STRING(aliases, ',')) LIKE LOWER($1))" +
" ORDER BY joined_members DESC" + " ORDER BY joined_members DESC" +
" OFFSET $2" " LIMIT 30 OFFSET $2"
const selectPublicRoomsWithLimitAndFilterSQL = "" + const selectPublicRoomsWithLimitAndFilterSQL = "" +
"SELECT room_id, joined_members, aliases, canonical_alias, name, topic, world_readable, guest_can_join, avatar_url" + "SELECT room_id, joined_members, aliases, canonical_alias, name, topic, world_readable, guest_can_join, avatar_url" +
" FROM publicroomsapi_public_rooms" + " FROM publicroomsapi_public_rooms" +
" WHERE visibility = true" + " WHERE visibility = true" +
" AND (LOWER(name) LIKE LOWER($1)" + " AND (LOWER(name) LIKE LOWER($1)" +
" OR LOWER(topic) LIKE LOWER($1)" + " OR LOWER(topic) LIKE LOWER($1))" +
" OR LOWER(ARRAY_TO_STRING(aliases, ',')) LIKE LOWER($1))" + // " OR LOWER(ARRAY_TO_STRING(aliases, ',')) LIKE LOWER($1))" +
" ORDER BY joined_members DESC" + " ORDER BY joined_members DESC" +
" OFFSET $2 LIMIT $3" " LIMIT $3 OFFSET $2"
const selectRoomVisibilitySQL = "" + const selectRoomVisibilitySQL = "" +
"SELECT visibility FROM publicroomsapi_public_rooms" + "SELECT visibility FROM publicroomsapi_public_rooms" +
@ -187,7 +176,7 @@ func (s *publicRoomsStatements) selectPublicRooms(
) )
} else { } else {
rows, err = s.selectPublicRoomsWithLimitAndFilterStmt.QueryContext( rows, err = s.selectPublicRoomsWithLimitAndFilterStmt.QueryContext(
ctx, pattern, offset, limit, ctx, pattern, limit, offset,
) )
} }
} else { } else {
@ -195,7 +184,7 @@ func (s *publicRoomsStatements) selectPublicRooms(
rows, err = s.selectPublicRoomsStmt.QueryContext(ctx, offset) rows, err = s.selectPublicRoomsStmt.QueryContext(ctx, offset)
} else { } else {
rows, err = s.selectPublicRoomsWithLimitStmt.QueryContext( rows, err = s.selectPublicRoomsWithLimitStmt.QueryContext(
ctx, offset, limit, ctx, limit, offset,
) )
} }
} }

3
publicroomsapi/storage/storage.go
View file

@ -20,6 +20,7 @@ import (
"github.com/matrix-org/dendrite/common" "github.com/matrix-org/dendrite/common"
"github.com/matrix-org/dendrite/publicroomsapi/storage/postgres" "github.com/matrix-org/dendrite/publicroomsapi/storage/postgres"
"github.com/matrix-org/dendrite/publicroomsapi/storage/sqlite3"
"github.com/matrix-org/dendrite/publicroomsapi/types" "github.com/matrix-org/dendrite/publicroomsapi/types"
"github.com/matrix-org/gomatrixserverlib" "github.com/matrix-org/gomatrixserverlib"
) )
@ -43,6 +44,8 @@ func NewPublicRoomsServerDatabase(dataSourceName string) (Database, error) {
switch uri.Scheme { switch uri.Scheme {
case "postgres": case "postgres":
return postgres.NewPublicRoomsServerDatabase(dataSourceName) return postgres.NewPublicRoomsServerDatabase(dataSourceName)
case "file":
return sqlite3.NewPublicRoomsServerDatabase(dataSourceName)
default: default:
return postgres.NewPublicRoomsServerDatabase(dataSourceName) return postgres.NewPublicRoomsServerDatabase(dataSourceName)
} }