From 44974c98740ab358e4157c8c4e0358312873ebb3 Mon Sep 17 00:00:00 2001
From: Håvard Pettersen <havardpe@oath.com>
Date: Tue, 15 Jun 2021 11:47:17 +0000
Subject: try to use less memory for buffers

- fix default 64k max sizes
- start with empty buffers
- simplify Buffer class
---
 jrt/tests/com/yahoo/jrt/BufferTest.java | 58 +--------------------------------
 1 file changed, 1 insertion(+), 57 deletions(-)

(limited to 'jrt/tests')

diff --git a/jrt/tests/com/yahoo/jrt/BufferTest.java b/jrt/tests/com/yahoo/jrt/BufferTest.java
index 7f3145365d9..10f1fbc17d3 100644
--- a/jrt/tests/com/yahoo/jrt/BufferTest.java
+++ b/jrt/tests/com/yahoo/jrt/BufferTest.java
@@ -28,7 +28,7 @@ public class BufferTest {
     @org.junit.Test
     public void testBuffer() {
 
-        int        size = Buffer.MAX_IO + (Buffer.MAX_IO / 10);
+        int        size = 70*1024;
         Buffer     buf  = new Buffer(1024);
         ByteBuffer b    = null;
 
@@ -117,62 +117,6 @@ public class BufferTest {
         }
     }
 
-    @org.junit.Test
-    public void testBufferMax() {
-        int        size = Buffer.MAX_IO + (Buffer.MAX_IO / 10);
-        Buffer     buf  = new Buffer(1024);
-        ByteBuffer b    = null;
-
-        byte[] x = new byte[size];
-        byte[] y = new byte[size];
-
-        Arrays.fill(x, (byte) 10);
-        Arrays.fill(y, (byte) 55);
-
-        assertEquals(buf.bytes(), 0);
-        assertFalse(Arrays.equals(x, y));
-
-        b = buf.getChannelWritable(size);
-        assertEquals(b.remaining(), Buffer.MAX_IO);
-        assertTrue(b.remaining() < size);
-        assertEquals(buf.bytes(), 0);
-        b.put(x, 0, Buffer.MAX_IO);
-        assertEquals(buf.bytes(), Buffer.MAX_IO);
-        assertEquals(b.remaining(), 0);
-
-        b = buf.getChannelWritable(size - Buffer.MAX_IO);
-        assertTrue(b.remaining() >= size - Buffer.MAX_IO);
-        assertEquals(buf.bytes(), Buffer.MAX_IO);
-        b.put(x, Buffer.MAX_IO, x.length - Buffer.MAX_IO);
-        assertEquals(buf.bytes(), size);
-
-        b = buf.getChannelReadable();
-        assertEquals(buf.bytes(), size);
-
-        b = buf.getChannelWritable(512);
-        assertEquals(buf.bytes(), size);
-        b.put((byte)42);
-        assertEquals(buf.bytes(), size + 1);
-
-        b = buf.getChannelReadable();
-        assertEquals(buf.bytes(), size + 1);
-        assertEquals(b.remaining(), Buffer.MAX_IO);
-        b.get(y, 0, Buffer.MAX_IO);
-        assertEquals(buf.bytes(), size - Buffer.MAX_IO + 1);
-
-        b = buf.getChannelReadable();
-        assertEquals(buf.bytes(), size - Buffer.MAX_IO + 1);
-        assertEquals(b.remaining(), size - Buffer.MAX_IO + 1);
-        b.get(y, Buffer.MAX_IO, y.length - Buffer.MAX_IO);
-        assertEquals(buf.bytes(), 1);
-        assertEquals(b.remaining(), 1);
-        assertEquals(b.get(), 42);
-        assertEquals(buf.bytes(), 0);
-        assertEquals(b.remaining(), 0);
-
-        assertTrue(Arrays.equals(x, y));
-    }
-
     @org.junit.Test
     public void testBufferShrink() {
         Buffer     buf = new Buffer(500);
-- 
cgit v1.2.3