You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sa...@apache.org on 2017/01/31 06:14:27 UTC
[1/4] lucene-solr:branch_6x: LUCENE-7670: AnalyzingInfixSuggester
should not immediately open an IndexWriter over an already-built index
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6x 958d38ec6 -> 967b66fb5
refs/heads/master 71abe1306 -> 338615279
LUCENE-7670: AnalyzingInfixSuggester should not immediately open an IndexWriter over an already-built index
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/dbcfe698
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/dbcfe698
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/dbcfe698
Branch: refs/heads/branch_6x
Commit: dbcfe698706fc2a87199f913bfd2185147b75e62
Parents: 958d38e
Author: Steve Rowe <sa...@apache.org>
Authored: Tue Jan 31 01:06:43 2017 -0500
Committer: Steve Rowe <sa...@apache.org>
Committed: Tue Jan 31 01:07:17 2017 -0500
----------------------------------------------------------------------
.../suggest/analyzing/AnalyzingInfixSuggester.java | 4 +---
.../suggest/analyzing/AnalyzingInfixSuggesterTest.java | 13 ++++++++++++-
2 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/dbcfe698/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
----------------------------------------------------------------------
diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
index eb6c885..614d6c8 100644
--- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
+++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
@@ -249,9 +249,7 @@ public class AnalyzingInfixSuggester extends Lookup implements Closeable {
if (DirectoryReader.indexExists(dir)) {
// Already built; open it:
- writer = new IndexWriter(dir,
- getIndexWriterConfig(getGramAnalyzer(), IndexWriterConfig.OpenMode.APPEND));
- searcherMgr = new SearcherManager(writer, null);
+ searcherMgr = new SearcherManager(dir, null);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/dbcfe698/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java
----------------------------------------------------------------------
diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java
index fc5e2b7..478358b 100644
--- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java
+++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java
@@ -1360,7 +1360,8 @@ public class AnalyzingInfixSuggesterTest extends LuceneTestCase {
// * SearcherManager's IndexWriter reference should be closed
// (as evidenced by maybeRefreshBlocking() throwing AlreadyClosedException)
Analyzer a = new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false);
- MyAnalyzingInfixSuggester suggester = new MyAnalyzingInfixSuggester(newDirectory(), a, a, 3, false,
+ Path tempDir = createTempDir("analyzingInfixContext");
+ final MyAnalyzingInfixSuggester suggester = new MyAnalyzingInfixSuggester(newFSDirectory(tempDir), a, a, 3, false,
AnalyzingInfixSuggester.DEFAULT_ALL_TERMS_REQUIRED, AnalyzingInfixSuggester.DEFAULT_HIGHLIGHT, true);
suggester.build(new InputArrayIterator(sharedInputs));
assertNull(suggester.getIndexWriter());
@@ -1368,6 +1369,16 @@ public class AnalyzingInfixSuggesterTest extends LuceneTestCase {
expectThrows(AlreadyClosedException.class, () -> suggester.getSearcherManager().maybeRefreshBlocking());
suggester.close();
+
+ // After instantiating from an already-built suggester dir:
+ // * The IndexWriter should be null
+ // * The SearcherManager should be non-null
+ final MyAnalyzingInfixSuggester suggester2 = new MyAnalyzingInfixSuggester(newFSDirectory(tempDir), a, a, 3, false,
+ AnalyzingInfixSuggester.DEFAULT_ALL_TERMS_REQUIRED, AnalyzingInfixSuggester.DEFAULT_HIGHLIGHT, true);
+ assertNull(suggester2.getIndexWriter());
+ assertNotNull(suggester2.getSearcherManager());
+
+ suggester2.close();
a.close();
}
[4/4] lucene-solr:master: LUCENE-7670: changes entry
Posted by sa...@apache.org.
LUCENE-7670: changes entry
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/33861527
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/33861527
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/33861527
Branch: refs/heads/master
Commit: 33861527914770b556528b66c90bc6ed421c2034
Parents: c1fe88b
Author: Steve Rowe <sa...@apache.org>
Authored: Tue Jan 31 01:12:58 2017 -0500
Committer: Steve Rowe <sa...@apache.org>
Committed: Tue Jan 31 01:13:23 2017 -0500
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/33861527/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 8d1eb21..7469012 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -108,6 +108,9 @@ Bug Fixes
* LUCENE-7630: Fix (Edge)NGramTokenFilter to no longer drop payloads
and preserve all attributes. (Nathan Gass via Uwe Schindler)
+* LUCENE-7670: AnalyzingInfixSuggester should not immediately open an
+ IndexWriter over an already-built index. (Steve Rowe)
+
Improvements
* LUCENE-7055: Added Weight#scorerSupplier, which allows to estimate the cost
[3/4] lucene-solr:master: LUCENE-7670: AnalyzingInfixSuggester should
not immediately open an IndexWriter over an already-built index
Posted by sa...@apache.org.
LUCENE-7670: AnalyzingInfixSuggester should not immediately open an IndexWriter over an already-built index
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/c1fe88b7
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/c1fe88b7
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/c1fe88b7
Branch: refs/heads/master
Commit: c1fe88b7c6fa861d5101f9702a7832d29b8032ee
Parents: 71abe13
Author: Steve Rowe <sa...@apache.org>
Authored: Tue Jan 31 01:06:43 2017 -0500
Committer: Steve Rowe <sa...@apache.org>
Committed: Tue Jan 31 01:13:11 2017 -0500
----------------------------------------------------------------------
.../suggest/analyzing/AnalyzingInfixSuggester.java | 4 +---
.../suggest/analyzing/AnalyzingInfixSuggesterTest.java | 13 ++++++++++++-
2 files changed, 13 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c1fe88b7/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
----------------------------------------------------------------------
diff --git a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
index 81880d4..0ca81c7 100644
--- a/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
+++ b/lucene/suggest/src/java/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggester.java
@@ -249,9 +249,7 @@ public class AnalyzingInfixSuggester extends Lookup implements Closeable {
if (DirectoryReader.indexExists(dir)) {
// Already built; open it:
- writer = new IndexWriter(dir,
- getIndexWriterConfig(getGramAnalyzer(), IndexWriterConfig.OpenMode.APPEND));
- searcherMgr = new SearcherManager(writer, null);
+ searcherMgr = new SearcherManager(dir, null);
}
}
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/c1fe88b7/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java
----------------------------------------------------------------------
diff --git a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java
index fc5e2b7..478358b 100644
--- a/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java
+++ b/lucene/suggest/src/test/org/apache/lucene/search/suggest/analyzing/AnalyzingInfixSuggesterTest.java
@@ -1360,7 +1360,8 @@ public class AnalyzingInfixSuggesterTest extends LuceneTestCase {
// * SearcherManager's IndexWriter reference should be closed
// (as evidenced by maybeRefreshBlocking() throwing AlreadyClosedException)
Analyzer a = new MockAnalyzer(random(), MockTokenizer.WHITESPACE, false);
- MyAnalyzingInfixSuggester suggester = new MyAnalyzingInfixSuggester(newDirectory(), a, a, 3, false,
+ Path tempDir = createTempDir("analyzingInfixContext");
+ final MyAnalyzingInfixSuggester suggester = new MyAnalyzingInfixSuggester(newFSDirectory(tempDir), a, a, 3, false,
AnalyzingInfixSuggester.DEFAULT_ALL_TERMS_REQUIRED, AnalyzingInfixSuggester.DEFAULT_HIGHLIGHT, true);
suggester.build(new InputArrayIterator(sharedInputs));
assertNull(suggester.getIndexWriter());
@@ -1368,6 +1369,16 @@ public class AnalyzingInfixSuggesterTest extends LuceneTestCase {
expectThrows(AlreadyClosedException.class, () -> suggester.getSearcherManager().maybeRefreshBlocking());
suggester.close();
+
+ // After instantiating from an already-built suggester dir:
+ // * The IndexWriter should be null
+ // * The SearcherManager should be non-null
+ final MyAnalyzingInfixSuggester suggester2 = new MyAnalyzingInfixSuggester(newFSDirectory(tempDir), a, a, 3, false,
+ AnalyzingInfixSuggester.DEFAULT_ALL_TERMS_REQUIRED, AnalyzingInfixSuggester.DEFAULT_HIGHLIGHT, true);
+ assertNull(suggester2.getIndexWriter());
+ assertNotNull(suggester2.getSearcherManager());
+
+ suggester2.close();
a.close();
}
[2/4] lucene-solr:branch_6x: LUCENE-7670: changes entry
Posted by sa...@apache.org.
LUCENE-7670: changes entry
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/967b66fb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/967b66fb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/967b66fb
Branch: refs/heads/branch_6x
Commit: 967b66fb5bf08c876632ada63751027b8efce5dc
Parents: dbcfe69
Author: Steve Rowe <sa...@apache.org>
Authored: Tue Jan 31 01:12:58 2017 -0500
Committer: Steve Rowe <sa...@apache.org>
Committed: Tue Jan 31 01:12:58 2017 -0500
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/967b66fb/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 22fa043..da6c626 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -50,6 +50,9 @@ Bug Fixes
* LUCENE-7630: Fix (Edge)NGramTokenFilter to no longer drop payloads
and preserve all attributes. (Nathan Gass via Uwe Schindler)
+* LUCENE-7670: AnalyzingInfixSuggester should not immediately open an
+ IndexWriter over an already-built index. (Steve Rowe)
+
Improvements
* LUCENE-7055: Added Weight#scorerSupplier, which allows to estimate the cost