From patchwork Fri Dec 8 14:53:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Patrick Steinhardt X-Patchwork-Id: 13485475 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=pks.im header.i=@pks.im header.b="vKrLDiEU"; dkim=pass (2048-bit key) header.d=messagingengine.com header.i=@messagingengine.com header.b="pnOXc4gZ" Received: from wout5-smtp.messagingengine.com (wout5-smtp.messagingengine.com [64.147.123.21]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23A15199E for ; Fri, 8 Dec 2023 06:53:14 -0800 (PST) Received: from compute5.internal (compute5.nyi.internal [10.202.2.45]) by mailout.west.internal (Postfix) with ESMTP id 7B0B03200A44; Fri, 8 Dec 2023 09:53:13 -0500 (EST) Received: from mailfrontend2 ([10.202.2.163]) by compute5.internal (MEProxy); Fri, 08 Dec 2023 09:53:13 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=pks.im; h=cc:cc :content-type:content-type:date:date:from:from:in-reply-to :in-reply-to:message-id:mime-version:references:reply-to:sender :subject:subject:to:to; s=fm1; t=1702047193; x=1702133593; bh=Eq lcaFpix6RMcFAN5cvFjMyS3zs/JYMwp4Q9eTiC1Wc=; b=vKrLDiEUyhTShc+9tr AcNWDMMfSFZkvys8yfHv8oOh/6Vd3teQpw4C06C9e+PNlrJATHoZfj9oenGhgyJ9 GFkNDgTuLLTMmeTPpqc6f+pE0Mva9GShHmNUbNUHACJDmGwSjbXRlntEsVmGRxxS Q/ymyokQuvUNrC5bZG8sWfhc1p73KMCMg2mCdR7gkx6rbmZJIJN7CsAN2fsEEUyg y16qvn/xu7tJbnRMSlo3PZtZyhUhArGWB/8bLRIJkQ/ayTHHikdWQ0iTAUPfDtJK PxFleVWkQ9HJu9kR2+k27O1AEqoEWg107mOW+Vg1XaNJ8HngC+Fka2uvU27jmOZs /sDQ== DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=cc:cc:content-type:content-type:date:date :feedback-id:feedback-id:from:from:in-reply-to:in-reply-to :message-id:mime-version:references:reply-to:sender:subject :subject:to:to:x-me-proxy:x-me-proxy:x-me-sender:x-me-sender :x-sasl-enc; s=fm1; t=1702047193; x=1702133593; bh=EqlcaFpix6RMc FAN5cvFjMyS3zs/JYMwp4Q9eTiC1Wc=; b=pnOXc4gZmuqnIjwvCr34D4fuZvkv9 /MCRaT7d3WIPDCe30qzU4xlk0+nBUUYYOEh/c6AAtbvdjdDb9us0vQqE9eQyAAde KjJQ7oiLt4bkJLZvNK79rkLTbtBZVuqez4vdF4EkvYpTcJqWL/cMEMTtamoZUNl7 P4sNMhnuspwHeoBuowwCSX/zPo/3yrAp0hjZ+AahB+DazNfnyS1Iu+kNdPqHvXJG e89iBsaEXIbqAaAuzoGkrTuALOn/j0MaHYNLsIIjm9XxLO78BodRtP7753U2KBBO fz6V4romn0lCHp9Z4zhTFn3lWvk1dzdMW6WzeUfopTLiGABOYvQrkUQFQ== X-ME-Sender: X-ME-Received: X-ME-Proxy-Cause: gggruggvucftvghtrhhoucdtuddrgedvkedrudekiedgjeduucetufdoteggodetrfdotf fvucfrrhhofhhilhgvmecuhfgrshhtofgrihhlpdfqfgfvpdfurfetoffkrfgpnffqhgen uceurghilhhouhhtmecufedttdenucesvcftvggtihhpihgvnhhtshculddquddttddmne cujfgurhepfffhvfevuffkfhggtggujgesghdtreertddtvdenucfhrhhomheprfgrthhr ihgtkhcuufhtvghinhhhrghrughtuceophhssehpkhhsrdhimheqnecuggftrfgrthhtvg hrnhepueektdevtdffveeljeetgfehheeigeekleduvdeffeeghefgledttdehjeelffet necuvehluhhsthgvrhfuihiivgeptdenucfrrghrrghmpehmrghilhhfrhhomhepphhsse hpkhhsrdhimh X-ME-Proxy: Feedback-ID: i197146af:Fastmail Received: by mail.messagingengine.com (Postfix) with ESMTPA; Fri, 8 Dec 2023 09:53:11 -0500 (EST) Received: by vm-mail (OpenSMTPD) with ESMTPSA id 7f64b4ff (TLSv1.3:TLS_AES_256_GCM_SHA384:256:NO); Fri, 8 Dec 2023 14:51:41 +0000 (UTC) Date: Fri, 8 Dec 2023 15:53:10 +0100 From: Patrick Steinhardt To: git@vger.kernel.org Cc: Han-Wen Nienhuys , Jonathan Nieder Subject: [PATCH v2 04/11] reftable/stack: verify that `reftable_stack_add()` uses auto-compaction Message-ID: <8061b9d2fcb3e8c3d1fd641e705b9a8879e452f4.1702047081.git.ps@pks.im> References: Precedence: bulk X-Mailing-List: git@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: While we have several tests that check whether we correctly perform auto-compaction when manually calling `reftable_stack_auto_compact()`, we don't have any tests that verify whether `reftable_stack_add()` does call it automatically. Add one. Signed-off-by: Patrick Steinhardt --- reftable/stack_test.c | 47 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 47 insertions(+) diff --git a/reftable/stack_test.c b/reftable/stack_test.c index 0644c8ad2e..c979d177c2 100644 --- a/reftable/stack_test.c +++ b/reftable/stack_test.c @@ -850,6 +850,52 @@ static void test_reftable_stack_auto_compaction(void) clear_dir(dir); } +static void test_reftable_stack_add_performs_auto_compaction(void) +{ + struct reftable_write_options cfg = { 0 }; + struct reftable_stack *st = NULL; + char *dir = get_tmp_dir(__LINE__); + int err, i, n = 20; + + err = reftable_new_stack(&st, dir, cfg); + EXPECT_ERR(err); + + for (i = 0; i <= n; i++) { + struct reftable_ref_record ref = { + .update_index = reftable_stack_next_update_index(st), + .value_type = REFTABLE_REF_SYMREF, + .value.symref = "master", + }; + char name[100]; + + /* + * Disable auto-compaction for all but the last runs. Like this + * we can ensure that we indeed honor this setting and have + * better control over when exactly auto compaction runs. + */ + st->disable_auto_compact = i != n; + + snprintf(name, sizeof(name), "branch%04d", i); + ref.refname = name; + + err = reftable_stack_add(st, &write_test_ref, &ref); + EXPECT_ERR(err); + + /* + * The stack length should grow continuously for all runs where + * auto compaction is disabled. When enabled, we should merge + * all tables in the stack. + */ + if (i != n) + EXPECT(st->merged->stack_len == i + 1); + else + EXPECT(st->merged->stack_len == 1); + } + + reftable_stack_destroy(st); + clear_dir(dir); +} + static void test_reftable_stack_compaction_concurrent(void) { struct reftable_write_options cfg = { 0 }; @@ -960,6 +1006,7 @@ int stack_test_main(int argc, const char *argv[]) RUN_TEST(test_reftable_stack_add); RUN_TEST(test_reftable_stack_add_one); RUN_TEST(test_reftable_stack_auto_compaction); + RUN_TEST(test_reftable_stack_add_performs_auto_compaction); RUN_TEST(test_reftable_stack_compaction_concurrent); RUN_TEST(test_reftable_stack_compaction_concurrent_clean); RUN_TEST(test_reftable_stack_hash_id);