[PATCH] v2writable: use {inboxdir} for msgmap->tmp_clone

[PATCH] v2writable: use {inboxdir} for msgmap->tmp_clone

[Eric Wong]

Otherwise, a user is more likely to remove the msgmap-XXXXXXXX
SQLite file from $TMPDIR and cause SQLite to error out.
---
 lib/PublicInbox/Msgmap.pm     | 4 ++--
 lib/PublicInbox/V2Writable.pm | 2 +-
 t/msgmap.t                    | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/lib/PublicInbox/Msgmap.pm b/lib/PublicInbox/Msgmap.pm
index 839ddf7c..51b6a68c 100644
--- a/lib/PublicInbox/Msgmap.pm
+++ b/lib/PublicInbox/Msgmap.pm
@@ -48,8 +48,8 @@ sub new_file {
 
 # used to keep track of used numeric mappings for v2 reindex
 sub tmp_clone {
-	my ($self) = @_;
-	my ($fh, $fn) = tempfile('msgmap-XXXXXXXX', EXLOCK => 0, TMPDIR => 1);
+	my ($self, $dir) = @_;
+	my ($fh, $fn) = tempfile('msgmap-XXXXXXXX', EXLOCK => 0, DIR => $dir);
 	my $tmp;
 	if ($self->{dbh}->can('sqlite_backup_to_dbh')) {
 		$tmp = ref($self)->new_file($fn, 2);
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 6908bd2e..6b0bdc73 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -1225,7 +1225,7 @@ sub index_sync {
 		# only for batch performance.
 		$self->{mm}->{dbh}->rollback;
 		$self->{mm}->{dbh}->begin_work;
-		$sync->{mm_tmp} = $self->{mm}->tmp_clone;
+		$sync->{mm_tmp} = $self->{mm}->tmp_clone($self->{inboxdir});
 	}
 	if ($sync->{index_max_size} = $self->{ibx}->{index_max_size}) {
 		$sync->{index_oid} = \&index_oid;
diff --git a/t/msgmap.t b/t/msgmap.t
index 1d7d1e87..437e106e 100644
--- a/t/msgmap.t
+++ b/t/msgmap.t
@@ -60,7 +60,7 @@ my $orig = $d->mid_insert('spam@1');
 $d->mid_delete('spam@1');
 is($d->mid_insert('spam@2'), 1 + $orig, "last number not recycled");
 
-my $tmp = $d->tmp_clone;
+my $tmp = $d->tmp_clone($tmpdir);
 is_deeply([$d->minmax], [$tmp->minmax], 'Cloned temporary DB matches');
 ok($tmp->mid_delete('spam@2'), 'temporary DB is writable');
 

Re: [PATCH] v2writable: use {inboxdir} for msgmap->tmp_clone

[Eric Wong]

Eric Wong <e@yhbt.net> wrote:
> +	my ($self, $dir) = @_;
> +	my ($fh, $fn) = tempfile('msgmap-XXXXXXXX', EXLOCK => 0, DIR => $dir);
>  	my $tmp;
>  	if ($self->{dbh}->can('sqlite_backup_to_dbh')) {
>  		$tmp = ref($self)->new_file($fn, 2);
> diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
> index 6908bd2e..6b0bdc73 100644
> --- a/lib/PublicInbox/V2Writable.pm
> +++ b/lib/PublicInbox/V2Writable.pm
> @@ -1225,7 +1225,7 @@ sub index_sync {
>  		# only for batch performance.
>  		$self->{mm}->{dbh}->rollback;
>  		$self->{mm}->{dbh}->begin_work;
> -		$sync->{mm_tmp} = $self->{mm}->tmp_clone;
> +		$sync->{mm_tmp} = $self->{mm}->tmp_clone($self->{inboxdir});

That is wrong, and the `undef' didn't get noticed since
tempfile() sees `DIR => undef' and just uses the current
working directory.  Will squash this in:

diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 6b0bdc73..e071bc1e 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -1225,7 +1225,8 @@ sub index_sync {
 		# only for batch performance.
 		$self->{mm}->{dbh}->rollback;
 		$self->{mm}->{dbh}->begin_work;
-		$sync->{mm_tmp} = $self->{mm}->tmp_clone($self->{inboxdir});
+		$sync->{mm_tmp} =
+			$self->{mm}->tmp_clone($self->{ibx}->{inboxdir});
 	}
 	if ($sync->{index_max_size} = $self->{ibx}->{index_max_size}) {
 		$sync->{index_oid} = \&index_oid;