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/04/08 19:01:00 UTC
[1/4] lucenenet git commit: Bringing code to be inline with the Java
version
Repository: lucenenet
Updated Branches:
refs/heads/master 464fd5054 -> 31a43f02a
Bringing code to be inline with the Java version
Source: https://github.com/apache/lucene-solr/blob/lucene_solr_4_8_0/lucene/core/src/java/org/apache/lucene/util/fst/NodeHash.java
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/ea7cfe69
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/ea7cfe69
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/ea7cfe69
Branch: refs/heads/master
Commit: ea7cfe6972972f91090d995c729689fff9a0f54c
Parents: 464fd50
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Wed Apr 8 19:59:53 2015 +0300
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Wed Apr 8 19:59:53 2015 +0300
----------------------------------------------------------------------
src/Lucene.Net.Core/Util/Fst/NodeHash.cs | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/ea7cfe69/src/Lucene.Net.Core/Util/Fst/NodeHash.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Util/Fst/NodeHash.cs b/src/Lucene.Net.Core/Util/Fst/NodeHash.cs
index d4ff9e7..4e8bc73 100644
--- a/src/Lucene.Net.Core/Util/Fst/NodeHash.cs
+++ b/src/Lucene.Net.Core/Util/Fst/NodeHash.cs
@@ -85,11 +85,9 @@ namespace Lucene.Net.Util.Fst
Builder<T>.Arc<T> arc = node.Arcs[arcIdx];
h = PRIME * h + arc.Label;
long n = ((Builder<T>.CompiledNode)arc.Target).Node;
- h = PRIME * h + (int)((n ^ (n >> 32)) >> 32);
- var arcOutputHashCode = arc.Output.GetHashCode();
- h = PRIME * h + arcOutputHashCode;
- var arcFinalOutputHashCode = arc.NextFinalOutput.GetHashCode();
- h = PRIME * h + arcFinalOutputHashCode;
+ h = PRIME * h + (int)(n ^ (n >> 32));
+ h = PRIME * h + arc.Output.GetHashCode();
+ h = PRIME * h + arc.NextFinalOutput.GetHashCode();
if (arc.IsFinal)
{
h += 17;
@@ -110,12 +108,9 @@ namespace Lucene.Net.Util.Fst
{
//System.out.println(" label=" + scratchArc.label + " target=" + scratchArc.target + " h=" + h + " output=" + fst.outputs.outputToString(scratchArc.output) + " next?=" + scratchArc.flag(4) + " final?=" + scratchArc.isFinal() + " pos=" + in.getPosition());
h = PRIME * h + ScratchArc.Label;
- //Force truncation by shifting at the end
- h = PRIME * h + (int)((ScratchArc.Target ^ (ScratchArc.Target >> 32)) >> 32);
- var sractchArcHashCode = ScratchArc.Output.GetHashCode();
- h = PRIME * h + sractchArcHashCode;
- var scratchArcFinalOutputHashCode = ScratchArc.NextFinalOutput.GetHashCode();
- h = PRIME * h + scratchArcFinalOutputHashCode;
+ h = PRIME * h + (int)(ScratchArc.Target ^ (ScratchArc.Target >> 32));
+ h = PRIME * h + ScratchArc.Output.GetHashCode();
+ h = PRIME * h + ScratchArc.NextFinalOutput.GetHashCode();
if (ScratchArc.Final)
{
h += 17;
[2/4] lucenenet git commit: Marking some more long running tests
Posted by sy...@apache.org.
Marking some more long running tests
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/626bb65d
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/626bb65d
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/626bb65d
Branch: refs/heads/master
Commit: 626bb65d669fa70751f3fb1f465395d031d09942
Parents: ea7cfe6
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Wed Apr 8 20:00:17 2015 +0300
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Wed Apr 8 20:00:17 2015 +0300
----------------------------------------------------------------------
src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs | 3 ++-
src/Lucene.Net.Tests/core/Util/Automaton/TestDeterminism.cs | 3 ++-
src/Lucene.Net.Tests/core/Util/TestOpenBitSet.cs | 3 ++-
3 files changed, 6 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/626bb65d/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs b/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs
index 3094f51..f299a1b 100644
--- a/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestSearchAfter.cs
@@ -1,5 +1,6 @@
using System;
using System.Collections.Generic;
+using Lucene.Net.Attributes;
using Lucene.Net.Documents;
namespace Lucene.Net.Search
@@ -188,7 +189,7 @@ namespace Lucene.Net.Search
base.TearDown();
}
- [Test]
+ [Test, LongRunningTest]
public virtual void TestQueries()
{
// because the first page has a null 'after', we get a normal collector.
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/626bb65d/src/Lucene.Net.Tests/core/Util/Automaton/TestDeterminism.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/Automaton/TestDeterminism.cs b/src/Lucene.Net.Tests/core/Util/Automaton/TestDeterminism.cs
index d2d5724..65fde52 100644
--- a/src/Lucene.Net.Tests/core/Util/Automaton/TestDeterminism.cs
+++ b/src/Lucene.Net.Tests/core/Util/Automaton/TestDeterminism.cs
@@ -1,3 +1,4 @@
+using Lucene.Net.Attributes;
using NUnit.Framework;
namespace Lucene.Net.Util.Automaton
@@ -28,7 +29,7 @@ namespace Lucene.Net.Util.Automaton
{
/// <summary>
/// test a bunch of random regular expressions </summary>
- [Test]
+ [Test, LongRunningTest]
public virtual void TestRegexps()
{
int num = AtLeast(500);
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/626bb65d/src/Lucene.Net.Tests/core/Util/TestOpenBitSet.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Util/TestOpenBitSet.cs b/src/Lucene.Net.Tests/core/Util/TestOpenBitSet.cs
index 5d4dbb8..c3776fe 100644
--- a/src/Lucene.Net.Tests/core/Util/TestOpenBitSet.cs
+++ b/src/Lucene.Net.Tests/core/Util/TestOpenBitSet.cs
@@ -16,6 +16,7 @@
*/
using System;
+using Lucene.Net.Attributes;
using Lucene.Net.Randomized.Generators;
using Lucene.Net.Support;
using NUnit.Framework;
@@ -337,7 +338,7 @@ namespace Lucene.Net.Util
// large enough to flush obvious bugs, small enough to run in <.5 sec as part of a
// larger testsuite.
- [Test]
+ [Test, LongRunningTest]
public virtual void TestSmall()
{
DoRandomSets(AtLeast(1200), AtLeast(1000), 1);
[4/4] lucenenet git commit: Fixing tests by catching the right
exception
Posted by sy...@apache.org.
Fixing tests by catching the right exception
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/31a43f02
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/31a43f02
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/31a43f02
Branch: refs/heads/master
Commit: 31a43f02a9dd9bbffaa5d728d0e942642a74dd79
Parents: 4436360
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Wed Apr 8 20:00:45 2015 +0300
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Wed Apr 8 20:00:45 2015 +0300
----------------------------------------------------------------------
src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs | 2 +-
src/Lucene.Net.Tests/core/Store/TestFileSwitchDirectory.cs | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/31a43f02/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
index a3d0c49..7eda017 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDirectoryReader.cs
@@ -743,7 +743,7 @@ namespace Lucene.Net.Index
DirectoryReader.Open(dir);
Assert.Fail("did not hit expected exception");
}
- catch (NoSuchDirectoryException nsde)
+ catch (IndexNotFoundException nsde)
{
// expected
}
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/31a43f02/src/Lucene.Net.Tests/core/Store/TestFileSwitchDirectory.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Store/TestFileSwitchDirectory.cs b/src/Lucene.Net.Tests/core/Store/TestFileSwitchDirectory.cs
index 4f3b773..6cfa6f0 100644
--- a/src/Lucene.Net.Tests/core/Store/TestFileSwitchDirectory.cs
+++ b/src/Lucene.Net.Tests/core/Store/TestFileSwitchDirectory.cs
@@ -1,3 +1,4 @@
+using Lucene.Net.Index;
using Lucene.Net.Support;
using NUnit.Framework;
using System.Collections.Generic;
@@ -118,7 +119,7 @@ namespace Lucene.Net.Store
DirectoryReader.Open(dir);
Assert.Fail("did not hit expected exception");
}
- catch (NoSuchDirectoryException nsde)
+ catch (IndexNotFoundException nsde)
{
// expected
}
[3/4] lucenenet git commit: Minor code cleanup
Posted by sy...@apache.org.
Minor code cleanup
Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/44363602
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/44363602
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/44363602
Branch: refs/heads/master
Commit: 443636026b5a7ecd8cac3ac27362e30b3799d8a5
Parents: 626bb65
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Wed Apr 8 20:00:32 2015 +0300
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Wed Apr 8 20:00:32 2015 +0300
----------------------------------------------------------------------
src/Lucene.Net.Core/Search/RegexpQuery.cs | 6 +-----
src/Lucene.Net.Tests/core/Search/TestTopDocsMerge.cs | 2 +-
2 files changed, 2 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/44363602/src/Lucene.Net.Core/Search/RegexpQuery.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Core/Search/RegexpQuery.cs b/src/Lucene.Net.Core/Search/RegexpQuery.cs
index 596fdfb..9a05226 100644
--- a/src/Lucene.Net.Core/Search/RegexpQuery.cs
+++ b/src/Lucene.Net.Core/Search/RegexpQuery.cs
@@ -51,14 +51,10 @@ namespace Lucene.Net.Search
/// <summary>
/// A provider that provides no named automata
/// </summary>
- private static AutomatonProvider defaultProvider = new AutomatonProviderAnonymousInnerClassHelper();
+ private static readonly AutomatonProvider defaultProvider = new AutomatonProviderAnonymousInnerClassHelper();
private class AutomatonProviderAnonymousInnerClassHelper : AutomatonProvider
{
- public AutomatonProviderAnonymousInnerClassHelper()
- {
- }
-
public Automaton GetAutomaton(string name)
{
return null;
http://git-wip-us.apache.org/repos/asf/lucenenet/blob/44363602/src/Lucene.Net.Tests/core/Search/TestTopDocsMerge.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Search/TestTopDocsMerge.cs b/src/Lucene.Net.Tests/core/Search/TestTopDocsMerge.cs
index d16efae..3edac14 100644
--- a/src/Lucene.Net.Tests/core/Search/TestTopDocsMerge.cs
+++ b/src/Lucene.Net.Tests/core/Search/TestTopDocsMerge.cs
@@ -45,7 +45,7 @@ namespace Lucene.Net.Search
{
private class ShardSearcher : IndexSearcher
{
- internal readonly IList<AtomicReaderContext> Ctx;
+ private readonly IList<AtomicReaderContext> Ctx;
public ShardSearcher(AtomicReaderContext ctx, IndexReaderContext parent)
: base(parent)