From commits-return-102608-archive-asf-public=cust-asf.ponee.io@lucene.apache.org Tue Jul 31 21:33:48 2018 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 60106180662 for ; Tue, 31 Jul 2018 21:33:48 +0200 (CEST) Received: (qmail 84354 invoked by uid 500); 31 Jul 2018 19:33:47 -0000 Mailing-List: contact commits-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list commits@lucene.apache.org Received: (qmail 84338 invoked by uid 99); 31 Jul 2018 19:33:47 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 31 Jul 2018 19:33:47 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 50687DFC65; Tue, 31 Jul 2018 19:33:47 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jpountz@apache.org To: commits@lucene.apache.org Date: Tue, 31 Jul 2018 19:33:47 -0000 Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: [1/2] lucene-solr:master: LUCENE-8391: Make TestUpgradeIndexMergePolicy faster when merging a TieredMergePolicy. Repository: lucene-solr Updated Branches: refs/heads/branch_7x 4a86e00b7 -> 334bf498b refs/heads/master 1a870876c -> 96e985a34 LUCENE-8391: Make TestUpgradeIndexMergePolicy faster when merging a TieredMergePolicy. Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/96e985a3 Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/96e985a3 Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/96e985a3 Branch: refs/heads/master Commit: 96e985a3483f10537ea835a339f89dd10839dae3 Parents: 1a87087 Author: Adrien Grand Authored: Tue Jul 31 21:31:56 2018 +0200 Committer: Adrien Grand Committed: Tue Jul 31 21:33:11 2018 +0200 ---------------------------------------------------------------------- .../org/apache/lucene/index/TestUpgradeIndexMergePolicy.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/96e985a3/lucene/core/src/test/org/apache/lucene/index/TestUpgradeIndexMergePolicy.java ---------------------------------------------------------------------- diff --git a/lucene/core/src/test/org/apache/lucene/index/TestUpgradeIndexMergePolicy.java b/lucene/core/src/test/org/apache/lucene/index/TestUpgradeIndexMergePolicy.java index a2c6600..6df5cc8 100644 --- a/lucene/core/src/test/org/apache/lucene/index/TestUpgradeIndexMergePolicy.java +++ b/lucene/core/src/test/org/apache/lucene/index/TestUpgradeIndexMergePolicy.java @@ -19,11 +19,17 @@ package org.apache.lucene.index; import java.io.IOException; import org.apache.lucene.index.MergePolicy.MergeSpecification; +import org.apache.lucene.util.TestUtil; public class TestUpgradeIndexMergePolicy extends BaseMergePolicyTestCase { public MergePolicy mergePolicy() { - return new UpgradeIndexMergePolicy(newMergePolicy(random())); + MergePolicy in = newMergePolicy(random()); + if (in instanceof TieredMergePolicy) { + // Avoid low values of the max merged segment size which prevent this merge policy from scaling well + ((TieredMergePolicy) in).setMaxMergedSegmentMB(TestUtil.nextInt(random(), 1024, 10 * 1024)); + } + return new UpgradeIndexMergePolicy(in); } @Override