@effect/cluster 0.49.0 → 0.49.2
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -175,9 +175,33 @@ const make = exports.make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
|
|
|
175
175
|
SET address = ${address}, acquired_at = ${sqlNow}
|
|
176
176
|
`
|
|
177
177
|
});
|
|
178
|
-
const
|
|
179
|
-
|
|
180
|
-
orElse: () =>
|
|
178
|
+
const wrapString = sql.onDialectOrElse({
|
|
179
|
+
mssql: () => s => `N'${s}'`,
|
|
180
|
+
orElse: () => s => `'${s}'`
|
|
181
|
+
});
|
|
182
|
+
const wrapStringArr = arr => sql.literal(arr.map(wrapString).join(", "));
|
|
183
|
+
const refreshShards = sql.onDialectOrElse({
|
|
184
|
+
mysql: () => (address, shardIds) => {
|
|
185
|
+
const shardIdsStr = wrapStringArr(shardIds);
|
|
186
|
+
return sql`
|
|
187
|
+
UPDATE ${locksTableSql}
|
|
188
|
+
SET acquired_at = ${sqlNow}
|
|
189
|
+
WHERE address = ${address} AND shard_id IN (${shardIdsStr});
|
|
190
|
+
SELECT shard_id FROM ${locksTableSql} WHERE address = ${address} AND shard_id IN (${shardIdsStr})
|
|
191
|
+
`.unprepared.pipe(Effect.map(rows => rows[1].map(row => [row.shard_id])));
|
|
192
|
+
},
|
|
193
|
+
mssql: () => (address, shardIds) => sql`
|
|
194
|
+
UPDATE ${locksTableSql}
|
|
195
|
+
SET acquired_at = ${sqlNow}
|
|
196
|
+
OUTPUT inserted.shard_id
|
|
197
|
+
WHERE address = ${address} AND shard_id IN (${wrapStringArr(shardIds)})
|
|
198
|
+
`.values,
|
|
199
|
+
orElse: () => (address, shardIds) => sql`
|
|
200
|
+
UPDATE ${locksTableSql}
|
|
201
|
+
SET acquired_at = ${sqlNow}
|
|
202
|
+
WHERE address = ${address} AND shard_id IN (${wrapStringArr(shardIds)})
|
|
203
|
+
RETURNING shard_id
|
|
204
|
+
`.values
|
|
181
205
|
});
|
|
182
206
|
return ShardStorage.makeEncoded({
|
|
183
207
|
getAssignments: sql`SELECT shard_id, address FROM ${shardsTableSql} ORDER BY shard_id`.values.pipe(_ClusterError.PersistenceError.refail, withTracerDisabled),
|
|
@@ -200,16 +224,17 @@ const make = exports.make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
|
|
|
200
224
|
return remove.pipe(Effect.andThen(insert), sql.withTransaction, _ClusterError.PersistenceError.refail, withTracerDisabled);
|
|
201
225
|
},
|
|
202
226
|
acquire: Effect.fnUntraced(function* (address, shardIds) {
|
|
203
|
-
|
|
204
|
-
|
|
227
|
+
if (shardIds.length > 0) {
|
|
228
|
+
const values = shardIds.map(shardId => sql`(${shardId}, ${address}, ${sqlNow})`);
|
|
229
|
+
yield* acquireLock(address, values);
|
|
230
|
+
}
|
|
205
231
|
const currentLocks = yield* sql`
|
|
206
232
|
SELECT shard_id FROM ${sql(locksTable)}
|
|
207
233
|
WHERE address = ${address} AND acquired_at >= ${lockExpiresAt}
|
|
208
|
-
${forUpdate}
|
|
209
234
|
`.values;
|
|
210
235
|
return currentLocks.map(row => row[0]);
|
|
211
236
|
}, sql.withTransaction, _ClusterError.PersistenceError.refail, withTracerDisabled),
|
|
212
|
-
refresh: (address, shardIds) =>
|
|
237
|
+
refresh: (address, shardIds) => shardIds.length === 0 ? Effect.succeed([]) : refreshShards(address, shardIds).pipe(Effect.map(rows => rows.map(row => row[0])), _ClusterError.PersistenceError.refail, withTracerDisabled),
|
|
213
238
|
release: (address, shardId) => sql`DELETE FROM ${locksTableSql} WHERE address = ${address} AND shard_id = ${shardId}`.pipe(_ClusterError.PersistenceError.refail, withTracerDisabled),
|
|
214
239
|
releaseAll: address => sql`DELETE FROM ${locksTableSql} WHERE address = ${address}`.pipe(_ClusterError.PersistenceError.refail, withTracerDisabled)
|
|
215
240
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SqlShardStorage.js","names":["SqlClient","_interopRequireWildcard","require","Arr","Effect","Layer","_ClusterError","ShardStorage","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","withTracerDisabled","withTracerEnabled","make","exports","fnUntraced","options","sql","withoutTransforms","prefix","table","name","runnersTable","runnersTableSql","onDialectOrElse","mssql","mysql","pg","orElse","shardsTable","shardsTableSql","locksTable","locksTableSql","sqlNowString","sqlNow","literal","lockExpiresAt","acquireLock","address","values","csv","_address","unprepared","
|
|
1
|
+
{"version":3,"file":"SqlShardStorage.js","names":["SqlClient","_interopRequireWildcard","require","Arr","Effect","Layer","_ClusterError","ShardStorage","e","t","WeakMap","r","n","__esModule","o","i","f","__proto__","default","has","get","set","hasOwnProperty","call","Object","defineProperty","getOwnPropertyDescriptor","withTracerDisabled","withTracerEnabled","make","exports","fnUntraced","options","sql","withoutTransforms","prefix","table","name","runnersTable","runnersTableSql","onDialectOrElse","mssql","mysql","pg","orElse","shardsTable","shardsTableSql","locksTable","locksTableSql","sqlNowString","sqlNow","literal","lockExpiresAt","acquireLock","address","values","csv","_address","unprepared","wrapString","s","wrapStringArr","arr","map","join","refreshShards","shardIds","shardIdsStr","pipe","rows","row","shard_id","makeEncoded","getAssignments","PersistenceError","refail","saveAssignments","assignments","remove","length","shardId","andThen","withTransaction","getRunners","runner","String","saveRunners","runners","insert","acquire","currentLocks","refresh","succeed","release","releaseAll","layer","effect","layerWith","scoped"],"sources":["../../src/SqlShardStorage.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SqlShardStorage.d.ts","sourceRoot":"","sources":["../../src/SqlShardStorage.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAA;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAEpD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAA;AAIjD;;;GAGG;AACH,eAAO,MAAM,IAAI;sBACG,MAAM,GAAG,SAAS;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"SqlShardStorage.d.ts","sourceRoot":"","sources":["../../src/SqlShardStorage.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAA;AAClD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAA;AAEpD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,KAAK,MAAM,cAAc,CAAA;AACrC,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAA;AACpD,OAAO,KAAK,YAAY,MAAM,mBAAmB,CAAA;AAIjD;;;GAGG;AACH,eAAO,MAAM,IAAI;sBACG,MAAM,GAAG,SAAS;;;;;;;;;;iCAmShB,CAAA;AAEtB;;;GAGG;AACH,eAAO,MAAM,KAAK,EAAE,KAAK,CAAC,KAAK,CAC7B,YAAY,CAAC,YAAY,EACzB,QAAQ,EACR,SAAS,CAAC,SAAS,CAC8B,CAAA;AAEnD;;;GAGG;AACH,eAAO,MAAM,SAAS,GAAI,SAAS;IACjC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,CAAA;CACrC,KAAG,KAAK,CAAC,KAAK,CAAC,YAAY,CAAC,YAAY,EAAE,QAAQ,EAAE,SAAS,CAAC,SAAS,CAChB,CAAA"}
|
|
@@ -167,9 +167,33 @@ export const make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
|
|
|
167
167
|
SET address = ${address}, acquired_at = ${sqlNow}
|
|
168
168
|
`
|
|
169
169
|
});
|
|
170
|
-
const
|
|
171
|
-
|
|
172
|
-
orElse: () =>
|
|
170
|
+
const wrapString = sql.onDialectOrElse({
|
|
171
|
+
mssql: () => s => `N'${s}'`,
|
|
172
|
+
orElse: () => s => `'${s}'`
|
|
173
|
+
});
|
|
174
|
+
const wrapStringArr = arr => sql.literal(arr.map(wrapString).join(", "));
|
|
175
|
+
const refreshShards = sql.onDialectOrElse({
|
|
176
|
+
mysql: () => (address, shardIds) => {
|
|
177
|
+
const shardIdsStr = wrapStringArr(shardIds);
|
|
178
|
+
return sql`
|
|
179
|
+
UPDATE ${locksTableSql}
|
|
180
|
+
SET acquired_at = ${sqlNow}
|
|
181
|
+
WHERE address = ${address} AND shard_id IN (${shardIdsStr});
|
|
182
|
+
SELECT shard_id FROM ${locksTableSql} WHERE address = ${address} AND shard_id IN (${shardIdsStr})
|
|
183
|
+
`.unprepared.pipe(Effect.map(rows => rows[1].map(row => [row.shard_id])));
|
|
184
|
+
},
|
|
185
|
+
mssql: () => (address, shardIds) => sql`
|
|
186
|
+
UPDATE ${locksTableSql}
|
|
187
|
+
SET acquired_at = ${sqlNow}
|
|
188
|
+
OUTPUT inserted.shard_id
|
|
189
|
+
WHERE address = ${address} AND shard_id IN (${wrapStringArr(shardIds)})
|
|
190
|
+
`.values,
|
|
191
|
+
orElse: () => (address, shardIds) => sql`
|
|
192
|
+
UPDATE ${locksTableSql}
|
|
193
|
+
SET acquired_at = ${sqlNow}
|
|
194
|
+
WHERE address = ${address} AND shard_id IN (${wrapStringArr(shardIds)})
|
|
195
|
+
RETURNING shard_id
|
|
196
|
+
`.values
|
|
173
197
|
});
|
|
174
198
|
return ShardStorage.makeEncoded({
|
|
175
199
|
getAssignments: sql`SELECT shard_id, address FROM ${shardsTableSql} ORDER BY shard_id`.values.pipe(PersistenceError.refail, withTracerDisabled),
|
|
@@ -192,16 +216,17 @@ export const make = /*#__PURE__*/Effect.fnUntraced(function* (options) {
|
|
|
192
216
|
return remove.pipe(Effect.andThen(insert), sql.withTransaction, PersistenceError.refail, withTracerDisabled);
|
|
193
217
|
},
|
|
194
218
|
acquire: Effect.fnUntraced(function* (address, shardIds) {
|
|
195
|
-
|
|
196
|
-
|
|
219
|
+
if (shardIds.length > 0) {
|
|
220
|
+
const values = shardIds.map(shardId => sql`(${shardId}, ${address}, ${sqlNow})`);
|
|
221
|
+
yield* acquireLock(address, values);
|
|
222
|
+
}
|
|
197
223
|
const currentLocks = yield* sql`
|
|
198
224
|
SELECT shard_id FROM ${sql(locksTable)}
|
|
199
225
|
WHERE address = ${address} AND acquired_at >= ${lockExpiresAt}
|
|
200
|
-
${forUpdate}
|
|
201
226
|
`.values;
|
|
202
227
|
return currentLocks.map(row => row[0]);
|
|
203
228
|
}, sql.withTransaction, PersistenceError.refail, withTracerDisabled),
|
|
204
|
-
refresh: (address, shardIds) =>
|
|
229
|
+
refresh: (address, shardIds) => shardIds.length === 0 ? Effect.succeed([]) : refreshShards(address, shardIds).pipe(Effect.map(rows => rows.map(row => row[0])), PersistenceError.refail, withTracerDisabled),
|
|
205
230
|
release: (address, shardId) => sql`DELETE FROM ${locksTableSql} WHERE address = ${address} AND shard_id = ${shardId}`.pipe(PersistenceError.refail, withTracerDisabled),
|
|
206
231
|
releaseAll: address => sql`DELETE FROM ${locksTableSql} WHERE address = ${address}`.pipe(PersistenceError.refail, withTracerDisabled)
|
|
207
232
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SqlShardStorage.js","names":["SqlClient","Arr","Effect","Layer","PersistenceError","ShardStorage","withTracerDisabled","withTracerEnabled","make","fnUntraced","options","sql","withoutTransforms","prefix","table","name","runnersTable","runnersTableSql","onDialectOrElse","mssql","mysql","pg","orElse","shardsTable","shardsTableSql","locksTable","locksTableSql","sqlNowString","sqlNow","literal","lockExpiresAt","acquireLock","address","values","csv","_address","unprepared","
|
|
1
|
+
{"version":3,"file":"SqlShardStorage.js","names":["SqlClient","Arr","Effect","Layer","PersistenceError","ShardStorage","withTracerDisabled","withTracerEnabled","make","fnUntraced","options","sql","withoutTransforms","prefix","table","name","runnersTable","runnersTableSql","onDialectOrElse","mssql","mysql","pg","orElse","shardsTable","shardsTableSql","locksTable","locksTableSql","sqlNowString","sqlNow","literal","lockExpiresAt","acquireLock","address","values","csv","_address","unprepared","wrapString","s","wrapStringArr","arr","map","join","refreshShards","shardIds","shardIdsStr","pipe","rows","row","shard_id","makeEncoded","getAssignments","refail","saveAssignments","assignments","remove","length","shardId","andThen","withTransaction","getRunners","runner","String","saveRunners","runners","insert","acquire","currentLocks","refresh","succeed","release","releaseAll","layer","effect","layerWith","scoped"],"sources":["../../src/SqlShardStorage.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect/cluster",
|
|
3
|
-
"version": "0.49.
|
|
3
|
+
"version": "0.49.2",
|
|
4
4
|
"description": "Unified interfaces for common cluster-specific services",
|
|
5
5
|
"license": "MIT",
|
|
6
6
|
"repository": {
|
|
@@ -11,7 +11,7 @@
|
|
|
11
11
|
"sideEffects": [],
|
|
12
12
|
"homepage": "https://effect.website",
|
|
13
13
|
"peerDependencies": {
|
|
14
|
-
"@effect/platform": "^0.91.
|
|
14
|
+
"@effect/platform": "^0.91.1",
|
|
15
15
|
"@effect/rpc": "^0.70.0",
|
|
16
16
|
"@effect/sql": "^0.45.0",
|
|
17
17
|
"@effect/workflow": "^0.10.0",
|
package/src/SqlShardStorage.ts
CHANGED
|
@@ -194,9 +194,38 @@ export const make = Effect.fnUntraced(function*(options?: {
|
|
|
194
194
|
`
|
|
195
195
|
})
|
|
196
196
|
|
|
197
|
-
const
|
|
198
|
-
|
|
199
|
-
orElse: () =>
|
|
197
|
+
const wrapString = sql.onDialectOrElse({
|
|
198
|
+
mssql: () => (s: string) => `N'${s}'`,
|
|
199
|
+
orElse: () => (s: string) => `'${s}'`
|
|
200
|
+
})
|
|
201
|
+
const wrapStringArr = (arr: ReadonlyArray<string>) => sql.literal(arr.map(wrapString).join(", "))
|
|
202
|
+
|
|
203
|
+
const refreshShards = sql.onDialectOrElse({
|
|
204
|
+
mysql: () => (address: string, shardIds: ReadonlyArray<string>) => {
|
|
205
|
+
const shardIdsStr = wrapStringArr(shardIds)
|
|
206
|
+
return sql<Array<{ shard_id: string }>>`
|
|
207
|
+
UPDATE ${locksTableSql}
|
|
208
|
+
SET acquired_at = ${sqlNow}
|
|
209
|
+
WHERE address = ${address} AND shard_id IN (${shardIdsStr});
|
|
210
|
+
SELECT shard_id FROM ${locksTableSql} WHERE address = ${address} AND shard_id IN (${shardIdsStr})
|
|
211
|
+
`.unprepared.pipe(
|
|
212
|
+
Effect.map((rows) => rows[1].map((row) => [row.shard_id]))
|
|
213
|
+
)
|
|
214
|
+
},
|
|
215
|
+
mssql: () => (address: string, shardIds: ReadonlyArray<string>) =>
|
|
216
|
+
sql`
|
|
217
|
+
UPDATE ${locksTableSql}
|
|
218
|
+
SET acquired_at = ${sqlNow}
|
|
219
|
+
OUTPUT inserted.shard_id
|
|
220
|
+
WHERE address = ${address} AND shard_id IN (${wrapStringArr(shardIds)})
|
|
221
|
+
`.values,
|
|
222
|
+
orElse: () => (address: string, shardIds: ReadonlyArray<string>) =>
|
|
223
|
+
sql`
|
|
224
|
+
UPDATE ${locksTableSql}
|
|
225
|
+
SET acquired_at = ${sqlNow}
|
|
226
|
+
WHERE address = ${address} AND shard_id IN (${wrapStringArr(shardIds)})
|
|
227
|
+
RETURNING shard_id
|
|
228
|
+
`.values
|
|
200
229
|
})
|
|
201
230
|
|
|
202
231
|
return ShardStorage.makeEncoded({
|
|
@@ -242,12 +271,13 @@ export const make = Effect.fnUntraced(function*(options?: {
|
|
|
242
271
|
|
|
243
272
|
acquire: Effect.fnUntraced(
|
|
244
273
|
function*(address, shardIds) {
|
|
245
|
-
|
|
246
|
-
|
|
274
|
+
if (shardIds.length > 0) {
|
|
275
|
+
const values = shardIds.map((shardId) => sql`(${shardId}, ${address}, ${sqlNow})`)
|
|
276
|
+
yield* acquireLock(address, values)
|
|
277
|
+
}
|
|
247
278
|
const currentLocks = yield* sql<{ shard_id: string }>`
|
|
248
279
|
SELECT shard_id FROM ${sql(locksTable)}
|
|
249
280
|
WHERE address = ${address} AND acquired_at >= ${lockExpiresAt}
|
|
250
|
-
${forUpdate}
|
|
251
281
|
`.values
|
|
252
282
|
return currentLocks.map((row) => row[0] as string)
|
|
253
283
|
},
|
|
@@ -257,17 +287,13 @@ export const make = Effect.fnUntraced(function*(options?: {
|
|
|
257
287
|
),
|
|
258
288
|
|
|
259
289
|
refresh: (address, shardIds) =>
|
|
260
|
-
|
|
261
|
-
|
|
262
|
-
|
|
263
|
-
|
|
264
|
-
|
|
265
|
-
|
|
290
|
+
shardIds.length === 0
|
|
291
|
+
? Effect.succeed([])
|
|
292
|
+
: refreshShards(address, shardIds).pipe(
|
|
293
|
+
Effect.map((rows) => rows.map((row) => row[0] as string)),
|
|
294
|
+
PersistenceError.refail,
|
|
295
|
+
withTracerDisabled
|
|
266
296
|
),
|
|
267
|
-
Effect.map((rows) => rows.map((row) => row[0] as string)),
|
|
268
|
-
PersistenceError.refail,
|
|
269
|
-
withTracerDisabled
|
|
270
|
-
),
|
|
271
297
|
|
|
272
298
|
release: (address, shardId) =>
|
|
273
299
|
sql`DELETE FROM ${locksTableSql} WHERE address = ${address} AND shard_id = ${shardId}`.pipe(
|