Fix duplicate-file SQL queries

ShokoAnime · Jan 10, 2025 · 252cb62 · 252cb62
1 parent c299c67
commit 252cb62
Show file tree

Hide file tree

Showing 2 changed files with 39 additions and 30 deletions.
diff --git a/Shoko.Server/Repositories/Cached/AnimeEpisodeRepository.cs b/Shoko.Server/Repositories/Cached/AnimeEpisodeRepository.cs
@@ -132,25 +132,28 @@ public IEnumerable<SVR_AnimeEpisode> GetWithMultipleReleases(bool ignoreVariatio
 FROM
     (
         SELECT
-            vlp.VideoLocal_Place_ID,
             vl.FileSize,
             vl.Hash
         FROM
             VideoLocal AS vl
-        INNER JOIN
-            VideoLocal_Place AS vlp
-            ON vlp.VideoLocalID = vl.VideoLocalID
         WHERE
+            VideoLocalID IN (
+                SELECT
+                    VideoLocalID
+                FROM
+                    VideoLocal_Place
+                GROUP BY
+                    VideoLocalID
+                HAVING
+                    COUNT(VideoLocal_Place_ID) > 1
+            )
+        AND
             vl.Hash != ''
-        GROUP BY
-            vl.VideoLocalID
-        HAVING
-            COUNT(vl.VideoLocalID) > 1
-    ) AS filtered_vlp
+    ) AS vlp_selected
 INNER JOIN
     CrossRef_File_Episode ani
-    ON filtered_vlp.Hash = ani.Hash
-       AND filtered_vlp.FileSize = ani.FileSize
+    ON vlp_selected.Hash = ani.Hash
+       AND vlp_selected.FileSize = ani.FileSize
 WHERE ani.AnimeID = :animeID
 GROUP BY
     ani.EpisodeID
@@ -162,25 +165,28 @@ GROUP BY
 FROM
     (
         SELECT
-            vlp.VideoLocal_Place_ID,
             vl.FileSize,
             vl.Hash
         FROM
             VideoLocal AS vl
-        INNER JOIN
-            VideoLocal_Place AS vlp
-            ON vlp.VideoLocalID = vl.VideoLocalID
         WHERE
+            VideoLocalID IN (
+                SELECT
+                    VideoLocalID
+                FROM
+                    VideoLocal_Place
+                GROUP BY
+                    VideoLocalID
+                HAVING
+                    COUNT(VideoLocal_Place_ID) > 1
+            )
+        AND
             vl.Hash != ''
-        GROUP BY
-            vl.VideoLocalID
-        HAVING
-            COUNT(vl.VideoLocalID) > 1
-    ) AS filtered_vlp
+    ) AS vlp_selected
 INNER JOIN
     CrossRef_File_Episode ani
-    ON filtered_vlp.Hash = ani.Hash
-       AND filtered_vlp.FileSize = ani.FileSize
+    ON vlp_selected.Hash = ani.Hash
+       AND vlp_selected.FileSize = ani.FileSize
 GROUP BY
     ani.EpisodeID
 ";

diff --git a/Shoko.Server/Repositories/Cached/AnimeSeriesRepository.cs b/Shoko.Server/Repositories/Cached/AnimeSeriesRepository.cs
@@ -348,20 +348,23 @@ SELECT DISTINCT
 FROM
     (
         SELECT
-            vlp.VideoLocal_Place_ID,
             vl.FileSize,
             vl.Hash
         FROM
             VideoLocal AS vl
-        INNER JOIN
-            VideoLocal_Place AS vlp
-            ON vlp.VideoLocalID = vl.VideoLocalID
         WHERE
+            VideoLocalID IN (
+                SELECT
+                    VideoLocalID
+                FROM
+                    VideoLocal_Place
+                GROUP BY
+                    VideoLocalID
+                HAVING
+                    COUNT(VideoLocal_Place_ID) > 1
+            )
+        AND
             vl.Hash != ''
-        GROUP BY
-            vl.VideoLocalID
-        HAVING
-            COUNT(vl.VideoLocalID) > 1
     ) AS vlp_selected
 INNER JOIN
     CrossRef_File_Episode ani