You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/05/09 14:05:24 UTC
svn commit: r1593520 - in /lucene/dev/branches/lucene_solr_4_8: ./ lucene/
lucene/core/ lucene/core/src/java/org/apache/lucene/index/
lucene/test-framework/ lucene/test-framework/src/java/org/apache/lucene/util/
Author: rmuir
Date: Fri May 9 12:05:23 2014
New Revision: 1593520
URL: http://svn.apache.org/r1593520
Log:
sync the buggy methods in LiveIWC, instead of all operations from all RIWs...
Modified:
lucene/dev/branches/lucene_solr_4_8/ (props changed)
lucene/dev/branches/lucene_solr_4_8/lucene/ (props changed)
lucene/dev/branches/lucene_solr_4_8/lucene/core/ (props changed)
lucene/dev/branches/lucene_solr_4_8/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java
lucene/dev/branches/lucene_solr_4_8/lucene/test-framework/ (props changed)
lucene/dev/branches/lucene_solr_4_8/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
Modified: lucene/dev/branches/lucene_solr_4_8/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_8/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java?rev=1593520&r1=1593519&r2=1593520&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_8/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java (original)
+++ lucene/dev/branches/lucene_solr_4_8/lucene/core/src/java/org/apache/lucene/index/LiveIndexWriterConfig.java Fri May 9 12:05:23 2014
@@ -318,7 +318,7 @@ public class LiveIndexWriterConfig {
* if ramBufferSize is enabled but non-positive, or it disables
* ramBufferSize when maxBufferedDocs is already disabled
*/
- public LiveIndexWriterConfig setRAMBufferSizeMB(double ramBufferSizeMB) {
+ public synchronized LiveIndexWriterConfig setRAMBufferSizeMB(double ramBufferSizeMB) {
if (ramBufferSizeMB != IndexWriterConfig.DISABLE_AUTO_FLUSH && ramBufferSizeMB <= 0.0) {
throw new IllegalArgumentException("ramBufferSize should be > 0.0 MB when enabled");
}
@@ -359,7 +359,7 @@ public class LiveIndexWriterConfig {
* if maxBufferedDocs is enabled but smaller than 2, or it disables
* maxBufferedDocs when ramBufferSize is already disabled
*/
- public LiveIndexWriterConfig setMaxBufferedDocs(int maxBufferedDocs) {
+ public synchronized LiveIndexWriterConfig setMaxBufferedDocs(int maxBufferedDocs) {
if (maxBufferedDocs != IndexWriterConfig.DISABLE_AUTO_FLUSH && maxBufferedDocs < 2) {
throw new IllegalArgumentException("maxBufferedDocs must at least be 2 when enabled");
}
Modified: lucene/dev/branches/lucene_solr_4_8/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene_solr_4_8/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java?rev=1593520&r1=1593519&r2=1593520&view=diff
==============================================================================
--- lucene/dev/branches/lucene_solr_4_8/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java (original)
+++ lucene/dev/branches/lucene_solr_4_8/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java Fri May 9 12:05:23 2014
@@ -1005,7 +1005,7 @@ public abstract class LuceneTestCase ext
}
// if you want it in LiveIndexWriterConfig: it must and will be tested here.
- public static synchronized void maybeChangeLiveIndexWriterConfig(Random r, LiveIndexWriterConfig c) {
+ public static void maybeChangeLiveIndexWriterConfig(Random r, LiveIndexWriterConfig c) {
boolean didChange = false;
if (rarely(r)) {