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/09 21:07:10 UTC

[1/3] lucenenet git commit: More sealing

Repository: lucenenet
Updated Branches:
  refs/heads/master a99c15cd4 -> 71874969c


More sealing


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/3cf42776
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/3cf42776
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/3cf42776

Branch: refs/heads/master
Commit: 3cf4277644ea55b425c4f22eb200063fa829c4cc
Parents: a99c15c
Author: Chand2048 <Ch...@Microsoft.com>
Authored: Mon Feb 9 11:30:34 2015 -0800
Committer: Chand2048 <Ch...@Microsoft.com>
Committed: Mon Feb 9 11:30:34 2015 -0800

----------------------------------------------------------------------
 .../core/Index/TestDocInverterPerFieldErrorInfo.cs           | 2 +-
 src/Lucene.Net.Tests/core/Index/TestDocumentWriter.cs        | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3cf42776/src/Lucene.Net.Tests/core/Index/TestDocInverterPerFieldErrorInfo.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDocInverterPerFieldErrorInfo.cs b/src/Lucene.Net.Tests/core/Index/TestDocInverterPerFieldErrorInfo.cs
index 8ec9e62..f054ac2 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDocInverterPerFieldErrorInfo.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDocInverterPerFieldErrorInfo.cs
@@ -78,7 +78,7 @@ namespace Lucene.Net.Index
                     this.OuterInstance = outerInstance;
                 }
 
-                public override bool IncrementToken()
+                public sealed override bool IncrementToken()
                 {
                     throw new BadNews("Something is icky.");
                 }

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/3cf42776/src/Lucene.Net.Tests/core/Index/TestDocumentWriter.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests/core/Index/TestDocumentWriter.cs b/src/Lucene.Net.Tests/core/Index/TestDocumentWriter.cs
index 0c6d6fb..dbe3ff5 100644
--- a/src/Lucene.Net.Tests/core/Index/TestDocumentWriter.cs
+++ b/src/Lucene.Net.Tests/core/Index/TestDocumentWriter.cs
@@ -218,7 +218,7 @@ namespace Lucene.Net.Index
                 internal bool first;
                 internal AttributeSource.State state;
 
