Skip to content

Commit 1183c52

Browse files
dfa1claude
andcommitted
fix: byte-buddy-agent dep + S2184 + unused import
- pom.xml: add byte-buddy-agent as root test dep so dependency:properties resolves it in all modules (fixes CI ${net.bytebuddy:byte-buddy-agent:jar} unresolved error) - PcoEncodingEncoder: change `- 1` to `- 1L` at all 3 weight writeBits calls so both subtraction operands are explicitly long (S2184) - SparseEncodingDecoder: remove unused ByteOrder import Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 2ba7b87 commit 1183c52

3 files changed

Lines changed: 18 additions & 4 deletions

File tree

pom.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,9 @@
7373
<slf4j.version>2.0.18</slf4j.version>
7474
<!-- coverage -->
7575
<jacoco-maven-plugin.version>0.8.13</jacoco-maven-plugin.version>
76+
<!-- byte-buddy-agent version must match what mockito-core pulls in transitively.
77+
Update this when bumping mockito.version (run: mvn dependency:tree -pl reader | grep byte-buddy-agent). -->
78+
<bytebuddy.version>1.17.7</bytebuddy.version>
7679
<!-- Generated sources (FlatBuffers + Protobuf) live under fbs/ and proto/. They
7780
are emitted by external code-gen and have no hand-written behaviour worth
7881
covering; counting them tanks the project-wide coverage ratio without
@@ -249,6 +252,18 @@
249252
</dependencies>
250253
</dependencyManagement>
251254

255+
<!-- byte-buddy-agent declared here so every module has it in its dependency tree,
256+
which allows maven-dependency-plugin:properties to resolve
257+
${net.bytebuddy:byte-buddy-agent:jar} for the surefire -javaagent arg. -->
258+
<dependencies>
259+
<dependency>
260+
<groupId>net.bytebuddy</groupId>
261+
<artifactId>byte-buddy-agent</artifactId>
262+
<version>${bytebuddy.version}</version>
263+
<scope>test</scope>
264+
</dependency>
265+
</dependencies>
266+
252267
<build>
253268
<pluginManagement>
254269
<plugins>

reader/src/main/java/io/github/dfa1/vortex/reader/decode/SparseEncodingDecoder.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
import java.lang.foreign.MemorySegment;
3131
import java.lang.foreign.ValueLayout;
3232
import java.nio.ByteBuffer;
33-
import java.nio.ByteOrder;
3433

3534
/// Read-only decoder for {@code vortex.sparse}.
3635
public final class SparseEncodingDecoder implements EncodingDecoder {

writer/src/main/java/io/github/dfa1/vortex/writer/encode/PcoEncodingEncoder.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -305,7 +305,7 @@ private static MemorySegment buildClassicChunkMeta(
305305
int offsetBitsWidth = bitsToEncodeOffsetBits(dtypeSize);
306306
for (int i = 0; i < bins.size(); i++) {
307307
PcoBinOptimizer.Bin bin = bins.get(i);
308-
w.writeBits((long) weights[i] - 1, ansSizeLog);
308+
w.writeBits((long) weights[i] - 1L, ansSizeLog);
309309
w.writeBits(bin.lowerLatent(), dtypeSize);
310310
w.writeBits(bin.offsetBits(), offsetBitsWidth);
311311
}
@@ -337,7 +337,7 @@ private static MemorySegment buildIntMultChunkMeta(
337337
w.writeBits(primaryBins.size(), 15);
338338
for (int i = 0; i < primaryBins.size(); i++) {
339339
PcoBinOptimizer.Bin bin = primaryBins.get(i);
340-
w.writeBits((long) primaryWeights[i] - 1, primaryAnsSizeLog);
340+
w.writeBits((long) primaryWeights[i] - 1L, primaryAnsSizeLog);
341341
w.writeBits(bin.lowerLatent(), dtypeSize);
342342
w.writeBits(bin.offsetBits(), offsetBitsWidth);
343343
}
@@ -347,7 +347,7 @@ private static MemorySegment buildIntMultChunkMeta(
347347
w.writeBits(secondaryBins.size(), 15);
348348
for (int i = 0; i < secondaryBins.size(); i++) {
349349
PcoBinOptimizer.Bin bin = secondaryBins.get(i);
350-
w.writeBits((long) secondaryWeights[i] - 1, secondaryAnsSizeLog);
350+
w.writeBits((long) secondaryWeights[i] - 1L, secondaryAnsSizeLog);
351351
w.writeBits(bin.lowerLatent(), dtypeSize);
352352
w.writeBits(bin.offsetBits(), offsetBitsWidth);
353353
}

0 commit comments

Comments
 (0)