diff --git a/CHANGELOG b/CHANGELOG index 5935c5f32f..b8bdd752c6 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -13,7 +13,7 @@ git-annex (7.20191115) UNRELEASED; urgency=medium * benchmark: Changed --databases to take a parameter specifiying the size of the database to benchmark. * benchmark --databases: Display size of the populated database. - * benchmark --databases: Improve the "addAssociatedFile to (new)" + * benchmark --databases: Improve the "addAssociatedFile (new)" benchmark to really add new values, not overwriting old values. * Windows: Fix handling of changes to time zone. (Used to work but was broken in version 7.20181031.) diff --git a/Database/Benchmark.hs b/Database/Benchmark.hs index da2a693395..906337ff3a 100644 --- a/Database/Benchmark.hs +++ b/Database/Benchmark.hs @@ -49,33 +49,33 @@ benchmarkDbs _ = error "not built with criterion, cannot benchmark" #ifdef WITH_BENCHMARK getAssociatedFilesHitBench :: BenchDb -> Benchmark -getAssociatedFilesHitBench (BenchDb h num) = bench ("getAssociatedFiles from " ++ show num ++ " (hit)") $ nfIO $ do +getAssociatedFilesHitBench (BenchDb h num) = bench ("getAssociatedFiles (hit)") $ nfIO $ do n <- getStdRandom (randomR (1,num)) SQL.getAssociatedFiles (toIKey (keyN n)) (SQL.ReadHandle h) getAssociatedFilesMissBench :: BenchDb -> Benchmark -getAssociatedFilesMissBench (BenchDb h num) = bench ("getAssociatedFiles from " ++ show num ++ " (miss)") $ nfIO $ +getAssociatedFilesMissBench (BenchDb h _num) = bench ("getAssociatedFiles (miss)") $ nfIO $ SQL.getAssociatedFiles (toIKey keyMiss) (SQL.ReadHandle h) getAssociatedKeyHitBench :: BenchDb -> Benchmark -getAssociatedKeyHitBench (BenchDb h num) = bench ("getAssociatedKey from " ++ show num ++ " (hit)") $ nfIO $ do +getAssociatedKeyHitBench (BenchDb h num) = bench ("getAssociatedKey (hit)") $ nfIO $ do n <- getStdRandom (randomR (1,num)) -- fromIKey because this ends up being used to get a Key map fromIKey <$> SQL.getAssociatedKey (fileN n) (SQL.ReadHandle h) getAssociatedKeyMissBench :: BenchDb -> Benchmark -getAssociatedKeyMissBench (BenchDb h num) = bench ("getAssociatedKey from " ++ show num ++ " (miss)") $ nfIO $ +getAssociatedKeyMissBench (BenchDb h _num) = bench ("getAssociatedKey from (miss)") $ nfIO $ -- fromIKey because this ends up being used to get a Key map fromIKey <$> SQL.getAssociatedKey fileMiss (SQL.ReadHandle h) addAssociatedFileOldBench :: BenchDb -> Benchmark -addAssociatedFileOldBench (BenchDb h num) = bench ("addAssociatedFile to " ++ show num ++ " (old)") $ nfIO $ do +addAssociatedFileOldBench (BenchDb h num) = bench ("addAssociatedFile to (old)") $ nfIO $ do n <- getStdRandom (randomR (1,num)) SQL.addAssociatedFile (toIKey (keyN n)) (fileN n) (SQL.WriteHandle h) H.flushDbQueue h addAssociatedFileNewBench :: BenchDb -> Benchmark -addAssociatedFileNewBench (BenchDb h num) = bench ("addAssociatedFile to " ++ show num ++ " (new)") $ nfIO $ do +addAssociatedFileNewBench (BenchDb h num) = bench ("addAssociatedFile to (new)") $ nfIO $ do n <- getStdRandom (randomR (1,num)) SQL.addAssociatedFile (toIKey (keyN n)) (fileN (num+n)) (SQL.WriteHandle h) H.flushDbQueue h