user/dev discussion of public-inbox itself
 help / color / mirror / code / Atom feed
Search results ordered by [date|relevance]  view[summary|nested|Atom feed]
thread overview below | download mbox.gz: |
* [PATCH 1/3] v1writable: new wrapper which is closer to v2writable
  2019-05-14  2:04  7% ` [PATCH 0/3] incremental index fixes for indexlevel=basic Eric Wong
@ 2019-05-14  2:04  7%   ` Eric Wong
  0 siblings, 0 replies; 2+ results
From: Eric Wong @ 2019-05-14  2:04 UTC (permalink / raw)
  To: meta; +Cc: Eric W. Biederman

Import initialization is a little strange from history, but we
also can't change it too much because it's technically a public
API which external code may rely on...

And we may need to support v1 repos indefinitely.  This should
make it easier to write tests for both formats.
---
 MANIFEST                      |  1 +
 lib/PublicInbox/Import.pm     | 15 ++++++++++++++-
 lib/PublicInbox/V1Writable.pm | 34 ++++++++++++++++++++++++++++++++++
 lib/PublicInbox/V2Writable.pm |  6 +-----
 script/public-inbox-init      | 23 ++++++++++-------------
 5 files changed, 60 insertions(+), 19 deletions(-)
 create mode 100644 lib/PublicInbox/V1Writable.pm

diff --git a/MANIFEST b/MANIFEST
index 29cea10..28300e0 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -125,6 +125,7 @@ lib/PublicInbox/SpawnPP.pm
 lib/PublicInbox/Syscall.pm
 lib/PublicInbox/Unsubscribe.pm
 lib/PublicInbox/UserContent.pm
+lib/PublicInbox/V1Writable.pm
 lib/PublicInbox/V2Writable.pm
 lib/PublicInbox/View.pm
 lib/PublicInbox/ViewDiff.pm
