380da47 · typeable/bloodhound

git.iko.soy/typeable/bloodhound

Elasticsearch not ElasticSearch

commit380da47cdab34513de3cf07c2c312dcea3b64849 authorChris Allen <cma@bitemyapp.com> dateSat 7 Apr 2018, 16:27 (9 years ago) parentcfc828a

3 files changed+20−20

compare with master

unifiedsplit

src/Database/V1/Bloodhound/Internal/Client.hs+7−7 src/Database/V5/Bloodhound/Internal/Analysis.hs+3−3 src/Database/V5/Bloodhound/Internal/Client.hs+10−10

src/Database/V1/Bloodhound/Internal/Client.hs+7−7

@@ -179,7 +179,7 @@ data IndexOptimizationSettings =

179179

180180

181181{-| 'defaultIndexOptimizationSettings' implements the default settings that

182− ElasticSearch uses for index optimization. 'maxNumSegments' is Nothing,

182+ Elasticsearch uses for index optimization. 'maxNumSegments' is Nothing,

183183 'onlyExpungeDeletes' is False, and flushAfterOptimize is True.

184184-}

185185defaultIndexOptimizationSettings :: IndexOptimizationSettings

@@ -492,11 +492,11 @@ data EsError = EsError { errorStatus :: Int

492492 , errorMessage :: Text } deriving (Eq, Show)

493493

494494{-| 'EsProtocolException' will be thrown if Bloodhound cannot parse a response

495−returned by the ElasticSearch server. If you encounter this error, please

495+returned by the Elasticsearch server. If you encounter this error, please

496496verify that your domain data types and FromJSON instances are working properly

497497(for example, the 'a' of '[Hit a]' in 'SearchResult.searchHits.hits'). If you're

498498sure that your mappings are correct, then this error may be an indication of an

499−incompatibility between Bloodhound and ElasticSearch. Please open a bug report

499+incompatibility between Bloodhound and Elasticsearch. Please open a bug report

500500and be sure to include the exception body.

501501-}

502502data EsProtocolException = EsProtocolException { esProtoExBody :: LByteString }

@@ -635,7 +635,7 @@ data NodeSelector = NodeByName NodeName

635635 deriving (Eq, Show)

636636

637637-- | A human-readable node name that is supplied by the user in the

638−-- node config or automatically generated by ElasticSearch.

638+-- node config or automatically generated by Elasticsearch.

639639newtype NodeName = NodeName { nodeName :: Text }

640640 deriving (Eq, Ord, Show, FromJSON)

641641

@@ -1185,7 +1185,7 @@ data NodeProcessInfo = NodeProcessInfo {

11851185 , nodeProcessRefreshInterval :: NominalDiffTime

11861186 } deriving (Eq, Show)

11871187

1188−-- | A quirky address format used throughout ElasticSearch. An example

1188+-- | A quirky address format used throughout Elasticsearch. An example

11891189-- would be inet[/1.1.1.1:9200]. inet may be a placeholder for a

11901190-- <https://en.wikipedia.org/wiki/Fully_qualified_domain_name FQDN>.

11911191newtype EsAddress = EsAddress { esAddress :: Text }

@@ -1267,7 +1267,7 @@ newtype RestoreRenamePattern = RestoreRenamePattern { rrPattern :: Text }

12671267

12681268-- | A single token in a index renaming scheme for a restore. These

12691269-- are concatenated into a string before being sent to

1270−-- ElasticSearch. Check out these Java

1270+-- Elasticsearch. Check out these Java

12711271-- <https://docs.oracle.com/javase/7/docs/api/java/util/regex/Matcher.html docs> to find out more if you're into that sort of thing.

12721272data RestoreRenameToken = RRTLit Text

12731273 -- ^ Just a literal string of characters

@@ -1322,7 +1322,7 @@ defaultSnapshotRepoUpdateSettings :: SnapshotRepoUpdateSettings

13221322defaultSnapshotRepoUpdateSettings = SnapshotRepoUpdateSettings True

13231323

13241324-- | A filesystem-based snapshot repo that ships with

1325−-- ElasticSearch. This is an instance of 'SnapshotRepo' so it can be

1325+-- Elasticsearch. This is an instance of 'SnapshotRepo' so it can be

13261326-- used with 'updateSnapshotRepo'

