motiejus
/
jgit
1
Fork 0
Code Releases Activity

RefCursor: Remove unnecessary getUpdateIndex method 

Now the reference carries its updateIndex, so the cursor doesn't need
to expose it.

Change-Id: Icbfca46f92a13f3d8215ad10b2a166a6f40b0b0f
Signed-off-by: Ivan Frade <ifrade@google.com>
This commit is contained in:
Ivan Frade 2018-12-19 22:25:55 -08:00
parent 6ea888a036
commit 3381bf7e6a
7 changed files with 2 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/MergedReftableTest.java
View File

@ -316,19 +316,16 @@ public void missedUpdate() throws IOException {
assertEquals("refs/heads/a", rc.getRef().getName());
assertEquals(id(1), rc.getRef().getObjectId());
assertEquals(1, rc.getRef().getUpdateIndex());
assertEquals(1, rc.getUpdateIndex());
assertTrue(rc.next());
assertEquals("refs/heads/b", rc.getRef().getName());
assertEquals(id(2), rc.getRef().getObjectId());
assertEquals(2, rc.getRef().getUpdateIndex());
assertEquals(2, rc.getUpdateIndex());
assertTrue(rc.next());
assertEquals("refs/heads/c", rc.getRef().getName());
assertEquals(id(3), rc.getRef().getObjectId());
assertEquals(3, rc.getRef().getUpdateIndex());
assertEquals(3, rc.getUpdateIndex());
}
}

4
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/ReftableCompactorTest.java
View File

@ -109,7 +109,6 @@ public void oneTable() throws IOException {
assertEquals(MASTER, rc.getRef().getName());
assertEquals(id(1), rc.getRef().getObjectId());
assertEquals(0, rc.getRef().getUpdateIndex());
assertEquals(0, rc.getUpdateIndex());
}
}
@ -157,7 +156,6 @@ public void twoTablesOneRef() throws IOException {
assertEquals(MASTER, rc.getRef().getName());
assertEquals(id(2), rc.getRef().getObjectId());
assertEquals(1, rc.getRef().getUpdateIndex());
assertEquals(1, rc.getUpdateIndex());
}
}
@ -206,13 +204,11 @@ public void twoTablesTwoRefs() throws IOException {
assertEquals(MASTER, rc.getRef().getName());
assertEquals(id(3), rc.getRef().getObjectId());
assertEquals(1, rc.getRef().getUpdateIndex());
assertEquals(1, rc.getUpdateIndex());
assertTrue(rc.next());
assertEquals(NEXT, rc.getRef().getName());
assertEquals(id(2), rc.getRef().getObjectId());
assertEquals(0, rc.getRef().getUpdateIndex());
assertEquals(0, rc.getUpdateIndex());
}
}

1
org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftable/ReftableTest.java
View File

@ -443,7 +443,6 @@ public void withReflog() throws IOException {
assertEquals(MASTER, rc.getRef().getName());
assertEquals(id(1), rc.getRef().getObjectId());
assertEquals(1, rc.getRef().getUpdateIndex());
assertEquals(1, rc.getUpdateIndex());
assertTrue(rc.next());
assertEquals(NEXT, rc.getRef().getName());

9
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/MergedReftable.java
View File

@ -168,7 +168,6 @@ private class MergedRefCursor extends RefCursor {
private final PriorityQueue<RefQueueEntry> queue;
private RefQueueEntry head;
private Ref ref;
private long updateIndex;
MergedRefCursor() {
queue = new PriorityQueue<>(queueSize(), RefQueueEntry::compare);
@ -206,7 +205,6 @@ public boolean next() throws IOException {
}
ref = t.rc.getRef();
updateIndex = t.rc.getUpdateIndex();
boolean include = includeDeletes || !t.rc.wasDeleted();
add(t);
skipShadowedRefs(ref.getName());
@ -241,11 +239,6 @@ public Ref getRef() {
return ref;
}
@Override
public long getUpdateIndex() {
return updateIndex;
}
@Override
public void close() {
if (head != null) {
@ -285,7 +278,7 @@ String name() {
}
long updateIndex() {
return rc.getUpdateIndex();
return rc.getRef().getUpdateIndex();
}
}

7
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/RefCursor.java
View File

@ -68,13 +68,6 @@ public abstract class RefCursor implements AutoCloseable {
*/
public abstract Ref getRef();
/**
* Get updateIndex that last modified the current reference.
*
* @return updateIndex that last modified the current reference.
*/
public abstract long getUpdateIndex();
/**
* Whether the current reference was deleted.
*

2
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableCompactor.java
View File

@ -256,7 +256,7 @@ public Stats getStats() {
private void mergeRefs(MergedReftable mr) throws IOException {
try (RefCursor rc = mr.allRefs()) {
while (rc.next()) {
writer.writeRef(rc.getRef(), rc.getUpdateIndex());
writer.writeRef(rc.getRef(), rc.getRef().getUpdateIndex());
}
}
}

10
org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftable/ReftableReader.java
View File

@ -520,11 +520,6 @@ public Ref getRef() {
return ref;
}
@Override
public long getUpdateIndex() {
return ref.getUpdateIndex();
}
@Override
public void close() {
// Do nothing.
@ -690,11 +685,6 @@ public Ref getRef() {
return ref;
}
@Override
public long getUpdateIndex() {
return ref.getUpdateIndex();
}
@Override
public void close() {
// Do nothing.