git.iko.soy/typeable/bloodhound
on master help sign in
Merge remote-tracking branch 'upstream/master' into source-in-search

Conflicts: src/Database/Bloodhound/Client.hs

commitdfa897d3412535cc52916a661b575388675026e8 authorThomas van Noort <thomas@silk.co> dateFri 28 Aug 2015, 11:45 (11 years ago) parent11b77c940204d2
7 files changed+55−41
compare with master
unifiedsplit
.travis.yml+13−24 bloodhound.cabal+1−1 src/Database/Bloodhound/Client.hs+17−15 src/Database/Bloodhound/Types.hs+1−1 stack-7.10.yaml+9 stack-7.8.yaml+1 tests/tests.hs+13
.travis.yml+13−24
@@ -7,14 +7,14 @@
77# release of a major GHC version. Setting HPVER implictly sets
88# GHCVER. Omit lines with versions you don't need/want testing for.
99env:
10− - GHCVER=7.6.3 ESVER=1.6.0
10+ # - GHCVER=7.6.3 ESVER=1.6.0 # Deprecated
1111 # - GHCVER=7.8.3 ESVER=1.0.3 # Deprecated
1212 # - GHCVER=7.8.3 ESVER=1.1.2 # Deprecated
13− - GHCVER=7.8.3 ESVER=1.2.4
14− - GHCVER=7.8.3 ESVER=1.3.6
15− - GHCVER=7.8.3 ESVER=1.4.1
16− - GHCVER=7.10.1 ESVER=1.5.2
17− - GHCVER=7.10.1 ESVER=1.6.0
13+ - GHCVER=7.8 ESVER=1.2.4
14+ - GHCVER=7.8 ESVER=1.3.6
15+ - GHCVER=7.8 ESVER=1.4.1
16+ - GHCVER=7.10 ESVER=1.5.2
17+ - GHCVER=7.10 ESVER=1.6.0
1818
1919# services:
2020# - elasticsearch
@@ -22,34 +22,23 @@ env:
2222# Note: the distinction between `before_install` and `install` is not
2323# important.
2424before_install:
25− - sudo add-apt-repository -y ppa:hvr/ghc
25+ - export STACK_YAML=stack-$GHCVER.yaml
26+ - wget -q -O- https://s3.amazonaws.com/download.fpcomplete.com/ubuntu/fpco.key | sudo apt-key add -
27+ - echo 'deb http://download.fpcomplete.com/ubuntu/precise stable main' | sudo tee /etc/apt/sources.list.d/fpco.list
2628 - sudo apt-get update
27− - sudo apt-get install cabal-install-1.20 ghc-$GHCVER
28− - sudo apt-get install happy-1.19.3
29− - export PATH=/opt/ghc/$GHCVER/bin:/opt/happy/1.19.3/bin:$PATH
29+ - sudo apt-get install stack -y
30+ - stack setup
3031 - wget --no-check-certificate https://download.elasticsearch.org/elasticsearch/elasticsearch/elasticsearch-$ESVER.deb
3132 - sudo dpkg --force-all -i elasticsearch-$ESVER.deb
3233 - sudo service elasticsearch start
3334
3435install:
35− - cabal-1.20 update
36− - cabal-1.20 install --only-dependencies --enable-tests --enable-benchmarks --force-reinstalls
36+ - stack build
3737
3838# Here starts the actual work to be performed for the package under
3939# test; any command which exits with a non-zero exit code causes the
4040# build to fail.
4141script:
42− # -v2 provides useful information for debugging
43− - cabal-1.20 configure --enable-tests --enable-benchmarks -v2
44−
45− # this builds all libraries and executables
46− # (including tests/benchmarks)
47− - cabal-1.20 build
48−
49− - cabal-1.20 test
50− - cabal-1.20 check
51−
52− # tests that a source-distribution can be generated
53− - cabal-1.20 sdist
42+ - stack test
5443
5544# EOF
bloodhound.cabal+1−1
@@ -1,5 +1,5 @@
11name: bloodhound
2−version: 0.7.1.0
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+17−15
@@ -173,16 +173,16 @@ joinPath ps = do
173173 return $ joinPath' (s:ps)
174174
175175appendSearchTypeParam :: Text -> SearchType -> Text
176−appendSearchTypeParam originalUrl st = addQuery [(keyEq, Just stParams)] originalUrl
177− where keyEq = "search_type="
178− stParams
179− | st == SearchTypeDfsQueryThenFetch = "dfs_query_then_fetch"
180− | st == SearchTypeCount = "count"
181− | st == SearchTypeScan = "scan&scroll=1m"
182− | st == SearchTypeQueryAndFetch = "query_and_fetch"
183− | st == SearchTypeDfsQueryAndFetch = "dfs_query_and_fetch"
176+appendSearchTypeParam originalUrl st = addQuery params originalUrl
177+ where stText = "search_type"
178+ params
179+ | st == SearchTypeDfsQueryThenFetch = [(stText, Just "dfs_query_then_fetch")]
180+ | st == SearchTypeCount = [(stText, Just "count")]
181+ | st == SearchTypeScan = [(stText, Just "scan"), ("scroll", Just "1m")]
182+ | st == SearchTypeQueryAndFetch = [(stText, Just "query_and_fetch")]
183+ | st == SearchTypeDfsQueryAndFetch = [(stText, Just "dfs_query_and_fetch")]
184184 -- used to catch 'SearchTypeQueryThenFetch', which is also the default
185− | otherwise = "query_then_fetch"
185+ | otherwise = [(stText, Just "query_then_fetch")]
186186
187187-- | Severely dumbed down query renderer. Assumes your data doesn't
188188-- need any encoding
@@ -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
src/Database/Bloodhound/Types.hs+1−1
@@ -47,7 +47,7 @@ module Database.Bloodhound.Types
4747 , toTerms
4848 , toDateHistogram
4949 , omitNulls
50− , BH
50+ , BH(..)
5151 , runBH
5252 , BHEnv(..)
5353 , MonadBH(..)
stack-7.10.yamlnew file+9
@@ -0,0 +1,9 @@
1+flags: {}
2+packages:
3+- '.'
4+extra-deps:
5+- doctest-0.10.1
6+- doctest-prop-0.2.0.1
7+- quickcheck-properties-0.1
8+- uri-bytestring-0.1.2
9+resolver: lts-3.1
stack-7.8.yamlnew file+1
@@ -0,0 +1 @@
1+stack.yaml
tests/tests.hs+13
@@ -798,3 +798,16 @@ main = hspec $ do
798798 enumFrom (pred maxBound :: DocVersion) `shouldBe` [pred maxBound, maxBound]
799799 enumFrom (pred maxBound :: DocVersion) `shouldBe` [pred maxBound, maxBound]
800800 enumFromThen minBound (pred maxBound :: DocVersion) `shouldBe` [minBound, pred maxBound]
801+
802+ describe "scan&scroll API" $ do
803+ it "returns documents using the scan&scroll API" $ withTestEnv $ do
804+ _ <- insertData
805+ _ <- insertOther
806+ let search = (mkSearch (Just $ MatchAllQuery Nothing) Nothing) { size = (Size 1) }
807+ regular_search <- searchTweet search
808+ scan_search' <- scanSearch testIndex testMapping search :: BH IO [Hit Tweet]
809+ let scan_search = map hitSource scan_search'
810+ liftIO $
811+ regular_search `shouldBe` Right exampleTweet -- Check that the size restrtiction is being honored
812+ liftIO $
813+ scan_search `shouldMatchList` [exampleTweet, otherTweet]