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 0/6] make Search::Xapian optional for v2, NNTP, etc
@ 2019-05-15  6:33  5% Eric Wong
  0 siblings, 0 replies; 4+ results
From: Eric Wong @ 2019-05-15  6:33 UTC (permalink / raw)
  To: meta

Search::Xapian is missing from CentOS 7 and probably other
distros; so make it optional as all of our NNTP and a large
chunk of our WWW functionality doesn't rely on it, anymore.

Xapian databases is also the most expensive in terms of space
for indexing overhead, so indexlevel=basic users may appreciate
not having to install Xapian at all.

This has passed all test profiles (ci/profiles.sh) on Debian 9
and FreeBSD 11.2 (x86-64); but I haven't dogfooded it enough
to be comfortable having it in 'master'...  and I might not be
online much the next few days in case something goes sideways
on public-inbox.org.

The following changes since commit 2d51a2accd28465c915f91ab48c7e52a81d87a68:

  tests: get rid of unnecessary Cwd module use (2019-05-14 04:00:10 +0000)

are available in the Git repository at:

  https://80x24.org/public-inbox.git xap-optional

for you to fetch changes up to d0e8bfd866ed1e924e8d9f551939eecbea4920ef:

  admin: improve warnings and errors for missing modules (2019-05-15 06:15:34 +0000)

----------------------------------------------------------------
Eric Wong (6):
      inbox: add ->over method to ease access
      nntp: use Inbox->over directly
      www: use Inbox->over where appropriate
      lazy load Xapian and make it optional for v2
      searchidx: do not create empty Xapian partitions for basic
      admin: improve warnings and errors for missing modules

 INSTALL                       |   2 +-
 TODO                          |   2 -
 ci/deps.perl                  |   7 +--
 ci/profiles.sh                |   3 +-
 lib/PublicInbox/Admin.pm      |  60 ++++++++++++++++++++
 lib/PublicInbox/Feed.pm       |  11 ++--
 lib/PublicInbox/Inbox.pm      |  40 +++++++++-----
 lib/PublicInbox/Mbox.pm       |  25 +++++----
 lib/PublicInbox/NNTP.pm       |  40 +++++++-------
 lib/PublicInbox/OverIdx.pm    |  13 ++++-
 lib/PublicInbox/Search.pm     | 125 +++++++++++++++++-------------------------
 lib/PublicInbox/SearchIdx.pm  |  57 +++++++++++++------
 lib/PublicInbox/SearchMsg.pm  |  14 +++++
 lib/PublicInbox/SearchView.pm |  13 +++--
 lib/PublicInbox/View.pm       |  53 ++++++++----------
 lib/PublicInbox/WWW.pm        |  39 +++++--------
 script/public-inbox-index     |  43 ++++++++++-----
 script/public-inbox-init      |   8 ++-
 script/public-inbox-purge     |  48 +++++++++++++---
 t/admin.t                     |   2 +-
 t/cgi.t                       |  16 ++++--
 t/indexlevels-mirror.t        |  22 ++++++--
 t/nntp.t                      |   2 +-
 t/nntpd.t                     |  15 +++--
 t/over.t                      |   3 +-
 t/psgi_bad_mids.t             |   3 +-
 t/psgi_scan_all.t             |   4 +-
 t/psgi_search.t               |   4 +-
 t/purge.t                     |   2 +-
 t/search-thr-index.t          |   5 +-
 t/search.t                    |  11 ++--
 t/v1reindex.t                 |   3 +-
 t/v2reindex.t                 |   5 +-
 t/v2writable.t                |   2 +-
 t/view.t                      |   1 +
 t/watch_maildir_v2.t          |   4 +-
 36 files changed, 432 insertions(+), 275 deletions(-)

^ permalink raw reply	[relevance 5%]

