pro/im_server
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: restore mysql docker build

Browse Source
This commit is contained in:
richjohnrambo
2026-08-25 22:17:59 +08:00
parent f900a08a01
commit c020171e52
5 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/db/mysql/adapter.go
+6 -6
View File
@@ -3704,8 +3704,8 @@ func (a *adapter) MessageGetAll(topic string, forUser t.Uid, opts *t.QueryOpt) (
// Get ranges of deleted messages
func (a *adapter) MessageGetDeleted(topic string, forUser t.Uid, opts *t.QueryOpt) ([]t.DelMessage, error) {
var limit = a.maxResults
var lower = 0
var upper = 1<<31 - 1
var lower int64 = 0
var upper int64 = 1<<31 - 1
if opts != nil {
if opts.Since > 0 {
@@ -3738,8 +3738,8 @@ func (a *adapter) MessageGetDeleted(topic string, forUser t.Uid, opts *t.QueryOp
Topic string
Deletedfor int64
Delid int
Low int
Hi int
Low int64
Hi int64
}
var dmsgs []t.DelMessage
var dmsg t.DelMessage
@@ -3817,7 +3817,7 @@ func messageDeleteList(tx *sqlx.Tx, topic string, toDel *t.DelMessage) error {
}
// Find the actual IDs still present in the database.
var seqIDs []int
var seqIDs []int64
err = tx.Select(&seqIDs, "SELECT seqid FROM im_messages AS m WHERE "+where, args...)
if err != nil {
return err
@@ -3829,7 +3829,7 @@ func messageDeleteList(tx *sqlx.Tx, topic string, toDel *t.DelMessage) error {
}
// Recalculate the actual ranges to delete.
sort.Ints(seqIDs)
sort.Slice(seqIDs, func(i, j int) bool { return seqIDs[i] < seqIDs[j] })
delRanges = t.SliceToRanges(seqIDs)
// Compose a new query with the new ranges.
server/db/mysql/tenant_adapter.go
+9 -7
View File
@@ -1118,14 +1118,14 @@ func tenantMessageDeleteList(tx *sqlx.Tx, tenantID t.TenantID, topic string, toD
where += " AND m.createdat>?"
args = append(args, newerThan)
}
var seqIDs []int
var seqIDs []int64
if err := tx.Select(&seqIDs, "SELECT seqid FROM im_messages AS m WHERE "+where, args...); err != nil {
return err
}
if len(seqIDs) == 0 {
return nil
}
sort.Ints(seqIDs)
sort.Slice(seqIDs, func(i, j int) bool { return seqIDs[i] < seqIDs[j] })
delRanges = t.SliceToRanges(seqIDs)
rSQL, rArgs := common.RangesToSql(delRanges)
where = "m.tenant_id=? AND m.topic=? AND m.seqid " + rSQL
@@ -1178,14 +1178,14 @@ func groupMessageDeleteList(tx *sqlx.Tx, topic string, toDel *t.DelMessage) erro
where += " AND m.created_at>?"
args = append(args, newerThan)
}
var seqIDs []int
var seqIDs []int64
if err = tx.Select(&seqIDs, "SELECT seqid FROM im_group_messages AS m WHERE "+where, args...); err != nil {
return err
}
if len(seqIDs) == 0 {
return nil
}
sort.Ints(seqIDs)
sort.Slice(seqIDs, func(i, j int) bool { return seqIDs[i] < seqIDs[j] })
delRanges = t.SliceToRanges(seqIDs)
rSQL, rArgs := common.RangesToSql(delRanges)
where = "m.topic=? AND m.seqid " + rSQL
@@ -5617,7 +5617,9 @@ func (a *adapter) TenantMessageGetDeleted(id t.TenantID, topic string, uid t.Uid
}
return deleted, err
}
limit, lower, upper := a.maxResults, 0, 1<<31-1
limit := a.maxResults
var lower int64 = 0
var upper int64 = 1<<31 - 1
if opts != nil {
if opts.Since > 0 {
lower = opts.Since
@@ -5648,8 +5650,8 @@ func (a *adapter) TenantMessageGetDeleted(id t.TenantID, topic string, uid t.Uid
Topic string
Deletedfor int64
Delid int
Low int
Hi int
Low int64
Hi int64
}
if err = rows.StructScan(&row); err != nil {
return nil, err