faster: manual << → JVM VarHandle

Author: magicprinc

src/main/java/com/trivago/fastutilconcurrentwrapper/io/BAIS.java

@@ -1,5 +1,6 @@
 package com.trivago.fastutilconcurrentwrapper.io;
 
+import com.trivago.fastutilconcurrentwrapper.util.JBytes;
 import it.unimi.dsi.fastutil.io.MeasurableStream;
 import it.unimi.dsi.fastutil.io.RepositionableStream;
 import jakarta.validation.constraints.PositiveOrZero;
@@ -175,7 +176,10 @@ public char readChar() {
 
 	@Override
 	public int readInt() {
-		return read() << 24 | ((read() & 0xFF) << 16) | ((read() & 0xFF) << 8) | (read() & 0xFF);
+		//return read() << 24 | ((read() & 0xFF) << 16) | ((read() & 0xFF) << 8) | (read() & 0xFF);
+		int v = JBytes.DirectByteArrayAccess.getInt(buf, pos);
+		pos += 4;
+		return v;
 	}
 
 	public int readMedium () {
@@ -193,7 +197,10 @@ public UUID readUUID () {
 
 	@Override
 	public long readLong () {
-		return (long) readInt() << 32 | (readInt() & 0xFFFF_FFFFL);
+		//return (long) readInt() << 32 | (readInt() & 0xFFFF_FFFFL);
+		long v = JBytes.DirectByteArrayAccess.getLong(buf, pos);
+		pos += 8;
+		return v;
 	}
 
 	@Override

src/main/java/com/trivago/fastutilconcurrentwrapper/io/BAOS.java

@@ -1,6 +1,7 @@
 package com.trivago.fastutilconcurrentwrapper.io;
 
 import com.google.errorprone.annotations.CanIgnoreReturnValue;
+import com.trivago.fastutilconcurrentwrapper.util.JBytes;
 import it.unimi.dsi.fastutil.Arrays;
 import it.unimi.dsi.fastutil.bytes.ByteArrays;
 import it.unimi.dsi.fastutil.io.MeasurableStream;
@@ -145,6 +146,7 @@ public void resize (@PositiveOrZero int targetCapacity) {
 	/// @see org.springframework.util.ResizableByteArrayOutputStream#grow(int)
 	public void grow (@PositiveOrZero int additionalCapacity) {
 		//Assert.isTrue(additionalCapacity >= 0, "Additional capacity must be 0 or higher");
+		if (count < position) additionalCapacity = additionalCapacity + position - count;
 		int needed = count + additionalCapacity;
 		if (needed > buf.length){// size + new > capacity
 			int newCapacity = (int)Math.min(Math.max((long)buf.length + (buf.length >> 1), needed), Arrays.MAX_ARRAY_SIZE);
@@ -182,36 +184,36 @@ public void writeTo (OutputStream out) throws IOException {
 
 
 	@Override
-	public void writeBoolean(boolean v)  {
+	public void writeBoolean(boolean v) {
 		write(v?1:0);
 	}
 
 	@Override
-	public void writeByte(int v)  {
+	public void writeByte(int v) {
 		write(v);
 	}
 
 	@Override
-	public void writeShort(int v)  {
+	public void writeShort(int v) {
 		write(v >> 8);
 		write(v);
 	}
 
 	@Override
-	public void writeChar(int v)  {
+	public void writeChar(int v) {
 		write(v >> 8);
 		write(v);
 	}
 
 	@Override
-	public void writeInt(int v)  {
-		write(v >> 24);
-		write(v >> 16);
-		write(v >> 8);
-		write(v);
+	public void writeInt (int v) {
+		grow(4);
+		JBytes.DirectByteArrayAccess.setInt(buf, position, v);
+		position += 4;
+		if (count < position) count = position;
 	}
 
-	public void writeMedium (int v)  {
+	public void writeMedium (int v) {
 		write(v >> 16);
 		write(v >> 8);
 		write(v);
@@ -223,18 +225,20 @@ public void writeUUID (UUID uuid) {
 	}
 
 	@Override
-	public void writeLong (long v)  {
-		writeInt((int)(v >> 32));
-		writeInt((int) v);
+	public void writeLong (long v) {
+		grow(8);
+		JBytes.DirectByteArrayAccess.setLong(buf, position, v);
+		position += 8;
+		if (count < position) count = position;
 	}
 
 	@Override
-	public void writeFloat(float v)  {
+	public void writeFloat(float v) {
 		writeInt(Float.floatToIntBits(v));
 	}
 
 	@Override
-	public void writeDouble(double v)  {
+	public void writeDouble(double v) {
 		writeLong(Double.doubleToLongBits(v));
 	}
 

src/test/java/com/trivago/fastutilconcurrentwrapper/io/BAOSTest.java

@@ -890,7 +890,7 @@ void _setArray () {
 		assertEquals(2, o.position());
 		assertEquals(2, o.writerIndex());
 		o.writeLong(0x1234567812345678L);
-		assertEquals(13, o.capacity());
+		assertEquals(10, o.capacity());
 		assertEquals(10, o.size());
 		assertEquals(10, o.length());
 		assertEquals(10, o.position());
@@ -926,30 +926,30 @@ void _spring_ResizableByteArrayOutputStream () {
 
 		o.grow(20);
 		assertEquals("0123456789", o.toString());
-		assertEquals(30, o.capacity());
+		assertEquals(47, o.capacity());
 		assertEquals(10, o.size());
 		assertEquals(10, o.length());
 		assertEquals(27, o.position());
 		assertEquals(27, o.writerIndex());
 
 		o.grow(100);
 		assertEquals("0123456789", o.toString());
-		assertEquals(110, o.capacity());// 10 было занято и 100 сверху
+		assertEquals(127, o.capacity());// 10 было занято и 100 сверху
 		assertEquals(10, o.size());
 
 		o.grow(10);
 		assertEquals("0123456789", o.toString());
-		assertEquals(110, o.capacity());
+		assertEquals(127, o.capacity());
 		assertEquals(10, o.size());
 
 		o.writerIndex(109);
 		o.write('x');
-		assertEquals(110, o.capacity());
+		assertEquals(127, o.capacity());
 		assertEquals(110, o.size());
 		assertEquals(110, o.position());
 
-		o.grow(10);
-		assertEquals(165, o.capacity());// 110 * 1.5 = 165
+		o.grow(30);
+		assertEquals(190, o.capacity());// 127 * 1.5 = 190
 		assertEquals(110, o.size());
 	}
 

src/test/java/com/trivago/fastutilconcurrentwrapper/io/FastByteArrayStreamsTest.java

@@ -157,10 +157,14 @@ void testEOF () throws UTFDataFormatException {
 		assertEquals(-1, r.readShort());
 		assertEquals(0xFFFF, r.readUnsignedShort());
 		assertEquals(0xFFFF, r.readChar());
-		assertEquals(-1, r.readInt());
-		assertEquals(-1, r.readLong());
-		assertEquals(Float.NaN, r.readFloat());
-		assertEquals(Double.NaN, r.readDouble());
+		//assertEquals(-1, r.readInt());
+		assertThrows(ArrayIndexOutOfBoundsException.class, r::readInt);
+		//assertEquals(-1, r.readLong());
+		assertThrows(ArrayIndexOutOfBoundsException.class, r::readLong);
+		//assertEquals(Float.NaN, r.readFloat());
+		assertThrows(ArrayIndexOutOfBoundsException.class, r::readFloat);
+		//assertEquals(Double.NaN, r.readDouble());
+		assertThrows(ArrayIndexOutOfBoundsException.class, r::readDouble);
 		assertNull(r.readLine());
 		assertNull(r.readUTF());
 	}