Tools/SCViewer
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixes deferred loading of Tx when being referenced

Browse Source
This commit is contained in:
eyck
2023-03-18 12:18:20 +01:00
parent f9d38b5091
commit 6f2f5a388c
3 changed files with 105 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrDbLoader.java
+6 -4
View File
@@ -129,7 +129,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
* Gets the transaction.
*
* @param txId the tx id
* @return the transaction
* @return the transaction or null if the transaction is not available
*/
public synchronized ITx getTransaction(long txId) {
if (txCache.containsKey(txId))
@@ -139,7 +139,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
txCache.put(txId, tx);
return tx;
} else {
throw new IllegalArgumentException();
return null;
}
}
@@ -528,12 +528,14 @@ public class FtrDbLoader implements IWaveformDbLoader {
CborType next = cborDecoder.peekType();
while(next != null && !break_type.isEqualType(next)) {
long sz = cborDecoder.readArrayLength();
assert(sz==3);
assert(sz==5);
long type_id = cborDecoder.readInt();
long from_id = cborDecoder.readInt();
long to_id = cborDecoder.readInt();
long from_fiber = sz>3?cborDecoder.readInt():-1;
long to_fiber = sz>3?cborDecoder.readInt():-1;
String rel_name = strDict.get((int)type_id);
FtrRelation ftrRel = new FtrRelation(relationTypes.getOrDefault(rel_name, RelationTypeFactory.create(rel_name)), from_id, to_id);
FtrRelation ftrRel = new FtrRelation(relationTypes.getOrDefault(rel_name, RelationTypeFactory.create(rel_name)), from_id, to_id, from_fiber, to_fiber);
relationsOut.put(from_id, ftrRel);
relationsIn.put(to_id, ftrRel);
next = cborDecoder.peekType();