From 2a3c8d7a2c40ad9424db10d68470d8bb120bddf9 Mon Sep 17 00:00:00 2001 From: Eric Wong Date: Tue, 12 Oct 2021 11:47:03 +0000 Subject: daemon: unconditionally close Xapian shards on cleanup The cost of opening a Xapian DB (even with shards) isn't high, so save some FDs and just close it. We hit Xapian far less than over.sqlite3 and we discard the MSet ASAP even when streaming large responses. This simplifies our code a bit and hopefully helps reduce fragmentation by increasing mortality of late allocations. --- t/extsearch.t | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 't') diff --git a/t/extsearch.t b/t/extsearch.t index 8190de17..dfc190e2 100644 --- a/t/extsearch.t +++ b/t/extsearch.t @@ -447,9 +447,6 @@ SKIP: { ok(ref($es->{xdb}), '{xdb} created'); my $nshards1 = $es->{nshard}; is($nshards1, 1, 'correct shard count'); - my $xdb_str = "$es->{xdb}"; - ok($es->cleanup_shards, 'cleanup_shards noop'); - is("$es->{xdb}", $xdb_str, '{xdb} unchanged'); my @ei_dir = glob("$d/ei*/"); chmod 0755, $ei_dir[0] or xbail "chmod: $!"; @@ -463,11 +460,8 @@ SKIP: { my $m = sprintf('%04o', 07777 & (stat($dirs[$i]))[2]); is($m, $mode, "shard [$i] mode"); } - is($es->cleanup_shards, undef, 'cleanup_shards cleaned'); - ok(!defined($es->{xdb}), 'old {xdb} gone'); - is($es->cleanup_shards, undef, 'cleanup_shards clean idempotent'); + delete @$es{qw(xdb qp)}; is($es->mset('z:0..')->size, $nresult0, 'new shards, same results'); - ok($es->cleanup_shards, 'cleanup_shards true after open'); for my $i (4..5) { is(grep(m!/ei[0-9]+/$i\z!, @dirs), 0, "no shard [$i]"); -- cgit v1.2.3-24-ge0c7