Browse Source

Merge changes I51167503,I794eca3a

* changes:
  TemporaryBuffer: Clear block pointer list instead of reallocating
  TemporaryBuffer: Allow presizing block pointer list
stable-4.0
Dave Borowitz 10 years ago committed by Gerrit Code Review @ Eclipse.org
parent
commit
65c379e02d
  1. 25
      org.eclipse.jgit.test/tst/org/eclipse/jgit/util/TemporaryBufferTest.java
  2. 57
      org.eclipse.jgit/src/org/eclipse/jgit/util/TemporaryBuffer.java

25
org.eclipse.jgit.test/tst/org/eclipse/jgit/util/TemporaryBufferTest.java

@ -53,7 +53,9 @@ import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import org.eclipse.jgit.junit.TestRng;
import org.eclipse.jgit.util.TemporaryBuffer.Block;
import org.junit.Test;
public class TemporaryBufferTest {
@ -424,4 +426,27 @@ public class TemporaryBufferTest {
assertEquals("In-memory buffer limit exceeded", e.getMessage());
}
}
@Test
public void testHeapWithEstimatedSize() throws IOException {
int sz = 2 * Block.SZ;
try (TemporaryBuffer b = new TemporaryBuffer.Heap(sz / 2, sz)) {
for (int i = 0; i < sz; i++) {
b.write('x');
}
try {
b.write(1);
fail("accepted too many bytes of data");
} catch (IOException e) {
assertEquals("In-memory buffer limit exceeded", e.getMessage());
}
try (InputStream in = b.openInputStream()) {
for (int i = 0; i < sz; i++) {
assertEquals('x', in.read());
}
assertEquals(-1, in.read());
}
}
}
}

57
org.eclipse.jgit/src/org/eclipse/jgit/util/TemporaryBuffer.java

@ -78,6 +78,9 @@ public abstract class TemporaryBuffer extends OutputStream {
*/
private int inCoreLimit;
/** Initial size of block list. */
private int initialBlocks;
/** If {@link #inCoreLimit} has been reached, remainder goes here. */
private OutputStream overflow;
@ -86,10 +89,28 @@ public abstract class TemporaryBuffer extends OutputStream {
*
* @param limit
* maximum number of bytes to store in memory before entering the
* overflow output path.
* overflow output path; also used as the estimated size.
*/
protected TemporaryBuffer(final int limit) {
inCoreLimit = limit;
this(limit, limit);
}
/**
* Create a new empty temporary buffer.
*
* @param estimatedSize
* estimated size of storage used, to size the initial list of
* block pointers.
* @param limit
* maximum number of bytes to store in memory before entering the
* overflow output path.
* @since 4.0
*/
protected TemporaryBuffer(final int estimatedSize, final int limit) {
if (estimatedSize > limit)
throw new IllegalArgumentException();
this.inCoreLimit = limit;
this.initialBlocks = (estimatedSize - 1) / Block.SZ + 1;
reset();
}
@ -270,13 +291,11 @@ public abstract class TemporaryBuffer extends OutputStream {
if (overflow != null) {
destroy();
}
if (inCoreLimit < Block.SZ) {
blocks = new ArrayList<Block>(1);
blocks.add(new Block(inCoreLimit));
} else {
blocks = new ArrayList<Block>(inCoreLimit / Block.SZ);
blocks.add(new Block());
}
if (blocks != null)
blocks.clear();
else
blocks = new ArrayList<Block>(initialBlocks);
blocks.add(new Block(Math.min(inCoreLimit, Block.SZ)));
}
/**
@ -498,12 +517,28 @@ public abstract class TemporaryBuffer extends OutputStream {
* Create a new heap buffer with a maximum storage limit.
*
* @param limit
* maximum number of bytes that can be stored in this buffer;
* also used as the estimated size. Storing beyond this many
* will cause an IOException to be thrown during write.
*/
public Heap(final int limit) {
super(limit);
}
/**
* Create a new heap buffer with a maximum storage limit.
*
* @param estimatedSize
* estimated size of storage used, to size the initial list of
* block pointers.
* @param limit
* maximum number of bytes that can be stored in this buffer.
* Storing beyond this many will cause an IOException to be
* thrown during write.
* @since 4.0
*/
public Heap(final int limit) {
super(limit);
public Heap(final int estimatedSize, final int limit) {
super(estimatedSize, limit);
}
@Override

Loading…
Cancel
Save