From: "Shawn O. Pearce" <spearce@spearce.org>
To: Robin Rosenberg <robin.rosenberg@dewire.com>
Cc: git@vger.kernel.org
Subject: [JGIT PATCH 19/19] Use Config cache for fetch and receive configuration parsing
Date: Sat, 25 Jul 2009 11:53:02 -0700 [thread overview]
Message-ID: <1248547982-4003-20-git-send-email-spearce@spearce.org> (raw)
In-Reply-To: <1248547982-4003-19-git-send-email-spearce@spearce.org>
Rather than parsing the fields on each transfer we now parse the
fields once and cache them in the Config object, under a unique
section key for the fetch or receive direction. This permits the
keys to be scanned only once, rather than per-request.
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
---
.../jgit/transport/BasePackFetchConnection.java | 21 ++++++++-
.../org/spearce/jgit/transport/ReceivePack.java | 45 ++++++++++++++++----
2 files changed, 55 insertions(+), 11 deletions(-)
diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackFetchConnection.java b/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackFetchConnection.java
index 7163e02..dea6181 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackFetchConnection.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/BasePackFetchConnection.java
@@ -46,12 +46,13 @@
import org.spearce.jgit.errors.TransportException;
import org.spearce.jgit.lib.AnyObjectId;
+import org.spearce.jgit.lib.Config;
import org.spearce.jgit.lib.MutableObjectId;
import org.spearce.jgit.lib.ObjectId;
import org.spearce.jgit.lib.PackLock;
import org.spearce.jgit.lib.ProgressMonitor;
import org.spearce.jgit.lib.Ref;
-import org.spearce.jgit.lib.RepositoryConfig;
+import org.spearce.jgit.lib.Config.SectionParser;
import org.spearce.jgit.revwalk.RevCommit;
import org.spearce.jgit.revwalk.RevCommitList;
import org.spearce.jgit.revwalk.RevFlag;
@@ -146,10 +147,10 @@
BasePackFetchConnection(final PackTransport packTransport) {
super(packTransport);
- final RepositoryConfig cfg = local.getConfig();
+ final FetchConfig cfg = local.getConfig().get(FetchConfig.KEY);
includeTags = transport.getTagOpt() != TagOpt.NO_TAGS;
thinPack = transport.isFetchThin();
- allowOfsDelta = cfg.getBoolean("repack", "usedeltabaseoffset", true);
+ allowOfsDelta = cfg.allowOfsDelta;
walk = new RevWalk(local);
reachableCommits = new RevCommitList<RevCommit>();
@@ -162,6 +163,20 @@
walk.carry(ADVERTISED);
}
+ private static class FetchConfig {
+ static final SectionParser<FetchConfig> KEY = new SectionParser<FetchConfig>() {
+ public FetchConfig parse(final Config cfg) {
+ return new FetchConfig(cfg);
+ }
+ };
+
+ final boolean allowOfsDelta;
+
+ FetchConfig(final Config c) {
+ allowOfsDelta = c.getBoolean("repack", "usedeltabaseoffset", true);
+ }
+ }
+
public final void fetch(final ProgressMonitor monitor,
final Collection<Ref> want, final Set<ObjectId> have)
throws TransportException {
diff --git a/org.spearce.jgit/src/org/spearce/jgit/transport/ReceivePack.java b/org.spearce.jgit/src/org/spearce/jgit/transport/ReceivePack.java
index 38f0b5c..ca4a7ec 100644
--- a/org.spearce.jgit/src/org/spearce/jgit/transport/ReceivePack.java
+++ b/org.spearce.jgit/src/org/spearce/jgit/transport/ReceivePack.java
@@ -54,6 +54,7 @@
import org.spearce.jgit.errors.MissingObjectException;
import org.spearce.jgit.errors.PackProtocolException;
+import org.spearce.jgit.lib.Config;
import org.spearce.jgit.lib.Constants;
import org.spearce.jgit.lib.NullProgressMonitor;
import org.spearce.jgit.lib.ObjectId;
@@ -62,7 +63,7 @@
import org.spearce.jgit.lib.Ref;
import org.spearce.jgit.lib.RefUpdate;
import org.spearce.jgit.lib.Repository;
-import org.spearce.jgit.lib.RepositoryConfig;
+import org.spearce.jgit.lib.Config.SectionParser;
import org.spearce.jgit.revwalk.ObjectWalk;
import org.spearce.jgit.revwalk.RevCommit;
import org.spearce.jgit.revwalk.RevFlag;
@@ -158,17 +159,45 @@ public ReceivePack(final Repository into) {
db = into;
walk = new RevWalk(db);
- final RepositoryConfig cfg = db.getConfig();
- checkReceivedObjects = cfg.getBoolean("receive", "fsckobjects", false);
- allowCreates = true;
- allowDeletes = !cfg.getBoolean("receive", "denydeletes", false);
- allowNonFastForwards = !cfg.getBoolean("receive",
- "denynonfastforwards", false);
- allowOfsDelta = cfg.getBoolean("repack", "usedeltabaseoffset", true);
+ final ReceiveConfig cfg = db.getConfig().get(ReceiveConfig.KEY);
+ checkReceivedObjects = cfg.checkReceivedObjects;
+ allowCreates = cfg.allowCreates;
+ allowDeletes = cfg.allowDeletes;
+ allowNonFastForwards = cfg.allowNonFastForwards;
+ allowOfsDelta = cfg.allowOfsDelta;
preReceive = PreReceiveHook.NULL;
postReceive = PostReceiveHook.NULL;
}
+ private static class ReceiveConfig {
+ static final SectionParser<ReceiveConfig> KEY = new SectionParser<ReceiveConfig>() {
+ public ReceiveConfig parse(final Config cfg) {
+ return new ReceiveConfig(cfg);
+ }
+ };
+
+ final boolean checkReceivedObjects;
+
+ final boolean allowCreates;
+
+ final boolean allowDeletes;
+
+ final boolean allowNonFastForwards;
+
+ final boolean allowOfsDelta;
+
+ ReceiveConfig(final Config config) {
+ checkReceivedObjects = config.getBoolean("receive", "fsckobjects",
+ false);
+ allowCreates = true;
+ allowDeletes = !config.getBoolean("receive", "denydeletes", false);
+ allowNonFastForwards = !config.getBoolean("receive",
+ "denynonfastforwards", false);
+ allowOfsDelta = config.getBoolean("repack", "usedeltabaseoffset",
+ true);
+ }
+ }
+
/** @return the repository this receive completes into. */
public final Repository getRepository() {
return db;
--
1.6.4.rc2.216.g769fa
next prev parent reply other threads:[~2009-07-25 18:54 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-25 18:52 [JGIT PATCH 00/19] More Config class cleanup work Shawn O. Pearce
2009-07-25 18:52 ` [JGIT PATCH 01/19] Cleanup nonstandard references to encoding strings to bytes Shawn O. Pearce
2009-07-25 18:52 ` [JGIT PATCH 02/19] Delete incorrect Javadoc from Config's getRawString method Shawn O. Pearce
2009-07-25 18:52 ` [JGIT PATCH 03/19] Make Config.escapeValue a private method Shawn O. Pearce
2009-07-25 18:52 ` [JGIT PATCH 04/19] Allow a RemoteConfig to use the more generic Config class Shawn O. Pearce
2009-07-25 18:52 ` [JGIT PATCH 05/19] Use type specific sets when creating a new RepositoryConfig Shawn O. Pearce
2009-07-25 18:52 ` [JGIT PATCH 06/19] Move SystemReader out of RepositoryConfig Shawn O. Pearce
2009-07-25 18:52 ` [JGIT PATCH 07/19] Correct user config to be of type FileBasedConfig Shawn O. Pearce
2009-07-25 18:52 ` [JGIT PATCH 08/19] Extract the test specific SystemReader out of RepositoryTestCase Shawn O. Pearce
2009-07-25 18:52 ` [JGIT PATCH 09/19] Refactor Config hierarchy to make IO more explicit Shawn O. Pearce
2009-07-25 18:52 ` [JGIT PATCH 10/19] Test for the config file when creating a new repository Shawn O. Pearce
2009-07-25 18:52 ` [JGIT PATCH 11/19] Remove the map lookup for values in Config Shawn O. Pearce
2009-07-25 18:52 ` [JGIT PATCH 12/19] Return base values first from Config.getStringList() Shawn O. Pearce
2009-07-25 18:52 ` [JGIT PATCH 13/19] Make Config thread safe by using copy-on-write semantics Shawn O. Pearce
2009-07-25 18:52 ` [JGIT PATCH 14/19] Support cached application models in a Config Shawn O. Pearce
2009-07-25 18:52 ` [JGIT PATCH 15/19] Cache Config subsection names when requested by application code Shawn O. Pearce
2009-07-25 18:52 ` [JGIT PATCH 16/19] Refactor author/committer lookup to use cached data Shawn O. Pearce
2009-07-25 18:53 ` [JGIT PATCH 17/19] Move repository config creation fully into Repository class Shawn O. Pearce
2009-07-25 18:53 ` [JGIT PATCH 18/19] Use Config SectionParser cache to store daemon enable states Shawn O. Pearce
2009-07-25 18:53 ` Shawn O. Pearce [this message]
2009-07-25 22:54 ` [JGIT PATCH 09/19] Refactor Config hierarchy to make IO more explicit Robin Rosenberg
2009-07-25 22:55 ` Shawn O. Pearce
2009-07-25 23:34 ` Robin Rosenberg
2009-07-25 23:38 ` Shawn O. Pearce
2009-07-25 20:32 ` [JGIT PATCH 02/19] Delete incorrect Javadoc from Config's getRawString method Robin Rosenberg
2009-07-25 20:33 ` 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=1248547982-4003-20-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).