From e78c65a36c2595096b5b3dd1f16cb77f2e7fbe1a Mon Sep 17 00:00:00 2001 From: Eyck Jentzsch Date: Sat, 14 Nov 2026 17:35:53 +0100 Subject: [PATCH] Batch SQLite transaction timestamps and share generator records --- .../database/sqlite/AbstractTxStream.java | 4 +- .../minres/scviewer/database/sqlite/Tx.java | 41 ++++------------- .../scviewer/database/sqlite/TxGenerator.java | 21 +++------ .../scviewer/database/sqlite/TxStream.java | 40 +++++++++++++++- .../database/test/SQLiteBatchTest.java | 46 +++++++++++++++++++ 5 files changed, 102 insertions(+), 50 deletions(-) create mode 100644 tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/SQLiteBatchTest.java diff --git a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/AbstractTxStream.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/AbstractTxStream.java index 9b92b58..d3df3a4 100644 --- a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/AbstractTxStream.java +++ b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/AbstractTxStream.java @@ -111,11 +111,11 @@ abstract class AbstractTxStream extends HierNode implements IWaveform { @Override public IEvent[] getEventsBeforeTime(long time) { - EventEntry e = events.floorEntry(time); + EventEntry e = getEvents().floorEntry(time); if(e==null) return new IEvent[]{}; else - return events.floorEntry(time).events; + return e.events; } @Override diff --git a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/Tx.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/Tx.java index 634818b..c9ed6fe 100644 --- a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/Tx.java +++ b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/Tx.java @@ -17,14 +17,12 @@ import java.util.ArrayList; import java.util.Collection; import java.util.List; -import com.minres.scviewer.database.AssociationType; import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.sqlite.db.IDatabase; import com.minres.scviewer.database.sqlite.db.SQLiteDatabaseSelectHandler; import com.minres.scviewer.database.sqlite.tables.ScvStream; import com.minres.scviewer.database.sqlite.tables.ScvTx; import com.minres.scviewer.database.sqlite.tables.ScvTxAttribute; -import com.minres.scviewer.database.sqlite.tables.ScvTxEvent; import com.minres.scviewer.database.sqlite.tables.ScvTxRelation; import com.minres.scviewer.database.tx.ITx; import com.minres.scviewer.database.tx.ITxAttribute; @@ -37,8 +35,8 @@ public class Tx implements ITx { private TxGenerator trGenerator; private ScvTx scvTx; private List attributes; - private long begin=-1; - private long end=-1; + private final long begin; + private final long end; private List incoming; private List outgoing; @@ -47,6 +45,9 @@ public class Tx implements ITx { this.trStream=trStream; this.trGenerator=trGenerator; this.scvTx=scvTx; + long[] times = trStream.getTransactionTimes(scvTx.getId()); + begin = times[0]; + end = times[1]; } @Override @@ -69,36 +70,10 @@ public class Tx implements ITx { } @Override - public long getBeginTime() { - if(begin<0){ - SQLiteDatabaseSelectHandler handler = new SQLiteDatabaseSelectHandler<>(ScvTxEvent.class, - database, "tx="+scvTx.getId()+" AND type="+ AssociationType.BEGIN.ordinal()); - try { - for(ScvTxEvent scvEvent:handler.selectObjects()){ - begin= scvEvent.getTime()*(Long)database.getData("TIMERESOLUTION"); - } - } catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException - | InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) { - } - } - return begin; - } + public long getBeginTime() { return begin; } - @Override - public long getEndTime() { - if(end<0){ - SQLiteDatabaseSelectHandler handler = new SQLiteDatabaseSelectHandler<>(ScvTxEvent.class, - database, "tx="+scvTx.getId()+" AND type="+ AssociationType.END.ordinal()); - try { - for(ScvTxEvent scvEvent:handler.selectObjects()){ - end = scvEvent.getTime()*(Long)database.getData("TIMERESOLUTION"); - } - } catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException - | InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) { - } - } - return end; - } + @Override + public long getEndTime() { return end; } @Override public List getAttributes() { diff --git a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxGenerator.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxGenerator.java index ab47980..1a0d16f 100644 --- a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxGenerator.java +++ b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxGenerator.java @@ -60,20 +60,13 @@ public class TxGenerator extends AbstractTxStream { } @Override - protected Map getTransactions() { - if(transactions==null){ - transactions = new TreeMap<>(); - SQLiteDatabaseSelectHandler handler = new SQLiteDatabaseSelectHandler<>(ScvTx.class, database, - "stream="+stream.getId()+" and generator="+scvGenerator.getId()); - try { - for(ScvTx scvTx:handler.selectObjects()){ - transactions.put(scvTx.getId(), new Tx(database, (TxStream) stream, this, scvTx)); - } - } catch (SecurityException | IllegalArgumentException | InstantiationException | IllegalAccessException - | InvocationTargetException | SQLException | IntrospectionException | NoSuchMethodException e) { - e.printStackTrace(); - } - } + protected synchronized Map getTransactions() { + if (transactions == null) { + TreeMap loaded = new TreeMap<>(); + for (Map.Entry entry : stream.getTransactions().entrySet()) + if (entry.getValue().getGenerator() == this) loaded.put(entry.getKey(), entry.getValue()); + transactions = loaded; + } return transactions; } diff --git a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java index 65b2ecf..4256baf 100644 --- a/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java +++ b/plugins/com.minres.scviewer.database.sqlite/src/com/minres/scviewer/database/sqlite/TxStream.java @@ -17,6 +17,12 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; import java.util.TreeMap; +import java.util.HashMap; +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import com.minres.scviewer.database.AssociationType; +import com.minres.scviewer.database.LazyValue; import com.minres.scviewer.database.DirectionType; import com.minres.scviewer.database.IEvent; @@ -37,6 +43,38 @@ public class TxStream extends AbstractTxStream { private TreeMap generators; private TreeMap transactions; + private final LazyValue> transactionTimes = new LazyValue<>(); + + long[] getTransactionTimes(int id) { + Map times = transactionTimes.get(() -> { + String sql = "SELECT e.tx, MIN(CASE WHEN e.type=? THEN e.time END) AS beginTime, " + + "MAX(CASE WHEN e.type=? THEN e.time END) AS endTime " + + "FROM ScvTxEvent e JOIN ScvTx t ON t.id=e.tx WHERE t.stream=? GROUP BY e.tx"; + Map loaded = new HashMap<>(); + long scale = ((Number) database.getData("TIMERESOLUTION")).longValue(); + try (Connection connection = database.createConnection(); + PreparedStatement statement = connection.prepareStatement(sql)) { + statement.setInt(1, AssociationType.BEGIN.ordinal()); + statement.setInt(2, AssociationType.END.ordinal()); + statement.setLong(3, getId()); + try (ResultSet rows = statement.executeQuery()) { + while (rows.next()) { + if (rows.getObject("beginTime") == null || rows.getObject("endTime") == null) + throw new SQLException("Missing timestamps for transaction " + rows.getInt("tx")); + loaded.put(rows.getInt("tx"), new long[] { + Math.multiplyExact(rows.getLong("beginTime"), scale), + Math.multiplyExact(rows.getLong("endTime"), scale)}); + } + } + } catch (SQLException e) { + throw new IllegalStateException("Cannot load timestamps for stream " + getFullName(), e); + } + return loaded; + }); + long[] result = times.get(id); + if (result == null) throw new IllegalStateException("Missing timestamps for transaction " + id); + return result; + } public TxStream(IDatabase database, ScvStream scvStream) { super(database, scvStream.getName(), scvStream.getId()); @@ -71,7 +109,7 @@ public class TxStream extends AbstractTxStream { return new ArrayList<>(generators.values()); } - protected Map getTransactions() { + protected synchronized Map getTransactions() { if(transactions==null){ if(generators==null) getGenerators(); transactions = new TreeMap<>(); diff --git a/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/SQLiteBatchTest.java b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/SQLiteBatchTest.java new file mode 100644 index 0000000..076d610 --- /dev/null +++ b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/SQLiteBatchTest.java @@ -0,0 +1,46 @@ +package com.minres.scviewer.database.test; + +import static org.junit.Assert.*; +import java.sql.Connection; +import java.sql.SQLException; +import org.junit.Test; +import com.minres.scviewer.database.EventEntry; +import com.minres.scviewer.database.IEvent; +import com.minres.scviewer.database.IWaveform; +import com.minres.scviewer.database.sqlite.TxStream; +import com.minres.scviewer.database.sqlite.db.SQLiteDatabase; +import com.minres.scviewer.database.sqlite.tables.ScvStream; +import com.minres.scviewer.database.tx.ITx; +import com.minres.scviewer.database.tx.ITxEvent; + +public class SQLiteBatchTest { + private static class Database extends SQLiteDatabase { + int connections; + Database() { super(TxTestSupport.input("my_sqldb.txdb").getAbsolutePath()); setData("TIMERESOLUTION", 1000L); } + @Override public Connection createConnection() throws SQLException { connections++;return super.createConnection(); } + } + + @Test + public void loadsAllTimesInOneQueryAndSharesGeneratorTransactions() { + Database database = new Database(); + ScvStream row = new ScvStream();row.setId(1);row.setName("test");row.setKind("test"); + TxStream stream = new TxStream(database, row); + assertNotNull(stream.getEventsBeforeTime(0)); + assertEquals(26, stream.getEvents().size()); + // One query each for generators, transaction records, and all timestamps. + assertEquals(3, database.connections); + int count = database.connections; + ITx first = ((ITxEvent)stream.getEventsAtTime(0)[0]).getTransaction(); + assertEquals(0, first.getBeginTime()); + assertEquals(420000000, first.getEndTime()); + for (EventEntry entry : stream.getEvents()) for (IEvent event : entry.events) { + ITx tx = ((ITxEvent)event).getTransaction(); + assertTrue(tx.getEndTime() >= tx.getBeginTime()); + } + for (IWaveform generator : stream.getGenerators()) + for (EventEntry entry : generator.getEvents()) for (IEvent event : entry.events) + if (((ITxEvent)event).getTransaction().getId() == first.getId()) + assertSame(first, ((ITxEvent)event).getTransaction()); + assertEquals(count, database.connections); + } +}