You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by mi...@apache.org on 2014/11/27 21:41:07 UTC
svn commit: r1642229 [1/7] - in /lucene/dev/branches/lucene6005: ./
dev-tools/ dev-tools/eclipse/dot.settings/
dev-tools/idea/lucene/benchmark/src/ dev-tools/idea/lucene/highlighter/
dev-tools/maven/ dev-tools/scripts/ lucene/ lucene/analysis/ lucene/a...
Author: mikemccand
Date: Thu Nov 27 20:41:01 2014
New Revision: 1642229
URL: http://svn.apache.org/r1642229
Log:
LUCENE-6005: merge trunk
Added:
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java
- copied, changed from r1642110, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDemoParallelLeafReader.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestDocValues.java
- copied unchanged from r1642110, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/index/TestDocValues.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/mockfile/
- copied from r1642110, lucene/dev/trunk/lucene/core/src/test/org/apache/lucene/mockfile/
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/mockfile/
- copied from r1642110, lucene/dev/trunk/lucene/test-framework/src/java/org/apache/lucene/mockfile/
lucene/dev/branches/lucene6005/lucene/tools/javadoc/java8/
- copied from r1642110, lucene/dev/trunk/lucene/tools/javadoc/java8/
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/core/PluginsRegistry.java
- copied unchanged from r1642110, lucene/dev/trunk/solr/core/src/java/org/apache/solr/core/PluginsRegistry.java
lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/core/MockInfoMBean.java
- copied unchanged from r1642110, lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/MockInfoMBean.java
lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/core/TestSolrDynamicMBean.java
- copied unchanged from r1642110, lucene/dev/trunk/solr/core/src/test/org/apache/solr/core/TestSolrDynamicMBean.java
lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java
- copied unchanged from r1642110, lucene/dev/trunk/solr/core/src/test/org/apache/solr/handler/TestConfigReload.java
lucene/dev/branches/lucene6005/solr/licenses/Saxon-HE-9.6.0-2.jar.sha1
- copied unchanged from r1642110, lucene/dev/trunk/solr/licenses/Saxon-HE-9.6.0-2.jar.sha1
Removed:
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestDocValuesFormat.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestNormsFormat.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestPostingsFormat.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestStoredFieldsFormat.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestTermVectorsFormat.java
lucene/dev/branches/lucene6005/lucene/tools/javadoc/java7/
lucene/dev/branches/lucene6005/solr/licenses/Saxon-HE-9.5.1-4.jar.sha1
Modified:
lucene/dev/branches/lucene6005/ (props changed)
lucene/dev/branches/lucene6005/build.xml
lucene/dev/branches/lucene6005/dev-tools/ (props changed)
lucene/dev/branches/lucene6005/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs
lucene/dev/branches/lucene6005/dev-tools/idea/lucene/benchmark/src/benchmark.iml
lucene/dev/branches/lucene6005/dev-tools/idea/lucene/highlighter/highlighter.iml
lucene/dev/branches/lucene6005/dev-tools/maven/README.maven
lucene/dev/branches/lucene6005/dev-tools/maven/pom.xml.template
lucene/dev/branches/lucene6005/dev-tools/scripts/smokeTestRelease.py
lucene/dev/branches/lucene6005/lucene/ (props changed)
lucene/dev/branches/lucene6005/lucene/BUILD.txt (contents, props changed)
lucene/dev/branches/lucene6005/lucene/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene6005/lucene/SYSTEM_REQUIREMENTS.txt (contents, props changed)
lucene/dev/branches/lucene6005/lucene/analysis/ (props changed)
lucene/dev/branches/lucene6005/lucene/analysis/common/ (props changed)
lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java
lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java
lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java
lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java
lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java
lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java
lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java
lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java
lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java
lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java
lucene/dev/branches/lucene6005/lucene/analysis/kuromoji/build.xml
lucene/dev/branches/lucene6005/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java
lucene/dev/branches/lucene6005/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.java
lucene/dev/branches/lucene6005/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java
lucene/dev/branches/lucene6005/lucene/build.xml (contents, props changed)
lucene/dev/branches/lucene6005/lucene/codecs/ (props changed)
lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java
lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java
lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java
lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermOutputs.java
lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java
lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java
lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
lucene/dev/branches/lucene6005/lucene/common-build.xml (contents, props changed)
lucene/dev/branches/lucene6005/lucene/core/ (props changed)
lucene/dev/branches/lucene6005/lucene/core/build.xml
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/FieldsConsumer.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/codecs/lucene50/Lucene50PostingsReader.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/document/FieldTypes.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/BufferedUpdatesStream.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/CheckIndex.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/ConcurrentMergeScheduler.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/DocValues.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/DocumentsWriter.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterDeleteQueue.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/DocumentsWriterFlushControl.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/ExitableDirectoryReader.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/IndexReader.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/IndexWriter.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/LeafReader.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/LeafReaderContext.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/MergePolicy.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/MergeState.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/MultiDocValues.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/MultiFields.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/ParallelLeafReader.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/PrefixCodedTerms.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/ReaderManager.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/SegmentCoreReaders.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/SegmentDocValues.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/SegmentDocValuesProducer.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/SegmentReader.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/index/TermContext.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/CachingWrapperFilter.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/DocIdSet.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/MultiTermQueryWrapperFilter.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/TermCollectingRewrite.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/similarities/TFIDFSimilarity.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/spans/SpanMultiTermQueryWrapper.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/search/spans/SpanTermQuery.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/RAMFile.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/store/RateLimiter.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/util/Accountable.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/util/BitSet.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/util/Constants.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/util/PagedBytes.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/util/fst/BytesStore.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/util/packed/AbstractPagedMutable.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/util/packed/BlockPackedReader.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/util/packed/EliasFanoEncoder.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/util/packed/MonotonicBlockPackedReader.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/util/packed/PackedInts.java
lucene/dev/branches/lucene6005/lucene/core/src/java/org/apache/lucene/util/packed/PackedLongValues.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/analysis/TestGraphTokenizers.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/analysis/TestMockAnalyzer.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/asserting/TestAssertingPostingsFormat.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingStoredFieldsFormat.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/compressing/TestCompressingTermVectorsFormat.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestBlockPostingsFormat3.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/codecs/lucene50/TestLucene50DocValuesFormat.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestBinaryDocValuesUpdates.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestConcurrentMergeScheduler.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestDocCount.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexReaderClose.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexWriter.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterDelete.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterExceptions2.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterMerging.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterOutOfMemory.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestIndexWriterThreadsToSegments.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestMixedDocValuesUpdates.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestMultiDocValues.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestNumericDocValuesUpdates.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestPrefixCodedTerms.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/index/TestStressIndexing2.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestBooleanQuery.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestCustomSearcherSort.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestFilteredQuery.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestIndexSearcher.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestSearchAfter.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestShardSearching.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/search/TestTopDocsMerge.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestMultiMMap.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestRateLimitedDirectoryWrapper.java
lucene/dev/branches/lucene6005/lucene/core/src/test/org/apache/lucene/store/TestRateLimiter.java
lucene/dev/branches/lucene6005/lucene/expressions/ (props changed)
lucene/dev/branches/lucene6005/lucene/expressions/build.xml
lucene/dev/branches/lucene6005/lucene/expressions/src/test/org/apache/lucene/expressions/TestExpressionSorts.java
lucene/dev/branches/lucene6005/lucene/facet/ (props changed)
lucene/dev/branches/lucene6005/lucene/facet/src/java/org/apache/lucene/facet/taxonomy/CachedOrdinalsReader.java
lucene/dev/branches/lucene6005/lucene/grouping/ (props changed)
lucene/dev/branches/lucene6005/lucene/grouping/src/test/org/apache/lucene/search/grouping/DistinctValuesCollectorTest.java
lucene/dev/branches/lucene6005/lucene/grouping/src/test/org/apache/lucene/search/grouping/GroupingSearchTest.java
lucene/dev/branches/lucene6005/lucene/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
lucene/dev/branches/lucene6005/lucene/ivy-versions.properties (contents, props changed)
lucene/dev/branches/lucene6005/lucene/join/ (props changed)
lucene/dev/branches/lucene6005/lucene/join/src/test/org/apache/lucene/search/join/TestBlockJoin.java
lucene/dev/branches/lucene6005/lucene/join/src/test/org/apache/lucene/search/join/TestJoinUtil.java
lucene/dev/branches/lucene6005/lucene/misc/ (props changed)
lucene/dev/branches/lucene6005/lucene/misc/src/java/org/apache/lucene/index/sorter/SortingLeafReader.java
lucene/dev/branches/lucene6005/lucene/misc/src/java/org/apache/lucene/misc/HighFreqTerms.java
lucene/dev/branches/lucene6005/lucene/misc/src/java/org/apache/lucene/uninverting/DocTermOrds.java
lucene/dev/branches/lucene6005/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCache.java
lucene/dev/branches/lucene6005/lucene/misc/src/java/org/apache/lucene/uninverting/FieldCacheImpl.java
lucene/dev/branches/lucene6005/lucene/queries/ (props changed)
lucene/dev/branches/lucene6005/lucene/queries/src/java/org/apache/lucene/queries/CommonTermsQuery.java
lucene/dev/branches/lucene6005/lucene/queries/src/java/org/apache/lucene/queries/TermsFilter.java
lucene/dev/branches/lucene6005/lucene/queries/src/java/org/apache/lucene/queries/function/valuesource/SumTotalTermFreqValueSource.java
lucene/dev/branches/lucene6005/lucene/queries/src/test/org/apache/lucene/queries/function/TestBoostedQuery.java
lucene/dev/branches/lucene6005/lucene/queryparser/ (props changed)
lucene/dev/branches/lucene6005/lucene/queryparser/build.xml
lucene/dev/branches/lucene6005/lucene/replicator/ (props changed)
lucene/dev/branches/lucene6005/lucene/replicator/build.xml
lucene/dev/branches/lucene6005/lucene/sandbox/ (props changed)
lucene/dev/branches/lucene6005/lucene/sandbox/src/java/org/apache/lucene/codecs/idversion/IDVersionPostingsReader.java
lucene/dev/branches/lucene6005/lucene/spatial/ (props changed)
lucene/dev/branches/lucene6005/lucene/spatial/src/test/org/apache/lucene/spatial/SpatialExample.java
lucene/dev/branches/lucene6005/lucene/suggest/ (props changed)
lucene/dev/branches/lucene6005/lucene/suggest/src/java/org/apache/lucene/search/suggest/DocumentDictionary.java
lucene/dev/branches/lucene6005/lucene/suggest/src/java/org/apache/lucene/search/suggest/Lookup.java
lucene/dev/branches/lucene6005/lucene/suggest/src/java/org/apache/lucene/search/suggest/jaspell/JaspellTernarySearchTrie.java
lucene/dev/branches/lucene6005/lucene/suggest/src/test/org/apache/lucene/search/suggest/DocumentDictionaryTest.java
lucene/dev/branches/lucene6005/lucene/test-framework/ (props changed)
lucene/dev/branches/lucene6005/lucene/test-framework/build.xml
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/codecs/ramonly/RAMOnlyPostingsFormat.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/index/AssertingLeafReader.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/index/BaseDocValuesFormatTestCase.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/index/BaseIndexFileFormatTestCase.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/index/BaseNormsFormatTestCase.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/index/PerThreadPKLookup.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/index/ThreadedIndexingAndSearchingTestCase.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/store/BaseDirectoryTestCase.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/store/MockDirectoryWrapper.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/util/LineFileDocs.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/util/LuceneTestCase.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/util/TestRuleTemporaryFilesCleanup.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/util/TestUtil.java
lucene/dev/branches/lucene6005/lucene/test-framework/src/java/org/apache/lucene/util/ThrottledIndexOutput.java
lucene/dev/branches/lucene6005/lucene/tools/ (props changed)
lucene/dev/branches/lucene6005/lucene/tools/javadoc/ecj.javadocs.prefs
lucene/dev/branches/lucene6005/solr/ (props changed)
lucene/dev/branches/lucene6005/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/lucene6005/solr/README.txt (contents, props changed)
lucene/dev/branches/lucene6005/solr/SYSTEM_REQUIREMENTS.txt (contents, props changed)
lucene/dev/branches/lucene6005/solr/bin/ (props changed)
lucene/dev/branches/lucene6005/solr/bin/solr
lucene/dev/branches/lucene6005/solr/bin/solr.cmd
lucene/dev/branches/lucene6005/solr/build.xml (contents, props changed)
lucene/dev/branches/lucene6005/solr/common-build.xml (contents, props changed)
lucene/dev/branches/lucene6005/solr/contrib/ (props changed)
lucene/dev/branches/lucene6005/solr/contrib/clustering/src/test-files/clustering/solr/collection1/conf/schema.xml
lucene/dev/branches/lucene6005/solr/contrib/contrib-build.xml
lucene/dev/branches/lucene6005/solr/contrib/dataimporthandler/src/test-files/dih/solr/collection1/conf/dataimport-solr_id-schema.xml
lucene/dev/branches/lucene6005/solr/contrib/morphlines-cell/src/test/org/apache/solr/morphlines/cell/SolrCellMorphlineTest.java
lucene/dev/branches/lucene6005/solr/contrib/morphlines-core/build.xml
lucene/dev/branches/lucene6005/solr/contrib/uima/src/test-files/uima/solr/collection1/conf/schema.xml
lucene/dev/branches/lucene6005/solr/contrib/uima/src/test-files/uima/uima-tokenizers-schema.xml
lucene/dev/branches/lucene6005/solr/core/ (props changed)
lucene/dev/branches/lucene6005/solr/core/build.xml
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/cloud/DistributedQueue.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/cloud/ElectionContext.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/cloud/Overseer.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/cloud/ZkController.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/cloud/ZkSolrResourceLoader.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/core/Config.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/core/ConfigOverlay.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/core/CoreContainer.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/core/InitParams.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/core/JmxMonitoredMap.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/core/PluginInfo.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/core/RequestHandlers.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/core/SolrConfig.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/core/SolrCore.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/core/SolrResourceLoader.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/schema/AbstractSpatialFieldType.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/schema/BBoxField.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/update/processor/MaxFieldValueUpdateProcessorFactory.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/update/processor/MinFieldValueUpdateProcessorFactory.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/util/CommandOperation.java
lucene/dev/branches/lucene6005/solr/core/src/java/org/apache/solr/util/SolrCLI.java
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema-sorts.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema-spatial.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema-trie.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/schema11.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-analytics-query.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-collapseqparser.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-components-name.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-deeppaging.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-doc-expire-update-processor.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-externalversionconstraint.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-implicitproperties.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-managed-schema.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-master-throttled.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-master1-keepOneBackup.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-master2.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-minimal.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-plugcollector.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-repeater.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-schemaless.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-slave1.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog-with-delayingcomponent.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-tlog.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-tolerant-search.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig-withgethandler.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig.xml
lucene/dev/branches/lucene6005/solr/core/src/test-files/solr/collection1/conf/solrconfig_perf.xml
lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/MinimalSchemaTest.java
lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/core/TestConfig.java
lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/core/TestConfigSets.java
lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/core/TestInitParams.java
lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/core/TestJmxMonitoredMap.java
lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/handler/TestSolrConfigHandlerConcurrent.java
lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/search/TestRTGBase.java
lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial.java
lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/search/TestSolr4Spatial2.java
lucene/dev/branches/lucene6005/solr/core/src/test/org/apache/solr/search/mlt/CloudMLTQParserTest.java
lucene/dev/branches/lucene6005/solr/example/ (props changed)
lucene/dev/branches/lucene6005/solr/example/example-DIH/solr/db/conf/schema.xml
lucene/dev/branches/lucene6005/solr/example/example-DIH/solr/mail/conf/schema.xml
lucene/dev/branches/lucene6005/solr/example/example-DIH/solr/rss/conf/schema.xml
lucene/dev/branches/lucene6005/solr/example/example-DIH/solr/solr/conf/schema.xml
lucene/dev/branches/lucene6005/solr/example/multicore/core0/conf/solrconfig.xml
lucene/dev/branches/lucene6005/solr/example/multicore/core1/conf/solrconfig.xml
lucene/dev/branches/lucene6005/solr/licenses/ (props changed)
lucene/dev/branches/lucene6005/solr/server/ (props changed)
lucene/dev/branches/lucene6005/solr/server/build.xml
lucene/dev/branches/lucene6005/solr/server/solr/configsets/basic_configs/conf/solrconfig.xml
lucene/dev/branches/lucene6005/solr/server/solr/configsets/data_driven_schema_configs/conf/solrconfig.xml
lucene/dev/branches/lucene6005/solr/server/solr/configsets/sample_techproducts_configs/conf/schema.xml
lucene/dev/branches/lucene6005/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
lucene/dev/branches/lucene6005/solr/site/ (props changed)
lucene/dev/branches/lucene6005/solr/site/html/tutorial.html
lucene/dev/branches/lucene6005/solr/solrj/ (props changed)
lucene/dev/branches/lucene6005/solr/solrj/build.xml
lucene/dev/branches/lucene6005/solr/solrj/src/java/org/apache/solr/common/cloud/ConnectionManager.java
lucene/dev/branches/lucene6005/solr/solrj/src/java/org/apache/solr/common/cloud/SolrZkClient.java
lucene/dev/branches/lucene6005/solr/solrj/src/test/org/apache/solr/client/solrj/impl/CloudSolrServerTest.java
lucene/dev/branches/lucene6005/solr/test-framework/ (props changed)
lucene/dev/branches/lucene6005/solr/test-framework/src/java/org/apache/solr/SolrTestCaseJ4.java
Modified: lucene/dev/branches/lucene6005/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/build.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/build.xml (original)
+++ lucene/dev/branches/lucene6005/build.xml Thu Nov 27 20:41:01 2014
@@ -279,7 +279,7 @@
<echo>
SUCCESS: You must right-click your project and choose Refresh.
- Your project must use a Java 7 JRE.
+ Your project must use a Java 8 JRE.
</echo>
</target>
@@ -326,7 +326,7 @@ following two XML attributes/values (adj
JDKs you have defined locally - see
File | Project Structure | Platform Settings | SDKs):
- idea.jdk = project-jdk-name="1.7" project-jdk-type="JavaSDK"
+ idea.jdk = project-jdk-name="1.8" project-jdk-type="JavaSDK"
</echo>
</target>
@@ -373,22 +373,13 @@ File | Project Structure | Platform Sett
</subant>
</target>
- <target name="-nightly-smoke-java8params" if="smokeTestRelease.java8">
- <!-- convert path to UNIX style, so windows backslashes don't hurt escaping: -->
- <pathconvert targetos="unix" property="-smokeTestRelease.java8params">
- <regexpmapper from="^(.*)$" to="--test-java8 '\1'"/>
- <path location="${smokeTestRelease.java8}"/>
- </pathconvert>
- </target>
-
- <target name="nightly-smoke" description="Builds an unsigned release and smoke tests it (pass '-DsmokeTestRelease.java8=/path/to/jdk1.8.0' to additionally test with Java 8)"
- depends="clean,-nightly-smoke-java8params">
- <fail message="To run nightly smoke, the JDK must be exactly Java 1.7, was: ${java.specification.version}">
+ <target name="nightly-smoke" description="Builds an unsigned release and smoke tests it"
+ depends="clean">
+ <fail message="To run nightly smoke, the JDK must be exactly Java 1.8, was: ${java.specification.version}">
<condition>
- <not><equals arg1="${java.specification.version}" arg2="1.7"/></not>
+ <not><equals arg1="${java.specification.version}" arg2="1.8"/></not>
</condition>
</fail>
- <property name="-smokeTestRelease.java8params" value=""/><!-- (if not yet defined) -->
<exec executable="${python32.exe}" failonerror="true" taskname="python32">
<arg value="-V"/>
</exec>
@@ -412,7 +403,6 @@ File | Project Structure | Platform Sett
<!-- Tell Python not to write any bytecode cache into the filesystem: -->
<arg value="-B"/>
<arg file="dev-tools/scripts/smokeTestRelease.py"/>
- <arg line="${-smokeTestRelease.java8params}"/>
<arg value="--revision"/>
<arg value="skip"/>
<!-- pass ${version.base} here to emulate a real release, without appendix like "-SNAPSHOT": -->
Modified: lucene/dev/branches/lucene6005/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs (original)
+++ lucene/dev/branches/lucene6005/dev-tools/eclipse/dot.settings/org.eclipse.jdt.core.prefs Thu Nov 27 20:41:01 2014
@@ -1,7 +1,7 @@
#Sun Sep 23 13:02:27 EDT 2012
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.8
+org.eclipse.jdt.core.compiler.compliance=1.8
org.eclipse.jdt.core.compiler.doc.comment.support=enabled
org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
@@ -18,7 +18,11 @@ org.eclipse.jdt.core.compiler.problem.mi
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsMethodTypeParameters=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsOverriding=disabled
org.eclipse.jdt.core.compiler.problem.missingJavadocTagsVisibility=public
-org.eclipse.jdt.core.compiler.source=1.7
+org.eclipse.jdt.core.compiler.annotation.nullanalysis=disabled
+org.eclipse.jdt.core.compiler.source=1.8
+org.eclipse.jdt.core.compiler.taskCaseSensitive=enabled
+org.eclipse.jdt.core.compiler.taskPriorities=HIGH
+org.eclipse.jdt.core.compiler.taskTags=nocommit
org.eclipse.jdt.core.formatter.align_type_members_on_columns=false
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_allocation_expression=16
org.eclipse.jdt.core.formatter.alignment_for_arguments_in_annotation=0
Modified: lucene/dev/branches/lucene6005/dev-tools/idea/lucene/benchmark/src/benchmark.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/dev-tools/idea/lucene/benchmark/src/benchmark.iml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/dev-tools/idea/lucene/benchmark/src/benchmark.iml (original)
+++ lucene/dev/branches/lucene6005/dev-tools/idea/lucene/benchmark/src/benchmark.iml Thu Nov 27 20:41:01 2014
@@ -34,5 +34,6 @@
<orderEntry type="module" module-name="lucene-core" />
<orderEntry type="module" module-name="queryparser" />
<orderEntry type="module" module-name="queries" />
+ <orderEntry type="module" module-name="join" />
</component>
</module>
Modified: lucene/dev/branches/lucene6005/dev-tools/idea/lucene/highlighter/highlighter.iml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/dev-tools/idea/lucene/highlighter/highlighter.iml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/dev-tools/idea/lucene/highlighter/highlighter.iml (original)
+++ lucene/dev/branches/lucene6005/dev-tools/idea/lucene/highlighter/highlighter.iml Thu Nov 27 20:41:01 2014
@@ -16,5 +16,6 @@
<orderEntry type="module" module-name="misc" />
<orderEntry type="module" module-name="queries" />
<orderEntry type="module" module-name="lucene-core" />
+ <orderEntry type="module" module-name="join" />
</component>
</module>
Modified: lucene/dev/branches/lucene6005/dev-tools/maven/README.maven
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/dev-tools/maven/README.maven?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/dev-tools/maven/README.maven (original)
+++ lucene/dev/branches/lucene6005/dev-tools/maven/README.maven Thu Nov 27 20:41:01 2014
@@ -36,7 +36,7 @@ A. How to use nightly Jenkins-built Luce
B. How to generate Lucene/Solr Maven artifacts
- Prerequisites: JDK 1.7+ and Ant 1.8.2+
+ Prerequisites: JDK 1.8+ and Ant 1.8.2+
Run 'ant generate-maven-artifacts' to create an internal Maven
repository, including POMs, binary .jars, source .jars, and javadoc
@@ -50,7 +50,7 @@ B. How to generate Lucene/Solr Maven art
C. How to deploy Maven artifacts to a repository
- Prerequisites: JDK 1.7+ and Ant 1.8.2+
+ Prerequisites: JDK 1.8+ and Ant 1.8.2+
You can deploy targets for all of Lucene/Solr, only Lucene, or only Solr,
as in B. above. To deploy to a Maven repository, the command is the same
@@ -77,7 +77,7 @@ D. How to use Maven to build Lucene/Solr
The details, followed by some example Maven commands:
- 1. Prerequisites: JDK 1.7+ and Maven 2.2.1 or 3.X
+ 1. Prerequisites: JDK 1.8+ and Maven 2.2.1 or 3.X
2. Make sure your sources are up to date. If you checked your sources out
from the Apache Subversion repository, run "svn update" from the top
Modified: lucene/dev/branches/lucene6005/dev-tools/maven/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/dev-tools/maven/pom.xml.template?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/dev-tools/maven/pom.xml.template (original)
+++ lucene/dev/branches/lucene6005/dev-tools/maven/pom.xml.template Thu Nov 27 20:41:01 2014
@@ -43,7 +43,7 @@
<vc-browse-base-url>http://svn.apache.org/viewvc/lucene/dev/trunk</vc-browse-base-url>
<specification.version>@spec.version@</specification.version>
<maven.build.timestamp.format>yyyy-MM-dd HH:mm:ss</maven.build.timestamp.format>
- <java.compat.version>1.7</java.compat.version>
+ <java.compat.version>1.8</java.compat.version>
<jetty.version>8.1.10.v20130312</jetty.version>
<!-- RandomizedTesting library system properties -->
Modified: lucene/dev/branches/lucene6005/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/dev-tools/scripts/smokeTestRelease.py?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/branches/lucene6005/dev-tools/scripts/smokeTestRelease.py Thu Nov 27 20:41:01 2014
@@ -171,15 +171,15 @@ def checkJARMetaData(desc, jarFile, svnR
for verify in (
'Specification-Vendor: The Apache Software Foundation',
'Implementation-Vendor: The Apache Software Foundation',
- # Make sure 1.7 compiler was used to build release bits:
- 'X-Compile-Source-JDK: 1.7',
+ # Make sure 1.8 compiler was used to build release bits:
+ 'X-Compile-Source-JDK: 1.8',
# Make sure 1.8 ant was used to build release bits: (this will match 1.8+)
'Ant-Version: Apache Ant 1.8',
- # Make sure .class files are 1.7 format:
- 'X-Compile-Target-JDK: 1.7',
+ # Make sure .class files are 1.8 format:
+ 'X-Compile-Target-JDK: 1.8',
'Specification-Version: %s' % version,
- # Make sure the release was compiled with 1.7:
- 'Created-By: 1.7'):
+ # Make sure the release was compiled with 1.8:
+ 'Created-By: 1.8'):
if s.find(verify) == -1:
raise RuntimeError('%s is missing "%s" inside its META-INF/MANIFEST.MF' % \
(desc, verify))
@@ -705,54 +705,32 @@ def verifyUnpacked(java, project, artifa
raise RuntimeError('source release has WARs...')
print(' run "ant validate"')
- java.run_java7('ant validate', '%s/validate.log' % unpackPath)
+ java.run_java8('ant validate', '%s/validate.log' % unpackPath)
if project == 'lucene':
- print(" run tests w/ Java 7 and testArgs='%s'..." % testArgs)
- java.run_java7('ant clean test %s' % testArgs, '%s/test.log' % unpackPath)
- java.run_java7('ant jar', '%s/compile.log' % unpackPath)
- testDemo(java.run_java7, isSrc, version, '1.7')
+ print(" run tests w/ Java 8 and testArgs='%s'..." % testArgs)
+ java.run_java8('ant clean test %s' % testArgs, '%s/test.log' % unpackPath)
+ java.run_java8('ant jar', '%s/compile.log' % unpackPath)
+ testDemo(java.run_java8, isSrc, version, '1.8')
- print(' generate javadocs w/ Java 7...')
- java.run_java7('ant javadocs', '%s/javadocs.log' % unpackPath)
+ print(' generate javadocs w/ Java 8...')
+ java.run_java8('ant javadocs', '%s/javadocs.log' % unpackPath)
checkJavadocpathFull('%s/build/docs' % unpackPath)
- if java.run_java8:
- print(" run tests w/ Java 8 and testArgs='%s'..." % testArgs)
- java.run_java8('ant clean test %s' % testArgs, '%s/test.log' % unpackPath)
- java.run_java8('ant jar', '%s/compile.log' % unpackPath)
- testDemo(java.run_java8, isSrc, version, '1.8')
-
- print(' generate javadocs w/ Java 8...')
- java.run_java8('ant javadocs', '%s/javadocs.log' % unpackPath)
- checkJavadocpathFull('%s/build/docs' % unpackPath)
-
else:
os.chdir('solr')
- print(" run tests w/ Java 7 and testArgs='%s'..." % testArgs)
- java.run_java7('ant clean test -Dtests.slow=false %s' % testArgs, '%s/test.log' % unpackPath)
+ print(" run tests w/ Java 8 and testArgs='%s'..." % testArgs)
+ java.run_java8('ant clean test -Dtests.slow=false %s' % testArgs, '%s/test.log' % unpackPath)
# test javadocs
- print(' generate javadocs w/ Java 7...')
- java.run_java7('ant clean javadocs', '%s/javadocs.log' % unpackPath)
+ print(' generate javadocs w/ Java 8...')
+ java.run_java8('ant clean javadocs', '%s/javadocs.log' % unpackPath)
checkJavadocpathFull('%s/solr/build/docs' % unpackPath, False)
- print(' test solr example w/ Java 7...')
- java.run_java7('ant clean example', '%s/antexample.log' % unpackPath)
- testSolrExample(unpackPath, java.java7_home, True)
-
- if java.run_java8:
- print(" run tests w/ Java 8 and testArgs='%s'..." % testArgs)
- java.run_java8('ant clean test -Dtests.slow=false %s' % testArgs, '%s/test.log' % unpackPath)
-
- print(' generate javadocs w/ Java 8...')
- java.run_java8('ant clean javadocs', '%s/javadocs.log' % unpackPath)
- checkJavadocpathFull('%s/solr/build/docs' % unpackPath, False)
-
- print(' test solr example w/ Java 8...')
- java.run_java8('ant clean example', '%s/antexample.log' % unpackPath)
- testSolrExample(unpackPath, java.java8_home, True)
+ print(' test solr example w/ Java 8...')
+ java.run_java8('ant clean example', '%s/antexample.log' % unpackPath)
+ testSolrExample(unpackPath, java.java8_home, True)
os.chdir('..')
print(' check NOTICE')
@@ -763,9 +741,7 @@ def verifyUnpacked(java, project, artifa
checkAllJARs(os.getcwd(), project, svnRevision, version, tmpDir, baseURL)
if project == 'lucene':
- testDemo(java.run_java7, isSrc, version, '1.7')
- if java.run_java8:
- testDemo(java.run_java8, isSrc, version, '1.8')
+ testDemo(java.run_java8, isSrc, version, '1.8')
print(' check Lucene\'s javadoc JAR')
checkJavadocpath('%s/docs' % unpackPath)
@@ -773,24 +749,14 @@ def verifyUnpacked(java, project, artifa
else:
checkSolrWAR('%s/server/webapps/solr.war' % unpackPath, svnRevision, version, tmpDir, baseURL)
- print(' copying unpacked distribution for Java 7 ...')
- java7UnpackPath = '%s-java7' % unpackPath
- if os.path.exists(java7UnpackPath):
- shutil.rmtree(java7UnpackPath)
- shutil.copytree(unpackPath, java7UnpackPath)
- os.chdir(java7UnpackPath)
- print(' test solr example w/ Java 7...')
- testSolrExample(java7UnpackPath, java.java7_home, False)
-
- if java.run_java8:
- print(' copying unpacked distribution for Java 8 ...')
- java8UnpackPath = '%s-java8' % unpackPath
- if os.path.exists(java8UnpackPath):
- shutil.rmtree(java8UnpackPath)
- shutil.copytree(unpackPath, java8UnpackPath)
- os.chdir(java8UnpackPath)
- print(' test solr example w/ Java 8...')
- testSolrExample(java8UnpackPath, java.java8_home, False)
+ print(' copying unpacked distribution for Java 8 ...')
+ java8UnpackPath = '%s-java8' % unpackPath
+ if os.path.exists(java8UnpackPath):
+ shutil.rmtree(java8UnpackPath)
+ shutil.copytree(unpackPath, java8UnpackPath)
+ os.chdir(java8UnpackPath)
+ print(' test solr example w/ Java 8...')
+ testSolrExample(java8UnpackPath, java.java8_home, False)
os.chdir(unpackPath)
@@ -859,8 +825,13 @@ def testSolrExample(unpackPath, javaPath
env.update(os.environ)
env['JAVA_HOME'] = javaPath
env['PATH'] = '%s/bin:%s' % (javaPath, env['PATH'])
+
# Stop Solr running on port 8983 (in case a previous run didn't shutdown cleanly)
- subprocess.call(['bin/solr','stop','-p','8983'])
+ try:
+ subprocess.call(['bin/solr','stop','-p','8983'])
+ except:
+ print(' Stop failed due to: '+sys.exc_info()[0])
+
print(' starting Solr on port 8983 from %s' % unpackPath)
server = subprocess.Popen(['bin/solr', '-f', '-p', '8983'], stdout=subprocess.PIPE, stderr=subprocess.STDOUT, stdin=subprocess.PIPE, env=env)
@@ -1297,16 +1268,13 @@ def make_java_config(parser, java8_home)
def run_java(cmd, logfile):
run('%s; %s' % (cmd_prefix, cmd), logfile)
return run_java
- java7_home = os.environ.get('JAVA_HOME')
- if java7_home is None:
+ java8_home = os.environ.get('JAVA_HOME')
+ if java8_home is None:
parser.error('JAVA_HOME must be set')
- run_java7 = _make_runner(java7_home, '1.7')
- run_java8 = None
- if java8_home is not None:
- run_java8 = _make_runner(java8_home, '1.8')
+ run_java8 = _make_runner(java8_home, '1.8')
- jc = namedtuple('JavaConfig', 'run_java7 java7_home run_java8 java8_home')
- return jc(run_java7, java7_home, run_java8, java8_home)
+ jc = namedtuple('JavaConfig', 'run_java8 java8_home')
+ return jc(run_java8, java8_home)
version_re = re.compile(r'(\d+\.\d+\.\d+(-ALPHA|-BETA)?)')
revision_re = re.compile(r'rev(\d+)')
Modified: lucene/dev/branches/lucene6005/lucene/BUILD.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/BUILD.txt?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/BUILD.txt (original)
+++ lucene/dev/branches/lucene6005/lucene/BUILD.txt Thu Nov 27 20:41:01 2014
@@ -1,19 +1,19 @@
Lucene Build Instructions
Basic steps:
- 0) Install JDK 1.7 (or greater), Ant 1.8.2+, Ivy 2.2.0
+ 0) Install JDK 1.8 (or greater), Ant 1.8.2+, Ivy 2.2.0
1) Download Lucene from Apache and unpack it
2) Connect to the top-level of your Lucene installation
3) Install JavaCC (optional)
4) Run ant
-Step 0) Set up your development environment (JDK 1.7 or greater,
+Step 0) Set up your development environment (JDK 1.8 or greater,
Ant 1.8.2+, Ivy 2.2.0)
We'll assume that you know how to get and set up the JDK - if you
-don't, then we suggest starting at http://java.sun.com and learning
+don't, then we suggest starting at http://www.oracle.com/java/ and learning
more about Java, before returning to this README. Lucene runs with
-JDK 1.7 and later.
+JDK 1.8 and later.
Like many Open Source java projects, Lucene uses Apache Ant for build
control. Specifically, you MUST use Ant version 1.8.2+.
Modified: lucene/dev/branches/lucene6005/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/CHANGES.txt?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/lucene6005/lucene/CHANGES.txt Thu Nov 27 20:41:01 2014
@@ -5,6 +5,11 @@ http://s.apache.org/luceneversions
======================= Lucene 6.0.0 =======================
+System Requirements
+
+* LUCENE-5950: Move to Java 8 as minimum Java version.
+ (Ryan Ernst, Uwe Schindler)
+
New Features
API Changes
@@ -17,6 +22,9 @@ API Changes
(Nikola Tanković, Uwe Schindler, Chris Male, Mike McCandless,
Robert Muir)
+* LUCENE-6067: Accountable.getChildResources has a default
+ implementation returning the empty list. (Robert Muir)
+
======================= Lucene 5.0.0 =======================
New Features
@@ -41,7 +49,7 @@ New Features
* LUCENE-5889: Add commit method to AnalyzingInfixSuggester, and allow just using .add
to build up the suggester. (Varun Thacker via Mike McCandless)
-* LUCENE-5123: Add a "push" option to the postings writing API, so
+* LUCENE-5123: Add a "pull" option to the postings writing API, so
that a PostingsFormat now receives a Fields instance and it is
responsible for iterating through all fields, terms, documents and
positions. (Robert Muir, Mike McCandless)
@@ -98,6 +106,15 @@ New Features
* LUCENE-5929: Also extract terms to highlight from block join
queries. (Julie Tibshirani via Mike McCandless)
+* LUCENE-6063: Allow overriding whether/how ConcurrentMergeScheduler
+ stalls incoming threads when merges are falling behind (Mike
+ McCandless)
+
+* LUCENE-5833: DocumentDictionary now enumerates each value separately
+ in a multi-valued field (not just the first value), so you can build
+ suggesters from multi-valued fields. (Varun Thacker via Mike
+ McCandless)
+
API Changes
* LUCENE-5900: Deprecated more constructors taking Version in *InfixSuggester and
@@ -202,6 +219,12 @@ API Changes
instance based on a Directory implementation passed to the factory method.
See MIGRATE.txt for more details. (Uwe Schindler, Robert Muir)
+* LUCENE-6062: Throw exception instead of silently doing nothing if you try to
+ sort/group/etc on a misconfigured field (e.g. no docvalues, no UninvertingReader, etc).
+ (Robert Muir)
+
+* LUCENE-6068: LeafReader.fields() never returns null. (Robert Muir)
+
Bug Fixes
* LUCENE-5650: Enforce read-only access to any path outside the temporary
@@ -255,6 +278,12 @@ Bug Fixes
* LUCENE-6060: Remove dangerous IndexWriter.unlock method (Simon
Willnauer, Mike McCandless)
+
+* LUCENE-6062: Pass correct fieldinfos to docvalues producer when the
+ segment has updates. (Mike McCandless, Shai Erera, Robert Muir)
+
+* LUCENE-6075: Don't overflow int in SimpleRateLimiter (Boaz Leskes
+ via Mike McCandless)
Documentation
@@ -328,6 +357,8 @@ Build
* LUCENE-5995: Upgrade ICU to 54.1 (Robert Muir)
+* LUCENE-6070: Upgrade forbidden-apis to 1.7 (Uwe Schindler)
+
Other
* LUCENE-5563: Removed sep layout: which has fallen behind on features and doesn't
Modified: lucene/dev/branches/lucene6005/lucene/SYSTEM_REQUIREMENTS.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/SYSTEM_REQUIREMENTS.txt?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/SYSTEM_REQUIREMENTS.txt (original)
+++ lucene/dev/branches/lucene6005/lucene/SYSTEM_REQUIREMENTS.txt Thu Nov 27 20:41:01 2014
@@ -1,9 +1,6 @@
# System Requirements
-Apache Lucene runs of Java 7 or greater, Java 8 is verified to be
-compatible and may bring some performance improvements. When using
-Oracle Java 7 or OpenJDK 7, be sure to not use the GA build 147 or
-update versions u40, u45 and u51! We recommend using u55 or later.
+Apache Lucene runs on Java 8 or greater.
It is also recommended to always use the latest update version of your
Java VM, because bugs may affect Lucene. An overview of known JVM bugs
Modified: lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java (original)
+++ lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestBugInSomething.java Thu Nov 27 20:41:01 2014
@@ -246,6 +246,7 @@ public class TestBugInSomething extends
}
// LUCENE-5269
+ @Slow
public void testUnicodeShinglesAndNgrams() throws Exception {
Analyzer analyzer = new Analyzer() {
@Override
Modified: lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java (original)
+++ lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestFactories.java Thu Nov 27 20:41:01 2014
@@ -77,7 +77,7 @@ public class TestFactories extends BaseT
// beast it just a little, it shouldnt throw exceptions:
// (it should have thrown them in initialize)
- checkRandomData(random(), new FactoryAnalyzer(factory, null, null), 100, 20, false, false);
+ checkRandomData(random(), new FactoryAnalyzer(factory, null, null), 20, 20, false, false);
}
}
@@ -97,7 +97,7 @@ public class TestFactories extends BaseT
// beast it just a little, it shouldnt throw exceptions:
// (it should have thrown them in initialize)
- checkRandomData(random(), new FactoryAnalyzer(assertingTokenizer, factory, null), 100, 20, false, false);
+ checkRandomData(random(), new FactoryAnalyzer(assertingTokenizer, factory, null), 20, 20, false, false);
}
}
@@ -117,7 +117,7 @@ public class TestFactories extends BaseT
// beast it just a little, it shouldnt throw exceptions:
// (it should have thrown them in initialize)
- checkRandomData(random(), new FactoryAnalyzer(assertingTokenizer, null, factory), 100, 20, false, false);
+ checkRandomData(random(), new FactoryAnalyzer(assertingTokenizer, null, factory), 20, 20, false, false);
}
}
Modified: lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java (original)
+++ lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestRandomChains.java Thu Nov 27 20:41:01 2014
@@ -900,7 +900,7 @@ public class TestRandomChains extends Ba
}
public void testRandomChains() throws Throwable {
- int numIterations = atLeast(20);
+ int numIterations = TEST_NIGHTLY ? atLeast(20) : 3;
Random random = random();
for (int i = 0; i < numIterations; i++) {
MockRandomAnalyzer a = new MockRandomAnalyzer(random.nextLong());
@@ -919,7 +919,7 @@ public class TestRandomChains extends Ba
// we might regret this decision...
public void testRandomChainsWithLargeStrings() throws Throwable {
- int numIterations = atLeast(20);
+ int numIterations = TEST_NIGHTLY ? atLeast(20) : 3;
Random random = random();
for (int i = 0; i < numIterations; i++) {
MockRandomAnalyzer a = new MockRandomAnalyzer(random.nextLong());
Modified: lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestStemmerOverrideFilter.java Thu Nov 27 20:41:01 2014
@@ -135,7 +135,9 @@ public class TestStemmerOverrideFilter e
if (map.isEmpty()) {
map.put("booked", "books");
}
- StemmerOverrideFilter.Builder builder = new StemmerOverrideFilter.Builder(random().nextBoolean());
+ // This test might fail if ignoreCase is true since the map might have twice the same key, once
+ // lowercased and once uppercased
+ StemmerOverrideFilter.Builder builder = new StemmerOverrideFilter.Builder(false);
Set<Entry<String,String>> entrySet = map.entrySet();
for (Entry<String,String> entry : entrySet) {
builder.add(entry.getKey(), entry.getValue());
Modified: lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java (original)
+++ lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/miscellaneous/TestWordDelimiterFilter.java Thu Nov 27 20:41:01 2014
@@ -355,7 +355,7 @@ public class TestWordDelimiterFilter ext
}
};
// TODO: properly support positionLengthAttribute
- checkRandomData(random(), a, 1000*RANDOM_MULTIPLIER, 20, false, false);
+ checkRandomData(random(), a, 200*RANDOM_MULTIPLIER, 20, false, false);
}
}
@@ -380,7 +380,7 @@ public class TestWordDelimiterFilter ext
}
};
// TODO: properly support positionLengthAttribute
- checkRandomData(random(), a, 100*RANDOM_MULTIPLIER, 8192, false, false);
+ checkRandomData(random(), a, 20*RANDOM_MULTIPLIER, 8192, false, false);
}
}
Modified: lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java (original)
+++ lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/EdgeNGramTokenizerTest.java Thu Nov 27 20:41:01 2014
@@ -99,7 +99,8 @@ public class EdgeNGramTokenizerTest exte
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- for (int i = 0; i < 10; i++) {
+ int numIters = TEST_NIGHTLY ? 10 : 1;
+ for (int i = 0; i < numIters; i++) {
final int min = TestUtil.nextInt(random(), 2, 10);
final int max = TestUtil.nextInt(random(), min, 20);
Modified: lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java (original)
+++ lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/ngram/NGramTokenizerTest.java Thu Nov 27 20:41:01 2014
@@ -110,7 +110,8 @@ public class NGramTokenizerTest extends
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- for (int i = 0; i < 10; i++) {
+ int numIters = TEST_NIGHTLY ? 10 : 1;
+ for (int i = 0; i < numIters; i++) {
final int min = TestUtil.nextInt(random(), 2, 10);
final int max = TestUtil.nextInt(random(), min, 20);
Analyzer a = new Analyzer() {
Modified: lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java (original)
+++ lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowball.java Thu Nov 27 20:41:01 2014
@@ -130,6 +130,6 @@ public class TestSnowball extends BaseTo
return new TokenStreamComponents(t, new SnowballFilter(t, snowballLanguage));
}
};
- checkRandomData(random(), a, 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), a, 100*RANDOM_MULTIPLIER);
}
}
\ No newline at end of file
Modified: lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java (original)
+++ lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java Thu Nov 27 20:41:01 2014
@@ -24,12 +24,14 @@ import org.apache.lucene.analysis.Analyz
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.core.KeywordTokenizer;
import org.apache.lucene.util.LuceneTestCase;
+import org.apache.lucene.util.LuceneTestCase.Slow;
import static org.apache.lucene.analysis.VocabularyAssert.*;
/**
* Test the snowball filters against the snowball data tests
*/
+@Slow
public class TestSnowballVocab extends LuceneTestCase {
/**
* Run all languages against their snowball vocabulary tests.
Modified: lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java (original)
+++ lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java Thu Nov 27 20:41:01 2014
@@ -32,6 +32,7 @@ import org.apache.lucene.util.TestUtil;
public class TestStandardAnalyzer extends BaseTokenStreamTestCase {
// LUCENE-5897: slow tokenization of strings of the form (\p{WB:ExtendNumLet}[\p{WB:Format}\p{WB:Extend}]*)+
+ @Slow
public void testLargePartiallyMatchingToken() throws Exception {
// TODO: get these lists of chars matching a property from ICU4J
// http://www.unicode.org/Public/6.3.0/ucd/auxiliary/WordBreakProperty.txt
Modified: lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java (original)
+++ lucene/dev/branches/lucene6005/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java Thu Nov 27 20:41:01 2014
@@ -41,6 +41,7 @@ import java.util.Random;
public class TestUAX29URLEmailTokenizer extends BaseTokenStreamTestCase {
// LUCENE-5440: extremely slow tokenization of text matching email <local-part> (before the '@')
+ @Slow
public void testLongEMAILatomText() throws Exception {
// EMAILatomText = [A-Za-z0-9!#$%&'*+-/=?\^_`{|}~]
char[] emailAtomChars
Modified: lucene/dev/branches/lucene6005/lucene/analysis/kuromoji/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/analysis/kuromoji/build.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/analysis/kuromoji/build.xml (original)
+++ lucene/dev/branches/lucene6005/lucene/analysis/kuromoji/build.xml Thu Nov 27 20:41:01 2014
@@ -58,7 +58,7 @@
<target name="compile-core" depends="jar-analyzers-common, common.compile-core" />
<target name="download-dict" depends="ivy-availability-check,ivy-fail,ivy-configure" unless="dict.available">
- <ivy:retrieve pattern="${build.dir}/${dict.src.file}" conf="${ipadic.type}"/>
+ <ivy:retrieve pattern="${build.dir}/${dict.src.file}" conf="${ipadic.type}" symlink="${ivy.symlink}"/>
<!-- TODO: we should checksum too -->
<gunzip src="${build.dir}/${dict.src.file}"/>
<untar src="${build.dir}/${ipadic.version}.tar" dest="${build.dir}"/>
Modified: lucene/dev/branches/lucene6005/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java (original)
+++ lucene/dev/branches/lucene6005/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestExtendedMode.java Thu Nov 27 20:41:01 2014
@@ -28,9 +28,7 @@ import org.apache.lucene.analysis.ja.Jap
import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.UnicodeUtil;
-import org.apache.lucene.util.LuceneTestCase.Slow;
-@Slow
public class TestExtendedMode extends BaseTokenStreamTestCase {
private final Analyzer analyzer = new Analyzer() {
@@ -66,12 +64,12 @@ public class TestExtendedMode extends Ba
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
Random random = random();
- checkRandomData(random, analyzer, 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random, analyzer, 500*RANDOM_MULTIPLIER);
}
/** blast some random large strings through the analyzer */
public void testRandomHugeStrings() throws Exception {
Random random = random();
- checkRandomData(random, analyzer, 100*RANDOM_MULTIPLIER, 8192);
+ checkRandomData(random, analyzer, 30*RANDOM_MULTIPLIER, 8192);
}
}
Modified: lucene/dev/branches/lucene6005/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.java (original)
+++ lucene/dev/branches/lucene6005/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseAnalyzer.java Thu Nov 27 20:41:01 2014
@@ -23,12 +23,10 @@ import java.util.Random;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.ja.JapaneseTokenizer.Mode;
-import org.apache.lucene.util.LuceneTestCase.Slow;
/**
* Test Kuromoji Japanese morphological analyzer
*/
-@Slow
public class TestJapaneseAnalyzer extends BaseTokenStreamTestCase {
/** This test fails with NPE when the
* stopwords file is missing in classpath */
@@ -130,7 +128,7 @@ public class TestJapaneseAnalyzer extend
final Analyzer a = new JapaneseAnalyzer(null, Mode.SEARCH,
JapaneseAnalyzer.getDefaultStopSet(),
JapaneseAnalyzer.getDefaultStopTags());
- checkRandomData(random, a, atLeast(10000));
+ checkRandomData(random, a, atLeast(1000));
}
/** blast some random large strings through the analyzer */
@@ -139,7 +137,7 @@ public class TestJapaneseAnalyzer extend
final Analyzer a = new JapaneseAnalyzer(null, Mode.SEARCH,
JapaneseAnalyzer.getDefaultStopSet(),
JapaneseAnalyzer.getDefaultStopTags());
- checkRandomData(random, a, 100*RANDOM_MULTIPLIER, 8192);
+ checkRandomData(random, a, 2*RANDOM_MULTIPLIER, 8192);
}
// Copied from TestJapaneseTokenizer, to make sure passing
Modified: lucene/dev/branches/lucene6005/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java (original)
+++ lucene/dev/branches/lucene6005/lucene/analysis/kuromoji/src/test/org/apache/lucene/analysis/ja/TestJapaneseTokenizer.java Thu Nov 27 20:41:01 2014
@@ -39,7 +39,6 @@ import org.apache.lucene.util.TestUtil;
import org.apache.lucene.util.UnicodeUtil;
import org.apache.lucene.util.LuceneTestCase.Slow;
-@Slow
public class TestJapaneseTokenizer extends BaseTokenStreamTestCase {
public static UserDictionary readDict() {
@@ -184,15 +183,15 @@ public class TestJapaneseTokenizer exten
/** blast some random strings through the analyzer */
public void testRandomStrings() throws Exception {
- checkRandomData(random(), analyzer, 1000*RANDOM_MULTIPLIER);
- checkRandomData(random(), analyzerNoPunct, 1000*RANDOM_MULTIPLIER);
+ checkRandomData(random(), analyzer, 500*RANDOM_MULTIPLIER);
+ checkRandomData(random(), analyzerNoPunct, 500*RANDOM_MULTIPLIER);
}
/** blast some random large strings through the analyzer */
public void testRandomHugeStrings() throws Exception {
Random random = random();
- checkRandomData(random, analyzer, 100*RANDOM_MULTIPLIER, 8192);
- checkRandomData(random, analyzerNoPunct, 100*RANDOM_MULTIPLIER, 8192);
+ checkRandomData(random, analyzer, 20*RANDOM_MULTIPLIER, 8192);
+ checkRandomData(random, analyzerNoPunct, 20*RANDOM_MULTIPLIER, 8192);
}
public void testRandomHugeStringsMockGraphAfter() throws Exception {
@@ -207,11 +206,11 @@ public class TestJapaneseTokenizer exten
return new TokenStreamComponents(tokenizer, graph);
}
},
- 100*RANDOM_MULTIPLIER, 8192);
+ 20*RANDOM_MULTIPLIER, 8192);
}
public void testLargeDocReliability() throws Exception {
- for (int i = 0; i < 100; i++) {
+ for (int i = 0; i < 10; i++) {
String s = TestUtil.randomUnicodeString(random(), 10000);
try (TokenStream ts = analyzer.tokenStream("foo", s)) {
ts.reset();
Modified: lucene/dev/branches/lucene6005/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/build.xml?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/build.xml (original)
+++ lucene/dev/branches/lucene6005/lucene/build.xml Thu Nov 27 20:41:01 2014
@@ -336,7 +336,7 @@
<svn-export-source source.dir="."/>
<!-- Exclude javadoc package-list files under licenses incompatible with the ASL -->
- <delete dir="${svn.export.dir}/tools/javadoc/java7"/>
+ <delete dir="${svn.export.dir}/tools/javadoc/java8"/>
<!-- Exclude clover license files incompatible with the ASL -->
<delete dir="${svn.export.dir}/tools/clover"/>
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/blockterms/BlockTermsReader.java Thu Nov 27 20:41:01 2014
@@ -238,11 +238,6 @@ public class BlockTermsReader extends Fi
public long ramBytesUsed() {
return FIELD_READER_RAM_BYTES_USED;
}
-
- @Override
- public Iterable<? extends Accountable> getChildResources() {
- return Collections.emptyList();
- }
@Override
public TermsEnum iterator(TermsEnum reuse) throws IOException {
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/bloom/FuzzySet.java Thu Nov 27 20:41:01 2014
@@ -17,7 +17,6 @@ package org.apache.lucene.codecs.bloom;
* limitations under the License.
*/
import java.io.IOException;
-import java.util.Collections;
import org.apache.lucene.search.DocIdSetIterator;
import org.apache.lucene.store.DataInput;
@@ -313,11 +312,6 @@ public class FuzzySet implements Account
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
- return Collections.emptyList();
- }
-
- @Override
public String toString() {
return getClass().getSimpleName() + "(hash=" + hashFunction + ")";
}
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectDocValuesProducer.java Thu Nov 27 20:41:01 2014
@@ -686,11 +686,6 @@ class DirectDocValuesProducer extends Do
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
- return Collections.emptyList();
- }
-
- @Override
public String toString() {
return getClass().getSimpleName();
}
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/DirectPostingsFormat.java Thu Nov 27 20:41:01 2014
@@ -208,11 +208,6 @@ public final class DirectPostingsFormat
((postings!=null) ? RamUsageEstimator.sizeOf(postings) : 0) +
((payloads!=null) ? RamUsageEstimator.sizeOf(payloads) : 0);
}
-
- @Override
- public Iterable<? extends Accountable> getChildResources() {
- return Collections.emptyList();
- }
}
// TODO: maybe specialize into prx/no-prx/no-frq cases?
@@ -261,11 +256,6 @@ public final class DirectPostingsFormat
return sizeInBytes;
}
-
- @Override
- public Iterable<? extends Accountable> getChildResources() {
- return Collections.emptyList();
- }
}
private final byte[] termBytes;
@@ -543,11 +533,6 @@ public final class DirectPostingsFormat
return sizeInBytes;
}
-
- @Override
- public Iterable<? extends Accountable> getChildResources() {
- return Collections.emptyList();
- }
@Override
public String toString() {
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermOutputs.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermOutputs.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermOutputs.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/memory/FSTTermOutputs.java Thu Nov 27 20:41:01 2014
@@ -19,7 +19,6 @@ package org.apache.lucene.codecs.memory;
import java.io.IOException;
import java.util.Arrays;
-import java.util.Collections;
import org.apache.lucene.index.FieldInfo;
import org.apache.lucene.index.IndexOptions;
@@ -79,11 +78,6 @@ class FSTTermOutputs extends Outputs<FST
}
return ramBytesUsed;
}
-
- @Override
- public Iterable<? extends Accountable> getChildResources() {
- return Collections.emptyList();
- }
// NOTE: actually, FST nodes are seldom
// identical when outputs on their arcs
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextDocValuesReader.java Thu Nov 27 20:41:01 2014
@@ -511,11 +511,6 @@ class SimpleTextDocValuesReader extends
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
- return Collections.emptyList();
- }
-
- @Override
public String toString() {
return getClass().getSimpleName() + "(fields=" + fields.size() + ")";
}
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextStoredFieldsReader.java Thu Nov 27 20:41:01 2014
@@ -19,7 +19,6 @@ package org.apache.lucene.codecs.simplet
import java.io.IOException;
import java.nio.charset.StandardCharsets;
-import java.util.Collections;
import org.apache.lucene.codecs.StoredFieldsReader;
import org.apache.lucene.index.FieldInfo;
@@ -33,7 +32,6 @@ import org.apache.lucene.store.ChecksumI
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.IndexInput;
-import org.apache.lucene.util.Accountable;
import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.BytesRefBuilder;
@@ -42,7 +40,6 @@ import org.apache.lucene.util.CharsRefBu
import org.apache.lucene.util.IOUtils;
import org.apache.lucene.util.RamUsageEstimator;
import org.apache.lucene.util.StringHelper;
-import org.apache.lucene.util.UnicodeUtil;
import static org.apache.lucene.codecs.simpletext.SimpleTextStoredFieldsWriter.*;
@@ -215,11 +212,6 @@ public class SimpleTextStoredFieldsReade
}
@Override
- public Iterable<? extends Accountable> getChildResources() {
- return Collections.emptyList();
- }
-
- @Override
public String toString() {
return getClass().getSimpleName();
}
Modified: lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java?rev=1642229&r1=1642228&r2=1642229&view=diff
==============================================================================
--- lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java (original)
+++ lucene/dev/branches/lucene6005/lucene/codecs/src/java/org/apache/lucene/codecs/simpletext/SimpleTextTermVectorsReader.java Thu Nov 27 20:41:01 2014
@@ -38,7 +38,6 @@ import org.apache.lucene.store.ChecksumI
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.IndexInput;
-import org.apache.lucene.util.Accountable;
import org.apache.lucene.util.ArrayUtil;
import org.apache.lucene.util.Bits;
import org.apache.lucene.util.BytesRef;
@@ -551,11 +550,6 @@ public class SimpleTextTermVectorsReader
public long ramBytesUsed() {
return BASE_RAM_BYTES_USED + RamUsageEstimator.sizeOf(offsets);
}
-
- @Override
- public Iterable<? extends Accountable> getChildResources() {
- return Collections.emptyList();
- }
@Override
public String toString() {