motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge changes I424295df,Ib003f7c8 

* changes:
  Treat RawText of binary data as file with one single line.
  Trim boilerplate in RawParseUtils_LineMapTest.
This commit is contained in:
David Pursehouse 2017-08-01 10:18:48 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent 8c6a9a286e a551b64694
commit 4085646f6d
2 changed files with 48 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
org.eclipse.jgit.test/tst/org/eclipse/jgit/util/RawParseUtils_LineMapTest.java
View File

@ -43,6 +43,7 @@
package org.eclipse.jgit.util;
import static org.junit.Assert.assertArrayEquals;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@ -55,52 +56,51 @@ public class RawParseUtils_LineMapTest {
public void testEmpty() {
final IntList map = RawParseUtils.lineMap(new byte[] {}, 0, 0);
assertNotNull(map);
assertEquals(2, map.size());
assertEquals(Integer.MIN_VALUE, map.get(0));
assertEquals(0, map.get(1));
assertArrayEquals(new int[]{Integer.MIN_VALUE, 0}, asInts(map));
}
@Test
public void testOneBlankLine() {
final IntList map = RawParseUtils.lineMap(new byte[] { '\n' }, 0, 1);
assertEquals(3, map.size());
assertEquals(Integer.MIN_VALUE, map.get(0));
assertEquals(0, map.get(1));
assertEquals(1, map.get(2));
assertArrayEquals(new int[]{Integer.MIN_VALUE, 0, 1}, asInts(map));
}
@Test
public void testTwoLineFooBar() throws UnsupportedEncodingException {
final byte[] buf = "foo\nbar\n".getBytes("ISO-8859-1");
final IntList map = RawParseUtils.lineMap(buf, 0, buf.length);
assertEquals(4, map.size());
assertEquals(Integer.MIN_VALUE, map.get(0));
assertEquals(0, map.get(1));
assertEquals(4, map.get(2));
assertEquals(buf.length, map.get(3));
assertArrayEquals(new int[]{Integer.MIN_VALUE, 0, 4, buf.length}, asInts(map));
}
@Test
public void testTwoLineNoLF() throws UnsupportedEncodingException {
final byte[] buf = "foo\nbar".getBytes("ISO-8859-1");
final IntList map = RawParseUtils.lineMap(buf, 0, buf.length);
assertEquals(4, map.size());
assertEquals(Integer.MIN_VALUE, map.get(0));
assertEquals(0, map.get(1));
assertEquals(4, map.get(2));
assertEquals(buf.length, map.get(3));
assertArrayEquals(new int[]{Integer.MIN_VALUE, 0, 4, buf.length}, asInts(map));
}
@Test
public void testBinary() throws UnsupportedEncodingException {
final byte[] buf = "xxxfoo\nb\0ar".getBytes("ISO-8859-1");
final IntList map = RawParseUtils.lineMap(buf, 3, buf.length);
assertArrayEquals(new int[]{Integer.MIN_VALUE, 3, buf.length}, asInts(map));
}
@Test
public void testFourLineBlanks() throws UnsupportedEncodingException {
final byte[] buf = "foo\n\n\nbar\n".getBytes("ISO-8859-1");
final IntList map = RawParseUtils.lineMap(buf, 0, buf.length);
assertEquals(6, map.size());
assertEquals(Integer.MIN_VALUE, map.get(0));
assertEquals(0, map.get(1));
assertEquals(4, map.get(2));
assertEquals(5, map.get(3));
assertEquals(6, map.get(4));
assertEquals(buf.length, map.get(5));
assertArrayEquals(new int[]{
Integer.MIN_VALUE, 0, 4, 5, 6, buf.length
}, asInts(map));
}
private int[] asInts(IntList l) {
int[] result = new int[l.size()];
for (int i = 0; i < l.size(); i++) {
result[i] = l.get(i);
}
return result;
}
}

29
org.eclipse.jgit/src/org/eclipse/jgit/util/RawParseUtils.java
View File

@ -618,6 +618,10 @@ public static final int prevLF(final byte[] b, int ptr, final char chrA) {
* <p>
* The last element (index <code>map.size()-1</code>) always contains
* <code>end</code>.
* <p>
* If the data contains a '\0' anywhere, the whole region is considered binary
* and a LineMap corresponding to a single line is returned.
* </p>
*
* @param buf
* buffer to scan.
@ -629,14 +633,29 @@ public static final int prevLF(final byte[] b, int ptr, final char chrA) {
* @return a line map indexing the start position of each line.
*/
public static final IntList lineMap(final byte[] buf, int ptr, int end) {
int start = ptr;
// Experimentally derived from multiple source repositories
// the average number of bytes/line is 36. Its a rough guess
// to initially size our map close to the target.
//
final IntList map = new IntList((end - ptr) / 36);
map.fillTo(1, Integer.MIN_VALUE);
for (; ptr < end; ptr = nextLF(buf, ptr))
map.add(ptr);
IntList map = new IntList((end - ptr) / 36);
map.add(Integer.MIN_VALUE);
boolean foundLF = true;
for (; ptr < end; ptr++) {
if (foundLF) {
map.add(ptr);
}
if (buf[ptr] == '\0') {
// binary data.
map = new IntList(3);
map.add(Integer.MIN_VALUE);
map.add(start);
break;
}
foundLF = (buf[ptr] == '\n');
}
map.add(end);
return map;
}