git.iko.soy/typeable/bloodhound
on master help sign in
limit change scanSearch to given index and mapping to better match existing search functionality; add tests
commitfa9cff1ce8c4a699744159c196d618274ade99ff authorJosh Berman <berman.josh@gmail.com> dateSun 23 Aug 2015, 16:05 (11 years ago) parenta4a1575
3 files changed+22−7
compare with master
unifiedsplit
bloodhound.cabal+1−1 src/Database/Bloodhound/Client.hs+8−6 tests/tests.hs+13
bloodhound.cabal+1−1
@@ -1,5 +1,5 @@
11name: bloodhound
2−version: 0.7.1.1
2+version: 0.7.2.0
33synopsis: ElasticSearch client library for Haskell
44description: ElasticSearch made awesome for Haskell hackers
55homepage: https://github.com/bitemyapp/bloodhound
src/Database/Bloodhound/Client.hs+8−6
@@ -543,9 +543,9 @@ searchByType (IndexName indexName)
543543 (MappingName mappingName) = bindM2 dispatchSearch url . return
544544 where url = joinPath [indexName, mappingName, "_search"]
545545
546−scanSearch' :: MonadBH m => Search -> m (Maybe ScrollId)
547−scanSearch' search = do
548− let url = joinPath ["_search"]
546+scanSearch' :: MonadBH m => IndexName -> MappingName -> Search -> m (Maybe ScrollId)
547+scanSearch' (IndexName indexName) (MappingName mappingName) search = do
548+ let url = joinPath [indexName, mappingName, "_search"]
549549 search' = search { searchType = SearchTypeScan }
550550 resp' <- bindM2 dispatchSearch url (return search')
551551 let msr = decode' $ responseBody resp' :: Maybe (SearchResult ())
@@ -570,9 +570,11 @@ simpleAccumilator oldHits (newHits, msid) = do
570570 (newHits', msid') <- scroll' msid
571571 simpleAccumilator (oldHits ++ newHits) (newHits', msid')
572572
573−scanSearch :: (FromJSON a, MonadBH m) => Search -> m [Hit a]
574−scanSearch search = do
575− msid <- scanSearch' search
573+-- | 'scanSearch' uses the 'scan&scroll' API of elastic,
574+-- for a given 'IndexName' and 'MappingName',
575+scanSearch :: (FromJSON a, MonadBH m) => IndexName -> MappingName -> Search -> m [Hit a]
576+scanSearch indexName mappingName search = do
577+ msid <- scanSearch' indexName mappingName search
576578 (hits, msid') <- scroll' msid
577579 (totalHits, _) <- simpleAccumilator [] (hits, msid')
578580 return totalHits
tests/tests.hs+13
@@ -762,3 +762,16 @@ main = hspec $ do
762762 enumFrom (pred maxBound :: DocVersion) `shouldBe` [pred maxBound, maxBound]
763763 enumFrom (pred maxBound :: DocVersion) `shouldBe` [pred maxBound, maxBound]
764764 enumFromThen minBound (pred maxBound :: DocVersion) `shouldBe` [minBound, pred maxBound]
765+
766+ describe "scan&scroll API" $ do
767+ it "returns documents using the scan&scroll API" $ withTestEnv $ do
768+ _ <- insertData
769+ _ <- insertOther
770+ let search = (mkSearch (Just $ MatchAllQuery Nothing) Nothing) { size = (Size 1) }
771+ regular_search <- searchTweet search
772+ scan_search' <- scanSearch testIndex testMapping search :: BH IO [Hit Tweet]
773+ let scan_search = map hitSource scan_search'
774+ liftIO $
775+ regular_search `shouldBe` Right exampleTweet -- Check that the size restrtiction is being honored
776+ liftIO $
777+ scan_search `shouldMatchList` [exampleTweet, otherTweet]