From: Eric Wong <e@80x24.org>
Date: Tue, 31 Aug 2021 11:21:24 +0000 (+0000)
Subject: lei_mail_sync: set_src uses binary OIDs
X-Git-Tag: v1.7.0~467
X-Git-Url: http://www.git.stargrave.org/?a=commitdiff_plain;h=4853dee600d76ed5de5807605fa78bcd0557babd;p=public-inbox.git

lei_mail_sync: set_src uses binary OIDs

Another step towards moving more of our internals to use binary
OIDs to avoid needless conversions before hitting disk.
---

diff --git a/lib/PublicInbox/LeiMailSync.pm b/lib/PublicInbox/LeiMailSync.pm
index 275e0cc4..f8834a27 100644
--- a/lib/PublicInbox/LeiMailSync.pm
+++ b/lib/PublicInbox/LeiMailSync.pm
@@ -118,7 +118,7 @@ EOM
 }
 
 sub set_src {
-	my ($self, $oidhex, $folder, $id) = @_;
+	my ($self, $oidbin, $folder, $id) = @_;
 	my $fid = $self->{fmap}->{$folder} //= fid_for($self, $folder, 1);
 	my $sth;
 	if (ref($id)) { # scalar name
@@ -131,7 +131,7 @@ INSERT OR IGNORE INTO blob2name (oidbin, fid, name) VALUES (?, ?, ?)
 INSERT OR IGNORE INTO blob2num (oidbin, fid, uid) VALUES (?, ?, ?)
 
 	}
-	$sth->execute(pack('H*', $oidhex), $fid, $id);
+	$sth->execute($oidbin, $fid, $id);
 }
 
 sub clear_src {
diff --git a/lib/PublicInbox/LeiStore.pm b/lib/PublicInbox/LeiStore.pm
index 28e36e89..5a48c064 100644
--- a/lib/PublicInbox/LeiStore.pm
+++ b/lib/PublicInbox/LeiStore.pm
@@ -229,7 +229,7 @@ sub lms_rename_folder {
 
 sub set_sync_info {
 	my ($self, $oidhex, $folder, $id) = @_;
-	_lms_rw($self)->set_src($oidhex, $folder, $id);
+	_lms_rw($self)->set_src(pack('H*', $oidhex), $folder, $id);
 }
 
 sub _remove_if_local { # git->cat_async arg
diff --git a/t/lei_mail_sync.t b/t/lei_mail_sync.t
index a5e5f5d3..5daa49cd 100644
--- a/t/lei_mail_sync.t
+++ b/t/lei_mail_sync.t
@@ -16,24 +16,25 @@ is_deeply([$ro->folders], [], 'no folders, yet');
 
 my $imap = 'imaps://bob@[::1]/INBOX;UIDVALIDITY=9';
 $lms->lms_begin;
-is($lms->set_src('deadbeef', $imap, 1), 1, 'set IMAP once');
-ok($lms->set_src('deadbeef', $imap, 1) == 0, 'set IMAP idempotently');
+my $deadbeef = "\xde\xad\xbe\xef";
+is($lms->set_src($deadbeef, $imap, 1), 1, 'set IMAP once');
+ok($lms->set_src($deadbeef, $imap, 1) == 0, 'set IMAP idempotently');
 $lms->lms_commit;
 is_deeply([$ro->folders], [$imap], 'IMAP folder added');
 is_deeply([$ro->folders($imap)], [$imap], 'IMAP folder with full GLOB');
 is_deeply([$ro->folders('imaps://bob@[::1]/INBOX')], [$imap],
 		'IMAP folder with partial GLOB');
 
-is_deeply($ro->locations_for("\xde\xad\xbe\xef"),
+is_deeply($ro->locations_for($deadbeef),
 	{ $imap => [ 1 ] }, 'locations_for w/ imap');
 
 my $maildir = 'maildir:/home/user/md';
 my $fname = 'foo:2,S';
 $lms->lms_begin;
-ok($lms->set_src('deadbeef', $maildir, \$fname), 'set Maildir once');
-ok($lms->set_src('deadbeef', $maildir, \$fname) == 0, 'set Maildir again');
+ok($lms->set_src($deadbeef, $maildir, \$fname), 'set Maildir once');
+ok($lms->set_src($deadbeef, $maildir, \$fname) == 0, 'set Maildir again');
 $lms->lms_commit;
-is_deeply($ro->locations_for("\xde\xad\xbe\xef"),
+is_deeply($ro->locations_for($deadbeef),
 	{ $imap => [ 1 ], $maildir => [ $fname ] },
 	'locations_for w/ maildir + imap');
 
@@ -45,7 +46,7 @@ if ('mess things up pretend old bug') {
 	$lms->lms_commit;
 
 	$lms->lms_begin;
-	ok($lms->set_src('deadbeef', $maildir, \$fname), 'set Maildir once');
+	ok($lms->set_src($deadbeef, $maildir, \$fname), 'set Maildir once');
 	$lms->lms_commit;
 };