380da47 · typeable/bloodhound

git.iko.soy/typeable/bloodhound

on master help sign in

Elasticsearch not ElasticSearch

380da47Chris Allen9 years ago

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

compare with master

unifiedsplit

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

179

180

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

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

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

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

184-}

185defaultIndexOptimizationSettings :: IndexOptimizationSettings

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

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

493

494{-| '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

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

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

498sure 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

500and be sure to include the exception body.

501-}

502data EsProtocolException = EsProtocolException { esProtoExBody :: LByteString }

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

635 deriving (Eq, Show)

636

637-- | 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.

639newtype NodeName = NodeName { nodeName :: Text }

640 deriving (Eq, Ord, Show, FromJSON)

641

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

1185 , nodeProcessRefreshInterval :: NominalDiffTime

1186 } deriving (Eq, Show)

1187

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

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

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

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

1191newtype EsAddress = EsAddress { esAddress :: Text }

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

1267

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

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

1270−-- ElasticSearch. Check out these Java

1270+-- Elasticsearch. Check out these Java

1271-- <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.

1272data RestoreRenameToken = RRTLit Text

1273 -- ^ Just a literal string of characters

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

1322defaultSnapshotRepoUpdateSettings = SnapshotRepoUpdateSettings True

1323

1324-- | 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

1326-- used with 'updateSnapshotRepo'

1327data FsSnapshotRepo = FsSnapshotRepo {

1328 fsrName :: SnapshotRepoName

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

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

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

167

168-- | 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

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

171-- 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.

173data Language

174 = Arabic

175 | Armenian

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

216

217instance FromJSON Language where

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

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

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

220 Just lang -> return lang

221

222languageToText :: Language -> Text

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

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

172

173

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

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

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

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

177-}

178defaultForceMergeIndexSettings :: ForceMergeIndexSettings

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

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

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

613 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

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

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

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

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

618 durability, and it may silently discard data.

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

620 discussed further on github.

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

686 parseJSON _ = empty

687

688{-| '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

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

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

692sure 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

694and be sure to include the exception body.

695-}

696newtype EsProtocolException = EsProtocolException

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

1023

1024

1025-- | 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.

1027newtype NodeName = NodeName { nodeName :: Text }

1028 deriving (Eq, Ord, Show, FromJSON)

1029

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

1298 , nodeIndicesStatsDocsCount :: Int

1299 } deriving (Eq, Show)

1300

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

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

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

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

1304newtype EsAddress = EsAddress { esAddress :: Text }

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

1566

1567

1568-- | 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

1570-- used with 'updateSnapshotRepo'

1571data FsSnapshotRepo = FsSnapshotRepo {

1572 fsrName :: SnapshotRepoName

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

1730

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

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

1733−-- ElasticSearch. Check out these Java

1733+-- Elasticsearch. Check out these Java

1734-- <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.

1735data RestoreRenameToken = RRTLit Text

1736 -- ^ Just a literal string of characters