内存 DISTINCT

PBH-BTN · Dec 19, 2024 · e64209f · e64209f
1 parent c86f9e5
commit e64209f
Show file tree

Hide file tree

Showing 2 changed files with 50 additions and 41 deletions.
diff --git a/src/main/java/com/ghostchu/btn/sparkle/module/analyse/AnalyseService.java b/src/main/java/com/ghostchu/btn/sparkle/module/analyse/AnalyseService.java
@@ -103,6 +103,7 @@ public void cronUntrustedIPAddresses() throws InterruptedException {
                                     Duration.ofMinutes(30)
                             )
                             .stream()
+                            .distinct()
                             .map(IPUtil::toString)
                             .collect(Collectors.toList()))
                     .stream().map(IPUtil::toIPAddress)
@@ -283,46 +284,54 @@ public void cronUpdateOverDownload() throws InterruptedException {
             var startAt = System.currentTimeMillis();
             var query = entityManager.createNativeQuery("""
                     WITH LatestSnapshots AS (
-                        SELECT DISTINCT ON (s.torrent, s.peer_ip, s.user_application)
-                            s.id,
-                            s.torrent,
-                            s.peer_ip,
-                            s.user_application,
-                            s.to_peer_traffic,
-                            s.last_time_seen
-                        FROM
-                            public.peer_history s
-                        WHERE
-                            s.last_time_seen >= ? AND s.to_peer_traffic > 0
-                        ORDER BY
-                            s.torrent, s.peer_ip, s.user_application, s.last_time_seen DESC
-                    ),
-                    AggregatedUploads AS (
-                        SELECT
-                            ls.torrent,
-                            ls.peer_ip,
-                            SUM(ls.to_peer_traffic) AS total_uploaded
-                        FROM
-                            LatestSnapshots ls
-                        GROUP BY
-                            ls.torrent, ls.peer_ip
-                        HAVING
-                            SUM(ls.to_peer_traffic) > 0
-                    )
-                    SELECT
-                        au.torrent,
-                        au.peer_ip,
-                        au.total_uploaded,
-                        t.size,
-                        (au.total_uploaded / t.size::float) * 100 AS upload_percentage
-                    FROM
-                        AggregatedUploads au
-                    JOIN
-                        public.torrent t ON au.torrent = t.id
-                    WHERE
-                        t.size::float > 0 AND au.total_uploaded > t.size::float * ?
-                    ORDER BY
-                        upload_percentage DESC;
+                                            SELECT
+                                                s.id,
+                                                s.torrent,
+                                                s.peer_ip,
+                                                s.user_application,
+                                                s.to_peer_traffic,
+                                                s.last_time_seen,
+                                                time_bucket('1 day', s.last_time_seen) AS day_bucket  -- 按天分桶
+                                            FROM
+                                                public.peer_history s
+                                            WHERE
+                                                s.last_time_seen >= ?
+                                                AND s.to_peer_traffic > 0
+                                        ),
+                                        AggregatedUploads AS (
+                                            SELECT
+                                                ls.torrent,
+                                                ls.peer_ip,
+                                                SUM(ls.to_peer_traffic) AS total_uploaded,
+                                                ls.day_bucket
+                                            FROM
+                                                LatestSnapshots ls
+                                            GROUP BY
+                                                ls.torrent, ls.peer_ip, ls.day_bucket  -- 按时间分桶后进行聚合
+                                            HAVING
+                                                SUM(ls.to_peer_traffic) > 0
+                                        )
+                                        SELECT
+                                            au.torrent,
+                                            au.peer_ip,
+                                            au.total_uploaded,
+                                            t.size,
+                                            (au.total_uploaded / t.size::float) * 100 AS upload_percentage
+                                        FROM
+                                            AggregatedUploads au
+                                        JOIN
+                                            public.torrent t ON au.torrent = t.id
+                                        WHERE
+                                            t.size::float > 0
+                                            AND au.total_uploaded > t.size::float * ?
+                                            AND EXISTS (
+                                                SELECT 1
+                                                FROM public.peer_history ph
+                                                WHERE ph.peer_ip = au.peer_ip
+                                                AND ph.last_time_seen >= ?
+                                            )
+                                        ORDER BY
+                                            upload_percentage DESC;
                                         
                     """);
             query.setParameter(1, new Timestamp(System.currentTimeMillis() - overDownloadGenerateOffset));

diff --git a/src/main/java/com/ghostchu/btn/sparkle/module/banhistory/internal/BanHistoryRepository.java b/src/main/java/com/ghostchu/btn/sparkle/module/banhistory/internal/BanHistoryRepository.java
@@ -15,7 +15,7 @@
 @Repository
 public interface BanHistoryRepository extends SparkleCommonRepository<BanHistory, Long> {
     @Query("""
-                SELECT DISTINCT ban.peerIp
+                SELECT ban.peerIp
                        FROM BanHistory ban
                        WHERE
                           ban.insertTime >= ?1 AND ban.insertTime <= ?2 AND ban.module LIKE '%ProgressCheatBlocker%'