Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use fork of bloodhound to support ES 5.2 #1050

Merged
merged 2 commits into from
Apr 14, 2020

Conversation

akshaymankar
Copy link
Member

Fixes https://github.com/zinfra/backend-issues/issues/1299

Branch on bloodhound fork: https://github.com/wireapp/bloodhound/tree/feature/count-with-ES-5.2

I don't plan on sending a PR for this as ES 5.2 is very old and we should just upgrade from it. There is already an issue for that: https://github.com/zinfra/backend-issues/issues/1161

Copy link
Contributor

@fisx fisx left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this looks... manageable. :)

$ git diff upstream/master..origin/feature/count-with-ES-5.2
diff --git a/src/Database/Bloodhound/Internal/Count.hs b/src/Database/Bloodhound/Internal/Count.hs
index d2f732a..422ee84 100644
--- a/src/Database/Bloodhound/Internal/Count.hs
+++ b/src/Database/Bloodhound/Internal/Count.hs
@@ -29,7 +29,6 @@ instance FromJSON CountResponse where
 
 data CountShards = CountShards { csTotal      :: Int
                                , csSuccessful :: Int
-                               , csSkipped    :: Int
                                , csFailed     :: Int
                                }
   deriving (Eq, Show)
@@ -41,5 +40,4 @@ instance FromJSON CountShards where
         CountShards
         <$> o .: "total"
         <*> o .: "successful"
-        <*> o .: "skipped"
         <*> o .: "failed"

stack.yaml Outdated Show resolved Hide resolved
Co-Authored-By: fisx <mf@zerobuzz.net>
@akshaymankar akshaymankar merged commit d6695fa into develop Apr 14, 2020
@akshaymankar akshaymankar deleted the akshaymankar/fix-count-for-es-5.2 branch April 14, 2020 11:24
@fisx fisx mentioned this pull request Apr 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants