git.iko.soy/typeable/bloodhound
on master help sign in
Merge pull request #59 from centromere/index-settings-fix

Fixed bug with IndexSettings serialization

commitf185e9d1e2431afdc02fe28c96cbc06f9b615b06 authorChris Allen <cma@bitemyapp.com> dateWed 29 Jul 2015, 13:01 (11 years ago) parente88613f5f29058
3 files changed+7−3
compare with master
unifiedsplit
src/Database/Bloodhound/Client.hs+1−1 src/Database/Bloodhound/Types.hs+5−1 tests/tests.hs+1−1
src/Database/Bloodhound/Client.hs+1−1
@@ -91,7 +91,7 @@ import Database.Bloodhound.Types
9191-- >>> let runBH' = withBH defaultManagerSettings testServer
9292-- >>> let testIndex = IndexName "twitter"
9393-- >>> let testMapping = MappingName "tweet"
94−-- >>> let defaultIndexSettings = IndexSettings (ShardCount 3) (ReplicaCount 2)
94+-- >>> let defaultIndexSettings = IndexSettings (ShardCount 1) (ReplicaCount 0)
9595-- >>> data TweetMapping = TweetMapping deriving (Eq, Show)
9696-- >>> _ <- runBH' $ deleteIndex testIndex >> deleteMapping testIndex testMapping
9797-- >>> import GHC.Generics
src/Database/Bloodhound/Types.hs+5−1
@@ -2058,7 +2058,11 @@ instance FromJSON Status where
20582058
20592059
20602060instance 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+ ]
20622066
20632067instance ToJSON IndexTemplate where
20642068 toJSON (IndexTemplate p s m) = merge
tests/tests.hs+1−1
@@ -48,7 +48,7 @@ validateStatus resp expected =
4848 `shouldBe` (expected :: Int)
4949
5050createExampleIndex :: BH IO Reply
51−createExampleIndex = createIndex defaultIndexSettings testIndex
51+createExampleIndex = createIndex (IndexSettings (ShardCount 1) (ReplicaCount 0)) testIndex
5252deleteExampleIndex :: BH IO Reply
5353deleteExampleIndex = deleteIndex testIndex
5454