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/03/01 23:56:28 UTC
[1/3] lucenenet git commit: Fixing NRE
Repository: lucenenet
Updated Branches:
refs/heads/master 9ff490365 -> aabf15fdb
Fixing NRE
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/979403c2
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/979403c2
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/979403c2
Branch: refs/heads/master
Commit: 979403c21364be8df5bb764ae3dc4e361d016062
Parents: 9ff4903
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Mon Mar 2 00:53:09 2015 +0200
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Mon Mar 2 00:53:09 2015 +0200
----------------------------------------------------------------------
.../Codecs/lucene40/Lucene40DocValuesWriter.cs | 16 +++++++++-------
1 file changed, 9 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/979403c2/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40DocValuesWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40DocValuesWriter.cs b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40DocValuesWriter.cs
index e8cfda1..4d634a4 100644
--- a/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40DocValuesWriter.cs
+++ b/src/Lucene.Net.TestFramework/Codecs/lucene40/Lucene40DocValuesWriter.cs
@@ -172,24 +172,26 @@ namespace Lucene.Net.Codecs.Lucene40
HashSet<BytesRef> uniqueValues = new HashSet<BytesRef>();
int minLength = int.MaxValue;
int maxLength = int.MinValue;
- BytesRef brefDummy;
- foreach (BytesRef b in values)
+
+ var vals = values.ToArray();
+
+ for (int i = 0; i < vals.Length; i++)
{
- brefDummy = b;
+ var b = vals[i];
if (b == null)
{
- brefDummy = new BytesRef(); // 4.0 doesnt distinguish
+ b = vals[i] = new BytesRef(); // 4.0 doesnt distinguish
}
if (b.Length > Lucene40DocValuesFormat.MAX_BINARY_FIELD_LENGTH)
{
throw new System.ArgumentException("DocValuesField \"" + field.Name + "\" is too large, must be <= " + Lucene40DocValuesFormat.MAX_BINARY_FIELD_LENGTH);
}
- minLength = Math.Min(minLength, brefDummy.Length);
- maxLength = Math.Max(maxLength, brefDummy.Length);
+ minLength = Math.Min(minLength, b.Length);
+ maxLength = Math.Max(maxLength, b.Length);
if (uniqueValues != null)
{
- if (uniqueValues.Add(BytesRef.DeepCopyOf(brefDummy)))
+ if (uniqueValues.Add(BytesRef.DeepCopyOf(b)))
{
if (uniqueValues.Count > 256)
{
[3/3] lucenenet git commit: Marking test as explicit
Posted by sy...@apache.org.
Marking test as explicit
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/aabf15fd
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/aabf15fd
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/aabf15fd
Branch: refs/heads/master
Commit: aabf15fdb14e4806f1182e2c8aa4edc57d8c27ab
Parents: 3c73a17
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Mon Mar 2 00:54:46 2015 +0200
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Mon Mar 2 00:54:46 2015 +0200
----------------------------------------------------------------------
src/Lucene.Net.Tests/core/Util/TestPriorityQueue.cs | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/aabf15fd/src/Lucene.Net.Tests/core/Util/TestPriorityQueue.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestPriorityQueue.cs b/src/Lucene.Net.Tests/core/Util/TestPriorityQueue.cs
index 441e49e..c5305c1 100644
--- a/src/Lucene.Net.Tests/core/Util/TestPriorityQueue.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestPriorityQueue.cs
@@ -614,7 +614,7 @@ namespace Lucene.Net.Util
Assert.AreEqual(pq.Size(), 0);
}
- [Test]
+ [Test, Explicit]
public static void Benchmarks()
{
if (!VERBOSE)
[2/3] lucenenet git commit: Making it easier to debug an exception +
various cleanups
Posted by sy...@apache.org.
Making it easier to debug an exception + various cleanups
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/3c73a178
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/3c73a178
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/3c73a178
Branch: refs/heads/master
Commit: 3c73a178a25b0099770e691eeabadd79ea66e688
Parents: 979403c
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Mon Mar 2 00:53:43 2015 +0200
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Mon Mar 2 00:53:43 2015 +0200
----------------------------------------------------------------------
src/Lucene.Net.Core/Index/IndexWriter.cs | 4 ++--
src/Lucene.Net.TestFramework/Util/VirtualMethod.cs | 6 +++---
2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c73a178/src/Lucene.Net.Core/Index/IndexWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Index/IndexWriter.cs b/src/Lucene.Net.Core/Index/IndexWriter.cs
index fbedd45..7c4627b 100644
--- a/src/Lucene.Net.Core/Index/IndexWriter.cs
+++ b/src/Lucene.Net.Core/Index/IndexWriter.cs
@@ -904,7 +904,7 @@ namespace Lucene.Net.Index
// points.
if (commit.Directory != directory)
{
- throw new System.ArgumentException("IndexCommit's directory doesn't match my directory");
+ throw new ArgumentException(string.Format("IndexCommit's directory doesn't match my directory (mine: {0}, commit's: {1})", directory, commit.Directory));
}
SegmentInfos oldInfos = new SegmentInfos();
oldInfos.Read(directory, commit.SegmentsFileName);
@@ -2861,7 +2861,7 @@ namespace Lucene.Net.Index
/// <summary>
/// Called internally if any index state has changed. </summary>
- internal virtual void Changed()
+ internal void Changed()
{
lock (this)
{
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3c73a178/src/Lucene.Net.TestFramework/Util/VirtualMethod.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.TestFramework/Util/VirtualMethod.cs b/src/Lucene.Net.TestFramework/Util/VirtualMethod.cs
index 319efaa..7cc661b 100644
--- a/src/Lucene.Net.TestFramework/Util/VirtualMethod.cs
+++ b/src/Lucene.Net.TestFramework/Util/VirtualMethod.cs
@@ -49,7 +49,7 @@ namespace Lucene.Net.Util
/// final boolean isDeprecatedMethodOverridden =
/// VirtualMethod.compareImplementationDistance(this.getClass(), oldMethod, newMethod) > 0
/// </pre>
- /// <p><seealso cref="getImplementationDistance"/> returns the distance of the subclass that overrides this method.
+ /// <p><seealso cref="GetImplementationDistance"/> returns the distance of the subclass that overrides this method.
/// The one with the larger distance should be used preferable.
/// this way also more complicated method rename scenarios can be handled
/// (think of 2.9 {@code TokenStream} deprecations).</p>
@@ -67,9 +67,9 @@ namespace Lucene.Net.Util
/// <summary>
/// Creates a new instance for the given {@code baseClass} and method declaration. </summary>
- /// <exception cref="UnsupportedOperationException"> if you create a second instance of the same
+ /// <exception cref="InvalidOperationException"> if you create a second instance of the same
/// {@code baseClass} and method declaration combination. this enforces the singleton status. </exception>
- /// <exception cref="IllegalArgumentException"> if {@code baseClass} does not declare the given method. </exception>
+ /// <exception cref="ArgumentException"> if {@code baseClass} does not declare the given method. </exception>
public VirtualMethod(Type baseClass, string method, params Type[] parameters)
{
this.BaseClass = baseClass;