* [PATCH 12/14] convert: speed up --help
2020-08-10 2:11 6% [PATCH 00/14] more indexing related improvements Eric Wong
@ 2020-08-10 2:12 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-08-10 2:12 UTC (permalink / raw)
To: meta
Lazy-loading dependencies speeds up --help by several hundred
milliseconds and is a huge step towards user-friendliness.
---
script/public-inbox-convert | 39 ++++++++++++++++++-------------------
1 file changed, 19 insertions(+), 20 deletions(-)
diff --git a/script/public-inbox-convert b/script/public-inbox-convert
index ca16b0dc..c9075207 100755
--- a/script/public-inbox-convert
+++ b/script/public-inbox-convert
@@ -2,16 +2,8 @@
# Copyright (C) 2018-2020 all contributors <meta@public-inbox.org>
# License: AGPL-3.0+ <http://www.gnu.org/licenses/agpl-3.0.txt>
use strict;
-use warnings;
+use v5.10.1;
use Getopt::Long qw(:config gnu_getopt no_ignore_case auto_abbrev);
-use PublicInbox::InboxWritable;
-use PublicInbox::Config;
-use PublicInbox::Admin;
-use PublicInbox::V2Writable;
-use PublicInbox::Git;
-use PublicInbox::Spawn qw(spawn);
-use Cwd 'abs_path';
-use File::Copy 'cp'; # preserves permissions:
my $usage = 'Usage: public-inbox-convert [options] OLD NEW';
my $help = <<EOF; # the following should fit w/o scrolling in 80x24 term:
usage: $usage
@@ -57,27 +49,33 @@ my $old_dir = shift(@ARGV) or die $usage;
my $new_dir = shift(@ARGV) or die $usage;
die "$new_dir exists\n" if -d $new_dir;
die "$old_dir not a directory\n" unless -d $old_dir;
-my $cfg = PublicInbox::Config->new;
+
+require Cwd;
+Cwd->import('abs_path');
+require PublicInbox::Config;
+require PublicInbox::InboxWritable;
+
$old_dir = abs_path($old_dir);
+my $cfg = PublicInbox::Config->new;
my $old;
$cfg->each_inbox(sub {
$old = $_[0] if abs_path($_[0]->{inboxdir}) eq $old_dir;
});
-unless ($old) {
+if ($old) {
+ $old = PublicInbox::InboxWritable->new($old);
+} else {
warn "W: $old_dir not configured in " .
PublicInbox::Config::default_file() . "\n";
- $old = {
+ $old = PublicInbox::InboxWritable->new({
inboxdir => $old_dir,
name => 'ignored',
+ -primary_address => 'old@example.com',
address => [ 'old@example.com' ],
- };
- $old = PublicInbox::Inbox->new($old);
-}
-$old = PublicInbox::InboxWritable->new($old);
-if ($old->version >= 2) {
- die "Only conversion from v1 inboxes is supported\n";
+ });
}
+die "Only conversion from v1 inboxes is supported\n" if $old->version >= 2;
+require PublicInbox::Admin;
$old->{indexlevel} //= PublicInbox::Admin::detect_indexlevel($old);
my $env;
if ($opt->{'index'}) {
@@ -100,14 +98,15 @@ sub link_or_copy ($$) {
my ($src, $dst) = @_;
link($src, $dst) and return;
$!{EXDEV} or warn "link $src, $dst failed: $!, trying cp\n";
- cp($src, $dst) or die "cp $src, $dst failed: $!\n";
+ require File::Copy; # preserves permissions:
+ File::Copy::cp($src, $dst) or die "cp $src, $dst failed: $!\n";
}
$old->with_umask(sub {
my $old_cfg = "$old->{inboxdir}/config";
local $ENV{GIT_CONFIG} = $old_cfg;
my $new_cfg = "$new->{inboxdir}/all.git/config";
- $v2w = PublicInbox::V2Writable->new($new, 1);
+ $v2w = $new->importer(1);
$v2w->init_inbox(delete $opt->{jobs});
unlink $new_cfg;
link_or_copy($old_cfg, $new_cfg);
^ permalink raw reply related [relevance 7%]
* [PATCH 00/14] more indexing related improvements
@ 2020-08-10 2:11 6% Eric Wong
2020-08-10 2:12 7% ` [PATCH 12/14] convert: speed up --help Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-08-10 2:11 UTC (permalink / raw)
To: meta
publicInbox.indexSequentialShard now works incrementally
-convert also learned all the options -index learned,
so it can be less painful on HDDs.
Eric Wong (14):
index: require --reindex when using --xapian-only
index: --sequential-shard works incrementally
doc: index: some more notes about latest changes
doc: add some notes around -xcpdb / -edit / -purge
index+xcpdb: improve SIG{INT,TERM,HUP,PIPE} behavior
msgmap: tmp_clone: simplify + meaningful filename
avoid File::Temp::tempfile in more places
admin: use a generic veriable name
index: cleanup internal variables
searchidx: use singular `$opt' for consistency with v2
convert: support new -index options
convert: speed up --help
convert: check ARGV more correctly
convert: set No_COW on copied SQLite files
Documentation/public-inbox-convert.pod | 19 ++++
Documentation/public-inbox-edit.pod | 14 +++
Documentation/public-inbox-index.pod | 68 +++++++------
Documentation/public-inbox-init.pod | 2 +-
Documentation/public-inbox-purge.pod | 14 +++
Documentation/public-inbox-xcpdb.pod | 15 ++-
lib/PublicInbox/Admin.pm | 71 ++++++++++++--
lib/PublicInbox/Msgmap.pm | 19 ++--
lib/PublicInbox/SearchIdx.pm | 34 +++----
lib/PublicInbox/V2Writable.pm | 77 ++++++++-------
lib/PublicInbox/Xapcmd.pm | 28 ++++--
script/public-inbox-convert | 131 ++++++++++++++++---------
script/public-inbox-index | 69 ++++---------
script/public-inbox-init | 17 ++--
t/import.t | 5 +-
15 files changed, 357 insertions(+), 226 deletions(-)
^ permalink raw reply [relevance 6%]
Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2020-08-10 2:11 6% [PATCH 00/14] more indexing related improvements Eric Wong
2020-08-10 2:12 7% ` [PATCH 12/14] convert: speed up --help 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).