Changed Int to Word in codecs

VyacheslavHashov · VyacheslavHashov · commit 5a5dbbd5d0a9 · 2017-03-02T22:16:37.000+03:00
diff --git a/src/Database/PostgreSQL/Protocol/Codecs/Decoders.hs b/src/Database/PostgreSQL/Protocol/Codecs/Decoders.hs
@@ -25,7 +25,7 @@ dataRowHeader  = skipBytes 7
 
 {-# INLINE fieldLength #-}
 fieldLength :: Decode Int
-fieldLength = fromIntegral <$> getInt32BE
+fieldLength = fromIntegral <$> getWord32BE
 
 {-# INLINE getNonNullable #-}
 getNonNullable :: FieldDecoder a -> Decode a
@@ -64,7 +64,7 @@ arrayDimensions dims = V.reverse <$> V.replicateM dims arrayDimSize
   where
     -- 4 bytes - count of elements in dimension
     -- 4 bytes - lower bound
-    arrayDimSize = (fromIntegral <$> getInt32BE) <* getInt32BE
+    arrayDimSize = (fromIntegral <$> getWord32BE) <* getWord32BE
 
 {-# INLINE arrayFieldDecoder #-}
 arrayFieldDecoder :: Int -> (V.Vector Int -> Decode a) -> FieldDecoder a
@@ -91,7 +91,7 @@ char _ = chr . fromIntegral <$> getWord8
 
 {-# INLINE date #-}
 date :: FieldDecoder Day
-date _ = pgjToDay <$> getInt32BE
+date _ = pgjToDay <$> getWord32BE
 
 {-# INLINE float4 #-}
 float4 :: FieldDecoder Float
@@ -137,16 +137,16 @@ bsText = getByteString
 
 {-# INLINE timestamp #-}
 timestamp :: FieldDecoder LocalTime
-timestamp _ = microsToLocalTime <$> getInt64BE
+timestamp _ = microsToLocalTime <$> getWord64BE
 
 {-# INLINE timestamptz #-}
 timestamptz :: FieldDecoder UTCTime
-timestamptz _ = microsToUTC <$> getInt64BE
+timestamptz _ = microsToUTC <$> getWord64BE
 
 {-# INLINE uuid #-}
 uuid :: FieldDecoder UUID
 uuid _ = fromWords 
-    <$> (fromIntegral <$> getInt32BE)
-    <*> (fromIntegral <$> getInt32BE)
-    <*> (fromIntegral <$> getInt32BE)
-    <*> (fromIntegral <$> getInt32BE)
+    <$> getWord32BE
+    <*> getWord32BE
+    <*> getWord32BE
+    <*> getWord32BE
diff --git a/src/Database/PostgreSQL/Protocol/Codecs/Time.hs b/src/Database/PostgreSQL/Protocol/Codecs/Time.hs
@@ -10,6 +10,7 @@ module Database.PostgreSQL.Protocol.Codecs.Time
     ) where
 
 import Data.Int  (Int64, Int32)
+import Data.Word (Word32, Word64)
 import Data.Time (Day(..), UTCTime(..), LocalTime(..), DiffTime, TimeOfDay,
                   picosecondsToDiffTime, timeToTimeOfDay,
                   diffTimeToPicoseconds, timeOfDayToTime)
@@ -19,12 +20,12 @@ dayToPgj :: Day -> Integer
 dayToPgj = (+ (modifiedJulianEpoch - postgresEpoch)) . toModifiedJulianDay
 
 {-# INLINE utcToMicros #-}
-utcToMicros :: UTCTime -> Int64
+utcToMicros :: UTCTime -> Word32
 utcToMicros (UTCTime day diffTime) = fromIntegral $ 
     dayToMcs day + diffTimeToMcs diffTime
 
 {-# INLINE localTimeToMicros #-}
-localTimeToMicros :: LocalTime -> Int64
+localTimeToMicros :: LocalTime -> Word64
 localTimeToMicros (LocalTime day time) = fromIntegral $
     dayToMcs day + timeOfDayToMcs time
 
@@ -34,13 +35,13 @@ pgjToDay = ModifiedJulianDay . fromIntegral
                         . subtract (modifiedJulianEpoch - postgresEpoch)
 
 {-# INLINE microsToUTC #-}
-microsToUTC :: Int64 -> UTCTime
+microsToUTC :: Word64 -> UTCTime
 microsToUTC mcs =
     let (d, r) = mcs `divMod` microsInDay
     in UTCTime (pgjToDay d) (mcsToDiffTime r)
 
 {-# INLINE microsToLocalTime #-}
-microsToLocalTime :: Int64 -> LocalTime
+microsToLocalTime :: Word64 -> LocalTime
 microsToLocalTime mcs =
     let (d, r) = mcs `divMod` microsInDay
     in LocalTime (pgjToDay d) (mcsToTimeOfDay r)