* [PATCH v2 4/4] tests: get rid of unnecessary Cwd module use
  2019-05-14  3:32  6% ` [PATCH 4/4] tests: get rid of unnecessary Cwd module use Eric Wong
@ 2019-05-14  4:02  6%   ` Eric Wong
  0 siblings, 0 replies; 4+ results
From: Eric Wong @ 2019-05-14  4:02 UTC (permalink / raw)
  To: meta

We only need it for tests that chdir, and maybe for ENV{PATH}
portability (dash seems fine, not sure about others).

v2: revert change to solver_git.t for FreeBSD 11.2 and document
---
Interdiff:
  diff --git a/t/solver_git.t b/t/solver_git.t
  index 5e0d132..0b7d7c4 100644
  --- a/t/solver_git.t
  +++ b/t/solver_git.t
  @@ -4,6 +4,7 @@ use strict;
   use warnings;
   use Test::More;
   use File::Temp qw(tempdir);
  +use Cwd qw(abs_path);
   require './t/common.perl';
   require_git(2.6);
   
  @@ -16,6 +17,9 @@ foreach my $mod (@mods) {
   chomp(my $git_dir = `git rev-parse --git-dir 2>/dev/null`);
   plan skip_all => "$0 must be run from a git working tree" if $?;
   
  +# needed for alternates, and --absolute-git-dir is only in git 2.13+
  +$git_dir = abs_path($git_dir);
  +
   use_ok "PublicInbox::$_" for (qw(Inbox V2Writable MIME Git SolverGit));
   
   my $mainrepo = tempdir('pi-solver-XXXXXX', TMPDIR => 1, CLEANUP => 1);

 t/admin.t           | 1 -
 t/cgi.t             | 1 -
 t/git.t             | 5 ++---
 t/httpd-corner.t    | 3 +--
 t/httpd-unix.t      | 3 +--
 t/httpd.t           | 1 -
 t/mda.t             | 2 +-
 t/nntpd.t           | 1 -
 t/solver_git.t      | 2 ++
 t/spamcheck_spamc.t | 1 -
 10 files changed, 7 insertions(+), 13 deletions(-)

diff --git a/t/admin.t b/t/admin.t
index cc1e65d..b5a4383 100644
--- a/t/admin.t
+++ b/t/admin.t
@@ -4,7 +4,6 @@ use strict;
 use warnings;
 use Test::More;
 use File::Temp qw(tempdir);
-# use Cwd qw(getcwd);
 use_ok 'PublicInbox::Admin', qw(resolve_repo_dir);
 my $tmpdir = tempdir('pi-admin.XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $git_dir = "$tmpdir/v1";
diff --git a/t/cgi.t b/t/cgi.t
index aedd79e..b24bbc4 100644
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -7,7 +7,6 @@ use warnings;
 use Test::More;
 use Email::MIME;
 use File::Temp qw/tempdir/;
-use Cwd;
 eval { require IPC::Run };
 plan skip_all => "missing IPC::Run for t/cgi.t" if $@;
 
diff --git a/t/git.t b/t/git.t
index 5b612b8..7edf82b 100644
--- a/t/git.t
+++ b/t/git.t
@@ -5,7 +5,6 @@ use warnings;
 use Test::More;
 use File::Temp qw/tempdir/;
 my $dir = tempdir('pi-git-XXXXXX', TMPDIR => 1, CLEANUP => 1);
-use Cwd qw/getcwd/;
 use PublicInbox::Spawn qw(popen_rd);
 
 eval { require IPC::Run } or plan skip_all => 'IPC::Run missing';
@@ -15,7 +14,7 @@ use_ok 'PublicInbox::Git';
 	is(system(qw(git init -q --bare), $dir), 0, 'created git directory');
 	my $cmd = [ 'git', "--git-dir=$dir", 'fast-import', '--quiet' ];
 
-	my $fi_data = getcwd().'/t/git.fast-import-data';
+	my $fi_data = './t/git.fast-import-data';
 	ok(-r $fi_data, "fast-import data readable (or run test at top level)");
 	IPC::Run::run($cmd, '<', $fi_data);
 	is($?, 0, 'fast-import succeeded');
@@ -68,7 +67,7 @@ if (1) {
 	my $cmd = [ 'git', "--git-dir=$dir", qw(hash-object -w --stdin) ];
 
 	# need a big file, use the AGPL-3.0 :p
-	my $big_data = getcwd().'/COPYING';
+	my $big_data = './COPYING';
 	ok(-r $big_data, 'COPYING readable');
 	my $size = -s $big_data;
 	ok($size > 8192, 'file is big enough');
diff --git a/t/httpd-corner.t b/t/httpd-corner.t
index bfa3920..7c21994 100644
--- a/t/httpd-corner.t
+++ b/t/httpd-corner.t
@@ -15,7 +15,6 @@ foreach my $mod (qw(Plack::Util Plack::Builder
 
 use Digest::SHA qw(sha1_hex);
 use File::Temp qw/tempdir/;
-use Cwd qw/getcwd/;
 use IO::Socket;
 use IO::Socket::UNIX;
 use Fcntl qw(:seek);
@@ -28,7 +27,7 @@ ok(defined mkfifo($fifo, 0777), 'created FIFO');
 my $err = "$tmpdir/stderr.log";
 my $out = "$tmpdir/stdout.log";
 my $httpd = 'blib/script/public-inbox-httpd';
-my $psgi = getcwd()."/t/httpd-corner.psgi";
+my $psgi = "./t/httpd-corner.psgi";
 my %opts = (
 	LocalAddr => '127.0.0.1',
 	ReuseAddr => 1,
diff --git a/t/httpd-unix.t b/t/httpd-unix.t
index 2ef64df..758277c 100644
--- a/t/httpd-unix.t
+++ b/t/httpd-unix.t
@@ -12,11 +12,10 @@ foreach my $mod (qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status)) {
 
 use File::Temp qw/tempdir/;
 use IO::Socket::UNIX;
-use Cwd qw/getcwd/;
 my $tmpdir = tempdir('httpd-unix-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $unix = "$tmpdir/unix.sock";
 my $httpd = 'blib/script/public-inbox-httpd';
-my $psgi = getcwd() . '/t/httpd-corner.psgi';
+my $psgi = './t/httpd-corner.psgi';
 my $out = "$tmpdir/out.log";
 my $err = "$tmpdir/err.log";
 
diff --git a/t/httpd.t b/t/httpd.t
index d55495f..c061031 100644
--- a/t/httpd.t
+++ b/t/httpd.t
@@ -9,7 +9,6 @@ foreach my $mod (qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status)) {
 	plan skip_all => "$mod missing for httpd.t" if $@;
 }
 use File::Temp qw/tempdir/;
-use Cwd qw/getcwd/;
 use IO::Socket::INET;
 require './t/common.perl';
 
diff --git a/t/mda.t b/t/mda.t
index 5dbcec6..966600a 100644
--- a/t/mda.t
+++ b/t/mda.t
@@ -5,7 +5,7 @@ use warnings;
 use Test::More;
 use Email::MIME;
 use File::Temp qw/tempdir/;
-use Cwd;
+use Cwd qw(getcwd);
 use PublicInbox::MID qw(mid2path);
 eval { require IPC::Run };
 plan skip_all => "missing IPC::Run for t/mda.t" if $@;
diff --git a/t/nntpd.t b/t/nntpd.t
index ec0a621..b8a84a0 100644
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -9,7 +9,6 @@ foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
 }
 require PublicInbox::SearchIdx;
 require PublicInbox::Msgmap;
-use Cwd;
 use Email::Simple;
 use IO::Socket;
 use Socket qw(IPPROTO_TCP TCP_NODELAY);
diff --git a/t/solver_git.t b/t/solver_git.t
index 6f0ce77..0b7d7c4 100644
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -16,6 +16,8 @@ foreach my $mod (@mods) {
 }
 chomp(my $git_dir = `git rev-parse --git-dir 2>/dev/null`);
 plan skip_all => "$0 must be run from a git working tree" if $?;
+
+# needed for alternates, and --absolute-git-dir is only in git 2.13+
 $git_dir = abs_path($git_dir);
 
 use_ok "PublicInbox::$_" for (qw(Inbox V2Writable MIME Git SolverGit));
diff --git a/t/spamcheck_spamc.t b/t/spamcheck_spamc.t
index 7016e8b..70de14b 100644
--- a/t/spamcheck_spamc.t
+++ b/t/spamcheck_spamc.t
@@ -3,7 +3,6 @@
 use strict;
 use warnings;
 use Test::More;
-use Cwd;
 use Email::Simple;
 use IO::File;
 use File::Temp qw/tempdir/;
-- 
EW

^ permalink raw reply	[relevance 6%]

* [PATCH 4/4] tests: get rid of unnecessary Cwd module use
  2019-05-14  3:31  7% [PATCH 0/4] test loading cleanups Eric Wong
@ 2019-05-14  3:32  6% ` Eric Wong
  2019-05-14  4:02  6%   ` [PATCH v2 " Eric Wong
  0 siblings, 1 reply; 4+ results
From: Eric Wong @ 2019-05-14  3:32 UTC (permalink / raw)
  To: meta

We only need it for tests that chdir, and maybe for ENV{PATH}
portability (dash seems fine, not sure about others).
---
 t/admin.t           | 1 -
 t/cgi.t             | 1 -
 t/git.t             | 5 ++---
 t/httpd-corner.t    | 3 +--
 t/httpd-unix.t      | 3 +--
 t/httpd.t           | 1 -
 t/mda.t             | 2 +-
 t/nntpd.t           | 1 -
 t/solver_git.t      | 2 --
 t/spamcheck_spamc.t | 1 -
 10 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/t/admin.t b/t/admin.t
index cc1e65d..b5a4383 100644
--- a/t/admin.t
+++ b/t/admin.t
@@ -4,7 +4,6 @@ use strict;
 use warnings;
 use Test::More;
 use File::Temp qw(tempdir);
-# use Cwd qw(getcwd);
 use_ok 'PublicInbox::Admin', qw(resolve_repo_dir);
 my $tmpdir = tempdir('pi-admin.XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $git_dir = "$tmpdir/v1";
diff --git a/t/cgi.t b/t/cgi.t
index aedd79e..b24bbc4 100644
--- a/t/cgi.t
+++ b/t/cgi.t
@@ -7,7 +7,6 @@ use warnings;
 use Test::More;
 use Email::MIME;
 use File::Temp qw/tempdir/;
-use Cwd;
 eval { require IPC::Run };
 plan skip_all => "missing IPC::Run for t/cgi.t" if $@;
 
diff --git a/t/git.t b/t/git.t
index 5b612b8..7edf82b 100644
--- a/t/git.t
+++ b/t/git.t
@@ -5,7 +5,6 @@ use warnings;
 use Test::More;
 use File::Temp qw/tempdir/;
 my $dir = tempdir('pi-git-XXXXXX', TMPDIR => 1, CLEANUP => 1);
-use Cwd qw/getcwd/;
 use PublicInbox::Spawn qw(popen_rd);
 
 eval { require IPC::Run } or plan skip_all => 'IPC::Run missing';
@@ -15,7 +14,7 @@ use_ok 'PublicInbox::Git';
 	is(system(qw(git init -q --bare), $dir), 0, 'created git directory');
 	my $cmd = [ 'git', "--git-dir=$dir", 'fast-import', '--quiet' ];
 
-	my $fi_data = getcwd().'/t/git.fast-import-data';
+	my $fi_data = './t/git.fast-import-data';
 	ok(-r $fi_data, "fast-import data readable (or run test at top level)");
 	IPC::Run::run($cmd, '<', $fi_data);
 	is($?, 0, 'fast-import succeeded');
@@ -68,7 +67,7 @@ if (1) {
 	my $cmd = [ 'git', "--git-dir=$dir", qw(hash-object -w --stdin) ];
 
 	# need a big file, use the AGPL-3.0 :p
-	my $big_data = getcwd().'/COPYING';
+	my $big_data = './COPYING';
 	ok(-r $big_data, 'COPYING readable');
 	my $size = -s $big_data;
 	ok($size > 8192, 'file is big enough');
diff --git a/t/httpd-corner.t b/t/httpd-corner.t
index bfa3920..7c21994 100644
--- a/t/httpd-corner.t
+++ b/t/httpd-corner.t
@@ -15,7 +15,6 @@ foreach my $mod (qw(Plack::Util Plack::Builder
 
 use Digest::SHA qw(sha1_hex);
 use File::Temp qw/tempdir/;
-use Cwd qw/getcwd/;
 use IO::Socket;
 use IO::Socket::UNIX;
 use Fcntl qw(:seek);
@@ -28,7 +27,7 @@ ok(defined mkfifo($fifo, 0777), 'created FIFO');
 my $err = "$tmpdir/stderr.log";
 my $out = "$tmpdir/stdout.log";
 my $httpd = 'blib/script/public-inbox-httpd';
-my $psgi = getcwd()."/t/httpd-corner.psgi";
+my $psgi = "./t/httpd-corner.psgi";
 my %opts = (
 	LocalAddr => '127.0.0.1',
 	ReuseAddr => 1,
diff --git a/t/httpd-unix.t b/t/httpd-unix.t
index 2ef64df..758277c 100644
--- a/t/httpd-unix.t
+++ b/t/httpd-unix.t
@@ -12,11 +12,10 @@ foreach my $mod (qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status)) {
 
 use File::Temp qw/tempdir/;
 use IO::Socket::UNIX;
-use Cwd qw/getcwd/;
 my $tmpdir = tempdir('httpd-unix-XXXXXX', TMPDIR => 1, CLEANUP => 1);
 my $unix = "$tmpdir/unix.sock";
 my $httpd = 'blib/script/public-inbox-httpd';
-my $psgi = getcwd() . '/t/httpd-corner.psgi';
+my $psgi = './t/httpd-corner.psgi';
 my $out = "$tmpdir/out.log";
 my $err = "$tmpdir/err.log";
 
diff --git a/t/httpd.t b/t/httpd.t
index d55495f..c061031 100644
--- a/t/httpd.t
+++ b/t/httpd.t
@@ -9,7 +9,6 @@ foreach my $mod (qw(Plack::Util Plack::Builder HTTP::Date HTTP::Status)) {
 	plan skip_all => "$mod missing for httpd.t" if $@;
 }
 use File::Temp qw/tempdir/;
-use Cwd qw/getcwd/;
 use IO::Socket::INET;
 require './t/common.perl';
 
diff --git a/t/mda.t b/t/mda.t
index 5dbcec6..966600a 100644
--- a/t/mda.t
+++ b/t/mda.t
@@ -5,7 +5,7 @@ use warnings;
 use Test::More;
 use Email::MIME;
 use File::Temp qw/tempdir/;
-use Cwd;
+use Cwd qw(getcwd);
 use PublicInbox::MID qw(mid2path);
 eval { require IPC::Run };
 plan skip_all => "missing IPC::Run for t/mda.t" if $@;
diff --git a/t/nntpd.t b/t/nntpd.t
index ec0a621..b8a84a0 100644
--- a/t/nntpd.t
+++ b/t/nntpd.t
@@ -9,7 +9,6 @@ foreach my $mod (qw(DBD::SQLite Search::Xapian)) {
 }
 require PublicInbox::SearchIdx;
 require PublicInbox::Msgmap;
-use Cwd;
 use Email::Simple;
 use IO::Socket;
 use Socket qw(IPPROTO_TCP TCP_NODELAY);
diff --git a/t/solver_git.t b/t/solver_git.t
index 6f0ce77..5e0d132 100644
--- a/t/solver_git.t
+++ b/t/solver_git.t
@@ -4,7 +4,6 @@ use strict;
 use warnings;
 use Test::More;
 use File::Temp qw(tempdir);
-use Cwd qw(abs_path);
 require './t/common.perl';
 require_git(2.6);
 
@@ -16,7 +15,6 @@ foreach my $mod (@mods) {
 }
 chomp(my $git_dir = `git rev-parse --git-dir 2>/dev/null`);
 plan skip_all => "$0 must be run from a git working tree" if $?;
-$git_dir = abs_path($git_dir);
 
 use_ok "PublicInbox::$_" for (qw(Inbox V2Writable MIME Git SolverGit));
 
diff --git a/t/spamcheck_spamc.t b/t/spamcheck_spamc.t
index 7016e8b..70de14b 100644
--- a/t/spamcheck_spamc.t
+++ b/t/spamcheck_spamc.t
@@ -3,7 +3,6 @@
 use strict;
 use warnings;
 use Test::More;
-use Cwd;
 use Email::Simple;
 use IO::File;
 use File::Temp qw/tempdir/;
-- 
EW


^ permalink raw reply	[relevance 6%]

* [PATCH 0/4] test loading cleanups
@ 2019-05-14  3:31  7% Eric Wong
  2019-05-14  3:32  6% ` [PATCH 4/4] tests: get rid of unnecessary Cwd module use Eric Wong
  0 siblings, 1 reply; 4+ results
From: Eric Wong @ 2019-05-14  3:31 UTC (permalink / raw)
  To: meta

We definitely don't need to check for ::DS usability anymore
now that we've bundled and forked Danga::Socket.

I also noticed Data::Dumper is a separate package on CentOS-7;
but it's a dependency of Test::Simple, already.  We were also
overusing Cwd::getcwd in some areas... and may still be...

Anyways, this saves a few milliseconds here and there and
tests are now slightly faster on my slow laptop, "make check"
goes from 51s to 49s :>

Eric Wong (4):
  tests: remove unnecessary loading of ::DS and Socket
  t/config.t: remove Data::Dumper dependency
  t/nntp.t: skip if Data::Dumper is missing
  tests: get rid of unnecessary Cwd module use

 t/admin.t            |  1 -
 t/cgi.t              |  1 -
 t/config.t           | 12 +++++++-----
 t/git-http-backend.t | 10 ++++------
 t/git.t              |  5 ++---
 t/httpd-corner.t     |  9 ++++-----
 t/httpd-unix.t       |  6 ++----
 t/httpd.t            |  7 ++-----
 t/mda.t              |  2 +-
 t/nntp.t             |  5 ++---
 t/nntpd.t            |  5 ++---
 t/solver_git.t       |  2 --
 t/spamcheck_spamc.t  |  1 -
 t/v2mirror.t         |  2 +-
 t/v2writable.t       |  7 ++-----
 15 files changed, 29 insertions(+), 46 deletions(-)

-- 
EW


^ permalink raw reply	[relevance 7%]

Results 1-4 of 4 | reverse | sort options + mbox downloads above
-- links below jump to the message on this page --
2019-05-14  3:31  7% [PATCH 0/4] test loading cleanups Eric Wong
2019-05-14  3:32  6% ` [PATCH 4/4] tests: get rid of unnecessary Cwd module use Eric Wong
2019-05-14  4:02  6%   ` [PATCH v2 " Eric Wong
2019-05-15  6:33  5% [PATCH 0/6] make Search::Xapian optional for v2, NNTP, etc Eric Wong

Code repositories for project(s) associated with this 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).