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 EF1C81042B for ; Fri, 20 Feb 2015 07:38:33 +0000 (UTC) Received: (qmail 63951 invoked by uid 500); 20 Feb 2015 07:38:33 -0000 Delivered-To: apmail-lucenenet-commits-archive@lucenenet.apache.org Received: (qmail 63901 invoked by uid 500); 20 Feb 2015 07:38:33 -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 63834 invoked by uid 99); 20 Feb 2015 07:38:33 -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; Fri, 20 Feb 2015 07:38:33 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id ACD41E05D1; Fri, 20 Feb 2015 07:38:33 +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 Date: Fri, 20 Feb 2015 07:38:34 -0000 Message-Id: <83881b1d18c741179728d215786eaa44@git.apache.org> In-Reply-To: <091251c2a39e4858be2c5c5bfe4dad96@git.apache.org> References: <091251c2a39e4858be2c5c5bfe4dad96@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [2/2] lucenenet git commit: Using proper method of comparing sets, removing noisy method Using proper method of comparing sets, removing noisy method Closes #106 Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/5f3998ba Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/5f3998ba Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/5f3998ba Branch: refs/heads/master Commit: 5f3998ba8ab5c4bdafcd154e30bdcf7eb28b5826 Parents: 0b794bb Author: Itamar Syn-Hershko Authored: Fri Feb 20 09:29:50 2015 +0200 Committer: Itamar Syn-Hershko Committed: Fri Feb 20 09:29:50 2015 +0200 ---------------------------------------------------------------------- src/Lucene.Net.Core/Index/BufferedUpdates.cs | 12 ++++-------- .../core/Index/TestDocumentsWriterDeleteQueue.cs | 10 +++++----- 2 files changed, 9 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5f3998ba/src/Lucene.Net.Core/Index/BufferedUpdates.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Core/Index/BufferedUpdates.cs b/src/Lucene.Net.Core/Index/BufferedUpdates.cs index 295034c..706bd14 100644 --- a/src/Lucene.Net.Core/Index/BufferedUpdates.cs +++ b/src/Lucene.Net.Core/Index/BufferedUpdates.cs @@ -120,11 +120,13 @@ namespace Lucene.Net.Index internal readonly AtomicInteger NumTermDeletes = new AtomicInteger(); internal readonly AtomicInteger NumNumericUpdates = new AtomicInteger(); - internal readonly AtomicInteger NumBinaryUpdates = new AtomicInteger(); - internal readonly IDictionary Terms = new Dictionary(); + internal readonly AtomicInteger NumBinaryUpdates = new AtomicInteger(); internal readonly IDictionary Queries = new Dictionary(); internal readonly IList DocIDs = new List(); + // TODO LUCENENET make get access internal and make accessible from Tests + public IDictionary Terms { get; private set; } + // Map> // For each field we keep an ordered list of NumericUpdates, key'd by the // update Term. OrderedDictionary guarantees we will later traverse the map in @@ -156,12 +158,6 @@ namespace Lucene.Net.Index this.BytesUsed = new AtomicLong(); } - // Do not use outside of Nunit - public IDictionary Terms_Nunit() - { - return Terms; - } - public override string ToString() { if (VERBOSE_DELETES) http://git-wip-us.apache.org/repos/asf/lucenenet/blob/5f3998ba/src/Lucene.Net.Tests/core/Index/TestDocumentsWriterDeleteQueue.cs ---------------------------------------------------------------------- diff --git a/src/Lucene.Net.Tests/core/Index/TestDocumentsWriterDeleteQueue.cs b/src/Lucene.Net.Tests/core/Index/TestDocumentsWriterDeleteQueue.cs index 426825b..205e0ff 100644 --- a/src/Lucene.Net.Tests/core/Index/TestDocumentsWriterDeleteQueue.cs +++ b/src/Lucene.Net.Tests/core/Index/TestDocumentsWriterDeleteQueue.cs @@ -80,9 +80,9 @@ namespace Lucene.Net.Index } Assert.AreEqual(j + 1, queue.NumGlobalTermDeletes()); } - Assert.AreEqual(uniqueValues, bd1.Terms_Nunit().Keys); - Assert.AreEqual(uniqueValues, bd2.Terms_Nunit().Keys); - HashSet frozenSet = new HashSet(); + assertEquals(uniqueValues, new HashSet(bd1.Terms.Keys)); + assertEquals(uniqueValues, new HashSet(bd2.Terms.Keys)); + var frozenSet = new HashSet(); foreach (Term t in queue.FreezeGlobalBuffer(null).TermsIterable()) { BytesRef bytesRef = new BytesRef(); @@ -97,7 +97,7 @@ namespace Lucene.Net.Index { for (int i = start; i <= end; i++) { - Assert.AreEqual(Convert.ToInt32(end), deletes.Terms_Nunit()[new Term("id", ids[i].ToString())]); + Assert.AreEqual(Convert.ToInt32(end), deletes.Terms[new Term("id", ids[i].ToString())]); } } @@ -240,7 +240,7 @@ namespace Lucene.Net.Index queue.UpdateSlice(slice); BufferedUpdates deletes = updateThread.Deletes; slice.Apply(deletes, BufferedUpdates.MAX_INT); - assertEquals(uniqueValues, deletes.Terms_Nunit().Keys); + assertEquals(uniqueValues, new HashSet(deletes.Terms.Keys)); } queue.TryApplyGlobalSlice(); HashSet frozenSet = new HashSet();