e1cf109 · typeable/bloodhound

git.iko.soy/typeable/bloodhound

purdy

commite1cf10941f752fa757b11fb60cbcb8e5ef58ff0e authorChris Allen <cma@bitemyapp.com> dateThu 11 Dec 2014, 23:19 (12 years ago) parent6988a3c

2 files changed+5−10

compare with master

unifiedsplit

bloodhound.cabal+3−8 src/Database/Bloodhound/Client.hs+2−2

bloodhound.cabal+3−8

@@ -24,7 +24,7 @@ library

2424 Database.Bloodhound.Types.Class

2525 hs-source-dirs: src

2626 build-depends: base >= 4.3 && <5,

27− bytestring >= 0.10.2 && <0.11,

27+ bytestring >= 0.10.0 && <0.11,

2828 containers >= 0.5.0.0 && <0.6,

2929 aeson >= 0.7 && <0.9,

3030 conduit >= 1.0 && <1.3,

@@ -37,7 +37,7 @@ library

3737 default-language: Haskell2010

3838

3939test-suite tests

40− ghc-options: -Wall

40+ ghc-options: -Wall -fno-warn-orphans

4141 type: exitcode-stdio-1.0

4242 main-is: tests.hs

4343 hs-source-dirs: tests

@@ -62,12 +62,7 @@ test-suite doctests

6262 main-is: doctests.hs

6363 hs-source-dirs: tests

6464 build-depends: base,

65+ directory,

6566 doctest,

6667 doctest-prop,

6768 filepath

68− if impl(ghc >= 7.8)

69− build-depends: directory >= 1.1 && < 1.2.2,

70− process >= 1.1 && < 1.3

71− else:

72− build-depends: directory >= 1.1 && < 1.2.0,

73− process >= 1.1 && < 1.2

src/Database/Bloodhound/Client.hs+2−2

@@ -50,7 +50,7 @@ module Database.Bloodhound.Client

5050 where

5151

5252import Data.Aeson

53−import Data.ByteString.Builder

53+import Data.ByteString.Lazy.Builder

5454import qualified Data.ByteString.Lazy.Char8 as L

5555import Data.List (intercalate)

5656import Data.Maybe (fromMaybe)

@@ -309,7 +309,7 @@ encodeBulkOperations stream = collapsed where

309309 collapsed = toLazyByteString $ mappend mashedTaters (byteString "\n")

310310

311311mash :: Builder -> V.Vector L.ByteString -> Builder

312−mash = V.foldl' (\b x -> b `mappend` "\n" `mappend` (lazyByteString x))

312+mash = V.foldl' (\b x -> b `mappend` (byteString "\n") `mappend` (lazyByteString x))

313313

314314mkBulkStreamValue :: Text -> String -> String -> String -> Value

315315mkBulkStreamValue operation indexName mappingName docId =