From 380da47cdab34513de3cf07c2c312dcea3b64849 Mon Sep 17 00:00:00 2001 From: Chris Allen Date: Sat, 7 Apr 2018 16:27:23 -0500 Subject: [PATCH] Elasticsearch not ElasticSearch --- src/Database/V1/Bloodhound/Internal/Client.hs | 14 ++++++------- .../V5/Bloodhound/Internal/Analysis.hs | 6 +++--- src/Database/V5/Bloodhound/Internal/Client.hs | 20 +++++++++---------- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/Database/V1/Bloodhound/Internal/Client.hs b/src/Database/V1/Bloodhound/Internal/Client.hs index b8543f0..4121de0 100644 --- a/src/Database/V1/Bloodhound/Internal/Client.hs +++ b/src/Database/V1/Bloodhound/Internal/Client.hs @@ -179,7 +179,7 @@ data IndexOptimizationSettings = {-| 'defaultIndexOptimizationSettings' implements the default settings that - ElasticSearch uses for index optimization. 'maxNumSegments' is Nothing, + Elasticsearch uses for index optimization. 'maxNumSegments' is Nothing, 'onlyExpungeDeletes' is False, and flushAfterOptimize is True. -} defaultIndexOptimizationSettings :: IndexOptimizationSettings @@ -492,11 +492,11 @@ data EsError = EsError { errorStatus :: Int , errorMessage :: Text } deriving (Eq, Show) {-| 'EsProtocolException' will be thrown if Bloodhound cannot parse a response -returned by the ElasticSearch server. If you encounter this error, please +returned by the Elasticsearch server. If you encounter this error, please verify that your domain data types and FromJSON instances are working properly (for example, the 'a' of '[Hit a]' in 'SearchResult.searchHits.hits'). If you're sure that your mappings are correct, then this error may be an indication of an -incompatibility between Bloodhound and ElasticSearch. Please open a bug report +incompatibility between Bloodhound and Elasticsearch. Please open a bug report and be sure to include the exception body. -} data EsProtocolException = EsProtocolException { esProtoExBody :: LByteString } @@ -635,7 +635,7 @@ data NodeSelector = NodeByName NodeName deriving (Eq, Show) -- | A human-readable node name that is supplied by the user in the --- node config or automatically generated by ElasticSearch. +-- node config or automatically generated by Elasticsearch. newtype NodeName = NodeName { nodeName :: Text } deriving (Eq, Ord, Show, FromJSON) @@ -1185,7 +1185,7 @@ data NodeProcessInfo = NodeProcessInfo { , nodeProcessRefreshInterval :: NominalDiffTime } deriving (Eq, Show) --- | A quirky address format used throughout ElasticSearch. An example +-- | A quirky address format used throughout Elasticsearch. An example -- would be inet[/1.1.1.1:9200]. inet may be a placeholder for a -- . newtype EsAddress = EsAddress { esAddress :: Text } @@ -1267,7 +1267,7 @@ newtype RestoreRenamePattern = RestoreRenamePattern { rrPattern :: Text } -- | A single token in a index renaming scheme for a restore. These -- are concatenated into a string before being sent to --- ElasticSearch. Check out these Java +-- Elasticsearch. Check out these Java -- to find out more if you're into that sort of thing. data RestoreRenameToken = RRTLit Text -- ^ Just a literal string of characters @@ -1322,7 +1322,7 @@ defaultSnapshotRepoUpdateSettings :: SnapshotRepoUpdateSettings defaultSnapshotRepoUpdateSettings = SnapshotRepoUpdateSettings True -- | A filesystem-based snapshot repo that ships with --- ElasticSearch. This is an instance of 'SnapshotRepo' so it can be +-- Elasticsearch. This is an instance of 'SnapshotRepo' so it can be -- used with 'updateSnapshotRepo' data FsSnapshotRepo = FsSnapshotRepo { fsrName :: SnapshotRepoName diff --git a/src/Database/V5/Bloodhound/Internal/Analysis.hs b/src/Database/V5/Bloodhound/Internal/Analysis.hs index 481a042..2b363ec 100644 --- a/src/Database/V5/Bloodhound/Internal/Analysis.hs +++ b/src/Database/V5/Bloodhound/Internal/Analysis.hs @@ -166,10 +166,10 @@ instance FromJSON TokenFilterDefinition where _ -> fail ("unrecognized token filter type: " ++ T.unpack t) -- | The set of languages that can be passed to various analyzers, --- filters, etc. in ElasticSearch. Most data types in this module +-- filters, etc. in Elasticsearch. Most data types in this module -- that have a 'Language' field are actually only actually to -- handle a subset of these languages. Consult the official --- ElasticSearch documentation to see what is actually supported. +-- Elasticsearch documentation to see what is actually supported. data Language = Arabic | Armenian @@ -216,7 +216,7 @@ instance ToJSON Language where instance FromJSON Language where parseJSON = withText "Language" $ \t -> case languageFromText t of - Nothing -> fail "not a supported ElasticSearch language" + Nothing -> fail "not a supported Elasticsearch language" Just lang -> return lang languageToText :: Language -> Text diff --git a/src/Database/V5/Bloodhound/Internal/Client.hs b/src/Database/V5/Bloodhound/Internal/Client.hs index 27c807b..0e955b7 100644 --- a/src/Database/V5/Bloodhound/Internal/Client.hs +++ b/src/Database/V5/Bloodhound/Internal/Client.hs @@ -172,7 +172,7 @@ data ForceMergeIndexSettings = {-| 'defaultForceMergeIndexSettings' implements the default settings that - ElasticSearch uses for index optimization. 'maxNumSegments' is Nothing, + Elasticsearch uses for index optimization. 'maxNumSegments' is Nothing, 'onlyExpungeDeletes' is False, and flushAfterOptimize is True. -} defaultForceMergeIndexSettings :: ForceMergeIndexSettings @@ -611,10 +611,10 @@ instance FromJSON AllocationPolicy where "upsert", 'BulkCreate' will fail if a document already exists at the DocId. Consult the for further explanation. - Warning: Bulk operations suffixed with @Auto@ rely on ElasticSearch to + Warning: Bulk operations suffixed with @Auto@ rely on Elasticsearch to generate the id. Often, people use auto-generated identifiers when - ElasticSearch is the only place that their data is stored. Do not let - ElasticSearch be the only place your data is stored. It does not guarantee + Elasticsearch is the only place that their data is stored. Do not let + Elasticsearch be the only place your data is stored. It does not guarantee durability, and it may silently discard data. This is discussed further on github. @@ -686,11 +686,11 @@ instance FromJSON EsError where parseJSON _ = empty {-| 'EsProtocolException' will be thrown if Bloodhound cannot parse a response -returned by the ElasticSearch server. If you encounter this error, please +returned by the Elasticsearch server. If you encounter this error, please verify that your domain data types and FromJSON instances are working properly (for example, the 'a' of '[Hit a]' in 'SearchResult.searchHits.hits'). If you're sure that your mappings are correct, then this error may be an indication of an -incompatibility between Bloodhound and ElasticSearch. Please open a bug report +incompatibility between Bloodhound and Elasticsearch. Please open a bug report and be sure to include the exception body. -} newtype EsProtocolException = EsProtocolException @@ -1023,7 +1023,7 @@ newtype FullNodeId = FullNodeId { fullNodeId :: Text } -- | A human-readable node name that is supplied by the user in the --- node config or automatically generated by ElasticSearch. +-- node config or automatically generated by Elasticsearch. newtype NodeName = NodeName { nodeName :: Text } deriving (Eq, Ord, Show, FromJSON) @@ -1298,7 +1298,7 @@ data NodeIndicesStats = NodeIndicesStats { , nodeIndicesStatsDocsCount :: Int } deriving (Eq, Show) --- | A quirky address format used throughout ElasticSearch. An example +-- | A quirky address format used throughout Elasticsearch. An example -- would be inet[/1.1.1.1:9200]. inet may be a placeholder for a -- . newtype EsAddress = EsAddress { esAddress :: Text } @@ -1566,7 +1566,7 @@ defaultSnapshotRepoUpdateSettings = SnapshotRepoUpdateSettings True -- | A filesystem-based snapshot repo that ships with --- ElasticSearch. This is an instance of 'SnapshotRepo' so it can be +-- Elasticsearch. This is an instance of 'SnapshotRepo' so it can be -- used with 'updateSnapshotRepo' data FsSnapshotRepo = FsSnapshotRepo { fsrName :: SnapshotRepoName @@ -1730,7 +1730,7 @@ newtype RestoreRenamePattern = -- | A single token in a index renaming scheme for a restore. These -- are concatenated into a string before being sent to --- ElasticSearch. Check out these Java +-- Elasticsearch. Check out these Java -- to find out more if you're into that sort of thing. data RestoreRenameToken = RRTLit Text -- ^ Just a literal string of characters