@@ -407,29 +407,27 @@ export class NetworkMonitor {
407
407
}
408
408
let subgraphs : Subgraph [ ] = [ ]
409
409
const queryProgress = {
410
- lastId : '' ,
411
- first : 20 ,
410
+ pageSize : 1000 ,
412
411
fetched : 0 ,
413
412
exhausted : false ,
414
413
retriesRemaining : 10 ,
415
414
}
416
- this . logger . info ( `Query subgraphs in batches of ${ queryProgress . first } ` )
415
+ this . logger . info ( `Query subgraphs in batches of ${ queryProgress . pageSize } ` )
416
+ const groups : string [ ] [ ] = [ ]
417
+ for ( let i = 0 ; i < ids . length ; i += queryProgress . pageSize ) {
418
+ groups . push ( ids . slice ( i , i + queryProgress . pageSize ) )
419
+ }
417
420
418
- while ( ! queryProgress . exhausted ) {
421
+ for ( const group of groups ) {
419
422
this . logger . debug ( `Query subgraphs by id` , {
420
423
queryProgress : queryProgress ,
421
424
subgraphIds : ids ,
422
425
} )
423
426
try {
424
427
const result = await this . networkSubgraph . checkedQuery (
425
428
gql `
426
- query subgraphs($first: Int!, $lastId: String!, $subgraphs: [String!]!) {
427
- subgraphs(
428
- where: { id_gt: $lastId, id_in: $subgraphs }
429
- orderBy: id
430
- orderDirection: asc
431
- first: $first
432
- ) {
429
+ query subgraphs($subgraphs: [String!]!) {
430
+ subgraphs(where: { id_in: $subgraphs }, orderBy: id, orderDirection: asc) {
433
431
id
434
432
createdAt
435
433
versionCount
@@ -444,9 +442,7 @@ export class NetworkMonitor {
444
442
}
445
443
` ,
446
444
{
447
- first : queryProgress . first ,
448
- lastId : queryProgress . lastId ,
449
- subgraphs : ids ,
445
+ subgraphs : group ,
450
446
} ,
451
447
)
452
448
@@ -479,10 +475,7 @@ export class NetworkMonitor {
479
475
throw new Error ( `No subgraph deployments found matching provided ids: ${ ids } ` )
480
476
}
481
477
482
- queryProgress . exhausted = results . length < queryProgress . first
483
478
queryProgress . fetched += results . length
484
- queryProgress . lastId = results [ results . length - 1 ] . id
485
-
486
479
subgraphs = subgraphs . concat ( results )
487
480
} catch ( error ) {
488
481
queryProgress . retriesRemaining --
0 commit comments