13271327data FsSnapshotRepo = FsSnapshotRepo {

13281328 fsrName :: SnapshotRepoName

src/Database/V5/Bloodhound/Internal/Analysis.hs+3−3

@@ -166,10 +166,10 @@ instance FromJSON TokenFilterDefinition where

166166 _ -> fail ("unrecognized token filter type: " ++ T.unpack t)

167167

168168-- | The set of languages that can be passed to various analyzers,

169−-- filters, etc. in ElasticSearch. Most data types in this module

169+-- filters, etc. in Elasticsearch. Most data types in this module

170170-- that have a 'Language' field are actually only actually to

171171-- handle a subset of these languages. Consult the official

172−-- ElasticSearch documentation to see what is actually supported.

172+-- Elasticsearch documentation to see what is actually supported.

173173data Language

174174 = Arabic

175175 | Armenian

@@ -216,7 +216,7 @@ instance ToJSON Language where

216216

217217instance FromJSON Language where

218218 parseJSON = withText "Language" $ \t -> case languageFromText t of

219− Nothing -> fail "not a supported ElasticSearch language"

219+ Nothing -> fail "not a supported Elasticsearch language"

220220 Just lang -> return lang

221221

222222languageToText :: Language -> Text

src/Database/V5/Bloodhound/Internal/Client.hs+10−10

@@ -172,7 +172,7 @@ data ForceMergeIndexSettings =

172172

173173

174174{-| 'defaultForceMergeIndexSettings' implements the default settings that

175− ElasticSearch uses for index optimization. 'maxNumSegments' is Nothing,

175+ Elasticsearch uses for index optimization. 'maxNumSegments' is Nothing,

176176 'onlyExpungeDeletes' is False, and flushAfterOptimize is True.

177177-}

178178defaultForceMergeIndexSettings :: ForceMergeIndexSettings

@@ -611,10 +611,10 @@ instance FromJSON AllocationPolicy where

611611 "upsert", 'BulkCreate' will fail if a document already exists at the DocId.

612612 Consult the <http://www.elasticsearch.org/guide/en/elasticsearch/reference/current/docs-bulk.html#docs-bulk Bulk API documentation>

613613 for further explanation.

614− Warning: Bulk operations suffixed with @Auto@ rely on ElasticSearch to

614+ Warning: Bulk operations suffixed with @Auto@ rely on Elasticsearch to

615615 generate the id. Often, people use auto-generated identifiers when

616− ElasticSearch is the only place that their data is stored. Do not let

617− ElasticSearch be the only place your data is stored. It does not guarantee

616+ Elasticsearch is the only place that their data is stored. Do not let

617+ Elasticsearch be the only place your data is stored. It does not guarantee

618618 durability, and it may silently discard data.

619619 This <https://github.com/elastic/elasticsearch/issues/10708 issue> is

620620 discussed further on github.

@@ -686,11 +686,11 @@ instance FromJSON EsError where

686686 parseJSON _ = empty

687687

688688{-| 'EsProtocolException' will be thrown if Bloodhound cannot parse a response

689−returned by the ElasticSearch server. If you encounter this error, please

689+returned by the Elasticsearch server. If you encounter this error, please

690690verify that your domain data types and FromJSON instances are working properly

691691(for example, the 'a' of '[Hit a]' in 'SearchResult.searchHits.hits'). If you're

692692sure that your mappings are correct, then this error may be an indication of an

693−incompatibility between Bloodhound and ElasticSearch. Please open a bug report

693+incompatibility between Bloodhound and Elasticsearch. Please open a bug report

694694and be sure to include the exception body.

695695-}

696696newtype EsProtocolException = EsProtocolException

@@ -1023,7 +1023,7 @@ newtype FullNodeId = FullNodeId { fullNodeId :: Text }

10231023

10241024

10251025-- | A human-readable node name that is supplied by the user in the

1026−-- node config or automatically generated by ElasticSearch.

1026+-- node config or automatically generated by Elasticsearch.

10271027newtype NodeName = NodeName { nodeName :: Text }

10281028 deriving (Eq, Ord, Show, FromJSON)

10291029

@@ -1298,7 +1298,7 @@ data NodeIndicesStats = NodeIndicesStats {

12981298 , nodeIndicesStatsDocsCount :: Int

12991299 } deriving (Eq, Show)

13001300

1301−-- | A quirky address format used throughout ElasticSearch. An example

1301+-- | A quirky address format used throughout Elasticsearch. An example

13021302-- would be inet[/1.1.1.1:9200]. inet may be a placeholder for a

13031303-- <https://en.wikipedia.org/wiki/Fully_qualified_domain_name FQDN>.

13041304newtype EsAddress = EsAddress { esAddress :: Text }

@@ -1566,7 +1566,7 @@ defaultSnapshotRepoUpdateSettings = SnapshotRepoUpdateSettings True

15661566

15671567

15681568-- | A filesystem-based snapshot repo that ships with

1569−-- ElasticSearch. This is an instance of 'SnapshotRepo' so it can be

1569+-- Elasticsearch. This is an instance of 'SnapshotRepo' so it can be

15701570-- used with 'updateSnapshotRepo'

15711571data FsSnapshotRepo = FsSnapshotRepo {

15721572 fsrName :: SnapshotRepoName

@@ -1730,7 +1730,7 @@ newtype RestoreRenamePattern =

17301730

17311731-- | A single token in a index renaming scheme for a restore. These

17321732-- are concatenated into a string before being sent to

1733−-- ElasticSearch. Check out these Java

1733+-- Elasticsearch. Check out these Java

17341734-- <https://docs.oracle.com/javase/7/docs/api/java/util/regex/Matcher.html docs> to find out more if you're into that sort of thing.

17351735data RestoreRenameToken = RRTLit Text

17361736 -- ^ Just a literal string of characters