Support vector-0.13

Vector 0.13 changed the type roles on Data.Vector.Storable so that
regular coerce can't be used to coerce the element types any more,
instead we have to use unsafeCoerceVector. We need a little
compatibility shim to support different versions of the vector package.

Author: simonmar

glean.cabal.in

@@ -147,7 +147,7 @@ common deps
         contravariant ^>=1.5,
         text ^>=1.2.3.0,
         bytestring >=0.10.8.2 && <0.12,
-        vector >=0.12.0.1 && <0.13,
+        vector >=0.12.0.1 && <0.14,
         transformers ^>=0.5.6.2,
         network-uri ^>=2.6.1.0,
         stm ^>=2.5.0.0,
@@ -363,6 +363,7 @@ library util
         Glean.Util.TransitiveClosure
         Glean.Util.Trace
         Glean.Util.ValueBuffer
+        Glean.Util.Vector
         Glean.Util.Warden
     build-depends:
         glean:stubs,

glean/db/Glean/Database/Write/Batch.hs

@@ -19,7 +19,6 @@ import Control.Trace (traceMsg)
 import qualified Data.ByteString as BS
 import qualified Data.HashMap.Strict as HashMap
 import Data.HashMap.Strict (HashMap)
-import Data.Coerce
 import Data.Default
 import Data.Int (Int64)
 import Data.IORef
@@ -48,11 +47,12 @@ import Glean.RTS.Foreign.Ownership as Ownership
 import Glean.RTS.Foreign.Stacked (stacked)
 import Glean.RTS.Foreign.Subst (Subst)
 import qualified Glean.RTS.Foreign.Subst as Subst
-import Glean.RTS.Types (Pid(..), Fid)
+import Glean.RTS.Types (Pid(..), Fid(..))
 import Glean.Types (Repo)
 import qualified Glean.Types as Thrift
 import Glean.Util.Metric
 import Glean.Util.Mutex
+import Glean.Util.Vector
 import qualified Glean.Write.Stats as Stats
 
 writeContentFromBatch :: Thrift.Batch -> WriteContent
@@ -190,8 +190,10 @@ reallyWriteBatch env repo OpenDB{..} lock lookup writing original_size deduped
 
       let
         commitOwnership = do
-          owned <- mapM (coerce Subst.unsafeSubstIntervalsAndRelease subst)
-            batch_owned
+          let apply v = unsafeCoerceVector <$>
+                Subst.unsafeSubstIntervalsAndRelease subst
+                  (unsafeCoerceVector v)
+          owned <- mapM apply batch_owned
           Storage.addOwnership odbHandle lock owned
           deps <- mapM (substDependencies subst) batch_dependencies
           derivedOwners <-
@@ -285,8 +287,10 @@ deDupBatch env repo odb lookup writing original_size
     case maybe_deduped_batch of
       Nothing -> return dsubst
       Just deduped_batch -> do
-        is <- mapM (coerce Subst.unsafeSubstIntervalsAndRelease dsubst)
-          batch_owned
+        let apply v = unsafeCoerceVector <$>
+              Subst.unsafeSubstIntervalsAndRelease dsubst
+                (unsafeCoerceVector v)
+        is <- mapM apply batch_owned
         deps <- mapM (substDependencies dsubst) batch_dependencies
         forM_ maybeOwn $ \ownBatch ->
           Ownership.substDefineOwnership ownBatch dsubst
@@ -316,9 +320,10 @@ substDependencies
 substDependencies subst dmap = mapM substFD dmap
   where
   substFD (Thrift.FactDependencies facts deps) = do
-    Thrift.FactDependencies
-      <$> coerce (Subst.substVector subst) facts
-      <*> coerce (Subst.substVector subst) deps
+    Thrift.FactDependencies <$> apply facts <*> apply deps
+  apply v =
+    unsafeCoerceVector <$>
+      Subst.substVector subst (unsafeCoerceVector v)
 
 batchSize :: Thrift.Batch -> Word64
 batchSize = fromIntegral . BS.length . Thrift.batch_facts

glean/hs/Glean/RTS/Foreign/Define.hs

@@ -17,7 +17,6 @@ module Glean.RTS.Foreign.Define
 
 import Control.Exception
 import Control.Monad
