Git development
 help / color / mirror / Atom feed
From: "SZEDER Gábor" <szeder@ira.uka.de>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: git@vger.kernel.org, "Junio C Hamano" <gitster@pobox.com>,
	"Björn Gustavsson" <bgustavsson@gmail.com>,
	"Shawn O. Pearce" <spearce@spearce.org>,
	"Robert Zeh" <robert.a.zeh@gmail.com>,
	"Peter van der Does" <peter@avirtualhome.com>,
	"Jonathan Nieder" <jrnieder@gmail.com>,
	"Jeff King" <peff@peff.net>
Subject: Re: [RFC/PATCH 4/5] completion: get rid of compgen
Date: Sat, 17 Nov 2012 15:12:15 +0100	[thread overview]
Message-ID: <20121117141215.GG12052@goldbirke> (raw)
In-Reply-To: <CAMP44s21CUb3_KhHBfJXW+Eqd45kz1hcbx3GCbs+f0HNRDEAzw@mail.gmail.com>

On Sat, Nov 17, 2012 at 12:42:38PM +0100, Felipe Contreras wrote:
> On Sat, Nov 17, 2012 at 12:00 PM, SZEDER Gábor <szeder@ira.uka.de> wrote:
> > On Sat, Nov 17, 2012 at 02:38:17AM +0100, Felipe Contreras wrote:
> >> The functionality we use is very simple, plus, this fixes a known
> >> breakage 'complete tree filename with metacharacters'.
> >>
> >> Signed-off-by: Felipe Contreras <felipe.contreras@gmail.com>
> >> ---
> >>  contrib/completion/git-completion.bash | 6 +++++-
> >>  1 file changed, 5 insertions(+), 1 deletion(-)
> >>
> >> diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
> >> index 975ae13..ad3e1fe 100644
> >> --- a/contrib/completion/git-completion.bash
> >> +++ b/contrib/completion/git-completion.bash
> >> @@ -227,7 +227,11 @@ fi
> >>
> >>  __gitcompadd ()
> >>  {
> >> -     COMPREPLY=($(compgen -W "$1" -P "$2" -S "$4" -- "$3"))
> >> +     for x in $1; do
> >> +             if [[ "$x" = "$3"* ]]; then
> >> +                     COMPREPLY+=("$2$x$4")
> >> +             fi
> >> +     done
> >
> > The whole point of creating __gitcomp_nl() back then was to fill
> > COMPREPLY without iterating through all words in the wordlist, making
> > completion faster for large number of words, e.g. a lot of refs, or
> > later a lot of symbols for 'git grep' in a larger project.
> >
> > The loop here kills that optimization.
> 
> So your solution is to move the loop to awk? I fail to see how that
> could bring more optimization, specially since it includes an extra
> fork now.

This patch didn't aim for more optimization, but it was definitely a
goal not to waste what we gained by creating __gitcomp_nl() in
a31e6262 (completion: optimize refs completion, 2011-10-15).  However,
as it turns out the new version with awk is actually faster than
current master with compgen:

  Before:

    $ refs="$(for i in {0..9999} ; do echo branch$i ; done)"
    $ time __gitcomp_nl "$refs"

    real    0m0.242s
    user    0m0.220s
    sys     0m0.028s

  After:

    $ time __gitcomp_nl "$refs"

    real    0m0.109s
    user    0m0.096s
    sys     0m0.012s

  reply	other threads:[~2012-11-17 14:12 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-11-17  1:38 [RFC/PATCH 0/5] completion: compgen/compadd cleanups Felipe Contreras
2012-11-17  1:38 ` [RFC/PATCH 1/5] completion: get rid of empty COMPREPLY assignments Felipe Contreras
2012-11-17  1:38 ` [RFC/PATCH 2/5] completion: add new __gitcompadd helper Felipe Contreras
2012-11-17  1:38 ` [RFC/PATCH 3/5] completion: trivial test improvement Felipe Contreras
2012-11-17 10:59   ` SZEDER Gábor
2012-11-17  1:38 ` [RFC/PATCH 4/5] completion: get rid of compgen Felipe Contreras
2012-11-17 11:00   ` SZEDER Gábor
2012-11-17 11:42     ` Felipe Contreras
2012-11-17 14:12       ` SZEDER Gábor [this message]
2012-11-17 19:33         ` Felipe Contreras
2012-11-18  0:53           ` Felipe Contreras
2012-11-17  1:38 ` [RFC/PATCH 5/5] completion: refactor __gitcomp_1 Felipe Contreras
2012-11-17 10:58   ` SZEDER Gábor
2012-11-17 11:27     ` Felipe Contreras
2012-11-17 14:13       ` SZEDER Gábor

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=20121117141215.GG12052@goldbirke \
    --to=szeder@ira.uka.de \
    --cc=bgustavsson@gmail.com \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=jrnieder@gmail.com \
    --cc=peff@peff.net \
    --cc=peter@avirtualhome.com \
    --cc=robert.a.zeh@gmail.com \
    --cc=spearce@spearce.org \
    /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