diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/SignalPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/SignalPainter.java index 613d6d6..91cbbd8 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/SignalPainter.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/SignalPainter.java @@ -106,11 +106,13 @@ public class SignalPainter extends TrackPainter { EventEntry first = signal.getEvents().floorEntry(beginTime); if (first == null) first = signal.getEvents().firstEntry(); + if (first == null) return; beginTime = first.timestamp; proj.setForeground(this.waveCanvas.styleProvider.getColor(WaveformColors.LINE)); proj.setLineStyle(SWT.LINE_SOLID); proj.setLineWidth(1); IEventList entries = signal.getEvents().subMap(beginTime, true, endTime); + if (entries.isEmpty()) return; SignalChange left = new SignalChange(entries.firstEntry()); SignalChange right = new SignalChange(entries.size() > 1 ? entries.higherEntry(left.time) : entries.firstEntry()); maxPosX = area.x + area.width; diff --git a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/StreamPainter.java b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/StreamPainter.java index 851d610..8074549 100644 --- a/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/StreamPainter.java +++ b/plugins/com.minres.scviewer.database.ui.swt/src/com/minres/scviewer/database/ui/swt/internal/StreamPainter.java @@ -10,20 +10,19 @@ *******************************************************************************/ package com.minres.scviewer.database.ui.swt.internal; -import java.util.TreeMap; import org.eclipse.swt.SWT; import org.eclipse.swt.graphics.Color; import org.eclipse.swt.graphics.Point; import org.eclipse.swt.graphics.Rectangle; -import com.minres.scviewer.database.EventEntry; import com.minres.scviewer.database.EventKind; import com.minres.scviewer.database.IEvent; import com.minres.scviewer.database.IEventList; import com.minres.scviewer.database.IWaveform; import com.minres.scviewer.database.tx.ITx; import com.minres.scviewer.database.tx.ITxEvent; +import com.minres.scviewer.database.tx.TxIntervalIndex; import com.minres.scviewer.database.ui.TrackEntry; import com.minres.scviewer.database.ui.WaveformColors; @@ -36,14 +35,14 @@ public class StreamPainter extends TrackPainter{ private IWaveform stream; private int txBase; private int txHeight; - // TODO: remove TreeMap usage - private TreeMap seenTx; + private TxIntervalIndex intervalIndex; + private IEventList indexedEvents; + private int indexedSize = -1; public StreamPainter(WaveformCanvas waveCanvas, boolean even, TrackEntry trackEntry) { super(trackEntry, even); this.waveCanvas = waveCanvas; this.stream=trackEntry.waveform; - this.seenTx=new TreeMap<>(); } public void paintArea(Projection proj, Rectangle area) { @@ -72,11 +71,6 @@ public class StreamPainter extends TrackPainter{ long beginTime = beginPos*scaleFactor; long endTime = beginTime + area.width*scaleFactor; - IEventList events = stream.getEvents(); - EventEntry firstTx = events.floorEntry(beginTime); - EventEntry lastTx = events.ceilingEntry(endTime); - if(firstTx==null) firstTx = events.firstEntry(); - if(lastTx==null) lastTx = events.lastEntry(); proj.setFillRule(SWT.FILL_EVEN_ODD); proj.setLineStyle(SWT.LINE_SOLID); proj.setLineWidth(1); @@ -84,43 +78,29 @@ public class StreamPainter extends TrackPainter{ for( int y1=area.y+trackHeight/2; y1 { - drawTx(proj, area, e.getKey(), e.getValue().getRowIndex(), false); - }); - - if(highlighed!=null){ - proj.setForeground(this.waveCanvas.styleProvider.getColor(WaveformColors.LINE_HIGHLITE)); - drawTx(proj, area, highlighed.getTransaction(), highlighed.getRowIndex(), true); - } - } - } + ITxEvent highlighted = null; + for (ITxEvent event : getIntervalIndex().overlapping(beginTime, endTime)) { + ITx tx = event.getTransaction(); + drawTx(proj, area, tx, event.getRowIndex(), false); + if (waveCanvas.currentSelection != null && waveCanvas.currentSelection.getId() == tx.getId()) + highlighted = event; + } + if (highlighted != null) { + proj.setForeground(waveCanvas.styleProvider.getColor(WaveformColors.LINE_HIGHLITE)); + drawTx(proj, area, highlighted.getTransaction(), highlighted.getRowIndex(), true); + } + } + + private TxIntervalIndex getIntervalIndex() { + stream.getRowCount(); + IEventList events = stream.getEvents(); + if (intervalIndex == null || indexedEvents != events || indexedSize != events.size()) { + intervalIndex = new TxIntervalIndex(events); + indexedEvents = events; + indexedSize = events.size(); + } + return intervalIndex; + } protected void drawTx(Projection proj, Rectangle area, ITx tx, int concurrencyIndex, boolean highlighted ) { // compute colors @@ -156,14 +136,16 @@ public class StreamPainter extends TrackPainter{ public ITx getClicked(Point point) { int lane=point.y/waveCanvas.styleProvider.getTrackHeight(); - EventEntry firstTx=stream.getEvents().floorEntry(point.x*waveCanvas.getScale()); - if(firstTx!=null){ - do { - ITx tx = getTxFromEntry(lane, point.x, firstTx.events); - if(tx!=null) return tx; - firstTx=stream.getEvents().lowerEntry(firstTx.timestamp); - }while(firstTx!=null); - } + long scale = waveCanvas.getScale(); + long time = (long) point.x * scale; + long low = Math.max(0L, (long) point.x - 5) * scale; + long high = ((long) point.x + 5) * scale; + for (ITxEvent event : getIntervalIndex().overlapping(low, high)) { + if (event.getRowIndex() != lane) continue; + ITx tx = event.getTransaction(); + if (event.getKind() == EventKind.SINGLE || + (tx.getBeginTime() <= time && tx.getEndTime() >= time)) return tx; + } return null; } @@ -173,6 +155,8 @@ public class StreamPainter extends TrackPainter{ public void setStream(IWaveform stream) { this.stream = stream; + intervalIndex = null; + indexedEvents = null; } protected ITx getTxFromEntry(int lane, int offset, IEvent[] firstTx) { diff --git a/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/TxIntervalIndex.java b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/TxIntervalIndex.java new file mode 100644 index 0000000..7ede483 --- /dev/null +++ b/plugins/com.minres.scviewer.database/src/com/minres/scviewer/database/tx/TxIntervalIndex.java @@ -0,0 +1,60 @@ +package com.minres.scviewer.database.tx; + +import java.util.ArrayList; +import java.util.List; + +import com.minres.scviewer.database.EventEntry; +import com.minres.scviewer.database.EventKind; +import com.minres.scviewer.database.IEvent; +import com.minres.scviewer.database.IEventList; + +/** Immutable balanced interval index; each transaction is represented by its start event. */ +public final class TxIntervalIndex { + private static final class Node { + final ITxEvent event; + final long begin, end, maxEnd; + final Node left, right; + + Node(List events, int from, int to) { + int mid = (from + to) >>> 1; + event = events.get(mid); + ITx tx = event.getTransaction(); + begin = tx.getBeginTime(); + end = tx.getEndTime(); + left = from < mid ? new Node(events, from, mid) : null; + right = mid + 1 < to ? new Node(events, mid + 1, to) : null; + long max = end; + if (left != null && Long.compareUnsigned(left.maxEnd, max) > 0) max = left.maxEnd; + if (right != null && Long.compareUnsigned(right.maxEnd, max) > 0) max = right.maxEnd; + maxEnd = max; + } + + void overlapping(long from, long to, List result) { + if (Long.compareUnsigned(maxEnd, from) < 0) return; + if (left != null) left.overlapping(from, to, result); + if (Long.compareUnsigned(begin, to) > 0) return; + if (Long.compareUnsigned(end, from) >= 0) result.add(event); + if (right != null) right.overlapping(from, to, result); + } + } + + private final Node root; + + public TxIntervalIndex(IEventList events) { + List starts = new ArrayList<>(); + for (EventEntry entry : events) + for (IEvent event : entry.events) + if (event instanceof ITxEvent && event.getKind() != EventKind.END) + starts.add((ITxEvent) event); + // EventList already orders buckets by timestamp, including same-time starts. + root = starts.isEmpty() ? null : new Node(starts, 0, starts.size()); + } + + /** Inclusive boundaries also include zero-duration transactions. */ + public List overlapping(long from, long to) { + if (Long.compareUnsigned(from, to) > 0) throw new IllegalArgumentException("Reversed time range"); + List result = new ArrayList<>(); + if (root != null) root.overlapping(from, to, result); + return result; + } +} diff --git a/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/TxIntervalIndexTest.java b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/TxIntervalIndexTest.java new file mode 100644 index 0000000..4310d1a --- /dev/null +++ b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/TxIntervalIndexTest.java @@ -0,0 +1,49 @@ +package com.minres.scviewer.database.test; + +import static org.junit.Assert.*; +import java.util.ArrayList; +import java.util.List; +import java.util.Random; +import java.util.stream.Collectors; +import org.junit.Test; +import com.minres.scviewer.database.EventKind; +import com.minres.scviewer.database.EventList; +import com.minres.scviewer.database.tx.TxIntervalIndex; + +public class TxIntervalIndexTest { + @Test + public void spanningViewportAndBoundaries() { + EventList events = new EventList(); + TxTestSupport.Tx longTx = new TxTestSupport.Tx(1, 0, 1000); + TxTestSupport.Event begin = new TxTestSupport.Event(longTx, EventKind.BEGIN); + events.put(0, begin); + events.put(1000, new TxTestSupport.Event(longTx, EventKind.END)); + TxIntervalIndex index = new TxIntervalIndex(events); + assertEquals(java.util.Arrays.asList(begin), index.overlapping(400, 500)); + assertEquals(1, index.overlapping(1000, 1000).size()); + assertTrue(index.overlapping(1001, 1100).isEmpty()); + assertTrue(new TxIntervalIndex(new EventList()).overlapping(0, 1).isEmpty()); + } + + @Test + public void randomizedQueriesMatchFullScan() { + Random random = new Random(42); + List transactions = new ArrayList<>(); + EventList events = new EventList(); + for (int i = 0; i < 500; ++i) { + int begin = random.nextInt(1000), end = begin + random.nextInt(200); + TxTestSupport.Tx tx = new TxTestSupport.Tx(i, begin, end); + transactions.add(tx); + events.put(begin, new TxTestSupport.Event(tx, begin == end ? EventKind.SINGLE : EventKind.BEGIN)); + if (begin != end) events.put(end, new TxTestSupport.Event(tx, EventKind.END)); + } + TxIntervalIndex index = new TxIntervalIndex(events); + for (int i = 0; i < 100; ++i) { + int from = random.nextInt(1200), to = from + random.nextInt(200); + List expected = transactions.stream().filter(t -> t.begin <= to && t.end >= from) + .map(t -> t.id).sorted().collect(Collectors.toList()); + assertEquals(expected, index.overlapping(from, to).stream() + .map(e -> e.getTransaction().getId()).sorted().collect(Collectors.toList())); + } + } +} diff --git a/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/TxTestSupport.java b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/TxTestSupport.java new file mode 100644 index 0000000..2f247cb --- /dev/null +++ b/tests/com.minres.scviewer.database.test/src/com/minres/scviewer/database/test/TxTestSupport.java @@ -0,0 +1,45 @@ +package com.minres.scviewer.database.test; + +import java.util.Collection; +import java.util.Collections; +import java.util.List; + +import com.minres.scviewer.database.EventKind; +import com.minres.scviewer.database.IWaveform; +import com.minres.scviewer.database.WaveformType; +import com.minres.scviewer.database.tx.ITx; +import com.minres.scviewer.database.tx.ITxAttribute; +import com.minres.scviewer.database.tx.ITxEvent; +import com.minres.scviewer.database.tx.ITxRelation; + +final class TxTestSupport { + static class Tx implements ITx { + final long id, begin, end; + Tx(long id, long begin, long end) { this.id = id; this.begin = begin; this.end = end; } + public long getId() { return id; } + public long getBeginTime() { return begin; } + public long getEndTime() { return end; } + public IWaveform getStream() { return null; } + public IWaveform getGenerator() { return null; } + public List getAttributes() { return Collections.emptyList(); } + public Collection getIncomingRelations() { return Collections.emptyList(); } + public Collection getOutgoingRelations() { return Collections.emptyList(); } + public int compareTo(ITx other) { + int c = Long.compare(begin, other.getBeginTime()); + return c != 0 ? c : Long.compare(id, other.getId()); + } + } + + static class Event implements ITxEvent { + final Tx tx; + final EventKind kind; + int row = -1; + Event(Tx tx, EventKind kind) { this.tx = tx; this.kind = kind; } + public long getTime() { return kind == EventKind.END ? tx.end : tx.begin; } + public ITx getTransaction() { return tx; } + public EventKind getKind() { return kind; } + public int getRowIndex() { return row; } + public WaveformType getType() { return WaveformType.TRANSACTION; } + public ITxEvent duplicate() { return new Event(tx, kind); } + } +}