Re: svn commit: r1244000 - in /lucene/dev/trunk: ./ lucene/ lucene/core/src/java/org/apache/lucene/search/ lucene/core/src/test/org/apache/lucene/search/ lucene/test-framework/src/java/org/apache/luce
shai, seems like you missed the CHANGES.TXT from branch_3x?
simon
On Tue, Feb 14, 2012 at 4:36 PM, sh...@apache.org wrote:
Author: shaie
Date: Tue Feb 14 15:36:14 2012
New Revision: 1244000
URL: http://svn.apache.org/viewvc?rev=1244000view=rev
Log:
LUCENE-3761: generalize SearcherManager (port to trunk)
Added:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ReferenceManager.java
- copied unchanged from r1243906,
lucene/dev/branches/branch_3x/lucene/core/src/java/org/apache/lucene/search/ReferenceManager.java
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/lucene/ (props changed)
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NRTManager.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java
Modified:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NRTManager.java
URL:
http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NRTManager.java?rev=1244000r1=1243999r2=1244000view=diff
==
---
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NRTManager.java
(original)
+++
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NRTManager.java
Tue Feb 14 15:36:14 2012
@@ -343,7 +343,7 @@ public class NRTManager implements Close
}
boolean setSearchGen;
if (!mgr.isSearcherCurrent()) {
- setSearchGen = mgr.maybeReopen();
+ setSearchGen = mgr.maybeRefresh();
} else {
setSearchGen = true;
}
Modified:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java
URL:
http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java?rev=1244000r1=1243999r2=1244000view=diff
==
---
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java
(original)
+++
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java
Tue Feb 14 15:36:14 2012
@@ -17,17 +17,11 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import java.io.Closeable;
import java.io.IOException;
-import java.util.concurrent.Semaphore;
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.search.NRTManager; // javadocs
-import org.apache.lucene.search.IndexSearcher; // javadocs
-import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.Directory;
/**
@@ -51,42 +45,40 @@ import org.apache.lucene.store.Directory
* /pre
*
* p
- * In addition you should periodically call {@link #maybeReopen}. While it's
+ * In addition you should periodically call {@link #maybeRefresh}. While it's
* possible to call this just before running each query, this is discouraged
* since it penalizes the unlucky queries that do the reopen. It's better to
use
* a separate background thread, that periodically calls maybeReopen. Finally,
* be sure to call {@link #close} once you are done.
*
- * p
- * bNOTE/b: if you have an {@link IndexWriter}, it's better to use
- * {@link NRTManager} since that class pulls near-real-time readers from the
- * IndexWriter.
- *
* @see SearcherFactory
*
* @lucene.experimental
*/
+public final class SearcherManager extends ReferenceManagerIndexSearcher {
-public final class SearcherManager implements Closeable {
-
- private volatile IndexSearcher currentSearcher;
private final SearcherFactory searcherFactory;
- private final Semaphore reopenLock = new Semaphore(1);
-
+
/**
- * Creates and returns a new SearcherManager from the given {@link
IndexWriter}.
- * @param writer the IndexWriter to open the IndexReader from.
- * @param applyAllDeletes If codetrue/code, all buffered deletes will
- * be applied (made visible) in the {@link IndexSearcher} / {@link
DirectoryReader}.
- * If codefalse/code, the deletes may or may not be applied,
but remain buffered
- * (in IndexWriter) so that they will be applied in the future.
- * Applying deletes can be costly, so if your app can tolerate
deleted documents
- * being returned you might gain some performance by passing
codefalse/code.
- * See {@link DirectoryReader#openIfChanged(DirectoryReader,
IndexWriter, boolean)}.
- * @param searcherFactory An optional {@link SearcherFactory}. Pass
-
Re: svn commit: r1244000 - in /lucene/dev/trunk: ./ lucene/ lucene/core/src/java/org/apache/lucene/search/ lucene/core/src/test/org/apache/lucene/search/ lucene/test-framework/src/java/org/apache/luce
I wasn't sure if the CHANGES is needed in trunk as well, since the change
was also done in 3x ... so I asked Robert and he said that he doesn't think
that we need an entry in trunk as well, which makes sense to me because
trunk is not yet released ..
What's our policy about this? because I keep asking myself in every commit
whether I need to port CHANGES to trunk too ...
Shai
On Tue, Feb 14, 2012 at 6:18 PM, Simon Willnauer
simon.willna...@googlemail.com wrote:
shai, seems like you missed the CHANGES.TXT from branch_3x?
simon
On Tue, Feb 14, 2012 at 4:36 PM, sh...@apache.org wrote:
Author: shaie
Date: Tue Feb 14 15:36:14 2012
New Revision: 1244000
URL: http://svn.apache.org/viewvc?rev=1244000view=rev
Log:
LUCENE-3761: generalize SearcherManager (port to trunk)
Added:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ReferenceManager.java
- copied unchanged from r1243906,
lucene/dev/branches/branch_3x/lucene/core/src/java/org/apache/lucene/search/ReferenceManager.java
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/lucene/ (props changed)
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NRTManager.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java
Modified:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NRTManager.java
URL:
http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NRTManager.java?rev=1244000r1=1243999r2=1244000view=diff
==
---
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NRTManager.java
(original)
+++
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NRTManager.java
Tue Feb 14 15:36:14 2012
@@ -343,7 +343,7 @@ public class NRTManager implements Close
}
boolean setSearchGen;
if (!mgr.isSearcherCurrent()) {
- setSearchGen = mgr.maybeReopen();
+ setSearchGen = mgr.maybeRefresh();
} else {
setSearchGen = true;
}
Modified:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java
URL:
http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java?rev=1244000r1=1243999r2=1244000view=diff
==
---
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java
(original)
+++
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java
Tue Feb 14 15:36:14 2012
@@ -17,17 +17,11 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import java.io.Closeable;
import java.io.IOException;
-import java.util.concurrent.Semaphore;
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.search.NRTManager; // javadocs
-import org.apache.lucene.search.IndexSearcher; // javadocs
-import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.Directory;
/**
@@ -51,42 +45,40 @@ import org.apache.lucene.store.Directory
* /pre
*
* p
- * In addition you should periodically call {@link #maybeReopen}. While
it's
+ * In addition you should periodically call {@link #maybeRefresh}.
While it's
* possible to call this just before running each query, this is
discouraged
* since it penalizes the unlucky queries that do the reopen. It's
better to use
* a separate background thread, that periodically calls maybeReopen.
Finally,
* be sure to call {@link #close} once you are done.
*
- * p
- * bNOTE/b: if you have an {@link IndexWriter}, it's better to use
- * {@link NRTManager} since that class pulls near-real-time readers
from the
- * IndexWriter.
- *
* @see SearcherFactory
*
* @lucene.experimental
*/
+public final class SearcherManager extends
ReferenceManagerIndexSearcher {
-public final class SearcherManager implements Closeable {
-
- private volatile IndexSearcher currentSearcher;
private final SearcherFactory searcherFactory;
- private final Semaphore reopenLock = new Semaphore(1);
-
+
/**
- * Creates and returns a new SearcherManager from the given {@link
IndexWriter}.
- * @param writer the IndexWriter to open the IndexReader from.
- * @param applyAllDeletes If codetrue/code, all buffered deletes
will
- *be applied (made visible) in the {@link IndexSearcher} /
RE: svn commit: r1244000 - in /lucene/dev/trunk: ./ lucene/ lucene/core/src/java/org/apache/lucene/search/ lucene/core/src/test/org/apache/lucene/search/ lucene/test-framework/src/java/org/apache/luce
When you merge from 3.x to trunk or the other way round it will
automatically merge the entries. Most of us always merge also the changes.
E.g. if I do a change that's released for the first time in 3.x, I do the
change first on trunk, but already put it in trunk into the changes. Then I
merge to 3.x and all is fine, no conflicts, always works.
I am not sure why you always fix bugs on 3.x and then merge to trunk, but
that should not matter for that.
Uwe
-
Uwe Schindler
H.-H.-Meier-Allee 63, D-28213 Bremen
http://www.thetaphi.de/ http://www.thetaphi.de
eMail: u...@thetaphi.de
From: Shai Erera [mailto:ser...@gmail.com]
Sent: Tuesday, February 14, 2012 6:19 PM
To: dev@lucene.apache.org; simon.willna...@gmail.com
Subject: Re: svn commit: r1244000 - in /lucene/dev/trunk: ./ lucene/
lucene/core/src/java/org/apache/lucene/search/
lucene/core/src/test/org/apache/lucene/search/
lucene/test-framework/src/java/org/apache/lucene/search/
I wasn't sure if the CHANGES is needed in trunk as well, since the change
was also done in 3x ... so I asked Robert and he said that he doesn't think
that we need an entry in trunk as well, which makes sense to me because
trunk is not yet released ..
What's our policy about this? because I keep asking myself in every commit
whether I need to port CHANGES to trunk too ...
Shai
On Tue, Feb 14, 2012 at 6:18 PM, Simon Willnauer
simon.willna...@googlemail.com wrote:
shai, seems like you missed the CHANGES.TXT from branch_3x?
simon
On Tue, Feb 14, 2012 at 4:36 PM, sh...@apache.org wrote:
Author: shaie
Date: Tue Feb 14 15:36:14 2012
New Revision: 1244000
URL: http://svn.apache.org/viewvc?rev=1244000
http://svn.apache.org/viewvc?rev=1244000view=rev view=rev
Log:
LUCENE-3761: generalize SearcherManager (port to trunk)
Added:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ReferenceMana
ger.java
- copied unchanged from r1243906,
lucene/dev/branches/branch_3x/lucene/core/src/java/org/apache/lucene/search/
ReferenceManager.java
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/lucene/ (props changed)
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NRTManager.ja
va
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SearcherManag
er.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearcherM
anager.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/Sha
rdSearchingTestBase.java
Modified:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NRTManager.ja
va
URL:
http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apach
e/lucene/search/NRTManager.java?rev=1244000
http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apac
he/lucene/search/NRTManager.java?rev=1244000r1=1243999r2=1244000view=diff
r1=1243999r2=1244000view=diff
==
---
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NRTManager.ja
va (original)
+++
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NRTManager.ja
va Tue Feb 14 15:36:14 2012
@@ -343,7 +343,7 @@ public class NRTManager implements Close
}
boolean setSearchGen;
if (!mgr.isSearcherCurrent()) {
- setSearchGen = mgr.maybeReopen();
+ setSearchGen = mgr.maybeRefresh();
} else {
setSearchGen = true;
}
Modified:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SearcherManag
er.java
URL:
http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apach
e/lucene/search/SearcherManager.java?rev=1244000
http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apac
he/lucene/search/SearcherManager.java?rev=1244000r1=1243999r2=1244000view
=diff r1=1243999r2=1244000view=diff
==
---
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SearcherManag
er.java (original)
+++
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SearcherManag
er.java Tue Feb 14 15:36:14 2012
@@ -17,17 +17,11 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import java.io.Closeable;
import java.io.IOException;
-import java.util.concurrent.Semaphore;
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexWriter;
-import org.apache.lucene.search.NRTManager; // javadocs
-import org.apache.lucene.search.IndexSearcher; // javadocs
-import org.apache.lucene.store.AlreadyClosedException;
import org.apache.lucene.store.Directory;
/**
@@ -51,42 +45,40 @@ import org.apache.lucene.store.Directory
* /pre
*
* p
- * In addition you should periodically call {@link #maybeReopen}. While
it's
+ * In addition you
Re: svn commit: r1244000 - in /lucene/dev/trunk: ./ lucene/ lucene/core/src/java/org/apache/lucene/search/ lucene/core/src/test/org/apache/lucene/search/ lucene/test-framework/src/java/org/apache/luce
Ok I will merge the CHANGES also. I 'svn merge' and then remove the CHANGES
stuff on purpose because I think it is redundant to have them twice. I.e.,
anyone who will upgrade from 3.6 to 4.0 will already know about these
changes, and reading them again in the CHANGES section for trunk seems
confusing to me.
I am not sure why you always fix bugs on 3.x and then merge to trunk
That is just a matter of convenience to me. Since I work with 3.x releases
and not trunk, it's much easier for me to fix stuff on 3x, test it with my
apps, and then port the changes to trunk.
Shai
On Tue, Feb 14, 2012 at 7:31 PM, Uwe Schindler u...@thetaphi.de wrote:
When you merge from 3.x to trunk or the other way round it will
automatically merge the entries. Most of us always merge also the changes.
E.g. if I do a change that’s released for the first time in 3.x, I do the
change first on trunk, but already put it in trunk into the changes. Then I
merge to 3.x and all is fine, no conflicts, always works.
** **
I am not sure why you always fix bugs on 3.x and then merge to trunk, but
that should not matter for that.
** **
Uwe
** **
-
Uwe Schindler
H.-H.-Meier-Allee 63, D-28213 Bremen
http://www.thetaphi.de
eMail: u...@thetaphi.de
** **
*From:* Shai Erera [mailto:ser...@gmail.com]
*Sent:* Tuesday, February 14, 2012 6:19 PM
*To:* dev@lucene.apache.org; simon.willna...@gmail.com
*Subject:* Re: svn commit: r1244000 - in /lucene/dev/trunk: ./ lucene/
lucene/core/src/java/org/apache/lucene/search/
lucene/core/src/test/org/apache/lucene/search/
lucene/test-framework/src/java/org/apache/lucene/search/
** **
I wasn't sure if the CHANGES is needed in trunk as well, since the change
was also done in 3x ... so I asked Robert and he said that he doesn't think
that we need an entry in trunk as well, which makes sense to me because
trunk is not yet released ..
What's our policy about this? because I keep asking myself in every commit
whether I need to port CHANGES to trunk too ...
Shai
On Tue, Feb 14, 2012 at 6:18 PM, Simon Willnauer
simon.willna...@googlemail.com wrote:
shai, seems like you missed the CHANGES.TXT from branch_3x?
simon
On Tue, Feb 14, 2012 at 4:36 PM, sh...@apache.org wrote:
Author: shaie
Date: Tue Feb 14 15:36:14 2012
New Revision: 1244000
URL: http://svn.apache.org/viewvc?rev=1244000view=rev
Log:
LUCENE-3761: generalize SearcherManager (port to trunk)
Added:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/ReferenceManager.java
- copied unchanged from r1243906,
lucene/dev/branches/branch_3x/lucene/core/src/java/org/apache/lucene/search/ReferenceManager.java
Modified:
lucene/dev/trunk/ (props changed)
lucene/dev/trunk/lucene/ (props changed)
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NRTManager.java
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java
lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/search/TestSearcherManager.java
lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/search/ShardSearchingTestBase.java
Modified:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NRTManager.java
URL:
http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NRTManager.java?rev=1244000r1=1243999r2=1244000view=diff
==
---
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NRTManager.java
(original)
+++
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/NRTManager.java
Tue Feb 14 15:36:14 2012
@@ -343,7 +343,7 @@ public class NRTManager implements Close
}
boolean setSearchGen;
if (!mgr.isSearcherCurrent()) {
- setSearchGen = mgr.maybeReopen();
+ setSearchGen = mgr.maybeRefresh();
} else {
setSearchGen = true;
}
Modified:
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java
URL:
http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java?rev=1244000r1=1243999r2=1244000view=diff
==
---
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java
(original)
+++
lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/search/SearcherManager.java
Tue Feb 14 15:36:14 2012
@@ -17,17 +17,11 @@ package org.apache.lucene.search;
* limitations under the License.
*/
-import java.io.Closeable;
import java.io.IOException;
-import java.util.concurrent.Semaphore;
-import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.DirectoryReader;
import
