Publish completed database loads and release resources on failure

This commit is contained in:
eyck committed 2026-11-14 17:50:28 +01:00
1 parent 75fa1a4f31
commit 883aeb600b
10 files changed
+216 -93

No files matched your search

@@ -178,19 +178,17 @@ public class FtrDbLoader implements IWaveformDbLoader {
* @throws InputFormatException the input format exception * @throws InputFormatException the input format exception
*/ */
@Override @Override
public void load(File file) throws InputFormatException { public synchronized void load(File file) throws InputFormatException {
dispose();
this.file = file; this.file = file;
try { try {
fis = new FileInputStream(file); fis = new FileInputStream(file);
FileChannel channel = fis.getChannel(); FileChannel channel = fis.getChannel();
lock = channel.lock(0, Long.MAX_VALUE, true); lock = channel.lock(0, Long.MAX_VALUE, true);
parseInput(new CborDecoder(fis), channel); parseInput(new CborDecoder(fis), channel);
} catch (IOException e) {
LOG.warn("Problem parsing file "+file.getName()+": " , e);
} catch (Exception e) { } catch (Exception e) {
LOG.error("Error parsing file "+file.getName()+ ": ", e); dispose();
transactions.clear(); throw new InputFormatException("Cannot parse " + file.getName(), e);
throw new InputFormatException(e.toString());
} }
} }
@@ -213,8 +211,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
} }
} catch (Exception e) { } catch (Exception e) {
LOG.error("Error parsing file "+file.getName(), e); LOG.error("Error parsing file "+file.getName(), e);
transactions.clear(); throw new InputFormatException("Cannot read FTR chunks", e);
throw new InputFormatException(e.toString());
} }
return ret; return ret;
} }
@@ -222,7 +219,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
void parseTx(TxStream txStream, long blockId, byte[] chunk) throws IOException { void parseTx(TxStream txStream, long blockId, byte[] chunk) throws IOException {
CborDecoder cborDecoder = new CborDecoder(new ByteArrayInputStream(chunk)); CborDecoder cborDecoder = new CborDecoder(new ByteArrayInputStream(chunk));
long size = cborDecoder.readArrayLength(); long size = cborDecoder.readArrayLength();
assert(size==-1); if (!(size==-1)) throw new IOException("Invalid FTR structure: size==-1");
CborType next = cborDecoder.peekType(); CborType next = cborDecoder.peekType();
while(next != null && !break_type.isEqualType(next)) { while(next != null && !break_type.isEqualType(next)) {
long blockOffset = cborDecoder.getPos(); long blockOffset = cborDecoder.getPos();
@@ -234,7 +231,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
switch((int)tag) { switch((int)tag) {
case 6: // id/generator/start/end case 6: // id/generator/start/end
long len = cborDecoder.readArrayLength(); long len = cborDecoder.readArrayLength();
assert(len==4); if (!(len==4)) throw new IOException("Invalid FTR structure: len==4");
txId = cborDecoder.readInt(); txId = cborDecoder.readInt();
genId = cborDecoder.readInt(); genId = cborDecoder.readInt();
long startTime = cborDecoder.readInt()*time_scale_factor; long startTime = cborDecoder.readInt()*time_scale_factor;
@@ -257,7 +254,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
break; break;
default: { // skip over 7:begin attr, 8:record attr, 9:end attr default: { // skip over 7:begin attr, 8:record attr, 9:end attr
long sz = cborDecoder.readArrayLength(); long sz = cborDecoder.readArrayLength();
assert(sz==3); if (!(sz==3)) throw new IOException("Invalid FTR structure: sz==3");
cborDecoder.readInt(); cborDecoder.readInt();
long type_id = cborDecoder.readInt(); long type_id = cborDecoder.readInt();
switch(DataType.values()[(int)type_id]) { switch(DataType.values()[(int)type_id]) {
@@ -299,7 +296,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
switch((int)tag) { switch((int)tag) {
case 6: // id/generator/start/end case 6: // id/generator/start/end
long len = cborDecoder.readArrayLength(); long len = cborDecoder.readArrayLength();
assert(len==4); if (!(len==4)) throw new IOException("Invalid FTR structure: len==4");
cborDecoder.readInt(); //txid cborDecoder.readInt(); //txid
cborDecoder.readInt(); // genId cborDecoder.readInt(); // genId
cborDecoder.readInt(); // startTime cborDecoder.readInt(); // startTime
@@ -307,7 +304,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
break; break;
default: { // skip over 7:begin attr, 8:record attr, 9:end attr default: { // skip over 7:begin attr, 8:record attr, 9:end attr
long sz = cborDecoder.readArrayLength(); long sz = cborDecoder.readArrayLength();
assert(sz==3); if (!(sz==3)) throw new IOException("Invalid FTR structure: sz==3");
long name_id = cborDecoder.readInt(); long name_id = cborDecoder.readInt();
long type_id = cborDecoder.readInt(); long type_id = cborDecoder.readInt();
DataType type = DataType.values()[(int)type_id]; DataType type = DataType.values()[(int)type_id];
@@ -359,21 +356,27 @@ public class FtrDbLoader implements IWaveformDbLoader {
* Dispose. * Dispose.
*/ */
@Override @Override
public void dispose() { public synchronized void dispose() {
try { try { if (lock != null) lock.close(); }
if(lock!=null) lock.close(); catch (IOException e) { LOG.warn("Cannot release FTR lock", e); }
lock=null; finally { lock = null; }
if(fis!=null) fis.close(); try { if (fis != null) fis.close(); }
fis=null; catch (IOException e) { LOG.warn("Cannot close FTR file", e); }
} catch (IOException e) { } finally { fis = null; }
attrValues.clear(); attrValues.clear();
relationTypes.clear(); relationTypes.clear();
txStreams.clear(); txStreams.clear();
txGenerators.clear(); txGenerators.clear();
transactions.clear(); transactions.clear();
txCache.clear();
strDict.clear();
attributeTypes.clear(); attributeTypes.clear();
relationsIn.clear(); relationsIn.clear();
relationsOut.clear(); relationsOut.clear();
threads.clear();
maxTime = 0;
time_scale_factor = 1000L;
file = null;
} }
static long calculateTimescaleMultipierPower(long power){ static long calculateTimescaleMultipierPower(long power){
@@ -387,12 +390,11 @@ public class FtrDbLoader implements IWaveformDbLoader {
} }
} }
public void parseInput(CborDecoder cborDecoder, FileChannel channel) { public void parseInput(CborDecoder cborDecoder, FileChannel channel) throws IOException {
try {
long cbor_tag = cborDecoder.readTag(); long cbor_tag = cborDecoder.readTag();
assert(cbor_tag == 55799); if (!(cbor_tag == 55799)) throw new IOException("Invalid FTR structure: cbor_tag == 55799");
long array_len = cborDecoder.readArrayLength(); long array_len = cborDecoder.readArrayLength();
assert(array_len==-1); if (!(array_len==-1)) throw new IOException("Invalid FTR structure: array_len==-1");
CborType next = cborDecoder.peekType(); CborType next = cborDecoder.peekType();
while(next != null && !break_type.isEqualType(next)) { while(next != null && !break_type.isEqualType(next)) {
long tag = cborDecoder.readTag(); long tag = cborDecoder.readTag();
@@ -400,12 +402,12 @@ public class FtrDbLoader implements IWaveformDbLoader {
case 6: { // info case 6: { // info
CborDecoder cbd = new CborDecoder(new ByteArrayInputStream(cborDecoder.readByteString())); CborDecoder cbd = new CborDecoder(new ByteArrayInputStream(cborDecoder.readByteString()));
long sz = cbd.readArrayLength(); long sz = cbd.readArrayLength();
assert(sz==2); if (!(sz==2)) throw new IOException("Invalid FTR structure: sz==2");
long time_scale=cbd.readInt(); long time_scale=cbd.readInt();
long eff_time_scale=time_scale-IWaveformDb.databaseTimeScale; long eff_time_scale=time_scale-IWaveformDb.databaseTimeScale;
time_scale_factor = calculateTimescaleMultipierPower(eff_time_scale); time_scale_factor = calculateTimescaleMultipierPower(eff_time_scale);
long epoch_tag = cbd.readTag(); long epoch_tag = cbd.readTag();
assert(epoch_tag==1); if (!(epoch_tag==1)) throw new IOException("Invalid FTR structure: epoch_tag==1");
cbd.readInt(); // epoch cbd.readInt(); // epoch
break; break;
} }
@@ -415,7 +417,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
} }
case 9: { // dictionary compressed case 9: { // dictionary compressed
long sz = cborDecoder.readArrayLength(); long sz = cborDecoder.readArrayLength();
assert(sz==2); if (!(sz==2)) throw new IOException("Invalid FTR structure: sz==2");
cborDecoder.readInt(); // uncompressed size cborDecoder.readInt(); // uncompressed size
parseDict(new CborDecoder(new BlockLZ4CompressorInputStream(new ByteArrayInputStream(cborDecoder.readByteString())))); parseDict(new CborDecoder(new BlockLZ4CompressorInputStream(new ByteArrayInputStream(cborDecoder.readByteString()))));
break; break;
@@ -426,14 +428,14 @@ public class FtrDbLoader implements IWaveformDbLoader {
} }
case 11: { // directory compressed case 11: { // directory compressed
long sz = cborDecoder.readArrayLength(); long sz = cborDecoder.readArrayLength();
assert(sz==2); if (!(sz==2)) throw new IOException("Invalid FTR structure: sz==2");
cborDecoder.readInt(); // uncompressed size cborDecoder.readInt(); // uncompressed size
parseDir(new CborDecoder(new BlockLZ4CompressorInputStream(new ByteArrayInputStream(cborDecoder.readByteString())))); parseDir(new CborDecoder(new BlockLZ4CompressorInputStream(new ByteArrayInputStream(cborDecoder.readByteString()))));
break; break;
} }
case 12: { //tx chunk uncompressed case 12: { //tx chunk uncompressed
long len = cborDecoder.readArrayLength(); long len = cborDecoder.readArrayLength();
assert(len==4); if (!(len==4)) throw new IOException("Invalid FTR structure: len==4");
long stream_id = cborDecoder.readInt(); long stream_id = cborDecoder.readInt();
cborDecoder.readInt(); // start time of block cborDecoder.readInt(); // start time of block
long end_time = cborDecoder.readInt()*time_scale_factor; long end_time = cborDecoder.readInt()*time_scale_factor;
@@ -444,7 +446,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
} }
case 13: { //tx chunk compressed case 13: { //tx chunk compressed
long len = cborDecoder.readArrayLength(); long len = cborDecoder.readArrayLength();
assert(len==5); if (!(len==5)) throw new IOException("Invalid FTR structure: len==5");
long stream_id = cborDecoder.readInt(); long stream_id = cborDecoder.readInt();
cborDecoder.readInt(); // start time of block cborDecoder.readInt(); // start time of block
long end_time = cborDecoder.readInt()*time_scale_factor; long end_time = cborDecoder.readInt()*time_scale_factor;
@@ -460,7 +462,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
} }
case 15: { // relations uncompressed case 15: { // relations uncompressed
long sz = cborDecoder.readArrayLength(); long sz = cborDecoder.readArrayLength();
assert(sz==2); if (!(sz==2)) throw new IOException("Invalid FTR structure: sz==2");
cborDecoder.readInt(); // uncompressed size cborDecoder.readInt(); // uncompressed size
parseRel(new CborDecoder(new BlockLZ4CompressorInputStream(new ByteArrayInputStream(cborDecoder.readByteString())))); parseRel(new CborDecoder(new BlockLZ4CompressorInputStream(new ByteArrayInputStream(cborDecoder.readByteString()))));
break; break;
@@ -468,11 +470,6 @@ public class FtrDbLoader implements IWaveformDbLoader {
} }
next = cborDecoder.peekType(); next = cborDecoder.peekType();
} }
} catch(IOException e) {
long pos = 0;
try {pos=channel.position(); } catch (Exception ee) {}
LOG.error("Error parsing file input stream at position" + pos, e);
}
} }
private void parseDict(CborDecoder cborDecoder) throws IOException { private void parseDict(CborDecoder cborDecoder) throws IOException {
@@ -480,7 +477,7 @@ public class FtrDbLoader implements IWaveformDbLoader {
ArrayList<String> lst = new ArrayList<>((int)size); ArrayList<String> lst = new ArrayList<>((int)size);
for(long i = 0; i<size; ++i) { for(long i = 0; i<size; ++i) {
long idx = cborDecoder.readInt(); long idx = cborDecoder.readInt();
assert(idx==strDict.size()+lst.size()); if (!(idx==strDict.size()+lst.size())) throw new IOException("Invalid FTR structure: idx==strDict.size()+lst.size()");
lst.add(cborDecoder.readTextString()); lst.add(cborDecoder.readTextString());
} }
strDict.addAll(lst); strDict.addAll(lst);
@@ -504,14 +501,14 @@ public class FtrDbLoader implements IWaveformDbLoader {
long id = cborDecoder.readTag(); long id = cborDecoder.readTag();
if(id==16) { // a stream if(id==16) { // a stream
long len = cborDecoder.readArrayLength(); long len = cborDecoder.readArrayLength();
assert(len==3); if (!(len==3)) throw new IOException("Invalid FTR structure: len==3");
long stream_id = cborDecoder.readInt(); long stream_id = cborDecoder.readInt();
long name_id = cborDecoder.readInt(); long name_id = cborDecoder.readInt();
long kind_id = cborDecoder.readInt(); long kind_id = cborDecoder.readInt();
add(stream_id, new TxStream(this, stream_id, strDict.get((int)name_id), strDict.get((int)kind_id))); add(stream_id, new TxStream(this, stream_id, strDict.get((int)name_id), strDict.get((int)kind_id)));
} else if(id==17) { // a generator } else if(id==17) { // a generator
long len = cborDecoder.readArrayLength(); long len = cborDecoder.readArrayLength();
assert(len==3); if (!(len==3)) throw new IOException("Invalid FTR structure: len==3");
long gen_id = cborDecoder.readInt(); long gen_id = cborDecoder.readInt();
long name_id = cborDecoder.readInt(); long name_id = cborDecoder.readInt();
long stream_id = cborDecoder.readInt(); long stream_id = cborDecoder.readInt();
@@ -524,11 +521,11 @@ public class FtrDbLoader implements IWaveformDbLoader {
private void parseRel(CborDecoder cborDecoder) throws IOException { private void parseRel(CborDecoder cborDecoder) throws IOException {
long size = cborDecoder.readArrayLength(); long size = cborDecoder.readArrayLength();
assert(size==-1); if (!(size==-1)) throw new IOException("Invalid FTR structure: size==-1");
CborType next = cborDecoder.peekType(); CborType next = cborDecoder.peekType();
while(next != null && !break_type.isEqualType(next)) { while(next != null && !break_type.isEqualType(next)) {
long sz = cborDecoder.readArrayLength(); long sz = cborDecoder.readArrayLength();
assert(sz==5 || sz==3); if (!(sz==5 || sz==3)) throw new IOException("Invalid FTR structure: sz==5 || sz==3");
long type_id = cborDecoder.readInt(); long type_id = cborDecoder.readInt();
long from_id = cborDecoder.readInt(); long from_id = cborDecoder.readInt();
long to_id = cborDecoder.readInt(); long to_id = cborDecoder.readInt();
@@ -13,3 +13,6 @@ Embed-Dependency: sqlite-jdbc
Embedded-Artifacts: sqlite-jdbc-3.8.7.jar;g="org.xerial"; Embedded-Artifacts: sqlite-jdbc-3.8.7.jar;g="org.xerial";
a="sqlite-jdbc";v="3.8.7" a="sqlite-jdbc";v="3.8.7"
Automatic-Module-Name: com.minres.scviewer.database.sqlite Automatic-Module-Name: com.minres.scviewer.database.sqlite
Export-Package: com.minres.scviewer.database.sqlite;x-friends:="com.minres.scviewer.database.test",
com.minres.scviewer.database.sqlite.db;x-friends:="com.minres.scviewer.database.test",
com.minres.scviewer.database.sqlite.tables;x-friends:="com.minres.scviewer.database.test"
@@ -42,7 +42,7 @@ public class TxStream extends AbstractTxStream {
private TreeMap<Integer, TxGenerator> generators; private TreeMap<Integer, TxGenerator> generators;
private TreeMap<Integer, ITx> transactions; private final LazyValue<Map<Integer, ITx>> transactions = new LazyValue<>();
private final LazyValue<Map<Integer, long[]>> transactionTimes = new LazyValue<>(); private final LazyValue<Map<Integer, long[]>> transactionTimes = new LazyValue<>();
long[] getTransactionTimes(int id) { long[] getTransactionTimes(int id) {
@@ -92,39 +92,38 @@ public class TxStream extends AbstractTxStream {
return (long) scvStream.getId(); return (long) scvStream.getId();
} }
public List<IWaveform> getGenerators() { public synchronized List<IWaveform> getGenerators() {
if(generators==null){ if(generators==null){
SQLiteDatabaseSelectHandler<ScvGenerator> handler = new SQLiteDatabaseSelectHandler<>( SQLiteDatabaseSelectHandler<ScvGenerator> handler = new SQLiteDatabaseSelectHandler<>(
ScvGenerator.class, database, "stream="+scvStream.getId()); ScvGenerator.class, database, "stream="+scvStream.getId());
generators=new TreeMap<>(); TreeMap<Integer, TxGenerator> loaded = new TreeMap<>();
try { try {
for(ScvGenerator scvGenerator:handler.selectObjects()){ for(ScvGenerator scvGenerator:handler.selectObjects()){
generators.put(scvGenerator.getId(), new TxGenerator(database, this, scvGenerator)); loaded.put(scvGenerator.getId(), new TxGenerator(database, this, scvGenerator));
} }
generators = loaded;
} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException } catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException
| InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) { | InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) {
e.printStackTrace(); throw new IllegalStateException("Cannot load generators for " + getFullName(), e);
} }
} }
return new ArrayList<>(generators.values()); return new ArrayList<>(generators.values());
} }
protected synchronized Map<Integer, ITx> getTransactions() { protected synchronized Map<Integer, ITx> getTransactions() {
if(transactions==null){ return transactions.get(() -> {
if (generators == null) getGenerators(); if (generators == null) getGenerators();
transactions = new TreeMap<>(); TreeMap<Integer, ITx> loaded = new TreeMap<>();
SQLiteDatabaseSelectHandler<ScvTx> handler = new SQLiteDatabaseSelectHandler<>(ScvTx.class, database, SQLiteDatabaseSelectHandler<ScvTx> handler = new SQLiteDatabaseSelectHandler<>(ScvTx.class,
"stream="+scvStream.getId()); database, "stream=" + scvStream.getId());
try { try {
for(ScvTx scvTx:handler.selectObjects()){ for (ScvTx row : handler.selectObjects())
transactions.put(scvTx.getId(), new Tx(database, this, generators.get(scvTx.getGenerator()), scvTx)); loaded.put(row.getId(), new Tx(database, this, generators.get(row.getGenerator()), row));
} catch (ReflectiveOperationException | SQLException | IntrospectionException e) {
throw new IllegalStateException("Cannot load transactions for " + getFullName(), e);
} }
} catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException return loaded;
| InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) { });
e.printStackTrace();
}
}
return transactions;
} }
@Override @Override
@@ -19,3 +19,4 @@ Bundle-ClassPath: .,
lib/kotlin-stdlib-1.2.42.jar, lib/kotlin-stdlib-1.2.42.jar,
lib/lz4-1.3.0.jar, lib/lz4-1.3.0.jar,
lib/elsa-3.0.0-M5.jar lib/elsa-3.0.0-M5.jar
Export-Package: com.minres.scviewer.database.text;x-friends:="com.minres.scviewer.database.test"
@@ -6,7 +6,8 @@ Bundle-Version: 4.0.0.qualifier
Bundle-Vendor: MINRES Technologies GmbH Bundle-Vendor: MINRES Technologies GmbH
Bundle-RequiredExecutionEnvironment: JavaSE-17 Bundle-RequiredExecutionEnvironment: JavaSE-17
Export-Package: com.minres.scviewer.database, Export-Package: com.minres.scviewer.database,
com.minres.scviewer.database.tx com.minres.scviewer.database.tx,
com.minres.scviewer.database.internal;x-friends:="com.minres.scviewer.database.test"
Import-Package: org.slf4j Import-Package: org.slf4j
Require-Bundle: javax.inject;bundle-version="1.0.0" Require-Bundle: javax.inject;bundle-version="1.0.0"
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
@@ -24,9 +24,15 @@ public class InputFormatException extends Exception {
* @param string the string * @param string the string
*/ */
public InputFormatException(String string) { public InputFormatException(String string) {
super(string);
message=string; message=string;
} }
public InputFormatException(String message, Throwable cause) {
super(message, cause);
this.message = message;
}
/** The Constant serialVersionUID. */ /** The Constant serialVersionUID. */
private static final long serialVersionUID = 8676129878197783368L; private static final long serialVersionUID = 8676129878197783368L;
@@ -16,7 +16,7 @@ import java.io.File;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Collections; import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.LinkedList; import java.util.concurrent.CopyOnWriteArrayList;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@@ -37,11 +37,11 @@ import com.minres.scviewer.database.RelationType;
public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeListener { public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeListener {
/** The loaders. */ /** The loaders. */
private static List<IWaveformDbLoaderFactory> loaderFactories = new LinkedList<>(); private static final CopyOnWriteArrayList<IWaveformDbLoaderFactory> loaderFactories = new CopyOnWriteArrayList<>();
private List<IWaveformDbLoader> activeLoader = new ArrayList<>(); private List<IWaveformDbLoader> activeLoader = new ArrayList<>();
/** The loaded. */ /** The loaded. */
private boolean loaded; private volatile boolean loaded;
/** The relation types. */ /** The relation types. */
private List<RelationType> relationTypes = new ArrayList<>();; private List<RelationType> relationTypes = new ArrayList<>();;
@@ -50,7 +50,7 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
private Map<String, IWaveform> waveforms = Collections.synchronizedMap(new HashMap<>()) ;; private Map<String, IWaveform> waveforms = Collections.synchronizedMap(new HashMap<>()) ;;
/** The max time. */ /** The max time. */
private long maxTime = 0L; private volatile long maxTime = 0L;
private static final Logger LOG = LoggerFactory.getLogger(WaveformDb.class); private static final Logger LOG = LoggerFactory.getLogger(WaveformDb.class);
@@ -60,7 +60,7 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
* @param loader the loader * @param loader the loader
*/ */
public synchronized void bind(IWaveformDbLoaderFactory loader) { public synchronized void bind(IWaveformDbLoaderFactory loader) {
loaderFactories.add(loader); loaderFactories.addIfAbsent(loader);
} }
/** /**
@@ -78,7 +78,7 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
* @return the loaders * @return the loaders
*/ */
public static List<IWaveformDbLoaderFactory> getLoaders() { public static List<IWaveformDbLoaderFactory> getLoaders() {
return Collections.unmodifiableList(loaderFactories); return List.copyOf(loaderFactories);
} }
/** /**
@@ -109,7 +109,7 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
*/ */
@Override @Override
public List<IWaveform> getAllWaves() { public List<IWaveform> getAllWaves() {
return new ArrayList<>(waveforms.values()); synchronized (waveforms) { return new ArrayList<>(waveforms.values()); }
} }
/** /**
@@ -119,43 +119,58 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
* @return true, if successful * @return true, if successful
*/ */
@Override @Override
public boolean load(File inp) { public synchronized boolean load(File inp) {
boolean retval = true; for (IWaveformDbLoaderFactory factory : getLoaders()) {
for (IWaveformDbLoaderFactory loaderFactory : loaderFactories) { if (!factory.canLoad(inp)) continue;
if (loaderFactory.canLoad(inp)) { IWaveformDbLoader loader = factory.getLoader();
IWaveformDbLoader loader = loaderFactory.getLoader(); List<PropertyChangeEvent> pending = Collections.synchronizedList(new ArrayList<>());
loader.addPropertyChangeListener(this); PropertyChangeListener collector = pending::add;
long endTime;
List<RelationType> types;
loader.addPropertyChangeListener(collector);
try { try {
loader.load(inp); loader.load(inp);
activeLoader.add(loader); endTime = loader.getMaxTime();
types = new ArrayList<>(loader.getAllRelationTypes());
} catch (Exception e) { } catch (Exception e) {
LOG.error("error loading file "+inp.getName(), e); LOG.error("Error loading file " + inp.getName(), e);
retval=false; try { loader.dispose(); }
catch (RuntimeException cleanup) { LOG.warn("Cannot dispose failed loader", cleanup); }
continue;
} finally {
loader.removePropertyChangeListener(collector);
} }
loader.removePropertyChangeListener(this); // Commit only completed loads; failed loaders never publish partial hierarchies.
// for (IWaveform w : loader.getAllWaves()) { activeLoader.add(loader);
// waveforms.put(w.getFullName(), w); maxTime = Math.max(maxTime, endTime);
// } if (name == null) name = getFileBasename(inp.getName());
if (loader.getMaxTime() > maxTime) { for (RelationType type : types) if (!relationTypes.contains(type)) relationTypes.add(type);
maxTime = loader.getMaxTime(); synchronized (pending) {
for (PropertyChangeEvent event : pending) propertyChange(event);
} }
if (name == null)
name = getFileBasename(inp.getName());
//buildHierarchyNodes();
relationTypes.addAll(loader.getAllRelationTypes());
}
}
pcs.firePropertyChange(IHierNode.LOADING_FINISHED, null, null);
loaded = true; loaded = true;
return retval; pcs.firePropertyChange(IHierNode.LOADING_FINISHED, null, Boolean.TRUE);
return true;
}
pcs.firePropertyChange(IHierNode.LOADING_FINISHED, null, Boolean.FALSE);
return false;
} }
@Override @Override
public void close() { public synchronized void close() {
for (IWaveformDbLoader entry : activeLoader) { for (IWaveformDbLoader loader : activeLoader) {
entry.dispose(); try { loader.dispose(); }
catch (RuntimeException e) { LOG.warn("Cannot dispose database loader", e); }
} }
activeLoader.clear();
waveforms.clear();
childNodes.clear();
relationTypes.clear();
maxTime = 0;
loaded = false;
name = null;
} }
/** /**
* Gets the file basename. * Gets the file basename.
* *
@@ -163,7 +178,7 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
* @return the file basename * @return the file basename
*/ */
protected static String getFileBasename(String f) { protected static String getFileBasename(String f) {
String ext = ""; String ext = f;
int i = f.lastIndexOf('.'); int i = f.lastIndexOf('.');
if (i > 0 && i < f.length() - 1) { if (i > 0 && i < f.length() - 1) {
ext = f.substring(0, i); ext = f.substring(0, i);
@@ -190,6 +205,9 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL
pcs.firePropertyChange(IHierNode.WAVEFORMS, null, waveforms); pcs.firePropertyChange(IHierNode.WAVEFORMS, null, waveforms);
pcs.firePropertyChange(IHierNode.CHILDS, null, childNodes); pcs.firePropertyChange(IHierNode.CHILDS, null, childNodes);
} else if (IWaveformDbLoader.GENERATOR_ADDED.equals(evt.getPropertyName())) { } else if (IWaveformDbLoader.GENERATOR_ADDED.equals(evt.getPropertyName())) {
IWaveform generator = (IWaveform) evt.getNewValue();
waveforms.put(generator.getFullName(), generator);
pcs.firePropertyChange(IHierNode.WAVEFORMS, null, waveforms);
pcs.firePropertyChange(IHierNode.CHILDS, null, childNodes); pcs.firePropertyChange(IHierNode.CHILDS, null, childNodes);
} }
} }
@@ -10,6 +10,7 @@ Require-Bundle: com.minres.scviewer.database,
com.minres.scviewer.database.text;bundle-version="1.0.0", com.minres.scviewer.database.text;bundle-version="1.0.0",
com.minres.scviewer.database.vcd;bundle-version="1.0.0", com.minres.scviewer.database.vcd;bundle-version="1.0.0",
com.minres.scviewer.database.ftr, com.minres.scviewer.database.ftr,
com.minres.scviewer.database.fst,
org.junit org.junit
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Service-Component: OSGI-INF/component.xml Service-Component: OSGI-INF/component.xml
@@ -0,0 +1,96 @@
package com.minres.scviewer.database.test;
import static org.junit.Assert.*;
import java.beans.PropertyChangeListener;
import java.beans.PropertyChangeSupport;
import java.io.File;
import java.nio.file.Files;
import java.nio.file.Path;
import java.util.Collection;
import java.util.Collections;
import org.junit.Test;
import com.minres.scviewer.database.*;
import com.minres.scviewer.database.ftr.FtrDbLoader;
import com.minres.scviewer.database.internal.WaveformDb;
public class DatabaseLifecycleTest {
private static class Loader implements IWaveformDbLoader {
final PropertyChangeSupport events = new PropertyChangeSupport(this);
final boolean fail;
int disposals;
Loader(boolean fail) { this.fail = fail; }
public void addPropertyChangeListener(PropertyChangeListener l) { events.addPropertyChangeListener(l); }
public void removePropertyChangeListener(PropertyChangeListener l) { events.removePropertyChangeListener(l); }
public void load(File file) throws InputFormatException {
events.firePropertyChange(STREAM_ADDED, null, new EmptyWaveform("stream"));
if (fail) throw new InputFormatException("broken");
}
public long getMaxTime() { return 100; }
public Collection<IWaveform> getAllWaves() { return Collections.emptyList(); }
public Collection<RelationType> getAllRelationTypes() { return Collections.emptyList(); }
public void dispose() { disposals++; }
}
private IWaveformDbLoaderFactory factory(Loader loader) {
return new IWaveformDbLoaderFactory() {
public boolean canLoad(File f) { return f.getName().endsWith(".review"); }
public IWaveformDbLoader getLoader() { return loader; }
};
}
@Test
public void failedAndUnsupportedLoadsPublishNothing() {
WaveformDb db = new WaveformDb();
Loader loader = new Loader(true);
IWaveformDbLoaderFactory factory = factory(loader);db.bind(factory);
try {
assertFalse(db.load(new File("broken.review")));
assertFalse(db.isLoaded());
assertTrue(db.getAllWaves().isEmpty());
assertTrue(db.getChildNodes().isEmpty());
assertEquals(0, db.getMaxTime());
assertEquals(1, loader.disposals);
assertEquals(0, loader.events.getPropertyChangeListeners().length);
assertFalse(db.load(new File("unsupported.review-unknown")));
db.close();assertEquals(1, loader.disposals);
} finally { db.unbind(factory); }
}
@Test
public void successfulCloseReleasesStateAndIsIdempotent() {
WaveformDb db = new WaveformDb();Loader loader = new Loader(false);
IWaveformDbLoaderFactory factory = factory(loader);db.bind(factory);
try {
assertTrue(db.load(new File("success.review")));
assertTrue(db.isLoaded());assertEquals(1, db.getAllWaves().size());
assertEquals(100, db.getMaxTime());
assertEquals(0, loader.events.getPropertyChangeListeners().length);
db.close();db.close();
assertEquals(1, loader.disposals);assertFalse(db.isLoaded());
assertTrue(db.getAllWaves().isEmpty());assertTrue(db.getChildNodes().isEmpty());
assertEquals(0, db.getMaxTime());
} finally { db.unbind(factory);db.close(); }
}
@Test
public void invalidFtrFailsAndLoaderCanBeReusedAfterDisposal() throws Exception {
FtrDbLoader loader = new FtrDbLoader();Path invalid = Files.createTempFile("invalid-ftr-", ".ftr");
try {
Files.write(invalid, new byte[] {0});
try { loader.load(invalid.toFile());fail("Invalid header must fail without assertions"); }
catch (InputFormatException e) { assertNotNull(e.getCause());assertNotNull(e.getMessage()); }
assertTrue(loader.getAllWaves().isEmpty());
loader.load(TxTestSupport.input("my_db.ftr"));
for (IWaveform wave : loader.getAllWaves()) wave.getEvents();
assertNotNull(loader.getTransaction(1));
loader.dispose();
assertNull(loader.getTransaction(1));assertEquals(0, loader.getMaxTime());
for (String name : new String[] {"strDict", "txCache"}) {
java.lang.reflect.Field field = FtrDbLoader.class.getDeclaredField(name);field.setAccessible(true);
Object value = field.get(loader);
assertTrue(value instanceof java.util.Map ? ((java.util.Map<?,?>)value).isEmpty() : ((Collection<?>)value).isEmpty());
}
loader.load(TxTestSupport.input("my_db_c.ftr"));
assertEquals(3400000000L, loader.getMaxTime());
} finally { loader.dispose();Files.deleteIfExists(invalid); }
}
}
@@ -41,6 +41,7 @@ public class DatabaseServicesTest {
@After @After
public void tearDown() throws Exception { public void tearDown() throws Exception {
if (waveformDb != null) waveformDb.close();
} }
@Test @Test