You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/08/25 12:06:16 UTC
svn commit: r1377246 [1/7] - in /lucene/dev/branches/lucene3312: ./
dev-tools/ dev-tools/idea/lucene/analysis/morfologik/
dev-tools/idea/lucene/analysis/phonetic/ dev-tools/maven/
dev-tools/scripts/ lucene/ lucene/analysis/ lucene/analysis/common/ luce...
Author: uschindler
Date: Sat Aug 25 10:06:07 2012
New Revision: 1377246
URL: http://svn.apache.org/viewvc?rev=1377246&view=rev
Log:
LUCENE-3312: Merge up to trunk
Added:
lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianCharFilter.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/fa/TestPersianCharFilter.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/block/
- copied from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/codecs/block/
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked1.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked1.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked10.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked10.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked11.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked11.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked12.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked12.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked13.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked13.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked14.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked14.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked15.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked15.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked16.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked16.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked17.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked17.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked18.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked18.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked19.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked19.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked2.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked2.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked20.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked20.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked21.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked21.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked22.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked22.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked23.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked23.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked24.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked24.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked25.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked25.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked26.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked26.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked27.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked27.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked28.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked28.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked29.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked29.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked3.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked3.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked30.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked30.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked31.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked31.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked32.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked32.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked33.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked33.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked34.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked34.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked35.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked35.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked36.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked36.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked37.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked37.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked38.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked38.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked39.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked39.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked4.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked4.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked40.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked40.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked41.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked41.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked42.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked42.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked43.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked43.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked44.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked44.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked45.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked45.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked46.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked46.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked47.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked47.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked48.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked48.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked49.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked49.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked5.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked5.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked50.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked50.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked51.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked51.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked52.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked52.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked53.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked53.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked54.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked54.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked55.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked55.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked56.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked56.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked57.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked57.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked58.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked58.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked59.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked59.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked6.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked6.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked60.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked60.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked61.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked61.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked62.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked62.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked63.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked63.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked64.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked64.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked7.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked7.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked8.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked8.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked9.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPacked9.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock1.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock1.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock10.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock10.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock12.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock12.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock16.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock16.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock2.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock2.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock21.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock21.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock3.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock3.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock32.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock32.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock4.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock4.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock5.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock5.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock6.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock6.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock7.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock7.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock8.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock8.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock9.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperationPackedSingleBlock9.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/codecs/block/
- copied from r1377243, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/block/
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/util/TestFilterIterator.java
- copied unchanged from r1377243, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestFilterIterator.java
lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientConfigurer.java
- copied unchanged from r1377243, lucene/dev/trunk/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientConfigurer.java
Removed:
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/UnmodifiableIterator.java
Modified:
lucene/dev/branches/lucene3312/ (props changed)
lucene/dev/branches/lucene3312/build.xml
lucene/dev/branches/lucene3312/dev-tools/ (props changed)
lucene/dev/branches/lucene3312/dev-tools/idea/lucene/analysis/morfologik/morfologik.iml
lucene/dev/branches/lucene3312/dev-tools/idea/lucene/analysis/phonetic/phonetic.iml
lucene/dev/branches/lucene3312/dev-tools/maven/pom.xml.template
lucene/dev/branches/lucene3312/dev-tools/scripts/smokeTestRelease.py
lucene/dev/branches/lucene3312/lucene/ (props changed)
lucene/dev/branches/lucene3312/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene3312/lucene/MIGRATE.txt (contents, props changed)
lucene/dev/branches/lucene3312/lucene/analysis/ (props changed)
lucene/dev/branches/lucene3312/lucene/analysis/common/ (props changed)
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilter.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilter.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilter.java
lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
lucene/dev/branches/lucene3312/lucene/benchmark/ (props changed)
lucene/dev/branches/lucene3312/lucene/build.xml (contents, props changed)
lucene/dev/branches/lucene3312/lucene/common-build.xml (contents, props changed)
lucene/dev/branches/lucene3312/lucene/core/ (props changed)
lucene/dev/branches/lucene3312/lucene/core/build.xml
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/CharFilter.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttribute.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttributeImpl.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionLengthAttribute.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsWriter.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/FieldsProducer.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/FixedGapTermsIndexReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListWriter.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/StoredFieldsReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/TermVectorsWriter.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/TermsIndexReaderBase.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/VariableGapTermsIndexReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/bloom/BloomFilteringPostingsFormat.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/intblock/FixedIntBlockIndexInput.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/intblock/VariableIntBlockIndexInput.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsFormat.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40PostingsWriter.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40StoredFieldsReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/lucene40/Lucene40TermVectorsReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/Bytes.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/PackedIntValues.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/lucene40/values/VarSortedBytesImpl.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/memory/MemoryPostingsFormat.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/perfield/PerFieldPostingsFormat.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/sep/IntIndexInput.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/sep/SepPostingsReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/sep/SepSkipListReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldsReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextPerDocProducer.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/DocumentStoredFieldVisitor.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/document/Field.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/AtomicReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/CoalescedDeletes.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/FieldInfos.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/Fields.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/FilterAtomicReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/LogMergePolicy.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/ParallelAtomicReader.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/index/package.html
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/BooleanScorer.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/ConjunctionScorer.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/ConjunctionTermScorer.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/DocIdSetIterator.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/FieldCacheImpl.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/FilteredQuery.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/Query.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/RegexpQuery.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/search/ReqOptSumScorer.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/store/DataInput.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/store/DataOutput.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/store/Directory.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/store/IndexInput.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/store/IndexOutput.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/WeakIdentityMap.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/BulkOperation.java (contents, props changed)
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/DirectPacked64SingleBlockReader.java (props changed)
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/Packed16ThreeBlocks.java (props changed)
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/Packed64.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/Packed64SingleBlock.java (contents, props changed)
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/Packed8ThreeBlocks.java (props changed)
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/PackedReaderIterator.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/PackedWriter.java
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/gen_BulkOperation.py (contents, props changed)
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/gen_Direct.py (props changed)
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/gen_Packed64SingleBlock.py (contents, props changed)
lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/util/packed/gen_PackedThreeBlocks.py (props changed)
lucene/dev/branches/lucene3312/lucene/core/src/resources/META-INF/services/org.apache.lucene.codecs.PostingsFormat
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/analysis/TestCharFilter.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/document/TestField.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestCompoundFile.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestDirectoryReader.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestDuelingCodecs.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestFieldsReader.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMergePolicy.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOnDiskFull.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestLazyProxSkipping.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestMultiLevelSkipList.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestPostingsFormat.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestPostingsOffsets.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/index/TestTieredMergePolicy.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/store/TestCopyBytes.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/util/TestMaxFailuresRule.java
lucene/dev/branches/lucene3312/lucene/core/src/test/org/apache/lucene/util/packed/TestPackedInts.java
lucene/dev/branches/lucene3312/lucene/demo/ (props changed)
lucene/dev/branches/lucene3312/lucene/facet/ (props changed)
lucene/dev/branches/lucene3312/lucene/facet/src/test/org/apache/lucene/util/SlowRAMDirectory.java
lucene/dev/branches/lucene3312/lucene/grouping/ (props changed)
lucene/dev/branches/lucene3312/lucene/highlighter/ (props changed)
lucene/dev/branches/lucene3312/lucene/highlighter/src/java/org/apache/lucene/search/highlight/TokenStreamFromTermPositionVector.java
lucene/dev/branches/lucene3312/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BaseFragmentsBuilder.java
lucene/dev/branches/lucene3312/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/BoundaryScanner.java
lucene/dev/branches/lucene3312/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldFragList.java
lucene/dev/branches/lucene3312/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldPhraseList.java
lucene/dev/branches/lucene3312/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldQuery.java
lucene/dev/branches/lucene3312/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java
lucene/dev/branches/lucene3312/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/ScoreOrderFragmentsBuilder.java
lucene/dev/branches/lucene3312/lucene/highlighter/src/java/org/apache/lucene/search/vectorhighlight/SimpleBoundaryScanner.java
lucene/dev/branches/lucene3312/lucene/ivy-settings.xml (props changed)
lucene/dev/branches/lucene3312/lucene/join/ (props changed)
lucene/dev/branches/lucene3312/lucene/memory/ (props changed)
lucene/dev/branches/lucene3312/lucene/misc/ (props changed)
lucene/dev/branches/lucene3312/lucene/module-build.xml (props changed)
lucene/dev/branches/lucene3312/lucene/queries/ (props changed)
lucene/dev/branches/lucene3312/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/NumDocsValueSource.java
lucene/dev/branches/lucene3312/lucene/queryparser/ (props changed)
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ModifierQueryNode.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PathQueryNode.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/PhraseSlopQueryNode.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/ProximityQueryNode.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/nodes/TextableQueryNode.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/parser/EscapeQuerySyntax.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/core/util/StringUtils.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/CommonQueryParserConfiguration.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/builders/AnyQueryNodeBuilder.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/FuzzyConfig.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/config/StandardQueryConfigHandler.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/EscapeQuerySyntaxImpl.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/parser/StandardSyntaxParser.jj
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/flexible/standard/processors/OpenRangeQueryNodeProcessor.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/AndQuery.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/OrQuery.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/SpanNearClauseFactory.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/surround/query/TooManyBasicQueries.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/FilterBuilder.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/FilterBuilderFactory.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/QueryBuilderFactory.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BooleanFilterBuilder.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BooleanQueryBuilder.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingQueryBuilder.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/BoostingTermBuilder.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/ConstantScoreQueryBuilder.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/DisjunctionMaxQueryBuilder.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/DuplicateFilterBuilder.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/FilteredQueryBuilder.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/FuzzyLikeThisQueryBuilder.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/LikeThisQueryBuilder.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/MatchAllDocsQueryBuilder.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/RangeFilterBuilder.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanBuilderBase.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanFirstBuilder.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanNearBuilder.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanNotBuilder.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrBuilder.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrTermsBuilder.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilder.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanQueryBuilderFactory.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanTermBuilder.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermQueryBuilder.java
lucene/dev/branches/lucene3312/lucene/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsFilterBuilder.java
lucene/dev/branches/lucene3312/lucene/sandbox/ (props changed)
lucene/dev/branches/lucene3312/lucene/spatial/ (props changed)
lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgs.java
lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/query/SpatialArgsParser.java
lucene/dev/branches/lucene3312/lucene/spatial/src/java/org/apache/lucene/spatial/query/UnsupportedSpatialOperation.java
lucene/dev/branches/lucene3312/lucene/suggest/ (props changed)
lucene/dev/branches/lucene3312/lucene/test-framework/ (props changed)
lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/analysis/MockCharFilter.java
lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/analysis/MockTokenizer.java
lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/codecs/asserting/AssertingPostingsFormat.java
lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/codecs/mocksep/MockSingleIntIndexInput.java
lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java
lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/index/RandomCodec.java
lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/store/MockIndexInputWrapper.java
lucene/dev/branches/lucene3312/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/lucene3312/lucene/tools/ (props changed)
lucene/dev/branches/lucene3312/solr/ (props changed)
lucene/dev/branches/lucene3312/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene3312/solr/NOTICE.txt (props changed)
lucene/dev/branches/lucene3312/solr/build.xml (props changed)
lucene/dev/branches/lucene3312/solr/cloud-dev/ (props changed)
lucene/dev/branches/lucene3312/solr/common-build.xml (props changed)
lucene/dev/branches/lucene3312/solr/contrib/ (props changed)
lucene/dev/branches/lucene3312/solr/core/ (props changed)
lucene/dev/branches/lucene3312/solr/core/src/java/doc-files/tutorial.html
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/analysis/LegacyHTMLStripCharFilter.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/cloud/ZkController.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/UpdateLog.java
lucene/dev/branches/lucene3312/solr/core/src/java/org/apache/solr/update/VersionInfo.java
lucene/dev/branches/lucene3312/solr/core/src/test-files/solr/collection1/conf/schema15.xml
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/OverseerTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/cloud/ZkControllerTest.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/core/TestBadConfig.java
lucene/dev/branches/lucene3312/solr/core/src/test/org/apache/solr/update/TestUpdate.java
lucene/dev/branches/lucene3312/solr/example/ (props changed)
lucene/dev/branches/lucene3312/solr/lib/ (props changed)
lucene/dev/branches/lucene3312/solr/licenses/ (props changed)
lucene/dev/branches/lucene3312/solr/licenses/httpclient-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene3312/solr/licenses/httpclient-NOTICE.txt (props changed)
lucene/dev/branches/lucene3312/solr/licenses/httpcore-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene3312/solr/licenses/httpcore-NOTICE.txt (props changed)
lucene/dev/branches/lucene3312/solr/licenses/httpmime-LICENSE-ASL.txt (props changed)
lucene/dev/branches/lucene3312/solr/licenses/httpmime-NOTICE.txt (props changed)
lucene/dev/branches/lucene3312/solr/solrj/ (props changed)
lucene/dev/branches/lucene3312/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpClientUtil.java
lucene/dev/branches/lucene3312/solr/solrj/src/test/org/apache/solr/client/solrj/impl/HttpClientUtilTest.java
lucene/dev/branches/lucene3312/solr/test-framework/ (props changed)
lucene/dev/branches/lucene3312/solr/testlogging.properties (props changed)
lucene/dev/branches/lucene3312/solr/webapp/ (props changed)
Modified: lucene/dev/branches/lucene3312/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/build.xml?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/build.xml (original)
+++ lucene/dev/branches/lucene3312/build.xml Sat Aug 25 10:06:07 2012
@@ -265,7 +265,6 @@
<param name="tests.jvms" value="1"/>
<!-- Also override some other props to be fast, ignoring what's set on command line: -->
<param name="tests.multiplier" value="1"/>
- <param name="tests.slow" value="false"/>
<param name="tests.nightly" value="false"/>
<param name="tests.weekly" value="false"/>
<param name="tests.multiplier" value="1"/>
@@ -276,7 +275,7 @@
<!-- we need this extra condition, as we want to match only on "true", not solely if property is set: -->
<property name="disable.javadocs-lint" value="false" />
<condition property="-disable.javadocs-lint">
- <equals arg1="${disable.javadocs-lint}" arg2="true"/>
+ <istrue value="${disable.javadocs-lint}"/>
</condition>
<target name="-jenkins-javadocs-lint" unless="-disable.javadocs-lint">
<antcall target="javadocs-lint"/>
Modified: lucene/dev/branches/lucene3312/dev-tools/idea/lucene/analysis/morfologik/morfologik.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/idea/lucene/analysis/morfologik/morfologik.iml?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/idea/lucene/analysis/morfologik/morfologik.iml (original)
+++ lucene/dev/branches/lucene3312/dev-tools/idea/lucene/analysis/morfologik/morfologik.iml Sat Aug 25 10:06:07 2012
@@ -6,6 +6,7 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
Modified: lucene/dev/branches/lucene3312/dev-tools/idea/lucene/analysis/phonetic/phonetic.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/idea/lucene/analysis/phonetic/phonetic.iml?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/idea/lucene/analysis/phonetic/phonetic.iml (original)
+++ lucene/dev/branches/lucene3312/dev-tools/idea/lucene/analysis/phonetic/phonetic.iml Sat Aug 25 10:06:07 2012
@@ -6,6 +6,7 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
Modified: lucene/dev/branches/lucene3312/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/maven/pom.xml.template?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/lucene3312/dev-tools/maven/pom.xml.template Sat Aug 25 10:06:07 2012
@@ -47,7 +47,7 @@
<java.compat.version>1.6</java.compat.version>
<jetty.version>8.1.2.v20120308</jetty.version>
<slf4j.version>1.6.4</slf4j.version>
- <tika.version>1.1</tika.version>
+ <tika.version>1.2</tika.version>
<httpcomponents.version>4.1.3</httpcomponents.version>
<!-- RandomizedTesting library system properties -->
Modified: lucene/dev/branches/lucene3312/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/dev-tools/scripts/smokeTestRelease.py?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/branches/lucene3312/dev-tools/scripts/smokeTestRelease.py Sat Aug 25 10:06:07 2012
@@ -546,7 +546,7 @@ def testNotice(unpackPath):
if solrNotice.find(expected) == -1:
raise RuntimeError('Solr\'s NOTICE.txt does not have the verbatim copy, plus header/footer, of Lucene\'s NOTICE.txt')
-def readSolrOutput(p, startupEvent, logFile):
+def readSolrOutput(p, startupEvent, failureEvent, logFile):
f = open(logFile, 'wb')
try:
while True:
@@ -556,8 +556,13 @@ def readSolrOutput(p, startupEvent, logF
f.write(line)
f.flush()
# print 'SOLR: %s' % line.strip()
- if line.decode('UTF-8').find('Started SocketConnector@0.0.0.0:8983') != -1:
+ if not startupEvent.isSet() and line.find(b'Started SocketConnector@0.0.0.0:8983') != -1:
startupEvent.set()
+ except:
+ print()
+ print('Exception reading Solr output:')
+ traceback.print_exc()
+ failureEvent.set()
finally:
f.close()
@@ -572,7 +577,8 @@ def testSolrExample(unpackPath, javaPath
server = subprocess.Popen(['java', '-jar', 'start.jar'], stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=env)
startupEvent = threading.Event()
- serverThread = threading.Thread(target=readSolrOutput, args=(server.stderr, startupEvent, logFile))
+ failureEvent = threading.Event()
+ serverThread = threading.Thread(target=readSolrOutput, args=(server.stderr, startupEvent, failureEvent, logFile))
serverThread.setDaemon(True)
serverThread.start()
@@ -609,6 +615,9 @@ def testSolrExample(unpackPath, javaPath
# Shouldn't happen unless something is seriously wrong...
print('***WARNING***: Solr instance didn\'t respond to SIGKILL; ignoring...')
+ if failureEvent.isSet():
+ raise RuntimeError('exception while reading Solr output')
+
os.chdir('..')
def checkJavadocpath(path):
Modified: lucene/dev/branches/lucene3312/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/CHANGES.txt?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene3312/lucene/CHANGES.txt Sat Aug 25 10:06:07 2012
@@ -15,6 +15,15 @@ New Features
that you must store term vector positions to store payloads.
(Robert Muir)
+* LUCENE-3892: Add a new BlockPostingsFormat that bulk-encodes docs,
+ freqs and positions in large (size 128) packed-int blocks for faster
+ search performance. This was from Han Jiang's 2012 Google Summer of
+ Code project (Han Jiang, Adrien Grand, Robert Muir, Mike McCandless)
+
+* LUCENE-4323: Added support for an absolute maximum CFS segment size
+ (in MiB) to LogMergePolicy and TieredMergePolicy.
+ (Alexey Lef via Uwe Schindler)
+
API Changes
* LUCENE-4299: Added Terms.hasPositions() and Terms.hasOffsets().
@@ -50,6 +59,24 @@ API Changes
* LUCENE-4307: Renamed IndexReader.getTopReaderContext to
IndexReader.getContext. (Robert Muir)
+* LUCENE-4316: Deprecate Fields.getUniqueTermCount and remove it from
+ AtomicReader. If you really want the unique term count across all
+ fields, just sum up Terms.size() across those fields. This method
+ only exists so that this statistic can be accessed for Lucene 3.x
+ segments, which don't support Terms.size(). (Uwe Schindler, Robert Muir)
+
+* LUCENE-4321: Change CharFilter to extend Reader directly, as FilterReader
+ overdelegates (read(), read(char[], int, int), skip, etc). This made it
+ hard to implement CharFilters that were correct. Instead only close() is
+ delegated by default: read(char[], int, int) and correct(int) are abstract
+ so that its obvious which methods you should implement. The protected
+ inner Reader is 'input' like CharFilter in the 3.x series, instead of 'in'.
+ (Dawid Weiss, Uwe Schindler, Robert Muir)
+
+* LUCENE-3309: The expert FieldSelector API, used to load only certain
+ fields in a stored document, has been replaced with the simpler
+ StoredFieldVisitor API. (Mike McCandless)
+
Bug Fixes
* LUCENE-4297: BooleanScorer2 would multiply the coord() factor
@@ -83,6 +110,14 @@ Bug Fixes
containing non-BMP Unicode characters. (Dawid Weiss, Robert Muir,
Mike McCandless)
+Optimizations
+
+* LUCENE-4317: Improve reuse of internal TokenStreams and StringReader
+ in oal.document.Field. (Uwe Schindler, Chris Male, Robert Muir)
+
+* LUCENE-4327: Support out-of-order scoring in FilteredQuery for higher
+ performance. (Mike McCandless, Robert Muir)
+
Build
* LUCENE-3985: Upgrade to randomizedtesting 2.0.0. Added support for
Modified: lucene/dev/branches/lucene3312/lucene/MIGRATE.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/MIGRATE.txt?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/MIGRATE.txt (original)
+++ lucene/dev/branches/lucene3312/lucene/MIGRATE.txt Sat Aug 25 10:06:07 2012
@@ -619,3 +619,10 @@ you can now do this:
postings in simple arrrays (byte[] for terms, int[] for docs, freqs,
positions, offsets). Note that this only covers postings, whereas
Instantiated covered all other parts of the index as well.
+
+* LUCENE-3309: The expert FieldSelector API has been replaced with
+ StoredFieldVisitor. The idea is the same (you have full control
+ over which fields should be loaded). Instead of a single accept
+ method, StoredFieldVisitor has a needsField method: if that method
+ returns true then the field will be loaded and the appropriate
+ type-specific method will be invoked with that fields's value.
Modified: lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilter.java?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilter.java (original)
+++ lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/charfilter/MappingCharFilter.java Sat Aug 25 10:06:07 2012
@@ -67,8 +67,8 @@ public class MappingCharFilter extends B
@Override
public void reset() throws IOException {
- super.reset();
- buffer.reset(in);
+ input.reset();
+ buffer.reset(input);
replacement = null;
inputOff = 0;
}
Modified: lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilter.java?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilter.java (original)
+++ lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/fa/PersianCharFilter.java Sat Aug 25 10:06:07 2012
@@ -34,7 +34,7 @@ public class PersianCharFilter extends C
@Override
public int read(char[] cbuf, int off, int len) throws IOException {
- final int charsRead = super.read(cbuf, off, len);
+ final int charsRead = input.read(cbuf, off, len);
if (charsRead > 0) {
final int end = off + charsRead;
while (off < end) {
@@ -45,6 +45,17 @@ public class PersianCharFilter extends C
}
return charsRead;
}
+
+ // optimized impl: some other charfilters consume with read()
+ @Override
+ public int read() throws IOException {
+ int ch = input.read();
+ if (ch == '\u200C') {
+ return ' ';
+ } else {
+ return ch;
+ }
+ }
@Override
protected int correct(int currentOff) {
Modified: lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilter.java?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilter.java (original)
+++ lucene/dev/branches/lucene3312/lucene/analysis/common/src/java/org/apache/lucene/analysis/pattern/PatternReplaceCharFilter.java Sat Aug 25 10:06:07 2012
@@ -72,7 +72,7 @@ public class PatternReplaceCharFilter ex
private void fill() throws IOException {
StringBuilder buffered = new StringBuilder();
char [] temp = new char [1024];
- for (int cnt = in.read(temp); cnt > 0; cnt = in.read(temp)) {
+ for (int cnt = input.read(temp); cnt > 0; cnt = input.read(temp)) {
buffered.append(temp, 0, cnt);
}
transformedInput = new StringReader(processPattern(buffered).toString());
Modified: lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java (original)
+++ lucene/dev/branches/lucene3312/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java Sat Aug 25 10:06:07 2012
@@ -782,31 +782,51 @@ public class TestRandomChains extends Ba
@Override
public int read(char[] cbuf, int off, int len) throws IOException {
readSomething = true;
- return in.read(cbuf, off, len);
+ return input.read(cbuf, off, len);
}
@Override
public int read() throws IOException {
readSomething = true;
- return in.read();
+ return input.read();
}
@Override
public int read(CharBuffer target) throws IOException {
readSomething = true;
- return in.read(target);
+ return input.read(target);
}
@Override
public int read(char[] cbuf) throws IOException {
readSomething = true;
- return in.read(cbuf);
+ return input.read(cbuf);
}
@Override
public long skip(long n) throws IOException {
readSomething = true;
- return in.skip(n);
+ return input.skip(n);
+ }
+
+ @Override
+ public void mark(int readAheadLimit) throws IOException {
+ input.mark(readAheadLimit);
+ }
+
+ @Override
+ public boolean markSupported() {
+ return input.markSupported();
+ }
+
+ @Override
+ public boolean ready() throws IOException {
+ return input.ready();
+ }
+
+ @Override
+ public void reset() throws IOException {
+ input.reset();
}
}
Modified: lucene/dev/branches/lucene3312/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/build.xml?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/build.xml (original)
+++ lucene/dev/branches/lucene3312/lucene/build.xml Sat Aug 25 10:06:07 2012
@@ -238,7 +238,7 @@
<check-missing-javadocs dir="build/docs/demo" level="class"/>
<check-missing-javadocs dir="build/docs/facet" level="class"/>
<check-missing-javadocs dir="build/docs/grouping" level="class"/>
- <!-- highlighter: problems -->
+ <check-missing-javadocs dir="build/docs/highlighter" level="class"/>
<check-missing-javadocs dir="build/docs/join" level="class"/>
<check-missing-javadocs dir="build/docs/memory" level="class"/>
<check-missing-javadocs dir="build/docs/misc" level="class"/>
Modified: lucene/dev/branches/lucene3312/lucene/common-build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/common-build.xml?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/common-build.xml (original)
+++ lucene/dev/branches/lucene3312/lucene/common-build.xml Sat Aug 25 10:06:07 2012
@@ -135,7 +135,7 @@
<property name="javac.target" value="1.6"/>
<property name="javac.source.backwards" value="1.6"/>
<property name="javac.target.backwards" value="1.6"/>
- <property name="javac.args" value="-Xlint -Xlint:-deprecation -Xlint:-serial"/>
+ <property name="javac.args" value="-Xlint -Xlint:-deprecation -Xlint:-serial -Xlint:-options"/>
<property name="bootclasspath" value=""/>
<property name="javadoc.link" value="http://download.oracle.com/javase/6/docs/api/"/>
<property name="javadoc.link.junit" value="http://junit.sourceforge.net/javadoc/"/>
@@ -713,6 +713,7 @@
<or>
<isset property="tests.class" />
<isset property="tests.method" />
+ <istrue value="${tests.showSuccess}"/>
</or>
</condition>
<property name="tests.showOutput" value="onerror"/>
Modified: lucene/dev/branches/lucene3312/lucene/core/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/build.xml?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/build.xml (original)
+++ lucene/dev/branches/lucene3312/lucene/core/build.xml Sat Aug 25 10:06:07 2012
@@ -62,16 +62,40 @@
<sequential>
<exec dir="src/java/org/apache/lucene/util/automaton"
executable="${python.exe}" failonerror="true">
- <arg line="createLevAutomata.py @{n} True"/>
+ <arg value="createLevAutomata.py"/>
+ <arg value="@{n}"/>
+ <arg value="True"/>
</exec>
<exec dir="src/java/org/apache/lucene/util/automaton"
executable="${python.exe}" failonerror="true">
- <arg line="createLevAutomata.py @{n} False"/>
+ <arg value="createLevAutomata.py"/>
+ <arg value="@{n}"/>
+ <arg value="False"/>
</exec>
<fixcrlf srcdir="src/java/org/apache/lucene/util/automaton" includes="*ParametricDescription.java" encoding="UTF-8"/>
</sequential>
</macrodef>
+ <target name="createPackedIntSources">
+ <exec dir="src/java/org/apache/lucene/util/packed"
+ executable="${python.exe}" failonerror="true">
+ <arg value="gen_BulkOperation.py"/>
+ </exec>
+ <exec dir="src/java/org/apache/lucene/util/packed"
+ executable="${python.exe}" failonerror="true">
+ <arg value="gen_Direct.py"/>
+ </exec>
+ <exec dir="src/java/org/apache/lucene/util/packed"
+ executable="${python.exe}" failonerror="true">
+ <arg value="gen_Packed64SingleBlock.py"/>
+ </exec>
+ <exec dir="src/java/org/apache/lucene/util/packed"
+ executable="${python.exe}" failonerror="true">
+ <arg value="gen_PackedThreeBlocks.py"/>
+ </exec>
+ <fixcrlf srcdir="src/java/org/apache/lucene/util/packed" includes="BulkOperation*.java,Direct*.java,Packed64SingleBlock.java,Packed*ThreeBlocks.py" encoding="UTF-8"/>
+ </target>
+
<target name="createLevAutomata" depends="check-moman,clone-moman,pull-moman">
<createLevAutomaton n="1"/>
<createLevAutomaton n="2"/>
@@ -86,14 +110,21 @@
<target name="clone-moman" unless="moman.cloned">
<exec dir="src/java/org/apache/lucene/util/automaton"
executable="${hg.exe}" failonerror="true">
- <arg line="clone -r ${moman.rev} ${moman.url} moman"/>
+ <arg value="clone"/>
+ <arg value="-r"/>
+ <arg value="${moman.rev}"/>
+ <arg value="${moman.url}"/>
+ <arg value="moman"/>
</exec>
</target>
<target name="pull-moman" if="moman.cloned">
<exec dir="src/java/org/apache/lucene/util/automaton/moman"
executable="${hg.exe}" failonerror="true">
- <arg line="pull -f -r ${moman.rev}"/>
+ <arg value="pull"/>
+ <arg value="-f"/>
+ <arg value="-r"/>
+ <arg value="${moman.rev}"/>
</exec>
</target>
</project>
Modified: lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/Analyzer.java Sat Aug 25 10:06:07 2012
@@ -30,8 +30,42 @@ import java.util.Map;
* policy for extracting index terms from text.
* <p>
* In order to define what analysis is done, subclasses must define their
- * {@link TokenStreamComponents} in {@link #createComponents(String, Reader)}.
+ * {@link TokenStreamComponents TokenStreamComponents} in {@link #createComponents(String, Reader)}.
* The components are then reused in each call to {@link #tokenStream(String, Reader)}.
+ * <p>
+ * Simple example:
+ * <pre class="prettyprint">
+ * Analyzer analyzer = new Analyzer() {
+ * {@literal @Override}
+ * protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
+ * Tokenizer source = new FooTokenizer(reader);
+ * TokenStream filter = new FooFilter(source);
+ * filter = new BarFilter(filter);
+ * return new TokenStreamComponents(source, filter);
+ * }
+ * };
+ * </pre>
+ * For more examples, see the {@link org.apache.lucene.analysis Analysis package documentation}.
+ * <p>
+ * For some concrete implementations bundled with Lucene, look in the analysis modules:
+ * <ul>
+ * <li><a href="{@docRoot}/../analyzers-common/overview-summary.html">Common</a>:
+ * Analyzers for indexing content in different languages and domains.
+ * <li><a href="{@docRoot}/../analyzers-icu/overview-summary.html">ICU</a>:
+ * Exposes functionality from ICU to Apache Lucene.
+ * <li><a href="{@docRoot}/../analyzers-kuromoji/overview-summary.html">Kuromoji</a>:
+ * Morphological analyzer for Japanese text.
+ * <li><a href="{@docRoot}/../analyzers-morfologik/overview-summary.html">Morfologik</a>:
+ * Dictionary-driven lemmatization for the Polish language.
+ * <li><a href="{@docRoot}/../analyzers-phonetic/overview-summary.html">Phonetic</a>:
+ * Analysis for indexing phonetic signatures (for sounds-alike search).
+ * <li><a href="{@docRoot}/../analyzers-smartcn/overview-summary.html">Smart Chinese</a>:
+ * Analyzer for Simplified Chinese, which indexes words.
+ * <li><a href="{@docRoot}/../analyzers-stempel/overview-summary.html">Stempel</a>:
+ * Algorithmic Stemmer for the Polish Language.
+ * <li><a href="{@docRoot}/../analyzers-uima/overview-summary.html">UIMA</a>:
+ * Analysis integration with Apache UIMA.
+ * </ul>
*/
public abstract class Analyzer {
Modified: lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/CharFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/CharFilter.java?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/CharFilter.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/CharFilter.java Sat Aug 25 10:06:07 2012
@@ -17,7 +17,7 @@ package org.apache.lucene.analysis;
* limitations under the License.
*/
-import java.io.FilterReader;
+import java.io.IOException;
import java.io.Reader;
/**
@@ -25,17 +25,39 @@ import java.io.Reader;
* They can be used as {@link java.io.Reader} with additional offset
* correction. {@link Tokenizer}s will automatically use {@link #correctOffset}
* if a CharFilter subclass is used.
+ * <p>
+ * This class is abstract: at a minimum you must implement {@link #read(char[], int, int)},
+ * transforming the input in some way from {@link #input}, and {@link #correct(int)}
+ * to adjust the offsets to match the originals.
+ * <p>
+ * You can optionally provide more efficient implementations of additional methods
+ * like {@link #read()}, {@link #read(char[])}, {@link #read(java.nio.CharBuffer)},
+ * but this is not required.
*/
-public abstract class CharFilter extends FilterReader {
+// the way java.io.FilterReader should work!
+public abstract class CharFilter extends Reader {
+ /**
+ * The underlying character-input stream.
+ */
+ protected final Reader input;
/**
* Create a new CharFilter wrapping the provided reader.
- * @param in a Reader, can also be a CharFilter for chaining.
+ * @param input a Reader, can also be a CharFilter for chaining.
*/
- public CharFilter(Reader in) {
- super(in);
+ public CharFilter(Reader input) {
+ super(input);
+ this.input = input;
}
+ /**
+ * Closes the underlying input stream.
+ */
+ @Override
+ public void close() throws IOException {
+ input.close();
+ }
+
/**
* Subclasses override to correct the current offset.
*
@@ -50,6 +72,6 @@ public abstract class CharFilter extends
*/
public final int correctOffset(int currentOff) {
final int corrected = correct(currentOff);
- return (in instanceof CharFilter) ? ((CharFilter) in).correctOffset(corrected) : corrected;
+ return (input instanceof CharFilter) ? ((CharFilter) input).correctOffset(corrected) : corrected;
}
}
Modified: lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttribute.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttribute.java?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttribute.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttribute.java Sat Aug 25 10:06:07 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.analysis.token
import org.apache.lucene.util.Attribute;
-/** The positionIncrement determines the position of this token
+/** Determines the position of this token
* relative to the previous Token in a TokenStream, used in phrase
* searching.
*
Modified: lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttributeImpl.java?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttributeImpl.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionIncrementAttributeImpl.java Sat Aug 25 10:06:07 2012
@@ -20,7 +20,7 @@ package org.apache.lucene.analysis.token
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.util.AttributeImpl;
-/** The positionIncrement determines the position of this token
+/** Determines the position of this token
* relative to the previous Token in a {@link TokenStream}, used in phrase
* searching.
*
Modified: lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionLengthAttribute.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionLengthAttribute.java?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionLengthAttribute.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/analysis/tokenattributes/PositionLengthAttribute.java Sat Aug 25 10:06:07 2012
@@ -19,7 +19,7 @@ package org.apache.lucene.analysis.token
import org.apache.lucene.util.Attribute;
-/** The positionLength determines how many positions this
+/** Determines how many positions this
* token spans. Very few analyzer components actually
* produce this attribute, and indexing ignores it, but
* it's useful to express the graph structure naturally
Modified: lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/BlockTermsReader.java Sat Aug 25 10:06:07 2012
@@ -18,6 +18,7 @@ package org.apache.lucene.codecs;
*/
import java.io.IOException;
+import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.TreeMap;
@@ -39,7 +40,6 @@ import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.DoubleBarrelLRUCache;
-import org.apache.lucene.util.UnmodifiableIterator;
/** Handles a terms dict, but decouples all details of
* doc/freqs/positions reading to an instance of {@link
@@ -185,7 +185,7 @@ public class BlockTermsReader extends Fi
@Override
public Iterator<String> iterator() {
- return new UnmodifiableIterator<String>(fields.keySet().iterator());
+ return Collections.unmodifiableSet(fields.keySet()).iterator();
}
@Override
@@ -308,7 +308,7 @@ public class BlockTermsReader extends Fi
private int metaDataUpto;
public SegmentTermsEnum() throws IOException {
- in = (IndexInput) BlockTermsReader.this.in.clone();
+ in = BlockTermsReader.this.in.clone();
in.seek(termsStartPointer);
indexEnum = indexReader.getFieldEnum(fieldInfo);
doOrd = indexReader.supportsOrd();
Modified: lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsReader.java Sat Aug 25 10:06:07 2012
@@ -21,6 +21,7 @@ import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.PrintStream;
import java.io.UnsupportedEncodingException;
+import java.util.Collections;
import java.util.Comparator;
import java.util.Iterator;
import java.util.Locale;
@@ -45,7 +46,6 @@ import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.RamUsageEstimator;
import org.apache.lucene.util.StringHelper;
-import org.apache.lucene.util.UnmodifiableIterator;
import org.apache.lucene.util.automaton.CompiledAutomaton;
import org.apache.lucene.util.automaton.RunAutomaton;
import org.apache.lucene.util.automaton.Transition;
@@ -200,7 +200,7 @@ public class BlockTreeTermsReader extend
@Override
public Iterator<String> iterator() {
- return new UnmodifiableIterator<String>(fields.keySet().iterator());
+ return Collections.unmodifiableSet(fields.keySet()).iterator();
}
@Override
@@ -400,7 +400,7 @@ public class BlockTreeTermsReader extend
rootBlockFP = (new ByteArrayDataInput(rootCode.bytes, rootCode.offset, rootCode.length)).readVLong() >>> BlockTreeTermsWriter.OUTPUT_FLAGS_NUM_BITS;
if (indexIn != null) {
- final IndexInput clone = (IndexInput) indexIn.clone();
+ final IndexInput clone = indexIn.clone();
//System.out.println("start=" + indexStartFP + " field=" + fieldInfo.name);
clone.seek(indexStartFP);
index = new FST<BytesRef>(clone, ByteSequenceOutputs.getSingleton());
@@ -746,7 +746,7 @@ public class BlockTreeTermsReader extend
// }
runAutomaton = compiled.runAutomaton;
compiledAutomaton = compiled;
- in = (IndexInput) BlockTreeTermsReader.this.in.clone();
+ in = BlockTreeTermsReader.this.in.clone();
stack = new Frame[5];
for(int idx=0;idx<stack.length;idx++) {
stack[idx] = new Frame(idx);
@@ -1236,7 +1236,7 @@ public class BlockTreeTermsReader extend
// Not private to avoid synthetic access$NNN methods
void initIndexInput() {
if (this.in == null) {
- this.in = (IndexInput) BlockTreeTermsReader.this.in.clone();
+ this.in = BlockTreeTermsReader.this.in.clone();
}
}
Modified: lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsWriter.java?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsWriter.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/BlockTreeTermsWriter.java Sat Aug 25 10:06:07 2012
@@ -71,7 +71,7 @@ import org.apache.lucene.util.fst.Util;
*/
/**
- * block-based terms index and dictionary writer.
+ * Block-based terms index and dictionary writer.
* <p>
* Writes terms dict and index, block-encoding (column
* stride) each term's metadata for each set of terms
@@ -724,7 +724,7 @@ public class BlockTreeTermsWriter extend
// Write term stats, to separate byte[] blob:
bytesWriter2.writeVInt(term.stats.docFreq);
if (fieldInfo.getIndexOptions() != IndexOptions.DOCS_ONLY) {
- assert term.stats.totalTermFreq >= term.stats.docFreq;
+ assert term.stats.totalTermFreq >= term.stats.docFreq: term.stats.totalTermFreq + " vs " + term.stats.docFreq;
bytesWriter2.writeVLong(term.stats.totalTermFreq - term.stats.docFreq);
}
}
Modified: lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/FieldsProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/FieldsProducer.java?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/FieldsProducer.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/FieldsProducer.java Sat Aug 25 10:06:07 2012
@@ -22,7 +22,7 @@ import java.io.IOException;
import org.apache.lucene.index.Fields;
-/** Abstract API that produces terms, doc, freq, prox and
+/** Abstract API that produces terms, doc, freq, prox, offset and
* payloads postings.
*
* @lucene.experimental
Modified: lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/FixedGapTermsIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/FixedGapTermsIndexReader.java?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/FixedGapTermsIndexReader.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/FixedGapTermsIndexReader.java Sat Aug 25 10:06:07 2012
@@ -34,7 +34,7 @@ import java.io.IOException;
import org.apache.lucene.index.IndexFileNames;
/**
- * TermsIndexReader for simple every-nth terms indexes.
+ * TermsIndexReader for simple every Nth terms indexes.
*
* @see FixedGapTermsIndexWriter
* @lucene.experimental
@@ -278,7 +278,7 @@ public class FixedGapTermsIndexReader ex
this.termsStart = termsStart;
termBytesStart = termBytes.getPointer();
- IndexInput clone = (IndexInput) in.clone();
+ IndexInput clone = in.clone();
clone.seek(indexStart);
// -1 is passed to mean "don't load term index", but
@@ -309,8 +309,8 @@ public class FixedGapTermsIndexReader ex
}
} else {
// Get packed iterators
- final IndexInput clone1 = (IndexInput) in.clone();
- final IndexInput clone2 = (IndexInput) in.clone();
+ final IndexInput clone1 = in.clone();
+ final IndexInput clone2 = in.clone();
try {
// Subsample the index terms
Modified: lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListReader.java?rev=1377246&r1=1377245&r2=1377246&view=diff
==============================================================================
--- lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListReader.java (original)
+++ lucene/dev/branches/lucene3312/lucene/core/src/java/org/apache/lucene/codecs/MultiLevelSkipListReader.java Sat Aug 25 10:06:07 2012
@@ -59,30 +59,36 @@ public abstract class MultiLevelSkipList
private int skipInterval[]; // skipInterval of each level
private int[] numSkipped; // number of docs skipped per level
- private int[] skipDoc; // doc id of current skip entry per level
+ protected int[] skipDoc; // doc id of current skip entry per level
private int lastDoc; // doc id of last read skip entry with docId <= target
private long[] childPointer; // child pointer of current skip entry per level
private long lastChildPointer; // childPointer of last read skip entry with docId <= target
private boolean inputIsBuffered;
-
- public MultiLevelSkipListReader(IndexInput skipStream, int maxSkipLevels, int skipInterval) {
+ private final int skipMultiplier;
+
+ protected MultiLevelSkipListReader(IndexInput skipStream, int maxSkipLevels, int skipInterval, int skipMultiplier) {
this.skipStream = new IndexInput[maxSkipLevels];
this.skipPointer = new long[maxSkipLevels];
this.childPointer = new long[maxSkipLevels];
this.numSkipped = new int[maxSkipLevels];
this.maxNumberOfSkipLevels = maxSkipLevels;
this.skipInterval = new int[maxSkipLevels];
+ this.skipMultiplier = skipMultiplier;
this.skipStream [0]= skipStream;
this.inputIsBuffered = (skipStream instanceof BufferedIndexInput);
this.skipInterval[0] = skipInterval;
for (int i = 1; i < maxSkipLevels; i++) {
// cache skip intervals
- this.skipInterval[i] = this.skipInterval[i - 1] * skipInterval;
+ this.skipInterval[i] = this.skipInterval[i - 1] * skipMultiplier;
}
skipDoc = new int[maxSkipLevels];
}
+ // skipMultiplier and skipInterval are the same:
+ protected MultiLevelSkipListReader(IndexInput skipStream, int maxSkipLevels, int skipInterval) {
+ this(skipStream, maxSkipLevels, skipInterval, skipInterval);
+ }
/** Returns the id of the doc to which the last call of {@link #skipTo(int)}
* has skipped. */
@@ -157,7 +163,7 @@ public abstract class MultiLevelSkipList
numSkipped[level] = numSkipped[level + 1] - skipInterval[level + 1];
skipDoc[level] = lastDoc;
if (level > 0) {
- childPointer[level] = skipStream[level].readVLong() + skipPointer[level - 1];
+ childPointer[level] = skipStream[level].readVLong() + skipPointer[level - 1];
}
}
@@ -187,7 +193,12 @@ public abstract class MultiLevelSkipList
/** Loads the skip levels */
private void loadSkipLevels() throws IOException {
- numberOfSkipLevels = MathUtil.log(docCount, skipInterval[0]);
+ if (docCount <= skipInterval[0]) {
+ numberOfSkipLevels = 1;
+ } else {
+ numberOfSkipLevels = 1+MathUtil.log(docCount/skipInterval[0], skipMultiplier);
+ }
+
if (numberOfSkipLevels > maxNumberOfSkipLevels) {
numberOfSkipLevels = maxNumberOfSkipLevels;
}
@@ -208,7 +219,7 @@ public abstract class MultiLevelSkipList
toBuffer--;
} else {
// clone this stream, it is already at the start of the current level
- skipStream[i] = (IndexInput) skipStream[0].clone();
+ skipStream[i] = skipStream[0].clone();
if (inputIsBuffered && length < BufferedIndexInput.BUFFER_SIZE) {
((BufferedIndexInput) skipStream[i]).setBufferSize((int) length);
}