diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/DBTraceUtils.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/DBTraceUtils.java index 3ccd8c530a..d04cf6a40f 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/DBTraceUtils.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/DBTraceUtils.java @@ -100,13 +100,13 @@ public enum DBTraceUtils { } @Override - protected void doStore(OT obj, Record record) + protected void doStore(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { record.setString(column, encode(getValue(obj))); } @Override - protected void doLoad(OT obj, Record record) + protected void doLoad(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { try { String data = record.getString(column); @@ -148,13 +148,13 @@ public enum DBTraceUtils { } @Override - protected void doStore(OT obj, Record record) + protected void doStore(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { record.setBinaryData(column, encode(getValue(obj))); } @Override - protected void doLoad(OT obj, Record record) + protected void doLoad(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { byte[] data = record.getBinaryData(column); if (data == null) { @@ -182,7 +182,7 @@ public enum DBTraceUtils { } @Override - protected void doStore(OT obj, Record record) + protected void doStore(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { LanguageID id = getValue(obj); if (id == null) { @@ -194,7 +194,7 @@ public enum DBTraceUtils { } @Override - protected void doLoad(OT obj, Record record) + protected void doLoad(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { String id = record.getString(column); if (id == null) { @@ -214,7 +214,7 @@ public enum DBTraceUtils { } @Override - protected void doStore(OT obj, Record record) + protected void doStore(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { OffsetSnap value = getValue(obj); if (value == null) { @@ -236,7 +236,7 @@ public enum DBTraceUtils { } @Override - protected void doLoad(OT obj, Record record) + protected void doLoad(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { byte[] data = record.getBinaryData(column); if (data == null) { @@ -304,13 +304,13 @@ public enum DBTraceUtils { } @Override - protected void doStore(OT obj, Record record) + protected void doStore(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { record.setByteValue(column, encode(getValue(obj))); } @Override - protected void doLoad(OT obj, Record record) + protected void doLoad(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { setValue(obj, decode(record.getByteValue(column))); } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/bookmark/DBTraceBookmark.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/bookmark/DBTraceBookmark.java index 301417c52f..aec3fb4c72 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/bookmark/DBTraceBookmark.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/bookmark/DBTraceBookmark.java @@ -17,7 +17,7 @@ package ghidra.trace.database.bookmark; import com.google.common.collect.Range; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.Address; import ghidra.program.model.address.AddressSpace; import ghidra.program.model.listing.Bookmark; @@ -66,7 +66,7 @@ public class DBTraceBookmark extends AbstractDBTraceAddressSnapRangePropertyMapD public DBTraceBookmark(DBTraceBookmarkSpace space, DBTraceAddressSnapRangePropertyMapTree tree, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(tree, store, record); this.space = space; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/breakpoint/DBTraceBreakpoint.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/breakpoint/DBTraceBreakpoint.java index fac2cd1f59..fed07b8555 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/breakpoint/DBTraceBreakpoint.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/breakpoint/DBTraceBreakpoint.java @@ -20,7 +20,7 @@ import java.util.*; import com.google.common.collect.Range; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.*; import ghidra.trace.database.DBTrace; import ghidra.trace.database.DBTraceUtils; @@ -88,7 +88,7 @@ public class DBTraceBreakpoint public DBTraceBreakpoint(DBTraceBreakpointSpace space, DBTraceAddressSnapRangePropertyMapTree tree, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(tree, store, record); this.space = space; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/context/DBTraceRegisterContextManager.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/context/DBTraceRegisterContextManager.java index 1a46630573..630ac47ead 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/context/DBTraceRegisterContextManager.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/context/DBTraceRegisterContextManager.java @@ -25,7 +25,7 @@ import java.util.concurrent.locks.ReadWriteLock; import com.google.common.collect.Range; import db.DBHandle; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.*; import ghidra.program.model.lang.*; import ghidra.program.model.listing.ProgramContext; @@ -64,7 +64,7 @@ public class DBTraceRegisterContextManager extends private byte[] value; public DBTraceRegisterContextEntry(DBTraceAddressSnapRangePropertyMapTree tree, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(tree, store, record); } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/context/DBTraceRegisterContextSpace.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/context/DBTraceRegisterContextSpace.java index b912e3e01d..8a04f63ce7 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/context/DBTraceRegisterContextSpace.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/context/DBTraceRegisterContextSpace.java @@ -26,7 +26,7 @@ import org.apache.commons.lang3.tuple.Pair; import com.google.common.collect.Range; import db.DBHandle; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.*; import ghidra.program.model.lang.*; import ghidra.trace.database.DBTrace; @@ -66,7 +66,7 @@ public class DBTraceRegisterContextSpace implements TraceRegisterContextSpace, D private DBTraceAddressSnapRangePropertyMapSpace map; - public DBTraceRegisterEntry(DBCachedObjectStore store, Record record) { + public DBTraceRegisterEntry(DBCachedObjectStore store, DBRecord record) { super(store, record); } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/data/DBTraceDataSettingsAdapter.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/data/DBTraceDataSettingsAdapter.java index a243e37aee..f78c2ef86c 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/data/DBTraceDataSettingsAdapter.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/data/DBTraceDataSettingsAdapter.java @@ -21,7 +21,7 @@ import java.util.concurrent.locks.ReadWriteLock; import com.google.common.collect.Range; import db.DBHandle; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.AddressSpace; import ghidra.program.model.lang.Language; import ghidra.trace.database.DBTrace; @@ -71,7 +71,7 @@ public class DBTraceDataSettingsAdapter public DBTraceSettingsEntry( DBTraceAddressSnapRangePropertyMapTree tree, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(tree, store, record); } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/language/DBTraceGuestLanguage.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/language/DBTraceGuestLanguage.java index 0830e47e45..70ee216a31 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/language/DBTraceGuestLanguage.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/language/DBTraceGuestLanguage.java @@ -20,7 +20,7 @@ import java.util.Map.Entry; import com.google.common.collect.Range; -import db.Record; +import db.DBRecord; import ghidra.app.util.PseudoInstruction; import ghidra.program.model.address.*; import ghidra.program.model.lang.*; @@ -71,7 +71,7 @@ public class DBTraceGuestLanguage extends DBAnnotatedObject implements TraceGues protected final AddressSet guestAddressSet = new AddressSet(); public DBTraceGuestLanguage(DBTraceLanguageManager manager, DBCachedObjectStore store, - Record record) { + DBRecord record) { super(store, record); this.manager = manager; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/language/DBTraceGuestLanguageMappedRange.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/language/DBTraceGuestLanguageMappedRange.java index 4d6473ce4e..2386b499c4 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/language/DBTraceGuestLanguageMappedRange.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/language/DBTraceGuestLanguageMappedRange.java @@ -17,7 +17,7 @@ package ghidra.trace.database.language; import java.io.IOException; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.*; import ghidra.program.model.lang.Language; import ghidra.trace.model.language.TraceGuestLanguageMappedRange; @@ -71,7 +71,7 @@ public class DBTraceGuestLanguageMappedRange extends DBAnnotatedObject private AddressRangeImpl guestRange; public DBTraceGuestLanguageMappedRange(DBTraceLanguageManager manager, DBCachedObjectStore s, - Record r) { + DBRecord r) { super(s, r); this.manager = manager; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/AbstractDBTraceCodeUnit.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/AbstractDBTraceCodeUnit.java index 13d4dcf66c..402567a424 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/AbstractDBTraceCodeUnit.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/AbstractDBTraceCodeUnit.java @@ -17,7 +17,7 @@ package ghidra.trace.database.listing; import java.nio.ByteBuffer; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.Address; import ghidra.trace.database.DBTrace; import ghidra.trace.database.DBTraceUtils; @@ -37,7 +37,7 @@ public abstract class AbstractDBTraceCodeUnit tree, DBCachedObjectStore store, - Record record) { + DBRecord record) { super(tree, store, record); this.space = space; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceCodeManager.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceCodeManager.java index c46c8c7fd1..d0613d5c66 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceCodeManager.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceCodeManager.java @@ -28,7 +28,7 @@ import com.google.common.cache.RemovalNotification; import com.google.common.collect.*; import db.DBHandle; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.*; import ghidra.program.model.lang.*; import ghidra.program.model.listing.ContextChangeException; @@ -101,7 +101,7 @@ public class DBTraceCodeManager private DBTraceCodeManager manager; public DBTraceCodePrototypeEntry(DBTraceCodeManager manager, DBCachedObjectStore store, - Record record) { + DBRecord record) { super(store, record); this.manager = manager; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceCommentAdapter.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceCommentAdapter.java index 20906f1267..352e529aed 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceCommentAdapter.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceCommentAdapter.java @@ -23,7 +23,7 @@ import org.apache.commons.lang3.StringUtils; import com.google.common.collect.Range; import db.DBHandle; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.*; import ghidra.program.model.lang.Language; import ghidra.program.model.listing.CodeUnit; @@ -66,7 +66,7 @@ public class DBTraceCommentAdapter public DBTraceCommentEntry( DBTraceAddressSnapRangePropertyMapTree tree, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(tree, store, record); } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceData.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceData.java index d1f22f6693..5befc1650b 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceData.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceData.java @@ -19,7 +19,7 @@ import java.io.IOException; import com.google.common.collect.Range; -import db.Record; +import db.DBRecord; import ghidra.docking.settings.Settings; import ghidra.program.model.address.AddressSpace; import ghidra.program.model.data.*; @@ -65,7 +65,7 @@ public class DBTraceData extends AbstractDBTraceCodeUnit public DBTraceData(DBTraceCodeSpace space, DBTraceAddressSnapRangePropertyMapTree tree, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(space, tree, store, record); } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceInstruction.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceInstruction.java index e8d27be1d8..d1041f0621 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceInstruction.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/listing/DBTraceInstruction.java @@ -21,7 +21,7 @@ import java.util.*; import com.google.common.collect.Range; -import db.Record; +import db.DBRecord; import ghidra.lifecycle.Unfinished; import ghidra.program.model.address.*; import ghidra.program.model.lang.*; @@ -115,7 +115,7 @@ public class DBTraceInstruction extends AbstractDBTraceCodeUnit tree, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(space, tree, store, record); } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/map/AbstractDBTracePropertyMap.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/map/AbstractDBTracePropertyMap.java index e9dfecf711..4470b41809 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/map/AbstractDBTracePropertyMap.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/map/AbstractDBTracePropertyMap.java @@ -126,7 +126,7 @@ public abstract class AbstractDBTracePropertyMap tree, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(tree, store, record); } @@ -171,7 +171,7 @@ public abstract class AbstractDBTracePropertyMap tree, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(tree, store, record); } @@ -229,7 +229,7 @@ public abstract class AbstractDBTracePropertyMap valueClass; public DBTraceSaveablePropertyMapEntry(DBTraceAddressSnapRangePropertyMapTree tree, - DBCachedObjectStore store, Record record, Class valueClass) { + DBCachedObjectStore store, DBRecord record, Class valueClass) { super(tree, store, record); this.valueClass = valueClass; } @@ -277,13 +277,13 @@ public abstract class AbstractDBTracePropertyMap obj, Record record) + protected void doStore(DBTraceSaveablePropertyMapEntry obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { record.setBinaryData(column, encode(getValue(obj))); } @Override - protected void doLoad(DBTraceSaveablePropertyMapEntry obj, Record record) + protected void doLoad(DBTraceSaveablePropertyMapEntry obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { byte[] enc = record.getBinaryData(column); if (enc == null) { @@ -340,7 +340,7 @@ public abstract class AbstractDBTracePropertyMap tree, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(tree, store, record); } @@ -378,7 +378,7 @@ public abstract class AbstractDBTracePropertyMap { public DBTraceVoidPropertyMapEntry(DBTraceAddressSnapRangePropertyMapTree tree, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(tree, store, record); } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/map/DBTraceAddressSnapRangePropertyMap.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/map/DBTraceAddressSnapRangePropertyMap.java index e5b15b9c8c..a1470273c5 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/map/DBTraceAddressSnapRangePropertyMap.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/map/DBTraceAddressSnapRangePropertyMap.java @@ -26,7 +26,7 @@ import com.google.common.collect.Collections2; import com.google.common.collect.Range; import db.DBHandle; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.AddressSetView; import ghidra.program.model.address.AddressSpace; import ghidra.program.model.lang.Language; @@ -56,7 +56,7 @@ public class DBTraceAddressSnapRangePropertyMap> { DR create(DBTraceAddressSnapRangePropertyMapTree tree, DBCachedObjectStore store, - Record record); + DBRecord record); } protected final Class dataType; diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/map/DBTraceAddressSnapRangePropertyMapTree.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/map/DBTraceAddressSnapRangePropertyMapTree.java index 06a861a0ba..11bf36a012 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/map/DBTraceAddressSnapRangePropertyMapTree.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/map/DBTraceAddressSnapRangePropertyMapTree.java @@ -20,7 +20,7 @@ import java.util.*; import com.google.common.collect.Range; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.*; import ghidra.trace.database.DBTraceUtils; import ghidra.trace.database.map.DBTraceAddressSnapRangePropertyMap.DBTraceAddressSnapRangePropertyMapDataFactory; @@ -99,7 +99,7 @@ public class DBTraceAddressSnapRangePropertyMapTree tree, DBCachedObjectStore store, - Record record) { + DBRecord record) { super(store, record); this.tree = tree; } @@ -242,7 +242,7 @@ public class DBTraceAddressSnapRangePropertyMapTree tree, DBCachedObjectStore store, - Record record) { + DBRecord record) { super(store, record); this.tree = tree; } @@ -561,13 +561,13 @@ public class DBTraceAddressSnapRangePropertyMapTree store, Record record) { + protected DR createDataEntry(DBCachedObjectStore store, DBRecord record) { return dataFactory.create(this, store, record); } @Override protected DBTraceAddressSnapRangePropertyMapNode createNodeEntry( - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { return new DBTraceAddressSnapRangePropertyMapNode(this, store, record); } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemoryBlockEntry.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemoryBlockEntry.java index 0be8ef6faa..a99deab039 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemoryBlockEntry.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemoryBlockEntry.java @@ -18,7 +18,7 @@ package ghidra.trace.database.memory; import java.io.IOException; import java.nio.ByteBuffer; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.AddressSpace; import ghidra.trace.database.DBTraceUtils; import ghidra.trace.database.DBTraceUtils.OffsetSnap; @@ -55,7 +55,7 @@ class DBTraceMemoryBlockEntry extends DBAnnotatedObject { private final DBTraceMemorySpace space; public DBTraceMemoryBlockEntry(DBTraceMemorySpace space, DBCachedObjectStore store, - Record record) { + DBRecord record) { super(store, record); this.space = space; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemoryBufferEntry.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemoryBufferEntry.java index 1e686442d6..5384850c77 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemoryBufferEntry.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemoryBufferEntry.java @@ -56,7 +56,7 @@ public class DBTraceMemoryBufferEntry extends DBAnnotatedObject { private DBBuffer buffer; - public DBTraceMemoryBufferEntry(DBHandle dbh, DBCachedObjectStore store, Record record) { + public DBTraceMemoryBufferEntry(DBHandle dbh, DBCachedObjectStore store, DBRecord record) { super(store, record); this.dbh = dbh; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemoryRegion.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemoryRegion.java index 93951f9e3f..9662e2cba4 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemoryRegion.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemoryRegion.java @@ -20,7 +20,7 @@ import java.util.*; import com.google.common.collect.Range; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.*; import ghidra.trace.database.DBTrace; import ghidra.trace.database.DBTraceUtils; @@ -69,7 +69,7 @@ public class DBTraceMemoryRegion public DBTraceMemoryRegion(DBTraceMemorySpace space, DBTraceAddressSnapRangePropertyMapTree tree, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(tree, store, record); this.space = space; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemoryStateEntry.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemoryStateEntry.java index 9f90b4433d..3852dc0653 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemoryStateEntry.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/memory/DBTraceMemoryStateEntry.java @@ -17,7 +17,7 @@ package ghidra.trace.database.memory; import javax.help.UnsupportedOperationException; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.AddressSpace; import ghidra.trace.database.DBTraceUtils; import ghidra.trace.database.map.DBTraceAddressSnapRangePropertyMapTree; @@ -48,7 +48,7 @@ class DBTraceMemoryStateEntry private TraceMemoryState state; public DBTraceMemoryStateEntry(DBTraceAddressSnapRangePropertyMapTree tree, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(tree, store, record); } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/module/DBTraceModule.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/module/DBTraceModule.java index 5377812684..a2831dd9d2 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/module/DBTraceModule.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/module/DBTraceModule.java @@ -19,7 +19,7 @@ import java.util.*; import com.google.common.collect.Range; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.*; import ghidra.trace.database.DBTrace; import ghidra.trace.database.DBTraceUtils; @@ -61,7 +61,7 @@ public class DBTraceModule extends AbstractDBTraceAddressSnapRangePropertyMapDat public DBTraceModule(DBTraceModuleSpace space, DBTraceAddressSnapRangePropertyMapTree tree, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(tree, store, record); this.space = space; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/module/DBTraceSection.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/module/DBTraceSection.java index bea88fbfa4..1ae2528960 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/module/DBTraceSection.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/module/DBTraceSection.java @@ -20,7 +20,7 @@ import java.util.Objects; import com.google.common.collect.Range; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.AddressSpace; import ghidra.trace.database.DBTraceUtils; import ghidra.trace.database.map.DBTraceAddressSnapRangePropertyMapTree; @@ -68,7 +68,7 @@ public class DBTraceSection extends AbstractDBTraceAddressSnapRangePropertyMapDa public DBTraceSection(DBTraceModuleSpace space, DBTraceAddressSnapRangePropertyMapTree tree, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(tree, store, record); this.space = space; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/module/DBTraceStaticMapping.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/module/DBTraceStaticMapping.java index dcafe7c3d4..023fcd1222 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/module/DBTraceStaticMapping.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/module/DBTraceStaticMapping.java @@ -21,7 +21,7 @@ import java.util.Objects; import com.google.common.collect.Range; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.*; import ghidra.trace.database.DBTraceUtils; import ghidra.trace.database.DBTraceUtils.*; @@ -93,7 +93,7 @@ public class DBTraceStaticMapping extends DBAnnotatedObject private Range lifespan; public DBTraceStaticMapping(DBTraceStaticMappingManager manager, DBCachedObjectStore store, - Record record) { + DBRecord record) { super(store, record); this.manager = manager; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/property/DBTraceAddressPropertyManager.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/property/DBTraceAddressPropertyManager.java index 3c4defcdb0..a0dbd43957 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/property/DBTraceAddressPropertyManager.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/property/DBTraceAddressPropertyManager.java @@ -20,7 +20,7 @@ import java.util.*; import java.util.concurrent.locks.ReadWriteLock; import db.DBHandle; -import db.Record; +import db.DBRecord; import ghidra.program.model.lang.Language; import ghidra.program.model.listing.ProgramUserData; import ghidra.program.model.util.TypeMismatchException; @@ -66,7 +66,7 @@ public class DBTraceAddressPropertyManager implements TraceAddressPropertyManage AbstractDBTracePropertyMap map; - public DBTraceAddressPropertyEntry(DBCachedObjectStore store, Record record) { + public DBTraceAddressPropertyEntry(DBCachedObjectStore store, DBRecord record) { super(store, record); } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/space/AbstractDBTraceSpaceBasedManager.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/space/AbstractDBTraceSpaceBasedManager.java index fff4ea9633..4d3e652a20 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/space/AbstractDBTraceSpaceBasedManager.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/space/AbstractDBTraceSpaceBasedManager.java @@ -23,7 +23,7 @@ import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; import db.DBHandle; -import db.Record; +import db.DBRecord; import generic.CatenatedCollection; import ghidra.program.model.address.AddressFactory; import ghidra.program.model.address.AddressSpace; @@ -63,7 +63,7 @@ public abstract class AbstractDBTraceSpaceBasedManager store, Record record) { + public DBTraceSpaceEntry(DBCachedObjectStore store, DBRecord record) { super(store, record); } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/stack/DBTraceStack.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/stack/DBTraceStack.java index 199691500e..fd5a9afabf 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/stack/DBTraceStack.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/stack/DBTraceStack.java @@ -21,7 +21,7 @@ import java.nio.ByteBuffer; import java.util.*; import db.BinaryField; -import db.Record; +import db.DBRecord; import ghidra.trace.database.thread.DBTraceThread; import ghidra.trace.model.Trace.TraceStackChangeType; import ghidra.trace.model.stack.TraceStack; @@ -87,13 +87,13 @@ public class DBTraceStack extends DBAnnotatedObject implements TraceStack { } @Override - protected void doStore(DBAnnotatedObject obj, Record record) + protected void doStore(DBAnnotatedObject obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { record.setBinaryData(column, encode(getValue(obj))); } @Override - protected void doLoad(DBAnnotatedObject obj, Record record) + protected void doLoad(DBAnnotatedObject obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { setValue(obj, decode(record.getBinaryData(column))); } @@ -109,7 +109,7 @@ public class DBTraceStack extends DBAnnotatedObject implements TraceStack { private DBTraceThread thread; private final List frames = new ArrayList<>(); - public DBTraceStack(DBTraceStackManager manager, DBCachedObjectStore store, Record record) { + public DBTraceStack(DBTraceStackManager manager, DBCachedObjectStore store, DBRecord record) { super(store, record); this.manager = manager; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/stack/DBTraceStackFrame.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/stack/DBTraceStackFrame.java index bc5c733ba4..75eb549233 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/stack/DBTraceStackFrame.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/stack/DBTraceStackFrame.java @@ -18,7 +18,7 @@ package ghidra.trace.database.stack; import java.io.IOException; import java.util.Objects; -import db.Record; +import db.DBRecord; import ghidra.lifecycle.Internal; import ghidra.program.model.address.Address; import ghidra.trace.database.DBTraceUtils.AddressDBFieldCodec; @@ -63,7 +63,7 @@ public class DBTraceStackFrame extends DBAnnotatedObject private DBTraceStack stack; public DBTraceStackFrame(DBTraceStackManager manager, DBCachedObjectStore store, - Record record) { + DBRecord record) { super(store, record); this.manager = manager; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/AbstractDBTraceSymbol.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/AbstractDBTraceSymbol.java index d25742cc87..598acbcbe7 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/AbstractDBTraceSymbol.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/AbstractDBTraceSymbol.java @@ -25,7 +25,7 @@ import org.apache.commons.lang3.tuple.Pair; import com.google.common.collect.Collections2; import com.google.common.collect.Range; -import db.Record; +import db.DBRecord; import generic.CatenatedCollection; import ghidra.program.model.address.*; import ghidra.program.model.listing.CircularDependencyException; @@ -85,7 +85,7 @@ public abstract class AbstractDBTraceSymbol extends DBAnnotatedObject protected final DBTraceSymbolManager manager; public AbstractDBTraceSymbol(DBTraceSymbolManager manager, DBCachedObjectStore store, - Record record) { + DBRecord record) { super(store, record); this.manager = manager; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/AbstractDBTraceVariableSymbol.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/AbstractDBTraceVariableSymbol.java index 0fb703b22d..61ae964733 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/AbstractDBTraceVariableSymbol.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/AbstractDBTraceVariableSymbol.java @@ -19,7 +19,7 @@ import java.io.IOException; import java.util.List; import java.util.Objects; -import db.Record; +import db.DBRecord; import ghidra.program.database.data.DataTypeUtilities; import ghidra.program.model.address.Address; import ghidra.program.model.address.AddressSpace; @@ -72,7 +72,7 @@ public abstract class AbstractDBTraceVariableSymbol extends AbstractDBTraceSymbo protected Address address; public AbstractDBTraceVariableSymbol(DBTraceSymbolManager manager, DBCachedObjectStore store, - Record record) { + DBRecord record) { super(manager, store, record); } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceClassSymbol.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceClassSymbol.java index df551bcb7f..3b7fa60cd1 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceClassSymbol.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceClassSymbol.java @@ -15,7 +15,7 @@ */ package ghidra.trace.database.symbol; -import db.Record; +import db.DBRecord; import ghidra.program.model.symbol.SymbolType; import ghidra.trace.model.symbol.TraceClassSymbol; import ghidra.util.database.DBCachedObjectStore; @@ -29,7 +29,7 @@ public class DBTraceClassSymbol extends DBTraceNamespaceSymbol implements TraceC // TODO: Emit lifespan change events public DBTraceClassSymbol(DBTraceSymbolManager manager, DBCachedObjectStore store, - Record record) { + DBRecord record) { super(manager, store, record); } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceEquate.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceEquate.java index 2081f71ad3..a400fe9ff1 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceEquate.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceEquate.java @@ -19,7 +19,7 @@ import java.util.Collection; import com.google.common.collect.Range; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.Address; import ghidra.program.model.data.Enum; import ghidra.program.model.pcode.Varnode; @@ -49,7 +49,7 @@ public class DBTraceEquate extends DBAnnotatedObject implements TraceEquate { protected final DBTraceEquateManager manager; public DBTraceEquate(DBTraceEquateManager manager, DBCachedObjectStore store, - Record record) { + DBRecord record) { super(store, record); this.manager = manager; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceEquateSpace.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceEquateSpace.java index ba4a26916b..05738f4afb 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceEquateSpace.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceEquateSpace.java @@ -23,7 +23,7 @@ import com.google.common.collect.Collections2; import com.google.common.collect.Range; import db.DBHandle; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.*; import ghidra.program.model.lang.Language; import ghidra.trace.database.DBTrace; @@ -78,7 +78,7 @@ public class DBTraceEquateSpace implements DBTraceSpaceBased, TraceEquateSpace { public DBTraceEquateReference(DBTraceEquateSpace space, DBTraceAddressSnapRangePropertyMapTree tree, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(tree, store, record); this.space = space; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceFunctionSymbol.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceFunctionSymbol.java index d0c304d558..92e8d4953b 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceFunctionSymbol.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceFunctionSymbol.java @@ -24,7 +24,7 @@ import org.apache.commons.lang3.tuple.Pair; import com.google.common.collect.Collections2; import com.google.common.collect.Range; -import db.Record; +import db.DBRecord; import ghidra.program.database.function.OverlappingFunctionException; import ghidra.program.model.address.*; import ghidra.program.model.data.*; @@ -136,7 +136,7 @@ public class DBTraceFunctionSymbol extends DBTraceNamespaceSymbol protected boolean foundBadVariables = false; public DBTraceFunctionSymbol(DBTraceSymbolManager manager, DBCachedObjectStore store, - Record record) { + DBRecord record) { super(manager, store, record); this.frame = new DBTraceFunctionStackFrame(this); } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceGlobalVariableSymbol.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceGlobalVariableSymbol.java index fb7b83c32f..dc5d9a7d12 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceGlobalVariableSymbol.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceGlobalVariableSymbol.java @@ -15,7 +15,7 @@ */ package ghidra.trace.database.symbol; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.Address; import ghidra.program.model.symbol.SymbolType; import ghidra.trace.model.symbol.TraceGlobalVariableSymbol; @@ -28,7 +28,7 @@ public class DBTraceGlobalVariableSymbol extends AbstractDBTraceVariableSymbol static final String TABLE_NAME = "GlobalVars"; public DBTraceGlobalVariableSymbol(DBTraceSymbolManager manager, DBCachedObjectStore store, - Record record) { + DBRecord record) { super(manager, store, record); } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceLabelSymbol.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceLabelSymbol.java index dacb7dc0e7..c9db472cd4 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceLabelSymbol.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceLabelSymbol.java @@ -19,7 +19,7 @@ import java.io.IOException; import com.google.common.collect.Range; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.*; import ghidra.program.model.symbol.SourceType; import ghidra.program.model.symbol.SymbolType; @@ -74,7 +74,7 @@ public class DBTraceLabelSymbol extends AbstractDBTraceSymbol protected Range lifespan; public DBTraceLabelSymbol(DBTraceSymbolManager manager, DBCachedObjectStore store, - Record record) { + DBRecord record) { super(manager, store, record); } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceLocalVariableSymbol.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceLocalVariableSymbol.java index 17d9a8398a..1cb3f09f17 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceLocalVariableSymbol.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceLocalVariableSymbol.java @@ -15,7 +15,7 @@ */ package ghidra.trace.database.symbol; -import db.Record; +import db.DBRecord; import ghidra.program.model.data.DataType; import ghidra.program.model.listing.VariableStorage; import ghidra.program.model.symbol.SourceType; @@ -42,7 +42,7 @@ public class DBTraceLocalVariableSymbol extends AbstractDBTraceVariableSymbol int firstUseOffset; public DBTraceLocalVariableSymbol(DBTraceSymbolManager manager, DBCachedObjectStore store, - Record record) { + DBRecord record) { super(manager, store, record); } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceNamespaceSymbol.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceNamespaceSymbol.java index 90f81e282d..dd6593a6bf 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceNamespaceSymbol.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceNamespaceSymbol.java @@ -20,7 +20,7 @@ import java.util.Collection; import com.google.common.collect.Range; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.AddressSet; import ghidra.program.model.address.AddressSetView; import ghidra.program.model.listing.CircularDependencyException; @@ -39,7 +39,7 @@ public class DBTraceNamespaceSymbol extends AbstractDBTraceSymbol implements Tra protected final AddressSet allAddresses; public DBTraceNamespaceSymbol(DBTraceSymbolManager manager, DBCachedObjectStore store, - Record record) { + DBRecord record) { super(manager, store, record); allAddresses = manager.trace.getBaseAddressFactory().getAddressSet(); } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceParameterSymbol.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceParameterSymbol.java index b22b6c179d..5249956120 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceParameterSymbol.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceParameterSymbol.java @@ -18,7 +18,7 @@ package ghidra.trace.database.symbol; import org.apache.commons.lang3.tuple.ImmutablePair; import org.apache.commons.lang3.tuple.Pair; -import db.Record; +import db.DBRecord; import ghidra.program.model.data.DataType; import ghidra.program.model.listing.*; import ghidra.program.model.symbol.*; @@ -49,7 +49,7 @@ public class DBTraceParameterSymbol extends AbstractDBTraceVariableSymbol protected VariableStorage dynamicStorage = VariableStorage.UNASSIGNED_STORAGE; public DBTraceParameterSymbol(DBTraceSymbolManager manager, DBCachedObjectStore store, - Record record) { + DBRecord record) { super(manager, store, record); } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceReferenceSpace.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceReferenceSpace.java index 810242086c..a430e0a1db 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceReferenceSpace.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceReferenceSpace.java @@ -23,7 +23,7 @@ import com.google.common.collect.Collections2; import com.google.common.collect.Range; import db.DBHandle; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.*; import ghidra.program.model.lang.Language; import ghidra.program.model.lang.Register; @@ -140,7 +140,7 @@ public class DBTraceReferenceSpace implements DBTraceSpaceBased, TraceReferenceS public DBTraceReferenceEntry(DBTraceReferenceSpace space, DBTraceAddressSnapRangePropertyMapTree tree, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(tree, store, record); this.space = space; } @@ -280,7 +280,7 @@ public class DBTraceReferenceSpace implements DBTraceSpaceBased, TraceReferenceS public DBTraceXRefEntry(DBTraceReferenceSpace space, DBTraceAddressSnapRangePropertyMapTree tree, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(tree, store, record); this.space = space; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceSymbolManager.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceSymbolManager.java index 2ece26b527..52ce570958 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceSymbolManager.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/symbol/DBTraceSymbolManager.java @@ -81,7 +81,7 @@ public class DBTraceSymbolManager implements TraceSymbolManager, DBTraceManager long symbolID; public DBTraceSymbolIDEntry(DBTraceAddressSnapRangePropertyMapTree tree, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(tree, store, record); } @@ -110,7 +110,7 @@ public class DBTraceSymbolManager implements TraceSymbolManager, DBTraceManager @DBAnnotatedField(column = NAME_COLUMN_NAME) String name; - public DBTraceCallingConventionEntry(DBCachedObjectStore store, Record record) { + public DBTraceCallingConventionEntry(DBCachedObjectStore store, DBRecord record) { super(store, record); } @@ -145,7 +145,7 @@ public class DBTraceSymbolManager implements TraceSymbolManager, DBTraceManager protected final DBTraceSymbolManager manager; public DBTraceFunctionTag(DBTraceSymbolManager manager, DBCachedObjectStore store, - Record record) { + DBRecord record) { super(store, record); this.manager = manager; } @@ -263,7 +263,7 @@ public class DBTraceSymbolManager implements TraceSymbolManager, DBTraceManager @DBAnnotatedField(column = TAG_COLUMN_NAME, indexed = true) private long tagKey; - public DBTraceFunctionTagMapping(DBCachedObjectStore store, Record record) { + public DBTraceFunctionTagMapping(DBCachedObjectStore store, DBRecord record) { super(store, record); } @@ -296,14 +296,14 @@ public class DBTraceSymbolManager implements TraceSymbolManager, DBTraceManager } @Override - protected void doStore(DBTraceVariableStorageEntry obj, Record record) + protected void doStore(DBTraceVariableStorageEntry obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { VariableStorage value = getValue(obj); record.setString(column, value == null ? null : value.getSerializationString()); } @Override - protected void doLoad(DBTraceVariableStorageEntry obj, Record record) + protected void doLoad(DBTraceVariableStorageEntry obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { String serial = record.getString(column); try { @@ -332,7 +332,7 @@ public class DBTraceSymbolManager implements TraceSymbolManager, DBTraceManager protected final DBTraceSymbolManager manager; public DBTraceVariableStorageEntry(DBTraceSymbolManager manager, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(store, record); this.manager = manager; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/thread/DBTraceThread.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/thread/DBTraceThread.java index d6d9671328..95f8359ff2 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/thread/DBTraceThread.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/thread/DBTraceThread.java @@ -19,7 +19,7 @@ import java.io.IOException; import com.google.common.collect.Range; -import db.Record; +import db.DBRecord; import ghidra.trace.database.DBTraceUtils; import ghidra.trace.model.Trace; import ghidra.trace.model.Trace.TraceThreadChangeType; @@ -67,7 +67,7 @@ public class DBTraceThread extends DBAnnotatedObject implements TraceThread { private Range lifespan; protected DBTraceThread(DBTraceThreadManager manager, DBCachedObjectStore store, - Record record) { + DBRecord record) { super(store, record); this.manager = manager; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/time/DBTraceSnapshot.java b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/time/DBTraceSnapshot.java index 6404827a87..90f002677f 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/time/DBTraceSnapshot.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/main/java/ghidra/trace/database/time/DBTraceSnapshot.java @@ -17,7 +17,7 @@ package ghidra.trace.database.time; import java.io.IOException; -import db.Record; +import db.DBRecord; import ghidra.trace.database.thread.DBTraceThread; import ghidra.trace.model.Trace; import ghidra.trace.model.Trace.TraceSnapshotChangeType; @@ -60,7 +60,7 @@ public class DBTraceSnapshot extends DBAnnotatedObject implements TraceSnapshot private DBTraceThread eventThread; public DBTraceSnapshot(DBTraceTimeManager manager, DBCachedObjectStore store, - Record record) { + DBRecord record) { super(store, record); this.manager = manager; } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/map/DBTraceAddressSnapRangePropertyMapAddressSetViewTest.java b/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/map/DBTraceAddressSnapRangePropertyMapAddressSetViewTest.java index 3716492c20..91e05ca66e 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/map/DBTraceAddressSnapRangePropertyMapAddressSetViewTest.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/map/DBTraceAddressSnapRangePropertyMapAddressSetViewTest.java @@ -24,7 +24,7 @@ import java.util.function.Predicate; import org.junit.*; import db.DBHandle; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.*; import ghidra.program.model.lang.Language; import ghidra.program.model.lang.LanguageID; @@ -71,7 +71,7 @@ public class DBTraceAddressSnapRangePropertyMapAddressSetViewTest String value; public MyEntry(DBTraceAddressSnapRangePropertyMapTree tree, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(tree, store, record); } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/map/DBTraceAddressSnapRangePropertyMapOcclusionIntoFutureIterableTest.java b/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/map/DBTraceAddressSnapRangePropertyMapOcclusionIntoFutureIterableTest.java index 5cc0e6cbb2..f9175953cf 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/map/DBTraceAddressSnapRangePropertyMapOcclusionIntoFutureIterableTest.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/map/DBTraceAddressSnapRangePropertyMapOcclusionIntoFutureIterableTest.java @@ -25,7 +25,7 @@ import org.apache.commons.lang3.tuple.ImmutablePair; import org.junit.*; import db.DBHandle; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.*; import ghidra.program.model.lang.Language; import ghidra.program.model.lang.LanguageID; @@ -70,7 +70,7 @@ public class DBTraceAddressSnapRangePropertyMapOcclusionIntoFutureIterableTest String value; public MyEntry(DBTraceAddressSnapRangePropertyMapTree tree, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(tree, store, record); } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/map/DBTraceAddressSnapRangePropertyMapOcclusionIntoPastIterableTest.java b/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/map/DBTraceAddressSnapRangePropertyMapOcclusionIntoPastIterableTest.java index 455a56a971..054aee6be4 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/map/DBTraceAddressSnapRangePropertyMapOcclusionIntoPastIterableTest.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/map/DBTraceAddressSnapRangePropertyMapOcclusionIntoPastIterableTest.java @@ -25,7 +25,7 @@ import org.apache.commons.lang3.tuple.ImmutablePair; import org.junit.*; import db.DBHandle; -import db.Record; +import db.DBRecord; import ghidra.program.model.address.*; import ghidra.program.model.lang.Language; import ghidra.program.model.lang.LanguageID; @@ -70,7 +70,7 @@ public class DBTraceAddressSnapRangePropertyMapOcclusionIntoPastIterableTest String value; public MyEntry(DBTraceAddressSnapRangePropertyMapTree tree, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(tree, store, record); } diff --git a/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/map/DBTraceAddressSnapRangePropertyMapSpaceTest.java b/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/map/DBTraceAddressSnapRangePropertyMapSpaceTest.java index 14726ea38c..a907c82f44 100644 --- a/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/map/DBTraceAddressSnapRangePropertyMapSpaceTest.java +++ b/Ghidra/Debug/Framework-TraceModeling/src/test/java/ghidra/trace/database/map/DBTraceAddressSnapRangePropertyMapSpaceTest.java @@ -29,7 +29,7 @@ import org.apache.commons.lang3.tuple.ImmutablePair; import org.junit.*; import db.DBHandle; -import db.Record; +import db.DBRecord; import ghidra.lifecycle.Unfinished; import ghidra.program.model.address.Address; import ghidra.program.model.lang.Language; @@ -133,7 +133,7 @@ public class DBTraceAddressSnapRangePropertyMapSpaceTest String name; public MyEntry(DBTraceAddressSnapRangePropertyMapTree tree, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(tree, store, record); } @@ -168,7 +168,7 @@ public class DBTraceAddressSnapRangePropertyMapSpaceTest String value; public AltEntry(DBTraceAddressSnapRangePropertyMapTree tree, - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { super(tree, store, record); } diff --git a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/BackwardRecordIterator.java b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/BackwardRecordIterator.java index c384e9e6df..718aaa3c78 100644 --- a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/BackwardRecordIterator.java +++ b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/BackwardRecordIterator.java @@ -17,7 +17,7 @@ package ghidra.util.database; import java.io.IOException; -import db.Record; +import db.DBRecord; import db.RecordIterator; public class BackwardRecordIterator extends AbstractDirectedRecordIterator { @@ -31,7 +31,7 @@ public class BackwardRecordIterator extends AbstractDirectedRecordIterator { } @Override - public Record next() throws IOException { + public DBRecord next() throws IOException { return it.previous(); } } diff --git a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DBAnnotatedObject.java b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DBAnnotatedObject.java index 6889a9afcf..c0941bc1c4 100644 --- a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DBAnnotatedObject.java +++ b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DBAnnotatedObject.java @@ -18,7 +18,7 @@ package ghidra.util.database; import java.io.IOException; import java.util.List; -import db.Record; +import db.DBRecord; import db.util.ErrorHandler; import ghidra.program.database.DatabaseObject; import ghidra.util.LockHold; @@ -29,10 +29,10 @@ public class DBAnnotatedObject extends DatabaseObject { private final ErrorHandler adapter; private final List> codecs; - Record record; + DBRecord record; @SuppressWarnings({ "unchecked", "rawtypes" }) - public DBAnnotatedObject(DBCachedObjectStore store, Record record) { + public DBAnnotatedObject(DBCachedObjectStore store, DBRecord record) { super(store == null ? null : store.cache, record == null ? -1 : record.getKey()); this.store = store; this.record = record; @@ -130,7 +130,7 @@ public class DBAnnotatedObject extends DatabaseObject { // Extension point } - private Record getFreshRecord(Record rec) throws IOException { + private DBRecord getFreshRecord(DBRecord rec) throws IOException { if (rec != null) { return rec; } @@ -155,7 +155,7 @@ public class DBAnnotatedObject extends DatabaseObject { } @Override - protected boolean refresh(Record rec) { + protected boolean refresh(DBRecord rec) { try (LockHold hold = LockHold.lock(store.readLock())) { return doRefresh(rec); } @@ -166,7 +166,7 @@ public class DBAnnotatedObject extends DatabaseObject { } @SuppressWarnings({ "rawtypes", "unchecked" }) - protected boolean doRefresh(Record rec) throws IOException { + protected boolean doRefresh(DBRecord rec) throws IOException { rec = getFreshRecord(rec); if (rec == null) { return false; diff --git a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DBAnnotatedObjectFactory.java b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DBAnnotatedObjectFactory.java index 4c6caa1a1e..69b9568638 100644 --- a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DBAnnotatedObjectFactory.java +++ b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DBAnnotatedObjectFactory.java @@ -15,8 +15,8 @@ */ package ghidra.util.database; -import db.Record; +import db.DBRecord; public interface DBAnnotatedObjectFactory { - T create(DBCachedObjectStore store, Record record); + T create(DBCachedObjectStore store, DBRecord record); } diff --git a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DBCachedObjectStore.java b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DBCachedObjectStore.java index 8231a8dc93..17081382ce 100644 --- a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DBCachedObjectStore.java +++ b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DBCachedObjectStore.java @@ -66,7 +66,7 @@ public class DBCachedObjectStore implements ErrorHa } protected abstract class BoundedStuff { - abstract U fromRecord(Record record) throws IOException; + abstract U fromRecord(DBRecord record) throws IOException; abstract U fromObject(T value); @@ -487,7 +487,7 @@ public class DBCachedObjectStore implements ErrorHa protected final BoundedStuff keys = new BoundedStuff<>() { @Override - Long fromRecord(Record record) { + Long fromRecord(DBRecord record) { if (record == null) { return null; } @@ -557,9 +557,9 @@ public class DBCachedObjectStore implements ErrorHa } }; - protected final BoundedStuff objects = new BoundedStuff<>() { + protected final BoundedStuff objects = new BoundedStuff<>() { @Override - T fromRecord(Record record) throws IOException { + T fromRecord(DBRecord record) throws IOException { if (record == null) { return null; } @@ -609,20 +609,20 @@ public class DBCachedObjectStore implements ErrorHa } @Override - DirectedIterator rawIterator(Direction direction, Range keyRange) + DirectedIterator rawIterator(Direction direction, Range keyRange) throws IOException { return DirectedRecordIterator.getIterator(table, keyRange, direction); } @Override - T fromRaw(Record raw) throws IOException { + T fromRaw(DBRecord raw) throws IOException { return fromRecord(raw); } }; - protected final BoundedStuff, Record> entries = new BoundedStuff<>() { + protected final BoundedStuff, DBRecord> entries = new BoundedStuff<>() { @Override - Entry fromRecord(Record record) throws IOException { + Entry fromRecord(DBRecord record) throws IOException { if (record == null) { return null; } @@ -674,13 +674,13 @@ public class DBCachedObjectStore implements ErrorHa } @Override - DirectedIterator rawIterator(Direction direction, Range keyRange) + DirectedIterator rawIterator(Direction direction, Range keyRange) throws IOException { return DirectedRecordIterator.getIterator(table, keyRange, direction); } @Override - Entry fromRaw(Record raw) throws IOException { + Entry fromRaw(DBRecord raw) throws IOException { return fromRecord(raw); } }; @@ -799,7 +799,7 @@ public class DBCachedObjectStore implements ErrorHa if (!keyRange.hasLowerBound() && !keyRange.hasUpperBound()) { throw new AssertionError(); // keyRange should never be "all" } - final Record rec; + final DBRecord rec; if (!keyRange.hasLowerBound()) { rec = table.getRecordAtOrAfter(Long.MIN_VALUE); } @@ -841,7 +841,7 @@ public class DBCachedObjectStore implements ErrorHa } protected T doCreate(long key) throws IOException { - Record rec = schema.createRecord(key); + DBRecord rec = schema.createRecord(key); table.putRecord(rec); T created = factory.create(this, rec); created.fresh(true); diff --git a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DBCachedObjectStoreFactory.java b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DBCachedObjectStoreFactory.java index f05ebd12c1..efd7cdcc59 100644 --- a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DBCachedObjectStoreFactory.java +++ b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DBCachedObjectStoreFactory.java @@ -31,11 +31,11 @@ import ghidra.util.exception.VersionException; public class DBCachedObjectStoreFactory { public interface DBFieldCodec { - void store(OT obj, Record record); + void store(OT obj, DBRecord record); void store(VT value, FT f); - void load(OT obj, Record record); + void load(OT obj, DBRecord record); Class getValueType(); @@ -84,7 +84,7 @@ public class DBCachedObjectStoreFactory { } @Override - public void store(OT obj, Record record) { + public void store(OT obj, DBRecord record) { try { doStore(obj, record); } @@ -94,7 +94,7 @@ public class DBCachedObjectStoreFactory { } @Override - public void load(OT obj, Record record) { + public void load(OT obj, DBRecord record) { try { doLoad(obj, record); } @@ -133,10 +133,10 @@ public class DBCachedObjectStoreFactory { field.set(obj, value); } - protected abstract void doStore(OT obj, Record record) + protected abstract void doStore(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException; - protected abstract void doLoad(OT obj, Record record) + protected abstract void doLoad(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException; } @@ -147,7 +147,7 @@ public class DBCachedObjectStoreFactory { } @Override - public void doStore(OT obj, Record record) + public void doStore(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { record.setBooleanValue(column, field.getBoolean(obj)); } @@ -158,7 +158,7 @@ public class DBCachedObjectStoreFactory { } @Override - public void doLoad(OT obj, Record record) + public void doLoad(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { field.setBoolean(obj, record.getBooleanValue(column)); } @@ -171,7 +171,7 @@ public class DBCachedObjectStoreFactory { } @Override - public void doStore(OT obj, Record record) + public void doStore(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { record.setByteValue(column, field.getByte(obj)); } @@ -182,7 +182,7 @@ public class DBCachedObjectStoreFactory { } @Override - public void doLoad(OT obj, Record record) + public void doLoad(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { field.setByte(obj, record.getByteValue(column)); } @@ -195,7 +195,7 @@ public class DBCachedObjectStoreFactory { } @Override - public void doStore(OT obj, Record record) + public void doStore(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { record.setShortValue(column, field.getShort(obj)); } @@ -206,7 +206,7 @@ public class DBCachedObjectStoreFactory { } @Override - public void doLoad(OT obj, Record record) + public void doLoad(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { field.setShort(obj, record.getShortValue(column)); } @@ -219,7 +219,7 @@ public class DBCachedObjectStoreFactory { } @Override - public void doStore(OT obj, Record record) + public void doStore(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { record.setIntValue(column, field.getInt(obj)); } @@ -230,7 +230,7 @@ public class DBCachedObjectStoreFactory { } @Override - public void doLoad(OT obj, Record record) + public void doLoad(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { field.setInt(obj, record.getIntValue(column)); } @@ -243,7 +243,7 @@ public class DBCachedObjectStoreFactory { } @Override - public void doStore(OT obj, Record record) + public void doStore(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { record.setLongValue(column, field.getLong(obj)); } @@ -254,7 +254,7 @@ public class DBCachedObjectStoreFactory { } @Override - public void doLoad(OT obj, Record record) + public void doLoad(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { field.setLong(obj, record.getLongValue(column)); } @@ -267,7 +267,7 @@ public class DBCachedObjectStoreFactory { } @Override - public void doStore(OT obj, Record record) + public void doStore(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { record.setString(column, getValue(obj)); } @@ -278,7 +278,7 @@ public class DBCachedObjectStoreFactory { } @Override - public void doLoad(OT obj, Record record) + public void doLoad(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { setValue(obj, record.getString(column)); } @@ -291,7 +291,7 @@ public class DBCachedObjectStoreFactory { } @Override - public void doStore(OT obj, Record record) + public void doStore(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { record.setBinaryData(column, getValue(obj)); } @@ -302,7 +302,7 @@ public class DBCachedObjectStoreFactory { } @Override - public void doLoad(OT obj, Record record) + public void doLoad(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { setValue(obj, record.getBinaryData(column)); } @@ -339,7 +339,7 @@ public class DBCachedObjectStoreFactory { } @Override - protected void doStore(OT obj, Record record) + protected void doStore(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { record.setBinaryData(column, encode(getValue(obj))); } @@ -350,7 +350,7 @@ public class DBCachedObjectStoreFactory { } @Override - protected void doLoad(OT obj, Record record) + protected void doLoad(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { setValue(obj, decode(record.getBinaryData(column))); } @@ -371,7 +371,7 @@ public class DBCachedObjectStoreFactory { } @Override - protected void doStore(OT obj, Record record) + protected void doStore(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { E value = getValue(obj); if (value == null) { @@ -393,7 +393,7 @@ public class DBCachedObjectStoreFactory { } @Override - protected void doLoad(OT obj, Record record) + protected void doLoad(OT obj, DBRecord record) throws IllegalArgumentException, IllegalAccessException { byte b = record.getByteValue(column); if (b == -1) { diff --git a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DirectedRecordIterator.java b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DirectedRecordIterator.java index 421385acab..2e57f2e2ef 100644 --- a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DirectedRecordIterator.java +++ b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/DirectedRecordIterator.java @@ -22,7 +22,7 @@ import com.google.common.collect.Range; import db.*; -public interface DirectedRecordIterator extends DirectedIterator { +public interface DirectedRecordIterator extends DirectedIterator { public static AbstractDirectedRecordIterator getIterator(Table table, Range keyRange, Direction direction) throws IOException { @@ -37,10 +37,10 @@ public interface DirectedRecordIterator extends DirectedIterator { private static DirectedRecordIterator applyBegFilter(DirectedRecordIterator it, int columnIndex, Field exclude) throws IOException { return new DirectedRecordIterator() { - Record next = findFirst(); + DBRecord next = findFirst(); - private Record findFirst() throws IOException { - Record r = null; + private DBRecord findFirst() throws IOException { + DBRecord r = null; while (it.hasNext()) { r = it.next(); if (r.getFieldValue(columnIndex).equals(exclude)) { @@ -52,8 +52,8 @@ public interface DirectedRecordIterator extends DirectedIterator { } @Override - public Record next() throws IOException { - Record ret = next; + public DBRecord next() throws IOException { + DBRecord ret = next; next = it.next(); return ret; } @@ -74,11 +74,11 @@ public interface DirectedRecordIterator extends DirectedIterator { private static DirectedRecordIterator applyEndFilter(DirectedRecordIterator it, int columnIndex, Field exclude) throws IOException { return new DirectedRecordIterator() { - Record next = it.next(); + DBRecord next = it.next(); @Override - public Record next() throws IOException { - Record ret = next; + public DBRecord next() throws IOException { + DBRecord ret = next; next = it.next(); return ret; } diff --git a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/ForwardRecordIterator.java b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/ForwardRecordIterator.java index 3a9b6bcf27..e14146459c 100644 --- a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/ForwardRecordIterator.java +++ b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/ForwardRecordIterator.java @@ -17,7 +17,7 @@ package ghidra.util.database; import java.io.IOException; -import db.Record; +import db.DBRecord; import db.RecordIterator; public class ForwardRecordIterator extends AbstractDirectedRecordIterator { @@ -31,7 +31,7 @@ public class ForwardRecordIterator extends AbstractDirectedRecordIterator { } @Override - public Record next() throws IOException { + public DBRecord next() throws IOException { return it.next(); } } diff --git a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/AbstractConstraintsTree.java b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/AbstractConstraintsTree.java index 4f82d8df26..d649767635 100644 --- a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/AbstractConstraintsTree.java +++ b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/AbstractConstraintsTree.java @@ -24,7 +24,7 @@ import com.google.common.cache.CacheBuilder; import com.google.common.cache.RemovalNotification; import com.google.common.collect.Collections2; -import db.Record; +import db.DBRecord; import generic.NestedIterator; import generic.util.PeekableIterator; import ghidra.util.LockHold; @@ -77,9 +77,9 @@ public abstract class AbstractConstraintsTree< // // Nothing } - protected abstract DR createDataEntry(DBCachedObjectStore store, Record record); + protected abstract DR createDataEntry(DBCachedObjectStore store, DBRecord record); - protected abstract NR createNodeEntry(DBCachedObjectStore store, Record record); + protected abstract NR createNodeEntry(DBCachedObjectStore store, DBRecord record); protected void init() { assert root == null; diff --git a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/DBTreeDataRecord.java b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/DBTreeDataRecord.java index e9df7b33c4..f54f84ebc6 100644 --- a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/DBTreeDataRecord.java +++ b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/DBTreeDataRecord.java @@ -18,7 +18,7 @@ package ghidra.util.database.spatial; import java.util.Map.Entry; import java.util.Objects; -import db.Record; +import db.DBRecord; import ghidra.util.database.DBCachedObjectStore; public abstract class DBTreeDataRecord, NS extends BoundingShape, T> @@ -88,7 +88,7 @@ public abstract class DBTreeDataRecord, NS extends B } }; - public DBTreeDataRecord(DBCachedObjectStore store, Record record) { + public DBTreeDataRecord(DBCachedObjectStore store, DBRecord record) { super(store, record); } diff --git a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/DBTreeNodeRecord.java b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/DBTreeNodeRecord.java index 4259f07a4f..949b29a463 100644 --- a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/DBTreeNodeRecord.java +++ b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/DBTreeNodeRecord.java @@ -15,7 +15,7 @@ */ package ghidra.util.database.spatial; -import db.Record; +import db.DBRecord; import ghidra.util.database.DBCachedObjectStore; public abstract class DBTreeNodeRecord> extends DBTreeRecord { @@ -62,7 +62,7 @@ public abstract class DBTreeNodeRecord> extends DBT public abstract NodeType getParentType(); } - public DBTreeNodeRecord(DBCachedObjectStore store, Record record) { + public DBTreeNodeRecord(DBCachedObjectStore store, DBRecord record) { super(store, record); } diff --git a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/DBTreeRecord.java b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/DBTreeRecord.java index c3ff2529f2..c1c58b4d7b 100644 --- a/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/DBTreeRecord.java +++ b/Ghidra/Debug/ProposedUtils/src/main/java/ghidra/util/database/spatial/DBTreeRecord.java @@ -15,13 +15,13 @@ */ package ghidra.util.database.spatial; -import db.Record; +import db.DBRecord; import ghidra.util.database.DBAnnotatedObject; import ghidra.util.database.DBCachedObjectStore; public abstract class DBTreeRecord, NS extends BoundingShape> extends DBAnnotatedObject { - public DBTreeRecord(DBCachedObjectStore store, Record record) { + public DBTreeRecord(DBCachedObjectStore store, DBRecord record) { super(store, record); } diff --git a/Ghidra/Debug/ProposedUtils/src/test/java/ghidra/util/database/DBCachedObjectStoreFactoryTest.java b/Ghidra/Debug/ProposedUtils/src/test/java/ghidra/util/database/DBCachedObjectStoreFactoryTest.java index 6e3ded26b1..2d5bbb4349 100644 --- a/Ghidra/Debug/ProposedUtils/src/test/java/ghidra/util/database/DBCachedObjectStoreFactoryTest.java +++ b/Ghidra/Debug/ProposedUtils/src/test/java/ghidra/util/database/DBCachedObjectStoreFactoryTest.java @@ -23,7 +23,7 @@ import org.junit.Ignore; import org.junit.Test; import db.DBHandle; -import db.Record; +import db.DBRecord; import ghidra.util.UniversalIdGenerator; import ghidra.util.database.annot.*; import ghidra.util.exception.VersionException; @@ -68,7 +68,7 @@ public class DBCachedObjectStoreFactoryTest { @DBAnnotatedField(column = "C") int c; - public MyObject(DBCachedObjectStore store, Record record) { + public MyObject(DBCachedObjectStore store, DBRecord record) { super(store, record); } } @@ -92,7 +92,7 @@ public class DBCachedObjectStoreFactoryTest { @DBAnnotatedField(column = "B") int b; - public MyExtObject(DBCachedObjectStore store, Record record) { + public MyExtObject(DBCachedObjectStore store, DBRecord record) { super(store, record); } } @@ -661,7 +661,7 @@ public class DBCachedObjectStoreFactoryTest { @DBAnnotatedField(column = BINARY_COLUMN_NAME) byte[] binaryField; - public MyKitchenSink(DBCachedObjectStore store, Record record) { + public MyKitchenSink(DBCachedObjectStore store, DBRecord record) { super(store, record); } } @@ -695,7 +695,7 @@ public class DBCachedObjectStoreFactoryTest { @DBAnnotatedColumn(FIELD_COLUMN_NAME) static DBObjectColumn FIELD_COLUMN; - public AbstractObject(DBCachedObjectStore store, Record record) { + public AbstractObject(DBCachedObjectStore store, DBRecord record) { super(store, record); } } @@ -705,7 +705,7 @@ public class DBCachedObjectStoreFactoryTest { @DBAnnotatedField(column = FIELD_COLUMN_NAME) int myField; - public MyFromAbstract(DBCachedObjectStore store, Record record) { + public MyFromAbstract(DBCachedObjectStore store, DBRecord record) { super(store, record); } } @@ -769,7 +769,7 @@ public class DBCachedObjectStoreFactoryTest { @DBAnnotatedField(column = ENUM_COLUMN_NAME) MyEnumTooBig enumField; - public MyUsesMyEnumTooBig(DBCachedObjectStore store, Record record) { + public MyUsesMyEnumTooBig(DBCachedObjectStore store, DBRecord record) { super(store, record); } } diff --git a/Ghidra/Debug/ProposedUtils/src/test/java/ghidra/util/database/DBCachedObjectStoreTest.java b/Ghidra/Debug/ProposedUtils/src/test/java/ghidra/util/database/DBCachedObjectStoreTest.java index ec76910d69..6508272ca7 100644 --- a/Ghidra/Debug/ProposedUtils/src/test/java/ghidra/util/database/DBCachedObjectStoreTest.java +++ b/Ghidra/Debug/ProposedUtils/src/test/java/ghidra/util/database/DBCachedObjectStoreTest.java @@ -107,7 +107,7 @@ public class DBCachedObjectStoreTest { @DBAnnotatedColumn(COL2_NAME) private static DBObjectColumn COL2; - public MyObject(DBCachedObjectStore store, Record record) { + public MyObject(DBCachedObjectStore store, DBRecord record) { super(store, record); } @@ -208,7 +208,7 @@ public class DBCachedObjectStoreTest { assertEquals(0, obj.getKey()); assertTrue(store.isCached(0)); Table table = handle.getTable(OBJECTS_TABLE_NAME); - Record record = table.getRecord(obj.getKey()); + DBRecord record = table.getRecord(obj.getKey()); assertNotNull(record); } } @@ -221,7 +221,7 @@ public class DBCachedObjectStoreTest { assertEquals(0x80, obj.getKey()); assertTrue(store.isCached(0x80)); Table table = handle.getTable(OBJECTS_TABLE_NAME); - Record record = table.getRecord(obj.getKey()); + DBRecord record = table.getRecord(obj.getKey()); assertNotNull(record); } } @@ -272,7 +272,7 @@ public class DBCachedObjectStoreTest { obj.setF2(0x802); obj.updated(); Table table = handle.getTable(OBJECTS_TABLE_NAME); - Record record = table.getRecord(obj.getKey()); + DBRecord record = table.getRecord(obj.getKey()); assertEquals(0x801, record.getLongValue(0)); assertEquals(0x802, record.getIntValue(1)); } @@ -284,7 +284,7 @@ public class DBCachedObjectStoreTest { Table table = myDomainObject.storeFactory.getOrCreateTable(OBJECTS_TABLE_NAME, MyObject.class, false); assertEquals(0, table.getRecordCount()); - Record record = table.getSchema().createRecord(0x1234); + DBRecord record = table.getSchema().createRecord(0x1234); record.setLongValue(0, 0x811); record.setIntValue(1, 0x812); table.putRecord(record); @@ -301,7 +301,7 @@ public class DBCachedObjectStoreTest { Table table = myDomainObject.storeFactory.getOrCreateTable(OBJECTS_TABLE_NAME, MyObject.class, false); assertEquals(0, table.getRecordCount()); - Record record = table.getSchema().createRecord(0x1234); + DBRecord record = table.getSchema().createRecord(0x1234); record.setLongValue(0, 0x811); record.setIntValue(1, 0x812); table.putRecord(record); diff --git a/Ghidra/Debug/ProposedUtils/src/test/java/ghidra/util/database/spatial/RStarTreeMapTest.java b/Ghidra/Debug/ProposedUtils/src/test/java/ghidra/util/database/spatial/RStarTreeMapTest.java index a23e23f206..d48ba1580f 100644 --- a/Ghidra/Debug/ProposedUtils/src/test/java/ghidra/util/database/spatial/RStarTreeMapTest.java +++ b/Ghidra/Debug/ProposedUtils/src/test/java/ghidra/util/database/spatial/RStarTreeMapTest.java @@ -40,7 +40,7 @@ import org.junit.*; import com.google.common.collect.Iterators; import db.DBHandle; -import db.Record; +import db.DBRecord; import ghidra.util.LockHold; import ghidra.util.database.*; import ghidra.util.database.annot.*; @@ -151,7 +151,7 @@ public class RStarTreeMapTest { @DBAnnotatedField(column = VAL_COLUMN_NAME) String value; - public DBIntRectStringDataRecord(DBCachedObjectStore store, Record record) { + public DBIntRectStringDataRecord(DBCachedObjectStore store, DBRecord record) { super(store, record); } @@ -295,7 +295,7 @@ public class RStarTreeMapTest { @DBAnnotatedField(column = DATA_COUNT_COLUMN_NAME) int dataCount; - public DBIntRectNodeRecord(DBCachedObjectStore store, Record record) { + public DBIntRectNodeRecord(DBCachedObjectStore store, DBRecord record) { super(store, record); } @@ -484,13 +484,13 @@ public class RStarTreeMapTest { @Override protected DBIntRectStringDataRecord createDataEntry( - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { return new DBIntRectStringDataRecord(store, record); } @Override protected DBIntRectNodeRecord createNodeEntry( - DBCachedObjectStore store, Record record) { + DBCachedObjectStore store, DBRecord record) { return new DBIntRectNodeRecord(store, record); }