32
32
import org .dcache .pool .FaultEvent ;
33
33
import org .dcache .pool .FaultListener ;
34
34
import org .dcache .pool .classic .MoverRequestScheduler .Order ;
35
- import org .dcache .pool .classic .MoverRequestScheduler .PrioritizedRequest ;
36
35
import org .dcache .util .IoPriority ;
37
36
import org .slf4j .Logger ;
38
37
import org .slf4j .LoggerFactory ;
@@ -444,7 +443,24 @@ public Serializable call() throws CommandException {
444
443
.toArray (IoJobInfo []::new );
445
444
} else {
446
445
447
- Comparator <PrioritizedRequest > comparator = getPrioritizedRequestComparator ();
446
+ Comparator <MoverRequestScheduler .PrioritizedRequest > comparator ;
447
+ if (sortBySize ) {
448
+ comparator = (b , a ) -> Long .compare (
449
+ a .getMover ().getBytesTransferred (), b .getMover ().getBytesTransferred ()
450
+ );
451
+ } else if (sortByTime ) {
452
+ comparator = (b , a ) -> Long .compare (
453
+ a .getMover ().getLastTransferred (), b .getMover ().getLastTransferred ()
454
+ );
455
+ } else {
456
+ comparator = (b , a ) -> Integer .compare (
457
+ a .getId (), b .getId ()
458
+ );
459
+ }
460
+
461
+ if (reverseSort ) {
462
+ comparator = comparator .reversed ();
463
+ }
448
464
449
465
StringBuilder sb = new StringBuilder ();
450
466
if (groupByQueue ) {
@@ -462,28 +478,6 @@ public Serializable call() throws CommandException {
462
478
return sb .toString ();
463
479
}
464
480
}
465
-
466
- private Comparator <PrioritizedRequest > getPrioritizedRequestComparator () {
467
- Comparator <PrioritizedRequest > comparator ;
468
- if (sortBySize ) {
469
- comparator = (b , a ) -> Long .compare (
470
- a .getMover ().getBytesTransferred (), b .getMover ().getBytesTransferred ()
471
- );
472
- } else if (sortByTime ) {
473
- comparator = (b , a ) -> Long .compare (
474
- a .getMover ().getLastTransferred (), b .getMover ().getLastTransferred ()
475
- );
476
- } else {
477
- comparator = (b , a ) -> Integer .compare (
478
- a .getId (), b .getId ()
479
- );
480
- }
481
-
482
- if (reverseSort ) {
483
- comparator = comparator .reversed ();
484
- }
485
- return comparator ;
486
- }
487
481
}
488
482
489
483
@ Command (name = "p2p ls" , hint = "list pool to pool source movers" ,
0 commit comments