Merge pull request #171 from alibaba/fix_group_hot_recall

sort group hot recall items

Author: bruceding

module/user_group_hot_recall_featurestore_dao.go

@@ -2,7 +2,7 @@ package module
 
 import (
 	"fmt"
-	"math/rand"
+	"sort"
 	"strings"
 
 	"github.com/alibaba/pairec/v2/context"
@@ -78,14 +78,6 @@ func (d *UserGroupHotRecallFeatureStoreDao) ListItemsByUser(user *User, context
 		return
 	}
 
-	if len(itemIds) > d.recallCount {
-		rand.Shuffle(len(itemIds)/2, func(i, j int) {
-			itemIds[i], itemIds[j] = itemIds[j], itemIds[i]
-		})
-
-		itemIds = itemIds[:d.recallCount]
-	}
-
 	for _, id := range itemIds {
 		strs := strings.Split(id, ":")
 		if len(strs) == 1 {
@@ -117,6 +109,12 @@ func (d *UserGroupHotRecallFeatureStoreDao) ListItemsByUser(user *User, context
 		}
 	}
 
+	sort.Sort(sort.Reverse(ItemScoreSlice(ret)))
+
+	if d.recallCount > 0 && len(ret) > d.recallCount {
+		return ret[:d.recallCount]
+	}
+
 	return
 }
 

module/user_group_hot_recall_hologres_dao.go

@@ -3,7 +3,7 @@ package module
 import (
 	"database/sql"
 	"fmt"
-	"math/rand"
+	"sort"
 	"strings"
 	"sync"
 
@@ -99,14 +99,6 @@ func (d *UserGroupHotRecallHologresDao) ListItemsByUser(user *User, context *con
 		return
 	}
 
-	if len(itemIds) > d.recallCount {
-		rand.Shuffle(len(itemIds)/2, func(i, j int) {
-			itemIds[i], itemIds[j] = itemIds[j], itemIds[i]
-		})
-
-		itemIds = itemIds[:d.recallCount]
-	}
-
 	for _, id := range itemIds {
 		strs := strings.Split(id, ":")
 		if len(strs) == 1 {
@@ -138,6 +130,12 @@ func (d *UserGroupHotRecallHologresDao) ListItemsByUser(user *User, context *con
 		}
 	}
 
+	sort.Sort(sort.Reverse(ItemScoreSlice(ret)))
+
+	if d.recallCount > 0 && len(ret) > d.recallCount {
+		return ret[:d.recallCount]
+	}
+
 	return
 }