From 883aeb600bf1e29e2d91a85bec196819fcc55b88 Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sat, 14 Nov 2026 17:50:28 +0100 Subject: [PATCH] Publish completed database loads and release resources on failure --- .../scviewer/database/ftr/FtrDbLoader.java | 115 +++++++++--------- .../META-INF/MANIFEST.MF | 3 + .../scviewer/database/sqlite/TxStream.java | 41 +++---- .../META-INF/MANIFEST.MF | 1 + .../META-INF/MANIFEST.MF | 3 +- .../database/InputFormatException.java | 8 +- .../database/internal/WaveformDb.java | 106 +++++++++------- .../META-INF/MANIFEST.MF | 1 + .../database/test/DatabaseLifecycleTest.java | 96 +++++++++++++++ .../database/test/DatabaseServicesTest.java | 1 + 10 files changed, 249 insertions(+), 126 deletions(-) create mode 100644 tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseLifecycleTest.java diff --git a/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrDbLoader.java b/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrDbLoader.java index 4b3203c..4d6c8c4 100644 --- a/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrDbLoader.java +++ b/plugins/com.minres.scviewer.database.ftr/src/com/minres/scviewer/database/ftr/FtrDbLoader.java @@ -178,21 +178,19 @@ public class FtrDbLoader implements IWaveformDbLoader { * @throws InputFormatException the input format exception */ @Override - public void load(File file) throws InputFormatException { - this.file=file; - try { - fis = new FileInputStream(file); - FileChannel channel = fis.getChannel(); - lock=channel.lock(0, Long.MAX_VALUE, true); - parseInput(new CborDecoder(fis), channel); - } catch (IOException e) { - LOG.warn("Problem parsing file "+file.getName()+": " , e); - } catch (Exception e) { - LOG.error("Error parsing file "+file.getName()+ ": ", e); - transactions.clear(); - throw new InputFormatException(e.toString()); - } - } + public synchronized void load(File file) throws InputFormatException { + dispose(); + this.file = file; + try { + fis = new FileInputStream(file); + FileChannel channel = fis.getChannel(); + lock = channel.lock(0, Long.MAX_VALUE, true); + parseInput(new CborDecoder(fis), channel); + } catch (Exception e) { + dispose(); + throw new InputFormatException("Cannot parse " + file.getName(), e); + } + } public synchronized List getChunksAtOffsets(ArrayList fileOffsets) throws InputFormatException { List ret = new ArrayList<>(); @@ -213,8 +211,7 @@ public class FtrDbLoader implements IWaveformDbLoader { } } catch (Exception e) { LOG.error("Error parsing file "+file.getName(), e); - transactions.clear(); - throw new InputFormatException(e.toString()); + throw new InputFormatException("Cannot read FTR chunks", e); } return ret; } @@ -222,7 +219,7 @@ public class FtrDbLoader implements IWaveformDbLoader { void parseTx(TxStream txStream, long blockId, byte[] chunk) throws IOException { CborDecoder cborDecoder = new CborDecoder(new ByteArrayInputStream(chunk)); long size = cborDecoder.readArrayLength(); - assert(size==-1); + if (!(size==-1)) throw new IOException("Invalid FTR structure: size==-1"); CborType next = cborDecoder.peekType(); while(next != null && !break_type.isEqualType(next)) { long blockOffset = cborDecoder.getPos(); @@ -234,7 +231,7 @@ public class FtrDbLoader implements IWaveformDbLoader { switch((int)tag) { case 6: // id/generator/start/end long len = cborDecoder.readArrayLength(); - assert(len==4); + if (!(len==4)) throw new IOException("Invalid FTR structure: len==4"); txId = cborDecoder.readInt(); genId = cborDecoder.readInt(); long startTime = cborDecoder.readInt()*time_scale_factor; @@ -257,7 +254,7 @@ public class FtrDbLoader implements IWaveformDbLoader { break; default: { // skip over 7:begin attr, 8:record attr, 9:end attr long sz = cborDecoder.readArrayLength(); - assert(sz==3); + if (!(sz==3)) throw new IOException("Invalid FTR structure: sz==3"); cborDecoder.readInt(); long type_id = cborDecoder.readInt(); switch(DataType.values()[(int)type_id]) { @@ -299,7 +296,7 @@ public class FtrDbLoader implements IWaveformDbLoader { switch((int)tag) { case 6: // id/generator/start/end long len = cborDecoder.readArrayLength(); - assert(len==4); + if (!(len==4)) throw new IOException("Invalid FTR structure: len==4"); cborDecoder.readInt(); //txid cborDecoder.readInt(); // genId cborDecoder.readInt(); // startTime @@ -307,7 +304,7 @@ public class FtrDbLoader implements IWaveformDbLoader { break; default: { // skip over 7:begin attr, 8:record attr, 9:end attr long sz = cborDecoder.readArrayLength(); - assert(sz==3); + if (!(sz==3)) throw new IOException("Invalid FTR structure: sz==3"); long name_id = cborDecoder.readInt(); long type_id = cborDecoder.readInt(); DataType type = DataType.values()[(int)type_id]; @@ -359,22 +356,28 @@ public class FtrDbLoader implements IWaveformDbLoader { * Dispose. */ @Override - public void dispose() { - try { - if(lock!=null) lock.close(); - lock=null; - if(fis!=null) fis.close(); - fis=null; - } catch (IOException e) { } - attrValues.clear(); - relationTypes.clear(); - txStreams.clear(); - txGenerators.clear(); - transactions.clear(); - attributeTypes.clear(); - relationsIn.clear(); - relationsOut.clear(); - } + public synchronized void dispose() { + try { if (lock != null) lock.close(); } + catch (IOException e) { LOG.warn("Cannot release FTR lock", e); } + finally { lock = null; } + try { if (fis != null) fis.close(); } + catch (IOException e) { LOG.warn("Cannot close FTR file", e); } + finally { fis = null; } + attrValues.clear(); + relationTypes.clear(); + txStreams.clear(); + txGenerators.clear(); + transactions.clear(); + txCache.clear(); + strDict.clear(); + attributeTypes.clear(); + relationsIn.clear(); + relationsOut.clear(); + threads.clear(); + maxTime = 0; + time_scale_factor = 1000L; + file = null; + } static long calculateTimescaleMultipierPower(long power){ long answer = 1; @@ -387,12 +390,11 @@ public class FtrDbLoader implements IWaveformDbLoader { } } - public void parseInput(CborDecoder cborDecoder, FileChannel channel) { - try { + public void parseInput(CborDecoder cborDecoder, FileChannel channel) throws IOException { 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(); - assert(array_len==-1); + if (!(array_len==-1)) throw new IOException("Invalid FTR structure: array_len==-1"); CborType next = cborDecoder.peekType(); while(next != null && !break_type.isEqualType(next)) { long tag = cborDecoder.readTag(); @@ -400,12 +402,12 @@ public class FtrDbLoader implements IWaveformDbLoader { case 6: { // info CborDecoder cbd = new CborDecoder(new ByteArrayInputStream(cborDecoder.readByteString())); long sz = cbd.readArrayLength(); - assert(sz==2); + if (!(sz==2)) throw new IOException("Invalid FTR structure: sz==2"); long time_scale=cbd.readInt(); long eff_time_scale=time_scale-IWaveformDb.databaseTimeScale; time_scale_factor = calculateTimescaleMultipierPower(eff_time_scale); 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 break; } @@ -415,7 +417,7 @@ public class FtrDbLoader implements IWaveformDbLoader { } case 9: { // dictionary compressed long sz = cborDecoder.readArrayLength(); - assert(sz==2); + if (!(sz==2)) throw new IOException("Invalid FTR structure: sz==2"); cborDecoder.readInt(); // uncompressed size parseDict(new CborDecoder(new BlockLZ4CompressorInputStream(new ByteArrayInputStream(cborDecoder.readByteString())))); break; @@ -426,14 +428,14 @@ public class FtrDbLoader implements IWaveformDbLoader { } case 11: { // directory compressed long sz = cborDecoder.readArrayLength(); - assert(sz==2); + if (!(sz==2)) throw new IOException("Invalid FTR structure: sz==2"); cborDecoder.readInt(); // uncompressed size parseDir(new CborDecoder(new BlockLZ4CompressorInputStream(new ByteArrayInputStream(cborDecoder.readByteString())))); break; } case 12: { //tx chunk uncompressed long len = cborDecoder.readArrayLength(); - assert(len==4); + if (!(len==4)) throw new IOException("Invalid FTR structure: len==4"); long stream_id = cborDecoder.readInt(); cborDecoder.readInt(); // start time of block long end_time = cborDecoder.readInt()*time_scale_factor; @@ -444,7 +446,7 @@ public class FtrDbLoader implements IWaveformDbLoader { } case 13: { //tx chunk compressed long len = cborDecoder.readArrayLength(); - assert(len==5); + if (!(len==5)) throw new IOException("Invalid FTR structure: len==5"); long stream_id = cborDecoder.readInt(); cborDecoder.readInt(); // start time of block long end_time = cborDecoder.readInt()*time_scale_factor; @@ -460,7 +462,7 @@ public class FtrDbLoader implements IWaveformDbLoader { } case 15: { // relations uncompressed long sz = cborDecoder.readArrayLength(); - assert(sz==2); + if (!(sz==2)) throw new IOException("Invalid FTR structure: sz==2"); cborDecoder.readInt(); // uncompressed size parseRel(new CborDecoder(new BlockLZ4CompressorInputStream(new ByteArrayInputStream(cborDecoder.readByteString())))); break; @@ -468,11 +470,6 @@ public class FtrDbLoader implements IWaveformDbLoader { } 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 { @@ -480,7 +477,7 @@ public class FtrDbLoader implements IWaveformDbLoader { ArrayList lst = new ArrayList<>((int)size); for(long i = 0; i generators; - private TreeMap transactions; + private final LazyValue> transactions = new LazyValue<>(); private final LazyValue> transactionTimes = new LazyValue<>(); long[] getTransactionTimes(int id) { @@ -92,40 +92,39 @@ public class TxStream extends AbstractTxStream { return (long) scvStream.getId(); } - public List getGenerators() { + public synchronized List getGenerators() { if(generators==null){ SQLiteDatabaseSelectHandler handler = new SQLiteDatabaseSelectHandler<>( ScvGenerator.class, database, "stream="+scvStream.getId()); - generators=new TreeMap<>(); + TreeMap loaded = new TreeMap<>(); try { 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 | InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) { - e.printStackTrace(); + throw new IllegalStateException("Cannot load generators for " + getFullName(), e); } } return new ArrayList<>(generators.values()); } protected synchronized Map getTransactions() { - if(transactions==null){ - if(generators==null) getGenerators(); - transactions = new TreeMap<>(); - SQLiteDatabaseSelectHandler handler = new SQLiteDatabaseSelectHandler<>(ScvTx.class, database, - "stream="+scvStream.getId()); - try { - for(ScvTx scvTx:handler.selectObjects()){ - transactions.put(scvTx.getId(), new Tx(database, this, generators.get(scvTx.getGenerator()), scvTx)); - } - } catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException - | InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) { - e.printStackTrace(); - } - } - return transactions; - } + return transactions.get(() -> { + if (generators == null) getGenerators(); + TreeMap loaded = new TreeMap<>(); + SQLiteDatabaseSelectHandler handler = new SQLiteDatabaseSelectHandler<>(ScvTx.class, + database, "stream=" + scvStream.getId()); + try { + for (ScvTx row : handler.selectObjects()) + 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); + } + return loaded; + }); + } @Override public IEvent[] getEventsAtTime(long time) { diff --git a/plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF index e5e0b73..9071563 100644 --- a/plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF +++ b/plugins/com.minres.scviewer.database.text/META-INF/MANIFEST.MF @@ -19,3 +19,4 @@ Bundle-ClassPath: ., lib/kotlin-stdlib-1.2.42.jar, lib/lz4-1.3.0.jar, lib/elsa-3.0.0-M5.jar +Export-Package: com.minres.scviewer.database.text;x-friends:="com.minres.scviewer.database.test" diff --git a/plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF b/plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF index 8c6e191..39571d6 100644 --- a/plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF +++ b/plugins/com.minres.scviewer.database/META-INF/MANIFEST.MF @@ -6,7 +6,8 @@ Bundle-Version: 4.0.0.qualifier Bundle-Vendor: MINRES Technologies GmbH Bundle-RequiredExecutionEnvironment: JavaSE-17 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 Require-Bundle: javax.inject;bundle-version="1.0.0" Bundle-ActivationPolicy: lazy diff --git a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/InputFormatException.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/InputFormatException.java index cf46fbd..7fd35c6 100644 --- a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/InputFormatException.java +++ b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/InputFormatException.java @@ -24,9 +24,15 @@ public class InputFormatException extends Exception { * @param string the string */ public InputFormatException(String string) { - message=string; + super(string); + message=string; } + public InputFormatException(String message, Throwable cause) { + super(message, cause); + this.message = message; + } + /** The Constant serialVersionUID. */ private static final long serialVersionUID = 8676129878197783368L; diff --git a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java index e395b6a..6e24ec3 100644 --- a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java +++ b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/internal/WaveformDb.java @@ -16,7 +16,7 @@ import java.io.File; import java.util.ArrayList; import java.util.Collections; import java.util.HashMap; -import java.util.LinkedList; +import java.util.concurrent.CopyOnWriteArrayList; import java.util.List; import java.util.Map; @@ -37,11 +37,11 @@ import com.minres.scviewer.database.RelationType; public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeListener { /** The loaders. */ - private static List loaderFactories = new LinkedList<>(); + private static final CopyOnWriteArrayList loaderFactories = new CopyOnWriteArrayList<>(); private List activeLoader = new ArrayList<>(); /** The loaded. */ - private boolean loaded; + private volatile boolean loaded; /** The relation types. */ private List relationTypes = new ArrayList<>();; @@ -50,7 +50,7 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL private Map waveforms = Collections.synchronizedMap(new HashMap<>()) ;; /** The max time. */ - private long maxTime = 0L; + private volatile long maxTime = 0L; 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 */ 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 */ public static List getLoaders() { - return Collections.unmodifiableList(loaderFactories); + return List.copyOf(loaderFactories); } /** @@ -109,7 +109,7 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL */ @Override public List 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 */ @Override - public boolean load(File inp) { - boolean retval = true; - for (IWaveformDbLoaderFactory loaderFactory : loaderFactories) { - if (loaderFactory.canLoad(inp)) { - IWaveformDbLoader loader = loaderFactory.getLoader(); - loader.addPropertyChangeListener(this); - try { - loader.load(inp); - activeLoader.add(loader); - } catch (Exception e) { - LOG.error("error loading file "+inp.getName(), e); - retval=false; - } - loader.removePropertyChangeListener(this); -// for (IWaveform w : loader.getAllWaves()) { -// waveforms.put(w.getFullName(), w); -// } - if (loader.getMaxTime() > maxTime) { - maxTime = loader.getMaxTime(); - } - if (name == null) - name = getFileBasename(inp.getName()); - //buildHierarchyNodes(); - relationTypes.addAll(loader.getAllRelationTypes()); - } - } - pcs.firePropertyChange(IHierNode.LOADING_FINISHED, null, null); - loaded = true; - return retval; - } + public synchronized boolean load(File inp) { + for (IWaveformDbLoaderFactory factory : getLoaders()) { + if (!factory.canLoad(inp)) continue; + IWaveformDbLoader loader = factory.getLoader(); + List pending = Collections.synchronizedList(new ArrayList<>()); + PropertyChangeListener collector = pending::add; + long endTime; + List types; + loader.addPropertyChangeListener(collector); + try { + loader.load(inp); + endTime = loader.getMaxTime(); + types = new ArrayList<>(loader.getAllRelationTypes()); + } catch (Exception e) { + LOG.error("Error loading file " + inp.getName(), e); + try { loader.dispose(); } + catch (RuntimeException cleanup) { LOG.warn("Cannot dispose failed loader", cleanup); } + continue; + } finally { + loader.removePropertyChangeListener(collector); + } + // Commit only completed loads; failed loaders never publish partial hierarchies. + activeLoader.add(loader); + maxTime = Math.max(maxTime, endTime); + if (name == null) name = getFileBasename(inp.getName()); + for (RelationType type : types) if (!relationTypes.contains(type)) relationTypes.add(type); + synchronized (pending) { + for (PropertyChangeEvent event : pending) propertyChange(event); + } + loaded = true; + pcs.firePropertyChange(IHierNode.LOADING_FINISHED, null, Boolean.TRUE); + return true; + } + pcs.firePropertyChange(IHierNode.LOADING_FINISHED, null, Boolean.FALSE); + return false; + } + + @Override + public synchronized void close() { + for (IWaveformDbLoader loader : activeLoader) { + 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; + } - @Override - public void close() { - for (IWaveformDbLoader entry : activeLoader) { - entry.dispose(); - } - } /** * Gets the file basename. * @@ -163,7 +178,7 @@ public class WaveformDb extends HierNode implements IWaveformDb, PropertyChangeL * @return the file basename */ protected static String getFileBasename(String f) { - String ext = ""; + String ext = f; int i = f.lastIndexOf('.'); if (i > 0 && i < f.length() - 1) { 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.CHILDS, null, childNodes); } 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); } } diff --git a/tests/com.minres.scviewer.database.test/META-INF/MANIFEST.MF b/tests/com.minres.scviewer.database.test/META-INF/MANIFEST.MF index 730155f..fe82568 100644 --- a/tests/com.minres.scviewer.database.test/META-INF/MANIFEST.MF +++ b/tests/com.minres.scviewer.database.test/META-INF/MANIFEST.MF @@ -10,6 +10,7 @@ Require-Bundle: com.minres.scviewer.database, com.minres.scviewer.database.text;bundle-version="1.0.0", com.minres.scviewer.database.vcd;bundle-version="1.0.0", com.minres.scviewer.database.ftr, + com.minres.scviewer.database.fst, org.junit Bundle-ActivationPolicy: lazy Service-Component: OSGI-INF/component.xml diff --git a/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseLifecycleTest.java b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseLifecycleTest.java new file mode 100644 index 0000000..cf2e103 --- /dev/null +++ b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseLifecycleTest.java @@ -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 getAllWaves() { return Collections.emptyList(); } + public Collection 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); } + } +} diff --git a/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java index 8f2bdac..ea4c49f 100644 --- a/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java +++ b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/DatabaseServicesTest.java @@ -41,6 +41,7 @@ public class DatabaseServicesTest { @After public void tearDown() throws Exception { + if (waveformDb != null) waveformDb.close(); } @Test