fix unique conflict offchainvotedata

Author: Cmdv

cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Alonzo/Config.hs

@@ -34,6 +34,7 @@ insertConfig = do
           , sioPoolStats = PoolStatsConfig False
           , sioJsonType = JsonTypeDisable
           , sioRemoveJsonbFromSchema = RemoveJsonbFromSchemaConfig False
+          , sioStopAtBlock = Nothing
           }
 
   dncInsertOptions cfg @?= expected

cardano-chain-gen/test/Test/Cardano/Db/Mock/Unit/Conway/Config/Parse.hs

@@ -104,6 +104,7 @@ insertConfig = do
           , sioPoolStats = PoolStatsConfig False
           , sioJsonType = JsonTypeDisable
           , sioRemoveJsonbFromSchema = RemoveJsonbFromSchemaConfig False
+          , sioStopAtBlock = Nothing
           }
 
   dncInsertOptions cfg @?= expected

cardano-db-sync/src/Cardano/DbSync/Default.hs

@@ -21,6 +21,7 @@ import qualified Cardano.Ledger.Alonzo.Scripts as Ledger
 import Cardano.Ledger.Shelley.AdaPots as Shelley
 import Cardano.Prelude
 import Cardano.Slotting.Slot (EpochNo (..), SlotNo)
+import Data.List (span)
 import Ouroboros.Consensus.Cardano.Block (HardForkBlock (..))
 import qualified Ouroboros.Consensus.HardFork.Combinator as Consensus
 import Ouroboros.Network.Block (blockHash, blockNo, getHeaderFields, headerFieldBlockNo, unBlockNo)
@@ -29,7 +30,7 @@ import qualified Cardano.Db as DB
 import Cardano.DbSync.Api
 import Cardano.DbSync.Api.Ledger
 import Cardano.DbSync.Api.Types (ConsistentLevel (..), InsertOptions (..), LedgerEnv (..), SyncEnv (..), SyncOptions (..))
-import Cardano.DbSync.Config.Types (dncInsertOptions, sioStopAtBlock)
+import Cardano.DbSync.Config.Types (SyncInsertOptions (..), dncInsertOptions)
 import Cardano.DbSync.DbEvent (runDbSyncTransaction)
 import Cardano.DbSync.Epoch (epochHandler)
 import Cardano.DbSync.Era.Byron.Insert (insertByronBlock)
@@ -52,8 +53,37 @@ insertListBlocks ::
   [CardanoBlock] ->
   IO (Either SyncNodeError ())
 insertListBlocks syncEnv blocks = do
-  runDbSyncTransaction (getTrace syncEnv) (envDbEnv syncEnv) $ do
-    traverse_ (applyAndInsertBlockMaybe syncEnv (getTrace syncEnv)) blocks
+  case sioStopAtBlock $ dncInsertOptions $ envSyncNodeConfig syncEnv of
+    Nothing -> runDbSyncTransaction (getTrace syncEnv) (envDbEnv syncEnv) $ do
+      traverse_ (applyAndInsertBlockMaybe syncEnv (getTrace syncEnv)) blocks
+    Just targetBlock ->
+      insertListBlocksWithStopCondition syncEnv blocks targetBlock
+
+insertListBlocksWithStopCondition ::
+  SyncEnv ->
+  [CardanoBlock] ->
+  Word64 -> -- target block number
+  IO (Either SyncNodeError ())
+insertListBlocksWithStopCondition syncEnv blocks targetBlock = do
+  -- Find all blocks up to and including the target block
+  let (blocksToProcess, _) = span (\cblk -> unBlockNo (blockNo cblk) <= targetBlock) blocks
+
+  -- Check if we hit the stop condition in this batch
+  let hitStopCondition = any (\cblk -> unBlockNo (blockNo cblk) >= targetBlock) blocks
+
+  -- Process the blocks in transaction
+  result <- runDbSyncTransaction (getTrace syncEnv) (envDbEnv syncEnv) $ do
+    traverse_ (applyAndInsertBlockMaybe syncEnv (getTrace syncEnv)) blocksToProcess
+
+  -- If we hit the stop condition and transaction succeeded, shutdown
+  case result of
+    Right () | hitStopCondition -> do
+      let tracer = getTrace syncEnv
+      liftIO $
+        logInfo tracer $
+          "Reached stop condition at block " <> textShow targetBlock <> ". Stopping db-sync gracefully."
+      pure $ Left $ SNErrDefault (mkSyncNodeCallStack "insertListBlocks") "Stop condition reached"
+    _ -> pure result
 
 applyAndInsertBlockMaybe ::
   SyncEnv ->
