motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "Use int[] rather than IntList for RawText hashes"

This commit is contained in:
Christian Halstrick 2010-09-02 07:46:50 -04:00 committed by Code Review
parent 7a504b8d7c 3fa7d3a2d2
commit f7f7c55bca
5 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
org.eclipse.jgit/src/org/eclipse/jgit/diff/RawText.java
View File

@ -95,7 +95,7 @@ public RawText create(byte[] input) {
protected final IntList lines; protected final IntList lines;
/** Hash code for each line, for fast equality elimination. */ /** Hash code for each line, for fast equality elimination. */
protected final IntList hashes; protected final int[] hashes;
/** /**
* Create a new sequence from an existing content byte array. * Create a new sequence from an existing content byte array.
@ -140,7 +140,7 @@ public boolean equals(final int i, final Sequence other, final int j) {
private static boolean equals(final RawText a, final int ai, private static boolean equals(final RawText a, final int ai,
final RawText b, final int bi) { final RawText b, final int bi) {
if (a.hashes.get(ai) != b.hashes.get(bi)) if (a.hashes[ai] != b.hashes[bi])
return false; return false;
int as = a.lines.get(ai); int as = a.lines.get(ai);
@ -197,15 +197,13 @@ public boolean isMissingNewlineAtEnd() {
return content[end - 1] != '\n'; return content[end - 1] != '\n';
} }
private IntList computeHashes() { private int[] computeHashes() {
final IntList r = new IntList(lines.size()); final int[] r = new int[lines.size()];
r.add(0);
for (int lno = 1; lno < lines.size() - 1; lno++) { for (int lno = 1; lno < lines.size() - 1; lno++) {
final int ptr = lines.get(lno); final int ptr = lines.get(lno);
final int end = lines.get(lno + 1); final int end = lines.get(lno + 1);
r.add(hashLine(content, ptr, end)); r[lno] = hashLine(content, ptr, end);
} }
r.add(0);
return r; return r;
} }

2
org.eclipse.jgit/src/org/eclipse/jgit/diff/RawTextIgnoreAllWhitespace.java
View File

@ -79,7 +79,7 @@ public boolean equals(final int i, final Sequence other, final int j) {
private static boolean equals(final RawText a, final int ai, private static boolean equals(final RawText a, final int ai,
final RawText b, final int bi) { final RawText b, final int bi) {
if (a.hashes.get(ai) != b.hashes.get(bi)) if (a.hashes[ai] != b.hashes[bi])
return false; return false;
int as = a.lines.get(ai); int as = a.lines.get(ai);

2
org.eclipse.jgit/src/org/eclipse/jgit/diff/RawTextIgnoreLeadingWhitespace.java
View File

@ -78,7 +78,7 @@ public boolean equals(final int i, final Sequence other, final int j) {
private static boolean equals(final RawText a, final int ai, private static boolean equals(final RawText a, final int ai,
final RawText b, final int bi) { final RawText b, final int bi) {
if (a.hashes.get(ai) != b.hashes.get(bi)) if (a.hashes[ai] != b.hashes[bi])
return false; return false;
int as = a.lines.get(ai); int as = a.lines.get(ai);

2
org.eclipse.jgit/src/org/eclipse/jgit/diff/RawTextIgnoreTrailingWhitespace.java
View File

@ -78,7 +78,7 @@ public boolean equals(final int i, final Sequence other, final int j) {
private static boolean equals(final RawText a, final int ai, private static boolean equals(final RawText a, final int ai,
final RawText b, final int bi) { final RawText b, final int bi) {
if (a.hashes.get(ai) != b.hashes.get(bi)) if (a.hashes[ai] != b.hashes[bi])
return false; return false;
int as = a.lines.get(ai); int as = a.lines.get(ai);

2
org.eclipse.jgit/src/org/eclipse/jgit/diff/RawTextIgnoreWhitespaceChange.java
View File

@ -81,7 +81,7 @@ public boolean equals(final int i, final Sequence other, final int j) {
private static boolean equals(final RawText a, final int ai, private static boolean equals(final RawText a, final int ai,
final RawText b, final int bi) { final RawText b, final int bi) {
if (a.hashes.get(ai) != b.hashes.get(bi)) if (a.hashes[ai] != b.hashes[bi])
return false; return false;
int as = a.lines.get(ai); int as = a.lines.get(ai);