From a290b822ab4f0ec9c1e5121235564fadf594a74e Mon Sep 17 00:00:00 2001 From: Shawn Pearce Date: Thu, 14 Jan 2016 16:11:15 -0800 Subject: RefTreeDatabase: Expose bootstrap refs in getAdditionalRefs By showing the bootstrap layer in getAdditionalRefs() garbage collector code can be more RefDatabase agnostic and not care about the special case of RefTree and RefTreeNames for the purposes of building up the roots to GC. Instead they can combine getRefs(ALL) and getAdditionalRefs() and have a clean set of roots. Change-Id: I665cd2456e9316640215b6a08bc728d1356f36d8 --- .../internal/storage/dfs/DfsGarbageCollector.java | 14 ++++++++- .../org/eclipse/jgit/internal/storage/file/GC.java | 9 +++--- .../internal/storage/reftree/RefTreeDatabase.java | 20 ++++++++++++- .../internal/storage/reftree/RefTreeNames.java | 35 ---------------------- 4 files changed, 37 insertions(+), 41 deletions(-) (limited to 'org.eclipse.jgit/src') 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 784507d88c..33be3b15a8 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 @@ -194,7 +194,7 @@ public class DfsGarbageCollector { refdb.refresh(); objdb.clearCache(); - Collection refsBefore = RefTreeNames.allRefs(refdb); + Collection refsBefore = getAllRefs(); packsBefore = packsToRebuild(); if (packsBefore.isEmpty()) return true; @@ -235,6 +235,18 @@ public class DfsGarbageCollector { } } + private Collection getAllRefs() throws IOException { + Collection refs = refdb.getRefs(RefDatabase.ALL).values(); + List addl = refdb.getAdditionalRefs(); + if (!addl.isEmpty()) { + List all = new ArrayList<>(refs.size() + addl.size()); + all.addAll(refs); + all.addAll(addl); + return all; + } + return refs; + } + private List packsToRebuild() throws IOException { DfsPackFile[] packs = objdb.getPacks(); List out = new ArrayList(packs.length); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java index 2ce0d47348..49f9335aed 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/file/GC.java @@ -629,15 +629,16 @@ public class GC { } /** - * Returns a map of all refs and additional refs (e.g. FETCH_HEAD, + * Returns a collection of all refs and additional refs (e.g. FETCH_HEAD, * MERGE_HEAD, ...) * - * @return a map where names of refs point to ref objects + * @return a collection of refs pointing to live objects. * @throws IOException */ private Collection getAllRefs() throws IOException { - Collection refs = RefTreeNames.allRefs(repo.getRefDatabase()); - List addl = repo.getRefDatabase().getAdditionalRefs(); + RefDatabase refdb = repo.getRefDatabase(); + Collection refs = refdb.getRefs(RefDatabase.ALL).values(); + List addl = refdb.getAdditionalRefs(); if (!addl.isEmpty()) { List all = new ArrayList<>(refs.size() + addl.size()); all.addAll(refs); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftree/RefTreeDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftree/RefTreeDatabase.java index dc60311102..f6fdef1fa5 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftree/RefTreeDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftree/RefTreeDatabase.java @@ -47,6 +47,8 @@ import static org.eclipse.jgit.lib.Ref.Storage.LOOSE; import static org.eclipse.jgit.lib.Ref.Storage.PACKED; import java.io.IOException; +import java.util.ArrayList; +import java.util.Collection; import java.util.Collections; import java.util.HashMap; import java.util.List; @@ -250,7 +252,23 @@ public class RefTreeDatabase extends RefDatabase { @Override public List getAdditionalRefs() throws IOException { - return Collections.emptyList(); + Collection txnRefs; + if (txnNamespace != null) { + txnRefs = bootstrap.getRefs(txnNamespace).values(); + } else { + Ref r = bootstrap.exactRef(txnCommitted); + if (r != null && r.getObjectId() != null) { + txnRefs = Collections.singleton(r); + } else { + txnRefs = Collections.emptyList(); + } + } + + List otherRefs = bootstrap.getAdditionalRefs(); + List all = new ArrayList<>(txnRefs.size() + otherRefs.size()); + all.addAll(txnRefs); + all.addAll(otherRefs); + return all; } @Override diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftree/RefTreeNames.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftree/RefTreeNames.java index 239a745277..c53d6deb21 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftree/RefTreeNames.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftree/RefTreeNames.java @@ -43,14 +43,6 @@ package org.eclipse.jgit.internal.storage.reftree; -import static org.eclipse.jgit.lib.RefDatabase.ALL; - -import java.io.IOException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.List; - -import org.eclipse.jgit.lib.Ref; import org.eclipse.jgit.lib.RefDatabase; /** Magic reference name logic for RefTrees. */ @@ -92,33 +84,6 @@ public class RefTreeNames { return false; } - /** - * Snapshot all references from a RefTreeDatabase and its bootstrap. - *

- * There may be name conflicts with multiple {@link Ref} objects containing - * the same name in the returned collection. - * - * @param refdb - * database instance. - * @return all known references. - * @throws IOException - * references cannot be enumerated. - */ - public static Collection allRefs(RefDatabase refdb) - throws IOException { - Collection refs = refdb.getRefs(ALL).values(); - if (!(refdb instanceof RefTreeDatabase)) { - return refs; - } - - RefDatabase bootstrap = ((RefTreeDatabase) refdb).getBootstrap(); - Collection br = bootstrap.getRefs(ALL).values(); - List all = new ArrayList<>(refs.size() + br.size()); - all.addAll(refs); - all.addAll(br); - return all; - } - private RefTreeNames() { } } -- cgit v1.2.3 From bbfca06d64616c13eb0281816149c8cc6d872023 Mon Sep 17 00:00:00 2001 From: Shawn Pearce Date: Fri, 15 Jan 2016 12:46:33 -0800 Subject: RefTreeDatabase: Allow ORIG_HEAD, etc. on non-bare repositories Store these in the bootstrap layer where they are using $GIT_DIR as the storage directory for any reference that does not contain '/'. Change-Id: I5595bf514e4475b7c7e799c2c79446597a3abb4a --- .../reftree/LocalDiskRefTreeDatabaseTest.java | 126 +++++++++++++++++++++ .../storage/reftree/RefTreeDatabaseTest.java | 22 ++++ .../internal/storage/reftree/RefTreeDatabase.java | 23 +++- 3 files changed, 168 insertions(+), 3 deletions(-) create mode 100644 org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftree/LocalDiskRefTreeDatabaseTest.java (limited to 'org.eclipse.jgit/src') diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftree/LocalDiskRefTreeDatabaseTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftree/LocalDiskRefTreeDatabaseTest.java new file mode 100644 index 0000000000..47f70d7bdb --- /dev/null +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftree/LocalDiskRefTreeDatabaseTest.java @@ -0,0 +1,126 @@ +/* + * Copyright (C) 2016 Google Inc. + * and other copyright owners as documented in the project's IP log. + * + * This program and the accompanying materials are made available + * under the terms of the Eclipse Distribution License v1.0 which + * accompanies this distribution, is reproduced below, and is + * available at http://www.eclipse.org/org/documents/edl-v10.php + * + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or + * without modification, are permitted provided that the following + * conditions are met: + * + * - Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * + * - Redistributions in binary form must reproduce the above + * copyright notice, this list of conditions and the following + * disclaimer in the documentation and/or other materials provided + * with the distribution. + * + * - Neither the name of the Eclipse Foundation, Inc. nor the + * names of its contributors may be used to endorse or promote + * products derived from this software without specific prior + * written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND + * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, + * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR + * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT + * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; + * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER + * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, + * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) + * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF + * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + */ + +package org.eclipse.jgit.internal.storage.reftree; + +import static org.eclipse.jgit.lib.Constants.HEAD; +import static org.eclipse.jgit.lib.Constants.MASTER; +import static org.eclipse.jgit.lib.Constants.ORIG_HEAD; +import static org.eclipse.jgit.lib.Constants.R_HEADS; +import static org.eclipse.jgit.lib.RefDatabase.ALL; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; + +import java.io.File; +import java.io.IOException; +import java.util.List; + +import org.eclipse.jgit.internal.storage.file.FileRepository; +import org.eclipse.jgit.junit.LocalDiskRepositoryTestCase; +import org.eclipse.jgit.junit.TestRepository; +import org.eclipse.jgit.lib.ObjectId; +import org.eclipse.jgit.lib.Ref; +import org.eclipse.jgit.lib.RefDatabase; +import org.eclipse.jgit.lib.RefUpdate; +import org.eclipse.jgit.revwalk.RevCommit; +import org.eclipse.jgit.storage.file.FileBasedConfig; +import org.eclipse.jgit.storage.file.FileRepositoryBuilder; +import org.junit.Before; +import org.junit.Test; + +public class LocalDiskRefTreeDatabaseTest extends LocalDiskRepositoryTestCase { + private FileRepository repo; + private RefTreeDatabase refdb; + private RefDatabase bootstrap; + + private TestRepository testRepo; + private RevCommit A; + private RevCommit B; + + @Before + public void setUp() throws Exception { + FileRepository init = createWorkRepository(); + FileBasedConfig cfg = init.getConfig(); + cfg.setInt("core", null, "repositoryformatversion", 1); + cfg.setString("extensions", null, "refsStorage", "reftree"); + cfg.save(); + + repo = (FileRepository) new FileRepositoryBuilder() + .setGitDir(init.getDirectory()) + .build(); + refdb = (RefTreeDatabase) repo.getRefDatabase(); + bootstrap = refdb.getBootstrap(); + addRepoToClose(repo); + + RefUpdate head = refdb.newUpdate(HEAD, true); + head.link(R_HEADS + MASTER); + + testRepo = new TestRepository<>(init); + A = testRepo.commit().create(); + B = testRepo.commit(testRepo.getRevWalk().parseCommit(A)); + } + + @Test + public void testHeadOrigHead() throws IOException { + RefUpdate master = refdb.newUpdate(HEAD, false); + master.setExpectedOldObjectId(ObjectId.zeroId()); + master.setNewObjectId(A); + assertEquals(RefUpdate.Result.NEW, master.update()); + assertEquals(A, refdb.exactRef(HEAD).getObjectId()); + + RefUpdate orig = refdb.newUpdate(ORIG_HEAD, true); + orig.setNewObjectId(B); + assertEquals(RefUpdate.Result.NEW, orig.update()); + + File origFile = new File(repo.getDirectory(), ORIG_HEAD); + assertEquals(B.name() + '\n', read(origFile)); + assertEquals(B, bootstrap.exactRef(ORIG_HEAD).getObjectId()); + assertEquals(B, refdb.exactRef(ORIG_HEAD).getObjectId()); + assertFalse(refdb.getRefs(ALL).containsKey(ORIG_HEAD)); + + List addl = refdb.getAdditionalRefs(); + assertEquals(2, addl.size()); + assertEquals(ORIG_HEAD, addl.get(1).getName()); + assertEquals(B, addl.get(1).getObjectId()); + } +} diff --git a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftree/RefTreeDatabaseTest.java b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftree/RefTreeDatabaseTest.java index 1bacfe46f0..e4d0f1d291 100644 --- a/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftree/RefTreeDatabaseTest.java +++ b/org.eclipse.jgit.test/tst/org/eclipse/jgit/internal/storage/reftree/RefTreeDatabaseTest.java @@ -44,6 +44,7 @@ package org.eclipse.jgit.internal.storage.reftree; import static org.eclipse.jgit.lib.Constants.HEAD; +import static org.eclipse.jgit.lib.Constants.ORIG_HEAD; import static org.eclipse.jgit.lib.Constants.R_HEADS; import static org.eclipse.jgit.lib.Constants.R_TAGS; import static org.eclipse.jgit.lib.Ref.Storage.LOOSE; @@ -467,6 +468,27 @@ public class RefTreeDatabaseTest { assertEquals(txnId, getTxnCommitted()); } + @Test + public void testUpdate_RefusesOrigHeadOnBare() throws IOException { + assertTrue(refdb.getRepository().isBare()); + ObjectId txnId = getTxnCommitted(); + + RefUpdate orig = refdb.newUpdate(ORIG_HEAD, true); + orig.setNewObjectId(B); + assertEquals(RefUpdate.Result.LOCK_FAILURE, orig.update()); + assertEquals(txnId, getTxnCommitted()); + + ReceiveCommand cmd = command(null, B, ORIG_HEAD); + BatchRefUpdate batch = refdb.newBatchUpdate(); + batch.addCommand(cmd); + batch.execute(new RevWalk(repo), NullProgressMonitor.INSTANCE); + assertEquals(REJECTED_OTHER_REASON, cmd.getResult()); + assertEquals( + MessageFormat.format(JGitText.get().invalidRefName, ORIG_HEAD), + cmd.getMessage()); + assertEquals(txnId, getTxnCommitted()); + } + @Test public void testBatchRefUpdate_NonFastForwardAborts() throws IOException { update("refs/heads/master", A); diff --git a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftree/RefTreeDatabase.java b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftree/RefTreeDatabase.java index f6fdef1fa5..df93ce88af 100644 --- a/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftree/RefTreeDatabase.java +++ b/org.eclipse.jgit/src/org/eclipse/jgit/internal/storage/reftree/RefTreeDatabase.java @@ -43,6 +43,7 @@ package org.eclipse.jgit.internal.storage.reftree; +import static org.eclipse.jgit.lib.Constants.HEAD; import static org.eclipse.jgit.lib.Ref.Storage.LOOSE; import static org.eclipse.jgit.lib.Ref.Storage.PACKED; @@ -189,12 +190,19 @@ public class RefTreeDatabase extends RefDatabase { @Override public Ref getRef(String name) throws IOException { - return findRef(getRefs(ALL), name); + String[] needle = new String[SEARCH_PATH.length]; + for (int i = 0; i < SEARCH_PATH.length; i++) { + needle[i] = SEARCH_PATH[i] + name; + } + return firstExactRef(needle); } @Override public Ref exactRef(String name) throws IOException { - if (conflictsWithBootstrap(name)) { + if (!repo.isBare() && name.indexOf('/') < 0 && !HEAD.equals(name)) { + // Pass through names like MERGE_HEAD, ORIG_HEAD, FETCH_HEAD. + return bootstrap.exactRef(name); + } else if (conflictsWithBootstrap(name)) { return null; } @@ -311,6 +319,9 @@ public class RefTreeDatabase extends RefDatabase { @Override public RefUpdate newUpdate(String name, boolean detach) throws IOException { + if (!repo.isBare() && name.indexOf('/') < 0 && !HEAD.equals(name)) { + return bootstrap.newUpdate(name, detach); + } if (conflictsWithBootstrap(name)) { return new AlwaysFailUpdate(this, name); } @@ -345,7 +356,13 @@ public class RefTreeDatabase extends RefDatabase { return true; } else if (txnCommitted.equals(name)) { return true; - } else if (name.length() > txnCommitted.length() + } + + if (name.indexOf('/') < 0 && !HEAD.equals(name)) { + return true; + } + + if (name.length() > txnCommitted.length() && name.charAt(txnCommitted.length()) == '/' && name.startsWith(txnCommitted)) { return true; -- cgit v1.2.3