@@ -65,20 +65,20 @@ public static class TransactionStatus {
65
65
private final FateId fateId ;
66
66
private final FateInstanceType instanceType ;
67
67
private final TStatus status ;
68
- private final Fate .FateOperation txName ;
68
+ private final Fate .FateOperation fateOp ;
69
69
private final List <String > hlocks ;
70
70
private final List <String > wlocks ;
71
71
private final String top ;
72
72
private final long timeCreated ;
73
73
74
74
private TransactionStatus (FateId fateId , FateInstanceType instanceType , TStatus status ,
75
- Fate .FateOperation txName , List <String > hlocks , List <String > wlocks , String top ,
75
+ Fate .FateOperation fateOp , List <String > hlocks , List <String > wlocks , String top ,
76
76
Long timeCreated ) {
77
77
78
78
this .fateId = fateId ;
79
79
this .instanceType = instanceType ;
80
80
this .status = status ;
81
- this .txName = txName ;
81
+ this .fateOp = fateOp ;
82
82
this .hlocks = Collections .unmodifiableList (hlocks );
83
83
this .wlocks = Collections .unmodifiableList (wlocks );
84
84
this .top = top ;
@@ -105,8 +105,8 @@ public TStatus getStatus() {
105
105
/**
106
106
* @return The name of the transaction running.
107
107
*/
108
- public Fate .FateOperation getTxName () {
109
- return txName ;
108
+ public Fate .FateOperation getFateOp () {
109
+ return fateOp ;
110
110
}
111
111
112
112
/**
@@ -353,9 +353,9 @@ public static <T> FateStatus getTransactionStatus(
353
353
fateIds .forEach (fateId -> {
354
354
355
355
ReadOnlyFateTxStore <T > txStore = store .read (fateId );
356
- // tx name will not be set if the tx is not seeded with work (it is NEW)
357
- Fate .FateOperation txName = txStore .getTransactionInfo (Fate .TxInfo .TX_NAME ) == null ? null
358
- : ((Fate .FateOperation ) txStore .getTransactionInfo (Fate .TxInfo .TX_NAME ));
356
+ // fate op will not be set if the tx is not seeded with work (it is NEW)
357
+ Fate .FateOperation fateOp = txStore .getTransactionInfo (Fate .TxInfo .FATE_OP ) == null ? null
358
+ : ((Fate .FateOperation ) txStore .getTransactionInfo (Fate .TxInfo .FATE_OP ));
359
359
360
360
List <String > hlocks = heldLocks .remove (fateId );
361
361
@@ -381,7 +381,7 @@ public static <T> FateStatus getTransactionStatus(
381
381
382
382
if (includeByStatus (status , statusFilter ) && includeByFateId (fateId , fateIdFilter )
383
383
&& includeByInstanceType (fateId .getType (), typesFilter )) {
384
- statuses .add (new TransactionStatus (fateId , type , status , txName , hlocks , wlocks , top ,
384
+ statuses .add (new TransactionStatus (fateId , type , status , fateOp , hlocks , wlocks , top ,
385
385
timeCreated ));
386
386
}
387
387
});
@@ -418,7 +418,7 @@ public void print(Map<FateInstanceType,ReadOnlyFateStore<T>> readOnlyFateStores,
418
418
for (TransactionStatus txStatus : fateStatus .getTransactions ()) {
419
419
fmt .format (
420
420
"%-15s fateId: %s status: %-18s locked: %-15s locking: %-15s op: %-15s created: %s%n" ,
421
- txStatus .getTxName (), txStatus .getFateId (), txStatus .getStatus (), txStatus .getHeldLocks (),
421
+ txStatus .getFateOp (), txStatus .getFateId (), txStatus .getStatus (), txStatus .getHeldLocks (),
422
422
txStatus .getWaitingLocks (), txStatus .getTop (), txStatus .getTimeCreatedFormatted ());
423
423
}
424
424
fmt .format (" %s transactions" , fateStatus .getTransactions ().size ());
0 commit comments