From: Eric Wong <e@80x24.org>
To: meta@public-inbox.org
Subject: [PATCH 10/13] overidx: fix version comparison
Date: Sun, 1 Oct 2023 09:54:26 +0000 [thread overview]
Message-ID: <20231001095429.2092610-11-e@80x24.org> (raw)
In-Reply-To: <20231001095429.2092610-1-e@80x24.org>
We can't use $DBD::SQLite::sqlite_version_number with older versions of
DBD::SQLite. Thus we need to treat the $DBD::SQLite::sqlite_version
string (e.g. "3.8.3", not v-string) and convert it to a v-string with
eval for version comparisons to determine if we can fork multiple
children when using SQLite.
Fixes: fa04201baae9 ("lei: force --jobs=1,1 for SQLite < 3.8.3")
---
lib/PublicInbox/OverIdx.pm | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/OverIdx.pm b/lib/PublicInbox/OverIdx.pm
index 6cc86d5d..5cea3706 100644
--- a/lib/PublicInbox/OverIdx.pm
+++ b/lib/PublicInbox/OverIdx.pm
@@ -671,13 +671,14 @@ sub vivify_xvmd {
}
sub fork_ok {
- return 1 if $DBD::SQLite::sqlite_version >= 3008003;
+ state $fork_ok = eval("v$DBD::SQLite::sqlite_version") ge v3.8.3;
+ return 1 if $fork_ok;
my ($opt) = @_;
my @j = split(/,/, $opt->{jobs} // '');
state $warned;
- grep { $_ > 1 } @j and $warned //= warn('DBD::SQLite version is ',
- $DBD::SQLite::sqlite_version,
- ", need >= 3008003 (3.8.3) for --jobs > 1\n");
+ grep { $_ > 1 } @j and $warned //= warn(<<EOM);
+DBD::SQLite version is v$DBD::SQLite::sqlite_version, need >= v3.8.3 for --jobs > 1
+EOM
$opt->{jobs} = '1,1';
undef;
}
next prev parent reply other threads:[~2023-10-01 9:54 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-01 9:54 [PATCH 00/13] various warning/diagnostic fixes Eric Wong
2023-10-01 9:54 ` [PATCH 01/13] gcf2: take non-ref scalar request arg Eric Wong
2023-10-01 9:54 ` [PATCH 02/13] t/git: show git_version in diag output Eric Wong
2023-10-01 9:54 ` [PATCH 03/13] process_pipe: don't run `close' unless requested Eric Wong
2023-10-01 9:54 ` [PATCH 04/13] git: improve error reporting Eric Wong
2023-10-01 9:54 ` [PATCH 05/13] git: packed_bytes: deal with glob+stat TOCTTOU Eric Wong
2023-10-01 9:54 ` [PATCH 06/13] lei rediff: `git diff -O<order-file>' support Eric Wong
2023-10-01 9:54 ` [PATCH 07/13] lei: correct exit signal Eric Wong
2023-10-01 9:54 ` [PATCH 08/13] lei mail-diff: don't remove temporary subdirectory Eric Wong
2023-10-01 9:54 ` [PATCH 09/13] lei_store: unlink stderr buffer early Eric Wong
2023-10-01 9:54 ` Eric Wong [this message]
2023-10-01 9:54 ` [PATCH 11/13] treewide: enable warnings in all exec-ed processes Eric Wong
2023-10-01 9:54 ` [PATCH 12/13] lei: ->fail only allows integer exit codes Eric Wong
2023-10-01 9:54 ` [PATCH 13/13] lei: deal with clients with blocked stderr Eric Wong
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://public-inbox.org/README
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231001095429.2092610-11-e@80x24.org \
--to=e@80x24.org \
--cc=meta@public-inbox.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).