1de5b91 · typeable/bloodhound

Database/Bloodhound.hs+1

compare with master

unifiedsplit

@@ -21,6 +21,7 @@ module Database.Bloodhound

21 , rangeToKV

22 , showText

23 , unpackId

24+ , mkSort

24 , Version(..)

25 , Version(..)

25 , Status(..)

26 , Status(..)

26 , Existence(..)

27 , Existence(..)

Database/Bloodhound/Types.hs+5

@@ -6,6 +6,7 @@ module Database.Bloodhound.Types

6 , halfRangeToKV

7 , maybeJson

8 , maybeJsonF

9+ , mkSort

9 , rangeToKV

10 , rangeToKV

10 , showText

11 , showText

11 , unpackId

12 , unpackId

@@ -162,6 +163,10 @@ data SortMode = SortMin

162 | SortMax

163 | SortMax

163 | SortSum

164 | SortSum

164 | SortAvg deriving (Eq, Show)

165 | SortAvg deriving (Eq, Show)

166+

167+mkSort :: FieldName -> SortOrder -> DefaultSort

168+mkSort fieldName sortOrder = DefaultSort fieldName sortOrder False Nothing Nothing Nothing

169+

165type Cache = Bool -- caching on/off

170type Cache = Bool -- caching on/off

166defaultCache = False

171defaultCache = False

167

172

README.org+8−2

@@ -27,7 +27,7 @@ Bloodhound is alpha at the moment. The library works fine, but I don't want to m

27-- the multi-line examples into your ghci REPL.

28

29:set -XDeriveGeneric

30−import Database.Bloodhound.Client

30+import Database.Bloodhound

31import Data.Aeson

32import Data.Either (Either(..))

33import Data.Maybe (fromJust)

@@ -43,7 +43,7 @@ let testServer = (Server "http://localhost:9200")

43let testIndex = IndexName "twitter"

44let testMapping = MappingName "tweet"

45

46−-- defaultIndexSettings is exported by Database.Bloodhound.Client as well.

46+-- defaultIndexSettings is exported by Database.Bloodhound as well

47let defaultIndexSettings = IndexSettings (ShardCount 3) (ReplicaCount 2)

48

49-- createIndex returns IO Reply

@@ -281,6 +281,12 @@ Right [Hit {hitIndex = IndexName "twitter"

281

282#+END_SRC

283

284+*** Sorting

285+

286+#+BEGIN_SRC haskell

287+

288+#+END_SRC

289+

284*** Filtering

290*** Filtering

285

291

286**** And, Not, and Or filters

292**** And, Not, and Or filters

tests/tests.hs+27

@@ -56,6 +56,14 @@ exampleTweet = Tweet { user = "bitemyapp"

56 , age = 10000

57 , location = Location 40.12 (-71.34) }

58

59+otherTweet = Tweet { user = "notmyapp"

60+ , postDate = UTCTime

61+ (ModifiedJulianDay 55000)

62+ (secondsToDiffTime 11)

63+ , message = "Use haskell!"

64+ , age = 1000

65+ , location = Location 40.12 (-71.34) }

66+

59insertData :: IO ()

67insertData :: IO ()

60insertData = do

68insertData = do

61 let encoded = encode exampleTweet

69 let encoded = encode exampleTweet

@@ -66,6 +74,12 @@ insertData = do

66 _ <- refreshIndex testServer testIndex

74 _ <- refreshIndex testServer testIndex

67 return ()

75 return ()

68

76

77+insertOther :: IO ()

78+insertOther = do

79+ docCreated <- indexDocument testServer testIndex testMapping otherTweet (DocId "2")

80+ _ <- refreshIndex testServer testIndex

81+ return ()

82+

69searchTweet :: Search -> IO (Either String Tweet)

83searchTweet :: Search -> IO (Either String Tweet)

70searchTweet search = do

84searchTweet search = do

71 reply <- searchByIndex testServer testIndex search

85 reply <- searchByIndex testServer testIndex search

@@ -132,6 +146,19 @@ main = hspec $ do

132 myTweet <- searchTweet search

146 myTweet <- searchTweet search

133 myTweet `shouldBe` Right exampleTweet

147 myTweet `shouldBe` Right exampleTweet

134

148

149+ describe "sorting" $ do

150+ it "returns documents in the right order" $ do

151+ _ <- insertData

152+ _ <- insertOther

153+ let sortSpec = DefaultSortSpec $ mkSort (FieldName "age") Ascending

154+ let search = Search Nothing

155+ (Just IdentityFilter) (Just [sortSpec])

156+ False 0 10

157+ reply <- searchByIndex testServer testIndex search

158+ let result = eitherDecode (responseBody reply) :: Either String (SearchResult Tweet)

159+ let myTweet = fmap (hitSource . head . hits . searchHits) result

160+ myTweet `shouldBe` Right otherTweet

161+

135 describe "filtering API" $ do

162 describe "filtering API" $ do

136 it "returns document for composed boolmatch and identity" $ do

163 it "returns document for composed boolmatch and identity" $ do

137 _ <- insertData

164 _ <- insertData