From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,BAYES_00 shortcircuit=no autolearn=ham autolearn_force=no version=3.4.0 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id AA99C1F42D for ; Tue, 3 Apr 2018 11:09:12 +0000 (UTC) From: "Eric Wong (Contractor, The Linux Foundation)" To: meta@public-inbox.org Subject: [PATCH 1/7] t/thread-all.t: modernize test to support modern inboxes Date: Tue, 3 Apr 2018 11:09:06 +0000 Message-Id: <20180403110912.24231-2-e@80x24.org> In-Reply-To: <20180403110912.24231-1-e@80x24.org> References: <20180403110912.24231-1-e@80x24.org> List-Id: We'll be adding more tests in the same vein as this to improve NNTP performance. --- t/thread-all.t | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/t/thread-all.t b/t/thread-all.t index d4e8c1f..820fba8 100644 --- a/t/thread-all.t +++ b/t/thread-all.t @@ -6,32 +6,26 @@ use strict; use warnings; use Test::More; use Time::HiRes qw(clock_gettime CLOCK_MONOTONIC); +use PublicInbox::Inbox; my $pi_dir = $ENV{GIANT_PI_DIR}; plan skip_all => "GIANT_PI_DIR not defined for $0" unless $pi_dir; -eval { require PublicInbox::Search; }; -plan skip_all => "Xapian missing for $0" if $@; -my $srch = eval { PublicInbox::Search->new($pi_dir) }; -plan skip_all => "$pi_dir not initialized for $0" if $@; +my $ibx = PublicInbox::Inbox->new({ mainrepo => $pi_dir }); +my $srch = $ibx->search; +plan skip_all => "$pi_dir not configured for search $0" unless $srch; require PublicInbox::View; require PublicInbox::SearchThread; -my $pfx = PublicInbox::Search::xpfx('thread'); -my $opts = { limit => 1000000, asc => 1 }; my $t0 = clock_gettime(CLOCK_MONOTONIC); my $elapsed; - -my $sres = $srch->_do_enquire(undef, $opts); -$elapsed = clock_gettime(CLOCK_MONOTONIC) - $t0; -diag "enquire: $elapsed"; - -$t0 = clock_gettime(CLOCK_MONOTONIC); -my $msgs = PublicInbox::View::load_results($srch, $sres); +my $msgs = $srch->{over_ro}->recent({limit => 200000}); +my $n = scalar(@$msgs); +ok($n, 'got some messages'); $elapsed = clock_gettime(CLOCK_MONOTONIC) - $t0; -diag "load_results $elapsed"; +diag "enquire: $elapsed for $n"; $t0 = clock_gettime(CLOCK_MONOTONIC); -PublicInbox::View::thread_results($msgs); +PublicInbox::View::thread_results({-inbox => $ibx}, $msgs); $elapsed = clock_gettime(CLOCK_MONOTONIC) - $t0; diag "thread_results $elapsed"; -- EW