Commit 1146d48d authored by Roman S. Borschel's avatar Roman S. Borschel 🐌

Merge branch 'release/4.0.1' into 'master'

Release 4.0.1

See merge request !8
parents a1cd40db 8b935a8a
Pipeline #22040661 passed with stage
in 6 minutes and 49 seconds
......@@ -8,8 +8,14 @@ cache:
before_script:
- apt -qq update
- apt -qq install xz-utils make libstdc++-4.9-dev g++ > /dev/null
- apt -qq install build-essential netbase xz-utils libstdc++-4.9-dev libssl-dev > /dev/null
- stack upgrade && hash -d stack && stack --version
- stack clean --full
test:8.4:
image: haskell:8.2
script:
- stack -j 1 --resolver nightly-2018-05-15 test --fast
test:8.2:
image: haskell:8.2
......
4.0.1
-----
- GHC 8.4 compatibility.
- Adjust lower bound on base (>= 4.9) to reflect reality.
4.0.0
-----
- Add support for CQL V4 binary protocol.
......
name: cql
version: 4.0.0
version: 4.0.1
synopsis: Cassandra CQL binary protocol.
stability: experimental
license: OtherLicense
......@@ -62,7 +62,7 @@ library
cpp-options: -DINCOMPATIBLE_VARINT
build-depends:
base >= 4.5 && < 5.0
base >= 4.9 && < 5.0
, bytestring >= 0.10
, cereal >= 0.3
, containers >= 0.5
......
......@@ -32,7 +32,8 @@ import Control.Applicative
import Data.Bits
import Data.ByteString.Lazy (ByteString)
import Data.Int
import Data.Monoid
import Data.Monoid hiding ((<>))
import Data.Semigroup
import Data.Serialize
import Data.Word
import Database.CQL.Protocol.Codec
......@@ -136,9 +137,12 @@ decodeStreamId V3 = StreamId <$> decodeSignedShort
-- as in @compress <> tracing <> mempty@.
newtype Flags = Flags Word8 deriving (Eq, Show)
instance Semigroup Flags where
(Flags a) <> (Flags b) = Flags (a .|. b)
instance Monoid Flags where
mempty = Flags 0
mappend (Flags a) (Flags b) = Flags (a .|. b)
mempty = Flags 0
mappend = (<>)
encodeFlags :: Putter Flags
encodeFlags (Flags x) = encodeByte x
......
......@@ -52,7 +52,6 @@ module Database.CQL.Protocol.Request
) where
import Control.Applicative
import Control.Monad (when)
import Data.Bits
import Data.ByteString.Lazy (ByteString)
import Data.Foldable (traverse_)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment