refactor: rename EncodingId to CodecId

dfa1 · claude · dfa1 · commit 260e82b1daee · 2026-05-29T07:04:07.000+02:00
Co-Authored-By: Claude Sonnet 4.6 &lt;noreply@anthropic.com&gt;
diff --git a/core/src/main/java/io/github/dfa1/vortex/encoding/AlpCodec.java b/core/src/main/java/io/github/dfa1/vortex/encoding/AlpCodec.java
@@ -76,8 +76,8 @@ private static PType ptypeFromProto(DTypeProtos.PType proto) {
 	}
 
 	@Override
-	public EncodingId encodingId() {
-		return EncodingId.VORTEX_ALP;
+	public CodecId encodingId() {
+		return CodecId.VORTEX_ALP;
 	}
 
 	// ── F32 ───────────────────────────────────────────────────────────────────
diff --git a/core/src/main/java/io/github/dfa1/vortex/encoding/ArrayNode.java b/core/src/main/java/io/github/dfa1/vortex/encoding/ArrayNode.java
@@ -7,7 +7,7 @@
 /// Encoded array node as stored in a Flat layout segment.
 /// In-file representation before decoding; mirrors the Go ArrayNode struct.
 record ArrayNode(
-		EncodingId encodingId,
+		CodecId encodingId,
 		ByteBuffer metadata,
 		ArrayNode[] children,
 		int[] bufferIndices,
diff --git a/core/src/main/java/io/github/dfa1/vortex/encoding/BitpackedCodec.java b/core/src/main/java/io/github/dfa1/vortex/encoding/BitpackedCodec.java
@@ -488,8 +488,8 @@ private static boolean isUnsigned(PType ptype) {
 	// ── Type conversion ───────────────────────────────────────────────────────
 
 	@Override
-	public EncodingId encodingId() {
-		return EncodingId.FASTLANES_BITPACKED;
+	public CodecId encodingId() {
+		return CodecId.FASTLANES_BITPACKED;
 	}
 
 	// ── Misc helpers ──────────────────────────────────────────────────────────
diff --git a/core/src/main/java/io/github/dfa1/vortex/encoding/BoolCodec.java b/core/src/main/java/io/github/dfa1/vortex/encoding/BoolCodec.java
@@ -21,8 +21,8 @@ private static ByteBuffer encodeBool(boolean[] data) {
 	}
 
 	@Override
-	public EncodingId encodingId() {
-		return EncodingId.VORTEX_BOOL;
+	public CodecId encodingId() {
+		return CodecId.VORTEX_BOOL;
 	}
 
 	@Override
diff --git a/core/src/main/java/io/github/dfa1/vortex/encoding/Codec.java b/core/src/main/java/io/github/dfa1/vortex/encoding/Codec.java
@@ -7,7 +7,7 @@
 /// Register via [CodecRegistry] — implementations are discoverable via ServiceLoader.
 public interface Codec {
 	/// Return the encoding id for this codec.
-	EncodingId encodingId();
+	CodecId encodingId();
 
 	/// Decode an array node from the file using the provided context.
 	Array decode(DecodeContext ctx);
diff --git a/core/src/main/java/io/github/dfa1/vortex/encoding/CodecId.java b/core/src/main/java/io/github/dfa1/vortex/encoding/CodecId.java
@@ -6,7 +6,7 @@
 import java.util.stream.Stream;
 
 /// Strongly-typed encoding identifier used in place of raw strings.
-public enum EncodingId {
+public enum CodecId {
 	VORTEX_PRIMITIVE("vortex.primitive"),
 	VORTEX_BOOL("vortex.bool"),
 	VORTEX_DICT("vortex.dict"),
@@ -29,17 +29,17 @@ public enum EncodingId {
 	FASTLANES_FOR("fastlanes.for"),
 	FASTLANES_DELTA("fastlanes.delta");
 
-	// O(1) access to EncodingId by its string representation
-	private static final Map<String, EncodingId> LOOKUP = Stream.of(EncodingId.values())
-			.collect(Collectors.toUnmodifiableMap(EncodingId::id, Function.identity()));
+	// O(1) access to CodecId by its string representation
+	private static final Map<String, CodecId> LOOKUP = Stream.of(CodecId.values())
+			.collect(Collectors.toUnmodifiableMap(CodecId::id, Function.identity()));
 	private final String id;
 
-	EncodingId(String id) {
+	CodecId(String id) {
 		this.id = id;
 	}
 
-	public static EncodingId from(String id) {
-		EncodingId result = LOOKUP.get(id);
+	public static CodecId from(String id) {
+		CodecId result = LOOKUP.get(id);
 		if (result == null) {
 			throw new IllegalArgumentException("unknown encoding id: " + id);
 		}
diff --git a/core/src/main/java/io/github/dfa1/vortex/encoding/CodecRegistry.java b/core/src/main/java/io/github/dfa1/vortex/encoding/CodecRegistry.java
@@ -17,7 +17,7 @@
 /// Registry mapping encoding IDs to [Codec] implementations.
 public final class CodecRegistry {
 
-	private final Map<EncodingId, Codec> codecs = new HashMap<>();
+	private final Map<CodecId, Codec> codecs = new HashMap<>();
 
 	private CodecRegistry() {
 	}
@@ -40,7 +40,7 @@ private static ArrayNode convertArrayNode(
 			List<String> encodingSpecs
 	) {
 		String encodingId = encodingSpecs.get(fbs.encoding());
-		EncodingId encId = EncodingId.from(encodingId);
+		CodecId encId = CodecId.from(encodingId);
 
 		ArrayNode[] children = new ArrayNode[fbs.childrenLength()];
 		for (int i = 0; i < children.length; i++) {
@@ -91,7 +91,7 @@ public Array decodeSegment(MemorySegment seg, List<String> encodingSpecs,
 	}
 
 	Array decode(DecodeContext ctx) {
-		EncodingId id = ctx.node().encodingId();
+		CodecId id = ctx.node().encodingId();
 		Codec c = codecs.get(id);
 		if (c == null) {
 			throw new IllegalArgumentException("no codec for encoding: " + id);
diff --git a/core/src/main/java/io/github/dfa1/vortex/encoding/ConstantCodec.java b/core/src/main/java/io/github/dfa1/vortex/encoding/ConstantCodec.java
@@ -45,8 +45,8 @@ private static void writeRaw(ByteBuffer buf, PType ptype, long rawBits) {
 	// ── Helpers ───────────────────────────────────────────────────────────────
 
 	@Override
-	public EncodingId encodingId() {
-		return EncodingId.VORTEX_CONSTANT;
+	public CodecId encodingId() {
+		return CodecId.VORTEX_CONSTANT;
 	}
 
 	@Override
diff --git a/core/src/main/java/io/github/dfa1/vortex/encoding/DeltaCodec.java b/core/src/main/java/io/github/dfa1/vortex/encoding/DeltaCodec.java
@@ -151,8 +151,8 @@ private static boolean isUnsigned(PType ptype) {
 	// ── Type conversion ───────────────────────────────────────────────────────
 
 	@Override
-	public EncodingId encodingId() {
-		return EncodingId.FASTLANES_DELTA;
+	public CodecId encodingId() {
+		return CodecId.FASTLANES_DELTA;
 	}
 
 	@Override
diff --git a/core/src/main/java/io/github/dfa1/vortex/encoding/DictCodec.java b/core/src/main/java/io/github/dfa1/vortex/encoding/DictCodec.java
@@ -175,8 +175,8 @@ private static long readCode(MemorySegment buf, PType codePType, long i) {
 	}
 
 	@Override
-	public EncodingId encodingId() {
-		return EncodingId.VORTEX_DICT;
+	public CodecId encodingId() {
+		return CodecId.VORTEX_DICT;
 	}
 
 	@Override
@@ -220,10 +220,10 @@ public EncodeResult encode(DType dtype, Object data) {
 		// Metadata: code PType ordinal
 		ByteBuffer meta = ByteBuffer.allocate(1).put(0, (byte) codePType.ordinal());
 
-		EncodeNode valuesNode = EncodeNode.leaf(EncodingId.VORTEX_PRIMITIVE, 0);
-		EncodeNode codesNode = EncodeNode.leaf(EncodingId.VORTEX_PRIMITIVE, 1);
+		EncodeNode valuesNode = EncodeNode.leaf(CodecId.VORTEX_PRIMITIVE, 0);
+		EncodeNode codesNode = EncodeNode.leaf(CodecId.VORTEX_PRIMITIVE, 1);
 		EncodeNode rootNode = new EncodeNode(
-				EncodingId.VORTEX_DICT, meta,
+				CodecId.VORTEX_DICT, meta,
 				new EncodeNode[]{valuesNode, codesNode},
 				new int[0]);
 
diff --git a/core/src/main/java/io/github/dfa1/vortex/encoding/EncodeNode.java b/core/src/main/java/io/github/dfa1/vortex/encoding/EncodeNode.java
@@ -5,12 +5,12 @@
 /// Describes the ArrayNode tree written into a flat segment's FlatBuffer.
 /// Mirrors [ArrayNode] for the encode path.
 public record EncodeNode(
-		EncodingId encodingId,
+		CodecId encodingId,
 		ByteBuffer metadata,
 		EncodeNode[] children,
 		int[] bufferIndices
 ) {
-	public static EncodeNode leaf(EncodingId encodingId, int bufferIndex) {
+	public static EncodeNode leaf(CodecId encodingId, int bufferIndex) {
 		return new EncodeNode(encodingId, null, new EncodeNode[0], new int[]{bufferIndex});
 	}
 }
diff --git a/core/src/main/java/io/github/dfa1/vortex/encoding/EncodeResult.java b/core/src/main/java/io/github/dfa1/vortex/encoding/EncodeResult.java
@@ -11,11 +11,11 @@ public record EncodeResult(
 		byte[] statsMax
 ) {
 	/// Convenience factory for single-buffer leaf encodings.
-	public static EncodeResult simple(EncodingId encodingId, ByteBuffer data, byte[] min, byte[] max) {
+	public static EncodeResult simple(CodecId encodingId, ByteBuffer data, byte[] min, byte[] max) {
 		return new EncodeResult(EncodeNode.leaf(encodingId, 0), List.of(data), min, max);
 	}
 
-	public static EncodeResult simple(EncodingId encodingId, ByteBuffer data) {
+	public static EncodeResult simple(CodecId encodingId, ByteBuffer data) {
 		return simple(encodingId, data, null, null);
 	}
 
diff --git a/core/src/main/java/io/github/dfa1/vortex/encoding/FrameOfReferenceCodec.java b/core/src/main/java/io/github/dfa1/vortex/encoding/FrameOfReferenceCodec.java
@@ -69,8 +69,8 @@ private static MemorySegment applyReference(MemorySegment src, long n, PType pty
 	}
 
 	@Override
-	public EncodingId encodingId() {
-		return EncodingId.FASTLANES_FOR;
+	public CodecId encodingId() {
+		return CodecId.FASTLANES_FOR;
 	}
 
 	@Override
diff --git a/core/src/main/java/io/github/dfa1/vortex/encoding/PrimitiveCodec.java b/core/src/main/java/io/github/dfa1/vortex/encoding/PrimitiveCodec.java
@@ -251,8 +251,8 @@ private static byte[] scalarF64(double v) {
 	}
 
 	@Override
-	public EncodingId encodingId() {
-		return EncodingId.VORTEX_PRIMITIVE;
+	public CodecId encodingId() {
+		return CodecId.VORTEX_PRIMITIVE;
 	}
 
 	@Override
diff --git a/core/src/main/java/io/github/dfa1/vortex/encoding/RunEndCodec.java b/core/src/main/java/io/github/dfa1/vortex/encoding/RunEndCodec.java
@@ -129,8 +129,8 @@ private static PType ptypeFromProto(DTypeProtos.PType proto) {
 	}
 
 	@Override
-	public EncodingId encodingId() {
-		return EncodingId.VORTEX_RUNEND;
+	public CodecId encodingId() {
+		return CodecId.VORTEX_RUNEND;
 	}
 
 	@Override
diff --git a/core/src/main/java/io/github/dfa1/vortex/encoding/SequenceCodec.java b/core/src/main/java/io/github/dfa1/vortex/encoding/SequenceCodec.java
@@ -74,8 +74,8 @@ private static long signedValue(dev.vortex.proto.ScalarProtos.ScalarValue sv) {
 	}
 
 	@Override
-	public EncodingId encodingId() {
-		return EncodingId.VORTEX_SEQUENCE;
+	public CodecId encodingId() {
+		return CodecId.VORTEX_SEQUENCE;
 	}
 
 	@Override
diff --git a/core/src/main/java/io/github/dfa1/vortex/encoding/SparseCodec.java b/core/src/main/java/io/github/dfa1/vortex/encoding/SparseCodec.java
@@ -120,8 +120,8 @@ private static PType ptypeFromProto(DTypeProtos.PType proto) {
 	}
 
 	@Override
-	public EncodingId encodingId() {
-		return EncodingId.VORTEX_SPARSE;
+	public CodecId encodingId() {
+		return CodecId.VORTEX_SPARSE;
 	}
 
 	@Override
diff --git a/core/src/test/java/io/github/dfa1/vortex/encoding/AlpCodecTest.java b/core/src/test/java/io/github/dfa1/vortex/encoding/AlpCodecTest.java
@@ -49,7 +49,7 @@ private static DecodeContext buildAlpCtxF64(
 			bb.putLong(v);
 		}
 
-		ArrayNode encNode = new ArrayNode(EncodingId.VORTEX_PRIMITIVE, null,
+		ArrayNode encNode = new ArrayNode(CodecId.VORTEX_PRIMITIVE, null,
 				new ArrayNode[0], new int[]{0}, ArrayStats.empty());
 
 		MemorySegment[] segments;
@@ -68,9 +68,9 @@ private static DecodeContext buildAlpCtxF64(
 				vb.putDouble(v);
 			}
 
-			ArrayNode idxNode = new ArrayNode(EncodingId.VORTEX_PRIMITIVE, null,
+			ArrayNode idxNode = new ArrayNode(CodecId.VORTEX_PRIMITIVE, null,
 					new ArrayNode[0], new int[]{1}, ArrayStats.empty());
-			ArrayNode valNode = new ArrayNode(EncodingId.VORTEX_PRIMITIVE, null,
+			ArrayNode valNode = new ArrayNode(CodecId.VORTEX_PRIMITIVE, null,
 					new ArrayNode[0], new int[]{2}, ArrayStats.empty());
 
 			children = new ArrayNode[]{encNode, idxNode, valNode};
@@ -84,7 +84,7 @@ private static DecodeContext buildAlpCtxF64(
 			segments = new MemorySegment[]{MemorySegment.ofArray(encBuf)};
 		}
 
-		ArrayNode alpNode = new ArrayNode(EncodingId.VORTEX_ALP,
+		ArrayNode alpNode = new ArrayNode(CodecId.VORTEX_ALP,
 				ByteBuffer.wrap(metaBytes), children, new int[0], ArrayStats.empty());
 
 		CodecRegistry registry = CodecRegistry.empty();
@@ -110,10 +110,10 @@ private static DecodeContext buildAlpCtxF32(
 			bb.putInt(v);
 		}
 
-		ArrayNode encNode = new ArrayNode(EncodingId.VORTEX_PRIMITIVE, null,
+		ArrayNode encNode = new ArrayNode(CodecId.VORTEX_PRIMITIVE, null,
 				new ArrayNode[0], new int[]{0}, ArrayStats.empty());
 
-		ArrayNode alpNode = new ArrayNode(EncodingId.VORTEX_ALP,
+		ArrayNode alpNode = new ArrayNode(CodecId.VORTEX_ALP,
 				ByteBuffer.wrap(metaBytes), new ArrayNode[]{encNode}, new int[0], ArrayStats.empty());
 
 		MemorySegment[] segments = {MemorySegment.ofArray(encBuf)};
diff --git a/core/src/test/java/io/github/dfa1/vortex/encoding/FrameOfReferenceCodecTest.java b/core/src/test/java/io/github/dfa1/vortex/encoding/FrameOfReferenceCodecTest.java
@@ -44,7 +44,7 @@ private static DecodeContext buildForContext(
 
 		// ArrayNode for vortex.primitive child: bufferIndices=[0], no children
 		ArrayNode childNode = new ArrayNode(
-				EncodingId.VORTEX_PRIMITIVE,
+				CodecId.VORTEX_PRIMITIVE,
 				null,
 				new ArrayNode[0],
 				new int[]{0},
@@ -53,7 +53,7 @@ private static DecodeContext buildForContext(
 
 		// ArrayNode for fastlanes.for: metadata=scalarBytes, child=childNode, no buffers
 		ArrayNode forNode = new ArrayNode(
-				EncodingId.FASTLANES_FOR,
+				CodecId.FASTLANES_FOR,
 				ByteBuffer.wrap(metaBytes),
 				new ArrayNode[]{childNode},
 				new int[0],
diff --git a/core/src/test/java/io/github/dfa1/vortex/encoding/RunEndCodecTest.java b/core/src/test/java/io/github/dfa1/vortex/encoding/RunEndCodecTest.java
@@ -33,11 +33,11 @@ private static DecodeContext buildCtx(
 		byte[] endsBuf = toLEBytes(ends, endsPtype);
 		byte[] valBuf = toLEBytes(values, PType.I64);
 
-		ArrayNode endsNode = new ArrayNode(EncodingId.VORTEX_PRIMITIVE, null,
+		ArrayNode endsNode = new ArrayNode(CodecId.VORTEX_PRIMITIVE, null,
 				new ArrayNode[0], new int[]{0}, ArrayStats.empty());
-		ArrayNode valsNode = new ArrayNode(EncodingId.VORTEX_PRIMITIVE, null,
+		ArrayNode valsNode = new ArrayNode(CodecId.VORTEX_PRIMITIVE, null,
 				new ArrayNode[0], new int[]{1}, ArrayStats.empty());
-		ArrayNode reNode = new ArrayNode(EncodingId.VORTEX_RUNEND,
+		ArrayNode reNode = new ArrayNode(CodecId.VORTEX_RUNEND,
 				ByteBuffer.wrap(metaBytes),
 				new ArrayNode[]{endsNode, valsNode},
 				new int[0], ArrayStats.empty());
diff --git a/core/src/test/java/io/github/dfa1/vortex/encoding/SparseCodecTest.java b/core/src/test/java/io/github/dfa1/vortex/encoding/SparseCodecTest.java
@@ -65,11 +65,11 @@ private static DecodeContext buildCtx(
 			byte[] idxBuf, byte[] valBuf,
 			DType idxDtype
 	) {
-		ArrayNode idxNode = new ArrayNode(EncodingId.VORTEX_PRIMITIVE, null,
+		ArrayNode idxNode = new ArrayNode(CodecId.VORTEX_PRIMITIVE, null,
 				new ArrayNode[0], new int[]{1}, ArrayStats.empty());
-		ArrayNode valNode = new ArrayNode(EncodingId.VORTEX_PRIMITIVE, null,
+		ArrayNode valNode = new ArrayNode(CodecId.VORTEX_PRIMITIVE, null,
 				new ArrayNode[0], new int[]{2}, ArrayStats.empty());
-		ArrayNode sparseNode = new ArrayNode(EncodingId.VORTEX_SPARSE,
+		ArrayNode sparseNode = new ArrayNode(CodecId.VORTEX_SPARSE,
 				ByteBuffer.wrap(metaBytes),
 				new ArrayNode[]{idxNode, valNode},
 				new int[]{0},
diff --git a/reader/src/test/java/io/github/dfa1/vortex/io/VortexReaderTest.java b/reader/src/test/java/io/github/dfa1/vortex/io/VortexReaderTest.java
@@ -4,7 +4,7 @@
 import io.github.dfa1.vortex.encoding.Codec;
 import io.github.dfa1.vortex.encoding.CodecRegistry;
 import io.github.dfa1.vortex.encoding.DecodeContext;
-import io.github.dfa1.vortex.encoding.EncodingId;
+import io.github.dfa1.vortex.encoding.CodecId;
 import io.github.dfa1.vortex.scan.ScanOptions;
 import io.github.dfa1.vortex.scan.ScanResult;
 import org.junit.jupiter.api.Test;
@@ -29,19 +29,19 @@ private static CodecRegistry buildUniversalStubRegistry() {
 		var registry = CodecRegistry.empty();
 		Codec stub = new Codec() {
 			@Override
-			public EncodingId encodingId() {
-				return EncodingId.VORTEX_PRIMITIVE;
+			public CodecId encodingId() {
+				return CodecId.VORTEX_PRIMITIVE;
 			}
 
 			@Override
 			public Array decode(DecodeContext ctx) {
 				return Array.empty(ctx.dtype());
 			}
 		};
-		for (EncodingId encodingId : EncodingId.values()) {
+		for (CodecId encodingId : CodecId.values()) {
 			registry.register(new Codec() {
 				@Override
-				public EncodingId encodingId() {
+				public CodecId encodingId() {
 					return encodingId;
 				}
 
diff --git a/writer/src/main/java/io/github/dfa1/vortex/writer/VortexWriter.java b/writer/src/main/java/io/github/dfa1/vortex/writer/VortexWriter.java

Original file line number	Diff line number	Diff line change
`@@ -76,8 +76,8 @@ private static PType ptypeFromProto(DTypeProtos.PType proto) {`
`76`	`76`	`}`
`77`	`77`
`78`	`78`	`@Override`
`79`		`- public EncodingId encodingId() {`
`80`		`- return EncodingId.VORTEX_ALP;`
	`79`	`+ public CodecId encodingId() {`
	`80`	`+ return CodecId.VORTEX_ALP;`
`81`	`81`	`}`
`82`	`82`
`83`	`83`	`// ── F32 ───────────────────────────────────────────────────────────────────`
Original file line number	Diff line number	Diff line change
`@@ -488,8 +488,8 @@ private static boolean isUnsigned(PType ptype) {`
`488`	`488`	`// ── Type conversion ───────────────────────────────────────────────────────`
`489`	`489`
`490`	`490`	`@Override`
`491`		`- public EncodingId encodingId() {`
`492`		`- return EncodingId.FASTLANES_BITPACKED;`
	`491`	`+ public CodecId encodingId() {`
	`492`	`+ return CodecId.FASTLANES_BITPACKED;`
`493`	`493`	`}`
`494`	`494`
`495`	`495`	`// ── Misc helpers ──────────────────────────────────────────────────────────`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ private static ByteBuffer encodeBool(boolean[] data) {`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`@Override`
`24`		`- public EncodingId encodingId() {`
`25`		`- return EncodingId.VORTEX_BOOL;`
	`24`	`+ public CodecId encodingId() {`
	`25`	`+ return CodecId.VORTEX_BOOL;`
`26`	`26`	`}`
`27`	`27`
`28`	`28`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -45,8 +45,8 @@ private static void writeRaw(ByteBuffer buf, PType ptype, long rawBits) {`
`45`	`45`	`// ── Helpers ───────────────────────────────────────────────────────────────`
`46`	`46`
`47`	`47`	`@Override`
`48`		`- public EncodingId encodingId() {`
`49`		`- return EncodingId.VORTEX_CONSTANT;`
	`48`	`+ public CodecId encodingId() {`
	`49`	`+ return CodecId.VORTEX_CONSTANT;`
`50`	`50`	`}`
`51`	`51`
`52`	`52`	`@Override`
Original file line number	Diff line number	Diff line change
`@@ -151,8 +151,8 @@ private static boolean isUnsigned(PType ptype) {`
`151`	`151`	`// ── Type conversion ───────────────────────────────────────────────────────`
`152`	`152`
`153`	`153`	`@Override`
`154`		`- public EncodingId encodingId() {`
`155`		`- return EncodingId.FASTLANES_DELTA;`
	`154`	`+ public CodecId encodingId() {`
	`155`	`+ return CodecId.FASTLANES_DELTA;`
`156`	`156`	`}`
`157`	`157`
`158`	`158`	`@Override`