fraport/fradrive-old
Archived
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'test' of gitlab.uniworx.de:fradrive/fradrive into test

Browse Source
This commit is contained in:
Steffen Jost 2023-09-06 16:04:45 +00:00
commit 7f5687b43d
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Jobs/Handler/Print.hs
View File

@ -14,7 +14,7 @@ import Jobs.Queue
-- import Jobs.Handler.Intervals.Utils -- import Jobs.Handler.Intervals.Utils
import qualified Data.Text as Text import qualified Data.Text as Text
import UnliftIO.Concurrent (threadDelay) -- import UnliftIO.Concurrent (threadDelay)
-- import Database.Persist.Sql (deleteWhereCount) -- import Database.Persist.Sql (deleteWhereCount)
-- import Database.Esqueleto.Experimental ((:&)(..)) -- import Database.Esqueleto.Experimental ((:&)(..))
@ -25,15 +25,15 @@ import UnliftIO.Concurrent (threadDelay)
jobPrintAckChunkSize :: Int jobPrintAckChunkSize :: Int
jobPrintAckChunkSize = 32 jobPrintAckChunkSize = 64
-- needed, since JobPrintAck cannot requeue itself due to JobNoQueueSame (and having no parameters) -- needed, since JobPrintAck cannot requeue itself due to JobNoQueueSame (and having no parameters)
dispatchJobPrintAckAgain :: JobHandler UniWorX dispatchJobPrintAckAgain :: JobHandler UniWorX
dispatchJobPrintAckAgain = JobHandlerException act dispatchJobPrintAckAgain = JobHandlerException act
where where
act = do act = void $ queueJob JobPrintAck
liftIO $ threadDelay 3e6 -- wait 3s before continuing -- liftIO $ threadDelay 3e6 -- wait 3s before continuing UPDATE: no wait needed
void $ queueJob JobPrintAck
dispatchJobPrintAck :: JobHandler UniWorX dispatchJobPrintAck :: JobHandler UniWorX
dispatchJobPrintAck = JobHandlerException act dispatchJobPrintAck = JobHandlerException act

9
src/Model/Migration/Definitions.hs
View File

@ -113,7 +113,7 @@ derivePersistFieldPathPiece ''ManualMigration
migrateManual :: Migration migrateManual :: Migration
migrateManual = do migrateManual = do
mapM_ (uncurry addIndex) mapM_ (uncurry addIndex) -- NOTE: Indices are automatically created for primary keys and unique columns; manually create them frequent filter conditions that small results for speed up
[ ("material_file_content", "CREATE INDEX material_file_content ON material_file (content)" ) [ ("material_file_content", "CREATE INDEX material_file_content ON material_file (content)" )
, ("course_news_file_content", "CREATE INDEX course_news_file_content ON course_news_file (content)" ) , ("course_news_file_content", "CREATE INDEX course_news_file_content ON course_news_file (content)" )
, ("sheet_file_content", "CREATE INDEX sheet_file_content ON sheet_file (content)" ) , ("sheet_file_content", "CREATE INDEX sheet_file_content ON sheet_file (content)" )
@ -132,7 +132,12 @@ migrateManual = do
, ("study_features_relevance_cached", "CREATE INDEX study_features_relevance_cached ON \"study_features\" (relevance_cached)") , ("study_features_relevance_cached", "CREATE INDEX study_features_relevance_cached ON \"study_features\" (relevance_cached)")
, ("submission_rating_by", "CREATE INDEX submission_rating_by ON submission (rating_by) WHERE rating_by IS NOT NULL" ) , ("submission_rating_by", "CREATE INDEX submission_rating_by ON submission (rating_by) WHERE rating_by IS NOT NULL" )
, ("exam_corrector_user", "CREATE INDEX exam_corrector_user ON exam_corrector (\"user\")" ) , ("exam_corrector_user", "CREATE INDEX exam_corrector_user ON exam_corrector (\"user\")" )
, ("submission_rating_time", "CREATE INDEX submission_rating_time ON submission (rating_time)" ) , ("submission_rating_time", "CREATE INDEX submission_rating_time ON submission (rating_time)" )
, ("qualification_user_block_quser" , "CREATE INDEX qualification_user_block_quser ON qualification_user_block (qualification_user)")
, ("qualification_user_block_unblock", "CREATE INDEX qualification_user_block_unblock ON qualification_user_block (unblock)")
, ("qualification_user_block_from" , "CREATE INDEX qualification_user_block_unblock ON qualification_user_block (from)")
, ("print_job_apc_ident" , "CREATE INDEX print_job_apc_ident ON print_job (apc_ident)")
, ("user_avs_card_person_id" , "CREATE INDEX user_avs_card_person_id ON user_avs_card (person_id)")
] ]
where where
addIndex :: Text -> Sql -> Migration addIndex :: Text -> Sql -> Migration