From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 15/17] view: remove redundant children array in thread views
Date: Wed, 5 Oct 2016 23:57:20 +0000 [thread overview]
Message-ID: <20161005235722.14857-16-e@80x24.org> (raw)
In-Reply-To: <20161005235722.14857-1-e@80x24.org>
Each node has an entire arrayref of its children nowadays, so
there's no need to waste time and memory creating another one.
---
lib/PublicInbox/View.pm | 63 ++++++++++++++++++++-----------------------------
1 file changed, 26 insertions(+), 37 deletions(-)
diff --git a/lib/PublicInbox/View.pm b/lib/PublicInbox/View.pm
index d0c6d33..0f00458 100644
--- a/lib/PublicInbox/View.pm
+++ b/lib/PublicInbox/View.pm
@@ -201,19 +201,16 @@ sub _th_index_lite {
my $rv = '';
my $mapping = $ctx->{mapping} or return $rv;
my $pad = ' ';
- # map = [children, attr, node, idx, level]
- my $map = $mapping->{$mid_raw};
- my $children = $map->[0];
+ my ($attr, $node, $idx, $level) = @{$mapping->{$mid_raw}};
+ my $children = $node->{children};
my $nr_c = scalar @$children;
my $nr_s = 0;
- my $level = $map->[4];
- my $idx = $map->[3];
my $siblings;
my $irt_map = $mapping->{$irt} if defined $irt;
if (defined $irt_map) {
- $siblings = $irt_map->[0];
+ $siblings = $irt_map->[1]->{children};
$nr_s = scalar(@$siblings) - 1;
- $rv .= $pad . $irt_map->[1];
+ $rv .= $pad . $irt_map->[0];
if ($idx > 0) {
my $prev = $siblings->[$idx - 1];
my $pmid = $prev->{id};
@@ -222,40 +219,38 @@ sub _th_index_lite {
$rv .= pad_link($pmid, $level, $s);
} elsif ($idx == 2) {
my $ppmid = $siblings->[0]->{id};
- $rv .= $pad . $mapping->{$ppmid}->[1];
+ $rv .= $pad . $mapping->{$ppmid}->[0];
}
- $rv .= $pad . $mapping->{$pmid}->[1];
+ $rv .= $pad . $mapping->{$pmid}->[0];
}
}
my $s_s = nr_to_s($nr_s, 'sibling', 'siblings');
my $s_c = nr_to_s($nr_c, 'reply', 'replies');
- my $this = $map->[1];
- $this =~ s!\n\z!</b>\n!s;
- $this =~ s!<a\nhref.*</a> !!s; # no point in duplicating subject
- $this =~ s!<a\nhref=[^>]+>([^<]+)</a>!$1!s; # no point linking to self
- $rv .= "<b>@ $this";
- my $node = $map->[2];
+ $attr =~ s!\n\z!</b>\n!s;
+ $attr =~ s!<a\nhref.*</a> !!s; # no point in duplicating subject
+ $attr =~ s!<a\nhref=[^>]+>([^<]+)</a>!$1!s; # no point linking to self
+ $rv .= "<b>@ $attr";
if ($nr_c) {
my $cmid = $children->[0]->{id};
- $rv .= $pad . $mapping->{$cmid}->[1];
+ $rv .= $pad . $mapping->{$cmid}->[0];
if ($nr_c > 2) {
my $s = ($nr_c - 1). ' more replies';
$rv .= pad_link($cmid, $level + 1, $s);
} elsif (my $cn = $children->[1]) {
- $rv .= $pad . $mapping->{$cn->{id}}->[1];
+ $rv .= $pad . $mapping->{$cn->{id}}->[0];
}
}
my $next = $siblings->[$idx+1] if $siblings && $idx >= 0;
if ($next) {
my $nmid = $next->{id};
- $rv .= $pad . $mapping->{$nmid}->[1];
+ $rv .= $pad . $mapping->{$nmid}->[0];
my $nnext = $nr_s - $idx;
if ($nnext > 2) {
my $s = ($nnext - 1).' subsequent siblings';
$rv .= pad_link($nmid, $level, $s);
} elsif (my $nn = $siblings->[$idx + 2]) {
- $rv .= $pad . $mapping->{$nn->{id}}->[1];
+ $rv .= $pad . $mapping->{$nn->{id}}->[0];
}
}
$rv .= $pad ."<a\nhref=#r$id>$s_s, $s_c; $ctx->{s_nr}</a>\n";
@@ -263,26 +258,20 @@ sub _th_index_lite {
sub walk_thread {
my ($th, $ctx, $cb) = @_;
- my @q = map { (0, $_) } @{$th->{rootset}};
+ my @q = map { (0, $_, -1) } @{$th->{rootset}};
while (@q) {
- my $level = shift @q;
- my $node = shift @q or next;
- $cb->($ctx, $level, $node);
+ my ($level, $node, $i) = splice(@q, 0, 3);
+ defined $node or next;
+ $cb->($ctx, $level, $node, $i);
++$level;
- unshift @q, map { ($level, $_) } @{$node->{children}};
+ $i = 0;
+ unshift @q, map { ($level, $_, $i++) } @{$node->{children}};
}
}
sub pre_thread {
- my ($ctx, $level, $node) = @_;
- my $mapping = $ctx->{mapping};
- my $idx = -1;
- if (my $parent = $node->{parent}) {
- my $m = $mapping->{$parent->{id}}->[0];
- $idx = scalar @$m;
- push @$m, $node;
- }
- $mapping->{$node->{id}} = [ [], '', $node, $idx, $level ];
+ my ($ctx, $level, $node, $idx) = @_;
+ $ctx->{mapping}->{$node->{id}} = [ '', $node, $idx, $level ];
skel_dump($ctx, $level, $node);
}
@@ -825,7 +814,7 @@ sub _skel_header {
my $map = $mapping->{$mid};
$id = id_compress($mid, 1);
$m = '#m'.$id;
- $map->[1] = "$d<a\nhref=\"$m\">$end";
+ $map->[0] = "$d<a\nhref=\"$m\">$end";
$id = "\nid=r".$id;
} else {
$m = $ctx->{-upfx}.mid_escape($mid).'/';
@@ -840,8 +829,6 @@ sub skel_dump {
} else {
my $mid = $node->{id};
my $dst = $ctx->{dst};
- my $mapping = $ctx->{mapping};
- my $map = $mapping->{$mid} if $mapping;
my $d = $ctx->{pct} ? ' [irrelevant] ' # search result
: ' [not found] ';
$d .= indent_for($level) . th_pfx($level);
@@ -850,9 +837,11 @@ sub skel_dump {
my $href = $upfx . $m->{href} . '/';
my $html = $m->as_html;
+ my $mapping = $ctx->{mapping};
+ my $map = $mapping->{$mid} if $mapping;
if ($map) {
my $id = id_compress($mid, 1);
- $map->[1] = $d . qq{<<a\nhref=#r$id>$html</a>>\n};
+ $map->[0] = $d . qq{<<a\nhref=#r$id>$html</a>>\n};
$d .= qq{<<a\nhref="$href"\nid=r$id>$html</a>>\n};
} else {
$d .= qq{<<a\nhref="$href">$html</a>>\n};
--
EW
next prev parent reply other threads:[~2016-10-05 23:57 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-10-05 23:57 [PATCH 0/17] remove Mail::Thread dependency Eric Wong
2016-10-05 23:57 ` [PATCH 01/17] view: remove "subject dummy" references Eric Wong
2016-10-05 23:57 ` [PATCH 02/17] thread: remove Mail::Thread dependency Eric Wong
2016-10-05 23:57 ` [PATCH 03/17] thread: pass array refs instead of entire arrays Eric Wong
2016-10-05 23:57 ` [PATCH 04/17] thread: remove accessor usage in internals Eric Wong
2016-10-05 23:57 ` [PATCH 05/17] inbox: deal with ghost smsg Eric Wong
2016-10-05 23:57 ` [PATCH 06/17] thread: remove Email::Abstract wrapping Eric Wong
2016-10-05 23:57 ` [PATCH 07/17] thread: remove rootset accessor method Eric Wong
2016-10-05 23:57 ` [PATCH 08/17] thread: simplify Eric Wong
2016-10-05 23:57 ` [PATCH 09/17] thread: remove iterate_down Eric Wong
2016-10-05 23:57 ` [PATCH 10/17] thread: avoid incrementing undefined value Eric Wong
2016-10-05 23:57 ` [PATCH 11/17] thread: order_children no longer cares about depth Eric Wong
2016-10-05 23:57 ` [PATCH 12/17] thread: inline and remove recurse_down logic Eric Wong
2016-10-05 23:57 ` [PATCH 13/17] thread: fix sorting without topmost Eric Wong
2016-10-14 21:17 ` [PATCH] thread: reinstates stable ordering when ghosts are present Eric Wong
2016-10-05 23:57 ` [PATCH 14/17] thread: use hash + array instead of hand-rolled linked list Eric Wong
2016-10-05 23:57 ` Eric Wong [this message]
2016-10-05 23:57 ` [PATCH 16/17] t/thread-cycle: test self-referential messages Eric Wong
2016-10-05 23:57 ` [PATCH 17/17] thread: remove weaken dependency Eric Wong
2016-10-06 8:22 ` [PATCH 0/17] remove Mail::Thread dependency Eric Wong
2016-10-13 3:59 ` [PATCH 0/2] thread: fix regressions from Mail::Thread removal Eric Wong
2016-10-13 3:59 ` [PATCH 1/2] thread: reduce indentation level Eric Wong
2016-10-13 3:59 ` [PATCH 2/2] thread: fix parent/child relationships Eric Wong
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: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20161005235722.14857-16-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.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;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).