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 2012/09/17 17:32:47 UTC
svn commit: r1386662 - in /lucene/dev/trunk: dev-tools/eclipse/
dev-tools/maven/ lucene/ lucene/analysis/ lucene/analysis/phonetic/
lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/
lucene/analysis/phonetic/src/test/org/apache/luce...
Author: rmuir
Date: Mon Sep 17 15:32:46 2012
New Revision: 1386662
URL: http://svn.apache.org/viewvc?rev=1386662&view=rev
Log:
LUCENE-3720: fix BeiderMorseFilter OOM issues
Added:
lucene/dev/trunk/lucene/licenses/commons-codec-1.7.jar.sha1 (with props)
lucene/dev/trunk/solr/licenses/commons-codec-1.7.jar.sha1 (with props)
Removed:
lucene/dev/trunk/lucene/licenses/commons-codec-1.6.jar.sha1
lucene/dev/trunk/solr/licenses/commons-codec-1.6.jar.sha1
Modified:
lucene/dev/trunk/dev-tools/eclipse/dot.classpath
lucene/dev/trunk/dev-tools/maven/pom.xml.template
lucene/dev/trunk/lucene/CHANGES.txt
lucene/dev/trunk/lucene/analysis/README.txt
lucene/dev/trunk/lucene/analysis/phonetic/build.xml
lucene/dev/trunk/lucene/analysis/phonetic/ivy.xml
lucene/dev/trunk/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/BeiderMorseFilter.java
lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilter.java
lucene/dev/trunk/solr/core/ivy.xml
Modified: lucene/dev/trunk/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/eclipse/dot.classpath?rev=1386662&r1=1386661&r2=1386662&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/trunk/dev-tools/eclipse/dot.classpath Mon Sep 17 15:32:46 2012
@@ -103,7 +103,7 @@
<classpathentry kind="lib" path="lucene/test-framework/lib/junit-4.10.jar"/>
<classpathentry kind="lib" path="lucene/sandbox/lib/jakarta-regexp-1.4.jar"/>
<classpathentry kind="lib" path="lucene/analysis/icu/lib/icu4j-49.1.jar"/>
- <classpathentry kind="lib" path="lucene/analysis/phonetic/lib/commons-codec-1.6.jar"/>
+ <classpathentry kind="lib" path="lucene/analysis/phonetic/lib/commons-codec-1.7.jar"/>
<classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-fsa-1.5.3.jar"/>
<classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-polish-1.5.3.jar"/>
<classpathentry kind="lib" path="lucene/analysis/morfologik/lib/morfologik-stemming-1.5.3.jar"/>
Modified: lucene/dev/trunk/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/dev-tools/maven/pom.xml.template?rev=1386662&r1=1386661&r2=1386662&view=diff
==============================================================================
--- lucene/dev/trunk/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/trunk/dev-tools/maven/pom.xml.template Mon Sep 17 15:32:46 2012
@@ -152,7 +152,7 @@
<dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
- <version>1.6</version>
+ <version>1.7</version>
</dependency>
<dependency>
<groupId>commons-cli</groupId>
Modified: lucene/dev/trunk/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/CHANGES.txt?rev=1386662&r1=1386661&r2=1386662&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/CHANGES.txt (original)
+++ lucene/dev/trunk/lucene/CHANGES.txt Mon Sep 17 15:32:46 2012
@@ -164,6 +164,9 @@ Bug Fixes
RAM, instead of checking the estimated size of the segment
to decide whether to cache it. (Mike McCandless)
+* LUCENE-3720: fix memory-consumption issues with BeiderMorseFilter.
+ (Thomas Neidhart via Robert Muir)
+
Optimizations
* LUCENE-4322: Decrease lucene-core JAR size. The core JAR size had increased a
Modified: lucene/dev/trunk/lucene/analysis/README.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/README.txt?rev=1386662&r1=1386661&r2=1386662&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/README.txt (original)
+++ lucene/dev/trunk/lucene/analysis/README.txt Mon Sep 17 15:32:46 2012
@@ -31,7 +31,7 @@ lucene-analyzers-morfologik-XX.jar
lucene-analyzers-phonetic-XX.jar
An add-on analysis library that provides phonetic encoders via Apache
Commons-Codec. Note: this module depends on the commons-codec jar
- file (version >= 1.4)
+ file
lucene-analyzers-smartcn-XX.jar
An add-on analysis library that provides word segmentation for Simplified
Modified: lucene/dev/trunk/lucene/analysis/phonetic/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/phonetic/build.xml?rev=1386662&r1=1386661&r2=1386662&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/phonetic/build.xml (original)
+++ lucene/dev/trunk/lucene/analysis/phonetic/build.xml Mon Sep 17 15:32:46 2012
@@ -27,7 +27,7 @@
<path id="classpath">
<pathelement path="${analyzers-common.jar}"/>
- <pathelement path="lib/commons-codec-1.6.jar"/>
+ <pathelement path="lib/commons-codec-1.7.jar"/>
<path refid="base.classpath"/>
</path>
Modified: lucene/dev/trunk/lucene/analysis/phonetic/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/phonetic/ivy.xml?rev=1386662&r1=1386661&r2=1386662&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/phonetic/ivy.xml (original)
+++ lucene/dev/trunk/lucene/analysis/phonetic/ivy.xml Mon Sep 17 15:32:46 2012
@@ -19,7 +19,7 @@
<ivy-module version="2.0">
<info organisation="org.apache.lucene" module="analyzers-phonetic"/>
<dependencies>
- <dependency org="commons-codec" name="commons-codec" rev="1.6" transitive="false"/>
+ <dependency org="commons-codec" name="commons-codec" rev="1.7" transitive="false"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
</dependencies>
</ivy-module>
Modified: lucene/dev/trunk/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/BeiderMorseFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/BeiderMorseFilter.java?rev=1386662&r1=1386661&r2=1386662&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/BeiderMorseFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/phonetic/src/java/org/apache/lucene/analysis/phonetic/BeiderMorseFilter.java Mon Sep 17 15:32:46 2012
@@ -32,12 +32,6 @@ import org.apache.lucene.analysis.tokena
/**
* TokenFilter for Beider-Morse phonetic encoding.
- * <p>
- * <b><font color="red">
- * WARNING: some inputs can cause extremely high RAM usage!
- * https://issues.apache.org/jira/browse/CODEC-132
- * </font></b>
- * </p>
* @see BeiderMorseEncoder
* @lucene.experimental
*/
Modified: lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilter.java?rev=1386662&r1=1386661&r2=1386662&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilter.java (original)
+++ lucene/dev/trunk/lucene/analysis/phonetic/src/test/org/apache/lucene/analysis/phonetic/TestBeiderMorseFilter.java Mon Sep 17 15:32:46 2012
@@ -88,8 +88,7 @@ public class TestBeiderMorseFilter exten
new int[] { 4 },
new int[] { 1 });
}
-
- @Ignore("broken: causes OOM on some strings (https://issues.apache.org/jira/browse/CODEC-132)")
+
public void testRandom() throws Exception {
checkRandomData(random(), analyzer, 1000 * RANDOM_MULTIPLIER);
}
Added: lucene/dev/trunk/lucene/licenses/commons-codec-1.7.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/licenses/commons-codec-1.7.jar.sha1?rev=1386662&view=auto
==============================================================================
--- lucene/dev/trunk/lucene/licenses/commons-codec-1.7.jar.sha1 (added)
+++ lucene/dev/trunk/lucene/licenses/commons-codec-1.7.jar.sha1 Mon Sep 17 15:32:46 2012
@@ -0,0 +1 @@
+9cd61d269c88f9fb0eb36cea1efcd596ab74772f
Modified: lucene/dev/trunk/solr/core/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/core/ivy.xml?rev=1386662&r1=1386661&r2=1386662&view=diff
==============================================================================
--- lucene/dev/trunk/solr/core/ivy.xml (original)
+++ lucene/dev/trunk/solr/core/ivy.xml Mon Sep 17 15:32:46 2012
@@ -20,7 +20,7 @@
<info organisation="org.apache.solr" module="core"/>
<dependencies>
- <dependency org="commons-codec" name="commons-codec" rev="1.6" transitive="false"/>
+ <dependency org="commons-codec" name="commons-codec" rev="1.7" transitive="false"/>
<dependency org="commons-fileupload" name="commons-fileupload" rev="1.2.1" transitive="false"/>
<dependency org="commons-cli" name="commons-cli" rev="1.2" transitive="false"/>
<dependency org="commons-lang" name="commons-lang" rev="2.6" transitive="false"/>
Added: lucene/dev/trunk/solr/licenses/commons-codec-1.7.jar.sha1
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/solr/licenses/commons-codec-1.7.jar.sha1?rev=1386662&view=auto
==============================================================================
--- lucene/dev/trunk/solr/licenses/commons-codec-1.7.jar.sha1 (added)
+++ lucene/dev/trunk/solr/licenses/commons-codec-1.7.jar.sha1 Mon Sep 17 15:32:46 2012
@@ -0,0 +1 @@
+9cd61d269c88f9fb0eb36cea1efcd596ab74772f