git.iko.soy/typeable/bloodhound
on master help sign in
Merge pull request #96 from MHova/fix-advancescroll-docs
bfb4adfChris Allen
README.md+1−1
compare with master
unifiedsplit
@@ -21,7 +21,7 @@ Endorsements
21Version compatibility
21Version compatibility
22---------------------
22---------------------
23
23
24−Elasticsearch \>= 1.0 is recommended. Bloodhound mostly works with 0.9.x, but I don't recommend it if you expect everything to work. As of Bloodhound 0.3 all \>=1.0 versions of Elasticsearch work.
24+Elasticsearch \>=1.0 && \<2.0 is recommended. Bloodhound mostly works with 0.9.x, but I don't recommend it if you expect everything to work. As of Bloodhound 0.3 all \>=1.0 && \<2.0 versions of Elasticsearch work. Some (or even most?) features will work with versions \>=2.0, but it is not officially supported yet.
25
25
26Current versions we test against are 1.0.3, 1.1.2, 1.2.3, 1.3.2, and 1.4.0. We also check that GHC 7.6 and 7.8 both build and pass tests. See our [TravisCI](https://travis-ci.org/bitemyapp/bloodhound) to learn more.
26Current versions we test against are 1.0.3, 1.1.2, 1.2.3, 1.3.2, and 1.4.0. We also check that GHC 7.6 and 7.8 both build and pass tests. See our [TravisCI](https://travis-ci.org/bitemyapp/bloodhound) to learn more.
27
27
src/Database/Bloodhound/Client.hs+2−3
@@ -680,9 +680,8 @@ scroll' (Just sid) = do
680 Right SearchResult {..} -> return (hits searchHits, scrollId)
680 Right SearchResult {..} -> return (hits searchHits, scrollId)
681 Left _ -> return ([], Nothing)
681 Left _ -> return ([], Nothing)
682
682
683−-- | Use the given scroll to fetch the next page of documents. If
683+-- | Use the given scroll to fetch the next page of documents. If there are no
684−-- there are still further pages, there will be a value in the
684+-- further pages, 'SearchResult.searchHits.hits' will be '[]'.
685−-- 'scrollId' field of the 'SearchResult'
686advanceScroll
685advanceScroll
687 :: ( FromJSON a
686 :: ( FromJSON a
688 , MonadBH m
687 , MonadBH m