get rid of num_rounds

Summary:
This diff removes the scuba field as described in the task, as well as removing numRounds from Stats. This involved removing the numRounds assertion from expectRounds* functions, which I chose to rename to expectResult* (lmk if you prefer something different there).

Within Stats, I merely deleted the numRounds function. I didn't go looking for anything deeper to clean up because it looked like `rs` was used in other functions.

Reviewed By: zilberstein

Differential Revision: D8963298

fbshipit-source-id: d367b53007be03bd290222c676539680acd9f929

Haxl/Core.hs

@@ -43,7 +43,6 @@ module Haxl.Core (
   , Microseconds
   , Timestamp
   , emptyStats
-  , numRounds
   , numFetches
   , ppStats
   , ppFetchStats

Haxl/Core/Stats.hs

@@ -23,7 +23,6 @@ module Haxl.Core.Stats
   , Timestamp
   , getTimestamp
   , emptyStats
-  , numRounds
   , numFetches
   , ppStats
   , ppFetchStats
@@ -159,9 +158,6 @@ instance ToJSON FetchStats where
 emptyStats :: Stats
 emptyStats = Stats []
 
-numRounds :: Stats -> Int
-numRounds (Stats rs) = length rs        -- not really
-
 numFetches :: Stats -> Int
 numFetches (Stats rs) = sum [ fetchBatchSize | FetchStats{..} <- rs ]
 

tests/AdoTests.hs

@@ -21,14 +21,14 @@ import Haxl.Prelude
 --
 -- Test ApplicativeDo batching
 --
-ado1 = expectRounds 1 12 ado1_
+ado1 = expectResult 12 ado1_
 
 ado1_ = do
   a <- friendsOf =<< id1
   b <- friendsOf =<< id2
   return (length (a ++ b))
 
-ado2 = expectRounds 1 12 ado2_
+ado2 = expectResult 12 ado2_
 
 ado2_ = do
   x <- id1
@@ -37,7 +37,7 @@ ado2_ = do
   b <- friendsOf y
   return (length (a ++ b))
 
-ado3 = expectRounds 2 11 ado3_
+ado3 = expectResult 11 ado3_
 
 ado3_ = do
   x <- id1

tests/BatchTests.hs

@@ -25,7 +25,7 @@ import Data.IORef
 --
 -- Test batching over multiple arguments in liftA2
 --
-batching1 = expectRounds 1 12 batching1_
+batching1 = expectResult 12 batching1_
 
 batching1_ = do
   a <- id1
@@ -35,7 +35,7 @@ batching1_ = do
 --
 -- Test batching in mapM (which is really traverse)
 --
-batching2 = expectRounds 1 12 batching2_
+batching2 = expectResult 12 batching2_
 
 batching2_ = do
   a <- id1
@@ -46,7 +46,7 @@ batching2_ = do
 --
 -- Test batching when we have a monadic bind in each branch
 --
-batching3 = expectRounds 1 12 batching3_
+batching3 = expectResult 12 batching3_
 
 batching3_ = do
   let a = id1 >>= friendsOf
@@ -56,7 +56,7 @@ batching3_ = do
 --
 -- Test batching over both arguments of (+)
 --
-batching4 = expectRounds 1 12 batching4_
+batching4 = expectResult 12 batching4_
 
 batching4_ = do
   let a = length <$> (id1 >>= friendsOf)
@@ -66,7 +66,7 @@ batching4_ = do
 --
 -- Test batching over both arguments of (+)
 --
-batching5 = expectRounds 1 2 batching5_
+batching5 = expectResult 2 batching5_
 
 batching5_ :: Haxl Int
 batching5_ = if a .> b then 1 else 2
@@ -77,14 +77,14 @@ batching5_ = if a .> b then 1 else 2
 --
 -- Test batching when we perform all batching tests together with sequence
 --
-batching6 = expectRounds 1 [12,12,12,12,2] batching6_
+batching6 = expectResult [12,12,12,12,2] batching6_
 
 batching6_ = sequence [batching1_,batching2_,batching3_,batching4_,batching5_]
 
 --
 -- Ensure if/then/else and bool operators break batching
 --
-batching7 = expectRounds 2 12 batching7_
+batching7 = expectResult 12 batching7_
 
 batching7_ :: Haxl Int
 batching7_ = if a .> 0 then a+b else 0
@@ -93,7 +93,7 @@ batching7_ = if a .> 0 then a+b else 0
   b = length <$> (id2 >>= friendsOf)
 
 -- We expect 3 rounds here due to boolean operators
-batching8 = expectRounds 3 12 batching8_
+batching8 = expectResult 12 batching8_
 
 batching8_ :: Haxl Int
 batching8_ = if (c .== 0) .|| (a .> 0 .&& b .> 0) then a+b else 0
@@ -103,7 +103,7 @@ batching8_ = if (c .== 0) .|| (a .> 0 .&& b .> 0) then a+b else 0
   c = length <$> (id3 >>= friendsOf)
 
 -- (>>) should batch, so we expect one round
-batching9 = expectRounds 1 6 batching9_
+batching9 = expectResult 6 batching9_
 
 batching9_ :: Haxl Int
 batching9_ = (id1 >>= friendsOf) >> (length <$> (id2 >>= friendsOf))
@@ -135,7 +135,7 @@ caching3_ = if nf id1 .> 0 then nf id1 + nf id2 + nf id3 else 0
 --
 cacheReuse future = do
   env <- makeTestEnv future
-  expectRoundsWithEnv 2 12 batching7_ env
+  expectResultWithEnv 12 batching7_ env
 
   -- make a new env
   tao <- MockTAO.initGlobalState future
@@ -143,7 +143,7 @@ cacheReuse future = do
   env2 <- initEnvWithData st testinput (caches env)
 
   -- ensure no more data fetching rounds needed
-  expectRoundsWithEnv 0 12 batching7_ env2
+  expectResultWithEnv 12 batching7_ env2
 
 noCaching future = do
   env <- makeTestEnv future
@@ -151,13 +151,12 @@ noCaching future = do
   result <- runHaxl env' caching3_
   assertEqual "result" result 18
   stats <- readIORef (statsRef env)
-  assertEqual "rounds" 2 (numRounds stats)
   assertEqual "fetches" 4 (numFetches stats)
 
-exceptionTest1 = expectRounds 1 []
+exceptionTest1 = expectResult []
   $ withDefault [] $ friendsOf 101
 
-exceptionTest2 = expectRounds 1 [7..12] $ liftA2 (++)
+exceptionTest2 = expectResult [7..12] $ liftA2 (++)
   (withDefault [] (friendsOf 101))
   (withDefault [] (friendsOf 2))
 

tests/TestUtils.hs

@@ -7,8 +7,8 @@
 {-# LANGUAGE OverloadedStrings #-}
 module TestUtils
   ( makeTestEnv
-  , expectRoundsWithEnv
-  , expectRounds
+  , expectResultWithEnv
+  , expectResult
   , expectFetches
   , testinput
   , id1, id2, id3, id4
@@ -53,18 +53,16 @@ makeTestEnv future = do
   env <- initEnv st testinput
   return env { flags = (flags env) { report = 2 } }
 
-expectRoundsWithEnv
-  :: (Eq a, Show a) => Int -> a -> Haxl a -> Env UserEnv -> Assertion
-expectRoundsWithEnv n result haxl env = do
+expectResultWithEnv
+  :: (Eq a, Show a) => a -> Haxl a -> Env UserEnv -> Assertion
+expectResultWithEnv result haxl env = do
   a <- runHaxl env haxl
   assertEqual "result" result a
-  stats <- readIORef (statsRef env)
-  assertEqual "rounds" n (numRounds stats)
 
-expectRounds :: (Eq a, Show a) => Int -> a -> Haxl a -> Bool -> Assertion
-expectRounds n result haxl future = do
+expectResult :: (Eq a, Show a) => a -> Haxl a -> Bool -> Assertion
+expectResult result haxl future = do
   env <- makeTestEnv future
-  expectRoundsWithEnv n result haxl env
+  expectResultWithEnv result haxl env
 
 expectFetches :: (Eq a, Show a) => Int -> Haxl a -> Bool -> Assertion
 expectFetches n haxl future = do