From 19629ff99de0eb43a26963b8c276eae54f1247c8 Mon Sep 17 00:00:00 2001
From: Eric Wong <e@80x24.org>
Date: Thu, 13 Jun 2019 08:10:02 +0000
Subject: git: remove cat_file sub callback interface

We weren't using it, and in retrospect, it makes no sense to use
this API cat_file for giant responses which can't read quickly
with minimal context-switching (or sanely fit into memory for
Email::Simple/Email::MIME).

For giant blobs which we don't want slurped in memory, we'll
spawn a short-lived git-cat-file process like we do in ViewVCS.

Otherwise, monopolizing a git-cat-file process for a giant
blob is harmful to other PSGI/NNTP users.

A better interface is coming which will be more suitable for
for batch processing of "small" objects such as commits and
email blobs.
---
 lib/PublicInbox/Git.pm | 43 +++++++++++++------------------------------
 1 file changed, 13 insertions(+), 30 deletions(-)

(limited to 'lib/PublicInbox/Git.pm')

diff --git a/lib/PublicInbox/Git.pm b/lib/PublicInbox/Git.pm
index 68445b3c..6a87661c 100644
--- a/lib/PublicInbox/Git.pm
+++ b/lib/PublicInbox/Git.pm
@@ -145,41 +145,24 @@ again:
 		fail($self, "Unexpected result from git cat-file: $head");
 
 	my $size = $1;
-	my $ref_type = $ref ? ref($ref) : '';
-
 	my $rv;
 	my $left = $size;
-	$$ref = $size if ($ref_type eq 'SCALAR');
-	my $cb_err;
-
-	if ($ref_type eq 'CODE') {
-		$rv = eval { $ref->($in, \$left) };
-		$cb_err = $@;
-		# drain the rest
-		my $max = 8192;
-		while ($left > 0) {
-			my $r = read($in, my $x, $left > $max ? $max : $left);
-			defined($r) or fail($self, "read failed: $!");
-			$r == 0 and fail($self, 'exited unexpectedly');
-			$left -= $r;
-		}
-	} else {
-		my $offset = 0;
-		my $buf = '';
-		while ($left > 0) {
-			my $r = read($in, $buf, $left, $offset);
-			defined($r) or fail($self, "read failed: $!");
-			$r == 0 and fail($self, 'exited unexpectedly');
-			$left -= $r;
-			$offset += $r;
-		}
-		$rv = \$buf;
+	$$ref = $size if $ref;
+
+	my $offset = 0;
+	my $buf = '';
+	while ($left > 0) {
+		my $r = read($in, $buf, $left, $offset);
+		defined($r) or fail($self, "read failed: $!");
+		$r == 0 and fail($self, 'exited unexpectedly');
+		$left -= $r;
+		$offset += $r;
 	}
+	$rv = \$buf;
 
-	my $r = read($in, my $buf, 1);
+	my $r = read($in, my $lf, 1);
 	defined($r) or fail($self, "read failed: $!");
-	fail($self, 'newline missing after blob') if ($r != 1 || $buf ne "\n");
-	die $cb_err if $cb_err;
+	fail($self, 'newline missing after blob') if ($r != 1 || $lf ne "\n");
 
 	$rv;
 }
-- 
cgit v1.2.3-24-ge0c7