motiejus
/
jgit
1
Fork 0
Code Releases Activity

Merge "GraphObjectIndex: fix search in findGraphPosition"

This commit is contained in:
Jonathan Tan 2023-05-23 18:26:47 -04:00 committed by Gerrit Code Review @ Eclipse.org
parent 5a00dd873d 6b3b2b33a5
commit 44461b215e
2 changed files with 30 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/commitgraph/GraphObjectIndexTest.java Normal file
View File

@ -0,0 +1,28 @@
/*
* Copyright (C) 2023, Google LLC
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0 which is available at
* https://www.eclipse.org/org/documents/edl-v10.php.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
package org.eclipse.jgit.internal.storage.commitgraph;
import org.eclipse.jgit.lib.ObjectId;
import org.junit.Test;
import static org.junit.Assert.assertEquals;
public class GraphObjectIndexTest {
@Test
public void findGraphPosition_noObjInBucket() throws CommitGraphFormatException {
GraphObjectIndex idx = new GraphObjectIndex(100,
new byte[256 * 4], new byte[] {});
int graphPosition = idx.findGraphPosition(
ObjectId.fromString("731dfd4c5eb6f88b98e983b9b0551b3562a0c46c"));
assertEquals(-1, graphPosition);
}
}

4
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/commitgraph/GraphObjectIndex.java
View File

@ -80,7 +80,7 @@ int findGraphPosition(AnyObjectId id) {
if (levelOne > 0) {
low = fanoutTable[levelOne - 1];
}
do {
while (low < high) {
int mid = (low + high) >>> 1;
int pos = objIdOffset(mid);
int cmp = id.compareTo(oidLookup, pos);
@ -91,7 +91,7 @@ int findGraphPosition(AnyObjectId id) {
} else {
low = mid + 1;
}
} while (low < high);
}
return -1;
}