From: "Shawn O. Pearce" <spearce@spearce.org>
To: Robin Rosenberg <robin.rosenberg@dewire.com>
Cc: git@vger.kernel.org
Subject: [JGIT PATCH 4/5] Test that ObjectLoader stays valid across repacks
Date: Wed, 22 Apr 2009 20:36:22 -0700 [thread overview]
Message-ID: <1240457783-21434-5-git-send-email-spearce@spearce.org> (raw)
In-Reply-To: <1240457783-21434-4-git-send-email-spearce@spearce.org>
What we are trying to verify is that an ObjectLoader remains valid
if the underlying storage for the object has moved, such as when a
repository is repacked, the old pack was deleted, and the object is
now in the new pack.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
.../org/spearce/jgit/lib/ConcurrentRepackTest.java | 40 ++++++++++++++++++++
1 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/org.spearce.jgit.test/tst/org/spearce/jgit/lib/ConcurrentRepackTest.java b/org.spearce.jgit.test/tst/org/spearce/jgit/lib/ConcurrentRepackTest.java
index 825fbb8..b56e0f4 100644
--- a/org.spearce.jgit.test/tst/org/spearce/jgit/lib/ConcurrentRepackTest.java
+++ b/org.spearce.jgit.test/tst/org/spearce/jgit/lib/ConcurrentRepackTest.java
@@ -41,6 +41,7 @@
import java.io.File;
import java.io.FileOutputStream;
import java.io.IOException;
+import java.util.Arrays;
import org.spearce.jgit.errors.IncorrectObjectTypeException;
import org.spearce.jgit.errors.MissingObjectException;
@@ -128,6 +129,45 @@ public void testObjectMovedWithinPack()
assertEquals(o2.name(), parse(o2).name());
}
+ public void testObjectMovedToNewPack2()
+ throws IncorrectObjectTypeException, IOException {
+ // Create an object and pack it. Then remove that pack and put the
+ // object into a different pack file, with some other object. We
+ // still should be able to access the objects.
+ //
+ final Repository eden = createNewEmptyRepo();
+ final RevObject o1 = writeBlob(eden, "o1");
+ final File[] out1 = pack(eden, o1);
+ assertEquals(o1.name(), parse(o1).name());
+
+ final ObjectLoader load1 = db.openBlob(o1);
+ assertNotNull(load1);
+
+ final RevObject o2 = writeBlob(eden, "o2");
+ pack(eden, o2, o1);
+
+ // Force close, and then delete, the old pack.
+ //
+ whackCache();
+ delete(out1);
+
+ // Now here is the interesting thing... can the loader we made
+ // earlier still resolve the object, even though its underlying
+ // pack is gone, but the object still exists.
+ //
+ final ObjectLoader load2 = db.openBlob(o1);
+ assertNotNull(load2);
+ assertNotSame(load1, load2);
+
+ final byte[] data2 = load2.getCachedBytes();
+ final byte[] data1 = load1.getCachedBytes();
+ assertNotNull(data2);
+ assertNotNull(data1);
+ assertNotSame(data1, data2); // cache should be per-pack, not per object
+ assertTrue(Arrays.equals(data1, data2));
+ assertEquals(load2.getType(), load1.getType());
+ }
+
private static void whackCache() {
final WindowCacheConfig config = new WindowCacheConfig();
--
1.6.3.rc1.205.g37f8
next prev parent reply other threads:[~2009-04-23 3:38 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-23 3:36 [JGIT PATCH 0/5] Make ObjectLoader safer during repack Shawn O. Pearce
2009-04-23 3:36 ` [JGIT PATCH 1/5] Remove throws IOException from UnpackedObjectLoader.getCachedBytes Shawn O. Pearce
2009-04-23 3:36 ` [JGIT PATCH 2/5] Add missing @Override annotations to UnpackedObjectLoader Shawn O. Pearce
2009-04-23 3:36 ` [JGIT PATCH 3/5] Fully materialize an ObjectLoader before returning it from ObjectDatabase Shawn O. Pearce
2009-04-23 3:36 ` Shawn O. Pearce [this message]
2009-04-23 3:36 ` [JGIT RFC PATCH 5/5] Teach PackWriter to recover from removed/replaced packs Shawn O. Pearce
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1240457783-21434-5-git-send-email-spearce@spearce.org \
--to=spearce@spearce.org \
--cc=git@vger.kernel.org \
--cc=robin.rosenberg@dewire.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).