Skip to content

Commit 3d6a2ec

Browse files
kdermekderme
committed
Remove unnecessary pipelining
1 parent aa5d983 commit 3d6a2ec

File tree

6 files changed

+41
-61
lines changed

6 files changed

+41
-61
lines changed

‎cardano-db/src/Cardano/Db/Statement/Base.hs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ import qualified Data.Text.Encoding as TextEnc
2424
import Data.Time (UTCTime)
2525
import qualified Hasql.Decoders as HsqlD
2626
import qualified Hasql.Encoders as HsqlE
27-
import qualified Hasql.Pipeline as HsqlP
2827
import qualified Hasql.Session as HsqlSes
2928
import qualified Hasql.Statement as HsqlStmt
3029

@@ -982,8 +981,7 @@ insertBulkTxMetadataStmt removeJsonb =
982981
insertBulkTxMetadataPiped :: HasCallStack => Bool -> [[SCB.TxMetadata]] -> DbM [Id.TxMetadataId]
983982
insertBulkTxMetadataPiped removeJsonb txMetaChunks =
984983
runSession mkDbCallStack $
985-
HsqlSes.pipeline $
986-
concat <$> traverse (\chunk -> HsqlP.statement chunk (insertBulkTxMetadataStmt removeJsonb)) txMetaChunks
984+
concat <$> traverse (\chunk -> HsqlSes.statement chunk (insertBulkTxMetadataStmt removeJsonb)) txMetaChunks
987985

