You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by jp...@apache.org on 2017/02/28 10:55:07 UTC
[1/2] lucene-solr:master: Avoid infinite loop in TestFuzzyQuery.
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x c79f670e9 -> da41b0e74
refs/heads/master 04ba9968c -> b6c5a8a0c
Avoid infinite loop in TestFuzzyQuery.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/b6c5a8a0
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/b6c5a8a0
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/b6c5a8a0
Branch: refs/heads/master
Commit: b6c5a8a0c1c6b93b36a57921b06346b577251439
Parents: 04ba996
Author: Adrien Grand <jp...@gmail.com>
Authored: Tue Feb 28 11:53:50 2017 +0100
Committer: Adrien Grand <jp...@gmail.com>
Committed: Tue Feb 28 11:53:50 2017 +0100
----------------------------------------------------------------------
.../core/src/test/org/apache/lucene/search/TestFuzzyQuery.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/b6c5a8a0/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java
index 62e63ea..ebaf3c0 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java
@@ -510,8 +510,11 @@ public class TestFuzzyQuery extends LuceneTestCase {
@SuppressWarnings({"unchecked","rawtypes"})
public void testRandom() throws Exception {
- int numTerms = atLeast(100);
int digits = TestUtil.nextInt(random(), 2, 3);
+ // underestimated total number of unique terms that randomSimpleString
+ // maybe generate, it assumes all terms have a length of 7
+ int vocabularySize = digits << 7;
+ int numTerms = Math.min(atLeast(100), vocabularySize);
Set<String> terms = new HashSet<>();
while (terms.size() < numTerms) {
terms.add(randomSimpleString(digits));
[2/2] lucene-solr:branch_6x: Avoid infinite loop in TestFuzzyQuery.
Posted by jp...@apache.org.
Avoid infinite loop in TestFuzzyQuery.
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/da41b0e7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/da41b0e7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/da41b0e7
Branch: refs/heads/branch_6x
Commit: da41b0e74e4026c595d368c148bee963031f3cb2
Parents: c79f670
Author: Adrien Grand <jp...@gmail.com>
Authored: Tue Feb 28 11:53:50 2017 +0100
Committer: Adrien Grand <jp...@gmail.com>
Committed: Tue Feb 28 11:54:44 2017 +0100
----------------------------------------------------------------------
.../core/src/test/org/apache/lucene/search/TestFuzzyQuery.java | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/da41b0e7/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java
----------------------------------------------------------------------
diff --git a/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java b/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java
index 62e63ea..ebaf3c0 100644
--- a/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java
+++ b/lucene/core/src/test/org/apache/lucene/search/TestFuzzyQuery.java
@@ -510,8 +510,11 @@ public class TestFuzzyQuery extends LuceneTestCase {
@SuppressWarnings({"unchecked","rawtypes"})
public void testRandom() throws Exception {
- int numTerms = atLeast(100);
int digits = TestUtil.nextInt(random(), 2, 3);
+ // underestimated total number of unique terms that randomSimpleString
+ // maybe generate, it assumes all terms have a length of 7
+ int vocabularySize = digits << 7;
+ int numTerms = Math.min(atLeast(100), vocabularySize);
Set<String> terms = new HashSet<>();
while (terms.size() < numTerms) {
terms.add(randomSimpleString(digits));