Use SQL RANDOM() in suggestions

It speeds up the computation in case of many tracks and albums.
DocMarty84 · Apr 22, 2019 · d29f312 · d29f312
1 parent fdc2a45
commit d29f312
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/models/oomusic_playlist.py b/models/oomusic_playlist.py
@@ -156,15 +156,17 @@ def _smart_rnd(self):
         if current_tracks:
             query += "WHERE id NOT IN %s" % (tuple(current_tracks.ids + [0]),)
         if folder_sharing == "inactive":
-            query += "{} user_id = {}".format(
+            query += "{} user_id = {} ".format(
                 "WHERE" if not current_tracks else "AND", self.env.uid
             )
+        query += "ORDER BY RANDOM() "
+        query += "LIMIT {}".format(self.smart_playlist_qty or 1)
         self.env.cr.execute(query)
         res = self.env.cr.fetchall()
         if not res:
             return self.env["oomusic.track"]
 
-        track_ids = random.sample([r[0] for r in res], min(self.smart_playlist_qty, len(res)))
+        track_ids = [r[0] for r in res]
         return self.env["oomusic.track"].browse(track_ids)
 
     def _smart_played(self):

diff --git a/models/oomusic_suggestion.py b/models/oomusic_suggestion.py
@@ -1,7 +1,5 @@
 # -*- coding: utf-8 -*-
 
-import random
-
 from odoo import fields, models, api
 
 
@@ -53,13 +51,15 @@ def _compute_track_random(self):
         )
         query = "SELECT id FROM oomusic_track "
         if folder_sharing == "inactive":
-            query += "WHERE user_id = {}".format(self.env.uid)
+            query += "WHERE user_id = {} ".format(self.env.uid)
+        query += "ORDER BY RANDOM() "
+        query += "LIMIT 10"
         self.env.cr.execute(query)
         res = self.env.cr.fetchall()
         if not res:
             return
 
-        self.track_random = random.sample([r[0] for r in res], min(10, len(res)))
+        self.track_random = [r[0] for r in res]
 
     @api.depends("name_albums")
     def _compute_album_recently_added(self):
@@ -72,10 +72,12 @@ def _compute_album_random(self):
         )
         query = "SELECT id FROM oomusic_album "
         if folder_sharing == "inactive":
-            query += "WHERE user_id = {}".format(self.env.uid)
+            query += "WHERE user_id = {} ".format(self.env.uid)
+        query += "ORDER BY RANDOM() "
+        query += "LIMIT 15"
         self.env.cr.execute(query)
         res = self.env.cr.fetchall()
         if not res:
             return
 
-        self.album_random = random.sample([r[0] for r in res], min(15, len(res)))
+        self.album_random = [r[0] for r in res]