diff --git a/dev-tools/eclipse/dot.classpath b/dev-tools/eclipse/dot.classpath index f8deb2d..7ce58c5 100644 --- a/dev-tools/eclipse/dot.classpath +++ b/dev-tools/eclipse/dot.classpath @@ -168,7 +168,7 @@ - + diff --git a/dev-tools/idea/.idea/libraries/JUnit.xml b/dev-tools/idea/.idea/libraries/JUnit.xml index 249ea7f..a8d30f6 100644 --- a/dev-tools/idea/.idea/libraries/JUnit.xml +++ b/dev-tools/idea/.idea/libraries/JUnit.xml @@ -2,7 +2,7 @@ - + diff --git a/dev-tools/maven/pom.xml.template b/dev-tools/maven/pom.xml.template index 868befe..c44e9b7 100644 --- a/dev-tools/maven/pom.xml.template +++ b/dev-tools/maven/pom.xml.template @@ -434,7 +434,7 @@ com.carrotsearch.randomizedtesting randomizedtesting-runner - 2.0.1 + 2.0.2 diff --git a/lucene/CHANGES.txt b/lucene/CHANGES.txt index 1d4c706..bfa538c 100644 --- a/lucene/CHANGES.txt +++ b/lucene/CHANGES.txt @@ -42,6 +42,13 @@ Optimizations * LUCENE-4443: BlockPostingsFormat no longer writes unnecessary offsets into the skipdata. You need to reindex any indexes created with this experimental codec. (Robert Muir) + +Build + +* LUCENE-4451: Memory leak per unique thread caused by + RandomizedContext.contexts static map. Upgrade randomized testing + to version 2.0.2 (Mike McCandless, Dawid Weiss) + ======================= Lucene 4.0.0 ======================= diff --git a/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestDirectPostingsFormat.java b/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestDirectPostingsFormat.java index 9e94b95..40faaa7 100644 --- a/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestDirectPostingsFormat.java +++ b/lucene/codecs/src/test/org/apache/lucene/codecs/memory/TestDirectPostingsFormat.java @@ -26,7 +26,7 @@ import org.junit.Ignore; /** * Tests DirectPostingsFormat */ -@Ignore("Put this test back once we fix OOMEs") +//@Ignore("Put this test back once we fix OOMEs") public class TestDirectPostingsFormat extends BasePostingsFormatTestCase { // TODO: randomize parameters private final PostingsFormat postings = new DirectPostingsFormat(); diff --git a/lucene/licenses/junit4-ant-2.0.1.jar.sha1 b/lucene/licenses/junit4-ant-2.0.1.jar.sha1 deleted file mode 100644 index 9cce42a..0000000 --- a/lucene/licenses/junit4-ant-2.0.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -992e7c9cc39dc19436b1788590c0ad7b5c156f81 diff --git a/lucene/licenses/junit4-ant-2.0.2.jar.sha1 b/lucene/licenses/junit4-ant-2.0.2.jar.sha1 new file mode 100644 index 0000000..779698d --- /dev/null +++ b/lucene/licenses/junit4-ant-2.0.2.jar.sha1 @@ -0,0 +1 @@ +efe29720d85e5fa63216d18a205c798784bc62c8 diff --git a/lucene/licenses/randomizedtesting-runner-2.0.1.jar.sha1 b/lucene/licenses/randomizedtesting-runner-2.0.1.jar.sha1 deleted file mode 100644 index 81860a9..0000000 --- a/lucene/licenses/randomizedtesting-runner-2.0.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dbd210438bf1da082149c9f50e275c382b478b1f diff --git a/lucene/licenses/randomizedtesting-runner-2.0.2.jar.sha1 b/lucene/licenses/randomizedtesting-runner-2.0.2.jar.sha1 new file mode 100644 index 0000000..e19551d --- /dev/null +++ b/lucene/licenses/randomizedtesting-runner-2.0.2.jar.sha1 @@ -0,0 +1 @@ +4bd9b7e944ccd65fdec007c2e88c688f812c2b70 diff --git a/lucene/test-framework/ivy.xml b/lucene/test-framework/ivy.xml index a50b5da..13034a6 100644 --- a/lucene/test-framework/ivy.xml +++ b/lucene/test-framework/ivy.xml @@ -32,8 +32,8 @@ - - + + diff --git a/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java b/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java index 9c6551c..5dfb032 100644 --- a/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java +++ b/lucene/test-framework/src/java/org/apache/lucene/index/BasePostingsFormatTestCase.java @@ -826,8 +826,8 @@ public abstract class BasePostingsFormatTestCase extends LuceneTestCase { throw new RuntimeException(t); } } finally { - fieldsSource = null; - testCase = null; + //fieldsSource = null; + //testCase = null; } } } diff --git a/solr/licenses/junit4-ant-2.0.1.jar.sha1 b/solr/licenses/junit4-ant-2.0.1.jar.sha1 deleted file mode 100644 index 9cce42a..0000000 --- a/solr/licenses/junit4-ant-2.0.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -992e7c9cc39dc19436b1788590c0ad7b5c156f81 diff --git a/solr/licenses/junit4-ant-2.0.2.jar.sha1 b/solr/licenses/junit4-ant-2.0.2.jar.sha1 new file mode 100644 index 0000000..779698d --- /dev/null +++ b/solr/licenses/junit4-ant-2.0.2.jar.sha1 @@ -0,0 +1 @@ +efe29720d85e5fa63216d18a205c798784bc62c8 diff --git a/solr/licenses/randomizedtesting-runner-2.0.1.jar.sha1 b/solr/licenses/randomizedtesting-runner-2.0.1.jar.sha1 deleted file mode 100644 index 81860a9..0000000 --- a/solr/licenses/randomizedtesting-runner-2.0.1.jar.sha1 +++ /dev/null @@ -1 +0,0 @@ -dbd210438bf1da082149c9f50e275c382b478b1f diff --git a/solr/licenses/randomizedtesting-runner-2.0.2.jar.sha1 b/solr/licenses/randomizedtesting-runner-2.0.2.jar.sha1 new file mode 100644 index 0000000..e19551d --- /dev/null +++ b/solr/licenses/randomizedtesting-runner-2.0.2.jar.sha1 @@ -0,0 +1 @@ +4bd9b7e944ccd65fdec007c2e88c688f812c2b70 diff --git a/solr/test-framework/ivy.xml b/solr/test-framework/ivy.xml index b4449a1..ef2540f 100644 --- a/solr/test-framework/ivy.xml +++ b/solr/test-framework/ivy.xml @@ -32,8 +32,8 @@ - - + +