From: Martin Langhoff <martin@catalyst.net.nz>
Date: Fri, 3 Mar 2006 03:38:03 +0000 (+1300)
Subject: cvsserver: checkout faster by sending files in a sensible order
X-Git-Tag: v1.3.0-rc1~50^2^2~1
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5398fed96699b5321678fdace86b6d4c62a155fb;p=git.git

cvsserver: checkout faster by sending files in a sensible order

Just by sending the files in an ordered fashion, clients can process them
much faster. And we can optimize our check of whether we created this
directory already -- faster.

Timings for a checkout on a commandline cvs client for a project with
~13K files totalling ~100MB:

Unsorted:
  603.12 real        16.89 user        42.88 sys

Sorted:
  298.19 real        26.37 user        42.42 sys
---

diff --git a/git-cvsserver.perl b/git-cvsserver.perl
index 7b3ba1b9d..f707bd937 100755
--- a/git-cvsserver.perl
+++ b/git-cvsserver.perl
@@ -584,6 +584,7 @@ sub req_co
     print "E cvs checkout: Updating $checkout_path\n";
 
     my %seendirs = ();
+    my $lastdir ='';
 
     foreach my $git ( @{$updater->gethead} )
     {
@@ -603,7 +604,8 @@ sub req_co
             print "M U $checkout_path/$git->{name}\n";
         }
 
-	if (length($git->{dir}) && $git->{dir} ne './' && !exists($seendirs{$git->{dir}})) {
+	if (length($git->{dir}) && $git->{dir} ne './' 
+	    && $git->{dir} ne $lastdir && !exists($seendirs{$git->{dir}})) {
 
 	    # Eclipse seems to need the Clear-sticky command
 	    # to prepare the 'Entries' file for the new directory.
@@ -612,6 +614,7 @@ sub req_co
 	    print "Clear-static-directory $module/$git->{dir}\n";
 	    print $state->{CVSROOT} . "/$module/$git->{dir}\n";
 	    print "E cvs checkout: Updating /$module/$git->{dir}\n";
+	    $lastdir = $git->{dir};
 	    $seendirs{$git->{dir}} = 1;
 	}
 
@@ -2349,7 +2352,7 @@ sub gethead
 
     return $self->{gethead_cache} if ( defined ( $self->{gethead_cache} ) );
 
-    my $db_query = $self->{dbh}->prepare_cached("SELECT name, filehash, mode, revision, modified, commithash, author FROM head",{},1);
+    my $db_query = $self->{dbh}->prepare_cached("SELECT name, filehash, mode, revision, modified, commithash, author FROM head ORDER BY name ASC",{},1);
     $db_query->execute();
 
     my $tree = [];