From commits-return-3173-apmail-lucenenet-commits-archive=lucenenet.apache.org@lucenenet.apache.org Sun Jan 25 02:03:43 2015 Return-Path: X-Original-To: apmail-lucenenet-commits-archive@www.apache.org Delivered-To: apmail-lucenenet-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BDB54173DC for ; Sun, 25 Jan 2015 02:03:43 +0000 (UTC) Received: (qmail 69073 invoked by uid 500); 25 Jan 2015 02:03:44 -0000 Delivered-To: apmail-lucenenet-commits-archive@lucenenet.apache.org Received: (qmail 69043 invoked by uid 500); 25 Jan 2015 02:03:43 -0000 Mailing-List: contact commits-help@lucenenet.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: lucene-net-dev@lucenenet.apache.org Delivered-To: mailing list commits@lucenenet.apache.org Received: (qmail 69034 invoked by uid 99); 25 Jan 2015 02:03:43 -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; Sun, 25 Jan 2015 02:03:43 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id CC62CE04A7; Sun, 25 Jan 2015 02:03:43 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: synhershko@apache.org To: commits@lucenenet.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: lucenenet git commit: fix overflow resulting in negative values Date: Sun, 25 Jan 2015 02:03:43 +0000 (UTC) Repository: lucenenet Updated Branches: refs/heads/master c2cd0e11c -> 593231b3b fix overflow resulting in negative values Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/593231b3 Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/593231b3 Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/593231b3 Branch: refs/heads/master Commit: 593231b3b39cb81dfcd29ea81cf98dc1ba9a026a Parents: c2cd0e1 Author: Laimonas Simutis Authored: Sat Jan 24 20:22:04 2015 -0500 Committer: Laimonas Simutis Committed: Sat Jan 24 20:22:04 2015 -0500 ---------------------------------------------------------------------- .../Index/LogByteSizeMergePolicy.cs | 21 +++++++++++++++++++- 1 file changed, 20 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/593231b3/src/Lucene.Net.Core/Index/LogByteSizeMergePolicy.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Index/LogByteSizeMergePolicy.cs b/src/Lucene.Net.Core/Index/LogByteSizeMergePolicy.cs index 4002cc7..4b25740 100644 --- a/src/Lucene.Net.Core/Index/LogByteSizeMergePolicy.cs +++ b/src/Lucene.Net.Core/Index/LogByteSizeMergePolicy.cs @@ -44,7 +44,14 @@ namespace Lucene.Net.Index { MinMergeSize = (long)(DEFAULT_MIN_MERGE_MB * 1024 * 1024); MaxMergeSize = (long)(DEFAULT_MAX_MERGE_MB * 1024 * 1024); - MaxMergeSizeForForcedMerge = (long)(DEFAULT_MAX_MERGE_MB_FOR_FORCED_MERGE * 1024 * 1024); + + // .Net port, original line is inappropriate, overflows in .NET + // and the property gets set to a negative value. + // In Java however such statements results in long.MaxValue + + //MaxMergeSizeForForcedMerge = (long)(DEFAULT_MAX_MERGE_MB_FOR_FORCED_MERGE * 1024 * 1024); + MaxMergeSizeForForcedMerge = long.MaxValue; + } protected internal override long Size(SegmentCommitInfo info) @@ -70,6 +77,10 @@ namespace Lucene.Net.Index set { MaxMergeSize = (long)(value * 1024 * 1024); + if (MaxMergeSize < 0) + { + MaxMergeSize = long.MaxValue; + } } get { @@ -89,6 +100,10 @@ namespace Lucene.Net.Index set { MaxMergeSizeForForcedMerge = (long)(value * 1024 * 1024); + if (MaxMergeSizeForForcedMerge < 0) + { + MaxMergeSizeForForcedMerge = long.MaxValue; + } } get { @@ -112,6 +127,10 @@ namespace Lucene.Net.Index set { MinMergeSize = (long)(value * 1024 * 1024); + if (MinMergeSize < 0) + { + MinMergeSize = long.MaxValue; + } } get {