* [PATCH 7/9] convert: fix --no-index switch
2020-02-02 6:52 6% [PATCH 0/9] convert: more fixes and tests Eric Wong
@ 2020-02-02 6:52 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-02-02 6:52 UTC (permalink / raw)
To: meta
The (currently undocumented) "--no-index" flag did not trigger
the V2Writable->done call necessary to make the import
successful.
Fixes: eea47b676127bcdb ("convert: preserve highwater mark from v1 msgmap")
---
script/public-inbox-convert | 6 ++----
t/convert-compact.t | 3 +++
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/script/public-inbox-convert b/script/public-inbox-convert
index 281313e0..68b0b31a 100755
--- a/script/public-inbox-convert
+++ b/script/public-inbox-convert
@@ -151,7 +151,5 @@ if (my $mm = $old->mm) {
chop(my $cmt = $epoch0->qx(qw(rev-parse --verify), $head));
$v2w->last_epoch_commit(0, $cmt);
}
-if ($index) {
- $v2w->index_sync({reindex => 1});
- $v2w->done;
-}
+$v2w->index_sync({reindex => 1}) if $index;
+$v2w->done;
diff --git a/t/convert-compact.t b/t/convert-compact.t
index fc46083b..f56d7817 100644
--- a/t/convert-compact.t
+++ b/t/convert-compact.t
@@ -76,6 +76,9 @@ my $hwm = do {
};
ok(defined($hwm) && $hwm > 0, "highwater mark set #$hwm");
+$cmd = [ '-convert', '--no-index', $ibx->{inboxdir}, "$tmpdir/no-index" ];
+ok(run_script($cmd, undef, $rdr), 'convert --no-index works');
+
$cmd = [ '-convert', $ibx->{inboxdir}, "$tmpdir/v2" ];
ok(run_script($cmd, undef, $rdr), 'convert works');
@xdir = glob("$tmpdir/v2/xap*/*");
^ permalink raw reply related [relevance 7%]
* [PATCH 0/9] convert: more fixes and tests
@ 2020-02-02 6:52 6% Eric Wong
2020-02-02 6:52 7% ` [PATCH 7/9] convert: fix --no-index switch Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-02-02 6:52 UTC (permalink / raw)
To: meta
Nothing major, but SMP systems should be better utilized
now that -convert can take advantage of parallel shard
indexing in Xapian. The switches for convert are also
now documented in the manpage.
Eric Wong (9):
t/multi-mid.t: extra test for -convert highwater mark
v2writable: nproc_shards: subtract 1 from given value
v2writable: do not clobber {shards} or {parallel} if unset
convert: remove unused variables capturing :from
searchidxshard: rely on autoflush instead of ->flush
convert: shift @ARGV explicitly
convert: fix --no-index switch
doc: -convert: document switches
v2writable: more ways to detect online CPU count
Documentation/public-inbox-convert.pod | 41 ++++++++++++++++-
MANIFEST | 1 +
lib/PublicInbox/SearchIdxShard.pm | 4 +-
lib/PublicInbox/V2Writable.pm | 38 +++++++++++-----
script/public-inbox-convert | 16 ++-----
t/convert-compact.t | 3 ++
t/multi-mid.t | 61 ++++++++++++++++++++++++++
t/xcpdb-reshard.t | 2 +-
8 files changed, 137 insertions(+), 29 deletions(-)
create mode 100644 t/multi-mid.t
^ 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-02-02 6:52 6% [PATCH 0/9] convert: more fixes and tests Eric Wong
2020-02-02 6:52 7% ` [PATCH 7/9] convert: fix --no-index switch 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).