diff --git a/lib/PublicInbox/Import.pm b/lib/PublicInbox/Import.pm
index c775575..12abf39 100644
--- a/lib/PublicInbox/Import.pm
+++ b/lib/PublicInbox/Import.pm
@@ -18,12 +18,15 @@ use PublicInbox::MDA;
 use POSIX qw(strftime);
 
 sub new {
+	# we can't change arg order, this is documented in POD
+	# and external projects may rely on it:
 	my ($class, $git, $name, $email, $ibx) = @_;
 	my $ref = 'refs/heads/master';
 	if ($ibx) {
 		$ref = $ibx->{ref_head} || 'refs/heads/master';
 		$name ||= $ibx->{name};
 		$email ||= $ibx->{-primary_address};
+		$git ||= $ibx->git;
 	}
 	bless {
 		git => $git,
@@ -433,6 +436,16 @@ sub run_die ($;$$) {
 	$? == 0 or die join(' ', @$cmd) . " failed: $?\n";
 }
 
+sub init_bare {
+	my ($dir) = @_;
+	my @cmd = (qw(git init --bare -q), $dir);
+	run_die(\@cmd);
+	# set a reasonable default:
+	@cmd = (qw/git config/, "--file=$dir/config",
+		'repack.writeBitmaps', 'true');
+	run_die(\@cmd);
+}
+
 sub done {
 	my ($self) = @_;
 	my $w = delete $self->{out} or return;
@@ -586,7 +599,7 @@ __END__
 
 =head1 NAME
 
-PublicInbox::Import - message importer for public-inbox
+PublicInbox::Import - message importer for public-inbox v1 inboxes
 
 =head1 VERSION
 
diff --git a/lib/PublicInbox/V1Writable.pm b/lib/PublicInbox/V1Writable.pm
new file mode 100644
index 0000000..6ca5db4
--- /dev/null
+++ b/lib/PublicInbox/V1Writable.pm
@@ -0,0 +1,34 @@
+# Copyright (C) 2019 all contributors <meta@public-inbox.org>
+# License: AGPL-3.0+ <https://www.gnu.org/licenses/agpl-3.0.txt>
+
+# This interface wraps PublicInbox::Import and makes it closer
+# to V2Writable
+# Used to write to V1 inboxes (see L<public-inbox-v1-format(5)>).
+package PublicInbox::V1Writable;
+use strict;
+use warnings;
+use base qw(PublicInbox::Import);
+use PublicInbox::InboxWritable;
+
+sub new {
+	my ($class, $ibx, $creat) = @_;
+	my $dir = $ibx->{mainrepo} or die "no mainrepo in inbox\n";
+	unless (-d $dir) {
+		if ($creat) {
+			PublicInbox::Import::init_bare($dir);
+		} else {
+			die "$dir does not exist\n";
+		}
+	}
+	$ibx = PublicInbox::InboxWritable->new($ibx);
+	$class->SUPER::new(undef, undef, undef, $ibx);
+}
+
+sub init_inbox {
+	my ($self, $partitions, $skip_epoch, $skip_artnum) = @_;
+	# TODO: honor skip_artnum
+	my $dir = $self->{-inbox}->{mainrepo} or die "no mainrepo in inbox\n";
+	PublicInbox::Import::init_bare($dir);
+}
+
+1;
diff --git a/lib/PublicInbox/V2Writable.pm b/lib/PublicInbox/V2Writable.pm
index 87e8f3e..b92d8d2 100644
--- a/lib/PublicInbox/V2Writable.pm
+++ b/lib/PublicInbox/V2Writable.pm
@@ -517,11 +517,7 @@ sub fill_alternates ($$) {
 	my $all = "$self->{-inbox}->{mainrepo}/all.git";
 	my @cmd;
 	unless (-d $all) {
-		@cmd = (qw(git init --bare -q), $all);
-		PublicInbox::Import::run_die(\@cmd);
-		@cmd = (qw/git config/, "--file=$all/config",
-				'repack.writeBitmaps', 'true');
-		PublicInbox::Import::run_die(\@cmd);
+		PublicInbox::Import::init_bare($all);
 	}
 	@cmd = (qw/git config/, "--file=$pfx/$epoch.git/config",
 			'include.path', '../../all.git/config');
diff --git a/script/public-inbox-init b/script/public-inbox-init
index 39f7497..8bb7845 100755
--- a/script/public-inbox-init
+++ b/script/public-inbox-init
@@ -8,6 +8,7 @@ use warnings;
 my $usage = "public-inbox-init NAME REPO_DIR HTTP_URL ADDRESS [ADDRESS..]";
 use Getopt::Long qw/:config gnu_getopt no_ignore_case auto_abbrev/;
 use PublicInbox::Config;
+use PublicInbox::Inbox;
 use File::Temp qw/tempfile/;
 use File::Basename qw/dirname/;
 use File::Path qw/mkpath/;
@@ -103,23 +104,19 @@ if ($version == 1 && defined $skip) {
 	die "--skip is only supported for -V2 repos\n";
 }
 
+my $ibx = PublicInbox::Inbox->new({
+	mainrepo => $mainrepo,
+	name => $name,
+	version => $version,
+	-primary_address => $address[0],
+});
+
 if ($version >= 2) {
 	require PublicInbox::V2Writable;
-	require PublicInbox::Inbox;
-	my $ibx = {
-		mainrepo => $mainrepo,
-		name => $name,
-		version => $version,
-		-primary_address => $address[0],
-	};
-	$ibx = PublicInbox::Inbox->new($ibx);
 	PublicInbox::V2Writable->new($ibx, 1)->init_inbox(0, $skip);
 } elsif ($version == 1) {
-	x(qw(git init -q --bare), $mainrepo);
-
-	# set a reasonable default:
-	x(qw/git config/, "--file=$mainrepo/config",
-		'repack.writeBitmaps', 'true');
+	require PublicInbox::V1Writable;
+	PublicInbox::V1Writable->new($ibx, 1)->init_inbox(0, $skip);
 } else {
 	die "Unsupported -V/--version: $version\n";
 }
-- 
EW


^ permalink raw reply related	[relevance 7%]

* [PATCH 0/3] incremental index fixes for indexlevel=basic
  @ 2019-05-14  2:04  7% ` Eric Wong
  2019-05-14  2:04  7%   ` [PATCH 1/3] v1writable: new wrapper which is closer to v2writable Eric Wong
  0 siblings, 1 reply; 2+ results
From: Eric Wong @ 2019-05-14  2:04 UTC (permalink / raw)
  To: meta; +Cc: Eric W. Biederman

Resurrecting an old issue from last year I completely forgot
about :x  Thanks to Eric Biederman for the cleanup to 3/3
to simplify the v1 indexing logic.

The first two are prepatory patches which make tests
easier-to-write; and I have plans to cleanup and cull
redundancies in tests because they take too long.

Eric Wong (3):
  v1writable: new wrapper which is closer to v2writable
  v2writable: allow setting nproc via creat options
  searchidx: fix incremental index with indexlevel=basic on v1

 MANIFEST                      |   2 +
 lib/PublicInbox/Import.pm     |  15 +++-
 lib/PublicInbox/OverIdx.pm    |   9 ++-
 lib/PublicInbox/SearchIdx.pm  |  68 +++++++++++-------
 lib/PublicInbox/V1Writable.pm |  34 +++++++++
 lib/PublicInbox/V2Writable.pm |  19 ++++--
 script/public-inbox-index     |   3 +-
 script/public-inbox-init      |  23 +++----
 t/indexlevels-mirror.t        | 125 ++++++++++++++++++++++++++++++++++
 t/purge.t                     |   3 +-
 t/v2reindex.t                 |   3 +-
 t/v2writable.t                |   8 +--
 12 files changed, 252 insertions(+), 60 deletions(-)
 create mode 100644 lib/PublicInbox/V1Writable.pm
 create mode 100644 t/indexlevels-mirror.t

-- 
EW

^ permalink raw reply	[relevance 7%]

Results 1-2 of 2 | reverse | options above
-- pct% links below jump to the message on this page, permalinks otherwise --
2018-08-02  3:44     [WIP] searchidx: support incremental indexing on indexlevel=basic Eric Wong
2019-05-14  2:04  7% ` [PATCH 0/3] incremental index fixes for indexlevel=basic Eric Wong
2019-05-14  2:04  7%   ` [PATCH 1/3] v1writable: new wrapper which is closer to v2writable 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).