* [PATCH 5/7] git: synchronous cat_file may return type and OID
2021-01-29 7:42 4% [PATCH 0/7] lei: more half-baked updates Eric Wong
@ 2021-01-29 7:42 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2021-01-29 7:42 UTC (permalink / raw)
To: meta
Instead of forcing callers to set a variable to write into,
we'll just rely on wantarray.
---
lib/PublicInbox/Git.pm | 9 ++++-----
t/git.t | 8 ++++----
2 files changed, 8 insertions(+), 9 deletions(-)
diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 3d97300c..c6c1c802 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -240,17 +240,16 @@ sub batch_prepare ($) {
}
sub _cat_file_cb {
- my ($bref, undef, undef, $size, $result) = @_;
- @$result = ($bref, $size);
+ my ($bref, $oid, $type, $size, $result) = @_;
+ @$result = ($bref, $oid, $type, $size);
}
sub cat_file {
- my ($self, $oid, $sizeref) = @_;
+ my ($self, $oid) = @_;
my $result = [];
cat_async($self, $oid, \&_cat_file_cb, $result);
cat_async_wait($self);
- $$sizeref = $result->[1] if $sizeref;
- $result->[0];
+ wantarray ? @$result : $result->[0];
}
sub check_async_step ($$) {
diff --git a/t/git.t b/t/git.t
index 377652ca..0c85e492 100644
--- a/t/git.t
+++ b/t/git.t
@@ -70,10 +70,10 @@ if (1) {
chomp $buf;
my $gcf = PublicInbox::Git->new($dir);
- my $rsize;
- my $x = $gcf->cat_file($buf, \$rsize);
- is($rsize, $size, 'got correct size ref on big file');
- is(length($$x), $size, 'read correct number of bytes');
+ my @x = $gcf->cat_file($buf);
+ is($x[2], 'blob', 'got blob on wantarray');
+ is($x[3], $size, 'got correct size ref on big file');
+ is(length(${$x[0]}), $size, 'read correct number of bytes');
my $ref = $gcf->qx(qw(cat-file blob), $buf);
is($?, 0, 'no error on scalar success');
^ permalink raw reply related [relevance 7%]
* [PATCH 0/7] lei: more half-baked updates
@ 2021-01-29 7:42 4% Eric Wong
2021-01-29 7:42 7% ` [PATCH 5/7] git: synchronous cat_file may return type and OID Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2021-01-29 7:42 UTC (permalink / raw)
To: meta
I'm not sure if I want to keep 1/7.
4/7 is LONG overdue
Still chasing down difficult-to-reproduce lei2mail workers
segfaults which seem related to LeiDedupe + SharedKV and weird
object lifetimes; which is preventing me from doing anything
else. Worst case is we disable worker processes, but the
performance hit sucks.
Eric Wong (7):
ipc: wq: support passing fields to workers
lei_xsearch: drop repeated "Xapian" in error message
ipc: more consistent behavior between worker types
lei: less error-prone FD mapping
git: synchronous cat_file may return type and OID
ipc: move on_destroy scope to inside the eval
shared_kv: simplify PID+object guard for cleanup
lib/PublicInbox/Git.pm | 9 ++---
lib/PublicInbox/IPC.pm | 46 +++++++++++++---------
lib/PublicInbox/LEI.pm | 56 ++++++++++++++++++++-------
lib/PublicInbox/LeiOverview.pm | 9 ++---
lib/PublicInbox/LeiToMail.pm | 8 +---
lib/PublicInbox/LeiXSearch.pm | 70 +++++++++++++++-------------------
lib/PublicInbox/SharedKV.pm | 8 ++--
lib/PublicInbox/Spawn.pm | 2 +-
t/git.t | 8 ++--
t/shared_kv.t | 2 +-
10 files changed, 119 insertions(+), 99 deletions(-)
^ permalink raw reply [relevance 4%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2021-01-29 7:42 4% [PATCH 0/7] lei: more half-baked updates Eric Wong
2021-01-29 7:42 7% ` [PATCH 5/7] git: synchronous cat_file may return type and OID Eric Wong
Code repositories for project(s) associated with this public inbox
https://80x24.org/public-inbox.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).