From ef0247d3bb781f992d0a55692dcbf8bd006dc0f5 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Thu, 13 Feb 2020 10:30:23 +0200 Subject: [PATCH] Newest Hoogle first --- src/Stackage/Database/Cron.hs | 3 ++- src/Stackage/Database/Query.hs | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/Stackage/Database/Cron.hs b/src/Stackage/Database/Cron.hs index 620cf19..e3ce070 100644 --- a/src/Stackage/Database/Cron.hs +++ b/src/Stackage/Database/Cron.hs @@ -697,9 +697,10 @@ uploadFromRIO key po = do buildAndUploadHoogleDB :: RIO StackageCron () buildAndUploadHoogleDB = do snapshots <- lastLtsNightly 50 5 + let snapshots' = sortBy (\x y -> compare (snd (snd y)) (snd (snd x))) $ Map.toList snapshots env <- ask locker <- newHoogleLocker (env ^. logFuncL) (env ^. envManager) - void $ flip Map.traverseWithKey snapshots $ \snapshotId snapName -> do + for_ snapshots' $ \(snapshotId, (snapName, _created)) -> do logInfo $ "Starting Hoogle DB download: " <> display (hoogleKey snapName) mfp <- singleRun locker snapName case mfp of diff --git a/src/Stackage/Database/Query.hs b/src/Stackage/Database/Query.hs index c24b6e0..77c28fe 100644 --- a/src/Stackage/Database/Query.hs +++ b/src/Stackage/Database/Query.hs @@ -169,12 +169,12 @@ lastXLts5Nightly ltsCount = run $ do l (Entity _ x) = SNLts (ltsMajor x) (ltsMinor x) n (Entity _ x) = SNNightly (nightlyDay x) -lastLtsNightly :: GetStackageDatabase env m => Int -> Int -> m (Map SnapshotId SnapName) +lastLtsNightly :: GetStackageDatabase env m => Int -> Int -> m (Map SnapshotId (SnapName, Day)) lastLtsNightly ltsCount nightlyCount = run $ do ls <- P.selectList [] [P.Desc LtsMajor, P.Desc LtsMinor, P.LimitTo ltsCount] ns <- P.selectList [] [P.Desc NightlyDay, P.LimitTo nightlyCount] - Map.map snapshotName <$> + Map.map (snapshotName &&& snapshotCreated) <$> P.getMany (map (ltsSnap . P.entityVal) ls <> map (nightlySnap . P.entityVal) ns)