You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by si...@apache.org on 2011/05/23 13:43:05 UTC
svn commit: r1126449 [1/2] - in /lucene/dev/branches/docvalues: ./
dev-tools/eclipse/ dev-tools/idea/.idea/ dev-tools/maven/
dev-tools/maven/lucene/contrib/
dev-tools/maven/solr/contrib/dataimporthandler/src/
dev-tools/maven/solr/src/ dev-tools/maven/s...
Author: simonw
Date: Mon May 23 11:43:03 2011
New Revision: 1126449
URL: http://svn.apache.org/viewvc?rev=1126449&view=rev
Log:
merged with trunk
Added:
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java
- copied, changed from r1126440, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/SegmentNorms.java
- copied unchanged from r1126440, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentNorms.java
lucene/dev/branches/docvalues/solr/contrib/clustering/lib/simple-xml-2.4.1.jar
- copied unchanged from r1126440, lucene/dev/trunk/solr/contrib/clustering/lib/simple-xml-2.4.1.jar
Removed:
lucene/dev/branches/docvalues/lucene/contrib/ant/
lucene/dev/branches/docvalues/lucene/contrib/db/
lucene/dev/branches/docvalues/lucene/contrib/lucli/
lucene/dev/branches/docvalues/lucene/contrib/swing/
lucene/dev/branches/docvalues/solr/contrib/clustering/lib/simple-xml-2.3.5.jar
lucene/dev/branches/docvalues/solr/lib/geronimo-stax-LICENSE-ASL.txt
lucene/dev/branches/docvalues/solr/lib/geronimo-stax-NOTICE.txt
lucene/dev/branches/docvalues/solr/lib/geronimo-stax-api_1.0_spec-1.0.1.jar
Modified:
lucene/dev/branches/docvalues/ (props changed)
lucene/dev/branches/docvalues/build.xml
lucene/dev/branches/docvalues/dev-tools/eclipse/dot.classpath
lucene/dev/branches/docvalues/dev-tools/idea/.idea/ant.xml
lucene/dev/branches/docvalues/dev-tools/idea/.idea/compiler.xml
lucene/dev/branches/docvalues/dev-tools/idea/.idea/modules.xml
lucene/dev/branches/docvalues/dev-tools/idea/.idea/workspace.xml
lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/pom.xml.template
lucene/dev/branches/docvalues/dev-tools/maven/pom.xml.template
lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template
lucene/dev/branches/docvalues/dev-tools/maven/solr/src/pom.xml.template
lucene/dev/branches/docvalues/dev-tools/maven/solr/src/solrj/pom.xml.template
lucene/dev/branches/docvalues/lucene/ (props changed)
lucene/dev/branches/docvalues/lucene/CHANGES.txt
lucene/dev/branches/docvalues/lucene/backwards/ (props changed)
lucene/dev/branches/docvalues/lucene/build.xml
lucene/dev/branches/docvalues/lucene/common-build.xml
lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt
lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java
lucene/dev/branches/docvalues/lucene/contrib/queries/src/test/org/apache/lucene/search/regex/TestSpanRegexQuery.java (props changed)
lucene/dev/branches/docvalues/lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/builders/TestNumericRangeFilterBuilder.java (props changed)
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/CompoundFileReader.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/SegmentReader.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/CachingCollector.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/Directory.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/FSDirectory.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/FileSwitchDirectory.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/RAMDirectory.java
lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/RAMFile.java
lucene/dev/branches/docvalues/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml
lucene/dev/branches/docvalues/lucene/src/site/src/documentation/content/xdocs/site.xml
lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/analysis/MockAnalyzer.java
lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/analysis/MockTokenizer.java
lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/index/codecs/mockrandom/MockRandomCodec.java
lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/store/MockDirectoryWrapper.java
lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/analysis/TestToken.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestFieldsReader.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestIndexReaderClone.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestIndexReaderCloneNorms.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/TestNRTThreads.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/index.32.cfs.zip
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/index/index.32.nocfs.zip
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/search/TestCachingCollector.java
lucene/dev/branches/docvalues/lucene/src/test/org/apache/lucene/store/TestBufferedIndexInput.java
lucene/dev/branches/docvalues/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html
lucene/dev/branches/docvalues/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
lucene/dev/branches/docvalues/solr/ (props changed)
lucene/dev/branches/docvalues/solr/CHANGES.txt
lucene/dev/branches/docvalues/solr/example/solr/conf/solrconfig.xml
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/request/SimpleFacets.java
lucene/dev/branches/docvalues/solr/src/java/org/apache/solr/response/XMLWriter.java
lucene/dev/branches/docvalues/solr/src/test/org/apache/solr/client/solrj/embedded/TestSolrProperties.java
Modified: lucene/dev/branches/docvalues/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/build.xml?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/build.xml (original)
+++ lucene/dev/branches/docvalues/build.xml Mon May 23 11:43:03 2011
@@ -77,14 +77,6 @@
<mkdir dir=".settings"/>
<copy file="dev-tools/eclipse/resources.prefs"
tofile=".settings/org.eclipse.core.resources.prefs" overwrite="true"/>
- <echo>Running Lucene contrib db/bdb-je task 'get-je-jar' ...</echo>
- <subant target="get-je-jar">
- <fileset dir="lucene/contrib/db/bdb-je" includes="build.xml" />
- </subant>
- <echo>Running Lucene contrib db/bdb task 'get-db-jar' ...</echo>
- <subant target="get-db-jar">
- <fileset dir="lucene/contrib/db/bdb" includes="build.xml" />
- </subant>
<echo>
SUCCESS: You must right-click your project and choose Refresh
Please note, your project must use a Java 6 JRE
@@ -95,14 +87,6 @@
<copy todir=".">
<fileset dir="dev-tools/idea"/>
</copy>
- <echo>Running Lucene contrib db/bdb-je task 'get-je-jar' ...</echo>
- <subant target="get-je-jar">
- <fileset dir="lucene/contrib/db/bdb-je" includes="build.xml" />
- </subant>
- <echo>Running Lucene contrib db/bdb task 'get-db-jar' ...</echo>
- <subant target="get-db-jar">
- <fileset dir="lucene/contrib/db/bdb" includes="build.xml" />
- </subant>
<echo>
To complete IntelliJ IDEA setup, you must manually configure
Project Structure | Project | Project SDK.
Modified: lucene/dev/branches/docvalues/dev-tools/eclipse/dot.classpath
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/eclipse/dot.classpath?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/eclipse/dot.classpath (original)
+++ lucene/dev/branches/docvalues/dev-tools/eclipse/dot.classpath Mon May 23 11:43:03 2011
@@ -3,21 +3,12 @@
<classpathentry kind="src" path="lucene/src/java"/>
<classpathentry kind="src" path="lucene/src/test-framework"/>
<classpathentry kind="src" path="lucene/src/test"/>
- <classpathentry kind="src" path="lucene/contrib/ant/src/java"/>
- <classpathentry kind="src" path="lucene/contrib/ant/src/resources"/>
- <classpathentry kind="src" path="lucene/contrib/ant/src/test"/>
- <classpathentry kind="src" path="lucene/contrib/db/bdb/src/java"/>
- <classpathentry kind="src" path="lucene/contrib/db/bdb/src/test"/>
- <classpathentry kind="src" path="lucene/contrib/db/bdb-je/src/java"/>
- <classpathentry kind="src" path="lucene/contrib/db/bdb-je/src/test"/>
<classpathentry kind="src" path="lucene/contrib/demo/src/java"/>
<classpathentry kind="src" path="lucene/contrib/demo/src/test"/>
<classpathentry kind="src" path="lucene/contrib/highlighter/src/java"/>
<classpathentry kind="src" path="lucene/contrib/highlighter/src/test"/>
<classpathentry kind="src" path="lucene/contrib/instantiated/src/java"/>
<classpathentry kind="src" path="lucene/contrib/instantiated/src/test"/>
- <classpathentry kind="src" path="lucene/contrib/lucli/src/java"/>
- <classpathentry kind="src" path="lucene/contrib/lucli/src/test"/>
<classpathentry kind="src" path="lucene/contrib/memory/src/java"/>
<classpathentry kind="src" path="lucene/contrib/memory/src/test"/>
<classpathentry kind="src" path="lucene/contrib/misc/src/java"/>
@@ -31,8 +22,6 @@
<classpathentry kind="src" path="lucene/contrib/spatial/src/test"/>
<classpathentry kind="src" path="lucene/contrib/spellchecker/src/java"/>
<classpathentry kind="src" path="lucene/contrib/spellchecker/src/test"/>
- <classpathentry kind="src" path="lucene/contrib/swing/src/java"/>
- <classpathentry kind="src" path="lucene/contrib/swing/src/test"/>
<classpathentry kind="src" path="lucene/contrib/wordnet/src/java"/>
<classpathentry kind="src" path="lucene/contrib/wordnet/src/test"/>
<classpathentry kind="src" path="lucene/contrib/xml-query-parser/src/java"/>
@@ -84,10 +73,6 @@
<classpathentry kind="lib" path="lucene/lib/ant-1.7.1.jar"/>
<classpathentry kind="lib" path="lucene/lib/ant-junit-1.7.1.jar"/>
<classpathentry kind="lib" path="lucene/lib/junit-4.7.jar"/>
- <classpathentry kind="lib" path="lucene/contrib/ant/lib/jtidy-r938.jar"/>
- <classpathentry kind="lib" path="lucene/contrib/db/bdb/lib/db-4.7.25.jar"/>
- <classpathentry kind="lib" path="lucene/contrib/db/bdb-je/lib/je-3.3.93.jar"/>
- <classpathentry kind="lib" path="lucene/contrib/lucli/lib/jline.jar"/>
<classpathentry kind="lib" path="lucene/contrib/queries/lib/jakarta-regexp-1.4.jar"/>
<classpathentry kind="lib" path="modules/analysis/icu/lib/icu4j-4_6.jar"/>
<classpathentry kind="lib" path="modules/analysis/phonetic/lib/commons-codec-1.4.jar"/>
@@ -107,7 +92,6 @@
<classpathentry kind="lib" path="solr/lib/commons-io-1.4.jar"/>
<classpathentry kind="lib" path="solr/lib/commons-lang-2.4.jar"/>
<classpathentry kind="lib" path="solr/lib/easymock-2.2.jar"/>
- <classpathentry kind="lib" path="solr/lib/geronimo-stax-api_1.0_spec-1.0.1.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/junit-4.7.jar"/>
@@ -132,7 +116,7 @@
<classpathentry kind="lib" path="solr/contrib/clustering/lib/jackson-mapper-asl-1.5.2.jar"/>
<classpathentry kind="lib" path="solr/contrib/clustering/lib/mahout-collections-0.3.jar"/>
<classpathentry kind="lib" path="solr/contrib/clustering/lib/mahout-math-0.3.jar"/>
- <classpathentry kind="lib" path="solr/contrib/clustering/lib/simple-xml-2.3.5.jar"/>
+ <classpathentry kind="lib" path="solr/contrib/clustering/lib/simple-xml-2.4.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/dataimporthandler/lib/activation-1.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/dataimporthandler/lib/mail-1.4.1.jar"/>
<classpathentry kind="lib" path="solr/contrib/extraction/lib/asm-3.1.jar"/>
Modified: lucene/dev/branches/docvalues/dev-tools/idea/.idea/ant.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/.idea/ant.xml?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/.idea/ant.xml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/.idea/ant.xml Mon May 23 11:43:03 2011
@@ -3,21 +3,15 @@
<component name="AntConfiguration">
<buildFile url="file://$PROJECT_DIR$/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/build.xml" />
- <buildFile url="file://$PROJECT_DIR$/lucene/contrib/ant/build.xml" />
- <buildFile url="file://$PROJECT_DIR$/lucene/contrib/db/bdb/build.xml" />
- <buildFile url="file://$PROJECT_DIR$/lucene/contrib/db/bdb-je/build.xml" />
- <buildFile url="file://$PROJECT_DIR$/lucene/contrib/db/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/demo/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/highlighter/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/instantiated/build.xml" />
- <buildFile url="file://$PROJECT_DIR$/lucene/contrib/lucli/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/memory/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/misc/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/queries/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/queryparser/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/spatial/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/spellchecker/build.xml" />
- <buildFile url="file://$PROJECT_DIR$/lucene/contrib/swing/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/wordnet/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/xml-query-parser/build.xml" />
<buildFile url="file://$PROJECT_DIR$/modules/analysis/common/build.xml" />
Modified: lucene/dev/branches/docvalues/dev-tools/idea/.idea/compiler.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/.idea/compiler.xml?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/.idea/compiler.xml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/.idea/compiler.xml Mon May 23 11:43:03 2011
@@ -27,6 +27,7 @@
<entry name="?*.tbl" />
<entry name="?*.tld" />
<entry name="?*.txt" />
+ <entry name="?*.utf8"/>
<entry name="?*.xml" />
<entry name="?*.xsl" />
<entry name="?*.vm" />
Modified: lucene/dev/branches/docvalues/dev-tools/idea/.idea/modules.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/.idea/modules.xml?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/.idea/modules.xml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/.idea/modules.xml Mon May 23 11:43:03 2011
@@ -4,20 +4,15 @@
<modules>
<module filepath="$PROJECT_DIR$/parent.iml" />
<module filepath="$PROJECT_DIR$/lucene/lucene.iml" />
- <module filepath="$PROJECT_DIR$/lucene/contrib/ant/ant.iml" />
- <module filepath="$PROJECT_DIR$/lucene/contrib/db/bdb/bdb.iml" />
- <module filepath="$PROJECT_DIR$/lucene/contrib/db/bdb-je/bdb-je.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/demo/demo.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/highlighter/highlighter.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/instantiated/instantiated.iml" />
- <module filepath="$PROJECT_DIR$/lucene/contrib/lucli/lucli.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/memory/memory.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/misc/misc.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/queries/queries.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/queryparser/queryparser.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/spatial/spatial.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/spellchecker/spellchecker.iml" />
- <module filepath="$PROJECT_DIR$/lucene/contrib/swing/swing.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/wordnet/wordnet.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/xml-query-parser/xml-query-parser.iml" />
<module filepath="$PROJECT_DIR$/modules/analysis/common/common.iml" />
Modified: lucene/dev/branches/docvalues/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/idea/.idea/workspace.xml?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/branches/docvalues/dev-tools/idea/.idea/workspace.xml Mon May 23 11:43:03 2011
@@ -8,27 +8,6 @@
<option name="VM_PARAMETERS" value="-ea -Dtests.luceneMatchVersion=4.0 -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <configuration default="false" name="ant contrib" type="JUnit" factoryName="JUnit">
- <module name="ant" />
- <option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/ant" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
- <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
- </configuration>
- <configuration default="false" name="bdb contrib" type="JUnit" factoryName="JUnit">
- <module name="bdb" />
- <option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/db" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=bdb-temp" />
- <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
- </configuration>
- <configuration default="false" name="bdb-je contrib" type="JUnit" factoryName="JUnit">
- <module name="bdb-je" />
- <option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/db" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=bdb-je-temp" />
- <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
- </configuration>
<configuration default="false" name="benchmark module" type="JUnit" factoryName="JUnit">
<module name="benchmark" />
<option name="TEST_OBJECT" value="package" />
@@ -106,13 +85,6 @@
<option name="VM_PARAMETERS" value="-ea -Dlucene.version=4.0-SNAPSHOT -DtempDir=temp -Dtests.linedocsfile=europarl.lines.txt.gz" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <configuration default="false" name="lucli contrib" type="JUnit" factoryName="JUnit">
- <module name="lucli" />
- <option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/lucli" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
- <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
- </configuration>
<configuration default="false" name="memory contrib" type="JUnit" factoryName="JUnit">
<module name="memory" />
<option name="TEST_OBJECT" value="package" />
@@ -183,13 +155,6 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <configuration default="false" name="swing contrib" type="JUnit" factoryName="JUnit">
- <module name="swing" />
- <option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/swing" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
- <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
- </configuration>
<configuration default="false" name="uima contrib" type="JUnit" factoryName="JUnit">
<module name="uima" />
<option name="TEST_OBJECT" value="package" />
@@ -211,37 +176,32 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <list size="30">
+ <list size="25">
<item index="0" class="java.lang.String" itemvalue="JUnit.analysis-extras contrib" />
- <item index="1" class="java.lang.String" itemvalue="JUnit.ant contrib" />
- <item index="2" class="java.lang.String" itemvalue="JUnit.bdb contrib" />
- <item index="3" class="java.lang.String" itemvalue="JUnit.bdb-je contrib" />
- <item index="4" class="java.lang.String" itemvalue="JUnit.benchmark module" />
- <item index="5" class="java.lang.String" itemvalue="JUnit.clustering contrib" />
- <item index="6" class="java.lang.String" itemvalue="JUnit.common analysis module" />
- <item index="7" class="java.lang.String" itemvalue="JUnit.dataimporthandler contrib" />
- <item index="8" class="java.lang.String" itemvalue="JUnit.extraction contrib" />
- <item index="9" class="java.lang.String" itemvalue="JUnit.extras from dataimporthandler contrib" />
- <item index="10" class="java.lang.String" itemvalue="JUnit.grouping module" />
- <item index="11" class="java.lang.String" itemvalue="JUnit.highlighter contrib" />
- <item index="12" class="java.lang.String" itemvalue="JUnit.icu analysis module" />
- <item index="13" class="java.lang.String" itemvalue="JUnit.instantiated contrib" />
- <item index="14" class="java.lang.String" itemvalue="JUnit.lucene" />
- <item index="15" class="java.lang.String" itemvalue="JUnit.lucli contrib" />
- <item index="16" class="java.lang.String" itemvalue="JUnit.memory contrib" />
- <item index="17" class="java.lang.String" itemvalue="JUnit.misc contrib" />
- <item index="18" class="java.lang.String" itemvalue="JUnit.phonetic analysis module" />
- <item index="19" class="java.lang.String" itemvalue="JUnit.queries contrib" />
- <item index="20" class="java.lang.String" itemvalue="JUnit.queryparser contrib" />
- <item index="21" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
- <item index="22" class="java.lang.String" itemvalue="JUnit.solr" />
- <item index="23" class="java.lang.String" itemvalue="JUnit.spatial contrib" />
- <item index="24" class="java.lang.String" itemvalue="JUnit.spellchecker contrib" />
- <item index="25" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
- <item index="26" class="java.lang.String" itemvalue="JUnit.swing contrib" />
- <item index="27" class="java.lang.String" itemvalue="JUnit.uima contrib" />
- <item index="28" class="java.lang.String" itemvalue="JUnit.wordnet contrib" />
- <item index="29" class="java.lang.String" itemvalue="JUnit.xml-query-parser contrib" />
+ <item index="1" class="java.lang.String" itemvalue="JUnit.benchmark module" />
+ <item index="2" class="java.lang.String" itemvalue="JUnit.clustering contrib" />
+ <item index="3" class="java.lang.String" itemvalue="JUnit.common analysis module" />
+ <item index="4" class="java.lang.String" itemvalue="JUnit.dataimporthandler contrib" />
+ <item index="5" class="java.lang.String" itemvalue="JUnit.extraction contrib" />
+ <item index="6" class="java.lang.String" itemvalue="JUnit.extras from dataimporthandler contrib" />
+ <item index="7" class="java.lang.String" itemvalue="JUnit.grouping module" />
+ <item index="8" class="java.lang.String" itemvalue="JUnit.highlighter contrib" />
+ <item index="9" class="java.lang.String" itemvalue="JUnit.icu analysis module" />
+ <item index="10" class="java.lang.String" itemvalue="JUnit.instantiated contrib" />
+ <item index="11" class="java.lang.String" itemvalue="JUnit.lucene" />
+ <item index="12" class="java.lang.String" itemvalue="JUnit.memory contrib" />
+ <item index="13" class="java.lang.String" itemvalue="JUnit.misc contrib" />
+ <item index="14" class="java.lang.String" itemvalue="JUnit.phonetic analysis module" />
+ <item index="15" class="java.lang.String" itemvalue="JUnit.queries contrib" />
+ <item index="16" class="java.lang.String" itemvalue="JUnit.queryparser contrib" />
+ <item index="17" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
+ <item index="18" class="java.lang.String" itemvalue="JUnit.solr" />
+ <item index="19" class="java.lang.String" itemvalue="JUnit.spatial contrib" />
+ <item index="20" class="java.lang.String" itemvalue="JUnit.spellchecker contrib" />
+ <item index="21" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
+ <item index="22" class="java.lang.String" itemvalue="JUnit.uima contrib" />
+ <item index="23" class="java.lang.String" itemvalue="JUnit.wordnet contrib" />
+ <item index="24" class="java.lang.String" itemvalue="JUnit.xml-query-parser contrib" />
</list>
</component>
</project>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/pom.xml.template?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/lucene/contrib/pom.xml.template Mon May 23 11:43:03 2011
@@ -31,19 +31,15 @@
<name>Lucene Contrib aggregator POM</name>
<packaging>pom</packaging>
<modules>
- <module>ant</module>
- <module>db</module>
<module>demo</module>
<module>highlighter</module>
<module>instantiated</module>
- <module>lucli</module>
<module>memory</module>
<module>misc</module>
<module>queries</module>
<module>queryparser</module>
<module>spatial</module>
<module>spellchecker</module>
- <module>swing</module>
<module>wordnet</module>
<module>xml-query-parser</module>
</modules>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/pom.xml.template?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/pom.xml.template Mon May 23 11:43:03 2011
@@ -131,16 +131,6 @@
<version>r05</version>
</dependency>
<dependency>
- <groupId>com.sleepycat</groupId>
- <artifactId>berkeleydb</artifactId>
- <version>4.7.25</version>
- </dependency>
- <dependency>
- <groupId>com.sleepycat</groupId>
- <artifactId>berkeleydb-je</artifactId>
- <version>3.3.93</version>
- </dependency>
- <dependency>
<groupId>commons-beanutils</groupId>
<artifactId>commons-beanutils</artifactId>
<version>1.7.0</version>
@@ -206,11 +196,6 @@
<version>0.9.1</version>
</dependency>
<dependency>
- <groupId>jtidy</groupId>
- <artifactId>jtidy</artifactId>
- <version>4aug2000r7-dev</version>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>4.7</version>
@@ -231,11 +216,6 @@
<version>1.1</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- <version>1.0.1</version>
- </dependency>
- <dependency>
<groupId>org.apache.solr</groupId>
<artifactId>solr-commons-csv</artifactId>
<version>${project.version}</version>
@@ -590,25 +570,6 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <executions>
- <execution>
- <id>get-jars-and-poms</id>
- <phase>install</phase>
- <goals>
- <goal>run</goal>
- </goals>
- <configuration>
- <target>
- <ant dir="lucene/contrib/db/bdb" target="get-db-jar"/>
- <ant dir="lucene/contrib/db/bdb-je" target="get-je-jar"/>
- </target>
- </configuration>
- </execution>
- </executions>
- </plugin>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-install-plugin</artifactId>
<executions>
<execution>
@@ -640,34 +601,6 @@
</configuration>
</execution>
<execution>
- <id>install-berkeleydb</id>
- <phase>install</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <groupId>com.sleepycat</groupId>
- <artifactId>berkeleydb</artifactId>
- <version>4.7.25</version>
- <packaging>jar</packaging>
- <file>lucene/contrib/db/bdb/lib/db-4.7.25.jar</file>
- </configuration>
- </execution>
- <execution>
- <id>install-berkeleydb-je</id>
- <phase>install</phase>
- <goals>
- <goal>install-file</goal>
- </goals>
- <configuration>
- <groupId>com.sleepycat</groupId>
- <artifactId>berkeleydb-je</artifactId>
- <version>3.3.93</version>
- <packaging>jar</packaging>
- <file>lucene/contrib/db/bdb-je/lib/je-3.3.93.jar</file>
- </configuration>
- </execution>
- <execution>
<id>install-solr-commons-csv</id>
<phase>install</phase>
<goals>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/solr/contrib/dataimporthandler/src/pom.xml.template Mon May 23 11:43:03 2011
@@ -70,10 +70,6 @@
<scope>provided</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- </dependency>
- <dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</dependency>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/solr/src/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/solr/src/pom.xml.template?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/solr/src/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/solr/src/pom.xml.template Mon May 23 11:43:03 2011
@@ -97,10 +97,6 @@
<artifactId>solr-commons-csv</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- </dependency>
- <dependency>
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
Modified: lucene/dev/branches/docvalues/dev-tools/maven/solr/src/solrj/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/dev-tools/maven/solr/src/solrj/pom.xml.template?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/dev-tools/maven/solr/src/solrj/pom.xml.template (original)
+++ lucene/dev/branches/docvalues/dev-tools/maven/solr/src/solrj/pom.xml.template Mon May 23 11:43:03 2011
@@ -49,10 +49,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-stax-api_1.0_spec</artifactId>
- </dependency>
- <dependency>
<groupId>org.apache.zookeeper</groupId>
<artifactId>zookeeper</artifactId>
<exclusions>
Modified: lucene/dev/branches/docvalues/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/CHANGES.txt?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/docvalues/lucene/CHANGES.txt Mon May 23 11:43:03 2011
@@ -275,10 +275,6 @@ API Changes
* LUCENE-2953: In addition to changes in 3.x, PriorityQueue#initialize(int)
function was moved into the ctor. (Uwe Schindler, Yonik Seeley)
-* LUCENE-3061: IndexWriter's getNextMerge() and merge(OneMerge) are now public
- (though @lucene.experimental), allowing for custom MergeScheduler
- implementations. (Shai Erera)
-
New features
* LUCENE-2604: Added RegexpQuery support to QueryParser. Regular expressions
@@ -334,9 +330,6 @@ New features
* LUCENE-2489: Added PerFieldCodecWrapper (in oal.index.codecs) which
lets you set the Codec per field (Mike McCandless)
-* LUCENE-1810: Added FieldSelectorResult.LATENT to not cache lazy loaded fields
- (Tim Smith, Grant Ingersoll)
-
* LUCENE-2373: Extend CodecProvider to use SegmentInfosWriter and
SegmentInfosReader to allow customization of SegmentInfos data.
(Andrzej Bialecki)
@@ -366,9 +359,6 @@ New features
use MultiFields static methods directly, instead) if you need to use
the flex APIs directly on a composite reader. (Mike McCandless)
-* LUCENE-2692: Added several new SpanQuery classes for positional checking
- (match is in a range, payload is a specific value) (Grant Ingersoll)
-
* LUCENE-2690: MultiTermQuery boolean rewrites per segment.
(Uwe Schindler, Robert Muir, Mike McCandless, Simon Willnauer)
@@ -401,9 +391,6 @@ New features
* LUCENE-2862: Added TermsEnum.totalTermFreq() and
Terms.getSumTotalTermFreq(). (Mike McCandless, Robert Muir)
-* LUCENE-3001: Added TrieFieldHelper to write solr compatible numeric
- fields without the solr dependency. (ryan)
-
* LUCENE-3003: Added new expert class oal.index.DocTermsOrd,
refactored from Solr's UnInvertedField, for accessing term ords for
multi-valued fields, per document. This is similar to FieldCache in
@@ -411,10 +398,6 @@ New features
it's able to handle multi-valued fields and does not hold the term
bytes in RAM. (Mike McCandless)
-* LUCENE-1421, LUCENE-3102: added CachingCollector which allow you to cache
- document IDs and scores encountered during the search, and "reply" them to
- another Collector. (Mike McCandless, Shai Erera)
-
Optimizations
* LUCENE-2588: Don't store unnecessary suffixes when writing the terms
@@ -444,27 +427,6 @@ Bug fixes
with more document deletions is requested before a reader with fewer
deletions, provided they share some segments. (yonik)
-* LUCENE-2936: PhraseQuery score explanations were not correctly
- identifying matches vs non-matches. (hossman)
-
-* LUCENE-2996: addIndexes(IndexReader) did not flush before adding the new
- indexes, causing existing deletions to be applied on the incoming indexes as
- well. (Shai Erera, Mike McCandless)
-
-* LUCENE-3068: sloppy phrase query failed to match valid documents when multiple
- query terms had same position in the query. (Doron Cohen)
-
-Test Cases
-
-* LUCENE-3002: added 'tests.iter.min' to control 'tests.iter' by allowing to
- stop iterating if at least 'tests.iter.min' ran and a failure occured.
- (Shai Erera, Chris Hostetter)
-
-Build
-
-* LUCENE-3006: Building javadocs will fail on warnings by default.
- Override with -Dfailonjavadocwarning=false (sarowe, gsingers)
-
======================= Lucene 3.x (not yet released) =======================
Changes in backwards compatibility policy
@@ -479,14 +441,14 @@ Changes in backwards compatibility polic
* LUCENE-3084: MergePolicy.OneMerge.segments was changed from
SegmentInfos to a List<SegmentInfo>. SegmentInfos itsself was changed
- to no longer extend Vector<SegmentInfo> (to update code that is using
- Vector-API, use the new asList() and asSet() methods returning unmodifiable
- collections; modifying SegmentInfos is now only possible through
- the explicitely declared methods). IndexWriter.segString() now takes
- Iterable<SegmentInfo> instead of List<SegmentInfo>. A simple recompile
- should fix this. MergePolicy and SegmentInfos are internal/experimental
- APIs not covered by the strict backwards compatibility policy.
- (Uwe Schindler, Mike McCandless)
+ to no longer extend Vector<SegmentInfo> (to update code that is using
+ Vector-API, use the new asList() and asSet() methods returning unmodifiable
+ collections; modifying SegmentInfos is now only possible through
+ the explicitely declared methods). IndexWriter.segString() now takes
+ Iterable<SegmentInfo> instead of List<SegmentInfo>. A simple recompile
+ should fix this. MergePolicy and SegmentInfos are internal/experimental
+ APIs not covered by the strict backwards compatibility policy.
+ (Uwe Schindler, Mike McCandless)
Changes in runtime behavior
@@ -520,6 +482,10 @@ New features
* LUCENE-3071: Adding ReversePathHierarchyTokenizer, added skip parameter to
PathHierarchyTokenizer (Olivier Favre via ryan)
+* LUCENE-1421, LUCENE-3102: added CachingCollector which allow you to cache
+ document IDs and scores encountered during the search, and "replay" them to
+ another Collector. (Mike McCandless, Shai Erera)
+
API Changes
* LUCENE-3061: IndexWriter's getNextMerge() and merge(OneMerge) are now public
@@ -530,6 +496,9 @@ API Changes
ClassCastException when loading lazy fields or NumericFields.
(Uwe Schindler, Ryan McKinley, Mike McCandless)
+* LUCENE-2027: Directory.touchFile is deprecated and will be removed
+ in 4.0. (Mike McCandless)
+
Optimizations
* LUCENE-2990: ArrayUtil/CollectionUtil.*Sort() methods now exit early
@@ -561,6 +530,17 @@ Bug fixes
PhraseQuery as term with lower doc freq will also have less positions.
(Uwe Schindler, Robert Muir, Otis Gospodnetic)
+* LUCENE-3068: sloppy phrase query failed to match valid documents when multiple
+ query terms had same position in the query. (Doron Cohen)
+
+* LUCENE-3012: Lucene writes the header now for separate norm files (*.sNNN)
+ (Robert Muir)
+
+Build
+
+* LUCENE-3006: Building javadocs will fail on warnings by default.
+ Override with -Dfailonjavadocwarning=false (sarowe, gsingers)
+
Test Cases
* LUCENE-3002: added 'tests.iter.min' to control 'tests.iter' by allowing to
@@ -1105,6 +1085,12 @@ New features
* LUCENE-2913: Add missing getters to Numeric* classes. (Uwe Schindler)
+* LUCENE-1810: Added FieldSelectorResult.LATENT to not cache lazy loaded fields
+ (Tim Smith, Grant Ingersoll)
+
+* LUCENE-2692: Added several new SpanQuery classes for positional checking
+ (match is in a range, payload is a specific value) (Grant Ingersoll)
+
Optimizations
* LUCENE-2494: Use CompletionService in ParallelMultiSearcher instead of
Modified: lucene/dev/branches/docvalues/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/build.xml?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/build.xml (original)
+++ lucene/dev/branches/docvalues/lucene/build.xml Mon May 23 11:43:03 2011
@@ -220,19 +220,14 @@
<!-- make sure the group list below is updated. -->
<!-- Also remember to keep site.xml in sync. -->
- <packageset dir="contrib/ant/src/java"/>
- <packageset dir="contrib/db/bdb-je/src/java"/>
- <packageset dir="contrib/db/bdb/src/java"/>
<packageset dir="contrib/demo/src/java"/>
<packageset dir="contrib/highlighter/src/java"/>
<packageset dir="contrib/instantiated/src/java"/>
- <packageset dir="contrib/lucli/src/java"/>
<packageset dir="contrib/memory/src/java"/>
<packageset dir="contrib/misc/src/java"/>
<packageset dir="contrib/queries/src/java"/>
<packageset dir="contrib/spatial/src/java"/>
<packageset dir="contrib/spellchecker/src/java"/>
- <packageset dir="contrib/swing/src/java"/>
<packageset dir="contrib/wordnet/src/java"/>
<packageset dir="contrib/xml-query-parser/src/java"/>
<packageset dir="contrib/queryparser/src/java"/>
@@ -244,20 +239,16 @@
<group title="Core" packages="org.apache.*:org.apache.lucene.analysis:org.apache.lucene.analysis.standard*:org.apache.lucene.analysis.tokenattributes*"/>
- <group title="contrib: Ant" packages="org.apache.lucene.ant*"/>
<group title="contrib: Demo" packages="org.apache.lucene.demo*"/>
<group title="contrib: ICU" packages="org.apache.lucene.collation*"/>
- <group title="contrib: DB" packages="org.apache.lucene.store.db*:org.apache.lucene.store.je*:com.sleepycat*"/>
<group title="contrib: Highlighter" packages="org.apache.lucene.search.highlight*:org.apache.lucene.search.vectorhighlight*"/>
<group title="contrib: Instantiated" packages="org.apache.lucene.store.instantiated*"/>
- <group title="contrib: Lucli" packages="lucli*"/>
<group title="contrib: Memory" packages="org.apache.lucene.index.memory*"/>
<group title="contrib: Misc " packages="org.apache.lucene.misc*"/>
<group title="contrib: Queries" packages="org.apache.lucene.search.similar*:org.apache.lucene.search.regex*:org.apache.regexp*"/>
<group title="contrib: Query Parser" packages="org.apache.lucene.queryParser.*"/>
<group title="contrib: Spatial" packages="org.apache.lucene.spatial*"/>
<group title="contrib: SpellChecker" packages="org.apache.lucene.search.spell*"/>
- <group title="contrib: Swing" packages="org.apache.lucene.swing*"/>
<group title="contrib: WordNet" packages="org.apache.lucene.wordnet*"/>
<group title="contrib: XML Query Parser" packages="org.apache.lucene.xmlparser*"/>
Modified: lucene/dev/branches/docvalues/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/common-build.xml?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/common-build.xml (original)
+++ lucene/dev/branches/docvalues/lucene/common-build.xml Mon May 23 11:43:03 2011
@@ -849,15 +849,6 @@
<arg value="-c" />
<arg value="${basedir}/lib" />
<arg value="-c" />
- <arg value="${basedir}/contrib/ant/lib" />
- <!-- BDB libs are downloaded, don't check them -->
- <!--<arg value="-c" />
- <arg value="${toplevel.dir}/lucene/contrib/db/bdb/lib" />
- <arg value="-c" />
- <arg value="${toplevel.dir}/lucene/contrib/db/bdb-je/lib" />-->
- <arg value="-c" />
- <arg value="${basedir}/contrib/lucli/lib" />
- <arg value="-c" />
<arg value="${basedir}/contrib/queries/lib" />
</java>
</target>
Modified: lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/CHANGES.txt Mon May 23 11:43:03 2011
@@ -50,6 +50,10 @@ Bug Fixes
======================= Lucene 3.x (not yet released) =======================
+Changes in backwards compatibility policy
+
+ * LUCENE-2981: Removed the following contribs: ant, db, lucli, swing. (Robert Muir)
+
Changes in runtime behavior
* LUCENE-3086: ItalianAnalyzer now uses ElisionFilter with a set of Italian
Modified: lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java (original)
+++ lucene/dev/branches/docvalues/lucene/contrib/misc/src/java/org/apache/lucene/store/NRTCachingDirectory.java Mon May 23 11:43:03 2011
@@ -135,15 +135,6 @@ public class NRTCachingDirectory extends
}
@Override
- public synchronized void touchFile(String name) throws IOException {
- if (cache.fileExists(name)) {
- cache.touchFile(name);
- } else {
- delegate.touchFile(name);
- }
- }
-
- @Override
public synchronized void deleteFile(String name) throws IOException {
// Delete from both, in case we are currently uncaching:
if (VERBOSE) {
Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/CompoundFileReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/CompoundFileReader.java?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/CompoundFileReader.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/CompoundFileReader.java Mon May 23 11:43:03 2011
@@ -189,12 +189,6 @@ public class CompoundFileReader extends
return directory.fileModified(fileName);
}
- /** Set the modified time of the compound file to now. */
- @Override
- public void touchFile(String name) throws IOException {
- directory.touchFile(fileName);
- }
-
/** Not implemented
* @throws UnsupportedOperationException */
@Override
Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/IndexWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/IndexWriter.java?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/IndexWriter.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/IndexWriter.java Mon May 23 11:43:03 2011
@@ -2552,7 +2552,7 @@ public class IndexWriter implements Clos
lastCommitChangeCount = pendingCommitChangeCount;
segmentInfos.updateGeneration(pendingCommit);
segmentInfos.setUserData(pendingCommit.getUserData());
- rollbackSegments = segmentInfos.createBackupSegmentInfos(true);
+ rollbackSegments = pendingCommit.createBackupSegmentInfos(true);
deleter.checkpoint(pendingCommit, true);
} finally {
// Matches the incRef done in startCommit:
Copied: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java (from r1126440, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java)
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java?p2=lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java&p1=lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java&r1=1126440&r2=1126449&rev=1126449&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/SegmentCoreReaders.java Mon May 23 11:43:03 2011
@@ -20,7 +20,9 @@ package org.apache.lucene.index;
import java.io.IOException;
import java.util.concurrent.atomic.AtomicInteger;
+import org.apache.lucene.index.codecs.Codec;
import org.apache.lucene.index.codecs.FieldsProducer;
+import org.apache.lucene.index.codecs.PerDocValues;
import org.apache.lucene.store.Directory;
/** Holds core readers that are shared (unchanged) when
@@ -39,7 +41,8 @@ final class SegmentCoreReaders {
final FieldInfos fieldInfos;
final FieldsProducer fields;
-
+ final PerDocValues perDocProducer;
+
final Directory dir;
final Directory cfsDir;
final int readBufferSize;
@@ -51,6 +54,8 @@ final class SegmentCoreReaders {
TermVectorsReader termVectorsReaderOrig;
CompoundFileReader cfsReader;
CompoundFileReader storeCFSReader;
+
+
SegmentCoreReaders(SegmentReader owner, Directory dir, SegmentInfo si, int readBufferSize, int termsIndexDivisor) throws IOException {
@@ -76,11 +81,12 @@ final class SegmentCoreReaders {
fieldInfos = si.getFieldInfos();
this.termsIndexDivisor = termsIndexDivisor;
-
+ final Codec codec = segmentCodecs.codec();
+ final SegmentReadState segmentReadState = new SegmentReadState(cfsDir, si, fieldInfos, readBufferSize, termsIndexDivisor);
// Ask codec for its Fields
- fields = segmentCodecs.codec().fieldsProducer(new SegmentReadState(cfsDir, si, fieldInfos, readBufferSize, termsIndexDivisor));
+ fields = codec.fieldsProducer(segmentReadState);
assert fields != null;
-
+ perDocProducer = codec.docsProducer(segmentReadState);
success = true;
} finally {
if (!success) {
@@ -119,6 +125,10 @@ final class SegmentCoreReaders {
fields.close();
}
+ if (perDocProducer != null) {
+ perDocProducer.close();
+ }
+
if (termVectorsReaderOrig != null) {
termVectorsReaderOrig.close();
}
Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/SegmentReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/SegmentReader.java?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/SegmentReader.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/index/SegmentReader.java Mon May 23 11:43:03 2011
@@ -29,17 +29,16 @@ import java.util.concurrent.atomic.Atomi
import org.apache.lucene.document.Document;
import org.apache.lucene.document.FieldSelector;
-import org.apache.lucene.index.codecs.FieldsProducer;
import org.apache.lucene.index.codecs.PerDocValues;
+import org.apache.lucene.index.values.DocValues;
import org.apache.lucene.store.BufferedIndexInput;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IndexInput;
-import org.apache.lucene.store.IndexOutput;
import org.apache.lucene.util.BitVector;
import org.apache.lucene.util.Bits;
-import org.apache.lucene.index.values.DocValues;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.CloseableThreadLocal;
+import org.apache.lucene.util.StringHelper;
/**
* @lucene.experimental
@@ -69,183 +68,10 @@ public class SegmentReader extends Index
private int rollbackPendingDeleteCount;
// optionally used for the .nrm file shared by multiple norms
- private IndexInput singleNormStream;
- private AtomicInteger singleNormRef;
-
- CoreReaders core;
-
- // Holds core readers that are shared (unchanged) when
- // SegmentReader is cloned or reopened
- static final class CoreReaders {
-
- // Counts how many other reader share the core objects
- // (freqStream, proxStream, tis, etc.) of this reader;
- // when coreRef drops to 0, these core objects may be
- // closed. A given instance of SegmentReader may be
- // closed, even those it shares core objects with other
- // SegmentReaders:
- private final AtomicInteger ref = new AtomicInteger(1);
-
- final String segment;
- final FieldInfos fieldInfos;
-
- final FieldsProducer fields;
- final PerDocValues perDocProducer;
-
- final Directory dir;
- final Directory cfsDir;
- final int readBufferSize;
- final int termsIndexDivisor;
-
- private final SegmentReader origInstance;
-
- FieldsReader fieldsReaderOrig;
- TermVectorsReader termVectorsReaderOrig;
- CompoundFileReader cfsReader;
- CompoundFileReader storeCFSReader;
+ IndexInput singleNormStream;
+ AtomicInteger singleNormRef;
- CoreReaders(SegmentReader origInstance, Directory dir, SegmentInfo si, int readBufferSize, int termsIndexDivisor) throws IOException {
-
- if (termsIndexDivisor == 0) {
- throw new IllegalArgumentException("indexDivisor must be < 0 (don't load terms index) or greater than 0 (got 0)");
- }
-
- segment = si.name;
- final SegmentCodecs segmentCodecs = si.getSegmentCodecs();
- this.readBufferSize = readBufferSize;
- this.dir = dir;
-
- boolean success = false;
-
- try {
- Directory dir0 = dir;
- if (si.getUseCompoundFile()) {
- cfsReader = new CompoundFileReader(dir, IndexFileNames.segmentFileName(segment, "", IndexFileNames.COMPOUND_FILE_EXTENSION), readBufferSize);
- dir0 = cfsReader;
- }
- cfsDir = dir0;
- si.loadFieldInfos(cfsDir, false); // prevent opening the CFS to load fieldInfos
- fieldInfos = si.getFieldInfos();
-
- this.termsIndexDivisor = termsIndexDivisor;
-
- // Ask codec for its Fields
- final SegmentReadState segmentReadState = new SegmentReadState(cfsDir, si, fieldInfos, readBufferSize, termsIndexDivisor);
- fields = segmentCodecs.codec().fieldsProducer(segmentReadState);
- assert fields != null;
- perDocProducer = segmentCodecs.codec().docsProducer(segmentReadState);
- success = true;
- } finally {
- if (!success) {
- decRef();
- }
- }
-
- // Must assign this at the end -- if we hit an
- // exception above core, we don't want to attempt to
- // purge the FieldCache (will hit NPE because core is
- // not assigned yet).
- this.origInstance = origInstance;
- }
-
-
-
- synchronized TermVectorsReader getTermVectorsReaderOrig() {
- return termVectorsReaderOrig;
- }
-
- synchronized FieldsReader getFieldsReaderOrig() {
- return fieldsReaderOrig;
- }
-
- synchronized void incRef() {
- ref.incrementAndGet();
- }
-
- synchronized Directory getCFSReader() {
- return cfsReader;
- }
-
- synchronized void decRef() throws IOException {
- if (ref.decrementAndGet() == 0) {
- if (fields != null) {
- fields.close();
- }
-
- if (perDocProducer != null) {
- perDocProducer.close();
- }
-
- if (termVectorsReaderOrig != null) {
- termVectorsReaderOrig.close();
- }
-
- if (fieldsReaderOrig != null) {
- fieldsReaderOrig.close();
- }
-
- if (cfsReader != null) {
- cfsReader.close();
- }
-
- if (storeCFSReader != null) {
- storeCFSReader.close();
- }
-
- // Now, notify any ReaderFinished listeners:
- if (origInstance != null) {
- origInstance.notifyReaderFinishedListeners();
- }
- }
- }
-
- synchronized void openDocStores(SegmentInfo si) throws IOException {
-
- assert si.name.equals(segment);
-
- if (fieldsReaderOrig == null) {
- final Directory storeDir;
- if (si.getDocStoreOffset() != -1) {
- if (si.getDocStoreIsCompoundFile()) {
- assert storeCFSReader == null;
- storeCFSReader = new CompoundFileReader(dir,
- IndexFileNames.segmentFileName(si.getDocStoreSegment(), "", IndexFileNames.COMPOUND_FILE_STORE_EXTENSION),
- readBufferSize);
- storeDir = storeCFSReader;
- assert storeDir != null;
- } else {
- storeDir = dir;
- assert storeDir != null;
- }
- } else if (si.getUseCompoundFile()) {
- // In some cases, we were originally opened when CFS
- // was not used, but then we are asked to open doc
- // stores after the segment has switched to CFS
- if (cfsReader == null) {
- cfsReader = new CompoundFileReader(dir, IndexFileNames.segmentFileName(segment, "", IndexFileNames.COMPOUND_FILE_EXTENSION), readBufferSize);
- }
- storeDir = cfsReader;
- assert storeDir != null;
- } else {
- storeDir = dir;
- assert storeDir != null;
- }
-
- final String storesSegment = si.getDocStoreSegment();
- fieldsReaderOrig = new FieldsReader(storeDir, storesSegment, fieldInfos, readBufferSize,
- si.getDocStoreOffset(), si.docCount);
-
- // Verify two sources of "maxDoc" agree:
- if (si.getDocStoreOffset() == -1 && fieldsReaderOrig.size() != si.docCount) {
- throw new CorruptIndexException("doc counts differ for segment " + segment + ": fieldsReader shows " + fieldsReaderOrig.size() + " but segmentInfo shows " + si.docCount);
- }
-
- if (si.getHasVectors()) { // open term vector files only as needed
- termVectorsReaderOrig = new TermVectorsReader(storeDir, storesSegment, fieldInfos, readBufferSize, si.getDocStoreOffset(), si.docCount);
- }
- }
- }
- }
+ SegmentCoreReaders core;
/**
* Sets the initial value
@@ -256,219 +82,8 @@ public class SegmentReader extends Index
return (FieldsReader) core.getFieldsReaderOrig().clone();
}
}
-
- /**
- * Byte[] referencing is used because a new norm object needs
- * to be created for each clone, and the byte array is all
- * that is needed for sharing between cloned readers. The
- * current norm referencing is for sharing between readers
- * whereas the byte[] referencing is for copy on write which
- * is independent of reader references (i.e. incRef, decRef).
- */
-
- final class Norm implements Cloneable {
- private int refCount = 1;
-
- // If this instance is a clone, the originalNorm
- // references the Norm that has a real open IndexInput:
- private Norm origNorm;
-
- private IndexInput in;
- private long normSeek;
-
- // null until bytes is set
- private AtomicInteger bytesRef;
- private byte[] bytes;
- private boolean dirty;
- private int number;
- private boolean rollbackDirty;
-
- public Norm(IndexInput in, int number, long normSeek) {
- this.in = in;
- this.number = number;
- this.normSeek = normSeek;
- }
-
- public synchronized void incRef() {
- assert refCount > 0 && (origNorm == null || origNorm.refCount > 0);
- refCount++;
- }
-
- private void closeInput() throws IOException {
- if (in != null) {
- if (in != singleNormStream) {
- // It's private to us -- just close it
- in.close();
- } else {
- // We are sharing this with others -- decRef and
- // maybe close the shared norm stream
- if (singleNormRef.decrementAndGet() == 0) {
- singleNormStream.close();
- singleNormStream = null;
- }
- }
-
- in = null;
- }
- }
-
- public synchronized void decRef() throws IOException {
- assert refCount > 0 && (origNorm == null || origNorm.refCount > 0);
-
- if (--refCount == 0) {
- if (origNorm != null) {
- origNorm.decRef();
- origNorm = null;
- } else {
- closeInput();
- }
-
- if (bytes != null) {
- assert bytesRef != null;
- bytesRef.decrementAndGet();
- bytes = null;
- bytesRef = null;
- } else {
- assert bytesRef == null;
- }
- }
- }
-
- // Load & cache full bytes array. Returns bytes.
- public synchronized byte[] bytes() throws IOException {
- assert refCount > 0 && (origNorm == null || origNorm.refCount > 0);
- if (bytes == null) { // value not yet read
- assert bytesRef == null;
- if (origNorm != null) {
- // Ask origNorm to load so that for a series of
- // reopened readers we share a single read-only
- // byte[]
- bytes = origNorm.bytes();
- bytesRef = origNorm.bytesRef;
- bytesRef.incrementAndGet();
-
- // Once we've loaded the bytes we no longer need
- // origNorm:
- origNorm.decRef();
- origNorm = null;
-
- } else {
- // We are the origNorm, so load the bytes for real
- // ourself:
- final int count = maxDoc();
- bytes = new byte[count];
-
- // Since we are orig, in must not be null
- assert in != null;
-
- // Read from disk.
- synchronized(in) {
- in.seek(normSeek);
- in.readBytes(bytes, 0, count, false);
- }
-
- bytesRef = new AtomicInteger(1);
- closeInput();
- }
- }
-
- return bytes;
- }
-
- // Only for testing
- AtomicInteger bytesRef() {
- return bytesRef;
- }
-
- // Called if we intend to change a norm value. We make a
- // private copy of bytes if it's shared with others:
- public synchronized byte[] copyOnWrite() throws IOException {
- assert refCount > 0 && (origNorm == null || origNorm.refCount > 0);
- bytes();
- assert bytes != null;
- assert bytesRef != null;
- if (bytesRef.get() > 1) {
- // I cannot be the origNorm for another norm
- // instance if I'm being changed. Ie, only the
- // "head Norm" can be changed:
- assert refCount == 1;
- final AtomicInteger oldRef = bytesRef;
- bytes = cloneNormBytes(bytes);
- bytesRef = new AtomicInteger(1);
- oldRef.decrementAndGet();
- }
- dirty = true;
- return bytes;
- }
-
- // Returns a copy of this Norm instance that shares
- // IndexInput & bytes with the original one
- @Override
- public synchronized Object clone() {
- assert refCount > 0 && (origNorm == null || origNorm.refCount > 0);
-
- Norm clone;
- try {
- clone = (Norm) super.clone();
- } catch (CloneNotSupportedException cnse) {
- // Cannot happen
- throw new RuntimeException("unexpected CloneNotSupportedException", cnse);
- }
- clone.refCount = 1;
-
- if (bytes != null) {
- assert bytesRef != null;
- assert origNorm == null;
-
- // Clone holds a reference to my bytes:
- clone.bytesRef.incrementAndGet();
- } else {
- assert bytesRef == null;
- if (origNorm == null) {
- // I become the origNorm for the clone:
- clone.origNorm = this;
- }
- clone.origNorm.incRef();
- }
-
- // Only the origNorm will actually readBytes from in:
- clone.in = null;
-
- return clone;
- }
-
- // Flush all pending changes to the next generation
- // separate norms file.
- public void reWrite(SegmentInfo si) throws IOException {
- assert refCount > 0 && (origNorm == null || origNorm.refCount > 0): "refCount=" + refCount + " origNorm=" + origNorm;
-
- // NOTE: norms are re-written in regular directory, not cfs
- si.advanceNormGen(this.number);
- final String normFileName = si.getNormFileName(this.number);
- IndexOutput out = directory().createOutput(normFileName);
- boolean success = false;
- try {
- try {
- out.writeBytes(bytes, maxDoc());
- } finally {
- out.close();
- }
- success = true;
- } finally {
- if (!success) {
- try {
- directory().deleteFile(normFileName);
- } catch (Throwable t) {
- // suppress this so we keep throwing the
- // original exception
- }
- }
- }
- this.dirty = false;
- }
- }
- Map<String,Norm> norms = new HashMap<String,Norm>();
+ Map<String,SegmentNorms> norms = new HashMap<String,SegmentNorms>();
/**
* @throws CorruptIndexException if the index is corrupt
@@ -498,7 +113,7 @@ public class SegmentReader extends Index
boolean success = false;
try {
- instance.core = new CoreReaders(instance, dir, si, readBufferSize, termInfosIndexDivisor);
+ instance.core = new SegmentCoreReaders(instance, dir, si, readBufferSize, termInfosIndexDivisor);
if (doOpenStores) {
instance.core.openDocStores(si);
}
@@ -666,16 +281,16 @@ public class SegmentReader extends Index
}
}
- clone.norms = new HashMap<String,Norm>();
+ clone.norms = new HashMap<String,SegmentNorms>();
// Clone norms
for (FieldInfo fi : core.fieldInfos) {
// Clone unchanged norms to the cloned reader
if (doClone || !fieldNormsChanged.contains(fi.number)) {
final String curField = fi.name;
- Norm norm = this.norms.get(curField);
+ SegmentNorms norm = this.norms.get(curField);
if (norm != null)
- clone.norms.put(curField, (Norm) norm.clone());
+ clone.norms.put(curField, (SegmentNorms) norm.clone());
}
}
@@ -745,7 +360,7 @@ public class SegmentReader extends Index
if (normsDirty) { // re-write norms
si.initNormGen();
- for (final Norm norm : norms.values()) {
+ for (final SegmentNorms norm : norms.values()) {
if (norm.dirty) {
norm.reWrite(si);
}
@@ -771,7 +386,7 @@ public class SegmentReader extends Index
deletedDocs = null;
}
- for (final Norm norm : norms.values()) {
+ for (final SegmentNorms norm : norms.values()) {
norm.decRef();
}
if (core != null) {
@@ -928,9 +543,6 @@ public class SegmentReader extends Index
fieldOption == IndexReader.FieldOption.TERMVECTOR_WITH_POSITION_OFFSET) {
fieldSet.add(fi.name);
}
- else if (fi.docValues != null && fieldOption == IndexReader.FieldOption.DOC_VALUES) {
- fieldSet.add(fi.name);
- }
}
return fieldSet;
}
@@ -944,7 +556,7 @@ public class SegmentReader extends Index
@Override
public byte[] norms(String field) throws IOException {
ensureOpen();
- final Norm norm = norms.get(field);
+ final SegmentNorms norm = norms.get(field);
if (norm == null) {
// not indexed, or norms not stored
return null;
@@ -955,7 +567,7 @@ public class SegmentReader extends Index
@Override
protected void doSetNorm(int doc, String field, byte value)
throws IOException {
- Norm norm = norms.get(field);
+ SegmentNorms norm = norms.get(field);
if (norm == null) // not an indexed field
return;
@@ -997,11 +609,23 @@ public class SegmentReader extends Index
// If this were to change in the future, a clone could be done here.
normInput = singleNormStream;
} else {
- normSeek = 0;
normInput = d.openInput(fileName);
+ // if the segment was created in 3.2 or after, we wrote the header for sure,
+ // and don't need to do the sketchy file size check. otherwise, we check
+ // if the size is exactly equal to maxDoc to detect a headerless file.
+ // NOTE: remove this check in Lucene 5.0!
+ String version = si.getVersion();
+ final boolean isUnversioned =
+ (version == null || StringHelper.getVersionComparator().compare(version, "3.2") < 0)
+ && normInput.length() == maxDoc();
+ if (isUnversioned) {
+ normSeek = 0;
+ } else {
+ normSeek = SegmentMerger.NORMS_HEADER.length;
+ }
}
- norms.put(fi.name, new Norm(normInput, fi.number, normSeek));
+ norms.put(fi.name, new SegmentNorms(normInput, fi.number, normSeek, this));
nextNormSeek += maxDoc; // increment also if some norms are separate
}
}
@@ -1021,7 +645,7 @@ public class SegmentReader extends Index
if (singleNormStream != null) {
return false;
}
- for (final Norm norm : norms.values()) {
+ for (final SegmentNorms norm : norms.values()) {
if (norm.refCount > 0) {
return false;
}
@@ -1168,7 +792,7 @@ public class SegmentReader extends Index
rollbackDeletedDocsDirty = deletedDocsDirty;
rollbackNormsDirty = normsDirty;
rollbackPendingDeleteCount = pendingDeleteCount;
- for (Norm norm : norms.values()) {
+ for (SegmentNorms norm : norms.values()) {
norm.rollbackDirty = norm.dirty;
}
}
@@ -1179,7 +803,7 @@ public class SegmentReader extends Index
deletedDocsDirty = rollbackDeletedDocsDirty;
normsDirty = rollbackNormsDirty;
pendingDeleteCount = rollbackPendingDeleteCount;
- for (Norm norm : norms.values()) {
+ for (SegmentNorms norm : norms.values()) {
norm.dirty = norm.rollbackDirty;
}
}
@@ -1205,8 +829,8 @@ public class SegmentReader extends Index
public int getTermInfosIndexDivisor() {
return core.termsIndexDivisor;
}
-
- @Override
+
+ @Override
protected void readerFinished() {
// Do nothing here -- we have more careful control on
// when to notify that a SegmentReader has finished,
@@ -1215,6 +839,7 @@ public class SegmentReader extends Index
// longer used (all SegmentReaders sharing it have been
// closed).
}
+
@Override
public DocValues docValues(String field) throws IOException {
Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/CachingCollector.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/CachingCollector.java?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/CachingCollector.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/CachingCollector.java Mon May 23 11:43:03 2011
@@ -308,6 +308,48 @@ public abstract class CachingCollector e
protected int base;
protected int lastDocBase;
+ /**
+ * Creates a {@link CachingCollector} which does not wrap another collector.
+ * The cached documents and scores can later be {@link #replay(Collector)
+ * replayed}.
+ *
+ * @param acceptDocsOutOfOrder
+ * whether documents are allowed to be collected out-of-order
+ */
+ public static CachingCollector create(final boolean acceptDocsOutOfOrder, boolean cacheScores, double maxRAMMB) {
+ Collector other = new Collector() {
+ @Override
+ public boolean acceptsDocsOutOfOrder() {
+ return acceptDocsOutOfOrder;
+ }
+
+ @Override
+ public void setScorer(Scorer scorer) throws IOException {}
+
+ @Override
+ public void collect(int doc) throws IOException {}
+
+ @Override
+ public void setNextReader(AtomicReaderContext context) throws IOException {}
+
+ };
+ return create(other, cacheScores, maxRAMMB);
+ }
+
+ /**
+ * Create a new {@link CachingCollector} that wraps the given collector and
+ * caches documents and scores up to the specified RAM threshold.
+ *
+ * @param other
+ * the Collector to wrap and delegate calls to.
+ * @param cacheScores
+ * whether to cache scores in addition to document IDs. Note that
+ * this increases the RAM consumed per doc
+ * @param maxRAMMB
+ * the maximum RAM in MB to consume for caching the documents and
+ * scores. If the collector exceeds the threshold, no documents and
+ * scores are cached.
+ */
public static CachingCollector create(Collector other, boolean cacheScores, double maxRAMMB) {
return cacheScores ? new ScoreCachingCollector(other, maxRAMMB) : new NoScoreCachingCollector(other, maxRAMMB);
}
Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java Mon May 23 11:43:03 2011
@@ -127,7 +127,7 @@ public class FieldCacheTermsFilter exten
public FieldCacheTermsFilterDocIdSet(FieldCache.DocTermsIndex fcsi) {
this.fcsi = fcsi;
- openBitSet = new OpenBitSet(this.fcsi.size());
+ openBitSet = new OpenBitSet(this.fcsi.numOrd());
final BytesRef spare = new BytesRef();
for (int i=0;i<terms.length;i++) {
int termNumber = this.fcsi.binarySearchLookup(terms[i], spare);
Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/Directory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/Directory.java?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/Directory.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/Directory.java Mon May 23 11:43:03 2011
@@ -65,10 +65,6 @@ public abstract class Directory implemen
public abstract long fileModified(String name)
throws IOException;
- /** Set the modified time of an existing file to now. */
- public abstract void touchFile(String name)
- throws IOException;
-
/** Removes an existing file in the directory. */
public abstract void deleteFile(String name)
throws IOException;
Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/FSDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/FSDirectory.java?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/FSDirectory.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/FSDirectory.java Mon May 23 11:43:03 2011
@@ -272,14 +272,6 @@ public abstract class FSDirectory extend
return file.lastModified();
}
- /** Set the modified time of an existing file to now. */
- @Override
- public void touchFile(String name) {
- ensureOpen();
- File file = new File(directory, name);
- file.setLastModified(System.currentTimeMillis());
- }
-
/** Returns the length in bytes of a file in the directory. */
@Override
public long fileLength(String name) throws IOException {
Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/FileSwitchDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/FileSwitchDirectory.java?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/FileSwitchDirectory.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/FileSwitchDirectory.java Mon May 23 11:43:03 2011
@@ -115,11 +115,6 @@ public class FileSwitchDirectory extends
}
@Override
- public void touchFile(String name) throws IOException {
- getDirectory(name).touchFile(name);
- }
-
- @Override
public void deleteFile(String name) throws IOException {
getDirectory(name).deleteFile(name);
}
Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/RAMDirectory.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/RAMDirectory.java?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/RAMDirectory.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/RAMDirectory.java Mon May 23 11:43:03 2011
@@ -27,8 +27,6 @@ import java.util.Set;
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.atomic.AtomicLong;
-import org.apache.lucene.util.ThreadInterruptedException;
-
/**
* A memory-resident {@link Directory} implementation. Locking
* implementation is by default the {@link SingleInstanceLockFactory}
@@ -112,30 +110,6 @@ public class RAMDirectory extends Direct
return file.getLastModified();
}
- /** Set the modified time of an existing file to now.
- * @throws IOException if the file does not exist
- */
- @Override
- public void touchFile(String name) throws IOException {
- ensureOpen();
- RAMFile file = fileMap.get(name);
- if (file == null) {
- throw new FileNotFoundException(name);
- }
-
- long ts2, ts1 = System.currentTimeMillis();
- do {
- try {
- Thread.sleep(0, 1);
- } catch (InterruptedException ie) {
- throw new ThreadInterruptedException(ie);
- }
- ts2 = System.currentTimeMillis();
- } while(ts1 == ts2);
-
- file.setLastModified(ts2);
- }
-
/** Returns the length in bytes of a file in the directory.
* @throws IOException if the file does not exist
*/
Modified: lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/RAMFile.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/RAMFile.java?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/RAMFile.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/java/org/apache/lucene/store/RAMFile.java Mon May 23 11:43:03 2011
@@ -26,7 +26,6 @@ public class RAMFile {
RAMDirectory directory;
protected long sizeInBytes;
- // This is publicly modifiable via Directory.touchFile(), so direct access not supported
private long lastModified = System.currentTimeMillis();
// File used as buffer, in no RAMDirectory
Modified: lucene/dev/branches/docvalues/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml (original)
+++ lucene/dev/branches/docvalues/lucene/src/site/src/documentation/content/xdocs/lucene-contrib/index.xml Mon May 23 11:43:03 2011
@@ -50,11 +50,6 @@
<a href="http://svn.apache.org/repos/asf/lucene/dev/trunk/lucene/contrib/">http://svn.apache.org/repos/asf/lucene/dev/trunk/lucene/contrib/</a>.
</p>
- <section id="ant"><title>ant</title>
- <p>Ant task to create Lucene indexes.</p>
- <p>See <a href="../api/contrib-ant/index.html">ant javadoc</a></p>
- </section>
-
<section id="benchmark"><title>benchmark</title>
<p>The benchmark contribution contains tools for benchmarking Lucene using standard, freely available corpora.</p>
<p>See <a href="../api/contrib-benchmark/index.html">benchmark javadoc</a></p>
@@ -66,11 +61,6 @@
<p>See <a href="../api/contrib-demo/index.html">demo javadoc</a></p>
</section>
- <section id="db"><title>db</title>
- <p>Provides integration with Berkley DB.</p>
- <p>See <a href="../api/contrib-db/index.html">db javadoc</a></p>
- </section>
-
<section id="highlighter"><title>highlighter</title>
<p>A set of classes for highlighting matching terms in search results.</p>
<p>See <a href="../api/contrib-highlighter/index.html">highlighter javadoc</a></p>
@@ -80,11 +70,6 @@
<p>RAM-based index that enables much faster searching than RAMDirectory in certain situations.</p>
<p>See <a href="../api/contrib-instantiated/index.html">instantiated javadoc</a></p>
</section>
-
- <section id="lucli"><title>lucli</title>
- <p>An application that allows Lucene index manipulation from the command-line.</p>
- <p>See <a href="../api/contrib-lucli/index.html">lucli javadoc</a></p>
- </section>
<section id="memory"><title>memory</title>
<p>High-performance single-document main memory index.</p>
@@ -121,11 +106,6 @@
<p>See <a href="../api/contrib-spellchecker/index.html">spellchecker javadoc</a></p>
</section>
- <section id="swing"><title>swing</title>
- <p>Swing components designed to integrate with Lucene.</p>
- <p>See <a href="../api/contrib-swing/index.html">swing javadoc</a></p>
- </section>
-
<section id="wordnet"><title>wordnet</title>
<p>Tools to help utilize wordnet synonyms with Lucene</p>
<p>See <a href="../api/contrib-wordnet/index.html">wordnet javadoc</a></p>
Modified: lucene/dev/branches/docvalues/lucene/src/site/src/documentation/content/xdocs/site.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/site/src/documentation/content/xdocs/site.xml?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/site/src/documentation/content/xdocs/site.xml (original)
+++ lucene/dev/branches/docvalues/lucene/src/site/src/documentation/content/xdocs/site.xml Mon May 23 11:43:03 2011
@@ -52,14 +52,10 @@ See http://forrest.apache.org/docs/linki
<javadoc-core label="Core" href="ext:javadocs-core"/>
<javadoc-test-framework label="Test Framework" href="ext:javadocs-test-framework"/>
<javadoc-contrib label="Contrib">
- <javadoc-contrib-ant label="Ant" href="ext:javadocs-contrib-ant"/>
- <javadoc-contrib-bdb label="Bdb" href="ext:javadocs-contrib-bdb"/>
- <javadoc-contrib-bdb-je label="Bdb-je" href="ext:javadocs-contrib-bdb-je"/>
<javadoc-contrib-benchmark label="Benchmark" href="ext:javadocs-contrib-benchmark"/>
<javadoc-contrib-demo label="Demo" href="ext:javadocs-contrib-demo"/>
<javadoc-contrib-highlighter label="Highlighter" href="ext:javadocs-contrib-highlighter"/>
<javadoc-contrib-instantiated label="Instantiated" href="ext:javadocs-contrib-instantiated"/>
- <javadoc-contrib-lucli label="Lucli" href="ext:javadocs-contrib-lucli"/>
<javadoc-contrib-memory label="Memory" href="ext:javadocs-contrib-memory"/>
<javadoc-contrib-misc label="Miscellaneous" href="ext:javadocs-contrib-misc"/>
<javadoc-contrib-queries label="Queries" href="ext:javadocs-contrib-queries"/>
@@ -69,8 +65,7 @@ See http://forrest.apache.org/docs/linki
-->
<javadoc-contrib-remote label="Remote" href="ext:javadocs-contrib-remote"/>
<javadoc-contrib-spatial label="Spatial" href="ext:javadocs-contrib-spatial"/>
- <javadoc-contrib-spellchecker label="Spellchecker" href="ext:javadocs-contrib-spellchecker"/>
- <javadoc-contrib-swing label="Swing" href="ext:javadocs-contrib-swing"/>
+ <javadoc-contrib-spellchecker label="Spellchecker" href="ext:javadocs-contrib-spellchecker"/>
<javadoc-contrib-wordnet label="Wordnet" href="ext:javadocs-contrib-wordnet"/>
<javadoc-contrib-xml-query-parser label="XML Query Parser" href="ext:javadocs-contrib-xml-query-parser"/>
</javadoc-contrib>
@@ -100,14 +95,10 @@ See http://forrest.apache.org/docs/linki
<javadocs-all href="api/all/index.html"/>
<javadocs-core href="api/core/index.html"/>
<javadocs-test-framework href="api/test-framework/index.html"/>
- <javadocs-contrib-ant href="api/contrib-ant/index.html"/>
- <javadocs-contrib-bdb href="api/contrib-bdb/index.html"/>
- <javadocs-contrib-bdb-je href="api/contrib-bdb-je/index.html"/>
<javadocs-contrib-benchmark href="api/contrib-benchmark/index.html"/>
<javadocs-contrib-demo href="api/contrib-demo/index.html"/>
<javadocs-contrib-highlighter href="api/contrib-highlighter/index.html"/>
<javadocs-contrib-instantiated href="api/contrib-instantiated/index.html"/>
- <javadocs-contrib-lucli href="api/contrib-lucli/index.html"/>
<javadocs-contrib-memory href="api/contrib-memory/index.html"/>
<javadocs-contrib-misc href="api/contrib-misc/index.html"/>
<javadocs-contrib-queries href="api/contrib-queries/index.html"/>
@@ -115,7 +106,6 @@ See http://forrest.apache.org/docs/linki
<javadocs-contrib-remote href="api/contrib-remote/index.html"/>
<javadocs-contrib-spatial href="api/contrib-spatial/index.html"/>
<javadocs-contrib-spellchecker href="api/contrib-spellchecker/index.html"/>
- <javadocs-contrib-swing href="api/contrib-swing/index.html"/>
<javadocs-contrib-wordnet href="api/contrib-wordnet/index.html"/>
<javadocs-contrib-xml-query-parser href="api/contrib-xml-query-parser/index.html"/>
Modified: lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/analysis/BaseTokenStreamTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/analysis/BaseTokenStreamTestCase.java?rev=1126449&r1=1126448&r2=1126449&view=diff
==============================================================================
--- lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/analysis/BaseTokenStreamTestCase.java (original)
+++ lucene/dev/branches/docvalues/lucene/src/test-framework/org/apache/lucene/analysis/BaseTokenStreamTestCase.java Mon May 23 11:43:03 2011
@@ -30,7 +30,15 @@ import org.apache.lucene.util.LuceneTest
import org.apache.lucene.util._TestUtil;
/**
- * Base class for all Lucene unit tests that use TokenStreams.
+ * Base class for all Lucene unit tests that use TokenStreams.
+ * <p>
+ * When writing unit tests for analysis components, its highly recommended
+ * to use the helper methods here (especially in conjunction with {@link MockAnalyzer} or
+ * {@link MockTokenizer}), as they contain many assertions and checks to
+ * catch bugs.
+ *
+ * @see MockAnalyzer
+ * @see MockTokenizer
*/
public abstract class BaseTokenStreamTestCase extends LuceneTestCase {
// some helpers to test Analyzers and TokenStreams: