Debugger refactor of Record to DBRecord

2026-06-01 03:26:56 +08:00 · 2020-12-28 13:55:51 -05:00
parent 65f5a5390a
commit 7d394d0aad
60 changed files with 200 additions and 200 deletions
@@ -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)));
 		}
@@ -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<DBTraceBookmark, ?> tree,
-			DBCachedObjectStore<?> store, Record record) {
+			DBCachedObjectStore<?> store, DBRecord record) {
 		super(tree, store, record);
 		this.space = space;
 	}
@@ -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<DBTraceBreakpoint, ?> tree,
-			DBCachedObjectStore<?> store, Record record) {
+			DBCachedObjectStore<?> store, DBRecord record) {
 		super(tree, store, record);
 		this.space = space;
 	}
@@ -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<byte[], ?> tree,
-				DBCachedObjectStore<?> store, Record record) {
+				DBCachedObjectStore<?> store, DBRecord record) {
 			super(tree, store, record);
 		}

@@ -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<byte[], DBTraceRegisterContextEntry> map;

-		public DBTraceRegisterEntry(DBCachedObjectStore<?> store, Record record) {
+		public DBTraceRegisterEntry(DBCachedObjectStore<?> store, DBRecord record) {
 			super(store, record);
 		}

@@ -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<DBTraceSettingsEntry, ?> tree,
-				DBCachedObjectStore<?> store, Record record) {
+				DBCachedObjectStore<?> store, DBRecord record) {
 			super(tree, store, record);
 		}

@@ -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;
 	}
@@ -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;
 	}
@@ -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<T extends AbstractDBTraceCodeUnit<

 	public AbstractDBTraceCodeUnit(DBTraceCodeSpace space,
 			DBTraceAddressSnapRangePropertyMapTree<T, ?> tree, DBCachedObjectStore<?> store,
-			Record record) {
+			DBRecord record) {
 		super(tree, store, record);
 		this.space = space;
 	}
@@ -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;
 		}
@@ -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<DBTraceCommentEntry, ?> tree,
-				DBCachedObjectStore<?> store, Record record) {
+				DBCachedObjectStore<?> store, DBRecord record) {
 			super(tree, store, record);
 		}

@@ -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<DBTraceData>

 	public DBTraceData(DBTraceCodeSpace space,
 			DBTraceAddressSnapRangePropertyMapTree<DBTraceData, ?> tree,
-			DBCachedObjectStore<?> store, Record record) {
+			DBCachedObjectStore<?> store, DBRecord record) {
 		super(space, tree, store, record);
 	}

@@ -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<DBTraceInstructi

 	public DBTraceInstruction(DBTraceCodeSpace space,
 			DBTraceAddressSnapRangePropertyMapTree<DBTraceInstruction, ?> tree,
-			DBCachedObjectStore<?> store, Record record) {
+			DBCachedObjectStore<?> store, DBRecord record) {
 		super(space, tree, store, record);
 	}

@@ -126,7 +126,7 @@ public abstract class AbstractDBTracePropertyMap<T, DR extends AbstractDBTraceAd
 		int value;

 		public DBTraceIntPropertyMapEntry(DBTraceAddressSnapRangePropertyMapTree<Integer, ?> tree,
-				DBCachedObjectStore<?> store, Record record) {
+				DBCachedObjectStore<?> store, DBRecord record) {
 			super(tree, store, record);
 		}

@@ -171,7 +171,7 @@ public abstract class AbstractDBTracePropertyMap<T, DR extends AbstractDBTraceAd
 		long value;

 		public DBTraceLongPropertyMapEntry(DBTraceAddressSnapRangePropertyMapTree<Long, ?> tree,
-				DBCachedObjectStore<?> store, Record record) {
+				DBCachedObjectStore<?> store, DBRecord record) {
 			super(tree, store, record);
 		}

@@ -229,7 +229,7 @@ public abstract class AbstractDBTracePropertyMap<T, DR extends AbstractDBTraceAd
 		protected Class<T> valueClass;

 		public DBTraceSaveablePropertyMapEntry(DBTraceAddressSnapRangePropertyMapTree<T, ?> tree,
-				DBCachedObjectStore<?> store, Record record, Class<T> valueClass) {
+				DBCachedObjectStore<?> store, DBRecord record, Class<T> valueClass) {
 			super(tree, store, record);
 			this.valueClass = valueClass;
 		}
@@ -277,13 +277,13 @@ public abstract class AbstractDBTracePropertyMap<T, DR extends AbstractDBTraceAd
 		}

 		@Override
-		protected void doStore(DBTraceSaveablePropertyMapEntry<?> 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<T, DR extends AbstractDBTraceAd
 		String value;

 		public DBTraceStringPropertyMapEntry(DBTraceAddressSnapRangePropertyMapTree<String, ?> tree,
-				DBCachedObjectStore<?> store, Record record) {
+				DBCachedObjectStore<?> store, DBRecord record) {
 			super(tree, store, record);
 		}

@@ -378,7 +378,7 @@ public abstract class AbstractDBTracePropertyMap<T, DR extends AbstractDBTraceAd
 			extends AbstractDBTraceAddressSnapRangePropertyMapData<Void> {

 		public DBTraceVoidPropertyMapEntry(DBTraceAddressSnapRangePropertyMapTree<Void, ?> tree,
-				DBCachedObjectStore<?> store, Record record) {
+				DBCachedObjectStore<?> store, DBRecord record) {
 			super(tree, store, record);
 		}

@@ -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<T, DR extends AbstractDBTraceAdd

 	public static interface DBTraceAddressSnapRangePropertyMapDataFactory<T, DR extends AbstractDBTraceAddressSnapRangePropertyMapData<T>> {
 		DR create(DBTraceAddressSnapRangePropertyMapTree<T, DR> tree, DBCachedObjectStore<DR> store,
-				Record record);
+				DBRecord record);
 	}

 	protected final Class<DR> dataType;
@@ -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<T, DR extends AbstractDBTrac

 		public DBTraceAddressSnapRangePropertyMapNode(
 				DBTraceAddressSnapRangePropertyMapTree<?, ?> tree, DBCachedObjectStore<?> store,
-				Record record) {
+				DBRecord record) {
 			super(store, record);
 			this.tree = tree;
 		}
@@ -242,7 +242,7 @@ public class DBTraceAddressSnapRangePropertyMapTree<T, DR extends AbstractDBTrac

 		public AbstractDBTraceAddressSnapRangePropertyMapData(
 				DBTraceAddressSnapRangePropertyMapTree<T, ?> tree, DBCachedObjectStore<?> store,
-				Record record) {
+				DBRecord record) {
 			super(store, record);
 			this.tree = tree;
 		}
@@ -561,13 +561,13 @@ public class DBTraceAddressSnapRangePropertyMapTree<T, DR extends AbstractDBTrac
 	}

 	@Override
-	protected DR createDataEntry(DBCachedObjectStore<DR> store, Record record) {
+	protected DR createDataEntry(DBCachedObjectStore<DR> store, DBRecord record) {
 		return dataFactory.create(this, store, record);
 	}

 	@Override
 	protected DBTraceAddressSnapRangePropertyMapNode createNodeEntry(
-			DBCachedObjectStore<DBTraceAddressSnapRangePropertyMapNode> store, Record record) {
+			DBCachedObjectStore<DBTraceAddressSnapRangePropertyMapNode> store, DBRecord record) {
 		return new DBTraceAddressSnapRangePropertyMapNode(this, store, record);
 	}

@@ -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;
 	}
@@ -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;
 	}
@@ -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<DBTraceMemoryRegion, DBTraceMemoryRegion> tree,
-			DBCachedObjectStore<?> store, Record record) {
+			DBCachedObjectStore<?> store, DBRecord record) {
 		super(tree, store, record);
 		this.space = space;
 	}
@@ -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<TraceMemoryState, ?> tree,
-			DBCachedObjectStore<?> store, Record record) {
+			DBCachedObjectStore<?> store, DBRecord record) {
 		super(tree, store, record);
 	}

@@ -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<DBTraceModule, ?> tree,
-			DBCachedObjectStore<?> store, Record record) {
+			DBCachedObjectStore<?> store, DBRecord record) {
 		super(tree, store, record);
 		this.space = space;
 	}
@@ -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<DBTraceSection, ?> tree,
-			DBCachedObjectStore<?> store, Record record) {
+			DBCachedObjectStore<?> store, DBRecord record) {
 		super(tree, store, record);
 		this.space = space;
 	}
@@ -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<Long> lifespan;

 	public DBTraceStaticMapping(DBTraceStaticMappingManager manager, DBCachedObjectStore<?> store,
-			Record record) {
+			DBRecord record) {
 		super(store, record);
 		this.manager = manager;
 	}
@@ -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);
 		}

@@ -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<M extends DBTraceSpaceBas

 		DBTraceSpaceBased space;

-		public DBTraceSpaceEntry(DBCachedObjectStore<?> store, Record record) {
+		public DBTraceSpaceEntry(DBCachedObjectStore<?> store, DBRecord record) {
 			super(store, record);
 		}

@@ -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<DBTraceStackFrame> 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;
 	}
@@ -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;
 	}
@@ -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;
 	}
@@ -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);
 	}

@@ -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);
 	}

@@ -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<DBTraceEquate> store,
-			Record record) {
+			DBRecord record) {
 		super(store, record);
 		this.manager = manager;
 	}
@@ -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<DBTraceEquateReference, ?> tree,
-				DBCachedObjectStore<?> store, Record record) {
+				DBCachedObjectStore<?> store, DBRecord record) {
 			super(tree, store, record);
 			this.space = space;
 		}
@@ -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);
 	}
@@ -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);
 	}

@@ -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<Long> lifespan;

 	public DBTraceLabelSymbol(DBTraceSymbolManager manager, DBCachedObjectStore<?> store,
-			Record record) {
+			DBRecord record) {
 		super(manager, store, record);
 	}

@@ -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);
 	}

@@ -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();
 	}
@@ -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);
 	}

@@ -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<DBTraceReferenceEntry, ?> 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<DBTraceXRefEntry, ?> tree,
-				DBCachedObjectStore<?> store, Record record) {
+				DBCachedObjectStore<?> store, DBRecord record) {
 			super(tree, store, record);
 			this.space = space;
 		}
@@ -81,7 +81,7 @@ public class DBTraceSymbolManager implements TraceSymbolManager, DBTraceManager
 		long symbolID;

 		public DBTraceSymbolIDEntry(DBTraceAddressSnapRangePropertyMapTree<Long, ?> 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;
 		}
@@ -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<Long> lifespan;

 	protected DBTraceThread(DBTraceThreadManager manager, DBCachedObjectStore<?> store,
-			Record record) {
+			DBRecord record) {
 		super(store, record);
 		this.manager = manager;
 	}
@@ -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;
 	}
@@ -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<String, ?> tree,
-				DBCachedObjectStore<?> store, Record record) {
+				DBCachedObjectStore<?> store, DBRecord record) {
 			super(tree, store, record);
 		}

@@ -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<String, ?> tree,
-				DBCachedObjectStore<?> store, Record record) {
+				DBCachedObjectStore<?> store, DBRecord record) {
 			super(tree, store, record);
 		}

@@ -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<String, ?> tree,
-				DBCachedObjectStore<?> store, Record record) {
+				DBCachedObjectStore<?> store, DBRecord record) {
 			super(tree, store, record);
 		}

@@ -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<MyEntry, ?> 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<String, ?> tree,
-				DBCachedObjectStore<?> store, Record record) {
+				DBCachedObjectStore<?> store, DBRecord record) {
 			super(tree, store, record);
 		}

@@ -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();
 	}
 }
@@ -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<DBFieldCodec<?, ?, ?>> 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;
@@ -15,8 +15,8 @@
 */
 package ghidra.util.database;

-import db.Record;
+import db.DBRecord;

 public interface DBAnnotatedObjectFactory<T extends DBAnnotatedObject> {
-	T create(DBCachedObjectStore<T> store, Record record);
+	T create(DBCachedObjectStore<T> store, DBRecord record);
 }
@@ -66,7 +66,7 @@ public class DBCachedObjectStore<T extends DBAnnotatedObject> implements ErrorHa
 	}

 	protected abstract class BoundedStuff<U, V> {
-		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<T extends DBAnnotatedObject> implements ErrorHa

 	protected final BoundedStuff<Long, Long> keys = new BoundedStuff<>() {
 		@Override
-		Long fromRecord(Record record) {
+		Long fromRecord(DBRecord record) {
 			if (record == null) {
 				return null;
 			}
@@ -557,9 +557,9 @@ public class DBCachedObjectStore<T extends DBAnnotatedObject> implements ErrorHa
 		}
 	};

-	protected final BoundedStuff<T, Record> objects = new BoundedStuff<>() {
+	protected final BoundedStuff<T, DBRecord> 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<T extends DBAnnotatedObject> implements ErrorHa
 		}

 		@Override
-		DirectedIterator<Record> rawIterator(Direction direction, Range<Long> keyRange)
+		DirectedIterator<DBRecord> rawIterator(Direction direction, Range<Long> 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<Entry<Long, T>, Record> entries = new BoundedStuff<>() {
+	protected final BoundedStuff<Entry<Long, T>, DBRecord> entries = new BoundedStuff<>() {
 		@Override
-		Entry<Long, T> fromRecord(Record record) throws IOException {
+		Entry<Long, T> fromRecord(DBRecord record) throws IOException {
 			if (record == null) {
 				return null;
 			}
@@ -674,13 +674,13 @@ public class DBCachedObjectStore<T extends DBAnnotatedObject> implements ErrorHa
 		}

 		@Override
-		DirectedIterator<Record> rawIterator(Direction direction, Range<Long> keyRange)
+		DirectedIterator<DBRecord> rawIterator(Direction direction, Range<Long> keyRange)
 				throws IOException {
 			return DirectedRecordIterator.getIterator(table, keyRange, direction);
 		}

 		@Override
-		Entry<Long, T> fromRaw(Record raw) throws IOException {
+		Entry<Long, T> fromRaw(DBRecord raw) throws IOException {
 			return fromRecord(raw);
 		}
 	};
@@ -799,7 +799,7 @@ public class DBCachedObjectStore<T extends DBAnnotatedObject> 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<T extends DBAnnotatedObject> 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);
--- a/Show More
+++ b/Show More