-import Data.Coerce (coerce)
 import Data.Default
 import Data.Typeable
 import qualified Data.Vector.Storable as VS
@@ -35,6 +34,7 @@ import Glean.RTS.Foreign.Inventory (Inventory)
 import Glean.RTS.Foreign.Subst (Subst)
 import Glean.RTS.Types (Fid(..), Pid(..), invalidFid)
 import qualified Glean.Types as Thrift
+import Glean.Util.Vector
 
 -- | A reference to a thing we can define facts in
 newtype Define = Define (Ptr Define)
@@ -108,7 +108,7 @@ defineBatch facts inventory batch DefineFlags{..} =
     withIds f
       | Just ids <- Thrift.batch_ids batch =
           if fromIntegral (VS.length ids) == Thrift.batch_count batch
-            then VS.unsafeWith (coerce ids) f
+            then VS.unsafeWith (unsafeCoerceVector ids) f
             else throwIO $
               Thrift.Exception "mismatch between count and ids.size in batch"
       | otherwise = f nullPtr

glean/hs/Glean/RTS/Foreign/Ownership.hsc

@@ -70,6 +70,7 @@ import Glean.RTS.Foreign.Lookup
 import Glean.RTS.Foreign.Subst
 import Glean.RTS.Types
 import qualified Glean.Types as Thrift
+import Glean.Util.Vector
 
 newtype UnitIterator = UnitIterator (Ptr UnitIterator)
   deriving(Storable)
@@ -213,14 +214,14 @@ addDerivedOwners base define (Pid pid) deps =
       define_ptr
       (fromIntegral pid)
       (fromIntegral $ length deps)
-      p_facts_ptrs
+      (castPtr p_facts_ptrs)
       p_facts_sizes
-      p_deps_ptrs
+      (castPtr p_deps_ptrs)
       p_deps_sizes
   where
     entry (Thrift.FactDependencies facts deps) f =
-      VS.unsafeWith (coerce facts) $ \facts_ptr ->
-      VS.unsafeWith (coerce deps) $ \deps_ptr -> do
+      VS.unsafeWith facts $ \facts_ptr ->
+      VS.unsafeWith deps $ \deps_ptr -> do
       let
         !num_facts = fromIntegral $ VS.length facts
         !num_deps = fromIntegral $ VS.length deps
@@ -286,8 +287,8 @@ getOwnershipSet ownership usetid =
           vec <- hsArrayStorable <$> peek (castPtr arr_ptr)
           let op | cop == (#const facebook::glean::rts::Or) = Or
                  | cop == (#const facebook::glean::rts::And) = And
-                 | otherwise = error "unkonwn SetOp"
-          return $ Just (op, coerce (vec :: VS.Vector Word32))
+                 | otherwise = error "unknown SetOp"
+          return $ Just (op, unsafeCoerceVector (vec :: VS.Vector Word32))
     )
 
 data OwnershipStats = OwnershipStats
@@ -349,8 +350,9 @@ newtype FactOwnership = FactOwnership
 
 substOwnership :: Subst -> FactOwnership -> IO FactOwnership
 substOwnership subst (FactOwnership owned) = do
-  owned' <- traverse (coerce $ unsafeSubstIntervalsAndRelease subst) owned
-  return (FactOwnership owned')
+  let apply x = unsafeCoerceVector <$>
+        unsafeSubstIntervalsAndRelease subst (unsafeCoerceVector x)
+  FactOwnership <$> traverse apply owned
 
 unionOwnership :: [FactOwnership] -> FactOwnership
 unionOwnership =

glean/util/Glean/Util/Vector.hs

@@ -0,0 +1,22 @@
+{-
+  Copyright (c) Meta Platforms, Inc. and affiliates.
+  All rights reserved.
+
+  This source code is licensed under the BSD-style license found in the
+  LICENSE file in the root directory of this source tree.
+-}
+
+{-# LANGUAGE CPP #-}
+module Glean.Util.Vector (
+    unsafeCoerceVector
+  ) where
+
+import Data.Vector.Storable
+#if !MIN_VERSION_vector(0,13,0)
+import Data.Coerce
+#endif
+
+#if !MIN_VERSION_vector(0,13,0)
+unsafeCoerceVector :: Coercible a b => Vector a -> Vector b
+unsafeCoerceVector = coerce
+#endif