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/01/21 15:47:21 UTC
[1/3] lucenenet git commit: fix enumerator port to use appropriate
logic
Repository: lucenenet
Updated Branches:
refs/heads/master 5de15ec25 -> 547b69f51
fix enumerator port to use appropriate logic
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/cf5ebe10
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/cf5ebe10
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/cf5ebe10
Branch: refs/heads/master
Commit: cf5ebe106b4f2df91ccc3dcf168e9b36eeaaab6a
Parents: 5de15ec
Author: Laimonas Simutis <la...@gmail.com>
Authored: Wed Jan 21 05:11:41 2015 -0600
Committer: Laimonas Simutis <la...@gmail.com>
Committed: Wed Jan 21 05:11:41 2015 -0600
----------------------------------------------------------------------
.../Codecs/MissingOrdRemapper.cs | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/cf5ebe10/src/Lucene.Net.TestFramework/Codecs/MissingOrdRemapper.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/MissingOrdRemapper.cs b/src/Lucene.Net.TestFramework/Codecs/MissingOrdRemapper.cs
index c610022..87c3afe 100644
--- a/src/Lucene.Net.TestFramework/Codecs/MissingOrdRemapper.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/MissingOrdRemapper.cs
@@ -71,22 +71,20 @@ namespace Lucene.Net.Codecs
public bool MoveNext()
{
- if (seenEmpty || !@in.MoveNext())
- {
- return false;
- }
-
if (!seenEmpty)
{
seenEmpty = true;
current = new BytesRef();
+ return true;
}
- else
+
+ if (@in.MoveNext())
{
current = @in.Current;
+ return true;
}
- return true;
+ return false;
}
public BytesRef Current
[3/3] lucenenet git commit: Merge remote-tracking branch
'laimis/MissingOrdRemapper_fixes'
Posted by sy...@apache.org.
Merge remote-tracking branch 'laimis/MissingOrdRemapper_fixes'
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/547b69f5
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/547b69f5
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/547b69f5
Branch: refs/heads/master
Commit: 547b69f5130a404918b05f6def788eda32df1c11
Parents: 1379b38 cf5ebe1
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Wed Jan 21 16:47:06 2015 +0200
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Wed Jan 21 16:47:06 2015 +0200
----------------------------------------------------------------------
.../Codecs/MissingOrdRemapper.cs | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
[2/3] lucenenet git commit: Minor
Posted by sy...@apache.org.
Minor
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/1379b387
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/1379b387
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/1379b387
Branch: refs/heads/master
Commit: 1379b3873ea90261e5a7da2c0e26602247a341e6
Parents: 5de15ec
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Wed Jan 21 16:40:45 2015 +0200
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Wed Jan 21 16:40:55 2015 +0200
----------------------------------------------------------------------
.../Search/CachingWrapperFilter.cs | 39 +++++++-------------
src/Lucene.Net.Core/Support/WeakDictionary.cs | 4 +-
2 files changed, 16 insertions(+), 27 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1379b387/src/Lucene.Net.Core/Search/CachingWrapperFilter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/CachingWrapperFilter.cs b/src/Lucene.Net.Core/Search/CachingWrapperFilter.cs
index 3e2dcef..242225a 100644
--- a/src/Lucene.Net.Core/Search/CachingWrapperFilter.cs
+++ b/src/Lucene.Net.Core/Search/CachingWrapperFilter.cs
@@ -1,5 +1,6 @@
using System.Collections.Generic;
using System.Diagnostics;
+using System.Linq;
namespace Lucene.Net.Search
{
@@ -35,17 +36,17 @@ namespace Lucene.Net.Search
/// </summary>
public class CachingWrapperFilter : Filter
{
- private readonly Filter Filter_Renamed;
+ private readonly Filter _filter;
//private readonly IDictionary<object, DocIdSet> Cache = Collections.synchronizedMap(new WeakHashMap<object, DocIdSet>());
- private readonly IDictionary<object, DocIdSet> Cache = new ConcurrentHashMapWrapper<object, DocIdSet>(new WeakDictionary<object, DocIdSet>());
+ private readonly IDictionary<object, DocIdSet> _cache = new ConcurrentHashMapWrapper<object, DocIdSet>(new WeakDictionary<object, DocIdSet>());
/// <summary>
/// Wraps another filter's result and caches it. </summary>
/// <param name="filter"> Filter to cache results of </param>
public CachingWrapperFilter(Filter filter)
{
- this.Filter_Renamed = filter;
+ this._filter = filter;
}
/// <summary>
@@ -55,7 +56,7 @@ namespace Lucene.Net.Search
{
get
{
- return Filter_Renamed;
+ return _filter;
}
}
@@ -114,7 +115,7 @@ namespace Lucene.Net.Search
var reader = context.AtomicReader;
object key = reader.CoreCacheKey;
- DocIdSet docIdSet = Cache[key];
+ DocIdSet docIdSet = _cache[key];
if (docIdSet != null)
{
HitCount++;
@@ -122,9 +123,9 @@ namespace Lucene.Net.Search
else
{
MissCount++;
- docIdSet = DocIdSetToCache(Filter_Renamed.GetDocIdSet(context, null), reader);
+ docIdSet = DocIdSetToCache(_filter.GetDocIdSet(context, null), reader);
Debug.Assert(docIdSet.Cacheable);
- Cache[key] = docIdSet;
+ _cache[key] = docIdSet;
}
return docIdSet == EMPTY_DOCIDSET ? null : BitsFilteredDocIdSet.Wrap(docIdSet, acceptDocs);
@@ -132,7 +133,7 @@ namespace Lucene.Net.Search
public override string ToString()
{
- return this.GetType().Name + "(" + Filter_Renamed + ")";
+ return this.GetType().Name + "(" + _filter + ")";
}
public override bool Equals(object o)
@@ -142,12 +143,12 @@ namespace Lucene.Net.Search
{
return false;
}
- return this.Filter_Renamed.Equals(other.Filter_Renamed);
+ return _filter.Equals(other._filter);
}
public override int GetHashCode()
{
- return (Filter_Renamed.GetHashCode() ^ this.GetType().GetHashCode());
+ return (_filter.GetHashCode() ^ this.GetType().GetHashCode());
}
/// <summary>
@@ -156,10 +157,6 @@ namespace Lucene.Net.Search
private class DocIdSetAnonymousInnerClassHelper : DocIdSet
{
- public DocIdSetAnonymousInnerClassHelper()
- {
- }
-
public override DocIdSetIterator GetIterator()
{
return DocIdSetIterator.Empty();
@@ -185,19 +182,11 @@ namespace Lucene.Net.Search
public virtual long SizeInBytes()
{
// Sync only to pull the current set of values:
- IList<DocIdSet> docIdSets;
- lock (Cache)
+ lock (_cache)
{
- docIdSets = new List<DocIdSet>(Cache.Values);
+ IList<DocIdSet> docIdSets = new List<DocIdSet>(_cache.Values);
+ return docIdSets.Sum(dis => RamUsageEstimator.SizeOf(dis));
}
-
- long total = 0;
- foreach (DocIdSet dis in docIdSets)
- {
- total += RamUsageEstimator.SizeOf(dis);
- }
-
- return total;
}
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/1379b387/src/Lucene.Net.Core/Support/WeakDictionary.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Support/WeakDictionary.cs b/src/Lucene.Net.Core/Support/WeakDictionary.cs
index 454d4df..a29a0bf 100644
--- a/src/Lucene.Net.Core/Support/WeakDictionary.cs
+++ b/src/Lucene.Net.Core/Support/WeakDictionary.cs
@@ -251,8 +251,8 @@ namespace Lucene.Net.Support
/// </summary>
private class WeakKey<T>
{
- private WeakReference reference;
- private int hashCode;
+ private readonly WeakReference reference;
+ private readonly int hashCode;
public WeakKey(T key)
{