Skip to content

bridgev2/database: expose incoming-message anchors and KV errors #601

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.

Sign up for GitHub

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

Merged
highesttt merged 1 commit into from
Oct 26, 2026
+29 −9
Merged

bridgev2/database: expose incoming-message anchors and KV errors #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions bridgev2/database/kvstore.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,21 @@ const (
)

func (kvq *KVQuery) Get(ctx context.Context, key Key) string {
var value string
err := kvq.QueryRow(ctx, getKVQuery, kvq.BridgeID, key).Scan(&value)
value, err := kvq.GetWithError(ctx, key)
if err != nil && !errors.Is(err, sql.ErrNoRows) {
zerolog.Ctx(ctx).Err(err).Str("key", string(key)).Msg("Failed to get key from kvstore")
}
return value
}

func (kvq *KVQuery) GetWithError(ctx context.Context, key Key) (string, error) {
var value string
err := kvq.QueryRow(ctx, getKVQuery, kvq.BridgeID, key).Scan(&value)
return value, err
}

func (kvq *KVQuery) Set(ctx context.Context, key Key, value string) {
_, err := kvq.Exec(ctx, setKVQuery, kvq.BridgeID, key, value)
err := kvq.SetWithError(ctx, key, value)
if err != nil {
zerolog.Ctx(ctx).Err(err).
Str("key", string(key)).
Expand All @@ -59,11 +64,21 @@ func (kvq *KVQuery) Set(ctx context.Context, key Key, value string) {
}
}

func (kvq *KVQuery) SetWithError(ctx context.Context, key Key, value string) error {
_, err := kvq.Exec(ctx, setKVQuery, kvq.BridgeID, key, value)
return err
}

func (kvq *KVQuery) Delete(ctx context.Context, key Key) {
_, err := kvq.Exec(ctx, deleteKVQuery, kvq.BridgeID, key)
err := kvq.DeleteWithError(ctx, key)
if err != nil {
zerolog.Ctx(ctx).Err(err).
Str("key", string(key)).
Msg("Failed to delete key in kvstore")
}
}

func (kvq *KVQuery) DeleteWithError(ctx context.Context, key Key) error {
_, err := kvq.Exec(ctx, deleteKVQuery, kvq.BridgeID, key)
return err
}
15 changes: 10 additions & 5 deletions bridgev2/database/message.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,11 +73,12 @@ const (
getLastMessageInThread = getMessageBaseQuery + `WHERE bridge_id=$1 AND room_id=$2 AND room_receiver=$3 AND (id=$4 OR thread_root_id=$4) ORDER BY thread_root_id NULLS LAST, timestamp DESC, id DESC, part_id DESC LIMIT 1`
getLastNInPortal = getMessageBaseQuery + `WHERE bridge_id=$1 AND room_id=$2 AND room_receiver=$3 ORDER BY timestamp DESC, id DESC, part_id DESC LIMIT $4`

getLastMessagePartAtOrBeforeTimeQuery = getMessageBaseQuery + `WHERE bridge_id = $1 AND room_id=$2 AND room_receiver=$3 AND timestamp<=$4 ORDER BY timestamp DESC, id DESC, part_id DESC LIMIT 1`
getLastNonFakeMessagePartAtOrBeforeTimeQuery = getMessageBaseQuery + `WHERE bridge_id = $1 AND room_id=$2 AND room_receiver=$3 AND timestamp<=$4 AND mxid NOT LIKE '~fake:%' ORDER BY timestamp DESC, id DESC, part_id DESC LIMIT 1`
getFirstNonFakeMessagePartAfterTimeQuery = getMessageBaseQuery + `WHERE bridge_id = $1 AND room_id=$2 AND room_receiver=$3 AND timestamp>$4 AND mxid NOT LIKE '~fake:%' ORDER BY timestamp ASC, id ASC, part_id ASC LIMIT 1`
getLastMessagePartAtOrBeforeTimeInThreadQuery = getMessageBaseQuery + `WHERE bridge_id = $1 AND room_id=$2 AND room_receiver=$3 AND (id=$4 OR thread_root_id=$4) AND timestamp<=$5 ORDER BY timestamp DESC, id DESC, part_id DESC LIMIT 1`
getLastNonFakeMessagePartAtOrBeforeTimeInThreadQuery = getMessageBaseQuery + `WHERE bridge_id = $1 AND room_id=$2 AND room_receiver=$3 AND (id=$4 OR thread_root_id=$4) AND timestamp<=$5 AND mxid NOT LIKE '~fake:%' ORDER BY timestamp DESC, id DESC, part_id DESC LIMIT 1`
getLastMessagePartAtOrBeforeTimeQuery = getMessageBaseQuery + `WHERE bridge_id = $1 AND room_id=$2 AND room_receiver=$3 AND timestamp<=$4 ORDER BY timestamp DESC, id DESC, part_id DESC LIMIT 1`
getLastNonFakeMessagePartAtOrBeforeTimeQuery = getMessageBaseQuery + `WHERE bridge_id = $1 AND room_id=$2 AND room_receiver=$3 AND timestamp<=$4 AND mxid NOT LIKE '~fake:%' ORDER BY timestamp DESC, id DESC, part_id DESC LIMIT 1`
getLastNonFakeMessagePartAtOrBeforeTimeExcludingSenderQuery = getMessageBaseQuery + `WHERE bridge_id=$1 AND room_id=$2 AND room_receiver=$3 AND timestamp<=$4 AND sender_id<>$5 AND mxid NOT LIKE '~fake:%' ORDER BY timestamp DESC, id DESC, part_id DESC LIMIT 1`
getFirstNonFakeMessagePartAfterTimeQuery = getMessageBaseQuery + `WHERE bridge_id = $1 AND room_id=$2 AND room_receiver=$3 AND timestamp>$4 AND mxid NOT LIKE '~fake:%' ORDER BY timestamp ASC, id ASC, part_id ASC LIMIT 1`
getLastMessagePartAtOrBeforeTimeInThreadQuery = getMessageBaseQuery + `WHERE bridge_id = $1 AND room_id=$2 AND room_receiver=$3 AND (id=$4 OR thread_root_id=$4) AND timestamp<=$5 ORDER BY timestamp DESC, id DESC, part_id DESC LIMIT 1`
getLastNonFakeMessagePartAtOrBeforeTimeInThreadQuery = getMessageBaseQuery + `WHERE bridge_id = $1 AND room_id=$2 AND room_receiver=$3 AND (id=$4 OR thread_root_id=$4) AND timestamp<=$5 AND mxid NOT LIKE '~fake:%' ORDER BY timestamp DESC, id DESC, part_id DESC LIMIT 1`

countMessagesInPortalQuery = `
SELECT COUNT(*) FROM message WHERE bridge_id=$1 AND room_id=$2 AND room_receiver=$3
Expand Down Expand Up @@ -162,6 +163,10 @@ func (mq *MessageQuery) GetLastNonFakePartAtOrBeforeTime(ctx context.Context, po
return mq.QueryOne(ctx, getLastNonFakeMessagePartAtOrBeforeTimeQuery, mq.BridgeID, portal.ID, portal.Receiver, maxTS.UnixNano())
}

func (mq *MessageQuery) GetLastNonFakePartAtOrBeforeTimeExcludingSender(ctx context.Context, portal networkid.PortalKey, maxTS time.Time, sender networkid.UserID) (*Message, error) {
return mq.QueryOne(ctx, getLastNonFakeMessagePartAtOrBeforeTimeExcludingSenderQuery, mq.BridgeID, portal.ID, portal.Receiver, maxTS.UnixNano(), sender)
}

func (mq *MessageQuery) GetFirstNonFakePartAfterTime(ctx context.Context, portal networkid.PortalKey, minTS time.Time) (*Message, error) {
return mq.QueryOne(ctx, getFirstNonFakeMessagePartAfterTimeQuery, mq.BridgeID, portal.ID, portal.Receiver, minTS.UnixNano())
}
Expand Down
Loading