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 13:21:45 UTC
[1/4] lucene-solr:branch_6_4: LUCENE-7670: AnalyzingInfixSuggester
should not immediately open an IndexWriter over an already-built index
Repository: lucene-solr
Updated Branches:
refs/heads/branch_6_4 ed4eee024 -> 8ce4ffc4f
refs/heads/branch_6x a8b1c8ba0 -> 0acddf44e
refs/heads/master d9edc0b74 -> 2e651010f
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/5cee247c
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/5cee247c
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/5cee247c
Branch: refs/heads/branch_6_4
Commit: 5cee247c4634dc7d70e2cec5eecfd04a38bcf1a8
Parents: ed4eee0
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 08:16:50 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/5cee247c/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/5cee247c/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();
}
[3/4] lucene-solr:master: LUCENE-7670: move changes entry under 6.4.1
Posted by sa...@apache.org.
LUCENE-7670: move changes entry under 6.4.1
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2e651010
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2e651010
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2e651010
Branch: refs/heads/master
Commit: 2e651010fc6e1fc09323363ecd77d07905526df5
Parents: d9edc0b
Author: Steve Rowe <sa...@apache.org>
Authored: Tue Jan 31 08:20:04 2017 -0500
Committer: Steve Rowe <sa...@apache.org>
Committed: Tue Jan 31 08:20:04 2017 -0500
----------------------------------------------------------------------
lucene/CHANGES.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2e651010/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 7469012..363e2bd 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -108,9 +108,6 @@ 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
@@ -173,6 +170,9 @@ Bug Fixes
configured with BEST_COMPRESSION. This could otherwise result in out-of-memory
issues. (Adrien Grand)
+* LUCENE-7670: AnalyzingInfixSuggester should not immediately open an
+ IndexWriter over an already-built index. (Steve Rowe)
+
======================= Lucene 6.4.0 =======================
API Changes
[2/4] lucene-solr:branch_6_4: 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/8ce4ffc4
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/8ce4ffc4
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/8ce4ffc4
Branch: refs/heads/branch_6_4
Commit: 8ce4ffc4f92ba9623a61bdcdbc9cafbdfdc3e4bd
Parents: 5cee247
Author: Steve Rowe <sa...@apache.org>
Authored: Tue Jan 31 08:18:26 2017 -0500
Committer: Steve Rowe <sa...@apache.org>
Committed: Tue Jan 31 08:18:26 2017 -0500
----------------------------------------------------------------------
lucene/CHANGES.txt | 3 +++
1 file changed, 3 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/8ce4ffc4/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index 4b87106..04336f2 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -20,6 +20,9 @@ Bug Fixes
* LUCENE-7647: Made stored fields reclaim native memory more aggressively when
configured with BEST_COMPRESSION. This could otherwise result in out-of-memory
issues. (Adrien Grand)
+
+* LUCENE-7670: AnalyzingInfixSuggester should not immediately open an
+ IndexWriter over an already-built index. (Steve Rowe)
======================= Lucene 6.4.0 =======================
[4/4] lucene-solr:branch_6x: LUCENE-7670: move changes entry under
6.4.1
Posted by sa...@apache.org.
LUCENE-7670: move changes entry under 6.4.1
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0acddf44
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0acddf44
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0acddf44
Branch: refs/heads/branch_6x
Commit: 0acddf44e670627a70daabf645159b873b79bd9d
Parents: a8b1c8b
Author: Steve Rowe <sa...@apache.org>
Authored: Tue Jan 31 08:20:04 2017 -0500
Committer: Steve Rowe <sa...@apache.org>
Committed: Tue Jan 31 08:20:47 2017 -0500
----------------------------------------------------------------------
lucene/CHANGES.txt | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0acddf44/lucene/CHANGES.txt
----------------------------------------------------------------------
diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt
index da6c626..b8c29ff 100644
--- a/lucene/CHANGES.txt
+++ b/lucene/CHANGES.txt
@@ -50,9 +50,6 @@ 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
@@ -115,6 +112,9 @@ Bug Fixes
configured with BEST_COMPRESSION. This could otherwise result in out-of-memory
issues. (Adrien Grand)
+* LUCENE-7670: AnalyzingInfixSuggester should not immediately open an
+ IndexWriter over an already-built index. (Steve Rowe)
+
======================= Lucene 6.4.0 =======================
API Changes