You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ry...@apache.org on 2012/03/06 19:13:50 UTC
svn commit: r1297628 [2/13] - in /lucene/dev/branches/solr_3159_jetty8: ./
dev-tools/maven/ dev-tools/maven/lucene/ dev-tools/maven/lucene/contrib/demo/
dev-tools/maven/lucene/contrib/highlighter/
dev-tools/maven/lucene/contrib/memory/ dev-tools/maven/...
Modified: lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/pom.xml.template?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/pom.xml.template Tue Mar 6 18:13:38 2012
@@ -90,13 +90,13 @@
<inceptionYear>2000</inceptionYear>
<scm>
<connection>
- scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk
</connection>
<developerConnection>
- scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk
</developerConnection>
<url>
- http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
+ http://svn.apache.org/viewvc/lucene/dev/trunk
</url>
</scm>
<licenses>
@@ -306,21 +306,6 @@
<version>${patched.jetty.version}</version>
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1-glassfish</artifactId>
- <version>2.1.v20091210</version>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1-jetty</artifactId>
- <version>${jetty.version}</version>
- </dependency>
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-api-2.1-glassfish</artifactId>
- <version>2.1.v20091210</version>
- </dependency>
- <dependency>
<groupId>org.slf4j</groupId>
<artifactId>jcl-over-slf4j</artifactId>
<version>${slf4j.version}</version>
Modified: lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template (original)
+++ lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/analysis-extras/pom.xml.template Tue Mar 6 18:13:38 2012
@@ -33,8 +33,19 @@
<description>Apache Solr Analysis Extras</description>
<properties>
<module-directory>solr/contrib/analysis-extras</module-directory>
- <build-directory>../../build/contrib/analysis-extras</build-directory>
+ <build-directory>../../build/contrib/solr-analysis-extras</build-directory>
</properties>
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
+ </url>
+ </scm>
<dependencies>
<dependency>
<!-- lucene-test-framework dependency must be declared before lucene-core -->
Modified: lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/clustering/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/clustering/pom.xml.template?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/clustering/pom.xml.template (original)
+++ lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/clustering/pom.xml.template Tue Mar 6 18:13:38 2012
@@ -33,8 +33,19 @@
<description>Apache Solr Clustering</description>
<properties>
<module-directory>solr/contrib/clustering</module-directory>
- <build-directory>../../build/contrib/clustering</build-directory>
+ <build-directory>../../build/contrib/solr-clustering</build-directory>
</properties>
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
+ </url>
+ </scm>
<dependencies>
<dependency>
<!-- lucene-test-framework dependency must be declared before lucene-core -->
Modified: lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template (original)
+++ lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/dataimporthandler-extras/pom.xml.template Tue Mar 6 18:13:38 2012
@@ -33,8 +33,19 @@
<description>Apache Solr DataImportHandler Extras</description>
<properties>
<module-directory>solr/contrib/dataimporthandler-extras</module-directory>
- <build-directory>../../build/contrib/dataimporthandler-extras</build-directory>
+ <build-directory>../../build/contrib/solr-dataimporthandler-extras</build-directory>
</properties>
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
+ </url>
+ </scm>
<dependencies>
<dependency>
<!-- lucene-test-framework dependency must be declared before lucene-core -->
Modified: lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template (original)
+++ lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template Tue Mar 6 18:13:38 2012
@@ -33,8 +33,19 @@
<description>Apache Solr DataImportHandler</description>
<properties>
<module-directory>solr/contrib/dataimporthandler</module-directory>
- <build-directory>../../build/contrib/dataimporthandler</build-directory>
+ <build-directory>../../build/contrib/solr-dataimporthandler</build-directory>
</properties>
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
+ </url>
+ </scm>
<dependencies>
<dependency>
<!-- lucene-test-framework dependency must be declared before lucene-core -->
Modified: lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/extraction/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/extraction/pom.xml.template?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/extraction/pom.xml.template (original)
+++ lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/extraction/pom.xml.template Tue Mar 6 18:13:38 2012
@@ -36,8 +36,19 @@
</description>
<properties>
<module-directory>solr/contrib/extraction</module-directory>
- <build-directory>../../build/contrib/extraction</build-directory>
+ <build-directory>../../build/contrib/solr-cell</build-directory>
</properties>
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
+ </url>
+ </scm>
<dependencies>
<dependency>
<!-- lucene-test-framework dependency must be declared before lucene-core -->
Modified: lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/langid/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/langid/pom.xml.template?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/langid/pom.xml.template (original)
+++ lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/langid/pom.xml.template Tue Mar 6 18:13:38 2012
@@ -36,9 +36,20 @@
Its purpose is to identify language from documents and tag the document with language code.
</description>
<properties>
- <module-directory>solr/contrib/solr-langid</module-directory>
+ <module-directory>solr/contrib/langid</module-directory>
<build-directory>../../build/contrib/solr-langid</build-directory>
</properties>
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
+ </url>
+ </scm>
<dependencies>
<dependency>
<!-- lucene-test-framework dependency must be declared before lucene-core -->
Modified: lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/uima/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/uima/pom.xml.template?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/uima/pom.xml.template (original)
+++ lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/uima/pom.xml.template Tue Mar 6 18:13:38 2012
@@ -29,12 +29,23 @@
<groupId>org.apache.solr</groupId>
<artifactId>solr-uima</artifactId>
<packaging>jar</packaging>
- <name>Apache Solr - UIMA integration</name>
+ <name>Apache Solr UIMA integration</name>
<description>Apache Solr - UIMA integration</description>
<properties>
<module-directory>solr/contrib/uima</module-directory>
- <build-directory>../../build/contrib/uima</build-directory>
+ <build-directory>../../build/contrib/solr-uima</build-directory>
</properties>
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
+ </url>
+ </scm>
<dependencies>
<dependency>
<!-- lucene-test-framework dependency must be declared before lucene-core -->
@@ -46,6 +57,11 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-analyzers-uima</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
<groupId>${project.groupId}</groupId>
<artifactId>solr-core</artifactId>
<version>${project.version}</version>
Modified: lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/velocity/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/velocity/pom.xml.template?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/velocity/pom.xml.template (original)
+++ lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/contrib/velocity/pom.xml.template Tue Mar 6 18:13:38 2012
@@ -35,6 +35,17 @@
<module-directory>solr/contrib/velocity</module-directory>
<build-directory>../../build/contrib/solr-velocity</build-directory>
</properties>
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
+ </url>
+ </scm>
<dependencies>
<dependency>
<!-- lucene-test-framework dependency must be declared before lucene-core -->
Modified: lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/core/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/core/pom.xml.template?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/core/pom.xml.template (original)
+++ lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/core/pom.xml.template Tue Mar 6 18:13:38 2012
@@ -32,9 +32,20 @@
<name>Apache Solr Core</name>
<description>Apache Solr Core</description>
<properties>
- <module-directory>solr</module-directory>
+ <module-directory>solr/core</module-directory>
<build-directory>../build/solr-maven</build-directory>
</properties>
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
+ </url>
+ </scm>
<dependencies>
<dependency>
<!-- lucene-test-framework dependency must be declared before lucene-core -->
@@ -171,11 +182,6 @@
<optional>true</optional> <!-- Only used for tests and one command-line utility: JettySolrRunner -->
</dependency>
<dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1-jetty</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.codehaus.woodstox</groupId>
<artifactId>wstx-asl</artifactId>
<scope>runtime</scope>
Modified: lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/pom.xml.template?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/pom.xml.template (original)
+++ lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/pom.xml.template Tue Mar 6 18:13:38 2012
@@ -40,7 +40,19 @@
</modules>
<properties>
<tests.luceneMatchVersion>LUCENE_CURRENT</tests.luceneMatchVersion>
+ <module-directory>solr</module-directory>
</properties>
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
+ </url>
+ </scm>
<issueManagement>
<system>JIRA</system>
<url>http://issues.apache.org/jira/browse/SOLR</url>
Modified: lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/solrj/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/solrj/pom.xml.template?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/solrj/pom.xml.template (original)
+++ lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/solrj/pom.xml.template Tue Mar 6 18:13:38 2012
@@ -35,6 +35,17 @@
<module-directory>solr/solrj</module-directory>
<build-directory>../build/solr-solrj</build-directory>
</properties>
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
+ </url>
+ </scm>
<dependencies>
<dependency>
<groupId>org.apache.solr</groupId>
Modified: lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/test-framework/pom.xml.template?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/test-framework/pom.xml.template (original)
+++ lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/test-framework/pom.xml.template Tue Mar 6 18:13:38 2012
@@ -35,6 +35,17 @@
<module-directory>solr/test-framework</module-directory>
<build-directory>../build/solr-test-framework</build-directory>
</properties>
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
+ </url>
+ </scm>
<dependencies>
<!-- These dependencies are compile scope because this is a test framework. -->
<dependency>
Modified: lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/webapp/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/webapp/pom.xml.template?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/webapp/pom.xml.template (original)
+++ lucene/dev/branches/solr_3159_jetty8/dev-tools/maven/solr/webapp/pom.xml.template Tue Mar 6 18:13:38 2012
@@ -35,6 +35,17 @@
<module-directory>solr/webapp</module-directory>
<build-directory>../build</build-directory>
</properties>
+ <scm>
+ <connection>
+ scm:svn:http://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </connection>
+ <developerConnection>
+ scm:svn:https://svn.apache.org/repos/asf/lucene/dev/trunk/${module-directory}
+ </developerConnection>
+ <url>
+ http://svn.apache.org/viewvc/lucene/dev/trunk/${module-directory}
+ </url>
+ </scm>
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/CHANGES.txt?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/CHANGES.txt Tue Mar 6 18:13:38 2012
@@ -859,7 +859,7 @@ New Features
* LUCENE-3725: Added optional packing to FST building; this uses extra
RAM during building but results in a smaller FST. (Mike McCandless)
-* LUCENE-3714: Add top N shortest cost paths search for FST<Long>.
+* LUCENE-3714: Add top N shortest cost paths search for FST.
(Robert Muir, Dawid Weiss, Mike McCandless)
Bug fixes
@@ -928,6 +928,12 @@ Documentation
Build
+* LUCENE-3847: LuceneTestCase will now check for modifications of System
+ properties before and after each test (and suite). If changes are detected,
+ the test will fail. A rule can be used to reset system properties to
+ before-scope state (and this has been used to make Solr tests pass).
+ (Dawid Weiss, Uwe Schindler).
+
* LUCENE-3228: Stop downloading external javadoc package-list files:
- Added package-list files for Oracle Java javadocs and JUnit javadocs to
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/common-build.xml?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/common-build.xml (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/common-build.xml Tue Mar 6 18:13:38 2012
@@ -354,9 +354,7 @@
<artifact:pom id="maven.project" file="@{pom.xml}"/>
<artifact:deploy file="@{jar.file}">
<artifact-attachments/>
- <remoteRepository url="${m2.repository.url}">
- <authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}" password="${m2.repository.password}"/>
- </remoteRepository>
+ <remoteRepository id="${m2.repository.id}" url="${m2.repository.url}"/>
<pom refid="maven.project"/>
</artifact:deploy>
</sequential>
@@ -374,9 +372,7 @@
<artifact:install-provider artifactId="wagon-ssh" version="1.0-beta-7"/>
<artifact:pom id="maven.project" file="${maven.build.dir}/pom.xml" />
<artifact:deploy file="@{jar.file}">
- <remoteRepository url="${m2.repository.url}">
- <authentication username="${m2.repository.username}" privateKey="${m2.repository.private.key}" password="${m2.repository.password}"/>
- </remoteRepository>
+ <remoteRepository id="${m2.repository.id}" url="${m2.repository.url}"/>
<pom refid="maven.project"/>
</artifact:deploy>
</sequential>
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/contrib/CHANGES.txt?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/contrib/CHANGES.txt Tue Mar 6 18:13:38 2012
@@ -68,6 +68,10 @@ New Features
cached IO pages due to large merges. (Varun Thacker, Mike
McCandless)
+ * LUCENE-3827: DocsAndPositionsEnum from MemoryIndex implements
+ start/endOffset, if offsets are indexed. (Alan Woodward via Mike
+ McCandless)
+
API Changes
* LUCENE-2606: Changed RegexCapabilities interface to fix thread
@@ -111,6 +115,13 @@ Changes in backwards compatibility polic
* LUCENE-3626: The internal implementation classes in PKIndexSplitter
and MultiPassIndexSplitter were made private as they now work
per segment. (Uwe Schindler)
+
+ * LUCENE-3807: Cleaned up Suggest / Lookup API. Term weights (freqs) are now
+ 64bit signed integers instead of 32bit floats. Sorting of terms is now a
+ disk based merge sort instead of an in-memory sort. The Lookup API now
+ accepts and returns CharSequence instead of String which should be converted
+ into a String before used in a datastructure that relies on hashCode / equals.
+ (Simon Willnauer)
Changes in Runtime Behavior
@@ -143,6 +154,9 @@ New Features
* LUCENE-3730: Refine Kuromoji search mode (Mode.SEARCH) decompounding
heuristics. (Christian Moen via Robert Muir)
+ * LUCENE-3767: Kuromoji tokenizer/analyzer produces both compound words
+ and the segmentation of that compound in Mode.SEARCH. (Robert Muir, Mike McCandless via Christian Moen)
+
* LUCENE-3685: Add ToChildBlockJoinQuery and renamed previous
BlockJoinQuery to ToParentBlockJoinQuery, so that you can now do
joins in both parent to child and child to parent directions.
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/contrib/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/contrib/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/contrib/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/contrib/demo/src/java/org/apache/lucene/demo/xmlparser/FormBasedXmlQueryDemo.java Tue Mar 6 18:13:38 2012
@@ -38,6 +38,7 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.CorruptIndexException;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.IndexWriterConfig;
@@ -83,7 +84,7 @@ public class FormBasedXmlQueryDemo exten
protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
//Take all completed form fields and add to a Properties object
Properties completedFormFields = new Properties();
- Enumeration pNames = request.getParameterNames();
+ Enumeration<?> pNames = request.getParameterNames();
while (pNames.hasMoreElements()) {
String propName = (String) pNames.nextElement();
String value = request.getParameter(propName);
@@ -147,7 +148,7 @@ public class FormBasedXmlQueryDemo exten
//open searcher
// this example never closes it reader!
- IndexReader reader = IndexReader.open(rd);
+ IndexReader reader = DirectoryReader.open(rd);
searcher = new IndexSearcher(reader);
}
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/contrib/highlighter/src/test/org/apache/lucene/search/highlight/HighlighterTest.java Tue Mar 6 18:13:38 2012
@@ -50,6 +50,7 @@ import org.apache.lucene.search.highligh
import org.apache.lucene.search.spans.*;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.automaton.BasicAutomata;
import org.apache.lucene.util.automaton.CharacterRunAutomaton;
import org.apache.lucene.util.automaton.RegExp;
@@ -722,7 +723,6 @@ public class HighlighterTest extends Bas
@Override
public void run() throws Exception {
numHighlights = 0;
- String queryString = FIELD_NAME + ":[kannedy TO kznnedy]";
// Need to explicitly set the QueryParser property to use TermRangeQuery
// rather
@@ -1249,8 +1249,6 @@ public class HighlighterTest extends Bas
String text = "this is a text with searchterm in it";
SimpleHTMLFormatter fm = new SimpleHTMLFormatter();
- TokenStream tokenStream = new MockAnalyzer(random, MockTokenizer.SIMPLE, true, stopWords, true)
- .tokenStream("text", new StringReader(text));
Highlighter hg = getHighlighter(query, "text", fm);
hg.setTextFragmenter(new NullFragmenter());
hg.setMaxDocCharsToAnalyze(36);
@@ -1969,16 +1967,16 @@ final class SynonymTokenizer extends Tok
String result = highlighter.getBestFragments(tokenStream, text, maxNumFragmentsRequired,
fragmentSeparator);
- if (HighlighterTest.VERBOSE) System.out.println("\t" + result);
+ if (LuceneTestCase.VERBOSE) System.out.println("\t" + result);
}
}
abstract void run() throws Exception;
void start() throws Exception {
- if (HighlighterTest.VERBOSE) System.out.println("Run QueryScorer");
+ if (LuceneTestCase.VERBOSE) System.out.println("Run QueryScorer");
run();
- if (HighlighterTest.VERBOSE) System.out.println("Run QueryTermScorer");
+ if (LuceneTestCase.VERBOSE) System.out.println("Run QueryTermScorer");
mode = QUERY_TERM;
run();
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java Tue Mar 6 18:13:38 2012
@@ -43,10 +43,8 @@ import org.apache.lucene.index.FieldInfo
import org.apache.lucene.index.FieldInvertState;
import org.apache.lucene.index.Fields;
import org.apache.lucene.index.FieldsEnum;
-import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.OrdTermState;
import org.apache.lucene.index.StoredFieldVisitor;
-import org.apache.lucene.index.Term;
import org.apache.lucene.index.TermState;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
@@ -206,7 +204,7 @@ public class MemoryIndex {
* Arrays.binarySearch() and Arrays.sort()
*/
private static final Comparator<Object> termComparator = new Comparator<Object>() {
- @SuppressWarnings("unchecked")
+ @SuppressWarnings({"unchecked","rawtypes"})
public int compare(Object o1, Object o2) {
if (o1 instanceof Map.Entry<?,?>) o1 = ((Map.Entry<?,?>) o1).getKey();
if (o2 instanceof Map.Entry<?,?>) o2 = ((Map.Entry<?,?>) o2).getKey();
@@ -226,14 +224,14 @@ public class MemoryIndex {
* Constructs an empty instance that can optionally store the start and end
* character offset of each token term in the text. This can be useful for
* highlighting of hit locations with the Lucene highlighter package.
- * Private until the highlighter package matures, so that this can actually
+ * Protected until the highlighter package matures, so that this can actually
* be meaningfully integrated.
*
* @param storeOffsets
* whether or not to store the start and end character offset of
* each token term in the text
*/
- private MemoryIndex(boolean storeOffsets) {
+ protected MemoryIndex(boolean storeOffsets) {
this.stride = storeOffsets ? 3 : 1;
fieldInfos = new FieldInfos();
}
@@ -610,9 +608,6 @@ public class MemoryIndex {
/** Boost factor for hits for this field */
private final float boost;
- /** Term for this field's fieldName, lazily computed on demand */
- public transient Term template;
-
private final long sumTotalTermFreq;
public Info(HashMap<BytesRef,ArrayIntList> terms, int numTokens, int numOverlapTokens, float boost) {
@@ -643,16 +638,6 @@ public class MemoryIndex {
if (sortedTerms == null) sortedTerms = sort(terms);
}
- /** note that the frequency can be calculated as numPosition(getPositions(x)) */
- public ArrayIntList getPositions(BytesRef term) {
- return terms.get(term);
- }
-
- /** note that the frequency can be calculated as numPosition(getPositions(x)) */
- public ArrayIntList getPositions(int pos) {
- return sortedTerms[pos].getValue();
- }
-
public float getBoost() {
return boost;
}
@@ -672,10 +657,6 @@ public class MemoryIndex {
private int[] elements;
private int size = 0;
- public ArrayIntList() {
- this(10);
- }
-
public ArrayIntList(int initialCapacity) {
elements = new int[initialCapacity];
}
@@ -702,16 +683,6 @@ public class MemoryIndex {
return size;
}
- public int[] toArray(int stride) {
- int[] arr = new int[size() / stride];
- if (stride == 1) {
- System.arraycopy(elements, 0, arr, 0, size); // fast path
- } else {
- for (int i=0, j=0; j < size; i++, j += stride) arr[i] = elements[j];
- }
- return arr;
- }
-
private void ensureCapacity(int minCapacity) {
int newCapacity = Math.max(minCapacity, (elements.length * 3) / 2 + 1);
int[] newElements = new int[newCapacity];
@@ -1046,22 +1017,22 @@ public class MemoryIndex {
@Override
public int freq() {
- return positions.size();
+ return positions.size() / stride;
}
@Override
public int nextPosition() {
- return positions.get(posUpto++);
+ return positions.get(posUpto++ * stride);
}
@Override
public int startOffset() {
- return -1;
+ return stride == 1 ? -1 : positions.get((posUpto - 1) * stride + 1);
}
@Override
public int endOffset() {
- return -1;
+ return stride == 1 ? -1 : positions.get((posUpto - 1) * stride + 2);
}
@Override
@@ -1164,16 +1135,7 @@ public class MemoryIndex {
public static final int PTR = Constants.JRE_IS_64BIT ? 8 : 4;
- // bytes occupied by primitive data types
- public static final int BOOLEAN = 1;
- public static final int BYTE = 1;
- public static final int CHAR = 2;
- public static final int SHORT = 2;
public static final int INT = 4;
- public static final int LONG = 8;
- public static final int FLOAT = 4;
- public static final int DOUBLE = 8;
-
private static final int LOG_PTR = (int) Math.round(log2(PTR));
/**
@@ -1201,28 +1163,15 @@ public class MemoryIndex {
return sizeOfObject(INT + PTR*len);
}
- public static int sizeOfCharArray(int len) {
- return sizeOfObject(INT + CHAR*len);
- }
-
public static int sizeOfIntArray(int len) {
return sizeOfObject(INT + INT*len);
}
- public static int sizeOfString(int len) {
- return sizeOfObject(3*INT + PTR) + sizeOfCharArray(len);
- }
-
public static int sizeOfHashMap(int len) {
return sizeOfObject(4*PTR + 4*INT) + sizeOfObjectArray(len)
+ len * sizeOfObject(3*PTR + INT); // entries
}
- // note: does not include referenced objects
- public static int sizeOfArrayList(int len) {
- return sizeOfObject(PTR + 2*INT) + sizeOfObjectArray(len);
- }
-
public static int sizeOfArrayIntList(int len) {
return sizeOfObject(PTR + INT) + sizeOfIntArray(len);
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/contrib/memory/src/test/org/apache/lucene/index/memory/MemoryIndexTest.java Tue Mar 6 18:13:38 2012
@@ -34,6 +34,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.Field;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.AtomicReader;
+import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
@@ -135,7 +136,7 @@ public class MemoryIndexTest extends Bas
* Run all queries against both the RAMDirectory and MemoryIndex, ensuring they are the same.
*/
public void assertAllQueries(MemoryIndex memory, Directory ramdir, Analyzer analyzer) throws Exception {
- IndexReader reader = IndexReader.open(ramdir);
+ IndexReader reader = DirectoryReader.open(ramdir);
IndexSearcher ram = new IndexSearcher(reader);
IndexSearcher mem = memory.createSearcher();
QueryParser qp = new QueryParser(TEST_VERSION_CURRENT, "foo", analyzer);
@@ -204,13 +205,16 @@ public class MemoryIndexTest extends Bas
public void testDocsAndPositionsEnumStart() throws Exception {
Analyzer analyzer = new MockAnalyzer(random);
- MemoryIndex memory = new MemoryIndex();
+ MemoryIndex memory = new MemoryIndex(true);
memory.addField("foo", "bar", analyzer);
AtomicReader reader = (AtomicReader) memory.createSearcher().getIndexReader();
DocsAndPositionsEnum disi = reader.termPositionsEnum(null, "foo", new BytesRef("bar"), false);
int docid = disi.docID();
assertTrue(docid == -1 || docid == DocIdSetIterator.NO_MORE_DOCS);
assertTrue(disi.nextDoc() != DocIdSetIterator.NO_MORE_DOCS);
+ assertEquals(0, disi.nextPosition());
+ assertEquals(0, disi.startOffset());
+ assertEquals(3, disi.endOffset());
// now reuse and check again
TermsEnum te = reader.terms("foo").iterator(null);
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/contrib/misc/src/java/org/apache/lucene/index/MultiPassIndexSplitter.java Tue Mar 6 18:13:38 2012
@@ -180,7 +180,7 @@ public class MultiPassIndexSplitter {
private static final class FakeDeleteIndexReader extends MultiReader {
public FakeDeleteIndexReader(IndexReader reader) throws IOException {
- super(initSubReaders(reader), false /* dont close */);
+ super(initSubReaders(reader));
}
private static AtomicReader[] initSubReaders(IndexReader reader) throws IOException {
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/contrib/misc/src/java/org/apache/lucene/misc/SweetSpotSimilarity.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/contrib/misc/src/java/org/apache/lucene/misc/SweetSpotSimilarity.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/contrib/misc/src/java/org/apache/lucene/misc/SweetSpotSimilarity.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/contrib/misc/src/java/org/apache/lucene/misc/SweetSpotSimilarity.java Tue Mar 6 18:13:38 2012
@@ -41,6 +41,7 @@ import org.apache.lucene.index.Norm;
* subclasses can choose between.
* </p>
*
+ * @see <a href="doc-files/ss.gnuplot">A Gnuplot file used to generate some of the visualizations refrenced from each function.</a>
*/
public class SweetSpotSimilarity extends DefaultSimilarity {
@@ -75,7 +76,7 @@ public class SweetSpotSimilarity extends
*
* @param min the minimum tf value to ever be returned (default: 0.0)
* @param max the maximum tf value to ever be returned (default: 2.0)
- * @param base the base value to be used in the exponential for the hyperbolic function (default: e)
+ * @param base the base value to be used in the exponential for the hyperbolic function (default: 1.3)
* @param xoffset the midpoint of the hyperbolic function (default: 10.0)
* @see #hyperbolicTf
*/
@@ -135,6 +136,7 @@ public class SweetSpotSimilarity extends
* </p>
*
* @see #setLengthNormFactors
+ * @see <a href="doc-files/ss.computeLengthNorm.svg">An SVG visualization of this function</a>
*/
public float computeLengthNorm(int numTerms) {
final int l = ln_min;
@@ -175,6 +177,7 @@ public class SweetSpotSimilarity extends
* </p>
*
* @see #setBaselineTfFactors
+ * @see <a href="doc-files/ss.baselineTf.svg">An SVG visualization of this function</a>
*/
public float baselineTf(float freq) {
@@ -198,6 +201,7 @@ public class SweetSpotSimilarity extends
* </p>
*
* @see #setHyperbolicTfFactors
+ * @see <a href="doc-files/ss.hyperbolicTf.svg">An SVG visualization of this function</a>
*/
public float hyperbolicTf(float freq) {
if (0.0f == freq) return 0.0f;
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java Tue Mar 6 18:13:38 2012
@@ -20,8 +20,6 @@ import java.io.File;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.Field;
-import org.apache.lucene.document.StringField;
import org.apache.lucene.index.IndexWriterConfig.OpenMode;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.LuceneTestCase;
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/DuplicateFilter.java Tue Mar 6 18:13:38 2012
@@ -18,6 +18,7 @@ package org.apache.lucene.sandbox.querie
import org.apache.lucene.index.*;
import org.apache.lucene.search.DocIdSet;
+import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.Filter;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
@@ -94,7 +95,7 @@ public class DuplicateFilter extends Fil
} else {
docs = termsEnum.docs(acceptDocs, docs, false);
int doc = docs.nextDoc();
- if (doc != DocsEnum.NO_MORE_DOCS) {
+ if (doc != DocIdSetIterator.NO_MORE_DOCS) {
if (keepMode == KeepMode.KM_USE_FIRST_OCCURRENCE) {
bits.set(doc);
} else {
@@ -102,7 +103,7 @@ public class DuplicateFilter extends Fil
while (true) {
lastDoc = doc;
doc = docs.nextDoc();
- if (doc == DocsEnum.NO_MORE_DOCS) {
+ if (doc == DocIdSetIterator.NO_MORE_DOCS) {
break;
}
}
@@ -134,7 +135,7 @@ public class DuplicateFilter extends Fil
// unset potential duplicates
docs = termsEnum.docs(acceptDocs, docs, false);
int doc = docs.nextDoc();
- if (doc != DocsEnum.NO_MORE_DOCS) {
+ if (doc != DocIdSetIterator.NO_MORE_DOCS) {
if (keepMode == KeepMode.KM_USE_FIRST_OCCURRENCE) {
doc = docs.nextDoc();
}
@@ -145,7 +146,7 @@ public class DuplicateFilter extends Fil
lastDoc = doc;
bits.clear(lastDoc);
doc = docs.nextDoc();
- if (doc == DocsEnum.NO_MORE_DOCS) {
+ if (doc == DocIdSetIterator.NO_MORE_DOCS) {
break;
}
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedStringComparator.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedStringComparator.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedStringComparator.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/SlowCollatedStringComparator.java Tue Mar 6 18:13:38 2012
@@ -90,7 +90,7 @@ public final class SlowCollatedStringCom
}
@Override
- public FieldComparator setNextReader(AtomicReaderContext context) throws IOException {
+ public FieldComparator<String> setNextReader(AtomicReaderContext context) throws IOException {
currentDocTerms = FieldCache.DEFAULT.getTerms(context.reader(), field);
return this;
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/DuplicateFilterTest.java Tue Mar 6 18:13:38 2012
@@ -25,6 +25,7 @@ import org.apache.lucene.document.Docume
import org.apache.lucene.document.StringField;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.*;
+import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.search.IndexSearcher;
import org.apache.lucene.search.ScoreDoc;
import org.apache.lucene.search.TermQuery;
@@ -142,7 +143,7 @@ public class DuplicateFilterTest extends
false);
int lastDoc = 0;
- while (td.nextDoc() != DocsEnum.NO_MORE_DOCS) {
+ while (td.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
lastDoc = td.docID();
}
assertEquals("Duplicate urls should return last doc", lastDoc, hit.doc);
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/TestSlowCollationMethods.java Tue Mar 6 18:13:38 2012
@@ -91,7 +91,7 @@ public class TestSlowCollationMethods ex
public void testSort() throws Exception {
SortField sf = new SortField("field", new FieldComparatorSource() {
@Override
- public FieldComparator newComparator(String fieldname, int numHits, int sortPos, boolean reversed) throws IOException {
+ public FieldComparator<String> newComparator(String fieldname, int numHits, int sortPos, boolean reversed) throws IOException {
return new SlowCollatedStringComparator(numHits, fieldname, collator);
}
});
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java Tue Mar 6 18:13:38 2012
@@ -83,31 +83,4 @@ public class TestSpanRegexQuery extends
reader.close();
directory.close();
}
-
- private void createRAMDirectories() throws CorruptIndexException,
- LockObtainFailedException, IOException {
- // creating a document to store
- Document lDoc = new Document();
- FieldType customType = new FieldType(TextField.TYPE_UNSTORED);
- customType.setOmitNorms(true);
- lDoc.add(newField("field", "a1 b1", customType));
-
- // creating a document to store
- Document lDoc2 = new Document();
- lDoc2.add(newField("field", "a2 b2", customType));
-
- // creating first index writer
- IndexWriter writerA = new IndexWriter(indexStoreA, newIndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer(random)).setOpenMode(OpenMode.CREATE));
- writerA.addDocument(lDoc);
- writerA.forceMerge(1);
- writerA.close();
-
- // creating second index writer
- IndexWriter writerB = new IndexWriter(indexStoreB, newIndexWriterConfig(
- TEST_VERSION_CURRENT, new MockAnalyzer(random)).setOpenMode(OpenMode.CREATE));
- writerB.addDocument(lDoc2);
- writerB.forceMerge(1);
- writerB.close();
- }
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttributeImpl.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttributeImpl.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttributeImpl.java Tue Mar 6 18:13:38 2012
@@ -52,9 +52,10 @@ public class PositionIncrementAttributeI
* @param positionIncrement the distance from the prior term
*/
public void setPositionIncrement(int positionIncrement) {
- if (positionIncrement < 0)
+ if (positionIncrement < 0) {
throw new IllegalArgumentException
- ("Increment must be zero or greater: " + positionIncrement);
+ ("Increment must be zero or greater: got " + positionIncrement);
+ }
this.positionIncrement = positionIncrement;
}
@@ -77,7 +78,8 @@ public class PositionIncrementAttributeI
}
if (other instanceof PositionIncrementAttributeImpl) {
- return positionIncrement == ((PositionIncrementAttributeImpl) other).positionIncrement;
+ PositionIncrementAttributeImpl _other = (PositionIncrementAttributeImpl) other;
+ return positionIncrement == _other.positionIncrement;
}
return false;
@@ -93,5 +95,4 @@ public class PositionIncrementAttributeI
PositionIncrementAttribute t = (PositionIncrementAttribute) target;
t.setPositionIncrement(positionIncrement);
}
-
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java Tue Mar 6 18:13:38 2012
@@ -778,9 +778,6 @@ public class BlockTermsReader extends Fi
return state.ord;
}
- private void doPendingSeek() {
- }
-
/* Does initial decode of next block of terms; this
doesn't actually decode the docFreq, totalTermFreq,
postings details (frq/prx offset, etc.) metadata;
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java Tue Mar 6 18:13:38 2012
@@ -35,7 +35,6 @@ import org.apache.lucene.index.IndexFile
import org.apache.lucene.index.SegmentInfo;
import org.apache.lucene.index.TermState;
import org.apache.lucene.index.Terms;
-import org.apache.lucene.index.TermsEnum.SeekStatus;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.store.ByteArrayDataInput;
import org.apache.lucene.store.Directory;
@@ -488,7 +487,7 @@ public class BlockTreeTermsReader extend
private Frame[] stack;
- @SuppressWarnings("unchecked") private FST.Arc<BytesRef>[] arcs = new FST.Arc[5];
+ @SuppressWarnings({"rawtypes","unchecked"}) private FST.Arc<BytesRef>[] arcs = new FST.Arc[5];
private final RunAutomaton runAutomaton;
private final CompiledAutomaton compiledAutomaton;
@@ -821,7 +820,8 @@ public class BlockTreeTermsReader extend
private FST.Arc<BytesRef> getArc(int ord) {
if (ord >= arcs.length) {
- @SuppressWarnings("unchecked") final FST.Arc<BytesRef>[] next = new FST.Arc[ArrayUtil.oversize(1+ord, RamUsageEstimator.NUM_BYTES_OBJECT_REF)];
+ @SuppressWarnings({"rawtypes","unchecked"}) final FST.Arc<BytesRef>[] next =
+ new FST.Arc[ArrayUtil.oversize(1+ord, RamUsageEstimator.NUM_BYTES_OBJECT_REF)];
System.arraycopy(arcs, 0, next, 0, arcs.length);
for(int arcOrd=arcs.length;arcOrd<next.length;arcOrd++) {
next[arcOrd] = new FST.Arc<BytesRef>();
@@ -1198,7 +1198,8 @@ public class BlockTreeTermsReader extend
final BytesRef term = new BytesRef();
private final FST.BytesReader fstReader;
- @SuppressWarnings("unchecked") private FST.Arc<BytesRef>[] arcs = new FST.Arc[1];
+ @SuppressWarnings({"rawtypes","unchecked"}) private FST.Arc<BytesRef>[] arcs =
+ new FST.Arc[1];
public SegmentTermsEnum() throws IOException {
//if (DEBUG) System.out.println("BTTR.init seg=" + segment);
@@ -1354,7 +1355,8 @@ public class BlockTreeTermsReader extend
private FST.Arc<BytesRef> getArc(int ord) {
if (ord >= arcs.length) {
- @SuppressWarnings("unchecked") final FST.Arc<BytesRef>[] next = new FST.Arc[ArrayUtil.oversize(1+ord, RamUsageEstimator.NUM_BYTES_OBJECT_REF)];
+ @SuppressWarnings({"rawtypes","unchecked"}) final FST.Arc<BytesRef>[] next =
+ new FST.Arc[ArrayUtil.oversize(1+ord, RamUsageEstimator.NUM_BYTES_OBJECT_REF)];
System.arraycopy(arcs, 0, next, 0, arcs.length);
for(int arcOrd=arcs.length;arcOrd<next.length;arcOrd++) {
next[arcOrd] = new FST.Arc<BytesRef>();
@@ -1944,6 +1946,7 @@ public class BlockTreeTermsReader extend
}
}
+ @SuppressWarnings("unused")
private void printSeekState() throws IOException {
if (currentFrame == staticFrame) {
System.out.println(" no prior seek");
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsWriter.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsWriter.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsWriter.java Tue Mar 6 18:13:38 2012
@@ -640,7 +640,7 @@ public class BlockTreeTermsWriter extend
// for debugging
@SuppressWarnings("unused")
- private String toString(BytesRef b) {
+ private String toString(BytesRef b) {
try {
return b.utf8ToString() + " " + b;
} catch (Throwable t) {
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/FieldsProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/FieldsProducer.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/FieldsProducer.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/FieldsProducer.java Tue Mar 6 18:13:38 2012
@@ -21,8 +21,6 @@ import java.io.Closeable;
import java.io.IOException;
import org.apache.lucene.index.Fields;
-import org.apache.lucene.index.FieldsEnum;
-import org.apache.lucene.index.Terms;
/** Abstract API that produces terms, doc, freq, prox and
* payloads postings.
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/FixedGapTermsIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/FixedGapTermsIndexReader.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/FixedGapTermsIndexReader.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/FixedGapTermsIndexReader.java Tue Mar 6 18:13:38 2012
@@ -227,8 +227,6 @@ public class FixedGapTermsIndexReader ex
private final class FieldIndexData {
- final private FieldInfo fieldInfo;
-
volatile CoreFieldIndex coreIndex;
private final long indexStart;
@@ -241,7 +239,6 @@ public class FixedGapTermsIndexReader ex
public FieldIndexData(FieldInfo fieldInfo, int numIndexTerms, long indexStart, long termsStart, long packedIndexStart,
long packedOffsetsStart) throws IOException {
- this.fieldInfo = fieldInfo;
this.termsStart = termsStart;
this.indexStart = indexStart;
this.packedIndexStart = packedIndexStart;
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/FixedGapTermsIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/FixedGapTermsIndexWriter.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/FixedGapTermsIndexWriter.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/FixedGapTermsIndexWriter.java Tue Mar 6 18:13:38 2012
@@ -53,7 +53,8 @@ public class FixedGapTermsIndexWriter ex
final private int termIndexInterval;
private final List<SimpleFieldWriter> fields = new ArrayList<SimpleFieldWriter>();
- private final FieldInfos fieldInfos; // unread
+
+ @SuppressWarnings("unused") private final FieldInfos fieldInfos; // unread
public FixedGapTermsIndexWriter(SegmentWriteState state) throws IOException {
final String indexFileName = IndexFileNames.segmentFileName(state.segmentName, state.segmentSuffix, TERMS_INDEX_EXTENSION);
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java Tue Mar 6 18:13:38 2012
@@ -22,7 +22,6 @@ import java.io.IOException;
import java.util.Comparator;
import org.apache.lucene.index.DocsAndPositionsEnum;
-import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.FieldInfos;
import org.apache.lucene.index.Fields;
@@ -30,6 +29,7 @@ import org.apache.lucene.index.FieldsEnu
import org.apache.lucene.index.MergeState;
import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
+import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.DataInput;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
@@ -236,7 +236,7 @@ public abstract class TermVectorsWriter
if (docsAndPositionsEnum != null) {
final int docID = docsAndPositionsEnum.nextDoc();
- assert docID != DocsEnum.NO_MORE_DOCS;
+ assert docID != DocIdSetIterator.NO_MORE_DOCS;
assert docsAndPositionsEnum.freq() == freq;
for(int posUpto=0; posUpto<freq; posUpto++) {
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/TermsIndexReaderBase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/TermsIndexReaderBase.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/TermsIndexReaderBase.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/TermsIndexReaderBase.java Tue Mar 6 18:13:38 2012
@@ -22,7 +22,6 @@ import org.apache.lucene.util.BytesRef;
import java.io.IOException;
import java.io.Closeable;
-import java.util.Collection;
// TODO
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/VariableGapTermsIndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/VariableGapTermsIndexWriter.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/VariableGapTermsIndexWriter.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/VariableGapTermsIndexWriter.java Tue Mar 6 18:13:38 2012
@@ -54,7 +54,8 @@ public class VariableGapTermsIndexWriter
final static int VERSION_CURRENT = VERSION_START;
private final List<FSTFieldWriter> fields = new ArrayList<FSTFieldWriter>();
- private final FieldInfos fieldInfos; // unread
+
+ @SuppressWarnings("unused") private final FieldInfos fieldInfos; // unread
private final IndexTermSelector policy;
/** @lucene.experimental */
@@ -214,7 +215,6 @@ public class VariableGapTermsIndexWriter
private final long startTermsFilePointer;
final FieldInfo fieldInfo;
- int numIndexTerms;
FST<Long> fst;
final long indexStart;
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/appending/AppendingPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/appending/AppendingPostingsFormat.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/appending/AppendingPostingsFormat.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/appending/AppendingPostingsFormat.java Tue Mar 6 18:13:38 2012
@@ -32,7 +32,6 @@ import org.apache.lucene.codecs.lucene40
import org.apache.lucene.index.SegmentInfo;
import org.apache.lucene.index.SegmentReadState;
import org.apache.lucene.index.SegmentWriteState;
-import org.apache.lucene.store.Directory;
/**
* Appending postings impl
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/VarSortedBytesImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/VarSortedBytesImpl.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/VarSortedBytesImpl.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/VarSortedBytesImpl.java Tue Mar 6 18:13:38 2012
@@ -63,6 +63,7 @@ final class VarSortedBytesImpl {
this.comp = comp;
size = 0;
}
+
@Override
public void merge(MergeState mergeState, DocValues[] docValues)
throws IOException {
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java Tue Mar 6 18:13:38 2012
@@ -387,7 +387,7 @@ public class SimpleTextTermVectorsReader
}
@Override
- public Comparator<BytesRef> getComparator() throws IOException {
+ public Comparator<BytesRef> getComparator() {
return BytesRef.getUTF8SortedAsUnicodeComparator();
}
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/AtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/AtomicReader.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/AtomicReader.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/AtomicReader.java Tue Mar 6 18:13:38 2012
@@ -20,7 +20,6 @@ package org.apache.lucene.index;
import java.io.IOException;
import org.apache.lucene.search.SearcherManager; // javadocs
-import org.apache.lucene.store.*;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.ReaderUtil; // for javadocs
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/BufferedDeletesStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/BufferedDeletesStream.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/BufferedDeletesStream.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/BufferedDeletesStream.java Tue Mar 6 18:13:38 2012
@@ -401,7 +401,7 @@ class BufferedDeletesStream {
while (true) {
final int docID = docsEnum.nextDoc();
//System.out.println(Thread.currentThread().getName() + " del term=" + term + " doc=" + docID);
- if (docID == DocsEnum.NO_MORE_DOCS) {
+ if (docID == DocIdSetIterator.NO_MORE_DOCS) {
break;
}
// NOTE: there is no limit check on the docID
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java Tue Mar 6 18:13:38 2012
@@ -925,7 +925,7 @@ public class CheckIndex {
final int skipDocID = (int) (((idx+1)*(long) maxDoc)/8);
postings = termsEnum.docsAndPositions(liveDocs, postings, false);
final int docID = postings.advance(skipDocID);
- if (docID == DocsEnum.NO_MORE_DOCS) {
+ if (docID == DocIdSetIterator.NO_MORE_DOCS) {
break;
} else {
if (docID < skipDocID) {
@@ -948,7 +948,7 @@ public class CheckIndex {
}
final int nextDocID = postings.nextDoc();
- if (nextDocID == DocsEnum.NO_MORE_DOCS) {
+ if (nextDocID == DocIdSetIterator.NO_MORE_DOCS) {
break;
}
if (nextDocID <= docID) {
@@ -961,14 +961,14 @@ public class CheckIndex {
final int skipDocID = (int) (((idx+1)*(long) maxDoc)/8);
docs = termsEnum.docs(liveDocs, docs, false);
final int docID = docs.advance(skipDocID);
- if (docID == DocsEnum.NO_MORE_DOCS) {
+ if (docID == DocIdSetIterator.NO_MORE_DOCS) {
break;
} else {
if (docID < skipDocID) {
throw new RuntimeException("term " + term + ": advance(docID=" + skipDocID + ") returned docID=" + docID);
}
final int nextDocID = docs.nextDoc();
- if (nextDocID == DocsEnum.NO_MORE_DOCS) {
+ if (nextDocID == DocIdSetIterator.NO_MORE_DOCS) {
break;
}
if (nextDocID <= docID) {
@@ -1067,7 +1067,7 @@ public class CheckIndex {
throw new RuntimeException("null DocsEnum from to existing term " + seekTerms[i]);
}
- while(docs.nextDoc() != DocsEnum.NO_MORE_DOCS) {
+ while(docs.nextDoc() != DocIdSetIterator.NO_MORE_DOCS) {
totDocCount++;
}
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java Tue Mar 6 18:13:38 2012
@@ -488,19 +488,6 @@ public class ConcurrentMergeScheduler ex
}
}
}
-
- @Override
- public String toString() {
- MergePolicy.OneMerge merge = getRunningMerge();
- if (merge == null) {
- merge = startMerge;
- }
- try {
- return "merge thread: " + tWriter.segString(merge.segments);
- } catch (IOException ioe) {
- throw new RuntimeException(ioe);
- }
- }
}
/** Called when an exception is hit in a background merge
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/DirectoryReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/DirectoryReader.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/DirectoryReader.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/DirectoryReader.java Tue Mar 6 18:13:38 2012
@@ -48,13 +48,8 @@ import org.apache.lucene.store.Directory
synchronization, you should <b>not</b> synchronize on the
<code>IndexReader</code> instance; use your own
(non-Lucene) objects instead.
-
- <p><em>Please note:</em> This class extends from an internal (invisible)
- superclass that is generic: The type parameter {@code R} is
- {@link AtomicReader}, see {@link #subReaders} and
- {@link #getSequentialSubReaders}.
*/
-public abstract class DirectoryReader extends BaseMultiReader<AtomicReader> {
+public abstract class DirectoryReader extends BaseCompositeReader<AtomicReader> {
public static final int DEFAULT_TERMS_INDEX_DIVISOR = 1;
protected final Directory directory;
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/DocFieldProcessor.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/DocFieldProcessor.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/DocFieldProcessor.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/DocFieldProcessor.java Tue Mar 6 18:13:38 2012
@@ -337,6 +337,9 @@ final class DocFieldProcessor extends Do
if (perDocConsumer == null) {
PerDocWriteState perDocWriteState = docState.docWriter.newPerDocWriteState("");
perDocConsumer = docState.docWriter.codec.docValuesFormat().docsConsumer(perDocWriteState);
+ if (perDocConsumer == null) {
+ throw new IllegalStateException("codec=" + docState.docWriter.codec + " does not support docValues: from docValuesFormat().docsConsumer(...) returned null; field=" + fieldInfo.name);
+ }
}
DocValuesConsumer docValuesConsumer = perDocConsumer.addValuesField(valueType, fieldInfo);
fieldInfo.setDocValuesType(valueType, false);
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/DocTermOrds.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/DocTermOrds.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/DocTermOrds.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/DocTermOrds.java Tue Mar 6 18:13:38 2012
@@ -642,19 +642,17 @@ public class DocTermOrds {
* ord; in this case we "wrap" our own terms index
* around it. */
private final class OrdWrappedTermsEnum extends TermsEnum {
- private final AtomicReader reader;
private final TermsEnum termsEnum;
private BytesRef term;
private long ord = -indexInterval-1; // force "real" seek
public OrdWrappedTermsEnum(AtomicReader reader) throws IOException {
- this.reader = reader;
assert indexedTermsArray != null;
termsEnum = reader.fields().terms(field).iterator(null);
}
@Override
- public Comparator<BytesRef> getComparator() throws IOException {
+ public Comparator<BytesRef> getComparator() {
return termsEnum.getComparator();
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/DocValues.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/DocValues.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/DocValues.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/DocValues.java Tue Mar 6 18:13:38 2012
@@ -148,6 +148,7 @@ public abstract class DocValues implemen
protected Source(Type type) {
this.type = type;
}
+
/**
* Returns a <tt>long</tt> for the given document id or throws an
* {@link UnsupportedOperationException} if this source doesn't support
@@ -239,9 +240,10 @@ public abstract class DocValues implemen
public BytesRef getBytes(int docID, BytesRef bytesRef) {
final int ord = ord(docID);
if (ord < 0) {
+ // Negative ord means doc was missing?
bytesRef.length = 0;
} else {
- getByOrd(ord , bytesRef);
+ getByOrd(ord, bytesRef);
}
return bytesRef;
}
@@ -253,7 +255,7 @@ public abstract class DocValues implemen
public abstract int ord(int docID);
/** Returns value for specified ord. */
- public abstract BytesRef getByOrd(int ord, BytesRef bytesRef);
+ public abstract BytesRef getByOrd(int ord, BytesRef result);
/** Return true if it's safe to call {@link
* #getDocToOrd}. */
@@ -274,7 +276,7 @@ public abstract class DocValues implemen
}
/**
- * Performs a lookup by value.
+ * Lookup ord by value.
*
* @param value
* the value to look up
@@ -283,11 +285,11 @@ public abstract class DocValues implemen
* values to the given value. Must not be <code>null</code>
* @return the given values ordinal if found or otherwise
* <code>(-(ord)-1)</code>, defined as the ordinal of the first
- * element that is greater than the given value. This guarantees
- * that the return value will always be >= 0 if the given value
- * is found.
+ * element that is greater than the given value (the insertion
+ * point). This guarantees that the return value will always be
+ * >= 0 if the given value is found.
*/
- public int getByValue(BytesRef value, BytesRef spare) {
+ public int getOrdByValue(BytesRef value, BytesRef spare) {
return binarySearch(value, spare, 0, getValueCount() - 1);
}
@@ -405,7 +407,7 @@ public abstract class DocValues implemen
}
@Override
- public int getByValue(BytesRef value, BytesRef spare) {
+ public int getOrdByValue(BytesRef value, BytesRef spare) {
if (value.length == 0) {
return 0;
} else {
@@ -414,7 +416,7 @@ public abstract class DocValues implemen
}
@Override
- public int getValueCount() {
+ public int getValueCount() {
return 1;
}
};
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/FilterAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/FilterAtomicReader.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/FilterAtomicReader.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/FilterAtomicReader.java Tue Mar 6 18:13:38 2012
@@ -17,8 +17,10 @@ package org.apache.lucene.index;
* limitations under the License.
*/
+import org.apache.lucene.util.AttributeSource;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
+import org.apache.lucene.util.automaton.CompiledAutomaton;
import java.io.IOException;
import java.util.Comparator;
@@ -37,7 +39,7 @@ public class FilterAtomicReader extends
/** Base class for filtering {@link Fields}
* implementations. */
public static class FilterFields extends Fields {
- protected Fields in;
+ protected final Fields in;
public FilterFields(Fields in) {
this.in = in;
@@ -57,12 +59,17 @@ public class FilterAtomicReader extends
public int getUniqueFieldCount() throws IOException {
return in.getUniqueFieldCount();
}
+
+ @Override
+ public long getUniqueTermCount() throws IOException {
+ return in.getUniqueTermCount();
+ }
}
/** Base class for filtering {@link Terms}
* implementations. */
public static class FilterTerms extends Terms {
- protected Terms in;
+ protected final Terms in;
public FilterTerms(Terms in) {
this.in = in;
@@ -97,11 +104,16 @@ public class FilterAtomicReader extends
public int getDocCount() throws IOException {
return in.getDocCount();
}
+
+ @Override
+ public TermsEnum intersect(CompiledAutomaton automaton, BytesRef bytes) throws java.io.IOException {
+ return in.intersect(automaton, bytes);
+ }
}
/** Base class for filtering {@link TermsEnum} implementations. */
public static class FilterFieldsEnum extends FieldsEnum {
- protected FieldsEnum in;
+ protected final FieldsEnum in;
public FilterFieldsEnum(FieldsEnum in) {
this.in = in;
}
@@ -115,11 +127,16 @@ public class FilterAtomicReader extends
public Terms terms() throws IOException {
return in.terms();
}
+
+ @Override
+ public AttributeSource attributes() {
+ return in.attributes();
+ }
}
/** Base class for filtering {@link TermsEnum} implementations. */
public static class FilterTermsEnum extends TermsEnum {
- protected TermsEnum in;
+ protected final TermsEnum in;
public FilterTermsEnum(TermsEnum in) { this.in = in; }
@@ -174,7 +191,7 @@ public class FilterAtomicReader extends
}
@Override
- public Comparator<BytesRef> getComparator() throws IOException {
+ public Comparator<BytesRef> getComparator() {
return in.getComparator();
}
@@ -187,11 +204,16 @@ public class FilterAtomicReader extends
public TermState termState() throws IOException {
return in.termState();
}
+
+ @Override
+ public AttributeSource attributes() {
+ return in.attributes();
+ }
}
/** Base class for filtering {@link DocsEnum} implementations. */
public static class FilterDocsEnum extends DocsEnum {
- protected DocsEnum in;
+ protected final DocsEnum in;
public FilterDocsEnum(DocsEnum in) {
this.in = in;
@@ -216,11 +238,16 @@ public class FilterAtomicReader extends
public int advance(int target) throws IOException {
return in.advance(target);
}
+
+ @Override
+ public AttributeSource attributes() {
+ return in.attributes();
+ }
}
/** Base class for filtering {@link DocsAndPositionsEnum} implementations. */
public static class FilterDocsAndPositionsEnum extends DocsAndPositionsEnum {
- protected DocsAndPositionsEnum in;
+ protected final DocsAndPositionsEnum in;
public FilterDocsAndPositionsEnum(DocsAndPositionsEnum in) {
this.in = in;
@@ -270,9 +297,14 @@ public class FilterAtomicReader extends
public boolean hasPayload() {
return in.hasPayload();
}
+
+ @Override
+ public AttributeSource attributes() {
+ return in.attributes();
+ }
}
- protected AtomicReader in;
+ protected final AtomicReader in;
/**
* <p>Construct a FilterAtomicReader based on the specified base reader.
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/FilteredTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/FilteredTermsEnum.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/FilteredTermsEnum.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/FilteredTermsEnum.java Tue Mar 6 18:13:38 2012
@@ -122,7 +122,7 @@ public abstract class FilteredTermsEnum
}
@Override
- public Comparator<BytesRef> getComparator() throws IOException {
+ public Comparator<BytesRef> getComparator() {
return tenum.getComparator();
}
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/IndexFileNameFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/IndexFileNameFilter.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/IndexFileNameFilter.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/IndexFileNameFilter.java Tue Mar 6 18:13:38 2012
@@ -19,7 +19,6 @@ package org.apache.lucene.index;
import java.io.File;
import java.io.FilenameFilter;
-import java.util.HashSet;
import java.util.regex.Pattern;
/**
Modified: lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java?rev=1297628&r1=1297627&r2=1297628&view=diff
==============================================================================
--- lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/solr_3159_jetty8/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java Tue Mar 6 18:13:38 2012
@@ -3134,7 +3134,7 @@ public class IndexWriter implements Clos
return false;
}
- final ReadersAndLiveDocs mergedDeletes = commitMergedDeletes(merge);
+ final ReadersAndLiveDocs mergedDeletes = merge.info.docCount == 0 ? null : commitMergedDeletes(merge);
assert mergedDeletes == null || mergedDeletes.pendingDeleteCount != 0;