You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/10/15 03:26:31 UTC
svn commit: r1631928 [1/5] - in /lucene/dev/branches/lucene5969: ./
dev-tools/ dev-tools/idea/.idea/libraries/ lucene/ lucene/analysis/
lucene/analysis/common/
lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/
lucene/analysis/common/...
Author: rmuir
Date: Wed Oct 15 01:26:26 2014
New Revision: 1631928
URL: http://svn.apache.org/r1631928
Log:
merge trunk
Added:
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianAnalyzer.java
- copied unchanged from r1631927, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianAnalyzer.java
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchAnalyzer.java
- copied unchanged from r1631927, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchAnalyzer.java
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/LuceneResourcesWikiPage.html
- copied unchanged from r1631927, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/LuceneResourcesWikiPage.html
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/LuceneResourcesWikiPageURLs.txt
- copied unchanged from r1631927, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/LuceneResourcesWikiPageURLs.txt
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestClassicAnalyzer.java
- copied unchanged from r1631927, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestClassicAnalyzer.java
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java
- copied unchanged from r1631927, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailAnalyzer.java
- copied unchanged from r1631927, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailAnalyzer.java
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java
- copied unchanged from r1631927, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/WordBreakTestUnicode_6_3_0.java
- copied unchanged from r1631927, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/WordBreakTestUnicode_6_3_0.java
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/email.addresses.from.random.text.with.email.addresses.txt
- copied unchanged from r1631927, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/email.addresses.from.random.text.with.email.addresses.txt
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/generateJavaUnicodeWordBreakTest.pl
- copied unchanged from r1631927, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/generateJavaUnicodeWordBreakTest.pl
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/random.text.with.email.addresses.txt
- copied unchanged from r1631927, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/random.text.with.email.addresses.txt
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/random.text.with.urls.txt
- copied unchanged from r1631927, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/random.text.with.urls.txt
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/urls.from.random.text.with.urls.txt
- copied unchanged from r1631927, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/urls.from.random.text.with.urls.txt
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40RWFieldInfosFormat.java
- copied unchanged from r1631927, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40RWFieldInfosFormat.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/TestLucene40FieldInfoFormat.java
- copied unchanged from r1631927, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/TestLucene40FieldInfoFormat.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/TestLucene40SegmentInfoFormat.java
- copied unchanged from r1631927, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/TestLucene40SegmentInfoFormat.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene42/Lucene42RWFieldInfosFormat.java
- copied unchanged from r1631927, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene42/Lucene42RWFieldInfosFormat.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene42/TestLucene42FieldInfoFormat.java
- copied unchanged from r1631927, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene42/TestLucene42FieldInfoFormat.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene46/TestLucene46FieldInfoFormat.java
- copied unchanged from r1631927, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene46/TestLucene46FieldInfoFormat.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene46/TestLucene46SegmentInfoFormat.java
- copied unchanged from r1631927, lucene/dev/trunk/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene46/TestLucene46SegmentInfoFormat.java
lucene/dev/branches/lucene5969/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextFieldInfoFormat.java
- copied unchanged from r1631927, lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextFieldInfoFormat.java
lucene/dev/branches/lucene5969/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextSegmentInfoFormat.java
- copied unchanged from r1631927, lucene/dev/trunk/lucene/codecs/src/test/org/apache/lucene/codecs/simpletext/TestSimpleTextSegmentInfoFormat.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/util/NotDocIdSet.java
- copied unchanged from r1631927, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/NotDocIdSet.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/util/RoaringDocIdSet.java
- copied unchanged from r1631927, lucene/dev/trunk/lucene/core/src/java/org/apache/lucene/util/RoaringDocIdSet.java
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50FieldInfoFormat.java
- copied unchanged from r1631927, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50FieldInfoFormat.java
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50SegmentInfoFormat.java
- copied unchanged from r1631927, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50SegmentInfoFormat.java
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/util/TestNotDocIdSet.java
- copied unchanged from r1631927, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestNotDocIdSet.java
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/util/TestRoaringDocIdSet.java
- copied unchanged from r1631927, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/util/TestRoaringDocIdSet.java
lucene/dev/branches/lucene5969/lucene/licenses/icu4j-54.1.jar.sha1
- copied unchanged from r1631927, lucene/dev/trunk/lucene/licenses/icu4j-54.1.jar.sha1
lucene/dev/branches/lucene5969/lucene/licenses/junit4-ant-2.1.9.jar.sha1
- copied unchanged from r1631927, lucene/dev/trunk/lucene/licenses/junit4-ant-2.1.9.jar.sha1
lucene/dev/branches/lucene5969/lucene/licenses/randomizedtesting-runner-2.1.9.jar.sha1
- copied unchanged from r1631927, lucene/dev/trunk/lucene/licenses/randomizedtesting-runner-2.1.9.jar.sha1
lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/index/BaseFieldInfoFormatTestCase.java
- copied unchanged from r1631927, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseFieldInfoFormatTestCase.java
lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/index/BaseSegmentInfoFormatTestCase.java
- copied unchanged from r1631927, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/index/BaseSegmentInfoFormatTestCase.java
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/util/CommandOperation.java
- copied unchanged from r1631927, lucene/dev/trunk/solr/core/src/java/org/apache/solr/util/CommandOperation.java
lucene/dev/branches/lucene5969/solr/core/src/test/org/apache/solr/cloud/ReplicaPropertiesBase.java
- copied unchanged from r1631927, lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/ReplicaPropertiesBase.java
lucene/dev/branches/lucene5969/solr/core/src/test/org/apache/solr/cloud/TestReplicaProperties.java
- copied unchanged from r1631927, lucene/dev/trunk/solr/core/src/test/org/apache/solr/cloud/TestReplicaProperties.java
lucene/dev/branches/lucene5969/solr/licenses/icu4j-54.1.jar.sha1
- copied unchanged from r1631927, lucene/dev/trunk/solr/licenses/icu4j-54.1.jar.sha1
lucene/dev/branches/lucene5969/solr/licenses/junit4-ant-2.1.9.jar.sha1
- copied unchanged from r1631927, lucene/dev/trunk/solr/licenses/junit4-ant-2.1.9.jar.sha1
lucene/dev/branches/lucene5969/solr/licenses/randomizedtesting-runner-2.1.9.jar.sha1
- copied unchanged from r1631927, lucene/dev/trunk/solr/licenses/randomizedtesting-runner-2.1.9.jar.sha1
lucene/dev/branches/lucene5969/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerMultiConstructorTest.java
- copied unchanged from r1631927, lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerMultiConstructorTest.java
Removed:
lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerInterface.java
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemmer.java
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/LuceneResourcesWikiPage.html
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/LuceneResourcesWikiPageURLs.txt
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestClassicAnalyzer.java
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStandardAnalyzer.java
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailAnalyzer.java
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailTokenizer.java
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/WordBreakTestUnicode_6_3_0.java
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/email.addresses.from.random.text.with.email.addresses.txt
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/generateJavaUnicodeWordBreakTest.pl
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/random.text.with.email.addresses.txt
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/random.text.with.urls.txt
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/urls.from.random.text.with.urls.txt
lucene/dev/branches/lucene5969/lucene/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java
lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/uax29/Myanmar.rbbi
lucene/dev/branches/lucene5969/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Myanmar.brk
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40FieldInfosReader.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoReader.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene42/Lucene42FieldInfosReader.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene46/Lucene46FieldInfosReader.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene46/Lucene46FieldInfosWriter.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoReader.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40FieldInfosWriter.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoWriter.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene42/Lucene42FieldInfosWriter.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoWriter.java
lucene/dev/branches/lucene5969/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosReader.java
lucene/dev/branches/lucene5969/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosWriter.java
lucene/dev/branches/lucene5969/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoReader.java
lucene/dev/branches/lucene5969/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoWriter.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/codecs/FieldInfosReader.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/codecs/FieldInfosWriter.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/codecs/SegmentInfoReader.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/codecs/SegmentInfoWriter.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50FieldInfosReader.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50FieldInfosWriter.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50SegmentInfoReader.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50SegmentInfoWriter.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/util/DocIdBitSet.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/util/PForDeltaDocIdSet.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/util/WAH8DocIdSet.java
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/util/TestDocIdBitSet.java
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/util/TestPForDeltaDocIdSet.java
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/util/TestWAH8DocIdSet.java
lucene/dev/branches/lucene5969/lucene/licenses/icu4j-53.1.jar.sha1
lucene/dev/branches/lucene5969/lucene/licenses/junit4-ant-2.1.6.jar.sha1
lucene/dev/branches/lucene5969/lucene/licenses/randomizedtesting-runner-2.1.6.jar.sha1
lucene/dev/branches/lucene5969/solr/licenses/icu4j-53.1.jar.sha1
lucene/dev/branches/lucene5969/solr/licenses/junit4-ant-2.1.6.jar.sha1
lucene/dev/branches/lucene5969/solr/licenses/randomizedtesting-runner-2.1.6.jar.sha1
Modified:
lucene/dev/branches/lucene5969/ (props changed)
lucene/dev/branches/lucene5969/dev-tools/ (props changed)
lucene/dev/branches/lucene5969/dev-tools/idea/.idea/libraries/JUnit.xml
lucene/dev/branches/lucene5969/lucene/ (props changed)
lucene/dev/branches/lucene5969/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene5969/lucene/analysis/ (props changed)
lucene/dev/branches/lucene5969/lucene/analysis/common/ (props changed)
lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java
lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java
lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex
lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java
lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java
lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex
lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java
lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java
lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex
lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/BasicFoldings.txt
lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/DiacriticFolding.txt
lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/NativeDigitFolding.txt
lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/nfc.txt
lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/nfkc.txt
lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/nfkc_cf.txt
lucene/dev/branches/lucene5969/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/DefaultICUTokenizerConfig.java
lucene/dev/branches/lucene5969/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Default.brk
lucene/dev/branches/lucene5969/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Khmer.brk
lucene/dev/branches/lucene5969/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/utr30.nrm
lucene/dev/branches/lucene5969/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java
lucene/dev/branches/lucene5969/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/ (props changed)
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesFormat.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesReader.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40FieldInfosFormat.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsReader.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoFormat.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene42/Lucene42FieldInfosFormat.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene46/Lucene46FieldInfosFormat.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene46/Lucene46SegmentInfoFormat.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40DocValuesWriter.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40RWCodec.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40RWDocValuesFormat.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40RWNormsFormat.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene40/Lucene40RWSegmentInfoFormat.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene41/Lucene41RWCodec.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene42/Lucene42RWCodec.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene45/Lucene45RWCodec.java
lucene/dev/branches/lucene5969/lucene/backward-codecs/src/test/org/apache/lucene/codecs/lucene46/Lucene46RWSegmentInfoFormat.java
lucene/dev/branches/lucene5969/lucene/codecs/ (props changed)
lucene/dev/branches/lucene5969/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextFieldInfosFormat.java
lucene/dev/branches/lucene5969/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextSegmentInfoFormat.java
lucene/dev/branches/lucene5969/lucene/core/ (props changed)
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/codecs/FieldInfosFormat.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/codecs/SegmentInfoFormat.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50FieldInfosFormat.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50SegmentInfoFormat.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/index/DefaultIndexingChain.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterPerThread.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/index/IndexFileDeleter.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/index/ReadersAndUpdates.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/index/SegmentInfos.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/index/SegmentMerger.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/index/TieredMergePolicy.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/search/FilteredQuery.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/util/SparseFixedBitSet.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/util/StringHelper.java
lucene/dev/branches/lucene5969/lucene/core/src/java/org/apache/lucene/util/Version.java
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/index/Test2BBinaryDocValues.java
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/index/Test2BNumericDocValues.java
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/index/Test2BPositions.java
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/index/Test2BPostingsBytes.java
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/index/Test2BSortedDocValues.java
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/index/Test2BTerms.java
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMaxDocs.java
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterThreadsToSegments.java
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/search/TestCachingWrapperFilter.java
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/search/TestSameScoresWithThreads.java
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/search/TestScorerPerf.java
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/util/TestDocIdSetBuilder.java
lucene/dev/branches/lucene5969/lucene/core/src/test/org/apache/lucene/util/TestSparseFixedBitSet.java
lucene/dev/branches/lucene5969/lucene/ivy-versions.properties (contents, props changed)
lucene/dev/branches/lucene5969/lucene/licenses/ (props changed)
lucene/dev/branches/lucene5969/lucene/test-framework/ (props changed)
lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankyFieldInfosFormat.java
lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/codecs/cranky/CrankySegmentInfoFormat.java
lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/index/BaseCompoundFormatTestCase.java
lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/index/BaseStoredFieldsFormatTestCase.java
lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/util/BaseDocIdSetTestCase.java
lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleLimitSysouts.java
lucene/dev/branches/lucene5969/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java
lucene/dev/branches/lucene5969/lucene/tools/ (props changed)
lucene/dev/branches/lucene5969/lucene/tools/forbiddenApis/base.txt
lucene/dev/branches/lucene5969/lucene/tools/junit4/cached-timehints.txt
lucene/dev/branches/lucene5969/solr/ (props changed)
lucene/dev/branches/lucene5969/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene5969/solr/bin/ (props changed)
lucene/dev/branches/lucene5969/solr/bin/solr
lucene/dev/branches/lucene5969/solr/bin/solr.cmd
lucene/dev/branches/lucene5969/solr/bin/solr.in.cmd
lucene/dev/branches/lucene5969/solr/bin/solr.in.sh
lucene/dev/branches/lucene5969/solr/core/ (props changed)
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/cloud/Overseer.java
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/cloud/OverseerCollectionProcessor.java
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/cloud/ZkController.java
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/handler/NestedRequestHandler.java
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/handler/SnapPuller.java
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/handler/loader/JsonLoader.java
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/schema/SchemaManager.java
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/search/Grouping.java
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/search/function/distance/StringDistanceFunction.java
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/search/grouping/CommandHandler.java
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/update/processor/DistributedUpdateProcessor.java
lucene/dev/branches/lucene5969/solr/core/src/java/org/apache/solr/update/processor/RunUpdateProcessorFactory.java
lucene/dev/branches/lucene5969/solr/core/src/test/org/apache/solr/TestDistributedSearch.java
lucene/dev/branches/lucene5969/solr/core/src/test/org/apache/solr/TestGroupingSearch.java
lucene/dev/branches/lucene5969/solr/core/src/test/org/apache/solr/cloud/CloudExitableDirectoryReaderTest.java
lucene/dev/branches/lucene5969/solr/core/src/test/org/apache/solr/cloud/CollectionsAPIDistributedZkTest.java
lucene/dev/branches/lucene5969/solr/core/src/test/org/apache/solr/cloud/HttpPartitionTest.java
lucene/dev/branches/lucene5969/solr/core/src/test/org/apache/solr/cloud/OverseerRolesTest.java
lucene/dev/branches/lucene5969/solr/core/src/test/org/apache/solr/cloud/ReplicationFactorTest.java
lucene/dev/branches/lucene5969/solr/core/src/test/org/apache/solr/cloud/TestCollectionAPI.java
lucene/dev/branches/lucene5969/solr/core/src/test/org/apache/solr/core/ExitableDirectoryReaderTest.java
lucene/dev/branches/lucene5969/solr/core/src/test/org/apache/solr/handler/component/DistributedQueryComponentOptimizationTest.java
lucene/dev/branches/lucene5969/solr/core/src/test/org/apache/solr/handler/component/StatsComponentTest.java
lucene/dev/branches/lucene5969/solr/core/src/test/org/apache/solr/rest/schema/TestBulkSchemaAPI.java
lucene/dev/branches/lucene5969/solr/core/src/test/org/apache/solr/schema/TestSchemaManager.java
lucene/dev/branches/lucene5969/solr/core/src/test/org/apache/solr/search/function/TestFunctionQuery.java
lucene/dev/branches/lucene5969/solr/core/src/test/org/apache/solr/update/AddBlockUpdateTest.java
lucene/dev/branches/lucene5969/solr/core/src/test/org/apache/solr/update/DocumentBuilderTest.java
lucene/dev/branches/lucene5969/solr/example/ (props changed)
lucene/dev/branches/lucene5969/solr/example/logs/ (props changed)
lucene/dev/branches/lucene5969/solr/licenses/ (props changed)
lucene/dev/branches/lucene5969/solr/solrj/ (props changed)
lucene/dev/branches/lucene5969/solr/solrj/src/java/org/apache/solr/client/solrj/impl/CloudSolrServer.java
lucene/dev/branches/lucene5969/solr/solrj/src/java/org/apache/solr/client/solrj/impl/HttpSolrServer.java
lucene/dev/branches/lucene5969/solr/solrj/src/java/org/apache/solr/client/solrj/impl/LBHttpSolrServer.java
lucene/dev/branches/lucene5969/solr/solrj/src/java/org/apache/solr/common/params/CollectionParams.java
lucene/dev/branches/lucene5969/solr/solrj/src/java/org/apache/solr/common/util/JsonRecordReader.java
lucene/dev/branches/lucene5969/solr/solrj/src/test/org/apache/solr/client/solrj/impl/BasicHttpSolrServerTest.java
lucene/dev/branches/lucene5969/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java
lucene/dev/branches/lucene5969/solr/solrj/src/test/org/apache/solr/common/util/TestJsonRecordReader.java
Modified: lucene/dev/branches/lucene5969/dev-tools/idea/.idea/libraries/JUnit.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/dev-tools/idea/.idea/libraries/JUnit.xml?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/dev-tools/idea/.idea/libraries/JUnit.xml (original)
+++ lucene/dev/branches/lucene5969/dev-tools/idea/.idea/libraries/JUnit.xml Wed Oct 15 01:26:26 2014
@@ -2,7 +2,7 @@
<library name="JUnit">
<CLASSES>
<root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/junit-4.10.jar!/" />
- <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.1.6.jar!/" />
+ <root url="jar://$PROJECT_DIR$/lucene/test-framework/lib/randomizedtesting-runner-2.1.9.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: lucene/dev/branches/lucene5969/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/CHANGES.txt?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene5969/lucene/CHANGES.txt Wed Oct 15 01:26:26 2014
@@ -151,6 +151,15 @@ API Changes
to return an instance optimized for merging instead of searching.
(Mike McCandless, Robert Muir)
+* LUCENE-5992: Remove FieldInfos from SegmentInfosWriter.write API. (Robert Muir, Mike McCandless)
+
+* LUCENE-5998: Simplify Field/SegmentInfoFormat to read+write methods.
+ (Robert Muir)
+
+* LUCENE-6000: Removed StandardTokenizerInterface. Tokenizers now use
+ their jflex impl directly.
+ (Ryan Ernst)
+
Bug Fixes
* LUCENE-5650: Enforce read-only access to any path outside the temporary
@@ -169,6 +178,8 @@ Bug Fixes
not have the regular "spinlock" of DirectoryReader.open. It now implements
Closeable and you must close it to release the lock. (Mike McCandless, Robert Muir)
+* LUCENE-5980: Don't let document length overflow. (Robert Muir)
+
Documentation
* LUCENE-5392: Add/improve analysis package documentation to reflect
@@ -187,6 +198,12 @@ Tests
index files to use Version.toString() in filename.
(Ryan Ernst)
+* LUCENE-6002: Monster tests no longer fail. Most of them now have an 80 hour
+ timeout, effectively removing the timeout. The tests that operate near the 2
+ billion limit now use IndexWriter.MAX_DOCS instead of Integer.MAX_VALUE.
+ Some of the slow Monster tests now explicitly choose the default codec.
+ (Mike McCandless, Shawn Heisey)
+
Optimizations
* LUCENE-5960: Use a more efficient bitset, not a Set<Integer>, to
@@ -206,6 +223,9 @@ Optimizations
per-segment/per-producer, and norms and doc values merging no longer cause
RAM spikes for latent fields. (Mike McCandless, Robert Muir)
+* LUCENE-5983: CachingWrapperFilter now uses a new DocIdSet implementation
+ called RoaringDocIdSet instead of WAH8DocIdSet. (Adrien Grand)
+
Build
* LUCENE-5909: Smoke tester now has better command line parsing and
@@ -216,6 +236,8 @@ Build
* LUCENE-5962: Rename diffSources.py to createPatch.py and make it work with all text file types.
(Ryan Ernst)
+* LUCENE-5995: Upgrade ICU to 54.1 (Robert Muir)
+
Other
* LUCENE-5563: Removed sep layout: which has fallen behind on features and doesn't
@@ -1250,6 +1272,10 @@ New Features
approximate value of the diameter of the earth at the given latitude.
(Adrien Grand)
+* LUCENE-5979: FilteredQuery uses the cost API to decide on whether to use
+ random-access or leap-frog to intersect the filter with the query.
+ (Adrien Grand)
+
Build
* LUCENE-5217,LUCENE-5420: Maven config: get dependencies from Ant+Ivy config;
Modified: lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java (original)
+++ lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizer.java Wed Oct 15 01:26:26 2014
@@ -49,7 +49,7 @@ import org.apache.lucene.util.AttributeF
public final class ClassicTokenizer extends Tokenizer {
/** A private instance of the JFlex-constructed scanner */
- private StandardTokenizerInterface scanner;
+ private ClassicTokenizerImpl scanner;
public static final int ALPHANUM = 0;
public static final int APOSTROPHE = 1;
@@ -135,7 +135,7 @@ public final class ClassicTokenizer exte
while(true) {
int tokenType = scanner.getNextToken();
- if (tokenType == StandardTokenizerInterface.YYEOF) {
+ if (tokenType == ClassicTokenizerImpl.YYEOF) {
return false;
}
Modified: lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java (original)
+++ lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.java Wed Oct 15 01:26:26 2014
@@ -33,7 +33,7 @@ import org.apache.lucene.analysis.tokena
* This class implements the classic lucene StandardTokenizer up until 3.0
*/
-class ClassicTokenizerImpl implements StandardTokenizerInterface {
+class ClassicTokenizerImpl {
/** This character denotes the end of file */
public static final int YYEOF = -1;
Modified: lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex (original)
+++ lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/ClassicTokenizerImpl.jflex Wed Oct 15 01:26:26 2014
@@ -33,7 +33,6 @@ import org.apache.lucene.analysis.tokena
%%
%class ClassicTokenizerImpl
-%implements StandardTokenizerInterface
%unicode 3.0
%integer
%function getNextToken
Modified: lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java (original)
+++ lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizer.java Wed Oct 15 01:26:26 2014
@@ -39,7 +39,7 @@ import org.apache.lucene.util.AttributeF
public final class StandardTokenizer extends Tokenizer {
/** A private instance of the JFlex-constructed scanner */
- private StandardTokenizerInterface scanner;
+ private StandardTokenizerImpl scanner;
// TODO: how can we remove these old types?!
public static final int ALPHANUM = 0;
@@ -150,7 +150,7 @@ public final class StandardTokenizer ext
while(true) {
int tokenType = scanner.getNextToken();
- if (tokenType == StandardTokenizerInterface.YYEOF) {
+ if (tokenType == StandardTokenizerImpl.YYEOF) {
return false;
}
Modified: lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java (original)
+++ lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.java Wed Oct 15 01:26:26 2014
@@ -39,7 +39,7 @@ import org.apache.lucene.analysis.tokena
* </ul>
*/
-public final class StandardTokenizerImpl implements StandardTokenizerInterface {
+public final class StandardTokenizerImpl {
/** This character denotes the end of file */
public static final int YYEOF = -1;
@@ -804,7 +804,7 @@ public final class StandardTokenizerImpl
if (zzInput == YYEOF && zzStartRead == zzCurrentPos) {
zzAtEOF = true;
{
- return StandardTokenizerInterface.YYEOF;
+ return YYEOF;
}
}
else {
Modified: lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex (original)
+++ lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/StandardTokenizerImpl.jflex Wed Oct 15 01:26:26 2014
@@ -43,7 +43,6 @@ import org.apache.lucene.analysis.tokena
%final
%public
%class StandardTokenizerImpl
-%implements StandardTokenizerInterface
%function getNextToken
%char
%buffer 255
@@ -118,7 +117,7 @@ ComplexContextEx = \p{LB:Complex_Cont
// UAX#29 WB1. sot ÷
// WB2. ÷ eot
//
-<<EOF>> { return StandardTokenizerInterface.YYEOF; }
+<<EOF>> { return YYEOF; }
// UAX#29 WB8. Numeric à Numeric
// WB11. Numeric (MidNum | MidNumLet | Single_Quote) Ã Numeric
Modified: lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java (original)
+++ lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizer.java Wed Oct 15 01:26:26 2014
@@ -47,7 +47,7 @@ import org.apache.lucene.util.AttributeF
public final class UAX29URLEmailTokenizer extends Tokenizer {
/** A private instance of the JFlex-constructed scanner */
- private final StandardTokenizerInterface scanner;
+ private final UAX29URLEmailTokenizerImpl scanner;
public static final int ALPHANUM = 0;
public static final int NUM = 1;
@@ -108,7 +108,7 @@ public final class UAX29URLEmailTokenize
this.scanner = getScanner();
}
- private StandardTokenizerInterface getScanner() {
+ private UAX29URLEmailTokenizerImpl getScanner() {
return new UAX29URLEmailTokenizerImpl(input);
}
@@ -127,7 +127,7 @@ public final class UAX29URLEmailTokenize
while(true) {
int tokenType = scanner.getNextToken();
- if (tokenType == StandardTokenizerInterface.YYEOF) {
+ if (tokenType == UAX29URLEmailTokenizerImpl.YYEOF) {
return false;
}
Modified: lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java (original)
+++ lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.java Wed Oct 15 01:26:26 2014
@@ -42,7 +42,7 @@ import org.apache.lucene.analysis.tokena
* </ul>
*/
-public final class UAX29URLEmailTokenizerImpl implements StandardTokenizerInterface {
+public final class UAX29URLEmailTokenizerImpl {
/** This character denotes the end of file */
public static final int YYEOF = -1;
@@ -7204,11 +7204,11 @@ public final class UAX29URLEmailTokenize
zzAtEOF = true;
switch (zzLexicalState) {
case YYINITIAL: {
- return StandardTokenizerInterface.YYEOF;
+ return YYEOF;
}
case 2910: break;
case AVOID_BAD_URL: {
- return StandardTokenizerInterface.YYEOF;
+ return YYEOF;
}
case 2911: break;
default:
Modified: lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex (original)
+++ lucene/dev/branches/lucene5969/lucene/analysis/common/src/java/org/apache/lucene/analysis/standard/UAX29URLEmailTokenizerImpl.jflex Wed Oct 15 01:26:26 2014
@@ -46,7 +46,6 @@ import org.apache.lucene.analysis.tokena
%final
%public
%class UAX29URLEmailTokenizerImpl
-%implements StandardTokenizerInterface
%function getNextToken
%char
%xstate AVOID_BAD_URL
@@ -208,7 +207,7 @@ EMAIL = {EMAILlocalPart} "@" ({DomainNam
// UAX#29 WB1. sot ÷
// WB2. ÷ eot
//
- <<EOF>> { return StandardTokenizerInterface.YYEOF; }
+ <<EOF>> { return YYEOF; }
{URL} { yybegin(YYINITIAL); return URL_TYPE; }
Modified: lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/BasicFoldings.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/BasicFoldings.txt?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/BasicFoldings.txt (original)
+++ lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/BasicFoldings.txt Wed Oct 15 01:26:26 2014
@@ -49,6 +49,7 @@
2E17>002D
2E1A>002D
2E3A..2E3B>002D
+2E40>002D
301C>002D
3030>002D
30A0>002D
Modified: lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/DiacriticFolding.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/DiacriticFolding.txt?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/DiacriticFolding.txt (original)
+++ lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/DiacriticFolding.txt Wed Oct 15 01:26:26 2014
@@ -102,6 +102,7 @@
1939..193B>
1A75..1A7C>
1A7F>
+1AB0..1ABD>
1B34>
1B44>
1B6B..1B73>
@@ -111,8 +112,10 @@
1CD0..1CE8>
1CED>
1CF4>
+1CF8..1CF9>
1D2C..1D6A>
1DC4..1DCF>
+1DF5>
1DFD..1DFF>
1FBD>
1FBF..1FC1>
@@ -128,6 +131,7 @@
A66F>
A67C..A67D>
A67F>
+A69C..A69D>
A6F0..A6F1>
A717..A721>
A788>
@@ -138,27 +142,43 @@ A92B..A92E>
A953>
A9B3>
A9C0>
-AA7B>
+A9E5>
+AA7B..AA7D>
AABF..AAC2>
AAF6>
+AB5B..AB5F>
ABEC..ABED>
FB1E>
-FE20..FE26>
+FE20..FE2D>
FF3E>
FF40>
FF70>
FF9E..FF9F>
FFE3>
+102E0>
+10AE5..10AE6>
110B9..110BA>
11133..11134>
+11173>
111C0>
+11235..11236>
+112E9..112EA>
+1133C>
+1134D>
+11366..1136C>
+11370..11374>
+114C2..114C3>
+115BF..115C0>
+1163F>
116B6..116B7>
+16AF0..16AF4>
16F8F..16F9F>
1D167..1D169>
1D16D..1D172>
1D17B..1D182>
1D185..1D18B>
1D1AA..1D1AD>
+1E8D0..1E8D6>
# Latin script "composed" that do not further decompose, so decompose here
# These are from AsciiFoldingFilter
Modified: lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/NativeDigitFolding.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/NativeDigitFolding.txt?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/NativeDigitFolding.txt (original)
+++ lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/NativeDigitFolding.txt Wed Oct 15 01:26:26 2014
@@ -151,6 +151,16 @@
0D6D>0037 # MALAYALAM DIGIT SEVEN
0D6E>0038 # MALAYALAM DIGIT EIGHT
0D6F>0039 # MALAYALAM DIGIT NINE
+0DE6>0030 # SINHALA LITH DIGIT ZERO
+0DE7>0031 # SINHALA LITH DIGIT ONE
+0DE8>0032 # SINHALA LITH DIGIT TWO
+0DE9>0033 # SINHALA LITH DIGIT THREE
+0DEA>0034 # SINHALA LITH DIGIT FOUR
+0DEB>0035 # SINHALA LITH DIGIT FIVE
+0DEC>0036 # SINHALA LITH DIGIT SIX
+0DED>0037 # SINHALA LITH DIGIT SEVEN
+0DEE>0038 # SINHALA LITH DIGIT EIGHT
+0DEF>0039 # SINHALA LITH DIGIT NINE
0E50>0030 # THAI DIGIT ZERO
0E51>0031 # THAI DIGIT ONE
0E52>0032 # THAI DIGIT TWO
@@ -388,6 +398,16 @@ A9D6>0036 # JAVANESE DIGIT SIX
A9D7>0037 # JAVANESE DIGIT SEVEN
A9D8>0038 # JAVANESE DIGIT EIGHT
A9D9>0039 # JAVANESE DIGIT NINE
+A9F0>0030 # MYANMAR TAI LAING DIGIT ZERO
+A9F1>0031 # MYANMAR TAI LAING DIGIT ONE
+A9F2>0032 # MYANMAR TAI LAING DIGIT TWO
+A9F3>0033 # MYANMAR TAI LAING DIGIT THREE
+A9F4>0034 # MYANMAR TAI LAING DIGIT FOUR
+A9F5>0035 # MYANMAR TAI LAING DIGIT FIVE
+A9F6>0036 # MYANMAR TAI LAING DIGIT SIX
+A9F7>0037 # MYANMAR TAI LAING DIGIT SEVEN
+A9F8>0038 # MYANMAR TAI LAING DIGIT EIGHT
+A9F9>0039 # MYANMAR TAI LAING DIGIT NINE
AA50>0030 # CHAM DIGIT ZERO
AA51>0031 # CHAM DIGIT ONE
AA52>0032 # CHAM DIGIT TWO
@@ -480,6 +500,36 @@ ABF9>0039 # MEETEI MAYEK DIGIT NINE
111D7>0037 # SHARADA DIGIT SEVEN
111D8>0038 # SHARADA DIGIT EIGHT
111D9>0039 # SHARADA DIGIT NINE
+112F0>0030 # KHUDAWADI DIGIT ZERO
+112F1>0031 # KHUDAWADI DIGIT ONE
+112F2>0032 # KHUDAWADI DIGIT TWO
+112F3>0033 # KHUDAWADI DIGIT THREE
+112F4>0034 # KHUDAWADI DIGIT FOUR
+112F5>0035 # KHUDAWADI DIGIT FIVE
+112F6>0036 # KHUDAWADI DIGIT SIX
+112F7>0037 # KHUDAWADI DIGIT SEVEN
+112F8>0038 # KHUDAWADI DIGIT EIGHT
+112F9>0039 # KHUDAWADI DIGIT NINE
+114D0>0030 # TIRHUTA DIGIT ZERO
+114D1>0031 # TIRHUTA DIGIT ONE
+114D2>0032 # TIRHUTA DIGIT TWO
+114D3>0033 # TIRHUTA DIGIT THREE
+114D4>0034 # TIRHUTA DIGIT FOUR
+114D5>0035 # TIRHUTA DIGIT FIVE
+114D6>0036 # TIRHUTA DIGIT SIX
+114D7>0037 # TIRHUTA DIGIT SEVEN
+114D8>0038 # TIRHUTA DIGIT EIGHT
+114D9>0039 # TIRHUTA DIGIT NINE
+11650>0030 # MODI DIGIT ZERO
+11651>0031 # MODI DIGIT ONE
+11652>0032 # MODI DIGIT TWO
+11653>0033 # MODI DIGIT THREE
+11654>0034 # MODI DIGIT FOUR
+11655>0035 # MODI DIGIT FIVE
+11656>0036 # MODI DIGIT SIX
+11657>0037 # MODI DIGIT SEVEN
+11658>0038 # MODI DIGIT EIGHT
+11659>0039 # MODI DIGIT NINE
116C0>0030 # TAKRI DIGIT ZERO
116C1>0031 # TAKRI DIGIT ONE
116C2>0032 # TAKRI DIGIT TWO
@@ -490,4 +540,34 @@ ABF9>0039 # MEETEI MAYEK DIGIT NINE
116C7>0037 # TAKRI DIGIT SEVEN
116C8>0038 # TAKRI DIGIT EIGHT
116C9>0039 # TAKRI DIGIT NINE
+118E0>0030 # WARANG CITI DIGIT ZERO
+118E1>0031 # WARANG CITI DIGIT ONE
+118E2>0032 # WARANG CITI DIGIT TWO
+118E3>0033 # WARANG CITI DIGIT THREE
+118E4>0034 # WARANG CITI DIGIT FOUR
+118E5>0035 # WARANG CITI DIGIT FIVE
+118E6>0036 # WARANG CITI DIGIT SIX
+118E7>0037 # WARANG CITI DIGIT SEVEN
+118E8>0038 # WARANG CITI DIGIT EIGHT
+118E9>0039 # WARANG CITI DIGIT NINE
+16A60>0030 # MRO DIGIT ZERO
+16A61>0031 # MRO DIGIT ONE
+16A62>0032 # MRO DIGIT TWO
+16A63>0033 # MRO DIGIT THREE
+16A64>0034 # MRO DIGIT FOUR
+16A65>0035 # MRO DIGIT FIVE
+16A66>0036 # MRO DIGIT SIX
+16A67>0037 # MRO DIGIT SEVEN
+16A68>0038 # MRO DIGIT EIGHT
+16A69>0039 # MRO DIGIT NINE
+16B50>0030 # PAHAWH HMONG DIGIT ZERO
+16B51>0031 # PAHAWH HMONG DIGIT ONE
+16B52>0032 # PAHAWH HMONG DIGIT TWO
+16B53>0033 # PAHAWH HMONG DIGIT THREE
+16B54>0034 # PAHAWH HMONG DIGIT FOUR
+16B55>0035 # PAHAWH HMONG DIGIT FIVE
+16B56>0036 # PAHAWH HMONG DIGIT SIX
+16B57>0037 # PAHAWH HMONG DIGIT SEVEN
+16B58>0038 # PAHAWH HMONG DIGIT EIGHT
+16B59>0039 # PAHAWH HMONG DIGIT NINE
Modified: lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/nfc.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/nfc.txt?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/nfc.txt (original)
+++ lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/nfc.txt Wed Oct 15 01:26:26 2014
@@ -1,4 +1,4 @@
-# Copyright (C) 1999-2013, International Business Machines
+# Copyright (C) 1999-2014, International Business Machines
# Corporation and others. All Rights Reserved.
#
# file name: nfc.txt
@@ -7,7 +7,7 @@
#
# Complete data for Unicode NFC normalization.
-* Unicode 6.3.0
+* Unicode 7.0.0
# Canonical_Combining_Class (ccc) values
0300..0314:230
@@ -142,7 +142,7 @@
08F6:220
08F7..08F8:230
08F9..08FA:220
-08FB..08FE:230
+08FB..08FF:230
093C:7
094D:9
0951:230
@@ -199,6 +199,10 @@
1A60:9
1A75..1A7C:230
1A7F:220
+1AB0..1AB4:230
+1AB5..1ABA:220
+1ABB..1ABC:230
+1ABD:220
1B34:7
1B44:9
1B6B:230
@@ -217,6 +221,7 @@
1CE2..1CE8:1
1CED:220
1CF4:230
+1CF8..1CF9:230
1DC0..1DC1:230
1DC2:220
1DC3..1DC9:230
@@ -226,7 +231,7 @@
1DCE:214
1DCF:220
1DD0:202
-1DD1..1DE6:230
+1DD1..1DF5:230
1DFC:233
1DFD:220
1DFE:230
@@ -274,21 +279,44 @@ AAF6:9
ABED:9
FB1E:26
FE20..FE26:230
+FE27..FE2D:220
101FD:220
+102E0:220
+10376..1037A:230
10A0D:220
10A0F:230
10A38:230
10A39:1
10A3A:220
10A3F:9
+10AE5:230
+10AE6:220
11046:9
+1107F:9
110B9:9
110BA:7
11100..11102:230
11133..11134:9
+11173:7
111C0:9
+11235:9
+11236:7
+112E9:7
+112EA:9
+1133C:7
+1134D:9
+11366..1136C:230
+11370..11374:230
+114C2:9
+114C3:7
+115BF:9
+115C0:7
+1163F:9
116B6:9
116B7:7
+16AF0..16AF4:1
+16B30..16B36:230
+1BC9E:1
1D165..1D166:216
1D167..1D169:1
1D16D:226
@@ -298,6 +326,7 @@ FE20..FE26:230
1D18A..1D18B:220
1D1AA..1D1AD:230
1D242..1D244:230
+1E8D0..1E8D6:220
# Canonical decomposition mappings
00C0>0041 0300 # one-way: diacritic 0300
@@ -1798,6 +1827,13 @@ FB4E>05E4 05BF
110AB>110A5 110BA # one-way: diacritic 110BA
1112E=11131 11127
1112F=11132 11127
+1134B=11347 1133E
+1134C=11347 11357
+114BB=114B9 114BA
+114BC=114B9 114B0
+114BE=114B9 114BD
+115BA=115B8 115AF
+115BB=115B9 115AF
1D15E>1D157 1D165
1D15F>1D158 1D165
1D160>1D15F 1D16E
Modified: lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/nfkc.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/nfkc.txt?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/nfkc.txt (original)
+++ lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/nfkc.txt Wed Oct 15 01:26:26 2014
@@ -1,4 +1,4 @@
-# Copyright (C) 1999-2013, International Business Machines
+# Copyright (C) 1999-2014, International Business Machines
# Corporation and others. All Rights Reserved.
#
# file name: nfkc.txt
@@ -11,7 +11,7 @@
# to NFKC one-way mappings.
# Use this file as the second gennorm2 input file after nfc.txt.
-* Unicode 6.3.0
+* Unicode 7.0.0
00A0>0020
00A8>0020 0308
@@ -1361,9 +1361,15 @@
33FD>0033 0030 65E5
33FE>0033 0031 65E5
33FF>0067 0061 006C
+A69C>044A
+A69D>044C
A770>A76F
A7F8>0126
A7F9>0153
+AB5C>A727
+AB5D>AB37
+AB5E>026B
+AB5F>AB52
FB00>0066 0066
FB01>0066 0069
FB02>0066 006C
Modified: lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/nfkc_cf.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/nfkc_cf.txt?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/nfkc_cf.txt (original)
+++ lucene/dev/branches/lucene5969/lucene/analysis/icu/src/data/utr30/nfkc_cf.txt Wed Oct 15 01:26:26 2014
@@ -1,5 +1,5 @@
# Unicode Character Database
-# Copyright (c) 1991-2013 Unicode, Inc.
+# Copyright (c) 1991-2014 Unicode, Inc.
# For terms of use, see http://www.unicode.org/terms_of_use.html
# For documentation, see http://www.unicode.org/reports/tr44/
#
@@ -12,7 +12,7 @@
# and reformatted into syntax for the gennorm2 Normalizer2 data generator tool.
# Use this file as the third gennorm2 input file after nfc.txt and nfkc.txt.
-* Unicode 6.3.0
+* Unicode 7.0.0
0041>0061
0042>0062
@@ -286,6 +286,7 @@
0376>0377
037A>0020 03B9
037E>003B
+037F>03F3
0384>0020 0301
0385>0020 0308 0301
0386>03AC
@@ -498,6 +499,10 @@
0522>0523
0524>0525
0526>0527
+0528>0529
+052A>052B
+052C>052D
+052E>052F
0531>0561
0532>0562
0533>0563
@@ -2308,6 +2313,10 @@ A690>A691
A692>A693
A694>A695
A696>A697
+A698>A699
+A69A>A69B
+A69C>044A
+A69D>044C
A722>A723
A724>A725
A726>A727
@@ -2359,14 +2368,28 @@ A78B>A78C
A78D>0265
A790>A791
A792>A793
+A796>A797
+A798>A799
+A79A>A79B
+A79C>A79D
+A79E>A79F
A7A0>A7A1
A7A2>A7A3
A7A4>A7A5
A7A6>A7A7
A7A8>A7A9
A7AA>0266
+A7AB>025C
+A7AC>0261
+A7AD>026C
+A7B0>029E
+A7B1>0287
A7F8>0127
A7F9>0153
+AB5C>A727
+AB5D>AB37
+AB5E>026B
+AB5F>AB52
F900>8C48
F901>66F4
F902>8ECA
@@ -3743,6 +3766,39 @@ FFF0..FFF8>
10425>1044D
10426>1044E
10427>1044F
+118A0>118C0
+118A1>118C1
+118A2>118C2
+118A3>118C3
+118A4>118C4
+118A5>118C5
+118A6>118C6
+118A7>118C7
+118A8>118C8
+118A9>118C9
+118AA>118CA
+118AB>118CB
+118AC>118CC
+118AD>118CD
+118AE>118CE
+118AF>118CF
+118B0>118D0
+118B1>118D1
+118B2>118D2
+118B3>118D3
+118B4>118D4
+118B5>118D5
+118B6>118D6
+118B7>118D7
+118B8>118D8
+118B9>118D9
+118BA>118DA
+118BB>118DB
+118BC>118DC
+118BD>118DD
+118BE>118DE
+118BF>118DF
+1BCA0..1BCA3>
1D15E>1D157 1D165
1D15F>1D158 1D165
1D160>1D158 1D165 1D16E
Modified: lucene/dev/branches/lucene5969/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/DefaultICUTokenizerConfig.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/DefaultICUTokenizerConfig.java?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/DefaultICUTokenizerConfig.java (original)
+++ lucene/dev/branches/lucene5969/lucene/analysis/icu/src/java/org/apache/lucene/analysis/icu/segmentation/DefaultICUTokenizerConfig.java Wed Oct 15 01:26:26 2014
@@ -35,8 +35,8 @@ import com.ibm.icu.util.ULocale;
* ({@link BreakIterator#getWordInstance(ULocale) BreakIterator.getWordInstance(ULocale.ROOT)}),
* but with the following tailorings:
* <ul>
- * <li>Thai, Lao, and CJK text is broken into words with a dictionary.
- * <li>Myanmar, and Khmer text is broken into syllables
+ * <li>Thai, Lao, Myanmar, and CJK text is broken into words with a dictionary.
+ * <li>Khmer text is broken into syllables
* based on custom BreakIterator rules.
* </ul>
* @lucene.experimental
@@ -67,8 +67,6 @@ public class DefaultICUTokenizerConfig e
readBreakIterator("Default.brk");
private static final BreakIterator khmerBreakIterator =
readBreakIterator("Khmer.brk");
- private static final BreakIterator myanmarBreakIterator =
- readBreakIterator("Myanmar.brk");
// TODO: deprecate this boolean? you only care if you are doing super-expert stuff...
private final boolean cjkAsWords;
@@ -94,7 +92,6 @@ public class DefaultICUTokenizerConfig e
public BreakIterator getBreakIterator(int script) {
switch(script) {
case UScript.KHMER: return (BreakIterator)khmerBreakIterator.clone();
- case UScript.MYANMAR: return (BreakIterator)myanmarBreakIterator.clone();
case UScript.JAPANESE: return (BreakIterator)cjkBreakIterator.clone();
default: return (BreakIterator)defaultBreakIterator.clone();
}
Modified: lucene/dev/branches/lucene5969/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Default.brk
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Default.brk?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/dev/branches/lucene5969/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Khmer.brk
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/segmentation/Khmer.brk?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/dev/branches/lucene5969/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/utr30.nrm
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/analysis/icu/src/resources/org/apache/lucene/analysis/icu/utr30.nrm?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
Binary files - no diff available.
Modified: lucene/dev/branches/lucene5969/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java (original)
+++ lucene/dev/branches/lucene5969/lucene/analysis/icu/src/test/org/apache/lucene/analysis/icu/segmentation/TestICUTokenizer.java Wed Oct 15 01:26:26 2014
@@ -122,6 +122,10 @@ public class TestICUTokenizer extends Ba
assertAnalyzesTo(a, "àºàº²àºªàº²àº¥àº²àº§", new String[] { "àºàº²àºªàº²", "ລາວ"}, new String[] { "<ALPHANUM>", "<ALPHANUM>" });
}
+ public void testMyanmar() throws Exception {
+ assertAnalyzesTo(a, "áááºáááºáá¾á¯ááºáá¾á¬á¸á
á±áá¼á®á¸", new String[] { "áááºáááº", "áá¾á¯ááºáá¾á¬á¸", "á
á±", "áá¼á®á¸" });
+ }
+
public void testThai() throws Exception {
assertAnalyzesTo(a, "à¸à¸²à¸£à¸à¸µà¹à¹à¸à¹à¸à¹à¸à¸à¹à¸ªà¸à¸à¸§à¹à¸²à¸à¸²à¸à¸à¸µ. à¹à¸¥à¹à¸§à¹à¸à¸à¸à¸°à¹à¸à¹à¸«à¸? à¹à¹à¹à¹",
new String[] { "à¸à¸²à¸£", "à¸à¸µà¹", "à¹à¸à¹", "à¸à¹à¸à¸", "à¹à¸ªà¸à¸", "วà¹à¸²", "à¸à¸²à¸", "à¸à¸µ", "à¹à¸¥à¹à¸§", "à¹à¸à¸", "à¸à¸°", "à¹à¸", "à¹à¸«à¸", "à¹à¹à¹à¹"});
Modified: lucene/dev/branches/lucene5969/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java (original)
+++ lucene/dev/branches/lucene5969/lucene/analysis/icu/src/tools/java/org/apache/lucene/analysis/icu/GenerateUTR30DataFiles.java Wed Oct 15 01:26:26 2014
@@ -63,7 +63,7 @@ import java.util.regex.Pattern;
public class GenerateUTR30DataFiles {
private static final String ICU_SVN_TAG_URL
= "http://source.icu-project.org/repos/icu/icu/tags";
- private static final String ICU_RELEASE_TAG = "release-52-1";
+ private static final String ICU_RELEASE_TAG = "release-54-1";
private static final String ICU_DATA_NORM2_PATH = "source/data/unidata/norm2";
private static final String NFC_TXT = "nfc.txt";
private static final String NFKC_TXT = "nfkc.txt";
Modified: lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesFormat.java?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesFormat.java (original)
+++ lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesFormat.java Wed Oct 15 01:26:26 2014
@@ -51,7 +51,7 @@ public class Lucene40DocValuesFormat ext
String filename = IndexFileNames.segmentFileName(state.segmentInfo.name,
"dv",
Lucene40CompoundFormat.COMPOUND_FILE_EXTENSION);
- return new Lucene40DocValuesReader(state, filename, Lucene40FieldInfosReader.LEGACY_DV_TYPE_KEY);
+ return new Lucene40DocValuesReader(state, filename, Lucene40FieldInfosFormat.LEGACY_DV_TYPE_KEY);
}
// constants for VAR_INTS
Modified: lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesReader.java?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesReader.java (original)
+++ lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40DocValuesReader.java Wed Oct 15 01:26:26 2014
@@ -24,7 +24,7 @@ import java.util.concurrent.atomic.Atomi
import org.apache.lucene.codecs.CodecUtil;
import org.apache.lucene.codecs.DocValuesProducer;
-import org.apache.lucene.codecs.lucene40.Lucene40FieldInfosReader.LegacyDocValuesType;
+import org.apache.lucene.codecs.lucene40.Lucene40FieldInfosFormat.LegacyDocValuesType;
import org.apache.lucene.index.BinaryDocValues;
import org.apache.lucene.index.CorruptIndexException;
import org.apache.lucene.index.FieldInfo;
Modified: lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40FieldInfosFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40FieldInfosFormat.java?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40FieldInfosFormat.java (original)
+++ lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40FieldInfosFormat.java Wed Oct 15 01:26:26 2014
@@ -18,10 +18,22 @@ package org.apache.lucene.codecs.lucene4
*/
import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+import org.apache.lucene.codecs.CodecUtil;
import org.apache.lucene.codecs.FieldInfosFormat;
-import org.apache.lucene.codecs.FieldInfosReader;
-import org.apache.lucene.codecs.FieldInfosWriter;
+import org.apache.lucene.index.CorruptIndexException;
+import org.apache.lucene.index.FieldInfo;
+import org.apache.lucene.index.FieldInfos;
+import org.apache.lucene.index.IndexFileNames;
+import org.apache.lucene.index.SegmentInfo;
+import org.apache.lucene.index.FieldInfo.DocValuesType;
+import org.apache.lucene.index.FieldInfo.IndexOptions;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.IOContext;
+import org.apache.lucene.store.IndexInput;
+import org.apache.lucene.util.IOUtils;
/**
* Lucene 4.0 Field Infos format.
@@ -29,22 +41,119 @@ import org.apache.lucene.codecs.FieldInf
*/
@Deprecated
public class Lucene40FieldInfosFormat extends FieldInfosFormat {
- private final FieldInfosReader reader = new Lucene40FieldInfosReader();
/** Sole constructor. */
public Lucene40FieldInfosFormat() {
}
@Override
- public final FieldInfosReader getFieldInfosReader() throws IOException {
- return reader;
- }
+ public final FieldInfos read(Directory directory, SegmentInfo segmentInfo, String segmentSuffix, IOContext iocontext) throws IOException {
+ final String fileName = IndexFileNames.segmentFileName(segmentInfo.name, "", Lucene40FieldInfosFormat.FIELD_INFOS_EXTENSION);
+ IndexInput input = directory.openInput(fileName, iocontext);
+
+ boolean success = false;
+ try {
+ CodecUtil.checkHeader(input, Lucene40FieldInfosFormat.CODEC_NAME,
+ Lucene40FieldInfosFormat.FORMAT_START,
+ Lucene40FieldInfosFormat.FORMAT_CURRENT);
+
+ final int size = input.readVInt(); //read in the size
+ FieldInfo infos[] = new FieldInfo[size];
+
+ for (int i = 0; i < size; i++) {
+ String name = input.readString();
+ final int fieldNumber = input.readVInt();
+ byte bits = input.readByte();
+ boolean isIndexed = (bits & Lucene40FieldInfosFormat.IS_INDEXED) != 0;
+ boolean storeTermVector = (bits & Lucene40FieldInfosFormat.STORE_TERMVECTOR) != 0;
+ boolean omitNorms = (bits & Lucene40FieldInfosFormat.OMIT_NORMS) != 0;
+ boolean storePayloads = (bits & Lucene40FieldInfosFormat.STORE_PAYLOADS) != 0;
+ final IndexOptions indexOptions;
+ if (!isIndexed) {
+ indexOptions = null;
+ } else if ((bits & Lucene40FieldInfosFormat.OMIT_TERM_FREQ_AND_POSITIONS) != 0) {
+ indexOptions = IndexOptions.DOCS_ONLY;
+ } else if ((bits & Lucene40FieldInfosFormat.OMIT_POSITIONS) != 0) {
+ indexOptions = IndexOptions.DOCS_AND_FREQS;
+ } else if ((bits & Lucene40FieldInfosFormat.STORE_OFFSETS_IN_POSTINGS) != 0) {
+ indexOptions = IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS;
+ } else {
+ indexOptions = IndexOptions.DOCS_AND_FREQS_AND_POSITIONS;
+ }
+
+ // LUCENE-3027: past indices were able to write
+ // storePayloads=true when omitTFAP is also true,
+ // which is invalid. We correct that, here:
+ if (isIndexed && indexOptions.compareTo(IndexOptions.DOCS_AND_FREQS_AND_POSITIONS) < 0) {
+ storePayloads = false;
+ }
+ // DV Types are packed in one byte
+ byte val = input.readByte();
+ final LegacyDocValuesType oldValuesType = getDocValuesType((byte) (val & 0x0F));
+ final LegacyDocValuesType oldNormsType = getDocValuesType((byte) ((val >>> 4) & 0x0F));
+ final Map<String,String> attributes = input.readStringStringMap();;
+ if (oldValuesType.mapping != null) {
+ attributes.put(LEGACY_DV_TYPE_KEY, oldValuesType.name());
+ }
+ if (oldNormsType.mapping != null) {
+ if (oldNormsType.mapping != DocValuesType.NUMERIC) {
+ throw new CorruptIndexException("invalid norm type: " + oldNormsType, input);
+ }
+ attributes.put(LEGACY_NORM_TYPE_KEY, oldNormsType.name());
+ }
+ infos[i] = new FieldInfo(name, isIndexed, fieldNumber, storeTermVector,
+ omitNorms, storePayloads, indexOptions, oldValuesType.mapping, oldNormsType.mapping, -1, Collections.unmodifiableMap(attributes));
+ }
+ CodecUtil.checkEOF(input);
+ FieldInfos fieldInfos = new FieldInfos(infos);
+ success = true;
+ return fieldInfos;
+ } finally {
+ if (success) {
+ input.close();
+ } else {
+ IOUtils.closeWhileHandlingException(input);
+ }
+ }
+ }
+
+ static final String LEGACY_DV_TYPE_KEY = Lucene40FieldInfosFormat.class.getSimpleName() + ".dvtype";
+ static final String LEGACY_NORM_TYPE_KEY = Lucene40FieldInfosFormat.class.getSimpleName() + ".normtype";
+
+ // mapping of 4.0 types -> 4.2 types
+ static enum LegacyDocValuesType {
+ NONE(null),
+ VAR_INTS(DocValuesType.NUMERIC),
+ FLOAT_32(DocValuesType.NUMERIC),
+ FLOAT_64(DocValuesType.NUMERIC),
+ BYTES_FIXED_STRAIGHT(DocValuesType.BINARY),
+ BYTES_FIXED_DEREF(DocValuesType.BINARY),
+ BYTES_VAR_STRAIGHT(DocValuesType.BINARY),
+ BYTES_VAR_DEREF(DocValuesType.BINARY),
+ FIXED_INTS_16(DocValuesType.NUMERIC),
+ FIXED_INTS_32(DocValuesType.NUMERIC),
+ FIXED_INTS_64(DocValuesType.NUMERIC),
+ FIXED_INTS_8(DocValuesType.NUMERIC),
+ BYTES_FIXED_SORTED(DocValuesType.SORTED),
+ BYTES_VAR_SORTED(DocValuesType.SORTED);
+
+ final DocValuesType mapping;
+ LegacyDocValuesType(DocValuesType mapping) {
+ this.mapping = mapping;
+ }
+ }
+
+ // decodes a 4.0 type
+ private static LegacyDocValuesType getDocValuesType(byte b) {
+ return LegacyDocValuesType.values()[b];
+ }
+
@Override
- public FieldInfosWriter getFieldInfosWriter() throws IOException {
+ public void write(Directory directory, SegmentInfo segmentInfo, String segmentSuffix, FieldInfos infos, IOContext context) throws IOException {
throw new UnsupportedOperationException("this codec can only be used for reading");
}
-
+
/** Extension of field infos */
static final String FIELD_INFOS_EXTENSION = "fnm";
Modified: lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsReader.java?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsReader.java (original)
+++ lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40NormsReader.java Wed Oct 15 01:26:26 2014
@@ -40,7 +40,7 @@ final class Lucene40NormsReader extends
}
Lucene40NormsReader(SegmentReadState state, String filename) throws IOException {
- impl = new Lucene40DocValuesReader(state, filename, Lucene40FieldInfosReader.LEGACY_NORM_TYPE_KEY);
+ impl = new Lucene40DocValuesReader(state, filename, Lucene40FieldInfosFormat.LEGACY_NORM_TYPE_KEY);
}
@Override
Modified: lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoFormat.java?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoFormat.java (original)
+++ lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene40/Lucene40SegmentInfoFormat.java Wed Oct 15 01:26:26 2014
@@ -17,10 +17,21 @@ package org.apache.lucene.codecs.lucene4
* limitations under the License.
*/
+import java.io.IOException;
+import java.text.ParseException;
+import java.util.Map;
+import java.util.Set;
+
+import org.apache.lucene.codecs.CodecUtil;
import org.apache.lucene.codecs.SegmentInfoFormat;
-import org.apache.lucene.codecs.SegmentInfoReader;
-import org.apache.lucene.codecs.SegmentInfoWriter;
+import org.apache.lucene.index.CorruptIndexException;
+import org.apache.lucene.index.IndexFileNames;
import org.apache.lucene.index.SegmentInfo;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.IOContext;
+import org.apache.lucene.store.IndexInput;
+import org.apache.lucene.util.IOUtils;
+import org.apache.lucene.util.Version;
/**
* Lucene 4.0 Segment info format.
@@ -28,19 +39,55 @@ import org.apache.lucene.index.SegmentIn
*/
@Deprecated
public class Lucene40SegmentInfoFormat extends SegmentInfoFormat {
- private final SegmentInfoReader reader = new Lucene40SegmentInfoReader();
/** Sole constructor. */
public Lucene40SegmentInfoFormat() {
}
@Override
- public final SegmentInfoReader getSegmentInfoReader() {
- return reader;
+ public final SegmentInfo read(Directory dir, String segment, IOContext context) throws IOException {
+ final String fileName = IndexFileNames.segmentFileName(segment, "", Lucene40SegmentInfoFormat.SI_EXTENSION);
+ final IndexInput input = dir.openInput(fileName, context);
+ boolean success = false;
+ try {
+ CodecUtil.checkHeader(input, Lucene40SegmentInfoFormat.CODEC_NAME,
+ Lucene40SegmentInfoFormat.VERSION_START,
+ Lucene40SegmentInfoFormat.VERSION_CURRENT);
+ final Version version;
+ try {
+ version = Version.parse(input.readString());
+ } catch (ParseException pe) {
+ throw new CorruptIndexException("unable to parse version string: " + pe.getMessage(), input, pe);
+ }
+ final int docCount = input.readInt();
+ if (docCount < 0) {
+ throw new CorruptIndexException("invalid docCount: " + docCount, input);
+ }
+ final boolean isCompoundFile = input.readByte() == SegmentInfo.YES;
+ final Map<String,String> diagnostics = input.readStringStringMap();
+ input.readStringStringMap(); // read deprecated attributes
+ final Set<String> files = input.readStringSet();
+
+ CodecUtil.checkEOF(input);
+
+ final SegmentInfo si = new SegmentInfo(dir, version, segment, docCount, isCompoundFile, null, diagnostics, null);
+ si.setFiles(files);
+
+ success = true;
+
+ return si;
+
+ } finally {
+ if (!success) {
+ IOUtils.closeWhileHandlingException(input);
+ } else {
+ input.close();
+ }
+ }
}
@Override
- public SegmentInfoWriter getSegmentInfoWriter() {
+ public void write(Directory dir, SegmentInfo info, IOContext ioContext) throws IOException {
throw new UnsupportedOperationException("this codec can only be used for reading");
}
Modified: lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene42/Lucene42FieldInfosFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene42/Lucene42FieldInfosFormat.java?rev=1631928&r1=1631927&r2=1631928&view=diff
==============================================================================
--- lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene42/Lucene42FieldInfosFormat.java (original)
+++ lucene/dev/branches/lucene5969/lucene/backward-codecs/src/java/org/apache/lucene/codecs/lucene42/Lucene42FieldInfosFormat.java Wed Oct 15 01:26:26 2014
@@ -18,10 +18,22 @@ package org.apache.lucene.codecs.lucene4
*/
import java.io.IOException;
+import java.util.Collections;
+import java.util.Map;
+import org.apache.lucene.codecs.CodecUtil;
import org.apache.lucene.codecs.FieldInfosFormat;
-import org.apache.lucene.codecs.FieldInfosReader;
-import org.apache.lucene.codecs.FieldInfosWriter;
+import org.apache.lucene.index.CorruptIndexException;
+import org.apache.lucene.index.FieldInfo;
+import org.apache.lucene.index.FieldInfos;
+import org.apache.lucene.index.IndexFileNames;
+import org.apache.lucene.index.SegmentInfo;
+import org.apache.lucene.index.FieldInfo.DocValuesType;
+import org.apache.lucene.index.FieldInfo.IndexOptions;
+import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.IOContext;
+import org.apache.lucene.store.IndexInput;
+import org.apache.lucene.util.IOUtils;
/**
* Lucene 4.2 Field Infos format.
@@ -29,22 +41,89 @@ import org.apache.lucene.codecs.FieldInf
*/
@Deprecated
public class Lucene42FieldInfosFormat extends FieldInfosFormat {
- private final FieldInfosReader reader = new Lucene42FieldInfosReader();
/** Sole constructor. */
public Lucene42FieldInfosFormat() {
}
@Override
- public final FieldInfosReader getFieldInfosReader() throws IOException {
- return reader;
- }
+ public FieldInfos read(Directory directory, SegmentInfo segmentInfo, String segmentSuffix, IOContext iocontext) throws IOException {
+ final String fileName = IndexFileNames.segmentFileName(segmentInfo.name, "", Lucene42FieldInfosFormat.EXTENSION);
+ IndexInput input = directory.openInput(fileName, iocontext);
+
+ boolean success = false;
+ try {
+ CodecUtil.checkHeader(input, Lucene42FieldInfosFormat.CODEC_NAME,
+ Lucene42FieldInfosFormat.FORMAT_START,
+ Lucene42FieldInfosFormat.FORMAT_CURRENT);
+
+ final int size = input.readVInt(); //read in the size
+ FieldInfo infos[] = new FieldInfo[size];
+
+ for (int i = 0; i < size; i++) {
+ String name = input.readString();
+ final int fieldNumber = input.readVInt();
+ byte bits = input.readByte();
+ boolean isIndexed = (bits & Lucene42FieldInfosFormat.IS_INDEXED) != 0;
+ boolean storeTermVector = (bits & Lucene42FieldInfosFormat.STORE_TERMVECTOR) != 0;
+ boolean omitNorms = (bits & Lucene42FieldInfosFormat.OMIT_NORMS) != 0;
+ boolean storePayloads = (bits & Lucene42FieldInfosFormat.STORE_PAYLOADS) != 0;
+ final IndexOptions indexOptions;
+ if (!isIndexed) {
+ indexOptions = null;
+ } else if ((bits & Lucene42FieldInfosFormat.OMIT_TERM_FREQ_AND_POSITIONS) != 0) {
+ indexOptions = IndexOptions.DOCS_ONLY;
+ } else if ((bits & Lucene42FieldInfosFormat.OMIT_POSITIONS) != 0) {
+ indexOptions = IndexOptions.DOCS_AND_FREQS;
+ } else if ((bits & Lucene42FieldInfosFormat.STORE_OFFSETS_IN_POSTINGS) != 0) {
+ indexOptions = IndexOptions.DOCS_AND_FREQS_AND_POSITIONS_AND_OFFSETS;
+ } else {
+ indexOptions = IndexOptions.DOCS_AND_FREQS_AND_POSITIONS;
+ }
+ // DV Types are packed in one byte
+ byte val = input.readByte();
+ final DocValuesType docValuesType = getDocValuesType(input, (byte) (val & 0x0F));
+ final DocValuesType normsType = getDocValuesType(input, (byte) ((val >>> 4) & 0x0F));
+ final Map<String,String> attributes = input.readStringStringMap();
+ infos[i] = new FieldInfo(name, isIndexed, fieldNumber, storeTermVector,
+ omitNorms, storePayloads, indexOptions, docValuesType, normsType, -1, Collections.unmodifiableMap(attributes));
+ }
+
+ CodecUtil.checkEOF(input);
+ FieldInfos fieldInfos = new FieldInfos(infos);
+ success = true;
+ return fieldInfos;
+ } finally {
+ if (success) {
+ input.close();
+ } else {
+ IOUtils.closeWhileHandlingException(input);
+ }
+ }
+ }
+
+ private static DocValuesType getDocValuesType(IndexInput input, byte b) throws IOException {
+ if (b == 0) {
+ return null;
+ } else if (b == 1) {
+ return DocValuesType.NUMERIC;
+ } else if (b == 2) {
+ return DocValuesType.BINARY;
+ } else if (b == 3) {
+ return DocValuesType.SORTED;
+ } else if (b == 4) {
+ return DocValuesType.SORTED_SET;
+ } else {
+ throw new CorruptIndexException("invalid docvalues byte: " + b, input);
+ }
+ }
+
@Override
- public FieldInfosWriter getFieldInfosWriter() throws IOException {
+ public void write(Directory directory, SegmentInfo segmentInfo, String segmentSuffix, FieldInfos infos, IOContext context) throws IOException {
throw new UnsupportedOperationException("this codec can only be used for reading");
}
-
+
/** Extension of field infos */
static final String EXTENSION = "fnm";