@@ -127,16 +157,6 @@ insertBlock syncEnv cblk applyRes firstAfterRollback tookSnapshot = do
   let !withinHalfHour = isWithinHalfHour details
   insertNewEpochLedgerEvents syncEnv (sdEpochNo details) (apEvents applyResult)
 
-  -- Check stop condition after successful block insertion
-  let stopAtBlock = sioStopAtBlock $ dncInsertOptions $ envSyncNodeConfig syncEnv
-  case stopAtBlock of
-    Just targetBlock | unBlockNo blkNo >= targetBlock -> do
-      liftIO $
-        logInfo tracer $
-          "Reached stop condition at block " <> textShow targetBlock <> ". Stopping db-sync gracefully."
-      throwError $ SNErrDefault (mkSyncNodeCallStack "insertBlock") "Stop condition reached"
-    _ -> pure ()
-
   let isNewEpochEvent = hasNewEpochEvent (apEvents applyResult)
   let isStartEventOrRollback = hasEpochStartEvent (apEvents applyResult) || firstAfterRollback
   let isMember poolId = Set.member poolId (apPoolsRegistered applyResult)

cardano-db/src/Cardano/Db/Schema/Core/StakeDeligation.hs

@@ -253,7 +253,7 @@ data EpochStake = EpochStake
 type instance Key EpochStake = EpochStakeId
 
 instance DbInfo EpochStake where
-  bulkUniqueFields _ = ["addr_id", "pool_id", "epoch_no"]
+  uniqueFields _ = ["addr_id", "pool_id", "epoch_no"]
   unnestParamTypes _ =
     [ ("addr_id", "bigint[]")
     , ("pool_id", "bigint[]")

cardano-db/src/Cardano/Db/Statement/OffChain.hs

@@ -454,7 +454,9 @@ insertBulkOffChainVoteAuthorsStmt =
 
 insertBulkOffChainVoteDataStmt :: HsqlStmt.Statement [SO.OffChainVoteData] [Id.OffChainVoteDataId]
 insertBulkOffChainVoteDataStmt =
-  insertBulk
+  insertBulkWith
+    (ReplaceWithColumns (uniqueFields (Proxy @SO.OffChainVoteData))) -- ON CONFLICT DO UPDATE to ensure we get IDs back
+    False
     extractOffChainVoteData
     SO.offChainVoteDataBulkEncoder
     (WithResultBulk $ Id.idBulkDecoder Id.OffChainVoteDataId)

cardano-db/src/Cardano/Db/Statement/Types.hs

@@ -105,12 +105,6 @@ class Typeable a => DbInfo a where
   default uniqueFields :: Proxy a -> [Text]
   uniqueFields _ = []
 
-  -- | Manual constraint specification for bulk operations only.
-  -- This doesn't affect singular inserts, only bulk operations with conflict handling.
-  bulkUniqueFields :: Proxy a -> [Text]
-  default bulkUniqueFields :: Proxy a -> [Text]
-  bulkUniqueFields _ = []
-
   -- \| Column names and their pg_array type. Used for UNNEST statements.
   unnestParamTypes :: Proxy a -> [(Text, Text)] -- (column_name, pg_array_type)
   default unnestParamTypes :: Proxy a -> [(Text, Text)]

doc/database-encode-decode.md

@@ -52,9 +52,6 @@ instance DbInfo SomeTable where
   -- Unique constraints
   uniqueFields _ = ["col1", "col2"]  -- Multi-column unique constraint
 
-  -- Bulk unique fields (for bulk operations only)
-  bulkUniqueFields _ = ["bulk_unique_col"]
-  
   -- JSONB columns (require ::jsonb casting)
   jsonbFields _ = ["metadata", "config"]