dfs: rename ReftableStack to DfsReftableStack
The functionality in ReftableStack is specific to DFS.
Signed-off-by: Han-Wen Nienhuys <hanwen@google.com>
Change-Id: If6003d104b1ecb0f3ca7e9c3815b233fa0abf077
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java
index 6f0ea18..0d139c1 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsGarbageCollector.java
@@ -744,7 +744,7 @@ private void writeReftable(DfsPackDescription pack) throws IOException {
return;
}
- try (ReftableStack stack = ReftableStack.open(ctx, reftablesBefore)) {
+ try (DfsReftableStack stack = DfsReftableStack.open(ctx, reftablesBefore)) {
ReftableCompactor compact = new ReftableCompactor();
compact.addAll(stack.readers());
compact.setIncludeDeletes(includeDeletes);
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java
index 6f3f2bd..8cf66b1 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsPackCompactor.java
@@ -311,7 +311,7 @@ private void compactReftables(DfsReader ctx) throws IOException {
DfsObjDatabase objdb = repo.getObjectDatabase();
Collections.sort(srcReftables, objdb.reftableComparator());
- try (ReftableStack stack = ReftableStack.open(ctx, srcReftables)) {
+ try (DfsReftableStack stack = DfsReftableStack.open(ctx, srcReftables)) {
initOutDesc(objdb);
ReftableCompactor compact = new ReftableCompactor();
compact.addAll(stack.readers());
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftableDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftableDatabase.java
index fc8320f..cf3c71d 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftableDatabase.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftableDatabase.java
@@ -85,7 +85,7 @@ public class DfsReftableDatabase extends DfsRefDatabase {
private DfsReader ctx;
- private ReftableStack tableStack;
+ private DfsReftableStack tableStack;
private MergedReftable mergedTables;
@@ -173,7 +173,7 @@ protected Reftable reader() throws IOException {
* @throws java.io.IOException
* if tables cannot be opened.
*/
- protected ReftableStack stack() throws IOException {
+ protected DfsReftableStack stack() throws IOException {
lock.lock();
try {
if (tableStack == null) {
@@ -181,7 +181,7 @@ protected ReftableStack stack() throws IOException {
if (ctx == null) {
ctx = odb.newReader();
}
- tableStack = ReftableStack.open(ctx,
+ tableStack = DfsReftableStack.open(ctx,
Arrays.asList(odb.getReftables()));
}
return tableStack;
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/ReftableStack.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftableStack.java
similarity index 94%
rename from org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/ReftableStack.java
rename to org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftableStack.java
index 50ba0e0..b6b5403 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/ReftableStack.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/DfsReftableStack.java
@@ -54,7 +54,7 @@
* Tracks multiple open
* {@link org.eclipse.jgit.internal.storage.reftable.Reftable} instances.
*/
-public class ReftableStack implements AutoCloseable {
+public class DfsReftableStack implements AutoCloseable {
/**
* Opens a stack of tables for reading.
*
@@ -67,9 +67,9 @@ public class ReftableStack implements AutoCloseable {
* @throws java.io.IOException
* a table could not be opened
*/
- public static ReftableStack open(DfsReader ctx, List<DfsReftable> files)
+ public static DfsReftableStack open(DfsReader ctx, List<DfsReftable> files)
throws IOException {
- ReftableStack stack = new ReftableStack(files.size());
+ DfsReftableStack stack = new DfsReftableStack(files.size());
boolean close = true;
try {
for (DfsReftable t : files) {
@@ -88,7 +88,7 @@ public static ReftableStack open(DfsReader ctx, List<DfsReftable> files)
private final List<DfsReftable> files;
private final List<Reftable> tables;
- private ReftableStack(int tableCnt) {
+ private DfsReftableStack(int tableCnt) {
this.files = new ArrayList<>(tableCnt);
this.tables = new ArrayList<>(tableCnt);
}
diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/ReftableBatchRefUpdate.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/ReftableBatchRefUpdate.java
index 682e156..090c8b3 100644
--- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/ReftableBatchRefUpdate.java
+++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/dfs/ReftableBatchRefUpdate.java
@@ -405,7 +405,7 @@ private long nextUpdateIndex() throws IOException {
private boolean canCompactTopOfStack(ReftableConfig cfg)
throws IOException {
- ReftableStack stack = refdb.stack();
+ DfsReftableStack stack = refdb.stack();
List<Reftable> readers = stack.readers();
if (readers.isEmpty()) {
return false;
