You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucenenet.apache.org by sy...@apache.org on 2015/02/20 08:38:33 UTC
[1/2] lucenenet git commit: more sealed increment token
Repository: lucenenet
Updated Branches:
refs/heads/master 529416776 -> 5f3998ba8
more sealed increment token
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/0b794bb4
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/0b794bb4
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/0b794bb4
Branch: refs/heads/master
Commit: 0b794bb43105be4b68034fc5167d9a780f5e127f
Parents: 5294167
Author: Laimonas Simutis <la...@gmail.com>
Authored: Thu Feb 19 20:32:52 2015 -0500
Committer: Laimonas Simutis <la...@gmail.com>
Committed: Thu Feb 19 20:32:52 2015 -0500
----------------------------------------------------------------------
src/Lucene.Net.Tests/core/Analysis/TestCachingTokenFilter.cs | 2 +-
src/Lucene.Net.Tests/core/Analysis/TestGraphTokenizers.cs | 2 +-
src/Lucene.Net.Tests/core/Analysis/TestLookaheadTokenFilter.cs | 2 +-
.../core/Search/Payloads/TestPayloadTermQuery.cs | 2 +-
src/Lucene.Net.Tests/core/Util/TestQueryBuilder.cs | 4 ++--
5 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0b794bb4/src/Lucene.Net.Tests/core/Analysis/TestCachingTokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Analysis/TestCachingTokenFilter.cs b/src/Lucene.Net.Tests/core/Analysis/TestCachingTokenFilter.cs
index 67dc09a..6cce5bd 100644
--- a/src/Lucene.Net.Tests/core/Analysis/TestCachingTokenFilter.cs
+++ b/src/Lucene.Net.Tests/core/Analysis/TestCachingTokenFilter.cs
@@ -104,7 +104,7 @@ namespace Lucene.Net.Analysis
private ICharTermAttribute termAtt;
private IOffsetAttribute offsetAtt;
- public override bool IncrementToken()
+ public sealed override bool IncrementToken()
{
if (index == OuterInstance.Tokens.Length)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0b794bb4/src/Lucene.Net.Tests/core/Analysis/TestGraphTokenizers.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Analysis/TestGraphTokenizers.cs b/src/Lucene.Net.Tests/core/Analysis/TestGraphTokenizers.cs
index dffb392..66b5d52 100644
--- a/src/Lucene.Net.Tests/core/Analysis/TestGraphTokenizers.cs
+++ b/src/Lucene.Net.Tests/core/Analysis/TestGraphTokenizers.cs
@@ -75,7 +75,7 @@ namespace Lucene.Net.Analysis
Upto = 0;
}
- public override bool IncrementToken()
+ public sealed override bool IncrementToken()
{
if (Tokens == null)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0b794bb4/src/Lucene.Net.Tests/core/Analysis/TestLookaheadTokenFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Analysis/TestLookaheadTokenFilter.cs b/src/Lucene.Net.Tests/core/Analysis/TestLookaheadTokenFilter.cs
index 0de10e5..f8b9b78 100644
--- a/src/Lucene.Net.Tests/core/Analysis/TestLookaheadTokenFilter.cs
+++ b/src/Lucene.Net.Tests/core/Analysis/TestLookaheadTokenFilter.cs
@@ -63,7 +63,7 @@ namespace Lucene.Net.Analysis
return new LookaheadTokenFilter.Position();
}
- public override bool IncrementToken()
+ public sealed override bool IncrementToken()
{
return NextToken();
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0b794bb4/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
index 0076c67..9226a89 100644
--- a/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
+++ b/src/Lucene.Net.Tests/core/Search/Payloads/TestPayloadTermQuery.cs
@@ -79,7 +79,7 @@ namespace Lucene.Net.Search.Payloads
PayloadAtt = AddAttribute<IPayloadAttribute>();
}
- public override bool IncrementToken()
+ public sealed override bool IncrementToken()
{
bool hasNext = input.IncrementToken();
if (hasNext)
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0b794bb4/src/Lucene.Net.Tests/core/Util/TestQueryBuilder.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestQueryBuilder.cs b/src/Lucene.Net.Tests/core/Util/TestQueryBuilder.cs
index 421a203..1829cb6 100644
--- a/src/Lucene.Net.Tests/core/Util/TestQueryBuilder.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestQueryBuilder.cs
@@ -158,7 +158,7 @@ namespace Lucene.Net.Util
PosIncAtt = AddAttribute<IPositionIncrementAttribute>();
}
- public override bool IncrementToken()
+ public sealed override bool IncrementToken()
{
if (AddSynonym) // inject our synonym
{
@@ -218,7 +218,7 @@ namespace Lucene.Net.Util
TermAtt = AddAttribute<ICharTermAttribute>();
}
- public override bool IncrementToken()
+ public sealed override bool IncrementToken()
{
int ch = input.Read();
if (ch < 0)
[2/2] lucenenet git commit: Using proper method of comparing sets,
removing noisy method
Posted by sy...@apache.org.
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 <it...@code972.com>
Authored: Fri Feb 20 09:29:50 2015 +0200
Committer: Itamar Syn-Hershko <it...@code972.com>
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<Term, int?> Terms = new Dictionary<Term, int?>();
+ internal readonly AtomicInteger NumBinaryUpdates = new AtomicInteger();
internal readonly IDictionary<Query, int?> Queries = new Dictionary<Query, int?>();
internal readonly IList<int?> DocIDs = new List<int?>();
+ // TODO LUCENENET make get access internal and make accessible from Tests
+ public IDictionary<Term, int?> Terms { get; private set; }
+
// Map<dvField,Map<updateTerm,NumericUpdate>>
// 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<Term, int?> 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<Term> frozenSet = new HashSet<Term>();
+ assertEquals(uniqueValues, new HashSet<Term>(bd1.Terms.Keys));
+ assertEquals(uniqueValues, new HashSet<Term>(bd2.Terms.Keys));
+ var frozenSet = new HashSet<Term>();
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<Term>(deletes.Terms.Keys));
}
queue.TryApplyGlobalSlice();
HashSet<Term> frozenSet = new HashSet<Term>();