-                public override bool IncrementToken()
+                public sealed override bool IncrementToken()
                 {
                     if (state != null)
                     {
@@ -251,7 +251,7 @@ namespace Lucene.Net.Index
                     return true;
                 }
 
-                public override void Reset()
+                public sealed override void Reset()
                 {
                     base.Reset();
                     first = true;
@@ -300,7 +300,7 @@ namespace Lucene.Net.Index
         {
             private readonly TestDocumentWriter OuterInstance;
 
-            public TokenStreamAnonymousInnerClassHelper(TestDocumentWriter outerInstance)
+            public TokenStreamAnonymousInnerClassHelper(TestDocumentWriter outerInstance) 
             {
                 this.OuterInstance = outerInstance;
                 tokens = new string[] { "term1", "term2", "term3", "term2" };
@@ -313,7 +313,7 @@ namespace Lucene.Net.Index
 
             private ICharTermAttribute termAtt;
 
-            public override bool IncrementToken()
+            public sealed override bool IncrementToken()
             {
                 if (index == tokens.Length)
                 {


[2/3] lucenenet git commit: More Lucene.Net.Queries tests

Posted by sy...@apache.org.
More Lucene.Net.Queries tests


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/0471466e
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/0471466e
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/0471466e

Branch: refs/heads/master
Commit: 0471466e0719b8f828e89fc7edaa481ad75ac2d8
Parents: a99c15c
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Mon Feb 9 22:06:25 2015 +0200
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Mon Feb 9 22:06:25 2015 +0200

----------------------------------------------------------------------
 .../CommonTermsQueryTest.cs                     | 542 +++++++++++++++++++
 .../Lucene.Net.Tests.Queries.csproj             |   1 +
 2 files changed, 543 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0471466e/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs b/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs
new file mode 100644
index 0000000..05c43cd
--- /dev/null
+++ b/src/Lucene.Net.Tests.Queries/CommonTermsQueryTest.cs
@@ -0,0 +1,542 @@
+using System;
+using System.Collections.Generic;
+using Lucene.Net.Analysis;
+using Lucene.Net.Documents;
+using Lucene.Net.Index;
+using Lucene.Net.JavaCompatibility;
+using Lucene.Net.Queries;
+using Lucene.Net.Randomized.Generators;
+using Lucene.Net.Search;
+using Lucene.Net.Store;
+using Lucene.Net.Support;
+using Lucene.Net.Util;
+using NUnit.Framework;
+
+namespace Lucene.Net.Tests.Queries
+{
+    public class CommonTermsQueryTest : LuceneTestCase
+    {
+        [Test]
+        public void TestBasics()
+        {
+            Directory dir = NewDirectory();
+            MockAnalyzer analyzer = new MockAnalyzer(Random());
+            RandomIndexWriter w = new RandomIndexWriter(Random(), dir, analyzer);
+            var docs = new string[]
+            {
+                @"this is the end of the world right", @"is this it or maybe not",
+                @"this is the end of the universe as we know it",
+                @"there is the famous restaurant at the end of the universe"
+            };
+
+            for (int i = 0; i < docs.Length; i++)
+            {
+                Document doc = new Document();
+                doc.Add(NewStringField(@"id", @"" + i, Field.Store.YES));
+                doc.Add(NewTextField(@"field", docs[i], Field.Store.NO));
+                w.AddDocument(doc);
+            }
+
+            IndexReader r = w.Reader;
+            IndexSearcher s = NewSearcher(r);
+            {
+                CommonTermsQuery query = new CommonTermsQuery(BooleanClause.Occur.SHOULD, BooleanClause.Occur.SHOULD, Random().NextBoolean() ? 2F : 0.5F);
+                query.Add(new Term("field", "is"));
+                query.Add(new Term("field", "this"));
+                query.Add(new Term("field", "end"));
+                query.Add(new Term("field", "world"));
+                query.Add(new Term("field", "universe"));
+                query.Add(new Term("field", "right"));
+                TopDocs search = s.Search(query, 10);
+                assertEquals(search.TotalHits, 3);
+                assertEquals(@"0", r.Document(search.ScoreDocs[0].Doc).Get(@"id"));
+                assertEquals(@"2", r.Document(search.ScoreDocs[1].Doc).Get(@"id"));
+                assertEquals(@"3", r.Document(search.ScoreDocs[2].Doc).Get(@"id"));
+            }
+
+            {
+                CommonTermsQuery query = new CommonTermsQuery(BooleanClause.Occur.SHOULD, BooleanClause.Occur.SHOULD, Random().NextBoolean() ? 2F : 0.5F);
+                query.Add(new Term("field", "is"));
+                query.Add(new Term("field", "this"));
+                query.Add(new Term("field", "end"));
+                TopDocs search = s.Search(query, 10);
+                assertEquals(search.TotalHits, 2);
+                assertEquals(@"0", r.Document(search.ScoreDocs[0].Doc).Get(@"id"));
+                assertEquals(@"2", r.Document(search.ScoreDocs[1].Doc).Get(@"id"));
+            }
+
+            {
+                CommonTermsQuery query = new CommonTermsQuery(BooleanClause.Occur.SHOULD, BooleanClause.Occur.MUST, Random().NextBoolean() ? 2F : 0.5F);
+                query.Add(new Term("field", "is"));
+                query.Add(new Term("field", "this"));
+                query.Add(new Term("field", "end"));
+                query.Add(new Term("field", "world"));
+                TopDocs search = s.Search(query, 10);
+                assertEquals(search.TotalHits, 1);
+                assertEquals(@"0", r.Document(search.ScoreDocs[0].Doc).Get(@"id"));
+            }
+
+            {
+                CommonTermsQuery query = new CommonTermsQuery(BooleanClause.Occur.SHOULD, BooleanClause.Occur.MUST, Random().NextBoolean() ? 2F : 0.5F);
+                query.Add(new Term("field", "restaurant"));
+                query.Add(new Term("field", "universe"));
+                TopDocs search = s.Search(query, 10);
+                assertEquals(search.TotalHits, 1);
+                assertEquals(@"3", r.Document(search.ScoreDocs[0].Doc).Get(@"id"));
+            }
+
+            r.Dispose();
+            w.Dispose();
+            dir.Dispose();
+        }
+
+        [Test]
+        public void TestEqualsHashCode()
+        {
+            CommonTermsQuery query = new CommonTermsQuery(RandomOccur(Random()), RandomOccur(Random()), Random().NextFloat(), Random().NextBoolean());
+            int terms = AtLeast(2);
+            for (int i = 0; i < terms; i++)
+            {
+                query.Add(new Term(TestUtil.RandomRealisticUnicodeString(Random()), TestUtil.RandomRealisticUnicodeString(Random())));
+            }
+
+            QueryUtils.CheckHashEquals(query);
+            QueryUtils.CheckUnequal(new CommonTermsQuery(RandomOccur(Random()), RandomOccur(Random()), Random().NextFloat(), Random().NextBoolean()), query);
+            {
+                long seed = Random().NextLong();
+                Random r = new Random((int)seed);
+                CommonTermsQuery left = new CommonTermsQuery(RandomOccur(r), RandomOccur(r), r.NextFloat(), r.NextBoolean());
+                int leftTerms = AtLeast(r, 2);
+                for (int i = 0; i < leftTerms; i++)
+                {
+                    left.Add(new Term(TestUtil.RandomRealisticUnicodeString(r), TestUtil.RandomRealisticUnicodeString(r)));
+                }
+
+                left.HighFreqMinimumNumberShouldMatch = r.nextInt(4);
+                left.LowFreqMinimumNumberShouldMatch = r.nextInt(4);
+                r = new Random((int)seed);
+                CommonTermsQuery right = new CommonTermsQuery(RandomOccur(r), RandomOccur(r), r.NextFloat(), r.NextBoolean());
+                int rightTerms = AtLeast(r, 2);
+                for (int i = 0; i < rightTerms; i++)
+                {
+                    right.Add(new Term(TestUtil.RandomRealisticUnicodeString(r), TestUtil.RandomRealisticUnicodeString(r)));
+                }
+
+                right.HighFreqMinimumNumberShouldMatch = r.nextInt(4);
+                right.LowFreqMinimumNumberShouldMatch = r.nextInt(4);
+                QueryUtils.CheckEqual(left, right);
+            }
+        }
+
+        private static BooleanClause.Occur RandomOccur(Random random)
+        {
+            return random.NextBoolean() ? BooleanClause.Occur.MUST : BooleanClause.Occur.SHOULD;
+        }
+
+        [Test]
+        public void TestNullTerm()
+        {
+            Random random = Random();
+            CommonTermsQuery query = new CommonTermsQuery(RandomOccur(random), RandomOccur(random), Random().NextFloat());
+            try
+            {
+                query.Add(null);
+                Fail(@"null values are not supported");
+            }
+            catch (ArgumentException ex)
+            {
+            }
+        }
+
+        [Test]
+        public void TestMinShouldMatch()
+        {
+            Directory dir = NewDirectory();
+            MockAnalyzer analyzer = new MockAnalyzer(Random());
+            RandomIndexWriter w = new RandomIndexWriter(Random(), dir, analyzer);
+            string[] docs = new string[]
+            {
+                @"this is the end of the world right", @"is this it or maybe not",
+                @"this is the end of the universe as we know it",
+                @"there is the famous restaurant at the end of the universe"
+            };
+
+            for (int i = 0; i < docs.Length; i++)
+            {
+                Document doc = new Document();
+                doc.Add(NewStringField(@"id", @"" + i, Field.Store.YES));
+                doc.Add(NewTextField(@"field", docs[i], Field.Store.NO));
+                w.AddDocument(doc);
+            }
+
+            IndexReader r = w.Reader;
+            IndexSearcher s = NewSearcher(r);
+            {
+                CommonTermsQuery query = new CommonTermsQuery(BooleanClause.Occur.SHOULD, BooleanClause.Occur.SHOULD, Random().NextBoolean() ? 2F : 0.5F);
+                query.Add(new Term("field", "is"));
+                query.Add(new Term("field", "this"));
+                query.Add(new Term("field", "end"));
+                query.Add(new Term("field", "world"));
+                query.Add(new Term("field", "universe"));
+                query.Add(new Term("field", "right"));
+                query.LowFreqMinimumNumberShouldMatch = 0.5F;
+                TopDocs search = s.Search(query, 10);
+                assertEquals(search.TotalHits, 1);
+                assertEquals(@"0", r.Document(search.ScoreDocs[0].Doc).Get(@"id"));
+            }
+
+            {
+                CommonTermsQuery query = new CommonTermsQuery(BooleanClause.Occur.SHOULD, BooleanClause.Occur.SHOULD, Random().NextBoolean() ? 2F : 0.5F);
+                query.Add(new Term("field", "is"));
+                query.Add(new Term("field", "this"));
+                query.Add(new Term("field", "end"));
+                query.Add(new Term("field", "world"));
+                query.Add(new Term("field", "universe"));
+                query.Add(new Term("field", "right"));
+                query.LowFreqMinimumNumberShouldMatch = 2F;
+                TopDocs search = s.Search(query, 10);
+                assertEquals(search.TotalHits, 1);
+                assertEquals(@"0", r.Document(search.ScoreDocs[0].Doc).Get(@"id"));
+            }
+
+            {
+                CommonTermsQuery query = new CommonTermsQuery(BooleanClause.Occur.SHOULD, BooleanClause.Occur.SHOULD, Random().NextBoolean() ? 2F : 0.5F);
+                query.Add(new Term("field", "is"));
+                query.Add(new Term("field", "this"));
+                query.Add(new Term("field", "end"));
+                query.Add(new Term("field", "world"));
+                query.Add(new Term("field", "universe"));
+                query.Add(new Term("field", "right"));
+                query.LowFreqMinimumNumberShouldMatch = 0.49F;
+                TopDocs search = s.Search(query, 10);
+                assertEquals(search.TotalHits, 3);
+                assertEquals(@"0", r.Document(search.ScoreDocs[0].Doc).Get(@"id"));
+                assertEquals(@"2", r.Document(search.ScoreDocs[1].Doc).Get(@"id"));
+                assertEquals(@"3", r.Document(search.ScoreDocs[2].Doc).Get(@"id"));
+            }
+
+            {
+                CommonTermsQuery query = new CommonTermsQuery(BooleanClause.Occur.SHOULD, BooleanClause.Occur.SHOULD, Random().NextBoolean() ? 2F : 0.5F);
+                query.Add(new Term("field", "is"));
+                query.Add(new Term("field", "this"));
+                query.Add(new Term("field", "end"));
+                query.Add(new Term("field", "world"));
+                query.Add(new Term("field", "universe"));
+                query.Add(new Term("field", "right"));
+                query.LowFreqMinimumNumberShouldMatch = 1F;
+                TopDocs search = s.Search(query, 10);
+                assertEquals(search.TotalHits, 3);
+                assertEquals(@"0", r.Document(search.ScoreDocs[0].Doc).Get(@"id"));
+                assertEquals(@"2", r.Document(search.ScoreDocs[1].Doc).Get(@"id"));
+                assertEquals(@"3", r.Document(search.ScoreDocs[2].Doc).Get(@"id"));
+                assertTrue(search.ScoreDocs[1].Score > search.ScoreDocs[2].Score);
+            }
+
+            {
+                CommonTermsQuery query = new CommonTermsQuery(BooleanClause.Occur.SHOULD, BooleanClause.Occur.SHOULD, Random().NextBoolean() ? 2F : 0.5F);
+                query.Add(new Term("field", "is"));
+                query.Add(new Term("field", "this"));
+                query.Add(new Term("field", "end"));
+                query.Add(new Term("field", "world"));
+                query.Add(new Term("field", "universe"));
+                query.Add(new Term("field", "right"));
+                query.LowFreqMinimumNumberShouldMatch = 1F;
+                query.HighFreqMinimumNumberShouldMatch = 4F;
+                TopDocs search = s.Search(query, 10);
+                assertEquals(search.TotalHits, 3);
+                assertEquals(search.ScoreDocs[1].Score, search.ScoreDocs[2].Score, 0F);
+                assertEquals(@"0", r.Document(search.ScoreDocs[0].Doc).Get(@"id"));
+                assertEquals(new HashSet<string>(Arrays.AsList(@"2", @"3")), new HashSet<string>(Arrays.AsList(r.Document(search.ScoreDocs[1].Doc).Get(@"id"), r.Document(search.ScoreDocs[2].Doc).Get(@"id"))));
+            }
+
+            {
+                CommonTermsQuery query = new CommonTermsQuery(BooleanClause.Occur.SHOULD, BooleanClause.Occur.SHOULD, Random().NextBoolean() ? 2F : 0.5F);
+                query.Add(new Term("field", "is"));
+                query.Add(new Term("field", "this"));
+                query.Add(new Term("field", "the"));
+                query.LowFreqMinimumNumberShouldMatch = 1F;
+                query.HighFreqMinimumNumberShouldMatch = 2F;
+                TopDocs search = s.Search(query, 10);
+                assertEquals(search.TotalHits, 4);
+            }
+
+            {
+                CommonTermsQuery query = new CommonTermsQuery(BooleanClause.Occur.MUST, BooleanClause.Occur.SHOULD, Random().NextBoolean() ? 2F : 0.5F);
+                query.Add(new Term("field", "is"));
+                query.Add(new Term("field", "this"));
+                query.Add(new Term("field", "the"));
+                query.LowFreqMinimumNumberShouldMatch = 1F;
+                query.HighFreqMinimumNumberShouldMatch = 2F;
+                TopDocs search = s.Search(query, 10);
+                assertEquals(search.TotalHits, 2);
+                assertEquals(new HashSet<string>(Arrays.AsList(@"0", @"2")), new HashSet<string>(Arrays.AsList(r.Document(search.ScoreDocs[0].Doc).Get(@"id"), r.Document(search.ScoreDocs[1].Doc).Get(@"id"))));
+            }
+
+            r.Dispose();
+            w.Dispose();
+            dir.Dispose();
+        }
+
+        [Test]
+        public void TestIllegalOccur()
+        {
+            Random random = Random();
+            try
+            {
+                new CommonTermsQuery(BooleanClause.Occur.MUST_NOT, RandomOccur(random), Random().NextFloat());
+                Fail(@"MUST_NOT is not supproted");
+            }
+            catch (ArgumentException ex)
+            {
+            }
+
+            try
+            {
+                new CommonTermsQuery(RandomOccur(random), BooleanClause.Occur.MUST_NOT, Random().NextFloat());
+                Fail(@"MUST_NOT is not supproted");
+            }
+            catch (ArgumentException ex)
+            {
+            }
+        }
+
+        [Test]
+        public void TestExtend()
+        {
+            Directory dir = NewDirectory();
+            MockAnalyzer analyzer = new MockAnalyzer(Random());
+            RandomIndexWriter w = new RandomIndexWriter(Random(), dir, analyzer);
+            var docs = new string[]
+            {
+                @"this is the end of the world right", @"is this it or maybe not",
+                @"this is the end of the universe as we know it",
+                @"there is the famous restaurant at the end of the universe"
+            };
+
+            for (int i = 0; i < docs.Length; i++)
+            {
+                Document doc = new Document();
+                doc.Add(NewStringField(@"id", @"" + i, Field.Store.YES));
+                doc.Add(NewTextField(@"field", docs[i], Field.Store.NO));
+                w.AddDocument(doc);
+            }
+
+            IndexReader r = w.Reader;
+            IndexSearcher s = NewSearcher(r);
+            {
+                CommonTermsQuery query = new CommonTermsQuery(BooleanClause.Occur.SHOULD, BooleanClause.Occur.SHOULD, Random().NextBoolean() ? 2F : 0.5F);
+                query.Add(new Term("field", "is"));
+                query.Add(new Term("field", "this"));
+                query.Add(new Term("field", "end"));
+                query.Add(new Term("field", "world"));
+                query.Add(new Term("field", "universe"));
+                query.Add(new Term("field", "right"));
+                TopDocs search = s.Search(query, 10);
+                assertEquals(search.TotalHits, 3);
+                assertEquals(@"0", r.Document(search.ScoreDocs[0].Doc).Get(@"id"));
+                assertEquals(@"2", r.Document(search.ScoreDocs[1].Doc).Get(@"id"));
+                assertEquals(@"3", r.Document(search.ScoreDocs[2].Doc).Get(@"id"));
+            }
+
+            {
+                CommonTermsQuery query = new ExtendedCommonTermsQuery(BooleanClause.Occur.SHOULD, BooleanClause.Occur.SHOULD, Random().NextBoolean() ? 2F : 0.5F);
+                query.Add(new Term("field", "is"));
+                query.Add(new Term("field", "this"));
+                query.Add(new Term("field", "end"));
+                query.Add(new Term("field", "world"));
+                query.Add(new Term("field", "universe"));
+                query.Add(new Term("field", "right"));
+                TopDocs search = s.Search(query, 10);
+                assertEquals(search.TotalHits, 3);
+                assertEquals(@"2", r.Document(search.ScoreDocs[0].Doc).Get(@"id"));
+                assertEquals(@"3", r.Document(search.ScoreDocs[1].Doc).Get(@"id"));
+                assertEquals(@"0", r.Document(search.ScoreDocs[2].Doc).Get(@"id"));
+            }
+
+            r.Dispose();
+            w.Dispose();
+            dir.Dispose();
+        }
+
+        /*
+         * LUCENENET TODO requires a better comparator implementation for PriorityQueue
+        [Test]
+        public void TestRandomIndex()
+        {
+            Directory dir = NewDirectory();
+            MockAnalyzer analyzer = new MockAnalyzer(Random());
+            analyzer.MaxTokenLength = TestUtil.NextInt(Random(), 1, IndexWriter.MAX_TERM_LENGTH);
+            RandomIndexWriter w = new RandomIndexWriter(Random(), dir, analyzer);
+            CreateRandomIndex(AtLeast(50), w, Random().NextLong());
+            DirectoryReader reader = w.Reader;
+            AtomicReader wrapper = SlowCompositeReaderWrapper.Wrap(reader);
+            string field = @"body";
+            Terms terms = wrapper.Terms(field);
+            var lowFreqQueue = new AnonymousPriorityQueue(this, 5);
+            Util.PriorityQueue<TermAndFreq> highFreqQueue = new AnonymousPriorityQueue1(this, 5);
+            try
+            {
+                TermsEnum iterator = terms.Iterator(null);
+                while (iterator.Next() != null)
+                {
+                    if (highFreqQueue.Size() < 5)
+                    {
+                        highFreqQueue.Add(new TermAndFreq(BytesRef.DeepCopyOf(iterator.Term()), iterator.DocFreq()));
+                        lowFreqQueue.Add(new TermAndFreq(BytesRef.DeepCopyOf(iterator.Term()), iterator.DocFreq()));
+                    }
+                    else
+                    {
+                        if (highFreqQueue.Top().freq < iterator.DocFreq())
+                        {
+                            highFreqQueue.Top().freq = iterator.DocFreq();
+                            highFreqQueue.Top().term = BytesRef.DeepCopyOf(iterator.Term());
+                            highFreqQueue.UpdateTop();
+                        }
+
+                        if (lowFreqQueue.Top().freq > iterator.DocFreq())
+                        {
+                            lowFreqQueue.Top().freq = iterator.DocFreq();
+                            lowFreqQueue.Top().term = BytesRef.DeepCopyOf(iterator.Term());
+                            lowFreqQueue.UpdateTop();
+                        }
+                    }
+                }
+
+                int lowFreq = lowFreqQueue.Top().freq;
+                int highFreq = highFreqQueue.Top().freq;
+                AssumeTrue(@"unlucky index", highFreq - 1 > lowFreq);
+                List<TermAndFreq> highTerms = QueueToList(highFreqQueue);
+                List<TermAndFreq> lowTerms = QueueToList(lowFreqQueue);
+                IndexSearcher searcher = NewSearcher(reader);
+                BooleanClause.Occur lowFreqOccur = RandomOccur(Random());
+                BooleanQuery verifyQuery = new BooleanQuery();
+                CommonTermsQuery cq = new CommonTermsQuery(RandomOccur(Random()), lowFreqOccur, highFreq - 1, Random().NextBoolean());
+                foreach (TermAndFreq termAndFreq in lowTerms)
+                {
+                    cq.Add(new Term(field, termAndFreq.term));
+                    verifyQuery.Add(new BooleanClause(new TermQuery(new Term(field, termAndFreq.term)), lowFreqOccur));
+                }
+
+                foreach (TermAndFreq termAndFreq in highTerms)
+                {
+                    cq.Add(new Term(field, termAndFreq.term));
+                }
+
+                TopDocs cqSearch = searcher.Search(cq, reader.MaxDoc);
+                TopDocs verifySearch = searcher.Search(verifyQuery, reader.MaxDoc);
+                assertEquals(verifySearch.TotalHits, cqSearch.TotalHits);
+                var hits = new HashSet<int>();
+                foreach (ScoreDoc doc in verifySearch.ScoreDocs)
+                {
+                    hits.Add(doc.Doc);
+                }
+
+                foreach (ScoreDoc doc in cqSearch.ScoreDocs)
+                {
+                    assertTrue(hits.Remove(doc.Doc));
+                }
+
+                assertTrue(hits.IsEmpty());
+                w.ForceMerge(1);
+                DirectoryReader reader2 = w.Reader;
+                QueryUtils.Check(Random(), cq, NewSearcher(reader2));
+                reader2.Dispose();
+            }
+            finally
+            {
+                reader.Dispose();
+                wrapper.Dispose();
+                w.Dispose();
+                dir.Dispose();
+            }
+        }
+
+        private sealed class AnonymousPriorityQueue : Support.PriorityQueue<TermAndFreq>
+        {
+            public AnonymousPriorityQueue(CommonTermsQueryTest parent)
+            {
+                this.parent = parent;
+            }
+
+            private readonly CommonTermsQueryTest parent;
+            protected override bool LessThan(TermAndFreq a, TermAndFreq b)
+            {
+                return a.freq > b.freq;
+            }
+        }
+
+        private sealed class AnonymousPriorityQueue1 : Support.PriorityQueue<TermAndFreq>
+        {
+            public AnonymousPriorityQueue1(CommonTermsQueryTest parent)
+            {
+                this.parent = parent;
+            }
+
+            private readonly CommonTermsQueryTest parent;
+            protected override bool LessThan(TermAndFreq a, TermAndFreq b)
+            {
+                return a.freq < b.freq;
+            }
+        }*/
+
+        private static List<TermAndFreq> QueueToList(Util.PriorityQueue<TermAndFreq> queue)
+        {
+            var terms = new List<TermAndFreq>();
+            while (queue.Size() > 0)
+            {
+                terms.Add(queue.Pop());
+            }
+
+            return terms;
+        }
+
+        private class TermAndFreq : IComparable<TermAndFreq>
+        {
+            public BytesRef term;
+            public int freq;
+
+            public TermAndFreq(BytesRef term, int freq)
+            {
+                this.term = term;
+                this.freq = freq;
+            }
+
+            public int CompareTo(TermAndFreq other)
+            {
+                return term.CompareTo(other.term) + freq.CompareTo(other.freq);
+            }
+        }
+
+        public static void CreateRandomIndex(int numdocs, RandomIndexWriter writer, long seed)
+        {
+            Random random = new Random((int)seed);
+            // primary source for our data is from linefiledocs, its realistic.
+            LineFileDocs lineFileDocs = new LineFileDocs(random, false); // no docvalues in 4x
+            for (int i = 0; i < numdocs; i++)
+            {
+                writer.AddDocument(lineFileDocs.NextDoc());
+            }
+
+            lineFileDocs.Dispose();
+        }
+
+        private sealed class ExtendedCommonTermsQuery : CommonTermsQuery
+        {
+            public ExtendedCommonTermsQuery(BooleanClause.Occur highFreqOccur, BooleanClause.Occur lowFreqOccur, float maxTermFrequency)
+                : base(highFreqOccur, lowFreqOccur, maxTermFrequency)
+            {
+            }
+
+            protected override Query NewTermQuery(Term term, TermContext context)
+            {
+                Query query = base.NewTermQuery(term, context);
+                if (term.Text().Equals(@"universe"))
+                {
+                    query.Boost = 100F;
+                }
+
+                return query;
+            }
+        }
+    }
+}

http://git-wip-us.apache.org/repos/asf/lucenenet/blob/0471466e/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj
----------------------------------------------------------------------
diff --git a/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj b/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj
index bb48f5d..74afe8f 100644
--- a/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj
+++ b/src/Lucene.Net.Tests.Queries/Lucene.Net.Tests.Queries.csproj
@@ -43,6 +43,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="BooleanFilterTest.cs" />
+    <Compile Include="CommonTermsQueryTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="TermFilterTest.cs" />
   </ItemGroup>


[3/3] lucenenet git commit: Merge remote-tracking branch 'guidotag/Chand5'

Posted by sy...@apache.org.
Merge remote-tracking branch 'guidotag/Chand5'


Project: http://git-wip-us.apache.org/repos/asf/lucenenet/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucenenet/commit/71874969
Tree: http://git-wip-us.apache.org/repos/asf/lucenenet/tree/71874969
Diff: http://git-wip-us.apache.org/repos/asf/lucenenet/diff/71874969

Branch: refs/heads/master
Commit: 71874969cfa462c135a729c72c7160412f25d235
Parents: 0471466 3cf4277
Author: Itamar Syn-Hershko <it...@code972.com>
Authored: Mon Feb 9 22:06:38 2015 +0200
Committer: Itamar Syn-Hershko <it...@code972.com>
Committed: Mon Feb 9 22:06:38 2015 +0200

----------------------------------------------------------------------
 .../core/Index/TestDocInverterPerFieldErrorInfo.cs           | 2 +-
 src/Lucene.Net.Tests/core/Index/TestDocumentWriter.cs        | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------