From: Jeff King <peff@peff.net>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Elliott Cable <me@ell.io>
Subject: Re: [PATCH v2 2/4] commit-queue: LIFO or priority queue of commits
Date: Mon, 10 Jun 2013 01:25:00 -0400 [thread overview]
Message-ID: <20130610052500.GD3621@sigill.intra.peff.net> (raw)
In-Reply-To: <1370820277-30158-3-git-send-email-gitster@pobox.com>
On Sun, Jun 09, 2013 at 04:24:35PM -0700, Junio C Hamano wrote:
> Traditionally we used a singly linked list of commits to hold a set
> of in-flight commits while traversing history. The most typical use
> of the list is to add commits that are newly discovered to it, keep
> the list sorted by commit timestamp, pick up the newest one from the
> list, and keep digging. The cost of keeping the singly linked list
> sorted is nontrivial, and this typical use pattern better matches a
> priority queue.
>
> Introduce a commit-queue structure, that can be used either as a
> LIFO stack, or a priority queue. This will be used in the next
> patch to hold in-flight commits during sort-in-topological-order.
Great. You may recall I had a similar patch or year or two back, in an
attempt to fix some of the O(n^2) places (e.g., in fetch-pack's
mark_complete). We ended up dropping it because duplicate removal kept
"n" small enough for common cases, and most of the commit_list users
depend on doing cheap splicing and other linked-list operations.
It may be worth looking again for other places to use this over
commit_list, but even the caller you are introducing here justifies its
presence.
Also, I wrote some basic tests to cover the priority queue as a unit. I
can rebase them on your commit if you are interested.
A few comments on the code itself:
> +void commit_queue_put(struct commit_queue *queue, struct commit *commit)
Is it worth making this "struct commit *" a void pointer, and handling
arbitrary items in our priority queue? The compare function should be
the only thing that dereferences them.
I do not have any non-commit priority queue use in mind, but I do not
think it adds any complexity in this case.
> + /* Bubble up the new one */
> + for (ix = queue->nr - 1; ix; ix = parent) {
> + parent = (ix - 1) / 2;
> + if (compare(queue->array[parent], queue->array[ix],
> + queue->cb_data) < 0)
> + break;
In my implementation, I stopped on "compare() <= 0". It is late and my
mind is fuzzy, but I recall that heaps are never stable with respect to
insertion order, so I don't think it would matter.
-Peff
next prev parent reply other threads:[~2013-06-10 5:25 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-04 18:08 [PATCH/RFC] add --authorship-order flag to git log / rev-list elliottcable
2013-06-04 18:08 ` [PATCH/RFC] rev-list: add --authorship-order alternative ordering elliottcable
2013-06-04 19:14 ` Junio C Hamano
2013-06-04 21:20 ` Junio C Hamano
2013-06-06 19:03 ` Elliott Cable
2013-06-06 19:29 ` Junio C Hamano
2013-06-06 19:32 ` Elliott Cable
2013-06-06 19:40 ` Junio C Hamano
2013-06-06 22:48 ` Junio C Hamano
2013-06-06 23:25 ` [PATCH] toposort: rename "lifo" field Junio C Hamano
2013-06-07 1:25 ` Junio C Hamano
2013-06-07 5:11 ` [PATCH 0/3] Preparing for --date-order=author Junio C Hamano
2013-06-07 5:11 ` [PATCH 1/3] toposort: rename "lifo" field Junio C Hamano
2013-06-07 5:18 ` Eric Sunshine
2013-06-07 5:21 ` Junio C Hamano
2013-06-07 5:11 ` [PATCH 2/3] commit-queue: LIFO or priority queue of commits Junio C Hamano
2013-06-07 5:29 ` Eric Sunshine
2013-06-07 5:11 ` [PATCH 3/3] sort-in-topological-order: use commit-queue Junio C Hamano
2013-06-09 23:24 ` [PATCH v2 0/4] log --author-date-order Junio C Hamano
2013-06-09 23:24 ` [PATCH v2 1/4] toposort: rename "lifo" field Junio C Hamano
2013-06-10 2:12 ` Eric Sunshine
2013-06-10 5:05 ` Jeff King
2013-06-09 23:24 ` [PATCH v2 2/4] commit-queue: LIFO or priority queue of commits Junio C Hamano
2013-06-10 5:25 ` Jeff King [this message]
2013-06-10 7:21 ` Junio C Hamano
2013-06-10 18:15 ` Jeff King
2013-06-10 18:56 ` Junio C Hamano
2013-06-10 18:59 ` Jeff King
2013-06-10 23:23 ` Junio C Hamano
2013-06-11 6:36 ` Jeff King
2013-06-11 17:02 ` Junio C Hamano
2013-06-11 22:19 ` [PATCH v3 0/4] log --author-date-order Junio C Hamano
2013-06-11 22:19 ` [PATCH v3 1/4] toposort: rename "lifo" field Junio C Hamano
2013-06-11 22:19 ` [PATCH v3 2/4] prio-queue: priority queue of pointers to structs Junio C Hamano
2013-06-11 22:19 ` [PATCH v3 3/4] sort-in-topological-order: use prio-queue Junio C Hamano
2013-06-11 22:19 ` [PATCH v3 4/4] log: --author-date-order Junio C Hamano
2013-06-09 23:24 ` [PATCH v2 3/4] sort-in-topological-order: use commit-queue Junio C Hamano
2013-06-09 23:37 ` Junio C Hamano
2013-06-10 5:31 ` Jeff King
2013-06-10 7:27 ` Junio C Hamano
2013-06-10 18:24 ` Jeff King
2013-06-09 23:24 ` [PATCH v2 4/4] log: --author-date-order Junio C Hamano
2013-06-10 5:50 ` Jeff King
2013-06-10 7:39 ` Junio C Hamano
2013-06-10 18:49 ` Jeff King
2013-06-20 19:36 ` Junio C Hamano
2013-06-20 20:16 ` Jeff King
2013-06-07 5:09 ` [PATCH] toposort: rename "lifo" field Eric Sunshine
2013-06-04 21:22 ` [PATCH/RFC] rev-list: add --authorship-order alternative ordering Jeff King
2013-06-04 18:53 ` [PATCH/RFC] add --authorship-order flag to git log / rev-list Junio C Hamano
2013-06-06 18:06 ` Elliott Cable
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20130610052500.GD3621@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=me@ell.io \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).