moparisthebest/poi
1
0
Fork 0
Code Issues Pull Requests Releases 1 Wiki Activity

Use long for the dummy stream, to permit >2gb streams

Browse Source 
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1782470 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Nick Burch 2017-02-10 13:51:33 +00:00
parent b6480adb9f
commit fc31afbb86
1 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/testcases/org/apache/poi/poifs/filesystem/TestNPOIFSFileSystem.java
View File

@ -1569,6 +1569,10 @@ public final class TestNPOIFSFileSystem {
* Note that to run this test, you will require 2.5+gb of free * Note that to run this test, you will require 2.5+gb of free
* space on your TMP/TEMP partition/disk * space on your TMP/TEMP partition/disk
* *
* Note that to run this test, you need to be able to mmap 2.5+gb
* files, which may need bigger kernel.shmmax and vm.max_map_count
* settings on Linux.
*
* TODO Fix this to work... * TODO Fix this to work...
*/ */
@Test @Test
@ -1578,13 +1582,16 @@ public final class TestNPOIFSFileSystem {
Assume.assumeTrue("2.5gb of free space is required on your tmp/temp " + Assume.assumeTrue("2.5gb of free space is required on your tmp/temp " +
"partition/disk to run large file tests", "partition/disk to run large file tests",
big.getFreeSpace() > 2.5*1024*1024*1024); big.getFreeSpace() > 2.5*1024*1024*1024);
System.out.println("Slow, memory heavy test in progress....");
int s100mb = 100*1024*1024; int s100mb = 100*1024*1024;
int s512mb = 512*1024*1024; int s512mb = 512*1024*1024;
long s2gb = 2l*1024*1024*1024;
DocumentEntry entry; DocumentEntry entry;
NPOIFSFileSystem fs;
// Create a just-sub 2gb file // Create a just-sub 2gb file
NPOIFSFileSystem fs = POIFSFileSystem.create(big); fs = POIFSFileSystem.create(big);
for (int i=0; i<19; i++) { for (int i=0; i<19; i++) {
fs.createDocument(new DummyDataInputStream(s100mb), "Entry"+i); fs.createDocument(new DummyDataInputStream(s100mb), "Entry"+i);
} }
@ -1652,15 +1659,17 @@ public final class TestNPOIFSFileSystem {
fs.close(); fs.close();
big.delete(); big.delete();
// Create a file with a 2gb entry // Create a file with a 2gb entry
fs = POIFSFileSystem.create(big);
fs.createDocument(new DummyDataInputStream(s100mb), "Small");
// TODO Check we get a helpful error about the max size // TODO Check we get a helpful error about the max size
fs.createDocument(new DummyDataInputStream(s2gb), "Big");
} }
protected static class DummyDataInputStream extends InputStream { protected static class DummyDataInputStream extends InputStream {
protected final int maxSize; protected final long maxSize;
protected int size; protected long size;
public DummyDataInputStream(int maxSize) { public DummyDataInputStream(long maxSize) {
this.maxSize = maxSize; this.maxSize = maxSize;
this.size = 0; this.size = 0;
} }
@ -1668,7 +1677,7 @@ public final class TestNPOIFSFileSystem {
public int read() throws IOException { public int read() throws IOException {
if (size >= maxSize) return -1; if (size >= maxSize) return -1;
size++; size++;
return size % 128; return (int)(size % 128);
} }
public int read(byte[] b) throws IOException { public int read(byte[] b) throws IOException {
@ -1676,7 +1685,7 @@ public final class TestNPOIFSFileSystem {
} }
public int read(byte[] b, int offset, int len) throws IOException { public int read(byte[] b, int offset, int len) throws IOException {
if (size >= maxSize) return -1; if (size >= maxSize) return -1;
int sz = Math.min(len, maxSize-size); int sz = (int)Math.min(len, maxSize-size);
for (int i=0; i<sz; i++) { for (int i=0; i<sz; i++) {
b[i+offset] = (byte)((size+i) % 128); b[i+offset] = (byte)((size+i) % 128);
} }