From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: X-Spam-Status: No, score=-4.0 required=3.0 tests=ALL_TRUSTED,AWL,BAYES_00, T_SCC_BODY_TEXT_LINE shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from localhost (dcvr.yhbt.net [127.0.0.1]) by dcvr.yhbt.net (Postfix) with ESMTP id 083ED1F953; Mon, 14 Feb 2022 05:37:26 +0000 (UTC) From: Eric Wong To: meta@public-inbox.org Subject: [PATCH 1/2] sharedkv: remove unused subs Date: Mon, 14 Feb 2022 05:37:24 +0000 Message-Id: <20220214053725.1080495-2-e@80x24.org> In-Reply-To: <20220214053725.1080495-1-e@80x24.org> References: <20220214053725.1080495-1-e@80x24.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit List-Id: Some features didn't get used, and they're just getting in the way of upcoming bugfixes. --- lib/PublicInbox/SharedKV.pm | 22 ---------------------- t/shared_kv.t | 13 ++----------- 2 files changed, 2 insertions(+), 33 deletions(-) diff --git a/lib/PublicInbox/SharedKV.pm b/lib/PublicInbox/SharedKV.pm index 95a3cb14..d49a39c1 100644 --- a/lib/PublicInbox/SharedKV.pm +++ b/lib/PublicInbox/SharedKV.pm @@ -56,12 +56,6 @@ sub new { $self; } -sub index_values { - my ($self) = @_; - my $lock = $self->lock_for_scope_fast; - $self->dbh($lock)->do('CREATE INDEX IF NOT EXISTS idx_v ON kv (v)'); -} - sub set_maybe { my ($self, $key, $val, $lock) = @_; $lock //= $self->lock_for_scope_fast; @@ -97,22 +91,6 @@ sub keys { map { $_->[0] } @{$self->dbh->selectall_arrayref($sql, undef, @pfx)}; } -sub delete_by_val { - my ($self, $val, $lock) = @_; - $lock //= $self->lock_for_scope_fast; - $self->{dbh}->prepare_cached(<<'')->execute($val) + 0; -DELETE FROM kv WHERE v = ? - -} - -sub replace_values { - my ($self, $oldval, $newval, $lock) = @_; - $lock //= $self->lock_for_scope_fast; - $self->{dbh}->prepare_cached(<<'')->execute($newval, $oldval) + 0; -UPDATE kv SET v = ? WHERE v = ? - -} - sub set { my ($self, $key, $val) = @_; if (defined $val) { diff --git a/t/shared_kv.t b/t/shared_kv.t index 251b7f39..8b4f9c29 100644 --- a/t/shared_kv.t +++ b/t/shared_kv.t @@ -1,5 +1,5 @@ #!perl -w -# Copyright (C) 2020-2021 all contributors +# Copyright (C) all contributors # License: AGPL-3.0+ use strict; use v5.10.1; @@ -26,10 +26,6 @@ is($skv->get($dead), $cafe, 'get after xchg'); is($skv->xchg($dead, undef), $cafe, 'xchg to undef'); is($skv->get($dead), undef, 'get after xchg to undef'); is($skv->get($cafe), $dead, 'get after set_maybe'); -ok($skv->index_values, 'index_values works'); -is($skv->replace_values($dead, $cafe), 1, 'replaced one by value'); -is($skv->get($cafe), $cafe, 'value updated'); -is($skv->replace_values($dead, $cafe), 0, 'replaced none by value'); is($skv->xchg($dead, $cafe), undef, 'xchg from undef'); is($skv->count, 2, 'count works'); @@ -39,14 +35,9 @@ while (my ($k, $v) = $sth->fetchrow_array) { $seen{$k} = $v; } is($seen{$dead}, $cafe, '$dead has expected value'); -is($seen{$cafe}, $cafe, '$cafe has expected value'); +is($seen{$cafe}, $dead, '$cafe has expected value'); is(scalar keys %seen, 2, 'iterated through all'); -is($skv->replace_values($cafe, $dead), 2, 'replaced 2 by value'); -is($skv->delete_by_val('bogus'), 0, 'delete_by_val misses'); -is($skv->delete_by_val($dead), 2, 'delete_by_val hits'); -is($skv->delete_by_val($dead), 0, 'delete_by_val misses again'); - undef $skv; ok(!-d $skv_tmpdir, 'temporary dir gone'); $skv = PublicInbox::SharedKV->new("$tmpdir/dir", 'base');