improve: optimize UserOnline algorithm

ncuhome · Apr 5, 2024 · 8b9e062 · 8b9e062
1 parent 9a8b878
commit 8b9e062
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 24 deletions.
diff --git a/internal/service/LoginRecord.go b/internal/service/LoginRecord.go
@@ -2,7 +2,6 @@ package service
 
 import (
 	"context"
-	"errors"
 	"github.com/Mmx233/daoUtil"
 	"github.com/ncuhome/GeniusAuthoritarian/internal/db/dao"
 	"github.com/ncuhome/GeniusAuthoritarian/internal/db/dto"
@@ -64,35 +63,31 @@ func (a LoginRecordSrv) UserOnline(uid uint, currentLoginID uint) ([]dto.LoginRe
 	if err != nil {
 		return nil, err
 	}
+	if len(validRecords) == 0 {
+		return validRecords, nil
+	}
 
-	var _redis = redis.NewRecordedToken()
-	var validCount int
-	ctx, cancel := context.WithTimeout(context.Background(), time.Second*10)
-	defer cancel()
+	ids := make([]uint64, len(validRecords))
 	for i, record := range validRecords {
-		err = _redis.NewStorePoint(uint64(record.ID)).Get(ctx, nil)
-		if err != nil {
-			if errors.Is(err, redis.Nil) {
-				validRecords[i].ID = 0
-				continue
-			}
-			return nil, err
-		}
-		validCount++
+		ids[i] = uint64(record.ID)
+	}
+	recordState, err := redis.NewRecordedToken().MPointGet(context.Background(), ids...)
+	if err != nil {
+		return nil, err
 	}
 
-	var result = make([]dto.LoginRecordOnline, validCount)
-	if validCount != 0 {
-		for i, record := range validRecords {
-			if record.ID != 0 {
-				if record.ID == currentLoginID {
-					record.IsMe = true
-				}
-				result[i] = record
-			}
+	pointer := 0
+	for i := 0; i < len(validRecords); i++ {
+		if recordState[i] == redis.Nil {
+			continue
+		}
+		validRecords[i].IsMe = validRecords[i].ID == currentLoginID
+		if i != pointer {
+			validRecords[pointer] = validRecords[i]
 		}
+		pointer++
 	}
-	return result, nil
+	return validRecords[0:pointer], nil
 }
 
 func (a LoginRecordSrv) OnlineRecordExist(uid, id uint, opts ...daoUtil.ServiceOpt) (bool, error) {

diff --git a/pkg/tokenStore/tokenStore.go b/pkg/tokenStore/tokenStore.go
@@ -50,6 +50,14 @@ func (a TokenStore[C]) CreateStorePoint(ctx context.Context, valid time.Duration
 	return id, a.CreateStorePointWithID(ctx, id, valid, claims)
 }
 
+func (a TokenStore[C]) MPointGet(ctx context.Context, ids ...uint64) ([]interface{}, error) {
+	keys := make([]string, len(ids))
+	for i, id := range ids {
+		keys[i] = a.genKey(id)
+	}
+	return a.client.MGet(ctx, keys...).Result()
+}
+
 func (a TokenStore[C]) NewStorePoint(id uint64) Point[C] {
 	return Point[C]{
 		s:   a,