@@ -876,24 +876,23 @@ export const makeStoreRedis = Effect.fnUntraced(function*(
876876 } )
877877 )
878878
879- const scanKeys = ( pattern : string ) =>
880- Effect . gen ( function * ( ) {
881- const keys : Array < string > = [ ]
882- let cursor = "0"
883- do {
884- const [ next , batch ] = yield * redis . send < [ string , Array < string > ] > (
885- "SCAN" ,
886- cursor ,
887- "MATCH" ,
888- pattern ,
889- "COUNT" ,
890- "100"
891- )
892- cursor = next
893- for ( const key of batch ) keys . push ( key )
894- } while ( cursor !== "0" )
895- return keys
896- } )
879+ const scanKeys = Effect . fnUntraced ( function * ( pattern : string ) {
880+ const keys : Array < string > = [ ]
881+ let cursor = "0"
882+ do {
883+ const [ next , batch ] = yield * redis . send < [ string , Array < string > ] > (
884+ "SCAN" ,
885+ cursor ,
886+ "MATCH" ,
887+ pattern ,
888+ "COUNT" ,
889+ "100"
890+ )
891+ cursor = next
892+ for ( const key of batch ) keys . push ( key )
893+ } while ( cursor !== "0" )
894+ return keys
895+ } )
897896
898897 return PersistedQueueStore . of ( {
899898 offer : ( { delay, element, id, isCustomId, name } ) => {
@@ -1007,8 +1006,8 @@ export const makeStoreRedis = Effect.fnUntraced(function*(
10071006 } )
10081007 )
10091008 } ) ,
1010- cleanup : ( { failedTimeToLive , timeToLive } ) =>
1011- Effect . gen ( function * ( ) {
1009+ cleanup : Effect . fnUntraced (
1010+ function * ( { failedTimeToLive , timeToLive } ) {
10121011 const now = clock . currentTimeMillisUnsafe ( )
10131012 const idsKeys = yield * scanKeys ( `${ prefix } *:ids` )
10141013 const cutoff = now - Duration . toMillis ( timeToLive )
@@ -1030,14 +1029,14 @@ export const makeStoreRedis = Effect.fnUntraced(function*(
10301029 { concurrency : 16 , discard : true }
10311030 )
10321031 }
1033- } ) . pipe (
1034- Effect . mapError ( ( { cause } ) =>
1035- new PersistedQueueError ( {
1036- message : "Failed to clean up persisted queue" ,
1037- cause
1038- } )
1039- )
1032+ } ,
1033+ Effect . mapError ( ( { cause } ) =>
1034+ new PersistedQueueError ( {
1035+ message : "Failed to clean up persisted queue" ,
1036+ cause
1037+ } )
10401038 )
1039+ )
10411040 } )
10421041} )
10431042
@@ -1905,22 +1904,22 @@ export const makeStoreSql: (
19051904 )
19061905 return loop
19071906 } ,
1908- cleanup : ( { failedTimeToLive , timeToLive } ) =>
1909- Effect . gen ( function * ( ) {
1907+ cleanup : Effect . fnUntraced (
1908+ function * ( { failedTimeToLive , timeToLive } ) {
19101909 yield * cleanupState ( "completed" , timeToLive )
19111910 if ( failedTimeToLive !== undefined ) {
19121911 yield * cleanupState ( "failed" , failedTimeToLive )
19131912 }
1914- } ) . pipe (
1915- Effect . catchCause ( ( cause ) =>
1916- Effect . fail (
1917- new PersistedQueueError ( {
1918- message : "Failed to clean up persisted queue" ,
1919- cause
1920- } )
1921- )
1913+ } ,
1914+ Effect . catchCause ( ( cause ) =>
1915+ Effect . fail (
1916+ new PersistedQueueError ( {
1917+ message : "Failed to clean up persisted queue" ,
1918+ cause
1919+ } )
19221920 )
19231921 )
1922+ )
19241923 } )
19251924} )
19261925
@@ -2038,46 +2037,43 @@ const sqlMigrations = (tableName: string) =>
20382037 const takeIndex = sql ( `idx_${ tableName } _take` )
20392038
20402039 yield * sql . onDialectOrElse ( {
2041- pg : ( ) =>
2042- Effect . gen ( function * ( ) {
2043- yield * sql `DROP INDEX IF EXISTS ${ takeIndex } `
2044- yield * sql `ALTER TABLE ${ tableNameSql }
2040+ pg : Effect . fnUntraced ( function * ( ) {
2041+ yield * sql `DROP INDEX IF EXISTS ${ takeIndex } `
2042+ yield * sql `ALTER TABLE ${ tableNameSql }
20452043 ADD COLUMN state VARCHAR(10),
20462044 ADD COLUMN visible_at TIMESTAMP`
2047- yield * sql `UPDATE ${ tableNameSql }
2045+ yield * sql `UPDATE ${ tableNameSql }
20482046 SET state = CASE WHEN completed THEN 'completed' ELSE 'pending' END,
20492047 visible_at = updated_at`
2050- yield * sql `ALTER TABLE ${ tableNameSql }
2048+ yield * sql `ALTER TABLE ${ tableNameSql }
20512049 ALTER COLUMN sequence TYPE BIGINT,
20522050 ALTER COLUMN id TYPE VARCHAR(255),
20532051 ALTER COLUMN queue_name TYPE VARCHAR(255),
20542052 ALTER COLUMN state SET NOT NULL,
20552053 ALTER COLUMN visible_at SET NOT NULL,
20562054 DROP COLUMN completed`
2057- } ) ,
2058- mysql : ( ) =>
2059- Effect . gen ( function * ( ) {
2060- yield * sql `DROP INDEX ${ takeIndex } ON ${ tableNameSql } `
2061- yield * sql `ALTER TABLE ${ tableNameSql }
2055+ } ) ,
2056+ mysql : Effect . fnUntraced ( function * ( ) {
2057+ yield * sql `DROP INDEX ${ takeIndex } ON ${ tableNameSql } `
2058+ yield * sql `ALTER TABLE ${ tableNameSql }
20622059 MODIFY COLUMN id VARCHAR(255) NOT NULL,
20632060 MODIFY COLUMN queue_name VARCHAR(255) NOT NULL,
20642061 MODIFY COLUMN element MEDIUMTEXT NOT NULL,
20652062 MODIFY COLUMN last_failure MEDIUMTEXT NULL,
20662063 ADD COLUMN state VARCHAR(10) NULL,
20672064 ADD COLUMN visible_at DATETIME NULL`
2068- yield * sql `UPDATE ${ tableNameSql }
2065+ yield * sql `UPDATE ${ tableNameSql }
20692066 SET state = CASE WHEN completed THEN 'completed' ELSE 'pending' END,
20702067 visible_at = updated_at`
2071- yield * sql `ALTER TABLE ${ tableNameSql }
2068+ yield * sql `ALTER TABLE ${ tableNameSql }
20722069 MODIFY COLUMN state VARCHAR(10) NOT NULL,
20732070 MODIFY COLUMN visible_at DATETIME NOT NULL,
20742071 DROP COLUMN completed`
2075- } ) ,
2076- mssql : ( ) =>
2077- Effect . gen ( function * ( ) {
2078- const upgradedTableName = `${ tableName } _upgrade`
2079- const upgradedTable = sql ( upgradedTableName )
2080- yield * sql `CREATE TABLE ${ upgradedTable } (
2072+ } ) ,
2073+ mssql : Effect . fnUntraced ( function * ( ) {
2074+ const upgradedTableName = `${ tableName } _upgrade`
2075+ const upgradedTable = sql ( upgradedTableName )
2076+ yield * sql `CREATE TABLE ${ upgradedTable } (
20812077 sequence BIGINT IDENTITY(1,1) PRIMARY KEY,
20822078 id NVARCHAR(255) NOT NULL,
20832079 queue_name NVARCHAR(255) NOT NULL,
@@ -2091,7 +2087,7 @@ const sqlMigrations = (tableName: string) =>
20912087 created_at DATETIME2 NOT NULL,
20922088 updated_at DATETIME2 NOT NULL
20932089 )`
2094- yield * sql `SET IDENTITY_INSERT ${ upgradedTable } ON;
2090+ yield * sql `SET IDENTITY_INSERT ${ upgradedTable } ON;
20952091 INSERT INTO ${ upgradedTable }
20962092 (sequence, id, queue_name, element, state, attempts, last_failure, visible_at,
20972093 acquired_at, acquired_by, created_at, updated_at)
@@ -2100,19 +2096,18 @@ const sqlMigrations = (tableName: string) =>
21002096 attempts, last_failure, updated_at, acquired_at, acquired_by, created_at, updated_at
21012097 FROM ${ tableNameSql } ;
21022098 SET IDENTITY_INSERT ${ upgradedTable } OFF`
2103- yield * sql `DROP TABLE ${ tableNameSql } `
2104- yield * sql `EXEC sp_rename ${ upgradedTableName } , ${ tableName } `
2105- yield * sql `CREATE UNIQUE INDEX ${ sql ( `idx_${ tableName } _id` ) } ON ${ tableNameSql } (id, queue_name)`
2106- yield * sql `CREATE INDEX ${ sql ( `idx_${ tableName } _update` ) } ON ${ tableNameSql } (sequence, acquired_by)`
2107- } ) ,
2099+ yield * sql `DROP TABLE ${ tableNameSql } `
2100+ yield * sql `EXEC sp_rename ${ upgradedTableName } , ${ tableName } `
2101+ yield * sql `CREATE UNIQUE INDEX ${ sql ( `idx_${ tableName } _id` ) } ON ${ tableNameSql } (id, queue_name)`
2102+ yield * sql `CREATE INDEX ${ sql ( `idx_${ tableName } _update` ) } ON ${ tableNameSql } (sequence, acquired_by)`
2103+ } ) ,
21082104 // sqlite rebuilds the table because altering or dropping constrained
21092105 // columns is not portable across supported SQLite versions.
2110- orElse : ( ) =>
2111- Effect . gen ( function * ( ) {
2112- const upgradedTableName = `${ tableName } _upgrade`
2113- const upgradedTable = sql ( upgradedTableName )
2114- yield * sql `DROP INDEX IF EXISTS ${ takeIndex } `
2115- yield * sql `CREATE TABLE ${ upgradedTable } (
2106+ orElse : Effect . fnUntraced ( function * ( ) {
2107+ const upgradedTableName = `${ tableName } _upgrade`
2108+ const upgradedTable = sql ( upgradedTableName )
2109+ yield * sql `DROP INDEX IF EXISTS ${ takeIndex } `
2110+ yield * sql `CREATE TABLE ${ upgradedTable } (
21162111 sequence INTEGER PRIMARY KEY AUTOINCREMENT,
21172112 id TEXT NOT NULL,
21182113 queue_name TEXT NOT NULL,
@@ -2126,18 +2121,18 @@ const sqlMigrations = (tableName: string) =>
21262121 created_at DATETIME NOT NULL,
21272122 updated_at DATETIME NOT NULL
21282123 )`
2129- yield * sql `INSERT INTO ${ upgradedTable }
2124+ yield * sql `INSERT INTO ${ upgradedTable }
21302125 (sequence, id, queue_name, element, state, attempts, last_failure, visible_at,
21312126 acquired_at, acquired_by, created_at, updated_at)
21322127 SELECT sequence, id, queue_name, element,
21332128 CASE WHEN completed THEN 'completed' ELSE 'pending' END,
21342129 attempts, last_failure, updated_at, acquired_at, acquired_by, created_at, updated_at
21352130 FROM ${ tableNameSql } `
2136- yield * sql `DROP TABLE ${ tableNameSql } `
2137- yield * sql `ALTER TABLE ${ upgradedTable } RENAME TO ${ tableNameSql } `
2138- yield * sql `CREATE UNIQUE INDEX ${ sql ( `idx_${ tableName } _id` ) } ON ${ tableNameSql } (id, queue_name)`
2139- yield * sql `CREATE INDEX ${ sql ( `idx_${ tableName } _update` ) } ON ${ tableNameSql } (sequence, acquired_by)`
2140- } )
2131+ yield * sql `DROP TABLE ${ tableNameSql } `
2132+ yield * sql `ALTER TABLE ${ upgradedTable } RENAME TO ${ tableNameSql } `
2133+ yield * sql `CREATE UNIQUE INDEX ${ sql ( `idx_${ tableName } _id` ) } ON ${ tableNameSql } (id, queue_name)`
2134+ yield * sql `CREATE INDEX ${ sql ( `idx_${ tableName } _update` ) } ON ${ tableNameSql } (sequence, acquired_by)`
2135+ } )
21412136 } )
21422137
21432138 // partial index where supported, so pollers never scan completed rows
0 commit comments