git.iko.soy/typeable/bloodhound
on master help sign in
Merge pull request #59 from centromere/index-settings-fix
f185e9dChris Allen
src/Database/Bloodhound/Client.hs+1−1
@@ -91,7 +91,7 @@ import Database.Bloodhound.Types
91-- >>> let runBH' = withBH defaultManagerSettings testServer
91-- >>> let runBH' = withBH defaultManagerSettings testServer
92-- >>> let testIndex = IndexName "twitter"
92-- >>> let testIndex = IndexName "twitter"
93-- >>> let testMapping = MappingName "tweet"
93-- >>> let testMapping = MappingName "tweet"
94−-- >>> let defaultIndexSettings = IndexSettings (ShardCount 3) (ReplicaCount 2)
94+-- >>> let defaultIndexSettings = IndexSettings (ShardCount 1) (ReplicaCount 0)
95-- >>> data TweetMapping = TweetMapping deriving (Eq, Show)
95-- >>> data TweetMapping = TweetMapping deriving (Eq, Show)
96-- >>> _ <- runBH' $ deleteIndex testIndex >> deleteMapping testIndex testMapping
96-- >>> _ <- runBH' $ deleteIndex testIndex >> deleteMapping testIndex testMapping
97-- >>> import GHC.Generics
97-- >>> import GHC.Generics
src/Database/Bloodhound/Types.hs+5−1
@@ -2058,7 +2058,11 @@ instance FromJSON Status where
2058
2058
2059
2059
2060instance ToJSON IndexSettings where
2060instance ToJSON IndexSettings where
2061− toJSON (IndexSettings s r) = object ["settings" .= object ["shards" .= s, "replicas" .= r]]
2061+ toJSON (IndexSettings s r) = object ["settings" .=
2062+ object ["index" .=
2063+ object ["number_of_shards" .= s, "number_of_replicas" .= r]
2064+ ]
2065+ ]
2062
2066
2063instance ToJSON IndexTemplate where
2067instance ToJSON IndexTemplate where
2064 toJSON (IndexTemplate p s m) = merge
2068 toJSON (IndexTemplate p s m) = merge
tests/tests.hs+1−1
@@ -48,7 +48,7 @@ validateStatus resp expected =
48 `shouldBe` (expected :: Int)
48 `shouldBe` (expected :: Int)
49
49
50createExampleIndex :: BH IO Reply
50createExampleIndex :: BH IO Reply
51−createExampleIndex = createIndex defaultIndexSettings testIndex
51+createExampleIndex = createIndex (IndexSettings (ShardCount 1) (ReplicaCount 0)) testIndex
52deleteExampleIndex :: BH IO Reply
52deleteExampleIndex :: BH IO Reply
53deleteExampleIndex = deleteIndex testIndex
53deleteExampleIndex = deleteIndex testIndex
54
54