> On Oct 19, 2014, at 18:16, Eric Wong <normalperson@xxxxxxxx> wrote:
>
> Jakob Stoklund Olesen <stoklund@xxxxxx> wrote:
>> If cached_mergeinfo is using too much memory, you can probably drop
>> that cache entirely. IIRC, it didn't give that much of a speed up.
>>
>> I am surprised that it is using a lot of memory, though. There is only
>> one entry per SVN branch.
>
> Something like the below? (on top of your original two patches)
> Pushed to my master @ git://bogomips.org/git-svn.git
Yes, but I think you can remove cached_mergeinfo_rev too.
Thanks
/Jakob
> Eric Wong (2):
> git-svn: reduce check_cherry_pick cache overhead
> git-svn: cache only mergeinfo revisions
>
> Jakob Stoklund Olesen (2):
> git-svn: only look at the new parts of svn:mergeinfo
> git-svn: only look at the root path for svn:mergeinfo
>
> git-svn still seems to have some excessive memory usage problems,
> even independenty of mergeinfo stuff.
> --------------------------8<----------------------------
> From: Eric Wong <normalperson@xxxxxxxx>
> Date: Mon, 20 Oct 2014 01:02:53 +0000
> Subject: [PATCH] git-svn: cache only mergeinfo revisions
>
> This should reduce excessive memory usage from the new mergeinfo
> caches without hurting performance too much, assuming reasonable
> latency to the SVN server.
>
> Cc: Hin-Tak Leung <htl10@xxxxxxxxxxxxxxxxxxxxx>
> Suggested-by: Jakob Stoklund Olesen <stoklund@xxxxxx>
> Signed-off-by: Eric Wong <normalperson@xxxxxxxx>
> ---
> perl/Git/SVN.pm | 22 ++++++++--------------
> 1 file changed, 8 insertions(+), 14 deletions(-)
>
> diff --git a/perl/Git/SVN.pm b/perl/Git/SVN.pm
> index 171af37..f8a75b1 100644
> --- a/perl/Git/SVN.pm
> +++ b/perl/Git/SVN.pm
> @@ -1713,13 +1713,10 @@ sub mergeinfo_changes {
> # Initialize cache on the first call.
> unless (defined $self->{cached_mergeinfo_rev}) {
> $self->{cached_mergeinfo_rev} = {};
> - $self->{cached_mergeinfo} = {};
> }
>
> my $cached_rev = $self->{cached_mergeinfo_rev}{$old_path};
> - if (defined $cached_rev && $cached_rev == $old_rev) {
> - $old_minfo = $self->{cached_mergeinfo}{$old_path};
> - } else {
> + unless (defined $cached_rev && $cached_rev == $old_rev) {
> my $ra = $self->ra;
> # Give up if $old_path isn't in the repo.
> # This is probably a merge on a subtree.
> @@ -1728,19 +1725,16 @@ sub mergeinfo_changes {
> "directory didn't exist in r$old_rev\n";
> return {};
> }
> - my (undef, undef, $props) =
> - $self->ra->get_dir($old_path, $old_rev);
> - if (defined $props->{"svn:mergeinfo"}) {
> - my %omi = map {split ":", $_ } split "\n",
> - $props->{"svn:mergeinfo"};
> - $old_minfo = \%omi;
> - }
> - $self->{cached_mergeinfo}{$old_path} = $old_minfo;
> - $self->{cached_mergeinfo_rev}{$old_path} = $old_rev;
> }
> + my (undef, undef, $props) = $self->ra->get_dir($old_path, $old_rev);
> + if (defined $props->{"svn:mergeinfo"}) {
> + my %omi = map {split ":", $_ } split "\n",
> + $props->{"svn:mergeinfo"};
> + $old_minfo = \%omi;
> + }
> + $self->{cached_mergeinfo_rev}{$old_path} = $old_rev;
>
> # Cache the new mergeinfo.
> - $self->{cached_mergeinfo}{$path} = \%minfo;
> $self->{cached_mergeinfo_rev}{$path} = $rev;
>
> my %changes = ();
> --
> EW
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html