You are viewing a plain text version of this content. The canonical link for it is here.
Posted to solr-commits@lucene.apache.org by rm...@apache.org on 2010/03/15 03:02:33 UTC
svn commit: r923025 - in /lucene/solr/branches/solr: ./ lib/
src/java/org/apache/solr/analysis/
Author: rmuir
Date: Mon Mar 15 02:02:32 2010
New Revision: 923025
URL: http://svn.apache.org/viewvc?rev=923025&view=rev
Log:
upgrade to 3.1-dev jars
Added:
lucene/solr/branches/solr/lib/lucene-analyzers-3.1-dev.jar (with props)
lucene/solr/branches/solr/lib/lucene-core-3.1-dev.jar (with props)
lucene/solr/branches/solr/lib/lucene-fast-vector-highlighter-3.1-dev.jar (with props)
lucene/solr/branches/solr/lib/lucene-highlighter-3.1-dev.jar (with props)
lucene/solr/branches/solr/lib/lucene-memory-3.1-dev.jar (with props)
lucene/solr/branches/solr/lib/lucene-misc-3.1-dev.jar (with props)
lucene/solr/branches/solr/lib/lucene-queries-3.1-dev.jar (with props)
lucene/solr/branches/solr/lib/lucene-spatial-3.1-dev.jar (with props)
lucene/solr/branches/solr/lib/lucene-spellchecker-3.1-dev.jar (with props)
Removed:
lucene/solr/branches/solr/lib/lucene-analyzers-3.0.1.jar
lucene/solr/branches/solr/lib/lucene-collation-3.0.1.jar
lucene/solr/branches/solr/lib/lucene-core-3.0.1.jar
lucene/solr/branches/solr/lib/lucene-fast-vector-highlighter-3.0.1.jar
lucene/solr/branches/solr/lib/lucene-highlighter-3.0.1.jar
lucene/solr/branches/solr/lib/lucene-memory-3.0.1.jar
lucene/solr/branches/solr/lib/lucene-misc-3.0.1.jar
lucene/solr/branches/solr/lib/lucene-queries-3.0.1.jar
lucene/solr/branches/solr/lib/lucene-snowball-3.0.1.jar
lucene/solr/branches/solr/lib/lucene-spatial-3.0.1.jar
lucene/solr/branches/solr/lib/lucene-spellchecker-3.0.1.jar
Modified:
lucene/solr/branches/solr/common-build.xml
lucene/solr/branches/solr/src/java/org/apache/solr/analysis/WordDelimiterFilter.java
Modified: lucene/solr/branches/solr/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/solr/branches/solr/common-build.xml?rev=923025&r1=923024&r2=923025&view=diff
==============================================================================
--- lucene/solr/branches/solr/common-build.xml (original)
+++ lucene/solr/branches/solr/common-build.xml Mon Mar 15 02:02:32 2010
@@ -92,7 +92,7 @@
<property name="javadoc.link.junit"
value="http://junit.sourceforge.net/javadoc/"/>
<property name="javadoc.link.lucene"
- value="http://lucene.apache.org/java/2_9_0/api/all/"/>
+ value="http://lucene.apache.org/java/3_1_0/api/all/"/>
<property name="javadoc.packages" value="org.apache.solr.*"/>
<property name="build.docs" value="${dest}/docs"/>
<property name="build.javadoc" value="${common.dir}/${build.docs}/api"/>
@@ -114,7 +114,7 @@
The version suffix of the Lucene artifacts checked into "lib"
IF YOU CHANGE THIS, SANITY CHECK "javadoc.link.lucene"
-->
- <property name="lucene_version" value="3.0.1"/>
+ <property name="lucene_version" value="3.1-dev"/>
<!-- The version number to assign to the Maven artifacts. -->
<property name="maven_version" value="1.5-SNAPSHOT"/>
Added: lucene/solr/branches/solr/lib/lucene-analyzers-3.1-dev.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/solr/lib/lucene-analyzers-3.1-dev.jar?rev=923025&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/solr/branches/solr/lib/lucene-analyzers-3.1-dev.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/solr/branches/solr/lib/lucene-core-3.1-dev.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/solr/lib/lucene-core-3.1-dev.jar?rev=923025&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/solr/branches/solr/lib/lucene-core-3.1-dev.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/solr/branches/solr/lib/lucene-fast-vector-highlighter-3.1-dev.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/solr/lib/lucene-fast-vector-highlighter-3.1-dev.jar?rev=923025&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/solr/branches/solr/lib/lucene-fast-vector-highlighter-3.1-dev.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/solr/branches/solr/lib/lucene-highlighter-3.1-dev.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/solr/lib/lucene-highlighter-3.1-dev.jar?rev=923025&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/solr/branches/solr/lib/lucene-highlighter-3.1-dev.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/solr/branches/solr/lib/lucene-memory-3.1-dev.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/solr/lib/lucene-memory-3.1-dev.jar?rev=923025&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/solr/branches/solr/lib/lucene-memory-3.1-dev.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/solr/branches/solr/lib/lucene-misc-3.1-dev.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/solr/lib/lucene-misc-3.1-dev.jar?rev=923025&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/solr/branches/solr/lib/lucene-misc-3.1-dev.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/solr/branches/solr/lib/lucene-queries-3.1-dev.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/solr/lib/lucene-queries-3.1-dev.jar?rev=923025&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/solr/branches/solr/lib/lucene-queries-3.1-dev.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/solr/branches/solr/lib/lucene-spatial-3.1-dev.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/solr/lib/lucene-spatial-3.1-dev.jar?rev=923025&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/solr/branches/solr/lib/lucene-spatial-3.1-dev.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: lucene/solr/branches/solr/lib/lucene-spellchecker-3.1-dev.jar
URL: http://svn.apache.org/viewvc/lucene/solr/branches/solr/lib/lucene-spellchecker-3.1-dev.jar?rev=923025&view=auto
==============================================================================
Binary file - no diff available.
Propchange: lucene/solr/branches/solr/lib/lucene-spellchecker-3.1-dev.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: lucene/solr/branches/solr/src/java/org/apache/solr/analysis/WordDelimiterFilter.java
URL: http://svn.apache.org/viewvc/lucene/solr/branches/solr/src/java/org/apache/solr/analysis/WordDelimiterFilter.java?rev=923025&r1=923024&r2=923025&view=diff
==============================================================================
--- lucene/solr/branches/solr/src/java/org/apache/solr/analysis/WordDelimiterFilter.java (original)
+++ lucene/solr/branches/solr/src/java/org/apache/solr/analysis/WordDelimiterFilter.java Mon Mar 15 02:02:32 2010
@@ -25,6 +25,7 @@ import org.apache.lucene.analysis.tokena
import org.apache.lucene.analysis.tokenattributes.TermAttribute;
import org.apache.lucene.analysis.tokenattributes.TypeAttribute;
import org.apache.lucene.util.ArrayUtil;
+import org.apache.lucene.util.RamUsageEstimator;
import java.io.IOException;
@@ -465,7 +466,7 @@ final class WordDelimiterFilter extends
savedType = typeAttribute.type();
if (savedBuffer.length < termAtttribute.termLength()) {
- savedBuffer = new char[ArrayUtil.getNextSize(termAtttribute.termLength())];
+ savedBuffer = new char[ArrayUtil.oversize(termAtttribute.termLength(), RamUsageEstimator.NUM_BYTES_CHAR)];
}
System.arraycopy(termAtttribute.termBuffer(), 0, savedBuffer, 0, termAtttribute.termLength());