* [PATCH 4/5] inboxwritable: drop git_dir_n sub
2020-12-16 23:19 6% [PATCH 0/5] various indexing cleanups and quieting Eric Wong
@ 2020-12-16 23:19 7% ` Eric Wong
0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2020-12-16 23:19 UTC (permalink / raw)
To: meta
There's only one caller, unlikely to be any more, and
should be harmless to open code.
---
lib/PublicInbox/InboxWritable.pm | 3 ---
lib/PublicInbox/V2Writable.pm | 3 ++-
2 files changed, 2 insertions(+), 4 deletions(-)
diff --git a/lib/PublicInbox/InboxWritable.pm b/lib/PublicInbox/InboxWritable.pm
index 48d2267f..c0e88f3d 100644
--- a/lib/PublicInbox/InboxWritable.pm
+++ b/lib/PublicInbox/InboxWritable.pm
@@ -300,9 +300,6 @@ sub warn_ignore_cb {
}
}
-# v2+ only
-sub git_dir_n { "$_[0]->{inboxdir}/git/$_[1].git" }
-
# v2+ only, XXX: maybe we can just rely on ->max_git_epoch and remove
sub git_dir_latest {
my ($self, $max) = @_;
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 7b8b5abf..3e3b275f 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -1091,8 +1091,9 @@ sub sync_prepare ($$) {
if ($sync->{max_size} = $sync->{-opt}->{max_size}) {
$sync->{index_oid} = $self->can('index_oid');
}
+ my $git_pfx = "$sync->{ibx}->{inboxdir}/git";
for (my $i = $sync->{epoch_max}; $i >= 0; $i--) {
- my $git_dir = $sync->{ibx}->git_dir_n($i);
+ my $git_dir = "$git_pfx/$i.git";
-d $git_dir or next; # missing epochs are fine
my $git = PublicInbox::Git->new($git_dir);
my $unit = { git => $git, epoch => $i };
^ permalink raw reply related [relevance 7%]
* [PATCH 0/5] various indexing cleanups and quieting
@ 2020-12-16 23:19 6% Eric Wong
2020-12-16 23:19 7% ` [PATCH 4/5] inboxwritable: drop git_dir_n sub Eric Wong
0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2020-12-16 23:19 UTC (permalink / raw)
To: meta
Less code, less warnings, more better
Eric Wong (5):
inboxwritable: warn_ignore: skip "Bad UTF7 data escape"
index: ignore data warnings, set {current_info} for v1
inbox: simplify v2 epoch count, reuse in InboxWritable
inboxwritable: drop git_dir_n sub
extsearchidx: no need to use InboxWritable
lib/PublicInbox/Admin.pm | 23 ++++++++++++++---------
lib/PublicInbox/ExtSearchIdx.pm | 6 +-----
lib/PublicInbox/Inbox.pm | 18 +++++++-----------
lib/PublicInbox/InboxWritable.pm | 22 +++++-----------------
lib/PublicInbox/Search.pm | 3 +--
lib/PublicInbox/SearchIdx.pm | 6 +++++-
lib/PublicInbox/V2Writable.pm | 19 ++++++-------------
lib/PublicInbox/Xapcmd.pm | 3 +--
8 files changed, 40 insertions(+), 60 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-12-16 23:19 6% [PATCH 0/5] various indexing cleanups and quieting Eric Wong
2020-12-16 23:19 7% ` [PATCH 4/5] inboxwritable: drop git_dir_n sub 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).