988986
--------------------------------------------------------------------------------
989987
-- CollateralTxIn
@@ -1372,9 +1370,8 @@ insertBulkTxInPiped txInChunks =
13721370
concat
13731371
<$> runSession
13741372
mkDbCallStack
1375-
( HsqlSes.pipeline $
1376-
for txInChunks $ \chunk ->
1377-
HsqlP.statement chunk insertBulkTxInStmt
1373+
( for txInChunks $ \chunk ->
1374+
HsqlSes.statement chunk insertBulkTxInStmt
13781375
)
13791376

13801377
--------------------------------------------------------------------------------

‎cardano-db/src/Cardano/Db/Statement/ConsumedTxOut.hs‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@ import Cardano.Db.Statement.Base (insertExtraMigration, queryAllExtraMigrations)
3737
import Cardano.Db.Statement.Function.Core (bulkEncoder, runSession)
3838
import Cardano.Db.Statement.Types (DbInfo (..))
3939
import Cardano.Db.Types (DbM, ExtraMigration (..), MigrationValues (..), PruneConsumeMigration (..), processMigrationValues)
40-
import qualified Hasql.Pipeline as HsqlP
4140

4241
data ConsumedTriplet = ConsumedTriplet
4342
{ ctTxOutTxId :: !Id.TxId -- The txId of the txOut
@@ -542,14 +541,12 @@ updateConsumedByTxHashPiped txOutVariantType consumedData = do
542541
TxOutVariantCore -> do
543542
!_result <-
544543
runSession mkDbCallStack $
545-
HsqlSes.pipeline $
546-
traverse (\chunk -> HsqlP.statement chunk (updateConsumedByTxHashBulkStmt @SVC.TxOutCore)) consumedData
544+
traverse (\chunk -> HsqlSes.statement chunk (updateConsumedByTxHashBulkStmt @SVC.TxOutCore)) consumedData
547545
pure ()
548546
TxOutVariantAddress -> do
549547
!_result <-
550548
runSession mkDbCallStack $
551-
HsqlSes.pipeline $
552-
traverse (\chunk -> HsqlP.statement chunk (updateConsumedByTxHashBulkStmt @SVA.TxOutAddress)) consumedData
549+
traverse (\chunk -> HsqlSes.statement chunk (updateConsumedByTxHashBulkStmt @SVA.TxOutAddress)) consumedData
553550
pure ()
554551

555552
updateConsumedByTxHashBulkStmt ::
@@ -675,30 +672,29 @@ migrateTxOutDbTool bulkSize txOutVariantType = do
675672

676673
--------------------------------------------------------------------------------
677674

678-
-- | Update a list of TxOut consumed by TxId mappings using bulked statemnts in a pipeline
675+
-- | Update a list of TxOut consumed by TxId mappings using bulked statements
679676
updateListTxOutConsumedByTxIdBP :: [[(TxOutIdW, Id.TxId)]] -> DbM ()
680677
updateListTxOutConsumedByTxIdBP chunks = do
681678
unless (null chunks) $ do
682679
!_results <-
683680
runSession mkDbCallStack $
684-
HsqlSes.pipeline $
685-
traverse executeUpdate chunks
681+
traverse executeUpdate chunks
686682
pure ()
687683
where
688-
executeUpdate :: [(TxOutIdW, Id.TxId)] -> HsqlP.Pipeline ()
684+
executeUpdate :: [(TxOutIdW, Id.TxId)] -> HsqlSes.Session ()
689685
executeUpdate chunk =
690686
case chunk of
691687
[] -> pure () -- Empty chunk, do nothing
692688
((VCTxOutIdW _, _) : _) ->
693689
-- All are Core type, extract Core IDs
694690
let coreChunk = [(coreId, txId) | (VCTxOutIdW coreId, txId) <- chunk]
695691
(coreIds, txIds) = unzip coreChunk
696-
in HsqlP.statement (coreIds, txIds) updateBulkConsumedByTxIdCore
692+
in HsqlSes.statement (coreIds, txIds) updateBulkConsumedByTxIdCore
697693
((VATxOutIdW _, _) : _) ->
698694
-- All are Address type, extract Address IDs
699695
let addressChunk = [(addrId, txId) | (VATxOutIdW addrId, txId) <- chunk]
700696
(addrIds, txIds) = unzip addressChunk
701-
in HsqlP.statement (addrIds, txIds) updateBulkConsumedByTxIdAddress
697+
in HsqlSes.statement (addrIds, txIds) updateBulkConsumedByTxIdAddress
702698

703699
updateBulkConsumedByTxId ::
704700
forall a b.

‎cardano-db/src/Cardano/Db/Statement/GovernanceAndVoting.hs‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ import qualified Data.Text as Text
1414
import qualified Data.Text.Encoding as TextEnc
1515
import qualified Hasql.Decoders as HsqlD
1616
import qualified Hasql.Encoders as HsqlE
17-
import qualified Hasql.Pipeline as HsqlP
1817
import qualified Hasql.Session as HsqlSes
1918
import qualified Hasql.Statement as HsqlStmt
2019

@@ -260,8 +259,7 @@ insertBulkDrepDistrStmt =
260259
insertBulkDrepDistrPiped :: HasCallStack => [[SGV.DrepDistr]] -> DbM ()
261260
insertBulkDrepDistrPiped drepDistrChunks =
262261
runSession mkDbCallStack $
263-
HsqlSes.pipeline $
264-
traverse_ (`HsqlP.statement` insertBulkDrepDistrStmt) drepDistrChunks
262+
traverse_ (`HsqlSes.statement` insertBulkDrepDistrStmt) drepDistrChunks
265263

266264
-- | QUERY
267265
queryDrepHashSpecialStmt ::
@@ -504,8 +502,7 @@ insertBulkTreasuryWithdrawalStmt =
504502
insertBulkTreasuryWithdrawal :: HasCallStack => [[SGV.TreasuryWithdrawal]] -> DbM ()
505503
insertBulkTreasuryWithdrawal treasuryWithdrawalChunks =
506504
runSession mkDbCallStack $
507-
HsqlSes.pipeline $
508-
traverse_ (`HsqlP.statement` insertBulkTreasuryWithdrawalStmt) treasuryWithdrawalChunks
505+
traverse_ (`HsqlSes.statement` insertBulkTreasuryWithdrawalStmt) treasuryWithdrawalChunks
509506

510507
--------------------------------------------------------------------------------
511508
-- Voting

‎cardano-db/src/Cardano/Db/Statement/MultiAsset.hs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@ import qualified Data.Text as Text
99
import qualified Data.Text.Encoding as TextEnc
1010
import qualified Hasql.Decoders as HsqlD
1111
import qualified Hasql.Encoders as HsqlE
12-
import qualified Hasql.Pipeline as HsqlP
1312
import qualified Hasql.Session as HsqlSes
1413
import qualified Hasql.Statement as HsqlStmt
1514

@@ -84,7 +83,6 @@ insertBulkMaTxMintPiped maTxMintChunks =
8483
concat
8584
<$> runSession
8685
mkDbCallStack
87-
( HsqlSes.pipeline $
88-
for maTxMintChunks $ \chunk ->
89-
HsqlP.statement chunk insertBulkMaTxMintStmt
86+
( for maTxMintChunks $ \chunk ->
87+
HsqlSes.statement chunk insertBulkMaTxMintStmt
9088
)

‎cardano-db/src/Cardano/Db/Statement/StakeDelegation.hs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -98,8 +98,7 @@ insertBulkEpochStake dbConstraintEpochStake epochStakes =
9898
insertBulkEpochStakePiped :: Bool -> [[SS.EpochStake]] -> DbM ()
9999
insertBulkEpochStakePiped dbConstraintEpochStake epochStakeChunks =
100100
runSession mkDbCallStack $
101-
HsqlSes.pipeline $
102-
traverse_ (\chunk -> HsqlP.statement chunk (insertBulkEpochStakeStmt dbConstraintEpochStake)) epochStakeChunks
101+
traverse_ (\chunk -> HsqlSes.statement chunk (insertBulkEpochStakeStmt dbConstraintEpochStake)) epochStakeChunks
103102

104103
-- | QUERIES -------------------------------------------------------------------
105104
queryEpochStakeCountStmt :: HsqlStmt.Statement Word64 Word64
@@ -189,8 +188,7 @@ insertBulkRewards dbConstraintRewards rewards =
189188
insertBulkRewardsPiped :: Bool -> [[SS.Reward]] -> DbM ()
190189
insertBulkRewardsPiped dbConstraintRewards rewardChunks =
191190
runSession mkDbCallStack $
192-
HsqlSes.pipeline $
193-
traverse_ (\chunk -> HsqlP.statement chunk (insertBulkRewardsStmt dbConstraintRewards)) rewardChunks
191+
traverse_ (\chunk -> HsqlSes.statement chunk (insertBulkRewardsStmt dbConstraintRewards)) rewardChunks
194192

195193
-- | QUERY ---------------------------------------------------------------------
196194
queryNormalEpochRewardCountStmt :: HsqlStmt.Statement Word64 Word64
@@ -363,8 +361,7 @@ insertBulkRewardRests rewardRests =
363361
insertBulkRewardRestsPiped :: [[SS.RewardRest]] -> DbM ()
364362
insertBulkRewardRestsPiped rewardRestChunks =
365363
runSession mkDbCallStack $
366-
HsqlSes.pipeline $
367-
traverse_ (`HsqlP.statement` insertBulkRewardRestsStmt) rewardRestChunks
364+
traverse_ (`HsqlSes.statement` insertBulkRewardRestsStmt) rewardRestChunks
368365

369366
--------------------------------------------------------------------------------
370367
queryRewardRestCount :: DbM Word64

‎cardano-db/src/Cardano/Db/Statement/Variants/TxOut.hs‎

Lines changed: 24 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ import qualified Data.Text as Text
1515
import qualified Data.Text.Encoding as TextEnc
1616
import qualified Hasql.Decoders as HsqlD
1717
import qualified Hasql.Encoders as HsqlE
18-
import qualified Hasql.Pipeline as HsqlP
1918
import qualified Hasql.Session as HsqlSes
2019
import qualified Hasql.Statement as HsqlStmt
2120

@@ -149,27 +148,25 @@ insertBulkTxOutPiped disInOut chunks =
149148
concat
150149
<$> runSession
151150
mkDbCallStack
152-
( HsqlSes.pipeline $
153-
traverse
154-
( \chunk ->
155-
let coreTxOuts = map extractCoreTxOut chunk
156-
in HsqlP.statement coreTxOuts insertBulkCoreTxOutStmt
157-
)
158-
chunks
151+
( traverse
152+
( \chunk ->
153+
let coreTxOuts = map extractCoreTxOut chunk
154+
in HsqlSes.statement coreTxOuts insertBulkCoreTxOutStmt
155+
)
156+
chunks
159157
)
160158
pure $ map VCTxOutIdW coreIds
161159
Just (VATxOutW _ _) -> do
162160
addressIds <-
163161
concat
164162
<$> runSession
165163
mkDbCallStack
166-
( HsqlSes.pipeline $
167-
traverse
168-
( \chunk ->
169-
let variantTxOuts = map extractVariantTxOut chunk
170-
in HsqlP.statement variantTxOuts insertBulkAddressTxOutStmt
171-
)
172-
chunks
164+
( traverse
165+
( \chunk ->
166+
let variantTxOuts = map extractVariantTxOut chunk
167+
in HsqlSes.statement variantTxOuts insertBulkAddressTxOutStmt
168+
)
169+
chunks
173170
)
174171
pure $ map VATxOutIdW addressIds
175172
where
@@ -605,27 +602,25 @@ insertBulkMaTxOutPiped chunks =
605602
concat
606603
<$> runSession
607604
mkDbCallStack
608-
( HsqlSes.pipeline $
609-
traverse
610-
( \chunk ->
611-
let coreMaTxOuts = map extractCoreMaTxOut chunk
612-
in HsqlP.statement coreMaTxOuts insertBulkCoreMaTxOutStmt
613-
)
614-
chunks
605+
( traverse
606+
( \chunk ->
607+
let coreMaTxOuts = map extractCoreMaTxOut chunk
608+
in HsqlSes.statement coreMaTxOuts insertBulkCoreMaTxOutStmt
609+
)
610+
chunks
615611
)
616612
pure $ map CMaTxOutIdW coreIds
617613
Just (VMaTxOutW _) -> do
618614
addressIds <-
619615
concat
620616
<$> runSession
621617
mkDbCallStack
622-
( HsqlSes.pipeline $
623-
traverse
624-
( \chunk ->
625-
let addressMaTxOuts = map extractVariantMaTxOut chunk
626-
in HsqlP.statement addressMaTxOuts insertBulkAddressMaTxOutStmt
627-
)
628-
chunks
618+
( traverse
619+
( \chunk ->
620+
let addressMaTxOuts = map extractVariantMaTxOut chunk
621+
in HsqlSes.statement addressMaTxOuts insertBulkAddressMaTxOutStmt
622+
)
623+
chunks
629624
)
630625
pure $ map VMaTxOutIdW addressIds
631626
where

0 commit comments

Comments
 (0)