git.iko.soy/typeable/bloodhound
on master help sign in
Merge branch 'faster-compile-script-merge' into we-need-faster-compile
f7d3149Chris Allen
.travis.yml+1−1
compare with master
unifiedsplit
@@ -40,7 +40,7 @@ script:
40 - stack update --no-terminal
40 - stack update --no-terminal
41 - stack build -j2 --fast --no-terminal
41 - stack build -j2 --fast --no-terminal
42 - travis_wait 45 sleep 1800 &
42 - travis_wait 45 sleep 1800 &
43− - stack test --fast --no-terminal bloodhound:tests --test-arguments="--qc-max-success 500" --flag bloodhound:$ESFLAG
43+ - stack test --fast --no-terminal bloodhound:bloodhound-tests --test-arguments="--qc-max-success 500" --flag bloodhound:$ESFLAG
44
44
45cache:
45cache:
46 timeout: 2000
46 timeout: 2000
bloodhound.cabal+2
@@ -44,6 +44,7 @@ library
44 Database.V5.Bloodhound.Types
44 Database.V5.Bloodhound.Types
45 Database.V5.Bloodhound.Types.Class
45 Database.V5.Bloodhound.Types.Class
46 other-modules: Bloodhound.Import
46 other-modules: Bloodhound.Import
47+ Database.Bloodhound.Common.Script
47 Database.V5.Bloodhound.Types.Internal.Analysis
48 Database.V5.Bloodhound.Types.Internal.Analysis
48 Database.V5.Bloodhound.Types.Internal.Client
49 Database.V5.Bloodhound.Types.Internal.Client
49 Database.V5.Bloodhound.Types.Internal.Newtypes
50 Database.V5.Bloodhound.Types.Internal.Newtypes
@@ -64,6 +65,7 @@ library
64 http-types >= 0.8 && <0.13,
65 http-types >= 0.8 && <0.13,
65 vector >= 0.10.9 && <0.13,
66 vector >= 0.10.9 && <0.13,
66 scientific >= 0.3.0.0 && <0.4.0.0,
67 scientific >= 0.3.0.0 && <0.4.0.0,
68+ bifunctors,
67 exceptions,
69 exceptions,
68 data-default-class,
70 data-default-class,
69 blaze-builder,
71 blaze-builder,
src/Bloodhound/Import.hs+14
@@ -2,6 +2,8 @@ module Bloodhound.Import
2 ( module X
2 ( module X
3 , LByteString
3 , LByteString
4 , Method
4 , Method
5+ , omitNulls
6+ , parseNEJSON
5 , parseReadText
7 , parseReadText
6 , readMay
8 , readMay
7 , showText
9 , showText
@@ -62,6 +64,8 @@ import Data.Time.Clock.POSIX as X
62
64
63import qualified Data.ByteString.Lazy as BL
65import qualified Data.ByteString.Lazy as BL
64import qualified Data.Text as T
66import qualified Data.Text as T
67+import qualified Data.Traversable as DT
68+import qualified Data.Vector as V
65import qualified Network.HTTP.Types.Method as NHTM
69import qualified Network.HTTP.Types.Method as NHTM
66
70
67type LByteString = BL.ByteString
71type LByteString = BL.ByteString
@@ -78,3 +82,13 @@ parseReadText = maybe mzero return . readMay . T.unpack
78
82
79showText :: Show a => a -> Text
83showText :: Show a => a -> Text
80showText = T.pack . show
84showText = T.pack . show
85+
86+omitNulls :: [(Text, Value)] -> Value
87+omitNulls = object . filter notNull where
88+ notNull (_, Null) = False
89+ notNull (_, Array a) = (not . V.null) a
90+ notNull _ = True
91+
92+parseNEJSON :: (FromJSON a) => [Value] -> Parser (NonEmpty a)
93+parseNEJSON [] = fail "Expected non-empty list"
94+parseNEJSON (x:xs) = DT.mapM parseJSON (x :| xs)
src/Database/Bloodhound/Common/Script.hsnew file+222
@@ -0,0 +1,222 @@
1+{-# LANGUAGE GeneralizedNewtypeDeriving #-}
2+{-# LANGUAGE OverloadedStrings #-}
3+
4+module Database.Bloodhound.Common.Script where
5+
6+import Bloodhound.Import
7+
8+import qualified Data.HashMap.Strict as HM
9+
10+import Database.V5.Bloodhound.Types.Internal.Newtypes
11+
12+newtype ScriptFields =
13+ ScriptFields (HM.HashMap ScriptFieldName ScriptFieldValue)
14+ deriving (Eq, Show)
15+
16+type ScriptFieldName = Text
17+type ScriptFieldValue = Value
18+
19+data Script =
20+ Script { scriptLanguage :: Maybe ScriptLanguage
21+ , scriptInline :: Maybe ScriptInline
22+ , scriptStored :: Maybe ScriptId
23+ , scriptParams :: Maybe ScriptParams
24+ } deriving (Eq, Show)
25+
26+newtype ScriptLanguage =
27+ ScriptLanguage Text deriving (Eq, Show, FromJSON, ToJSON)
28+
29+newtype ScriptInline =
30+ ScriptInline Text deriving (Eq, Show, FromJSON, ToJSON)
31+
32+newtype ScriptId =
33+ ScriptId Text deriving (Eq, Show, FromJSON, ToJSON)
34+
35+newtype ScriptParams =
36+ ScriptParams (HM.HashMap ScriptParamName ScriptParamValue)
37+ deriving (Eq, Show)
38+
39+type ScriptParamName = Text
40+type ScriptParamValue = Value
41+
42+data BoostMode =
43+ BoostModeMultiply
44+ | BoostModeReplace
45+ | BoostModeSum
46+ | BoostModeAvg
47+ | BoostModeMax
48+ | BoostModeMin deriving (Eq, Show)
49+
50+data ScoreMode =
51+ ScoreModeMultiply
52+ | ScoreModeSum
53+ | ScoreModeAvg
54+ | ScoreModeFirst
55+ | ScoreModeMax
56+ | ScoreModeMin deriving (Eq, Show)
57+
58+data FunctionScoreFunction =
59+ FunctionScoreFunctionScript Script
60+ | FunctionScoreFunctionRandom Seed
61+ | FunctionScoreFunctionFieldValueFactor FieldValueFactor
62+ deriving (Eq, Show)
63+
64+newtype Weight =
65+ Weight Float deriving (Eq, Show, FromJSON, ToJSON)
66+
67+newtype Seed =
68+ Seed Float deriving (Eq, Show, FromJSON, ToJSON)
69+
70+data FieldValueFactor =
71+ FieldValueFactor { fieldValueFactorField :: FieldName
72+ , fieldValueFactor :: Maybe Factor
73+ , fieldValueFactorModifier :: Maybe FactorModifier
74+ , fieldValueFactorMissing :: Maybe FactorMissingFieldValue
75+ } deriving (Eq, Show)
76+
77+newtype Factor =
78+ Factor Float deriving (Eq, Show, FromJSON, ToJSON)
79+
80+data FactorModifier =
81+ FactorModifierNone
82+ | FactorModifierLog
83+ | FactorModifierLog1p
84+ | FactorModifierLog2p
85+ | FactorModifierLn
86+ | FactorModifierLn1p
87+ | FactorModifierLn2p
88+ | FactorModifierSquare
89+ | FactorModifierSqrt
90+ | FactorModifierReciprocal deriving (Eq, Show)
91+
92+newtype FactorMissingFieldValue =
93+ FactorMissingFieldValue Float deriving (Eq, Show, FromJSON, ToJSON)
94+
95+instance ToJSON BoostMode where
96+ toJSON BoostModeMultiply = "multiply"
97+ toJSON BoostModeReplace = "replace"
98+ toJSON BoostModeSum = "sum"
99+ toJSON BoostModeAvg = "avg"
100+ toJSON BoostModeMax = "max"
101+ toJSON BoostModeMin = "min"
102+
103+instance FromJSON BoostMode where
104+ parseJSON = withText "BoostMode" parse
105+ where parse "multiply" = pure BoostModeMultiply
106+ parse "replace" = pure BoostModeReplace
107+ parse "sum" = pure BoostModeSum
108+ parse "avg" = pure BoostModeAvg
109+ parse "max" = pure BoostModeMax
110+ parse "min" = pure BoostModeMin
111+ parse bm = fail ("Unexpected BoostMode: " <> show bm)
112+
113+instance ToJSON ScoreMode where
114+ toJSON ScoreModeMultiply = "multiply"
115+ toJSON ScoreModeSum = "sum"
116+ toJSON ScoreModeFirst = "first"
117+ toJSON ScoreModeAvg = "avg"
118+ toJSON ScoreModeMax = "max"
119+ toJSON ScoreModeMin = "min"
120+
121+instance FromJSON ScoreMode where
122+ parseJSON = withText "ScoreMode" parse
123+ where parse "multiply" = pure ScoreModeMultiply
124+ parse "sum" = pure ScoreModeSum
125+ parse "first" = pure ScoreModeFirst
126+ parse "avg" = pure ScoreModeAvg
127+ parse "max" = pure ScoreModeMax
128+ parse "min" = pure ScoreModeMin
129+ parse sm = fail ("Unexpected ScoreMode: " <> show sm)
130+
131+functionScoreFunctionPair :: FunctionScoreFunction -> (Text, Value)
132+functionScoreFunctionPair (FunctionScoreFunctionScript functionScoreScript) =
133+ ("script_score", toJSON functionScoreScript)
134+
135+functionScoreFunctionPair (FunctionScoreFunctionRandom seed) =
136+ ("random_score", omitNulls [ "seed" .= seed ])
137+
138+functionScoreFunctionPair (FunctionScoreFunctionFieldValueFactor fieldValueFactor) =
139+ ("field_value_factor", toJSON fieldValueFactor)
140+
141+parseFunctionScoreFunction :: Object -> Parser FunctionScoreFunction
142+parseFunctionScoreFunction o =
143+ singleScript `taggedWith` "script_score"
144+ <|> singleRandom `taggedWith` "random_score"
145+ <|> singleFieldValueFactor `taggedWith` "field_value_factor"
146+ where taggedWith parser k = parser =<< o .: k
147+ singleScript = pure . FunctionScoreFunctionScript
148+ singleRandom o' = FunctionScoreFunctionRandom <$> o' .: "seed"
149+ singleFieldValueFactor = pure . FunctionScoreFunctionFieldValueFactor
150+
151+instance ToJSON ScriptFields where
152+ toJSON (ScriptFields x) = Object x
153+
154+instance FromJSON ScriptFields where
155+ parseJSON (Object o) = pure (ScriptFields o)
156+ parseJSON _ = fail "error parsing ScriptFields"
157+
158+instance ToJSON Script where
159+ toJSON (Script lang inline stored params) =
160+ object [ "script" .= omitNulls base ]
161+ where base = [ "lang" .= lang
162+ , "inline" .= inline
163+ , "stored" .= stored
164+ , "params" .= params ]
165+
166+instance FromJSON Script where
167+ parseJSON = withObject "Script" parse
168+ where parse o = o .: "script" >>= \o' ->
169+ Script
170+ <$> o' .:? "lang"
171+ <*> o' .:? "inline"
172+ <*> o' .:? "stored"
173+ <*> o' .:? "params"
174+
175+instance ToJSON ScriptParams where
176+ toJSON (ScriptParams x) = Object x
177+
178+instance FromJSON ScriptParams where
179+ parseJSON (Object o) = pure (ScriptParams o)
180+ parseJSON _ = fail "error parsing ScriptParams"
181+
182+instance ToJSON FieldValueFactor where
183+ toJSON (FieldValueFactor field factor modifier missing) =
184+ omitNulls base
185+ where base = [ "field" .= field
186+ , "factor" .= factor
187+ , "modifier" .= modifier
188+ , "missing" .= missing ]
189+
190+instance FromJSON FieldValueFactor where
191+ parseJSON = withObject "FieldValueFactor" parse
192+ where parse o = FieldValueFactor
193+ <$> o .: "field"
194+ <*> o .:? "factor"
195+ <*> o .:? "modifier"
196+ <*> o .:? "missing"
197+
198+instance ToJSON FactorModifier where
199+ toJSON FactorModifierNone = "none"
200+ toJSON FactorModifierLog = "log"
201+ toJSON FactorModifierLog1p = "log1p"
202+ toJSON FactorModifierLog2p = "log2p"
203+ toJSON FactorModifierLn = "ln"
204+ toJSON FactorModifierLn1p = "ln1p"
205+ toJSON FactorModifierLn2p = "ln2p"
206+ toJSON FactorModifierSquare = "square"
207+ toJSON FactorModifierSqrt = "sqrt"
208+ toJSON FactorModifierReciprocal = "reciprocal"
209+
210+instance FromJSON FactorModifier where
211+ parseJSON = withText "FactorModifier" parse
212+ where parse "none" = pure FactorModifierNone
213+ parse "log" = pure FactorModifierLog
214+ parse "log1p" = pure FactorModifierLog1p
215+ parse "log2p" = pure FactorModifierLog2p
216+ parse "ln" = pure FactorModifierLn
217+ parse "ln1p" = pure FactorModifierLn1p
218+ parse "ln2p" = pure FactorModifierLn2p
219+ parse "square" = pure FactorModifierSquare
220+ parse "sqrt" = pure FactorModifierSqrt
221+ parse "reciprocal" = pure FactorModifierReciprocal
222+ parse fm = fail ("Unexpected FactorModifier: " <> show fm)
src/Database/V5/Bloodhound/Client.hs+3−3
@@ -1092,7 +1092,7 @@ scanSearch indexName mappingName search = do
1092-- >>> mkSearch (Just query) Nothing
1092-- >>> mkSearch (Just query) Nothing
1093-- Search {queryBody = Just (TermQuery (Term {termField = "user", termValue = "bitemyapp"}) Nothing), filterBody = Nothing, sortBody = Nothing, aggBody = Nothing, highlight = Nothing, trackSortScores = False, from = From 0, size = Size 10, searchType = SearchTypeQueryThenFetch, fields = Nothing, source = Nothing}
1093-- Search {queryBody = Just (TermQuery (Term {termField = "user", termValue = "bitemyapp"}) Nothing), filterBody = Nothing, sortBody = Nothing, aggBody = Nothing, highlight = Nothing, trackSortScores = False, from = From 0, size = Size 10, searchType = SearchTypeQueryThenFetch, fields = Nothing, source = Nothing}
1094mkSearch :: Maybe Query -> Maybe Filter -> Search
1094mkSearch :: Maybe Query -> Maybe Filter -> Search
1095−mkSearch query filter = Search query filter Nothing Nothing Nothing False (From 0) (Size 10) SearchTypeQueryThenFetch Nothing Nothing Nothing
1095+mkSearch query filter = Search query filter Nothing Nothing Nothing False (From 0) (Size 10) SearchTypeQueryThenFetch Nothing Nothing Nothing Nothing
1096
1096
1097-- | 'mkAggregateSearch' is a helper function that defaults everything in a 'Search' except for
1097-- | 'mkAggregateSearch' is a helper function that defaults everything in a 'Search' except for
1098-- the 'Query' and the 'Aggregation'.
1098-- the 'Query' and the 'Aggregation'.
@@ -1102,7 +1102,7 @@ mkSearch query filter = Search query filter Nothing Nothing Nothing False (From
1102-- TermsAgg (TermsAggregation {term = Left "user", termInclude = Nothing, termExclude = Nothing, termOrder = Nothing, termMinDocCount = Nothing, termSize = Nothing, termShardSize = Nothing, termCollectMode = Just BreadthFirst, termExecutionHint = Nothing, termAggs = Nothing})
1102-- TermsAgg (TermsAggregation {term = Left "user", termInclude = Nothing, termExclude = Nothing, termOrder = Nothing, termMinDocCount = Nothing, termSize = Nothing, termShardSize = Nothing, termCollectMode = Just BreadthFirst, termExecutionHint = Nothing, termAggs = Nothing})
1103-- >>> let myAggregation = mkAggregateSearch Nothing $ mkAggregations "users" terms
1103-- >>> let myAggregation = mkAggregateSearch Nothing $ mkAggregations "users" terms
1104mkAggregateSearch :: Maybe Query -> Aggregations -> Search
1104mkAggregateSearch :: Maybe Query -> Aggregations -> Search
1105−mkAggregateSearch query mkSearchAggs = Search query Nothing Nothing (Just mkSearchAggs) Nothing False (From 0) (Size 0) SearchTypeQueryThenFetch Nothing Nothing Nothing
1105+mkAggregateSearch query mkSearchAggs = Search query Nothing Nothing (Just mkSearchAggs) Nothing False (From 0) (Size 0) SearchTypeQueryThenFetch Nothing Nothing Nothing Nothing
1106
1106
1107-- | 'mkHighlightSearch' is a helper function that defaults everything in a 'Search' except for
1107-- | 'mkHighlightSearch' is a helper function that defaults everything in a 'Search' except for
1108-- the 'Query' and the 'Aggregation'.
1108-- the 'Query' and the 'Aggregation'.
@@ -1111,7 +1111,7 @@ mkAggregateSearch query mkSearchAggs = Search query Nothing Nothing (Just mkSear
1111-- >>> let testHighlight = Highlights Nothing [FieldHighlight (FieldName "message") Nothing]
1111-- >>> let testHighlight = Highlights Nothing [FieldHighlight (FieldName "message") Nothing]
1112-- >>> let search = mkHighlightSearch (Just query) testHighlight
1112-- >>> let search = mkHighlightSearch (Just query) testHighlight
1113mkHighlightSearch :: Maybe Query -> Highlights -> Search
1113mkHighlightSearch :: Maybe Query -> Highlights -> Search
1114−mkHighlightSearch query searchHighlights = Search query Nothing Nothing Nothing (Just searchHighlights) False (From 0) (Size 10) SearchTypeQueryThenFetch Nothing Nothing Nothing
1114+mkHighlightSearch query searchHighlights = Search query Nothing Nothing Nothing (Just searchHighlights) False (From 0) (Size 10) SearchTypeQueryThenFetch Nothing Nothing Nothing Nothing
1115
1115
1116-- | 'pageSearch' is a helper function that takes a search and assigns the from
1116-- | 'pageSearch' is a helper function that takes a search and assigns the from
1117-- and size fields for the search. The from parameter defines the offset
1117-- and size fields for the search. The from parameter defines the offset
src/Database/V5/Bloodhound/Types.hs+61−29
@@ -122,6 +122,7 @@ module Database.V5.Bloodhound.Types
122 , Pattern(..)
122 , Pattern(..)
123 , ShardResult(..)
123 , ShardResult(..)
124 , Hit(..)
124 , Hit(..)
125+ , HitFields(..)
125 , Filter(..)
126 , Filter(..)
126 , Seminearring(..)
127 , Seminearring(..)
127 , BoolMatch(..)
128 , BoolMatch(..)
@@ -150,7 +151,16 @@ module Database.V5.Bloodhound.Types
150 , RegexpFlags(..)
151 , RegexpFlags(..)
151 , RegexpFlag(..)
152 , RegexpFlag(..)
152 , FieldName(..)
153 , FieldName(..)
154+ , ScriptFields(..)
155+ , ScriptFieldName
156+ , ScriptFieldValue
153 , Script(..)
157 , Script(..)
158+ , ScriptLanguage(..)
159+ , ScriptInline(..)
160+ , ScriptId(..)
161+ , ScriptParams(..)
162+ , ScriptParamName
163+ , ScriptParamValue
154 , IndexName(..)
164 , IndexName(..)
155 , IndexSelection(..)
165 , IndexSelection(..)
156 , NodeSelection(..)
166 , NodeSelection(..)
@@ -180,6 +190,18 @@ module Database.V5.Bloodhound.Types
180 , BoolQuery(..)
190 , BoolQuery(..)
181 , BoostingQuery(..)
191 , BoostingQuery(..)
182 , CommonTermsQuery(..)
192 , CommonTermsQuery(..)
193+ , FunctionScoreQuery(..)
194+ , BoostMode(..)
195+ , ScoreMode(..)
196+ , FunctionScoreFunctions(..)
197+ , ComponentFunctionScoreFunction(..)
198+ , FunctionScoreFunction(..)
199+ , Weight(..)
200+ , Seed(..)
201+ , FieldValueFactor(..)
202+ , Factor(..)
203+ , FactorModifier(..)
204+ , FactorMissingFieldValue(..)
183 , DisMaxQuery(..)
205 , DisMaxQuery(..)
184 , FuzzyLikeThisQuery(..)
206 , FuzzyLikeThisQuery(..)
185 , FuzzyLikeFieldQuery(..)
207 , FuzzyLikeFieldQuery(..)
@@ -521,6 +543,7 @@ data Search = Search { queryBody :: Maybe Query
521 , size :: Size
543 , size :: Size
522 , searchType :: SearchType
544 , searchType :: SearchType
523 , fields :: Maybe [FieldName]
545 , fields :: Maybe [FieldName]
546+ , scriptFields :: Maybe ScriptFields
524 , source :: Maybe Source
547 , source :: Maybe Source
525 , suggestBody :: Maybe Suggest -- ^ Only one Suggestion request / response per Search is supported.
548 , suggestBody :: Maybe Suggest -- ^ Only one Suggestion request / response per Search is supported.
526 } deriving (Eq, Show)
549 } deriving (Eq, Show)
@@ -607,9 +630,6 @@ data HighlightTag =
607 | CustomTags ([Text], [Text])
630 | CustomTags ([Text], [Text])
608 deriving (Eq, Show)
631 deriving (Eq, Show)
609
632
610−
611−
612−
613data SearchResult a =
633data SearchResult a =
614 SearchResult { took :: Int
634 SearchResult { took :: Int
615 , timedOut :: Bool
635 , timedOut :: Bool
@@ -617,7 +637,8 @@ data SearchResult a =
617 , searchHits :: SearchHits a
637 , searchHits :: SearchHits a
618 , aggregations :: Maybe AggregationResults
638 , aggregations :: Maybe AggregationResults
619 , scrollId :: Maybe ScrollId
639 , scrollId :: Maybe ScrollId
620− , suggest :: Maybe NamedSuggestionResponse -- ^ Only one Suggestion request / response per Search is supported.
640+ -- ^ Only one Suggestion request / response per Search is supported.
641+ , suggest :: Maybe NamedSuggestionResponse
621 }
642 }
622 deriving (Eq, Show)
643 deriving (Eq, Show)
623
644
@@ -625,8 +646,6 @@ newtype ScrollId =
625 ScrollId Text
646 ScrollId Text
626 deriving (Eq, Show, Ord, ToJSON, FromJSON)
647 deriving (Eq, Show, Ord, ToJSON, FromJSON)
627
648
628−type Score = Maybe Double
629−
630data SearchHits a =
649data SearchHits a =
631 SearchHits { hitsTotal :: Int
650 SearchHits { hitsTotal :: Int
632 , maxScore :: Score
651 , maxScore :: Score
@@ -645,8 +664,13 @@ data Hit a =
645 , hitDocId :: DocId
664 , hitDocId :: DocId
646 , hitScore :: Score
665 , hitScore :: Score
647 , hitSource :: Maybe a
666 , hitSource :: Maybe a
667+ , hitFields :: Maybe HitFields
648 , hitHighlight :: Maybe HitHighlight } deriving (Eq, Show)
668 , hitHighlight :: Maybe HitHighlight } deriving (Eq, Show)
649
669
670+newtype HitFields =
671+ HitFields (M.Map Text [Value])
672+ deriving (Eq, Show)
673+
650type HitHighlight = M.Map Text [Text]
674type HitHighlight = M.Map Text [Text]
651
675
652
676
@@ -856,7 +880,9 @@ instance ToJSON Aggregation where
856 ]
880 ]
857 ]
881 ]
858
882
883+ toJSON (DateHistogramAgg
884+ (DateHistogramAggregation field interval format
859− toJSON (DateHistogramAgg (DateHistogramAggregation field interval format preZone postZone preOffset postOffset dateHistoAggs)) =
885+ preZone postZone preOffset postOffset dateHistoAggs)) =
860 omitNulls ["date_histogram" .= omitNulls [ "field" .= field,
886 omitNulls ["date_histogram" .= omitNulls [ "field" .= field,
861 "interval" .= interval,
887 "interval" .= interval,
862 "format" .= format,
888 "format" .= format,
@@ -868,8 +894,10 @@ instance ToJSON Aggregation where
868 "aggs" .= dateHistoAggs ]
894 "aggs" .= dateHistoAggs ]
869 toJSON (ValueCountAgg a) = object ["value_count" .= v]
895 toJSON (ValueCountAgg a) = object ["value_count" .= v]
870 where v = case a of
896 where v = case a of
871− (FieldValueCount (FieldName n)) -> object ["field" .= n]
897+ (FieldValueCount (FieldName n)) ->
898+ object ["field" .= n]
872− (ScriptValueCount (Script s)) -> object ["script" .= s]
899+ (ScriptValueCount s) ->
900+ object ["script" .= s]
873 toJSON (FilterAgg (FilterAggregation filt ags)) =
901 toJSON (FilterAgg (FilterAggregation filt ags)) =
874 omitNulls [ "filter" .= filt
902 omitNulls [ "filter" .= filt
875 , "aggs" .= ags]
903 , "aggs" .= ags]
@@ -1058,11 +1086,6 @@ instance ToJSON GeoPoint where
1058 toJSON (GeoPoint (FieldName geoPointField) geoPointLatLon) =
1086 toJSON (GeoPoint (FieldName geoPointField) geoPointLatLon) =
1059 object [ geoPointField .= geoPointLatLon ]
1087 object [ geoPointField .= geoPointLatLon ]
1060
1088
1061−
1062−
1063−
1064−
1065−
1066instance FromJSON Status where
1089instance FromJSON Status where
1067 parseJSON (Object v) = Status <$>
1090 parseJSON (Object v) = Status <$>
1068 v .: "name" <*>
1091 v .: "name" <*>
@@ -1393,21 +1416,28 @@ instance FromJSON SearchAliasRouting where
1393 where parse t = SearchAliasRouting <$> parseNEJSON (String <$> T.splitOn "," t)
1416 where parse t = SearchAliasRouting <$> parseNEJSON (String <$> T.splitOn "," t)
1394
1417
1395instance ToJSON Search where
1418instance ToJSON Search where
1419+ toJSON (Search mquery sFilter sort searchAggs
1396− toJSON (Search mquery sFilter sort searchAggs highlight sTrackSortScores sFrom sSize _ sFields sSource sSuggest) =
1420+ highlight sTrackSortScores sFrom sSize _ sFields
1421+ sScriptFields sSource sSuggest) =
1397− omitNulls [ "query" .= query'
1422+ omitNulls [ "query" .= query'
1398− , "sort" .= sort
1423+ , "sort" .= sort
1399− , "aggregations" .= searchAggs
1424+ , "aggregations" .= searchAggs
1400− , "highlight" .= highlight
1425+ , "highlight" .= highlight
1401− , "from" .= sFrom
1426+ , "from" .= sFrom
1402− , "size" .= sSize
1427+ , "size" .= sSize
1403− , "track_scores" .= sTrackSortScores
1428+ , "track_scores" .= sTrackSortScores
1404− , "fields" .= sFields
1429+ , "fields" .= sFields
1430+ , "script_fields" .= sScriptFields
1405− , "_source" .= sSource
1431+ , "_source" .= sSource
1406− , "suggest" .= sSuggest]
1432+ , "suggest" .= sSuggest]
1407
1433
1408 where query' = case sFilter of
1434 where query' = case sFilter of
1409 Nothing -> mquery
1435 Nothing -> mquery
1436+ Just x ->
1437+ Just
1438+ . QueryBoolQuery
1410− Just x -> Just . QueryBoolQuery $ mkBoolQuery (maybeToList mquery) [x] [] []
1439+ $ mkBoolQuery (maybeToList mquery)
1440+ [x] [] []
1411
1441
1412instance ToJSON Source where
1442instance ToJSON Source where
1413 toJSON NoSource = toJSON False
1443 toJSON NoSource = toJSON False
@@ -1568,10 +1598,14 @@ instance (FromJSON a) => FromJSON (Hit a) where
1568 v .: "_type" <*>
1598 v .: "_type" <*>
1569 v .: "_id" <*>
1599 v .: "_id" <*>
1570 v .: "_score" <*>
1600 v .: "_score" <*>
1571− v .:? "_source" <*>
1601+ v .:? "_source" <*>
1602+ v .:? "fields" <*>
1572 v .:? "highlight"
1603 v .:? "highlight"
1573 parseJSON _ = empty
1604 parseJSON _ = empty
1574
1605
1606+instance FromJSON HitFields where
1607+ parseJSON x
1608+ = HitFields <$> parseJSON x
1575
1609
1576instance FromJSON DocVersion where
1610instance FromJSON DocVersion where
1577 parseJSON v = do
1611 parseJSON v = do
@@ -1579,8 +1613,6 @@ instance FromJSON DocVersion where
1579 maybe (fail "DocVersion out of range") return $ mkDocVersion i
1613 maybe (fail "DocVersion out of range") return $ mkDocVersion i
1580
1614
1581
1615
1582−
1583−
1584data Suggest = Suggest { suggestText :: Text
1616data Suggest = Suggest { suggestText :: Text
1585 , suggestName :: Text
1617 , suggestName :: Text
1586 , suggestType :: SuggestType
1618 , suggestType :: SuggestType
src/Database/V5/Bloodhound/Types/Internal/Newtypes.hs+9−6
@@ -5,6 +5,9 @@ module Database.V5.Bloodhound.Types.Internal.Newtypes where
5
5
6import Bloodhound.Import
6import Bloodhound.Import
7
7
8+-- Slight misnomer.
9+type Score = Maybe Double
10+
8{-| 'MappingName' is part of mappings which are how ES describes and schematizes
11{-| 'MappingName' is part of mappings which are how ES describes and schematizes
9 the data in the indices.
12 the data in the indices.
10-}
13-}
@@ -41,12 +44,12 @@ newtype QueryString =
41 deriving (Eq, Show, ToJSON, FromJSON)
44 deriving (Eq, Show, ToJSON, FromJSON)
42
45
43
46
44−{-| 'Script' is often used in place of 'FieldName' to specify more
47+-- {-| 'Script' is often used in place of 'FieldName' to specify more
45−complex ways of extracting a value from a document.
48+-- complex ways of extracting a value from a document.
46−-}
49+-- -}
47−newtype Script =
50+-- newtype Script =
48− Script { scriptText :: Text }
51+-- Script { scriptText :: Text }
49− deriving (Eq, Show)
52+-- deriving (Eq, Show)
50
53
51{-| 'CacheName' is used in 'RegexpFilter' for describing the
54{-| 'CacheName' is used in 'RegexpFilter' for describing the
52 'CacheKey' keyed caching behavior.
55 'CacheKey' keyed caching behavior.
src/Database/V5/Bloodhound/Types/Internal/Query.hs+81−13
@@ -2,7 +2,10 @@
2{-# LANGUAGE OverloadedStrings #-}
2{-# LANGUAGE OverloadedStrings #-}
3{-# LANGUAGE RecordWildCards #-}
3{-# LANGUAGE RecordWildCards #-}
4
4
5−module Database.V5.Bloodhound.Types.Internal.Query where
5+module Database.V5.Bloodhound.Types.Internal.Query
6+ ( module X
7+ , module Database.V5.Bloodhound.Types.Internal.Query
8+ ) where
6
9
7import Bloodhound.Import
10import Bloodhound.Import
8
11
@@ -13,10 +16,11 @@ import qualified Data.Text as T
13import qualified Data.Traversable as DT
16import qualified Data.Traversable as DT
14import qualified Data.Vector as V
17import qualified Data.Vector as V
15
18
19+import Database.Bloodhound.Common.Script as X
16import Database.V5.Bloodhound.Types.Internal.Newtypes
20import Database.V5.Bloodhound.Types.Internal.Newtypes
17
21
18data Query =
22data Query =
19− TermQuery Term (Maybe Boost)
23+ TermQuery Term (Maybe Boost)
20 | TermsQuery Text (NonEmpty Text)
24 | TermsQuery Text (NonEmpty Text)
21 | QueryMatchQuery MatchQuery
25 | QueryMatchQuery MatchQuery
22 | QueryMultiMatchQuery MultiMatchQuery
26 | QueryMultiMatchQuery MultiMatchQuery
@@ -24,6 +28,7 @@ data Query =
24 | QueryBoostingQuery BoostingQuery
28 | QueryBoostingQuery BoostingQuery
25 | QueryCommonTermsQuery CommonTermsQuery
29 | QueryCommonTermsQuery CommonTermsQuery
26 | ConstantScoreQuery Query Boost
30 | ConstantScoreQuery Query Boost
31+ | QueryFunctionScoreQuery FunctionScoreQuery
27 | QueryDisMaxQuery DisMaxQuery
32 | QueryDisMaxQuery DisMaxQuery
28 | QueryFuzzyLikeThisQuery FuzzyLikeThisQuery
33 | QueryFuzzyLikeThisQuery FuzzyLikeThisQuery
29 | QueryFuzzyLikeFieldQuery FuzzyLikeFieldQuery
34 | QueryFuzzyLikeFieldQuery FuzzyLikeFieldQuery
@@ -42,8 +47,8 @@ data Query =
42 | QueryRangeQuery RangeQuery
47 | QueryRangeQuery RangeQuery
43 | QueryRegexpQuery RegexpQuery
48 | QueryRegexpQuery RegexpQuery
44 | QueryExistsQuery FieldName
49 | QueryExistsQuery FieldName
45− | QueryMatchNoneQuery
46 | QueryTemplateQueryInline TemplateQueryInline
50 | QueryTemplateQueryInline TemplateQueryInline
51+ | QueryMatchNoneQuery
47 deriving (Eq, Show)
52 deriving (Eq, Show)
48
53
49-- | As of Elastic 2.0, 'Filters' are just 'Queries' housed in a
54-- | As of Elastic 2.0, 'Filters' are just 'Queries' housed in a
@@ -505,6 +510,74 @@ type Cache = Bool -- caching on/off
505defaultCache :: Cache
510defaultCache :: Cache
506defaultCache = False
511defaultCache = False
507
512
513+
514+data FunctionScoreQuery =
515+ FunctionScoreQuery { functionScoreQuery :: Maybe Query
516+ , functionScoreBoost :: Maybe Boost
517+ , functionScoreFunctions :: FunctionScoreFunctions
518+ , functionScoreMaxBoost :: Maybe Boost
519+ , functionScoreBoostMode :: Maybe BoostMode
520+ , functionScoreMinScore :: Score
521+ , functionScoreScoreMode :: Maybe ScoreMode
522+ } deriving (Eq, Show)
523+
524+instance ToJSON FunctionScoreQuery where
525+ toJSON (FunctionScoreQuery query boost fns maxBoost boostMode minScore scoreMode) =
526+ omitNulls base
527+ where base = functionScoreFunctionsPair fns :
528+ [ "query" .= query
529+ , "boost" .= boost
530+ , "max_boost" .= maxBoost
531+ , "boost_mode" .= boostMode
532+ , "min_score" .= minScore
533+ , "score_mode" .= scoreMode ]
534+
535+instance FromJSON FunctionScoreQuery where
536+ parseJSON = withObject "FunctionScoreQuery" parse
537+ where parse o = FunctionScoreQuery
538+ <$> o .:? "query"
539+ <*> o .:? "boost"
540+ <*> (singleFunction o
541+ <|> multipleFunctions `taggedWith` "functions")
542+ <*> o .:? "max_boost"
543+ <*> o .:? "boost_mode"
544+ <*> o .:? "min_score"
545+ <*> o .:? "score_mode"
546+ where taggedWith parser k = parser =<< o .: k
547+ singleFunction = fmap FunctionScoreSingle . parseFunctionScoreFunction
548+ multipleFunctions = pure . FunctionScoreMultiple
549+
550+data FunctionScoreFunctions =
551+ FunctionScoreSingle FunctionScoreFunction
552+ | FunctionScoreMultiple (NonEmpty ComponentFunctionScoreFunction) deriving (Eq, Show)
553+
554+data ComponentFunctionScoreFunction =
555+ ComponentFunctionScoreFunction { componentScoreFunctionFilter :: Maybe Filter
556+ , componentScoreFunction :: FunctionScoreFunction
557+ , componentScoreFunctionWeight :: Maybe Weight
558+ } deriving (Eq, Show)
559+
560+instance ToJSON ComponentFunctionScoreFunction where
561+ toJSON (ComponentFunctionScoreFunction filter fn weight) =
562+ omitNulls base
563+ where base = functionScoreFunctionPair fn :
564+ [ "filter" .= filter
565+ , "weight" .= weight ]
566+
567+instance FromJSON ComponentFunctionScoreFunction where
568+ parseJSON = withObject "ComponentFunctionScoreFunction" parse
569+ where parse o = ComponentFunctionScoreFunction
570+ <$> o .:? "filter"
571+ <*> parseFunctionScoreFunction o
572+ <*> o .:? "weight"
573+
574+functionScoreFunctionsPair :: FunctionScoreFunctions -> (Text, Value)
575+functionScoreFunctionsPair (FunctionScoreSingle fn)
576+ = functionScoreFunctionPair fn
577+functionScoreFunctionsPair (FunctionScoreMultiple componentFns) =
578+ ("functions", toJSON componentFns)
579+
580+
508instance ToJSON Query where
581instance ToJSON Query where
509 toJSON (TermQuery (Term termQueryField termQueryValue) boost) =
582 toJSON (TermQuery (Term termQueryField termQueryValue) boost) =
510 object [ "term" .=
583 object [ "term" .=
@@ -545,6 +618,9 @@ instance ToJSON Query where
545 object ["constant_score" .= object ["query" .= query
618 object ["constant_score" .= object ["query" .= query
546 , "boost" .= boost]]
619 , "boost" .= boost]]
547
620
621+ toJSON (QueryFunctionScoreQuery functionScoreQuery) =
622+ object [ "function_score" .= functionScoreQuery ]
623+
548 toJSON (QueryDisMaxQuery disMaxQuery) =
624 toJSON (QueryDisMaxQuery disMaxQuery) =
549 object [ "dis_max" .= disMaxQuery ]
625 object [ "dis_max" .= disMaxQuery ]
550
626
@@ -612,6 +688,7 @@ instance FromJSON Query where
612 <|> queryBoostingQuery `taggedWith` "boosting"
688 <|> queryBoostingQuery `taggedWith` "boosting"
613 <|> queryCommonTermsQuery `taggedWith` "common"
689 <|> queryCommonTermsQuery `taggedWith` "common"
614 <|> constantScoreQuery `taggedWith` "constant_score"
690 <|> constantScoreQuery `taggedWith` "constant_score"
691+ <|> queryFunctionScoreQuery `taggedWith` "function_score"
615 <|> queryDisMaxQuery `taggedWith` "dis_max"
692 <|> queryDisMaxQuery `taggedWith` "dis_max"
616 <|> queryFuzzyLikeThisQuery `taggedWith` "fuzzy_like_this"
693 <|> queryFuzzyLikeThisQuery `taggedWith` "fuzzy_like_this"
617 <|> queryFuzzyLikeFieldQuery `taggedWith` "fuzzy_like_this_field"
694 <|> queryFuzzyLikeFieldQuery `taggedWith` "fuzzy_like_this_field"
@@ -649,6 +726,7 @@ instance FromJSON Query where
649 Just x -> ConstantScoreQuery <$> parseJSON x
726 Just x -> ConstantScoreQuery <$> parseJSON x
650 <*> o .: "boost"
727 <*> o .: "boost"
651 _ -> fail "Does not appear to be a ConstantScoreQuery"
728 _ -> fail "Does not appear to be a ConstantScoreQuery"
729+ queryFunctionScoreQuery = pure . QueryFunctionScoreQuery
652 queryDisMaxQuery = pure . QueryDisMaxQuery
730 queryDisMaxQuery = pure . QueryDisMaxQuery
653 queryFuzzyLikeThisQuery = pure . QueryFuzzyLikeThisQuery
731 queryFuzzyLikeThisQuery = pure . QueryFuzzyLikeThisQuery
654 queryFuzzyLikeFieldQuery = pure . QueryFuzzyLikeFieldQuery
732 queryFuzzyLikeFieldQuery = pure . QueryFuzzyLikeFieldQuery
@@ -667,21 +745,11 @@ instance FromJSON Query where
667 -- queryExistsQuery o = QueryExistsQuery <$> o .: "field"
745 -- queryExistsQuery o = QueryExistsQuery <$> o .: "field"
668 queryTemplateQueryInline = pure . QueryTemplateQueryInline
746 queryTemplateQueryInline = pure . QueryTemplateQueryInline
669
747
670−omitNulls :: [(Text, Value)] -> Value
671−omitNulls = object . filter notNull where
672− notNull (_, Null) = False
673− notNull (_, Array a) = (not . V.null) a
674− notNull _ = True
675−
676fieldTagged :: Monad m => (FieldName -> Object -> m a) -> Object -> m a
748fieldTagged :: Monad m => (FieldName -> Object -> m a) -> Object -> m a
677fieldTagged f o = case HM.toList o of
749fieldTagged f o = case HM.toList o of
678 [(k, Object o')] -> f (FieldName k) o'
750 [(k, Object o')] -> f (FieldName k) o'
679 _ -> fail "Expected object with 1 field-named key"
751 _ -> fail "Expected object with 1 field-named key"
680
752
681−parseNEJSON :: (FromJSON a) => [Value] -> Parser (NonEmpty a)
682−parseNEJSON [] = fail "Expected non-empty list"
683−parseNEJSON (x:xs) = DT.mapM parseJSON (x :| xs)
684−
685instance ToJSON SimpleQueryStringQuery where
753instance ToJSON SimpleQueryStringQuery where
686 toJSON SimpleQueryStringQuery {..} =
754 toJSON SimpleQueryStringQuery {..} =
687 omitNulls (base ++ maybeAdd)
755 omitNulls (base ++ maybeAdd)
tests/V5/tests.hs+91−4
@@ -19,7 +19,7 @@
19module Main where
19module Main where
20
20
21import Control.Applicative
21import Control.Applicative
22−import Control.Error
22+import Control.Error hiding (Script)
23import Control.Exception (evaluate)
23import Control.Exception (evaluate)
24import Control.Monad
24import Control.Monad
25import Control.Monad.Catch
25import Control.Monad.Catch
@@ -540,8 +540,11 @@ instance (Arbitrary a, Typeable a) => Arbitrary (Hit a) where
540 <*> arbitraryScore
540 <*> arbitraryScore
541 <*> arbitrary
541 <*> arbitrary
542 <*> arbitrary
542 <*> arbitrary
543+ <*> arbitrary
543
544
544−
545+instance Arbitrary HitFields where
546+ arbitrary = pure (HitFields M.empty)
547+ shrink = const []
545
548
546instance (Arbitrary a, Typeable a) => Arbitrary (SearchHits a) where
549instance (Arbitrary a, Typeable a) => Arbitrary (SearchHits a) where
547 arbitrary = reduceSize $ do
550 arbitrary = reduceSize $ do
@@ -609,6 +612,21 @@ instance Arbitrary a => Arbitrary (NonEmpty a) where
609 qcNonEmptyToNonEmpty
612 qcNonEmptyToNonEmpty
610 <$> arbitrary
613 <$> arbitrary
611#endif
614#endif
615+instance Arbitrary ScriptFields where
616+ arbitrary =
617+ pure $ ScriptFields $
618+ HM.fromList []
619+
620+ shrink = const []
621+
622+instance Arbitrary ScriptParams where
623+ arbitrary =
624+ pure $ ScriptParams $
625+ HM.fromList [ ("a", Number 42)
626+ , ("b", String "forty two")
627+ ]
628+
629+ shrink = const []
612
630
613instance Arbitrary RegexpFlags where
631instance Arbitrary RegexpFlags where
614 arbitrary = oneof [ pure AllRegexpFlags
632 arbitrary = oneof [ pure AllRegexpFlags
@@ -944,6 +962,40 @@ instance Arbitrary SuggestType where arbitrary = arbitrarySuggestType
944makeArbitrary ''Suggest
962makeArbitrary ''Suggest
945instance Arbitrary Suggest where arbitrary = arbitrarySuggest
963instance Arbitrary Suggest where arbitrary = arbitrarySuggest
946
964
965+makeArbitrary ''FunctionScoreQuery
966+instance Arbitrary FunctionScoreQuery where arbitrary = arbitraryFunctionScoreQuery
967+
968+makeArbitrary ''FunctionScoreFunction
969+instance Arbitrary FunctionScoreFunction where arbitrary = arbitraryFunctionScoreFunction
970+makeArbitrary ''FunctionScoreFunctions
971+instance Arbitrary FunctionScoreFunctions where arbitrary = arbitraryFunctionScoreFunctions
972+makeArbitrary ''ComponentFunctionScoreFunction
973+instance Arbitrary ComponentFunctionScoreFunction where arbitrary = arbitraryComponentFunctionScoreFunction
974+makeArbitrary ''Script
975+instance Arbitrary Script where arbitrary = arbitraryScript
976+makeArbitrary ''ScriptLanguage
977+instance Arbitrary ScriptLanguage where arbitrary = arbitraryScriptLanguage
978+makeArbitrary ''ScriptInline
979+instance Arbitrary ScriptInline where arbitrary = arbitraryScriptInline
980+makeArbitrary ''ScriptId
981+instance Arbitrary ScriptId where arbitrary = arbitraryScriptId
982+makeArbitrary ''ScoreMode
983+instance Arbitrary ScoreMode where arbitrary = arbitraryScoreMode
984+makeArbitrary ''BoostMode
985+instance Arbitrary BoostMode where arbitrary = arbitraryBoostMode
986+makeArbitrary ''Seed
987+instance Arbitrary Seed where arbitrary = arbitrarySeed
988+makeArbitrary ''FieldValueFactor
989+instance Arbitrary FieldValueFactor where arbitrary = arbitraryFieldValueFactor
990+makeArbitrary ''Weight
991+instance Arbitrary Weight where arbitrary = arbitraryWeight
992+makeArbitrary ''Factor
993+instance Arbitrary Factor where arbitrary = arbitraryFactor
994+makeArbitrary ''FactorMissingFieldValue
995+instance Arbitrary FactorMissingFieldValue where arbitrary = arbitraryFactorMissingFieldValue
996+makeArbitrary ''FactorModifier
997+instance Arbitrary FactorModifier where arbitrary = arbitraryFactorModifier
998+
947newtype UpdatableIndexSetting' =
999newtype UpdatableIndexSetting' =
948 UpdatableIndexSetting' UpdatableIndexSetting
1000 UpdatableIndexSetting' UpdatableIndexSetting
949 deriving (Show, Eq, ToJSON, FromJSON, ApproxEq, Typeable)
1001 deriving (Show, Eq, ToJSON, FromJSON, ApproxEq, Typeable)
@@ -1218,7 +1270,7 @@ main = hspec $ do
1218 let search = Search Nothing
1270 let search = Search Nothing
1219 Nothing (Just [sortSpec]) Nothing Nothing
1271 Nothing (Just [sortSpec]) Nothing Nothing
1220 False (From 0) (Size 10) SearchTypeQueryThenFetch Nothing Nothing
1272 False (From 0) (Size 10) SearchTypeQueryThenFetch Nothing Nothing
1221− Nothing
1273+ Nothing Nothing
1222 result <- searchTweets search
1274 result <- searchTweets search
1223 let myTweet = grabFirst result
1275 let myTweet = grabFirst result
1224 liftIO $
1276 liftIO $
@@ -1635,7 +1687,7 @@ main = hspec $ do
1635 resetIndex
1687 resetIndex
1636 resp <- updateIndexAliases (action :| [])
1688 resp <- updateIndexAliases (action :| [])
1637 liftIO $ validateStatus resp 200
1689 liftIO $ validateStatus resp 200
1638− deleteIndexAlias aname
1690+ _ <- deleteIndexAlias aname
1639 getIndexAliases
1691 getIndexAliases
1640 -- let expected = IndexAliasSummary alias create
1692 -- let expected = IndexAliasSummary alias create
1641 case aliases of
1693 case aliases of
@@ -1740,6 +1792,30 @@ main = hspec $ do
1740 Left e -> liftIO $ expectationFailure ("Expected an search suggestion but got " <> show e)
1792 Left e -> liftIO $ expectationFailure ("Expected an search suggestion but got " <> show e)
1741 Right sr -> liftIO $ (suggestOptionsText . head . suggestResponseOptions . head . nsrResponses <$> suggest sr) `shouldBe` expectedText
1793 Right sr -> liftIO $ (suggestOptionsText . head . suggestResponseOptions . head . nsrResponses <$> suggest sr) `shouldBe` expectedText
1742
1794
1795+ describe "Script" $ do
1796+ it "returns a transformed document based on the script field" $ withTestEnv $ do
1797+ _ <- insertData
1798+ let query = MatchAllQuery Nothing
1799+ sfv = toJSON $
1800+ Script
1801+ (Just (ScriptLanguage "painless"))
1802+ (Just (ScriptInline "doc['age'].value * 2"))
1803+ Nothing
1804+ Nothing
1805+ sf = ScriptFields $
1806+ HM.fromList [("test1", sfv)]
1807+ search' = mkSearch (Just query) Nothing
1808+ search = search' { scriptFields = Just sf }
1809+ resp <- searchByIndex testIndex search
1810+ parsed <- parseEsResponse resp :: BH IO (Either EsError (SearchResult Value))
1811+ case parsed of
1812+ Left e ->
1813+ liftIO $ expectationFailure ("Expected a script-transformed result but got: " <> show e)
1814+ Right sr -> do
1815+ let Just results =
1816+ hitFields (head (hits (searchHits sr)))
1817+ liftIO $ results `shouldBe` (HitFields (M.fromList [("test1", [Number 20000.0])]))
1818+
1743 describe "Exact isomorphism JSON instances" $ do
1819 describe "Exact isomorphism JSON instances" $ do
1744 propJSON (Proxy :: Proxy Version)
1820 propJSON (Proxy :: Proxy Version)
1745 propJSON (Proxy :: Proxy IndexName)
1821 propJSON (Proxy :: Proxy IndexName)
@@ -1753,6 +1829,11 @@ main = hspec $ do
1753 propJSON (Proxy :: Proxy TemplatePattern)
1829 propJSON (Proxy :: Proxy TemplatePattern)
1754 propJSON (Proxy :: Proxy QueryString)
1830 propJSON (Proxy :: Proxy QueryString)
1755 propJSON (Proxy :: Proxy FieldName)
1831 propJSON (Proxy :: Proxy FieldName)
1832+ propJSON (Proxy :: Proxy Script)
1833+ propJSON (Proxy :: Proxy ScriptLanguage)
1834+ propJSON (Proxy :: Proxy ScriptInline)
1835+ propJSON (Proxy :: Proxy ScriptId)
1836+ propJSON (Proxy :: Proxy ScriptParams)
1756 propJSON (Proxy :: Proxy CacheName)
1837 propJSON (Proxy :: Proxy CacheName)
1757 propJSON (Proxy :: Proxy CacheKey)
1838 propJSON (Proxy :: Proxy CacheKey)
1758 propJSON (Proxy :: Proxy Existence)
1839 propJSON (Proxy :: Proxy Existence)
@@ -1803,6 +1884,12 @@ main = hspec $ do
1803 propJSON (Proxy :: Proxy FuzzyQuery)
1884 propJSON (Proxy :: Proxy FuzzyQuery)
1804 propJSON (Proxy :: Proxy FuzzyLikeFieldQuery)
1885 propJSON (Proxy :: Proxy FuzzyLikeFieldQuery)
1805 propJSON (Proxy :: Proxy FuzzyLikeThisQuery)
1886 propJSON (Proxy :: Proxy FuzzyLikeThisQuery)
1887+ propJSON (Proxy :: Proxy FunctionScoreQuery)
1888+ propJSON (Proxy :: Proxy BoostMode)
1889+ propJSON (Proxy :: Proxy ScoreMode)
1890+ propJSON (Proxy :: Proxy ComponentFunctionScoreFunction)
1891+ propJSON (Proxy :: Proxy FieldValueFactor)
1892+ propJSON (Proxy :: Proxy FactorModifier)
1806 propJSON (Proxy :: Proxy DisMaxQuery)
1893 propJSON (Proxy :: Proxy DisMaxQuery)
1807 propJSON (Proxy :: Proxy CommonTermsQuery)
1894 propJSON (Proxy :: Proxy CommonTermsQuery)
1808 propJSON (Proxy :: Proxy CommonMinimumMatch)
1895 propJSON (Proxy :: Proxy CommonMinimumMatch)