You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2012/04/11 21:41:09 UTC
svn commit: r1324945 [1/2] - in /lucene/dev/branches/lucene3969: ./
dev-tools/ dev-tools/eclipse/ dev-tools/idea/lucene/ dev-tools/idea/solr/
dev-tools/idea/solr/contrib/dataimporthandler-extras/
dev-tools/idea/solr/contrib/dataimporthandler/ dev-tools...
Author: rmuir
Date: Wed Apr 11 19:41:06 2012
New Revision: 1324945
URL: http://svn.apache.org/viewvc?rev=1324945&view=rev
Log:
LUCENE-3969: Merged /lucene/dev/trunk:r1311219-1324765
Added:
lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/servlet/RedirectServlet.java
- copied unchanged from r1324765, lucene/dev/trunk/solr/core/src/java/org/apache/solr/servlet/RedirectServlet.java
lucene/dev/branches/lucene3969/solr/lib/jcl-over-slf4j-1.6.4.jar.sha1
- copied unchanged from r1324765, lucene/dev/trunk/solr/lib/jcl-over-slf4j-1.6.4.jar.sha1
lucene/dev/branches/lucene3969/solr/lib/log4j-over-slf4j-1.6.4.jar.sha1
- copied unchanged from r1324765, lucene/dev/trunk/solr/lib/log4j-over-slf4j-1.6.4.jar.sha1
lucene/dev/branches/lucene3969/solr/lib/slf4j-api-1.6.4.jar.sha1
- copied unchanged from r1324765, lucene/dev/trunk/solr/lib/slf4j-api-1.6.4.jar.sha1
lucene/dev/branches/lucene3969/solr/lib/slf4j-jdk14-1.6.4.jar.sha1
- copied unchanged from r1324765, lucene/dev/trunk/solr/lib/slf4j-jdk14-1.6.4.jar.sha1
lucene/dev/branches/lucene3969/solr/webapp/web/js/lib/jquery-1.7.2.min.js
- copied unchanged from r1324765, lucene/dev/trunk/solr/webapp/web/js/lib/jquery-1.7.2.min.js
Removed:
lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/servlet/LogLevelSelection.java
lucene/dev/branches/lucene3969/solr/lib/jcl-over-slf4j-1.6.1.jar.sha1
lucene/dev/branches/lucene3969/solr/lib/log4j-over-slf4j-1.6.1.jar.sha1
lucene/dev/branches/lucene3969/solr/lib/slf4j-api-1.6.1.jar.sha1
lucene/dev/branches/lucene3969/solr/lib/slf4j-jdk14-1.6.1.jar.sha1
lucene/dev/branches/lucene3969/solr/webapp/web/js/lib/jquery-1.4.3.min.js
Modified:
lucene/dev/branches/lucene3969/ (props changed)
lucene/dev/branches/lucene3969/dev-tools/ (props changed)
lucene/dev/branches/lucene3969/dev-tools/eclipse/dot.classpath
lucene/dev/branches/lucene3969/dev-tools/idea/lucene/lucene.iml
lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml
lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml
lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/extraction/extraction.iml
lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/langid/langid.iml
lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/uima/uima.iml
lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/velocity/velocity.iml
lucene/dev/branches/lucene3969/dev-tools/idea/solr/solr.iml
lucene/dev/branches/lucene3969/dev-tools/maven/pom.xml.template
lucene/dev/branches/lucene3969/dev-tools/maven/solr/contrib/clustering/pom.xml.template
lucene/dev/branches/lucene3969/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
lucene/dev/branches/lucene3969/dev-tools/maven/solr/test-framework/pom.xml.template
lucene/dev/branches/lucene3969/dev-tools/scripts/crawl.maven.release.dist.sh (contents, props changed)
lucene/dev/branches/lucene3969/dev-tools/scripts/write.stage.maven.build.xml.pl (props changed)
lucene/dev/branches/lucene3969/lucene/ (props changed)
lucene/dev/branches/lucene3969/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene3969/lucene/contrib/ (props changed)
lucene/dev/branches/lucene3969/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
lucene/dev/branches/lucene3969/lucene/core/ (props changed)
lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java
lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java
lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java
lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFields.java
lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java
lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java
lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java
lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java
lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/Fields.java
lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/FilterAtomicReader.java
lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/MultiFields.java
lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/MultiTerms.java
lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/ParallelAtomicReader.java
lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/Terms.java
lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java
lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java
lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/document/TestDocument.java
lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java
lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java
lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java
lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java
lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java
lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java
lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/search/FieldCacheRewriteMethod.java
lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java
lucene/dev/branches/lucene3969/lucene/test-framework/ (props changed)
lucene/dev/branches/lucene3969/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java
lucene/dev/branches/lucene3969/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java
lucene/dev/branches/lucene3969/modules/analysis/common/ (props changed)
lucene/dev/branches/lucene3969/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
lucene/dev/branches/lucene3969/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java
lucene/dev/branches/lucene3969/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
lucene/dev/branches/lucene3969/solr/ (props changed)
lucene/dev/branches/lucene3969/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene3969/solr/NOTICE.txt (contents, props changed)
lucene/dev/branches/lucene3969/solr/core/ (props changed)
lucene/dev/branches/lucene3969/solr/core/ivy.xml
lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java
lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/core/StandardIndexReaderFactory.java
lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java
lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
lucene/dev/branches/lucene3969/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
lucene/dev/branches/lucene3969/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
lucene/dev/branches/lucene3969/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java
lucene/dev/branches/lucene3969/solr/example/ (props changed)
lucene/dev/branches/lucene3969/solr/example/solr/conf/solrconfig.xml
lucene/dev/branches/lucene3969/solr/example/solr/conf/velocity/head.vm
lucene/dev/branches/lucene3969/solr/lib/ (props changed)
lucene/dev/branches/lucene3969/solr/solrj/ (props changed)
lucene/dev/branches/lucene3969/solr/solrj/ivy.xml
lucene/dev/branches/lucene3969/solr/webapp/web/WEB-INF/web.xml
Modified: lucene/dev/branches/lucene3969/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/dev-tools/eclipse/dot.classpath?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/lucene3969/dev-tools/eclipse/dot.classpath Wed Apr 11 19:41:06 2012
@@ -109,10 +109,10 @@
<classpathentry kind="lib" path="solr/lib/commons-lang-2.6.jar"/>
<classpathentry kind="lib" path="solr/lib/easymock-2.2.jar"/>
<classpathentry kind="lib" path="solr/lib/guava-r05.jar"/>
- <classpathentry kind="lib" path="solr/lib/jcl-over-slf4j-1.6.1.jar"/>
- <classpathentry kind="lib" path="solr/lib/log4j-over-slf4j-1.6.1.jar"/>
- <classpathentry kind="lib" path="solr/lib/slf4j-api-1.6.1.jar"/>
- <classpathentry kind="lib" path="solr/lib/slf4j-jdk14-1.6.1.jar"/>
+ <classpathentry kind="lib" path="solr/lib/jcl-over-slf4j-1.6.4.jar"/>
+ <classpathentry kind="lib" path="solr/lib/log4j-over-slf4j-1.6.4.jar"/>
+ <classpathentry kind="lib" path="solr/lib/slf4j-api-1.6.4.jar"/>
+ <classpathentry kind="lib" path="solr/lib/slf4j-jdk14-1.6.4.jar"/>
<classpathentry kind="lib" path="solr/lib/wstx-asl-3.2.7.jar"/>
<classpathentry kind="lib" path="solr/lib/zookeeper-3.3.4.jar"/>
<classpathentry kind="lib" path="solr/example/lib/jetty-continuation-8.1.2.v20120308.jar"/>
Modified: lucene/dev/branches/lucene3969/dev-tools/idea/lucene/lucene.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/dev-tools/idea/lucene/lucene.iml?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/dev-tools/idea/lucene/lucene.iml (original)
+++ lucene/dev/branches/lucene3969/dev-tools/idea/lucene/lucene.iml Wed Apr 11 19:41:06 2012
@@ -16,16 +16,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
- <orderEntry type="module-library">
- <library>
- <CLASSES>
- <root url="file://$MODULE_DIR$/test-framework/lib" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- <jarDirectory url="file://$MODULE_DIR$/test-framework/lib" recursive="false" />
- </library>
- </orderEntry>
+ <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
</component>
</module>
Modified: lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml (original)
+++ lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/dataimporthandler-extras/dataimporthandler-extras.iml Wed Apr 11 19:41:06 2012
@@ -11,6 +11,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
<orderEntry type="library" name="Solr library" level="project" />
<orderEntry type="library" name="Solr DIH library" level="project" />
<orderEntry type="library" name="Solr extraction library" level="project" />
Modified: lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml (original)
+++ lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/dataimporthandler/dataimporthandler.iml Wed Apr 11 19:41:06 2012
@@ -12,6 +12,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
<orderEntry type="library" name="Solr library" level="project" />
<orderEntry type="library" name="Solr DIH library" level="project" />
<orderEntry type="module" module-name="solr" />
Modified: lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/extraction/extraction.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/extraction/extraction.iml?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/extraction/extraction.iml (original)
+++ lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/extraction/extraction.iml Wed Apr 11 19:41:06 2012
@@ -11,6 +11,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
<orderEntry type="library" name="Solr library" level="project" />
<orderEntry type="library" name="Solr extraction library" level="project" />
<orderEntry type="module" module-name="solr" />
Modified: lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/langid/langid.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/langid/langid.iml?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/langid/langid.iml (original)
+++ lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/langid/langid.iml Wed Apr 11 19:41:06 2012
@@ -12,6 +12,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
<orderEntry type="library" name="Solr library" level="project" />
<orderEntry type="library" name="Solr extraction library" level="project" />
<orderEntry type="module-library">
Modified: lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/uima/uima.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/uima/uima.iml?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/uima/uima.iml (original)
+++ lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/uima/uima.iml Wed Apr 11 19:41:06 2012
@@ -12,6 +12,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
<orderEntry type="library" name="Solr library" level="project" />
<orderEntry type="module-library">
<library>
Modified: lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/velocity/velocity.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/velocity/velocity.iml?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/velocity/velocity.iml (original)
+++ lucene/dev/branches/lucene3969/dev-tools/idea/solr/contrib/velocity/velocity.iml Wed Apr 11 19:41:06 2012
@@ -11,6 +11,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
<orderEntry type="library" name="Solr library" level="project" />
<orderEntry type="library" name="Solr velocity library" level="project" />
<orderEntry type="module" module-name="solr" />
Modified: lucene/dev/branches/lucene3969/dev-tools/idea/solr/solr.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/dev-tools/idea/solr/solr.iml?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/dev-tools/idea/solr/solr.iml (original)
+++ lucene/dev/branches/lucene3969/dev-tools/idea/solr/solr.iml Wed Apr 11 19:41:06 2012
@@ -18,6 +18,7 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" scope="TEST" name="JUnit" level="project" />
<orderEntry type="library" name="Solr library" level="project" />
<orderEntry type="library" name="Solr example library" level="project" />
<orderEntry type="module" module-name="kuromoji" />
Modified: lucene/dev/branches/lucene3969/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/dev-tools/maven/pom.xml.template?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/lucene3969/dev-tools/maven/pom.xml.template Wed Apr 11 19:41:06 2012
@@ -43,8 +43,8 @@
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
<java.compat.version>1.6</java.compat.version>
<jetty.version>8.1.2.v20120308</jetty.version>
- <slf4j.version>1.6.1</slf4j.version>
- <tika.version>1.0</tika.version>
+ <slf4j.version>1.6.4</slf4j.version>
+ <tika.version>1.1</tika.version>
<httpcomponents.version>4.1.3</httpcomponents.version>
<tests.asserts.gracious>false</tests.asserts.gracious>
Modified: lucene/dev/branches/lucene3969/dev-tools/maven/solr/contrib/clustering/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/dev-tools/maven/solr/contrib/clustering/pom.xml.template?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/dev-tools/maven/solr/contrib/clustering/pom.xml.template (original)
+++ lucene/dev/branches/lucene3969/dev-tools/maven/solr/contrib/clustering/pom.xml.template Wed Apr 11 19:41:06 2012
@@ -93,21 +93,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene3969/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template (original)
+++ lucene/dev/branches/lucene3969/dev-tools/maven/solr/contrib/dataimporthandler/pom.xml.template Wed Apr 11 19:41:06 2012
@@ -72,21 +72,6 @@
<artifactId>easymock</artifactId>
<scope>test</scope>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-server</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-servlet</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-util</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene3969/dev-tools/maven/solr/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/dev-tools/maven/solr/test-framework/pom.xml.template?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/dev-tools/maven/solr/test-framework/pom.xml.template (original)
+++ lucene/dev/branches/lucene3969/dev-tools/maven/solr/test-framework/pom.xml.template Wed Apr 11 19:41:06 2012
@@ -63,6 +63,23 @@
<groupId>junit</groupId>
<artifactId>junit</artifactId>
</dependency>
+ <!-- If your tests don't use BaseDistributedSearchTestCase or SolrJettyTestBase,
+ you can exclude the three Jetty dependencies below. -->
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-server</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-util</artifactId>
+ <scope>runtime</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
+ <scope>runtime</scope>
+ </dependency>
</dependencies>
<build>
<directory>${build-directory}</directory>
Modified: lucene/dev/branches/lucene3969/dev-tools/scripts/crawl.maven.release.dist.sh
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/dev-tools/scripts/crawl.maven.release.dist.sh?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/dev-tools/scripts/crawl.maven.release.dist.sh (original)
+++ lucene/dev/branches/lucene3969/dev-tools/scripts/crawl.maven.release.dist.sh Wed Apr 11 19:41:06 2012
@@ -1,7 +1,8 @@
#!/bin/sh
#
-# Crawls all Maven release distribution artifacts at the given URL
-# and downloads them to the current directory.
+# Crawls all Maven release distribution artifacts at the given release RC URL
+# and downloads them to ./lucene/ and ./solr/ after first creating these
+# two directories in the current directory.
#
#
# Licensed to the Apache Software Foundation (ASF) under one or more
@@ -21,9 +22,30 @@
#
if [ -z "$1" ] ; then
- echo "Usage: $0 <RC-url-to-lucene-or-solr-maven-dist-dir>"
- echo "Example: $0 'http://people.apache.org/~rmuir/staging_area/lucene-solr-3.6RC0-rev1309642/solr/maven/'"
+ echo "Usage: $0 <RC-URL>"
+ echo ""
+ echo "Example: $0 http://s.apache.org/lusolr36rc1"
exit 1;
fi
-wget -r -np -l 0 -nH -erobots=off --cut-dirs=8 --reject="*.md5,*.sha1,maven-metadata.xml*,index.html*" "$1/"
\ No newline at end of file
+# Resolve redirects, e.g. from URL shortening, e.g. http://s.apache.org/lusolr36rc1
+RC_URL=`(echo "Location: $1" ; wget -l 1 --spider "$1" 2>&1) \
+ | perl -ne '$url=$1 if (/Location:\s*(\S+)/); END { print "$url" if ($url); }'`
+
+if [ -d lucene ] ; then
+ echo "Please remove directory ./lucene/ before running this script."
+ exit 1;
+elif [ -d solr ] ; then
+ echo "Please remove directory ./solr/ before running this script."
+ exit 1;
+fi
+mkdir lucene
+cd lucene
+wget -r -np -l 0 -nH -erobots=off --cut-dirs=8 \
+ --reject="*.md5,*.sha1,maven-metadata.xml*,index.html*" "${RC_URL}/lucene/maven/"
+cd ..
+mkdir solr
+cd solr
+wget -r -np -l 0 -nH -erobots=off --cut-dirs=8 \
+ --reject="*.md5,*.sha1,maven-metadata.xml*,index.html*" "${RC_URL}/solr/maven/"
+cd ..
Modified: lucene/dev/branches/lucene3969/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/CHANGES.txt?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene3969/lucene/CHANGES.txt Wed Apr 11 19:41:06 2012
@@ -259,6 +259,9 @@ Changes in backwards compatibility polic
* LUCENE-2000: clone() now returns covariant types where possible. (ryan)
+* LUCENE-3970: Rename Fields.getUniqueFieldCount -> .size() and
+ Terms.getUniqueTermCount -> .size(). (Iulius Curt via Mike McCandless)
+
Changes in Runtime Behavior
* LUCENE-2846: omitNorms now behaves like omitTermFrequencyAndPositions, if you
Modified: lucene/dev/branches/lucene3969/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (original)
+++ lucene/dev/branches/lucene3969/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java Wed Apr 11 19:41:06 2012
@@ -759,7 +759,7 @@ public class MemoryIndex {
}
@Override
- public long getUniqueTermCount() {
+ public long size() {
return info.sortedTerms.length;
}
@@ -785,7 +785,7 @@ public class MemoryIndex {
}
@Override
- public int getUniqueFieldCount() {
+ public int size() {
return sortedFields.length;
}
}
Modified: lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java Wed Apr 11 19:41:06 2012
@@ -202,7 +202,7 @@ public class BlockTermsReader extends Fi
}
@Override
- public int getUniqueFieldCount() {
+ public int size() {
return fields.size();
}
@@ -261,7 +261,7 @@ public class BlockTermsReader extends Fi
}
@Override
- public long getUniqueTermCount() {
+ public long size() {
return numTerms;
}
Modified: lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java Wed Apr 11 19:41:06 2012
@@ -216,7 +216,7 @@ public class BlockTreeTermsReader extend
}
@Override
- public int getUniqueFieldCount() {
+ public int size() {
return fields.size();
}
@@ -455,7 +455,7 @@ public class BlockTreeTermsReader extend
}
@Override
- public long getUniqueTermCount() {
+ public long size() {
return numTerms;
}
Modified: lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java Wed Apr 11 19:41:06 2012
@@ -166,17 +166,17 @@ public abstract class TermVectorsWriter
/** Safe (but, slowish) default method to write every
* vector field in the document. This default
* implementation requires that the vectors implement
- * both Fields.getUniqueFieldCount and
- * Terms.getUniqueTermCount. */
+ * both Fields.size and
+ * Terms.size. */
protected final void addAllDocVectors(Fields vectors, FieldInfos fieldInfos) throws IOException {
if (vectors == null) {
startDocument(0);
return;
}
- final int numFields = vectors.getUniqueFieldCount();
+ final int numFields = vectors.size();
if (numFields == -1) {
- throw new IllegalStateException("vectors.getUniqueFieldCount() must be implemented (it returned -1)");
+ throw new IllegalStateException("vectors.size() must be implemented (it returned -1)");
}
startDocument(numFields);
@@ -195,9 +195,9 @@ public abstract class TermVectorsWriter
// FieldsEnum shouldn't lie...
continue;
}
- final int numTerms = (int) terms.getUniqueTermCount();
+ final int numTerms = (int) terms.size();
if (numTerms == -1) {
- throw new IllegalStateException("vector.getUniqueTermCount() must be implemented (it returned -1)");
+ throw new IllegalStateException("terms.size() must be implemented (it returned -1)");
}
final TermsEnum termsEnum = terms.iterator(null);
Modified: lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFields.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFields.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xFields.java Wed Apr 11 19:41:06 2012
@@ -161,7 +161,7 @@ class Lucene3xFields extends FieldsProdu
}
@Override
- public int getUniqueFieldCount() {
+ public int size() {
return preTerms.size();
}
@@ -246,7 +246,7 @@ class Lucene3xFields extends FieldsProdu
}
@Override
- public long getUniqueTermCount() throws IOException {
+ public long size() throws IOException {
return -1;
}
Modified: lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/lucene3x/Lucene3xTermVectorsReader.java Wed Apr 11 19:41:06 2012
@@ -270,7 +270,7 @@ class Lucene3xTermVectorsReader extends
}
@Override
- public int getUniqueFieldCount() {
+ public int size() {
if (fieldNumbers == null) {
return 0;
} else {
@@ -307,7 +307,7 @@ class Lucene3xTermVectorsReader extends
}
@Override
- public long getUniqueTermCount() {
+ public long size() {
return numTerms;
}
@@ -660,7 +660,7 @@ class Lucene3xTermVectorsReader extends
}
if (tvx != null) {
Fields fields = new TVFields(docID);
- if (fields.getUniqueFieldCount() == 0) {
+ if (fields.size() == 0) {
// TODO: we can improve writer here, eg write 0 into
// tvx file, so we know on first read from tvx that
// this doc has no TVs
Modified: lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java Wed Apr 11 19:41:06 2012
@@ -300,7 +300,7 @@ public class Lucene40TermVectorsReader e
}
@Override
- public int getUniqueFieldCount() {
+ public int size() {
if (fieldNumbers == null) {
return 0;
} else {
@@ -335,7 +335,7 @@ public class Lucene40TermVectorsReader e
}
@Override
- public long getUniqueTermCount() {
+ public long size() {
return numTerms;
}
@@ -674,7 +674,7 @@ public class Lucene40TermVectorsReader e
}
if (tvx != null) {
Fields fields = new TVFields(docID);
- if (fields.getUniqueFieldCount() == 0) {
+ if (fields.size() == 0) {
// TODO: we can improve writer here, eg write 0 into
// tvx file, so we know on first read from tvx that
// this doc has no TVs
Modified: lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java Wed Apr 11 19:41:06 2012
@@ -824,7 +824,7 @@ public class MemoryPostingsFormat extend
}
@Override
- public long getUniqueTermCount() throws IOException {
+ public long size() throws IOException {
return termCount;
}
@@ -888,7 +888,7 @@ public class MemoryPostingsFormat extend
}
@Override
- public int getUniqueFieldCount() {
+ public int size() {
return fields.size();
}
Modified: lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java Wed Apr 11 19:41:06 2012
@@ -248,7 +248,7 @@ public abstract class PerFieldPostingsFo
}
@Override
- public int getUniqueFieldCount() {
+ public int size() {
return fields.size();
}
Modified: lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java Wed Apr 11 19:41:06 2012
@@ -596,7 +596,7 @@ class SimpleTextFieldsReader extends Fie
}
@Override
- public long getUniqueTermCount() {
+ public long size() {
return (long) termCount;
}
@@ -641,7 +641,7 @@ class SimpleTextFieldsReader extends Fie
}
@Override
- public int getUniqueFieldCount() {
+ public int size() {
return -1;
}
Modified: lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java Wed Apr 11 19:41:06 2012
@@ -257,7 +257,7 @@ public class SimpleTextTermVectorsReader
}
@Override
- public int getUniqueFieldCount() throws IOException {
+ public int size() throws IOException {
return fields.size();
}
}
@@ -281,7 +281,7 @@ public class SimpleTextTermVectorsReader
}
@Override
- public long getUniqueTermCount() throws IOException {
+ public long size() throws IOException {
return terms.size();
}
Modified: lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java Wed Apr 11 19:41:06 2012
@@ -1051,7 +1051,7 @@ public class CheckIndex {
long termCount = -1;
if (status.termCount-termCountStart > 0) {
- termCount = fields.terms(field).getUniqueTermCount();
+ termCount = fields.terms(field).size();
if (termCount != -1 && termCount != status.termCount - termCountStart) {
throw new RuntimeException("termCount mismatch " + termCount + " vs " + (status.termCount - termCountStart));
@@ -1104,7 +1104,7 @@ public class CheckIndex {
}
}
- int fieldCount = fields.getUniqueFieldCount();
+ int fieldCount = fields.size();
if (fieldCount != -1) {
if (fieldCount < 0) {
Modified: lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/Fields.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/Fields.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/Fields.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/Fields.java Wed Apr 11 19:41:06 2012
@@ -36,7 +36,7 @@ public abstract class Fields {
* measure isn't stored by the codec. Note that, just like
* other term measures, this measure does not take deleted
* documents into account. */
- public abstract int getUniqueFieldCount() throws IOException;
+ public abstract int size() throws IOException;
/** Returns the number of terms for all fields, or -1 if this
* measure isn't stored by the codec. Note that, just like
@@ -53,7 +53,7 @@ public abstract class Fields {
}
Terms terms = terms(field);
if (terms != null) {
- final long termCount = terms.getUniqueTermCount();
+ final long termCount = terms.size();
if (termCount == -1) {
return -1;
}
Modified: lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/FilterAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/FilterAtomicReader.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/FilterAtomicReader.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/FilterAtomicReader.java Wed Apr 11 19:41:06 2012
@@ -56,8 +56,8 @@ public class FilterAtomicReader extends
}
@Override
- public int getUniqueFieldCount() throws IOException {
- return in.getUniqueFieldCount();
+ public int size() throws IOException {
+ return in.size();
}
@Override
@@ -86,8 +86,8 @@ public class FilterAtomicReader extends
}
@Override
- public long getUniqueTermCount() throws IOException {
- return in.getUniqueTermCount();
+ public long size() throws IOException {
+ return in.size();
}
@Override
Modified: lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/MultiFields.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/MultiFields.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/MultiFields.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/MultiFields.java Wed Apr 11 19:41:06 2012
@@ -228,7 +228,7 @@ public final class MultiFields extends F
}
@Override
- public int getUniqueFieldCount() {
+ public int size() {
return -1;
}
Modified: lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/MultiTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/MultiTerms.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/MultiTerms.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/MultiTerms.java Wed Apr 11 19:41:06 2012
@@ -96,7 +96,7 @@ public final class MultiTerms extends Te
}
@Override
- public long getUniqueTermCount() throws IOException {
+ public long size() throws IOException {
return -1;
}
Modified: lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/ParallelAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/ParallelAtomicReader.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/ParallelAtomicReader.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/ParallelAtomicReader.java Wed Apr 11 19:41:06 2012
@@ -197,7 +197,7 @@ public final class ParallelAtomicReader
}
@Override
- public int getUniqueFieldCount() throws IOException {
+ public int size() throws IOException {
return fields.size();
}
}
Modified: lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/Terms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/Terms.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/Terms.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/index/Terms.java Wed Apr 11 19:41:06 2012
@@ -81,7 +81,7 @@ public abstract class Terms {
* measure isn't stored by the codec. Note that, just like
* other term measures, this measure does not take deleted
* documents into account. */
- public abstract long getUniqueTermCount() throws IOException;
+ public abstract long size() throws IOException;
/** Returns the sum of {@link TermsEnum#totalTermFreq} for
* all terms in this field, or -1 if this measure isn't
Modified: lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java Wed Apr 11 19:41:06 2012
@@ -1114,7 +1114,7 @@ class FieldCacheImpl implements FieldCac
// is fine -- GrowableWriter will reallocate as needed
long numUniqueTerms = 0;
try {
- numUniqueTerms = terms.getUniqueTermCount();
+ numUniqueTerms = terms.size();
} catch (UnsupportedOperationException uoe) {
numUniqueTerms = -1;
}
@@ -1165,7 +1165,7 @@ class FieldCacheImpl implements FieldCac
if (termOrd == termOrdToBytesOffset.size()) {
// NOTE: this code only runs if the incoming
// reader impl doesn't implement
- // getUniqueTermCount (which should be uncommon)
+ // size (which should be uncommon)
termOrdToBytesOffset = termOrdToBytesOffset.resize(ArrayUtil.oversize(1+termOrd, 1));
}
termOrdToBytesOffset.set(termOrd, bytes.copyUsingLengthPrefix(term));
@@ -1252,7 +1252,7 @@ class FieldCacheImpl implements FieldCac
// is fine -- GrowableWriter will reallocate as needed
long numUniqueTerms = 0;
try {
- numUniqueTerms = terms.getUniqueTermCount();
+ numUniqueTerms = terms.size();
} catch (UnsupportedOperationException uoe) {
numUniqueTerms = -1;
}
Modified: lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/codecs/lucene40/TestReuseDocsEnum.java Wed Apr 11 19:41:06 2012
@@ -21,7 +21,6 @@ import java.util.Random;
import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.codecs.Codec;
-import org.apache.lucene.codecs.lucene40.Lucene40PostingsFormat;
import org.apache.lucene.index.AtomicReader;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocsEnum;
@@ -63,7 +62,7 @@ public class TestReuseDocsEnum extends L
enums.put(docs, true);
}
- assertEquals(terms.getUniqueTermCount(), enums.size());
+ assertEquals(terms.size(), enums.size());
}
}.run();
IOUtils.close(writer, open, dir);
@@ -100,7 +99,7 @@ public class TestReuseDocsEnum extends L
docs = iterator.docs(new Bits.MatchNoBits(open.maxDoc()), docs, random.nextBoolean());
enums.put(docs, true);
}
- assertEquals(terms.getUniqueTermCount(), enums.size());
+ assertEquals(terms.size(), enums.size());
enums.clear();
iterator = terms.iterator(null);
@@ -141,7 +140,7 @@ public class TestReuseDocsEnum extends L
docs = iterator.docs(null, randomDocsEnum("body", term, sequentialSubReaders2, bits), random.nextBoolean());
enums.put(docs, true);
}
- assertEquals(terms.getUniqueTermCount(), enums.size());
+ assertEquals(terms.size(), enums.size());
iterator = terms.iterator(null);
enums.clear();
@@ -150,7 +149,7 @@ public class TestReuseDocsEnum extends L
docs = iterator.docs(bits, randomDocsEnum("body", term, sequentialSubReaders2, bits), random.nextBoolean());
enums.put(docs, true);
}
- assertEquals(terms.getUniqueTermCount(), enums.size());
+ assertEquals(terms.size(), enums.size());
}
IOUtils.close(writer, firstReader, secondReader, dir);
}
Modified: lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/document/TestDocument.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/document/TestDocument.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/document/TestDocument.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/document/TestDocument.java Wed Apr 11 19:41:06 2012
@@ -21,7 +21,6 @@ import java.io.StringReader;
import org.apache.lucene.analysis.EmptyTokenizer;
import org.apache.lucene.analysis.MockAnalyzer;
-import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.index.DirectoryReader;
import org.apache.lucene.index.DocsAndPositionsEnum;
import org.apache.lucene.index.Fields;
@@ -345,7 +344,7 @@ public class TestDocument extends Lucene
Fields tvFields = r.getTermVectors(0);
Terms tvs = tvFields.terms(field);
assertNotNull(tvs);
- assertEquals(2, tvs.getUniqueTermCount());
+ assertEquals(2, tvs.size());
TermsEnum tvsEnum = tvs.iterator(null);
assertEquals(new BytesRef("abc"), tvsEnum.next());
final DocsAndPositionsEnum dpEnum = tvsEnum.docsAndPositions(null, null, false);
Modified: lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestDocumentWriter.java Wed Apr 11 19:41:06 2012
@@ -290,11 +290,11 @@ public class TestDocumentWriter extends
// f1
Terms tfv1 = reader.getTermVectors(0).terms("f1");
assertNotNull(tfv1);
- assertEquals("the 'with_tv' setting should rule!",2,tfv1.getUniqueTermCount());
+ assertEquals("the 'with_tv' setting should rule!",2,tfv1.size());
// f2
Terms tfv2 = reader.getTermVectors(0).terms("f2");
assertNotNull(tfv2);
- assertEquals("the 'with_tv' setting should rule!",2,tfv2.getUniqueTermCount());
+ assertEquals("the 'with_tv' setting should rule!",2,tfv2.size());
reader.close();
}
Modified: lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java Wed Apr 11 19:41:06 2012
@@ -184,8 +184,8 @@ public class TestDuelingCodecs extends L
* checks that top-level statistics on Fields are the same
*/
public void assertFieldStatistics(Fields leftFields, Fields rightFields) throws Exception {
- if (leftFields.getUniqueFieldCount() != -1 && rightFields.getUniqueFieldCount() != -1) {
- assertEquals(info, leftFields.getUniqueFieldCount(), rightFields.getUniqueFieldCount());
+ if (leftFields.size() != -1 && rightFields.size() != -1) {
+ assertEquals(info, leftFields.size(), rightFields.size());
}
if (leftFields.getUniqueTermCount() != -1 && rightFields.getUniqueTermCount() != -1) {
@@ -238,8 +238,8 @@ public class TestDuelingCodecs extends L
if (leftTerms.getSumTotalTermFreq() != -1 && rightTerms.getSumTotalTermFreq() != -1) {
assertEquals(info, leftTerms.getSumTotalTermFreq(), rightTerms.getSumTotalTermFreq());
}
- if (leftTerms.getUniqueTermCount() != -1 && rightTerms.getUniqueTermCount() != -1) {
- assertEquals(info, leftTerms.getUniqueTermCount(), rightTerms.getUniqueTermCount());
+ if (leftTerms.size() != -1 && rightTerms.size() != -1) {
+ assertEquals(info, leftTerms.size(), rightTerms.size());
}
}
Modified: lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestSegmentMerger.java Wed Apr 11 19:41:06 2012
@@ -19,10 +19,8 @@ package org.apache.lucene.index;
import java.io.IOException;
-import org.apache.lucene.analysis.MockAnalyzer;
import org.apache.lucene.codecs.Codec;
import org.apache.lucene.document.Document;
-import org.apache.lucene.document.TextField;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.Directory;
import org.apache.lucene.util.BytesRef;
@@ -120,7 +118,7 @@ public class TestSegmentMerger extends L
Terms vector = mergedReader.getTermVectors(0).terms(DocHelper.TEXT_FIELD_2_KEY);
assertNotNull(vector);
- assertEquals(3, vector.getUniqueTermCount());
+ assertEquals(3, vector.size());
TermsEnum termsEnum = vector.iterator(null);
int i = 0;
Modified: lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestSegmentReader.java Wed Apr 11 19:41:06 2012
@@ -193,7 +193,7 @@ public class TestSegmentReader extends L
public void testTermVectors() throws IOException {
Terms result = reader.getTermVectors(0).terms(DocHelper.TEXT_FIELD_2_KEY);
assertNotNull(result);
- assertEquals(3, result.getUniqueTermCount());
+ assertEquals(3, result.size());
TermsEnum termsEnum = result.iterator(null);
while(termsEnum.next() != null) {
String term = termsEnum.term().utf8ToString();
@@ -204,6 +204,6 @@ public class TestSegmentReader extends L
Fields results = reader.getTermVectors(0);
assertTrue(results != null);
- assertEquals("We do not have 3 term freq vectors", 3, results.getUniqueFieldCount());
+ assertEquals("We do not have 3 term freq vectors", 3, results.size());
}
}
Modified: lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java Wed Apr 11 19:41:06 2012
@@ -600,7 +600,7 @@ public class TestStressIndexing2 extends
public static void verifyEquals(Fields d1, Fields d2) throws IOException {
if (d1 == null) {
- assertTrue(d2 == null || d2.getUniqueFieldCount() == 0);
+ assertTrue(d2 == null || d2.size() == 0);
return;
}
assertTrue(d2 != null);
Modified: lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsReader.java Wed Apr 11 19:41:06 2012
@@ -204,7 +204,7 @@ public class TestTermVectorsReader exten
for (int j = 0; j < 5; j++) {
Terms vector = reader.get(j).terms(testFields[0]);
assertNotNull(vector);
- assertEquals(testTerms.length, vector.getUniqueTermCount());
+ assertEquals(testTerms.length, vector.size());
TermsEnum termsEnum = vector.iterator(null);
for (int i = 0; i < testTerms.length; i++) {
final BytesRef text = termsEnum.next();
@@ -223,7 +223,7 @@ public class TestTermVectorsReader exten
for (int j = 0; j < 5; j++) {
Terms vector = reader.get(j).terms(testFields[0]);
assertNotNull(vector);
- assertEquals(testTerms.length, vector.getUniqueTermCount());
+ assertEquals(testTerms.length, vector.size());
TermsEnum termsEnum = vector.iterator(null);
DocsEnum docsEnum = null;
for (int i = 0; i < testTerms.length; i++) {
@@ -250,7 +250,7 @@ public class TestTermVectorsReader exten
BytesRef[] terms;
Terms vector = reader.get(0).terms(testFields[0]);
assertNotNull(vector);
- assertEquals(testTerms.length, vector.getUniqueTermCount());
+ assertEquals(testTerms.length, vector.size());
TermsEnum termsEnum = vector.iterator(null);
DocsAndPositionsEnum dpEnum = null;
for (int i = 0; i < testTerms.length; i++) {
@@ -287,7 +287,7 @@ public class TestTermVectorsReader exten
Terms freqVector = reader.get(0).terms(testFields[1]); //no pos, no offset
assertNotNull(freqVector);
- assertEquals(testTerms.length, freqVector.getUniqueTermCount());
+ assertEquals(testTerms.length, freqVector.size());
termsEnum = freqVector.iterator(null);
assertNotNull(termsEnum);
for (int i = 0; i < testTerms.length; i++) {
@@ -306,7 +306,7 @@ public class TestTermVectorsReader exten
assertNotNull(vector);
TermsEnum termsEnum = vector.iterator(null);
assertNotNull(termsEnum);
- assertEquals(testTerms.length, vector.getUniqueTermCount());
+ assertEquals(testTerms.length, vector.size());
DocsAndPositionsEnum dpEnum = null;
for (int i = 0; i < testTerms.length; i++) {
final BytesRef text = termsEnum.next();
Modified: lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/search/FieldCacheRewriteMethod.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/search/FieldCacheRewriteMethod.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/search/FieldCacheRewriteMethod.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/search/FieldCacheRewriteMethod.java Wed Apr 11 19:41:06 2012
@@ -119,7 +119,7 @@ public final class FieldCacheRewriteMeth
}
@Override
- public long getUniqueTermCount() throws IOException {
+ public long size() throws IOException {
return -1;
}
});
Modified: lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java (original)
+++ lucene/dev/branches/lucene3969/lucene/core/src/test/org/apache/lucene/search/TestTermVectors.java Wed Apr 11 19:41:06 2012
@@ -98,7 +98,7 @@ public class TestTermVectors extends Luc
for (int i = 0; i < hits.length; i++) {
Fields vectors = searcher.reader.getTermVectors(hits[i].doc);
assertNotNull(vectors);
- assertEquals("doc=" + hits[i].doc + " tv=" + vectors, 1, vectors.getUniqueFieldCount());
+ assertEquals("doc=" + hits[i].doc + " tv=" + vectors, 1, vectors.size());
}
Terms vector;
vector = searcher.reader.getTermVectors(hits[0].doc).terms("noTV");
@@ -121,13 +121,13 @@ public class TestTermVectors extends Luc
IndexReader reader = writer.getReader();
writer.close();
Fields v = reader.getTermVectors(0);
- assertEquals(4, v.getUniqueFieldCount());
+ assertEquals(4, v.size());
String[] expectedFields = new String[]{"a", "b", "c", "x"};
int[] expectedPositions = new int[]{1, 2, 0};
FieldsEnum fieldsEnum = v.iterator();
for(int i=0;i<expectedFields.length;i++) {
assertEquals(expectedFields[i], fieldsEnum.next());
- assertEquals(3, v.terms(expectedFields[i]).getUniqueTermCount());
+ assertEquals(3, v.terms(expectedFields[i]).size());
DocsAndPositionsEnum dpEnum = null;
Terms terms = fieldsEnum.terms();
@@ -166,7 +166,7 @@ public class TestTermVectors extends Luc
for (int i = 0; i < hits.length; i++) {
Fields vectors = searcher.reader.getTermVectors(hits[i].doc);
assertNotNull(vectors);
- assertEquals(1, vectors.getUniqueFieldCount());
+ assertEquals(1, vectors.size());
TermsEnum termsEnum = vectors.terms("field").iterator(null);
assertNotNull(termsEnum.next());
@@ -205,7 +205,7 @@ public class TestTermVectors extends Luc
for (int i = 0; i < hits.length; i++) {
Fields vectors = searcher.reader.getTermVectors(hits[i].doc);
assertNotNull(vectors);
- assertEquals(1, vectors.getUniqueFieldCount());
+ assertEquals(1, vectors.size());
}
}
@@ -303,7 +303,7 @@ public class TestTermVectors extends Luc
Terms vector = knownSearcher.reader.getTermVectors(hits[1].doc).terms("field");
assertNotNull(vector);
//System.out.println("Vector: " + vector);
- assertEquals(10, vector.getUniqueTermCount());
+ assertEquals(10, vector.size());
TermsEnum termsEnum = vector.iterator(null);
while(termsEnum.next() != null) {
String term = termsEnum.term().utf8ToString();
@@ -371,7 +371,7 @@ public class TestTermVectors extends Luc
Fields vectors = searcher.reader.getTermVectors(hits[i].doc);
assertNotNull(vectors);
- assertEquals(1, vectors.getUniqueFieldCount());
+ assertEquals(1, vectors.size());
}
reader.close();
}
@@ -418,10 +418,10 @@ public class TestTermVectors extends Luc
Fields vectors = searcher.reader.getTermVectors(hits[0].doc);
assertNotNull(vectors);
- assertEquals(1, vectors.getUniqueFieldCount());
+ assertEquals(1, vectors.size());
Terms vector = vectors.terms("field");
assertNotNull(vector);
- assertEquals(1, vector.getUniqueTermCount());
+ assertEquals(1, vector.size());
TermsEnum termsEnum = vector.iterator(null);
assertNotNull(termsEnum.next());
assertEquals("one", termsEnum.term().utf8ToString());
Modified: lucene/dev/branches/lucene3969/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java (original)
+++ lucene/dev/branches/lucene3969/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java Wed Apr 11 19:41:06 2012
@@ -109,7 +109,7 @@ public class RAMOnlyPostingsFormat exten
}
@Override
- public int getUniqueFieldCount() {
+ public int size() {
return fieldToTerms.size();
}
@@ -135,7 +135,7 @@ public class RAMOnlyPostingsFormat exten
}
@Override
- public long getUniqueTermCount() {
+ public long size() {
return termToDocs.size();
}
Modified: lucene/dev/branches/lucene3969/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java (original)
+++ lucene/dev/branches/lucene3969/lucene/test-framework/src/java/org/apache/lucene/index/FieldFilterAtomicReader.java Wed Apr 11 19:41:06 2012
@@ -130,7 +130,7 @@ public final class FieldFilterAtomicRead
}
@Override
- public int getUniqueFieldCount() throws IOException {
+ public int size() throws IOException {
// TODO: add faster implementation!
int c = 0;
final FieldsEnum it = iterator();
Modified: lucene/dev/branches/lucene3969/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java (original)
+++ lucene/dev/branches/lucene3969/modules/analysis/common/src/test/org/apache/lucene/analysis/sinks/TestTeeSinkTokenFilter.java Wed Apr 11 19:41:06 2012
@@ -30,7 +30,6 @@ import org.apache.lucene.document.Field;
import org.apache.lucene.document.FieldType;
import org.apache.lucene.document.TextField;
import org.apache.lucene.index.DocsAndPositionsEnum;
-import org.apache.lucene.index.DocsEnum;
import org.apache.lucene.index.IndexReader;
import org.apache.lucene.index.IndexWriter;
import org.apache.lucene.index.Terms;
@@ -106,7 +105,7 @@ public class TestTeeSinkTokenFilter exte
IndexReader r = IndexReader.open(dir);
Terms vector = r.getTermVectors(0).terms("field");
- assertEquals(1, vector.getUniqueTermCount());
+ assertEquals(1, vector.size());
TermsEnum termsEnum = vector.iterator(null);
termsEnum.next();
assertEquals(2, termsEnum.totalTermFreq());
Modified: lucene/dev/branches/lucene3969/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java (original)
+++ lucene/dev/branches/lucene3969/modules/analysis/common/src/test/org/apache/lucene/analysis/synonym/TestSynonymMapFilter.java Wed Apr 11 19:41:06 2012
@@ -447,7 +447,11 @@ public class TestSynonymMapFilter extend
checkRandomData(random, analyzer, 1000*RANDOM_MULTIPLIER);
}
}
-
+
+ // NOTE: this is an invalid test... SynFilter today can't
+ // properly consume a graph... we can re-enable this once
+ // we fix that...
+ /*
// Adds MockGraphTokenFilter before SynFilter:
public void testRandom2GraphBefore() throws Exception {
final int numIters = atLeast(10);
@@ -472,6 +476,7 @@ public class TestSynonymMapFilter extend
checkRandomData(random, analyzer, 1000*RANDOM_MULTIPLIER);
}
}
+ */
// Adds MockGraphTokenFilter after SynFilter:
public void testRandom2GraphAfter() throws Exception {
Modified: lucene/dev/branches/lucene3969/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java (original)
+++ lucene/dev/branches/lucene3969/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/TestPerfTasksLogic.java Wed Apr 11 19:41:06 2012
@@ -752,7 +752,7 @@ public class TestPerfTasksLogic extends
IndexReader reader = IndexReader.open(dir);
Fields tfv = reader.getTermVectors(0);
assertNotNull(tfv);
- assertTrue(tfv.getUniqueFieldCount() > 0);
+ assertTrue(tfv.size() > 0);
reader.close();
}
Modified: lucene/dev/branches/lucene3969/solr/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/solr/CHANGES.txt?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/solr/CHANGES.txt (original)
+++ lucene/dev/branches/lucene3969/solr/CHANGES.txt Wed Apr 11 19:41:06 2012
@@ -482,6 +482,9 @@ Other Changes
* SOLR-3329: Dropped getSourceID() from SolrInfoMBean and using
getClass().getPackage().getSpecificationVersion() for Version. (ryan)
+* SOLR-3302: Upgraded SLF4j to version 1.6.4 (hossman)
+
+* SOLR-3322: Add more context to IndexReaderFactory.newReader (ab)
Documentation
----------------------
Modified: lucene/dev/branches/lucene3969/solr/NOTICE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/solr/NOTICE.txt?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/solr/NOTICE.txt (original)
+++ lucene/dev/branches/lucene3969/solr/NOTICE.txt Wed Apr 11 19:41:06 2012
@@ -244,7 +244,14 @@ Copyright 2001-2005 (C) MetaStuff, Ltd.
Copyright 2004 Sun Microsystems, Inc. (Rome JAR)
Copyright 2002-2008 by John Cowan (TagSoup -- http://ccil.org/~cowan/XML/tagsoup/)
-
+
+Copyright (C) 1999-2007 Shigeru Chiba. All Rights Reserved.
+(Javassist, MPL licensed: http://www.csg.ci.i.u-tokyo.ac.jp/~chiba/javassist/)
+
+Copyright (C) 1994-2007 by the Xiph.org Foundation, http://www.xiph.org/ (OggVorbis)
+
+Scannotation (C) Bill Burke
+
=========================================================================
== Language Detection Notices ==
=========================================================================
Modified: lucene/dev/branches/lucene3969/solr/core/ivy.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/solr/core/ivy.xml?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/solr/core/ivy.xml (original)
+++ lucene/dev/branches/lucene3969/solr/core/ivy.xml Wed Apr 11 19:41:06 2012
@@ -25,14 +25,14 @@
<dependency org="org.apache.httpcomponents" name="httpcore" rev="4.1.4" transitive="false"/>
<dependency org="org.apache.httpcomponents" name="httpclient" rev="4.1.3" transitive="false"/>
<dependency org="org.apache.httpcomponents" name="httpmime" rev="4.1.3" transitive="false"/>
- <dependency org="org.slf4j" name="jcl-over-slf4j" rev="1.6.1" transitive="false"/>
+ <dependency org="org.slf4j" name="jcl-over-slf4j" rev="1.6.4" transitive="false"/>
<dependency org="commons-io" name="commons-io" rev="2.1" transitive="false"/>
<dependency org="commons-lang" name="commons-lang" rev="2.6" transitive="false"/>
<dependency org="com.google.guava" name="guava" rev="r05" transitive="false"/>
<dependency org="org.codehaus.woodstox" name="wstx-asl" rev="3.2.7" transitive="false"/>
<dependency org="org.easymock" name="easymock" rev="2.2" transitive="false"/>
- <dependency org="org.slf4j" name="slf4j-api" rev="1.6.1" transitive="false"/>
- <dependency org="org.slf4j" name="slf4j-jdk14" rev="1.6.1" transitive="false"/>
+ <dependency org="org.slf4j" name="slf4j-api" rev="1.6.4" transitive="false"/>
+ <dependency org="org.slf4j" name="slf4j-jdk14" rev="1.6.4" transitive="false"/>
<dependency org="com.spatial4j" name="spatial4j" rev="0.2" transitive="false"/>
<dependency org="javax.servlet" name="javax.servlet-api" rev="3.0.1" transitive="false"/>
<exclude org="*" ext="*" matcher="regexp" type="${ivy.exclude.types}"/>
Modified: lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java (original)
+++ lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/core/IndexReaderFactory.java Wed Apr 11 19:41:06 2012
@@ -58,9 +58,13 @@ public abstract class IndexReaderFactory
* Creates a new IndexReader instance using the given Directory.
*
* @param indexDir indexDir index location
+ * @param core {@link SolrCore} instance where this reader will be used. NOTE:
+ * this SolrCore instance may not be fully configured yet, but basic things like
+ * {@link SolrCore#getCoreDescriptor()}, {@link SolrCore#getSchema()} and
+ * {@link SolrCore#getSolrConfig()} are valid.
* @return An IndexReader instance
* @throws IOException
*/
- public abstract DirectoryReader newReader(Directory indexDir)
+ public abstract DirectoryReader newReader(Directory indexDir, SolrCore core)
throws IOException;
}
Modified: lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/core/StandardIndexReaderFactory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/core/StandardIndexReaderFactory.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/core/StandardIndexReaderFactory.java (original)
+++ lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/core/StandardIndexReaderFactory.java Wed Apr 11 19:41:06 2012
@@ -30,7 +30,7 @@ import org.apache.lucene.store.Directory
public class StandardIndexReaderFactory extends IndexReaderFactory {
@Override
- public DirectoryReader newReader(Directory indexDir) throws IOException {
+ public DirectoryReader newReader(Directory indexDir, SolrCore core) throws IOException {
return DirectoryReader.open(indexDir, termInfosIndexDivisor);
}
}
Modified: lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java (original)
+++ lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java Wed Apr 11 19:41:06 2012
@@ -595,7 +595,7 @@ public class LukeRequestHandler extends
if (freq > tiq.minFreq) {
UnicodeUtil.UTF8toUTF16(text, spare);
String t = spare.toString();
- tiq.distinctTerms = new Long(terms.getUniqueTermCount()).intValue();
+ tiq.distinctTerms = new Long(terms.size()).intValue();
tiq.add(new TopTermQueue.TermInfo(new Term(field, t), termsEnum.docFreq()));
if (tiq.size() > numTerms) { // if tiq full
Modified: lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java (original)
+++ lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java Wed Apr 11 19:41:06 2012
@@ -17,7 +17,6 @@
package org.apache.solr.handler.admin;
-import org.apache.commons.io.IOUtils;
import org.apache.solr.cloud.ZkSolrResourceLoader;
import org.apache.solr.common.SolrException;
import org.apache.solr.common.SolrException.ErrorCode;
@@ -38,7 +37,6 @@ import org.apache.zookeeper.KeeperExcept
import java.io.File;
import java.io.IOException;
-import java.io.InputStream;
import java.io.UnsupportedEncodingException;
import java.net.URISyntaxException;
import java.util.Date;
@@ -88,11 +86,9 @@ public class ShowFileRequestHandler exte
protected Set<String> hiddenFiles;
- private static ShowFileRequestHandler instance;
public ShowFileRequestHandler()
{
super();
- instance = this; // used so that getFileContents can access hiddenFiles
}
@Override
@@ -281,30 +277,7 @@ public class ShowFileRequestHandler exte
rsp.setHttpCaching(false);
}
- /**
- * This is a utility function that lets you get the contents of an admin file
- *
- * It is only used so that we can get rid of "/admin/get-file.jsp" and include
- * "admin-extra.html" in "/admin/index.html" using jsp scriptlets
- */
- public static String getFileContents(SolrCore core, String path )
- {
- if( instance != null && instance.hiddenFiles != null ) {
- if( instance.hiddenFiles.contains( path ) ) {
- return ""; // ignore it...
- }
- }
- InputStream input = null;
- try {
- input = core.getResourceLoader().openResource(path);
- return IOUtils.toString( input, "UTF-8" );
- } catch( Exception ex ) {
- } finally {
- IOUtils.closeQuietly(input);
- }
- return "";
- }
-
+
//////////////////////// SolrInfoMBeans methods //////////////////////
@Override
Modified: lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java (original)
+++ lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java Wed Apr 11 19:41:06 2012
@@ -177,7 +177,7 @@ public class SolrInfoMBeanHandler extend
// Something in the category changed
// Now iterate the real beans
- NamedList<NamedList<Object>> cat = new NamedList<NamedList<Object>>();
+ NamedList<NamedList<Object>> cat = new SimpleOrderedMap<NamedList<Object>>();
for(int j=0;j<ref_cat.size();j++) {
String name = ref_cat.getName(j);
NamedList<Object> ref_bean = ref_cat.get(name);
@@ -205,7 +205,7 @@ public class SolrInfoMBeanHandler extend
}
public NamedList diffNamedList(NamedList ref, NamedList now) {
- NamedList out = new NamedList();
+ NamedList out = new SimpleOrderedMap();
for(int i=0; i<ref.size(); i++) {
String name = ref.getName(i);
Object r = ref.getVal(i);
Modified: lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java (original)
+++ lucene/dev/branches/lucene3969/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java Wed Apr 11 19:41:06 2012
@@ -117,7 +117,7 @@ public class SolrIndexSearcher extends I
public SolrIndexSearcher(SolrCore core, String path, IndexSchema schema, SolrIndexConfig config, String name, boolean enableCache, DirectoryFactory directoryFactory) throws IOException {
// we don't need to reserve the directory because we get it from the factory
- this(core, schema,name, core.getIndexReaderFactory().newReader(directoryFactory.get(path, config.lockType)), true, enableCache, false, directoryFactory);
+ this(core, schema,name, core.getIndexReaderFactory().newReader(directoryFactory.get(path, config.lockType), core), true, enableCache, false, directoryFactory);
}
public SolrIndexSearcher(SolrCore core, IndexSchema schema, String name, DirectoryReader r, boolean closeReader, boolean enableCache, boolean reserveDirectory, DirectoryFactory directoryFactory) throws IOException {
Modified: lucene/dev/branches/lucene3969/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/solr/core/src/test/org/apache/solr/TestDistributedSearch.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/solr/core/src/test/org/apache/solr/TestDistributedSearch.java (original)
+++ lucene/dev/branches/lucene3969/solr/core/src/test/org/apache/solr/TestDistributedSearch.java Wed Apr 11 19:41:06 2012
@@ -358,7 +358,9 @@ public class TestDistributedSearch exten
// Thread.sleep(10000000000L);
}
- protected void queryPartialResults(final List<String> upShards, List<SolrServer> upClients, Object... q) throws Exception {
+ protected void queryPartialResults(final List<String> upShards,
+ final List<SolrServer> upClients,
+ Object... q) throws Exception {
final ModifiableSolrParams params = new ModifiableSolrParams();
@@ -385,8 +387,8 @@ public class TestDistributedSearch exten
@Override
public void run() {
for (int j = 0; j < stress; j++) {
- int which = r.nextInt(clients.size());
- SolrServer client = clients.get(which);
+ int which = r.nextInt(upClients.size());
+ SolrServer client = upClients.get(which);
try {
QueryResponse rsp = client.query(new ModifiableSolrParams(params));
if (verifyStress) {
Modified: lucene/dev/branches/lucene3969/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java (original)
+++ lucene/dev/branches/lucene3969/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java Wed Apr 11 19:41:06 2012
@@ -93,7 +93,7 @@ public class OverseerTest extends SolrTe
public void close(){
try {
- deleteNode(ZkStateReader.LIVE_NODES_ZKNODE + "/" + "node1");
+ deleteNode(ZkStateReader.LIVE_NODES_ZKNODE + "/" + nodeName);
zkClient.close();
} catch (InterruptedException e) {
//e.printStackTrace();
@@ -127,7 +127,7 @@ public class OverseerTest extends SolrTe
ZkStateReader.toJSON(coreStates.values().toArray(
new CoreState[coreStates.size()])), true);
- for (int i = 0; i < 10; i++) {
+ for (int i = 0; i < 30; i++) {
String shardId = getShardId(coreName);
if (shardId != null) {
try {
@@ -154,9 +154,9 @@ public class OverseerTest extends SolrTe
collection);
if (slices != null) {
for (Slice slice : slices.values()) {
- if (slice.getShards().containsKey(nodeName + "_" + coreName))
- ;
- return slice.getName();
+ if (slice.getShards().containsKey(nodeName + "_" + coreName)) {
+ return slice.getName();
+ }
}
}
return null;
Modified: lucene/dev/branches/lucene3969/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java (original)
+++ lucene/dev/branches/lucene3969/solr/core/src/test/org/apache/solr/core/AlternateDirectoryTest.java Wed Apr 11 19:41:06 2012
@@ -61,7 +61,7 @@ public class AlternateDirectoryTest exte
static volatile boolean newReaderCalled = false;
@Override
- public DirectoryReader newReader(Directory indexDir) throws IOException {
+ public DirectoryReader newReader(Directory indexDir, SolrCore core) throws IOException {
TestIndexReaderFactory.newReaderCalled = true;
return DirectoryReader.open(indexDir);
}
Modified: lucene/dev/branches/lucene3969/solr/example/solr/conf/solrconfig.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3969/solr/example/solr/conf/solrconfig.xml?rev=1324945&r1=1324944&r2=1324945&view=diff
==============================================================================
--- lucene/dev/branches/lucene3969/solr/example/solr/conf/solrconfig.xml (original)
+++ lucene/dev/branches/lucene3969/solr/example/solr/conf/solrconfig.xml Wed Apr 11 19:41:06 2012
@@ -933,7 +933,7 @@
<!-- JSON Update Request Handler
http://wiki.apache.org/solr/UpdateJSON
-->
- <requestHandler name="/update/json" class="solr.JsonUpdateRequestHandler" startup="lazy">
+ <requestHandler name="/update/json" class="solr.JsonUpdateRequestHandler">
<lst name="defaults">
<str name="wt">json</str>
<str name="indent">true</str>