Browse Source
This method creates a RawText from a blob, but avoids reading the blob if the start contains null bytes. This should reduce the amount of garbage that Gerrit produces for changes with binaries. Signed-off-by: Han-Wen Nienhuys <hanwen@google.com> Change-Id: Idd202d20251f2d1653e5f1ca374fe644c2cf205fstable-4.10
Han-Wen Nienhuys
7 years ago
4 changed files with 271 additions and 53 deletions
@ -0,0 +1,110 @@ |
|||||||
|
/* |
||||||
|
* Copyright (C) 2017, Google Inc. |
||||||
|
* and other copyright owners as documented in the project's IP log. |
||||||
|
* |
||||||
|
* This program and the accompanying materials are made available |
||||||
|
* under the terms of the Eclipse Distribution License v1.0 which |
||||||
|
* accompanies this distribution, is reproduced below, and is |
||||||
|
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||||
|
* |
||||||
|
* All rights reserved. |
||||||
|
* |
||||||
|
* Redistribution and use in source and binary forms, with or |
||||||
|
* without modification, are permitted provided that the following |
||||||
|
* conditions are met: |
||||||
|
* |
||||||
|
* - Redistributions of source code must retain the above copyright |
||||||
|
* notice, this list of conditions and the following disclaimer. |
||||||
|
* |
||||||
|
* - Redistributions in binary form must reproduce the above |
||||||
|
* copyright notice, this list of conditions and the following |
||||||
|
* disclaimer in the documentation and/or other materials provided |
||||||
|
* with the distribution. |
||||||
|
* |
||||||
|
* - Neither the name of the Eclipse Foundation, Inc. nor the |
||||||
|
* names of its contributors may be used to endorse or promote |
||||||
|
* products derived from this software without specific prior |
||||||
|
* written permission. |
||||||
|
* |
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
||||||
|
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
||||||
|
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||||
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
||||||
|
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||||
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
||||||
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
||||||
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
||||||
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
||||||
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
||||||
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||||
|
*/ |
||||||
|
package org.eclipse.jgit.diff; |
||||||
|
|
||||||
|
import org.eclipse.jgit.errors.BinaryBlobException; |
||||||
|
import org.eclipse.jgit.internal.storage.file.FileRepository; |
||||||
|
import org.eclipse.jgit.junit.RepositoryTestCase; |
||||||
|
import org.eclipse.jgit.lib.Constants; |
||||||
|
import org.eclipse.jgit.lib.ObjectId; |
||||||
|
import org.eclipse.jgit.lib.ObjectInserter; |
||||||
|
import org.eclipse.jgit.lib.ObjectLoader; |
||||||
|
import org.junit.Assert; |
||||||
|
import org.junit.Test; |
||||||
|
|
||||||
|
import java.io.IOException; |
||||||
|
|
||||||
|
public class RawTextLoadTest extends RepositoryTestCase { |
||||||
|
private static byte[] generate(int size, int nullAt) { |
||||||
|
byte[] data = new byte[size]; |
||||||
|
for (int i = 0; i < data.length; i++) { |
||||||
|
data[i] = (byte) ((i % 72 == 0) ? '\n' : (i%10) + '0'); |
||||||
|
} |
||||||
|
if (nullAt >= 0) { |
||||||
|
data[nullAt] = '\0'; |
||||||
|
} |
||||||
|
return data; |
||||||
|
} |
||||||
|
|
||||||
|
private RawText textFor(byte[] data, int limit) throws IOException, BinaryBlobException { |
||||||
|
FileRepository repo = createBareRepository(); |
||||||
|
ObjectId id; |
||||||
|
try (ObjectInserter ins = repo.getObjectDatabase().newInserter()) { |
||||||
|
id = ins.insert(Constants.OBJ_BLOB, data); |
||||||
|
} |
||||||
|
ObjectLoader ldr = repo.open(id); |
||||||
|
return RawText.load(ldr, limit); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
public void testSmallOK() throws Exception { |
||||||
|
byte[] data = generate(1000, -1); |
||||||
|
RawText result = textFor(data, 1 << 20); |
||||||
|
Assert.assertArrayEquals(result.content, data); |
||||||
|
} |
||||||
|
|
||||||
|
@Test(expected = BinaryBlobException.class) |
||||||
|
public void testSmallNull() throws Exception { |
||||||
|
byte[] data = generate(1000, 22); |
||||||
|
textFor(data, 1 << 20); |
||||||
|
} |
||||||
|
|
||||||
|
@Test |
||||||
|
public void testBigOK() throws Exception { |
||||||
|
byte[] data = generate(10000, -1); |
||||||
|
RawText result = textFor(data, 1 << 20); |
||||||
|
Assert.assertArrayEquals(result.content, data); |
||||||
|
} |
||||||
|
|
||||||
|
@Test(expected = BinaryBlobException.class) |
||||||
|
public void testBigWithNullAtStart() throws Exception { |
||||||
|
byte[] data = generate(10000, 22); |
||||||
|
textFor(data, 1 << 20); |
||||||
|
} |
||||||
|
|
||||||
|
@Test(expected = BinaryBlobException.class) |
||||||
|
public void testBinaryThreshold() throws Exception { |
||||||
|
byte[] data = generate(2 << 20, -1); |
||||||
|
textFor(data, 1 << 20); |
||||||
|
} |
||||||
|
} |
@ -0,0 +1,58 @@ |
|||||||
|
/* |
||||||
|
* Copyright (C) 2017 Google Inc. |
||||||
|
* and other copyright owners as documented in the project's IP log. |
||||||
|
* |
||||||
|
* This program and the accompanying materials are made available |
||||||
|
* under the terms of the Eclipse Distribution License v1.0 which |
||||||
|
* accompanies this distribution, is reproduced below, and is |
||||||
|
* available at http://www.eclipse.org/org/documents/edl-v10.php
|
||||||
|
* |
||||||
|
* All rights reserved. |
||||||
|
* |
||||||
|
* Redistribution and use in source and binary forms, with or |
||||||
|
* without modification, are permitted provided that the following |
||||||
|
* conditions are met: |
||||||
|
* |
||||||
|
* - Redistributions of source code must retain the above copyright |
||||||
|
* notice, this list of conditions and the following disclaimer. |
||||||
|
* |
||||||
|
* - Redistributions in binary form must reproduce the above |
||||||
|
* copyright notice, this list of conditions and the following |
||||||
|
* disclaimer in the documentation and/or other materials provided |
||||||
|
* with the distribution. |
||||||
|
* |
||||||
|
* - Neither the name of the Eclipse Foundation, Inc. nor the |
||||||
|
* names of its contributors may be used to endorse or promote |
||||||
|
* products derived from this software without specific prior |
||||||
|
* written permission. |
||||||
|
* |
||||||
|
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND |
||||||
|
* CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, |
||||||
|
* INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES |
||||||
|
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE |
||||||
|
* ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR |
||||||
|
* CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, |
||||||
|
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT |
||||||
|
* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; |
||||||
|
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER |
||||||
|
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, |
||||||
|
* STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) |
||||||
|
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF |
||||||
|
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
||||||
|
*/ |
||||||
|
package org.eclipse.jgit.errors; |
||||||
|
|
||||||
|
/** |
||||||
|
* BinaryBlobException is used to signal that binary data was found |
||||||
|
* in a context that requires text (eg. for generating textual diffs). |
||||||
|
* |
||||||
|
* @since 4.10 |
||||||
|
*/ |
||||||
|
public class BinaryBlobException extends Exception { |
||||||
|
private static final long serialVersionUID = 1L; |
||||||
|
|
||||||
|
/** |
||||||
|
* Construct a BinaryBlobException. |
||||||
|
*/ |
||||||
|
public BinaryBlobException() {} |
||||||
|
} |
Loading…
Reference in new issue