You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ma...@apache.org on 2011/11/26 02:03:19 UTC
svn commit: r1206387 [1/5] - in /lucene/dev/branches/solrcloud: ./
dev-tools/idea/.idea/ dev-tools/idea/lucene/contrib/
dev-tools/maven/lucene/contrib/demo/
dev-tools/maven/lucene/contrib/highlighter/
dev-tools/maven/lucene/contrib/memory/ dev-tools/ma...
Author: markrmiller
Date: Sat Nov 26 01:03:02 2011
New Revision: 1206387
URL: http://svn.apache.org/viewvc?rev=1206387&view=rev
Log:
merge up to r1206270
Added:
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/values/BytesRefUtils.java
- copied unchanged from r1206385, lucene/dev/trunk/lucene/src/java/org/apache/lucene/index/values/BytesRefUtils.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/FieldCacheDocIdSet.java
- copied unchanged from r1206385, lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FieldCacheDocIdSet.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/FieldValueFilter.java
- copied unchanged from r1206385, lucene/dev/trunk/lucene/src/java/org/apache/lucene/search/FieldValueFilter.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestFieldValueFilter.java
- copied unchanged from r1206385, lucene/dev/trunk/lucene/src/test/org/apache/lucene/search/TestFieldValueFilter.java
lucene/dev/branches/solrcloud/modules/facet/docs/prettify.css
- copied unchanged from r1206385, lucene/dev/trunk/modules/facet/docs/prettify.css
lucene/dev/branches/solrcloud/modules/facet/docs/prettify.js
- copied unchanged from r1206385, lucene/dev/trunk/modules/facet/docs/prettify.js
lucene/dev/branches/solrcloud/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/
- copied from r1206385, lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/
lucene/dev/branches/solrcloud/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupHeadsCollector.java
- copied unchanged from r1206385, lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupHeadsCollector.java
lucene/dev/branches/solrcloud/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupsCollector.java
- copied unchanged from r1206385, lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVAllGroupsCollector.java
lucene/dev/branches/solrcloud/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVFirstPassGroupingCollector.java
- copied unchanged from r1206385, lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVFirstPassGroupingCollector.java
lucene/dev/branches/solrcloud/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVSecondPassGroupingCollector.java
- copied unchanged from r1206385, lucene/dev/trunk/modules/grouping/src/java/org/apache/lucene/search/grouping/dv/DVSecondPassGroupingCollector.java
lucene/dev/branches/solrcloud/solr/core/src/test-files/solr/conf/schema-folding.xml
- copied unchanged from r1206385, lucene/dev/trunk/solr/core/src/test-files/solr/conf/schema-folding.xml
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/schema/MultiTermTest.java
- copied unchanged from r1206385, lucene/dev/trunk/solr/core/src/test/org/apache/solr/schema/MultiTermTest.java
lucene/dev/branches/solrcloud/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java
- copied unchanged from r1206385, lucene/dev/trunk/solr/core/src/test/org/apache/solr/search/TestFoldingMultitermQuery.java
lucene/dev/branches/solrcloud/solr/site-src/src/documentation/content/xdocs/images/as3ess_book.jpg
- copied unchanged from r1206385, lucene/dev/trunk/solr/site-src/src/documentation/content/xdocs/images/as3ess_book.jpg
lucene/dev/branches/solrcloud/solr/site/images/as3ess_book.jpg
- copied unchanged from r1206385, lucene/dev/trunk/solr/site/images/as3ess_book.jpg
lucene/dev/branches/solrcloud/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java
- copied unchanged from r1206385, lucene/dev/trunk/solr/solrj/src/test/org/apache/solr/client/solrj/embedded/SolrExampleStreamingBinaryTest.java
Removed:
lucene/dev/branches/solrcloud/solr/client/ruby/
Modified:
lucene/dev/branches/solrcloud/ (props changed)
lucene/dev/branches/solrcloud/build.xml
lucene/dev/branches/solrcloud/dev-tools/idea/.idea/ant.xml
lucene/dev/branches/solrcloud/dev-tools/idea/.idea/modules.xml
lucene/dev/branches/solrcloud/dev-tools/idea/.idea/workspace.xml
lucene/dev/branches/solrcloud/dev-tools/idea/lucene/contrib/ (props changed)
lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/demo/pom.xml.template
lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template
lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/memory/pom.xml.template
lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/misc/pom.xml.template
lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/sandbox/pom.xml.template
lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/spatial/pom.xml.template
lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/common/pom.xml.template
lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/icu/pom.xml.template
lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/morfologik/pom.xml.template
lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/phonetic/pom.xml.template
lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/smartcn/pom.xml.template
lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/stempel/pom.xml.template
lucene/dev/branches/solrcloud/dev-tools/maven/modules/benchmark/pom.xml.template
lucene/dev/branches/solrcloud/dev-tools/maven/modules/facet/pom.xml.template
lucene/dev/branches/solrcloud/dev-tools/maven/modules/grouping/pom.xml.template
lucene/dev/branches/solrcloud/dev-tools/maven/modules/join/pom.xml.template
lucene/dev/branches/solrcloud/dev-tools/maven/modules/queries/pom.xml.template
lucene/dev/branches/solrcloud/dev-tools/maven/modules/queryparser/pom.xml.template
lucene/dev/branches/solrcloud/dev-tools/maven/modules/suggest/pom.xml.template
lucene/dev/branches/solrcloud/dev-tools/maven/solr/test-framework/pom.xml.template
lucene/dev/branches/solrcloud/dev-tools/scripts/smokeTestRelease.py
lucene/dev/branches/solrcloud/lucene/ (props changed)
lucene/dev/branches/solrcloud/lucene/CHANGES.txt
lucene/dev/branches/solrcloud/lucene/build.xml
lucene/dev/branches/solrcloud/lucene/contrib/CHANGES.txt
lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java
lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java
lucene/dev/branches/solrcloud/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/misc/TermStats.java
lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java
lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/test/org/apache/lucene/sandbox/queries/regex/TestSpanRegexQuery.java (props changed)
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/document/IndexDocValuesField.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/AutomatonTermsEnum.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/BufferedDeletesStream.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/CheckIndex.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocTermOrds.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/MultiTermsEnum.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/PrefixCodedTerms.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/BlockTreeTermsWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultTermVectorsReader.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/DefaultTermVectorsWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/FixedGapTermsIndexWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/VariableGapTermsIndexWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/Lucene3xFields.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/TermBuffer.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/lucene3x/TermInfosReaderIndex.java (props changed)
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/memory/MemoryPostingsFormat.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/pulsing/PulsingPostingsWriter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/values/IndexDocValuesArray.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/values/PackedIntValues.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/values/SortedBytesMergeUtils.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/FieldCacheRangeFilter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/FieldCacheTermsFilter.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/FuzzyTermsEnum.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/search/TopTermsRewrite.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/store/MMapDirectory.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/BytesRef.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/CharsRef.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/FixedBitSet.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/IntsRef.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/Version.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/fst/Builder.java
lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/util/mutable/MutableValueStr.java
lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/analysis/CollationTestBase.java
lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/index/codecs/preflexrw/TermInfosWriter.java
lucene/dev/branches/solrcloud/lucene/src/test-framework/java/org/apache/lucene/util/automaton/DaciukMihovAutomatonBuilder.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/Test2BTerms.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestDocumentsWriterDeleteQueue.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestIndexWriterUnicode.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestTermsEnum.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/TestTermsEnum2.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/codecs/lucene3x/TestSurrogates.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/values/TestDocValues.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/index/values/TestTypePromotion.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/FieldCacheRewriteMethod.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/store/TestMultiMMap.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/util/TestByteBlockPool.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/util/TestBytesRefHash.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/util/TestCharsRef.java
lucene/dev/branches/solrcloud/lucene/src/test/org/apache/lucene/util/fst/TestFSTs.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/query/QueryAutoStopWordAnalyzer.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymFilter.java
lucene/dev/branches/solrcloud/modules/analysis/common/src/java/org/apache/lucene/analysis/synonym/SynonymMap.java
lucene/dev/branches/solrcloud/modules/benchmark/ (props changed)
lucene/dev/branches/solrcloud/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/PerfRunData.java
lucene/dev/branches/solrcloud/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/ContentItemsSource.java
lucene/dev/branches/solrcloud/modules/benchmark/src/java/org/apache/lucene/benchmark/byTask/feeds/DocMaker.java
lucene/dev/branches/solrcloud/modules/benchmark/src/test/org/apache/lucene/benchmark/byTask/feeds/LineDocSourceTest.java
lucene/dev/branches/solrcloud/modules/facet/ (props changed)
lucene/dev/branches/solrcloud/modules/facet/docs/userguide.html
lucene/dev/branches/solrcloud/modules/grouping/CHANGES.txt
lucene/dev/branches/solrcloud/modules/grouping/src/java/org/apache/lucene/search/grouping/package.html
lucene/dev/branches/solrcloud/modules/grouping/src/java/org/apache/lucene/search/grouping/term/TermAllGroupHeadsCollector.java
lucene/dev/branches/solrcloud/modules/grouping/src/java/org/apache/lucene/search/grouping/term/TermFirstPassGroupingCollector.java
lucene/dev/branches/solrcloud/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupHeadsCollectorTest.java
lucene/dev/branches/solrcloud/modules/grouping/src/test/org/apache/lucene/search/grouping/AllGroupsCollectorTest.java
lucene/dev/branches/solrcloud/modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java
lucene/dev/branches/solrcloud/modules/queries/src/java/org/apache/lucene/queries/TermsFilter.java
lucene/dev/branches/solrcloud/modules/queries/src/java/org/apache/lucene/queries/function/DocValues.java
lucene/dev/branches/solrcloud/modules/queries/src/java/org/apache/lucene/queries/function/docvalues/StringIndexDocValues.java
lucene/dev/branches/solrcloud/modules/queries/src/java/org/apache/lucene/queries/function/valuesource/LiteralValueSource.java
lucene/dev/branches/solrcloud/modules/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java
lucene/dev/branches/solrcloud/modules/queryparser/src/java/org/apache/lucene/queryparser/classic/QueryParserBase.java
lucene/dev/branches/solrcloud/modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/SpanOrTermsBuilder.java
lucene/dev/branches/solrcloud/modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsFilterBuilder.java
lucene/dev/branches/solrcloud/modules/queryparser/src/java/org/apache/lucene/queryparser/xml/builders/TermsQueryBuilder.java
lucene/dev/branches/solrcloud/modules/queryparser/src/test/org/apache/lucene/queryparser/xml/builders/TestNumericRangeFilterBuilder.java (props changed)
lucene/dev/branches/solrcloud/modules/suggest/src/java/org/apache/lucene/search/spell/DirectSpellChecker.java
lucene/dev/branches/solrcloud/modules/suggest/src/java/org/apache/lucene/search/spell/HighFrequencyDictionary.java
lucene/dev/branches/solrcloud/modules/suggest/src/java/org/apache/lucene/search/spell/LuceneDictionary.java
lucene/dev/branches/solrcloud/modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java
lucene/dev/branches/solrcloud/solr/ (props changed)
lucene/dev/branches/solrcloud/solr/CHANGES.txt (contents, props changed)
lucene/dev/branches/solrcloud/solr/LICENSE.txt (props changed)
lucene/dev/branches/solrcloud/solr/NOTICE.txt (props changed)
lucene/dev/branches/solrcloud/solr/README.txt (props changed)
lucene/dev/branches/solrcloud/solr/build.xml (contents, props changed)
lucene/dev/branches/solrcloud/solr/client/ (props changed)
lucene/dev/branches/solrcloud/solr/common-build.xml (props changed)
lucene/dev/branches/solrcloud/solr/contrib/ (props changed)
lucene/dev/branches/solrcloud/solr/contrib/analysis-extras/src/java/org/apache/solr/schema/ICUCollationField.java
lucene/dev/branches/solrcloud/solr/contrib/clustering/CHANGES.txt
lucene/dev/branches/solrcloud/solr/contrib/clustering/src/test-files/ (props changed)
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler-extras/src/java/ (props changed)
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/java/ (props changed)
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/test-files/ (props changed)
lucene/dev/branches/solrcloud/solr/contrib/dataimporthandler/src/test/org/ (props changed)
lucene/dev/branches/solrcloud/solr/contrib/extraction/CHANGES.txt
lucene/dev/branches/solrcloud/solr/contrib/langid/CHANGES.txt
lucene/dev/branches/solrcloud/solr/contrib/uima/CHANGES.txt
lucene/dev/branches/solrcloud/solr/contrib/uima/src/java/ (props changed)
lucene/dev/branches/solrcloud/solr/contrib/uima/src/test-files/ (props changed)
lucene/dev/branches/solrcloud/solr/core/ (props changed)
lucene/dev/branches/solrcloud/solr/core/src/java/ (props changed)
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/AnalysisRequestHandlerBase.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/request/PerSegmentSingleValuedFaceting.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/request/SimpleFacets.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/request/UnInvertedField.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/schema/BoolField.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/schema/CollationField.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/schema/DateField.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/schema/FieldProperties.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/schema/FieldType.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/schema/FieldTypePluginLoader.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/schema/SchemaField.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/schema/SortableDoubleField.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/schema/SortableFloatField.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/schema/SortableIntField.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/schema/SortableLongField.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/schema/TextField.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/search/SolrQueryParser.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/search/TermQParserPlugin.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java
lucene/dev/branches/solrcloud/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/TopGroupsResultTransformer.java
lucene/dev/branches/solrcloud/solr/core/src/test/ (props changed)
lucene/dev/branches/solrcloud/solr/dev-tools/ (props changed)
lucene/dev/branches/solrcloud/solr/example/ (props changed)
lucene/dev/branches/solrcloud/solr/example/solr/conf/schema.xml
lucene/dev/branches/solrcloud/solr/example/solr/conf/solrconfig.xml
lucene/dev/branches/solrcloud/solr/lib/ (props changed)
lucene/dev/branches/solrcloud/solr/scripts/ (props changed)
lucene/dev/branches/solrcloud/solr/site/ (props changed)
lucene/dev/branches/solrcloud/solr/site-src/ (props changed)
lucene/dev/branches/solrcloud/solr/site-src/src/documentation/content/xdocs/index.xml
lucene/dev/branches/solrcloud/solr/site-src/src/documentation/skinconf.xml
lucene/dev/branches/solrcloud/solr/site/features.html
lucene/dev/branches/solrcloud/solr/site/features.pdf
lucene/dev/branches/solrcloud/solr/site/index.html
lucene/dev/branches/solrcloud/solr/site/index.pdf
lucene/dev/branches/solrcloud/solr/site/issue_tracking.html
lucene/dev/branches/solrcloud/solr/site/issue_tracking.pdf
lucene/dev/branches/solrcloud/solr/site/linkmap.html
lucene/dev/branches/solrcloud/solr/site/linkmap.pdf
lucene/dev/branches/solrcloud/solr/site/mailing_lists.html
lucene/dev/branches/solrcloud/solr/site/mailing_lists.pdf
lucene/dev/branches/solrcloud/solr/site/skin/basic.css
lucene/dev/branches/solrcloud/solr/site/skin/print.css
lucene/dev/branches/solrcloud/solr/site/skin/profile.css
lucene/dev/branches/solrcloud/solr/site/skin/screen.css
lucene/dev/branches/solrcloud/solr/site/tutorial.html
lucene/dev/branches/solrcloud/solr/site/tutorial.pdf
lucene/dev/branches/solrcloud/solr/site/version_control.html
lucene/dev/branches/solrcloud/solr/site/version_control.pdf
lucene/dev/branches/solrcloud/solr/solrj/ (props changed)
lucene/dev/branches/solrcloud/solr/solrj/src/java/ (props changed)
lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/client/solrj/impl/StreamingUpdateSolrServer.java
lucene/dev/branches/solrcloud/solr/solrj/src/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java
lucene/dev/branches/solrcloud/solr/solrj/src/test/org/apache/solr/client/ (props changed)
lucene/dev/branches/solrcloud/solr/solrj/src/test/org/apache/solr/client/solrj/ (props changed)
lucene/dev/branches/solrcloud/solr/solrj/src/test/org/apache/solr/client/solrj/request/TestUpdateRequestCodec.java
lucene/dev/branches/solrcloud/solr/solrj/src/test/org/apache/solr/common/ (props changed)
lucene/dev/branches/solrcloud/solr/test-framework/ (props changed)
lucene/dev/branches/solrcloud/solr/testlogging.properties (props changed)
lucene/dev/branches/solrcloud/solr/webapp/ (props changed)
lucene/dev/branches/solrcloud/solr/webapp/web/admin/analysis.jsp
Modified: lucene/dev/branches/solrcloud/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/build.xml?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/build.xml (original)
+++ lucene/dev/branches/solrcloud/build.xml Sat Nov 26 01:03:02 2011
@@ -27,6 +27,15 @@
</subant>
</sequential>
</target>
+ <target name="javadocs" description="Generate Lucene and Solr javadocs">
+ <sequential>
+ <subant target="javadocs" inheritall="false" failonerror="true">
+ <fileset dir="lucene" includes="build.xml" />
+ <fileset dir="modules" includes="build.xml" />
+ <fileset dir="solr" includes="build.xml" />
+ </subant>
+ </sequential>
+ </target>
<target name="validate" description="Validate dependencies, licenses, etc.">
<sequential><subant target="validate" inheritall="false" failonerror="true">
<fileset dir="lucene" includes="build.xml" />
Modified: lucene/dev/branches/solrcloud/dev-tools/idea/.idea/ant.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/idea/.idea/ant.xml?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/idea/.idea/ant.xml (original)
+++ lucene/dev/branches/solrcloud/dev-tools/idea/.idea/ant.xml Sat Nov 26 01:03:02 2011
@@ -5,7 +5,6 @@
<buildFile url="file://$PROJECT_DIR$/lucene/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/demo/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/highlighter/build.xml" />
- <buildFile url="file://$PROJECT_DIR$/lucene/contrib/instantiated/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/memory/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/misc/build.xml" />
<buildFile url="file://$PROJECT_DIR$/lucene/contrib/queries/build.xml" />
Modified: lucene/dev/branches/solrcloud/dev-tools/idea/.idea/modules.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/idea/.idea/modules.xml?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/idea/.idea/modules.xml (original)
+++ lucene/dev/branches/solrcloud/dev-tools/idea/.idea/modules.xml Sat Nov 26 01:03:02 2011
@@ -6,7 +6,6 @@
<module filepath="$PROJECT_DIR$/lucene/lucene.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/demo/demo.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/highlighter/highlighter.iml" />
- <module filepath="$PROJECT_DIR$/lucene/contrib/instantiated/instantiated.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/memory/memory.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/misc/misc.iml" />
<module filepath="$PROJECT_DIR$/lucene/contrib/spatial/spatial.iml" />
Modified: lucene/dev/branches/solrcloud/dev-tools/idea/.idea/workspace.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/idea/.idea/workspace.xml?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/idea/.idea/workspace.xml (original)
+++ lucene/dev/branches/solrcloud/dev-tools/idea/.idea/workspace.xml Sat Nov 26 01:03:02 2011
@@ -81,13 +81,6 @@
<option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <configuration default="false" name="instantiated contrib" type="JUnit" factoryName="JUnit">
- <module name="instantiated" />
- <option name="TEST_OBJECT" value="package" />
- <option name="WORKING_DIRECTORY" value="file://$PROJECT_DIR$/lucene/build/contrib/instantiated" />
- <option name="VM_PARAMETERS" value="-ea -DtempDir=temp" />
- <option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
- </configuration>
<configuration default="false" name="join module" type="JUnit" factoryName="JUnit">
<module name="join" />
<option name="TEST_OBJECT" value="package" />
@@ -207,7 +200,7 @@
<option name="VM_PARAMETERS" value="-ea" />
<option name="TEST_SEARCH_SCOPE"><value defaultName="singleModule" /></option>
</configuration>
- <list size="29">
+ <list size="28">
<item index="0" class="java.lang.String" itemvalue="JUnit.analysis-extras contrib" />
<item index="1" class="java.lang.String" itemvalue="JUnit.benchmark module" />
<item index="2" class="java.lang.String" itemvalue="JUnit.clustering contrib" />
@@ -219,24 +212,23 @@
<item index="8" class="java.lang.String" itemvalue="JUnit.grouping module" />
<item index="9" class="java.lang.String" itemvalue="JUnit.highlighter contrib" />
<item index="10" class="java.lang.String" itemvalue="JUnit.icu analysis module" />
- <item index="11" class="java.lang.String" itemvalue="JUnit.instantiated contrib" />
- <item index="12" class="java.lang.String" itemvalue="JUnit.join module" />
- <item index="13" class="java.lang.String" itemvalue="JUnit.langid contrib" />
- <item index="14" class="java.lang.String" itemvalue="JUnit.lucene" />
- <item index="15" class="java.lang.String" itemvalue="JUnit.memory contrib" />
- <item index="16" class="java.lang.String" itemvalue="JUnit.misc contrib" />
- <item index="17" class="java.lang.String" itemvalue="JUnit.morfologik analysis module" />
- <item index="18" class="java.lang.String" itemvalue="JUnit.phonetic analysis module" />
- <item index="19" class="java.lang.String" itemvalue="JUnit.queries module" />
- <item index="20" class="java.lang.String" itemvalue="JUnit.queryparser module" />
- <item index="21" class="java.lang.String" itemvalue="JUnit.sandbox contrib" />
- <item index="22" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
- <item index="23" class="java.lang.String" itemvalue="JUnit.solr" />
- <item index="24" class="java.lang.String" itemvalue="JUnit.spatial contrib" />
- <item index="25" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
- <item index="26" class="java.lang.String" itemvalue="JUnit.suggest module" />
- <item index="27" class="java.lang.String" itemvalue="JUnit.uima contrib" />
- <item index="28" class="java.lang.String" itemvalue="JUnit.velocity contrib" />
+ <item index="11" class="java.lang.String" itemvalue="JUnit.join module" />
+ <item index="12" class="java.lang.String" itemvalue="JUnit.langid contrib" />
+ <item index="13" class="java.lang.String" itemvalue="JUnit.lucene" />
+ <item index="14" class="java.lang.String" itemvalue="JUnit.memory contrib" />
+ <item index="15" class="java.lang.String" itemvalue="JUnit.misc contrib" />
+ <item index="16" class="java.lang.String" itemvalue="JUnit.morfologik analysis module" />
+ <item index="17" class="java.lang.String" itemvalue="JUnit.phonetic analysis module" />
+ <item index="18" class="java.lang.String" itemvalue="JUnit.queries module" />
+ <item index="19" class="java.lang.String" itemvalue="JUnit.queryparser module" />
+ <item index="20" class="java.lang.String" itemvalue="JUnit.sandbox contrib" />
+ <item index="21" class="java.lang.String" itemvalue="JUnit.smartcn analysis module" />
+ <item index="22" class="java.lang.String" itemvalue="JUnit.solr" />
+ <item index="23" class="java.lang.String" itemvalue="JUnit.spatial contrib" />
+ <item index="24" class="java.lang.String" itemvalue="JUnit.stempel analysis module" />
+ <item index="25" class="java.lang.String" itemvalue="JUnit.suggest module" />
+ <item index="26" class="java.lang.String" itemvalue="JUnit.uima contrib" />
+ <item index="27" class="java.lang.String" itemvalue="JUnit.velocity contrib" />
</list>
</component>
</project>
Modified: lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/demo/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/demo/pom.xml.template?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/demo/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/demo/pom.xml.template Sat Nov 26 01:03:02 2011
@@ -36,16 +36,17 @@
<build-directory>../../build/contrib/demo</build-directory>
</properties>
<dependencies>
- <dependency>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-test-framework</artifactId>
+ <artifactId>lucene-core</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/highlighter/pom.xml.template Sat Nov 26 01:03:02 2011
@@ -38,16 +38,17 @@
<build-directory>../../build/contrib/highlighter</build-directory>
</properties>
<dependencies>
- <dependency>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-test-framework</artifactId>
+ <artifactId>lucene-core</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/memory/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/memory/pom.xml.template?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/memory/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/memory/pom.xml.template Sat Nov 26 01:03:02 2011
@@ -38,20 +38,21 @@
<build-directory>../../build/contrib/memory</build-directory>
</properties>
<dependencies>
- <dependency>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-queryparser</artifactId>
+ <artifactId>lucene-core</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-test-framework</artifactId>
+ <artifactId>lucene-queryparser</artifactId>
<version>${project.version}</version>
<scope>test</scope>
</dependency>
Modified: lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/misc/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/misc/pom.xml.template?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/misc/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/misc/pom.xml.template Sat Nov 26 01:03:02 2011
@@ -36,16 +36,17 @@
<build-directory>../../build/contrib/misc</build-directory>
</properties>
<dependencies>
- <dependency>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-test-framework</artifactId>
+ <artifactId>lucene-core</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
<build>
Modified: lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/sandbox/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/sandbox/pom.xml.template?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/sandbox/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/sandbox/pom.xml.template Sat Nov 26 01:03:02 2011
@@ -36,16 +36,17 @@
<build-directory>../../build/contrib/sandbox</build-directory>
</properties>
<dependencies>
- <dependency>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-test-framework</artifactId>
+ <artifactId>lucene-core</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>jakarta-regexp</groupId>
Modified: lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/spatial/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/spatial/pom.xml.template?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/spatial/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/lucene/contrib/spatial/pom.xml.template Sat Nov 26 01:03:02 2011
@@ -36,7 +36,8 @@
<build-directory>../../build/contrib/spatial</build-directory>
</properties>
<dependencies>
- <dependency>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
<groupId>${project.groupId}</groupId>
<artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
Modified: lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/common/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/common/pom.xml.template?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/common/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/common/pom.xml.template Sat Nov 26 01:03:02 2011
@@ -36,16 +36,17 @@
<build-directory>../build/common</build-directory>
</properties>
<dependencies>
- <dependency>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-test-framework</artifactId>
+ <artifactId>lucene-core</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
<build>
Modified: lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/icu/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/icu/pom.xml.template?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/icu/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/icu/pom.xml.template Sat Nov 26 01:03:02 2011
@@ -39,16 +39,17 @@
<build-directory>../build/icu</build-directory>
</properties>
<dependencies>
- <dependency>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-test-framework</artifactId>
+ <artifactId>lucene-core</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/morfologik/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/morfologik/pom.xml.template?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/morfologik/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/morfologik/pom.xml.template Sat Nov 26 01:03:02 2011
@@ -38,16 +38,17 @@
<build-directory>../build/morfologik</build-directory>
</properties>
<dependencies>
- <dependency>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-test-framework</artifactId>
+ <artifactId>lucene-core</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/phonetic/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/phonetic/pom.xml.template?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/phonetic/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/phonetic/pom.xml.template Sat Nov 26 01:03:02 2011
@@ -38,16 +38,17 @@
<build-directory>../build/phonetic</build-directory>
</properties>
<dependencies>
- <dependency>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-test-framework</artifactId>
+ <artifactId>lucene-core</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/smartcn/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/smartcn/pom.xml.template?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/smartcn/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/smartcn/pom.xml.template Sat Nov 26 01:03:02 2011
@@ -36,16 +36,17 @@
<build-directory>../build/smartcn</build-directory>
</properties>
<dependencies>
- <dependency>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-test-framework</artifactId>
+ <artifactId>lucene-core</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/stempel/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/stempel/pom.xml.template?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/stempel/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/modules/analysis/stempel/pom.xml.template Sat Nov 26 01:03:02 2011
@@ -36,16 +36,17 @@
<build-directory>../build/stempel</build-directory>
</properties>
<dependencies>
- <dependency>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-test-framework</artifactId>
+ <artifactId>lucene-core</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: lucene/dev/branches/solrcloud/dev-tools/maven/modules/benchmark/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/modules/benchmark/pom.xml.template?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/modules/benchmark/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/modules/benchmark/pom.xml.template Sat Nov 26 01:03:02 2011
@@ -36,16 +36,17 @@
<build-directory>build</build-directory>
</properties>
<dependencies>
- <dependency>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-test-framework</artifactId>
+ <artifactId>lucene-core</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: lucene/dev/branches/solrcloud/dev-tools/maven/modules/facet/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/modules/facet/pom.xml.template?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/modules/facet/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/modules/facet/pom.xml.template Sat Nov 26 01:03:02 2011
@@ -38,21 +38,22 @@
<build-directory>build</build-directory>
</properties>
<dependencies>
- <dependency>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
+ <artifactId>lucene-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-test-framework</artifactId>
+ <artifactId>lucene-analyzers-common</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
<build>
Modified: lucene/dev/branches/solrcloud/dev-tools/maven/modules/grouping/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/modules/grouping/pom.xml.template?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/modules/grouping/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/modules/grouping/pom.xml.template Sat Nov 26 01:03:02 2011
@@ -36,16 +36,17 @@
<build-directory>build</build-directory>
</properties>
<dependencies>
- <dependency>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-test-framework</artifactId>
+ <artifactId>lucene-core</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
Modified: lucene/dev/branches/solrcloud/dev-tools/maven/modules/join/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/modules/join/pom.xml.template?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/modules/join/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/modules/join/pom.xml.template Sat Nov 26 01:03:02 2011
@@ -36,21 +36,22 @@
<build-directory>build</build-directory>
</properties>
<dependencies>
- <dependency>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-grouping</artifactId>
+ <artifactId>lucene-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-test-framework</artifactId>
+ <artifactId>lucene-grouping</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
<build>
Modified: lucene/dev/branches/solrcloud/dev-tools/maven/modules/queries/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/modules/queries/pom.xml.template?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/modules/queries/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/modules/queries/pom.xml.template Sat Nov 26 01:03:02 2011
@@ -36,16 +36,17 @@
<build-directory>build</build-directory>
</properties>
<dependencies>
- <dependency>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-test-framework</artifactId>
+ <artifactId>lucene-core</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
<build>
Modified: lucene/dev/branches/solrcloud/dev-tools/maven/modules/queryparser/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/modules/queryparser/pom.xml.template?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/modules/queryparser/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/modules/queryparser/pom.xml.template Sat Nov 26 01:03:02 2011
@@ -36,26 +36,27 @@
<build-directory>build</build-directory>
</properties>
<dependencies>
- <dependency>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-queries</artifactId>
+ <artifactId>lucene-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-sandbox</artifactId>
+ <artifactId>lucene-queries</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-test-framework</artifactId>
+ <artifactId>lucene-sandbox</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
<build>
Modified: lucene/dev/branches/solrcloud/dev-tools/maven/modules/suggest/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/modules/suggest/pom.xml.template?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/modules/suggest/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/modules/suggest/pom.xml.template Sat Nov 26 01:03:02 2011
@@ -36,21 +36,22 @@
<build-directory>build</build-directory>
</properties>
<dependencies>
- <dependency>
+ <dependency>
+ <!-- lucene-test-framework dependency must be declared before lucene-core -->
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-core</artifactId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-analyzers-common</artifactId>
+ <artifactId>lucene-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
- <artifactId>lucene-test-framework</artifactId>
+ <artifactId>lucene-analyzers-common</artifactId>
<version>${project.version}</version>
- <scope>test</scope>
</dependency>
</dependencies>
<build>
Modified: lucene/dev/branches/solrcloud/dev-tools/maven/solr/test-framework/pom.xml.template
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/maven/solr/test-framework/pom.xml.template?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/maven/solr/test-framework/pom.xml.template (original)
+++ lucene/dev/branches/solrcloud/dev-tools/maven/solr/test-framework/pom.xml.template Sat Nov 26 01:03:02 2011
@@ -38,13 +38,14 @@
<dependencies>
<!-- These dependencies are compile scope because this is a test framework. -->
<dependency>
- <groupId>${project.groupId}</groupId>
- <artifactId>solr-core</artifactId>
+ <!-- lucene-test-framework dependency must come before lucene-core -->
+ <groupId>org.apache.lucene</groupId>
+ <artifactId>lucene-test-framework</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
- <groupId>org.apache.lucene</groupId>
- <artifactId>lucene-test-framework</artifactId>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>solr-core</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Modified: lucene/dev/branches/solrcloud/dev-tools/scripts/smokeTestRelease.py
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/dev-tools/scripts/smokeTestRelease.py?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/dev-tools/scripts/smokeTestRelease.py (original)
+++ lucene/dev/branches/solrcloud/dev-tools/scripts/smokeTestRelease.py Sat Nov 26 01:03:02 2011
@@ -31,6 +31,7 @@ import HTMLParser
JAVA5_HOME = '/usr/local/src/jdk1.5.0_22'
JAVA6_HOME = '/usr/local/src/jdk1.6.0_21'
+JAVA7_HOME = '/usr/local/src/jdk1.7.0_01'
# TODO
# + verify KEYS contains key that signed the release
@@ -185,13 +186,27 @@ def checkSigs(project, urlString, versio
verifyDigests(artifact, urlString, tmpDir)
print ' verify sig'
- # Test sig
+ # Test sig (this is done with a clean brand-new GPG world)
download(artifact + '.asc', urlString + '.asc', tmpDir)
sigFile = '%s/%s.asc' % (tmpDir, artifact)
artifactFile = '%s/%s' % (tmpDir, artifact)
logFile = '%s/%s.%s.gpg.verify.log' % (tmpDir, project, artifact)
run('gpg --homedir %s --verify %s %s' % (gpgHomeDir, sigFile, artifactFile),
logFile)
+ # Forward any GPG warnings, except the expected one (since its a clean world)
+ f = open(logFile, 'rb')
+ for line in f.readlines():
+ if line.lower().find('warning') != -1 \
+ and line.find('WARNING: This key is not certified with a trusted signature') == -1:
+ print ' GPG: %s' % line.strip()
+ f.close()
+
+ # Test trust (this is done with the real users config)
+ run('gpg --import %s' % (keysFile),
+ '%s/%s.gpg.trust.import.log 2>&1' % (tmpDir, project))
+ print ' verify trust'
+ logFile = '%s/%s.%s.gpg.trust.log' % (tmpDir, project, artifact)
+ run('gpg --verify %s %s' % (sigFile, artifactFile), logFile)
# Forward any GPG warnings:
f = open(logFile, 'rb')
for line in f.readlines():
@@ -366,9 +381,41 @@ def verifyUnpacked(project, artifact, un
run('export JAVA_HOME=%s; ant test' % JAVA5_HOME, '%s/test.log' % unpackPath)
run('export JAVA_HOME=%s; ant jar' % JAVA5_HOME, '%s/compile.log' % unpackPath)
testDemo(isSrc, version)
+ # test javadocs
+ print ' generate javadocs w/ Java 5...'
+ run('export JAVA_HOME=%s; ant javadocs' % JAVA5_HOME, '%s/javadocs.log' % unpackPath)
else:
print ' run tests w/ Java 6...'
run('export JAVA_HOME=%s; ant test' % JAVA6_HOME, '%s/test.log' % unpackPath)
+
+ # test javadocs
+ print ' generate javadocs w/ Java 6...'
+ # uncomment this after 3.5.0 and delete the hack below
+ # run('export JAVA_HOME=%s; ant javadocs' % JAVA6_HOME, '%s/javadocs.log' % unpackPath)
+ os.chdir('lucene')
+ run('export JAVA_HOME=%s; ant javadocs' % JAVA6_HOME, '%s/javadocs.log' % unpackPath)
+ os.chdir(unpackPath)
+
+ os.chdir('solr')
+ run('export JAVA_HOME=%s; ant javadocs' % JAVA6_HOME, '%s/javadocs.log' % unpackPath)
+ os.chdir(unpackPath)
+ # end hackidy-hack
+
+ print ' run tests w/ Java 7...'
+ run('export JAVA_HOME=%s; ant test' % JAVA7_HOME, '%s/test.log' % unpackPath)
+
+ # test javadocs
+ print ' generate javadocs w/ Java 7...'
+ # uncomment this after 3.5.0 and delete the hack below
+ # run('export JAVA_HOME=%s; ant javadocs' % JAVA7_HOME, '%s/javadocs.log' % unpackPath)
+ os.chdir('lucene')
+ run('export JAVA_HOME=%s; ant javadocs' % JAVA7_HOME, '%s/javadocs.log' % unpackPath)
+ os.chdir(unpackPath)
+
+ os.chdir('solr')
+ run('export JAVA_HOME=%s; ant javadocs' % JAVA7_HOME, '%s/javadocs.log' % unpackPath)
+ os.chdir(unpackPath)
+ # end hackidy-hack
else:
if project == 'lucene':
testDemo(isSrc, version)
Modified: lucene/dev/branches/solrcloud/lucene/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/CHANGES.txt?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/CHANGES.txt (original)
+++ lucene/dev/branches/solrcloud/lucene/CHANGES.txt Sat Nov 26 01:03:02 2011
@@ -637,6 +637,38 @@ Bug fixes
DocsAndPositionsEnum while merging (Marc Sturlese, Erick Erickson,
Robert Muir, Simon Willnauer, Mike McCandless)
+* LUCENE-3589: BytesRef copy(short) didnt set length.
+ (Peter Chang via Robert Muir)
+
+
+======================= Lucene 3.6.0 =======================
+
+Changes in backwards compatibility policy
+
+* LUCENE-3594: The protected inner class (never intended to be visible)
+ FieldCacheTermsFilter.FieldCacheTermsFilterDocIdSet was removed and
+ replaced by another internal implementation. (Uwe Schindler)
+
+Security fixes
+
+* LUCENE-3588: Try harder to prevent SIGSEGV on cloned MMapIndexInputs:
+ Previous versions of Lucene could SIGSEGV the JVM if you try to access
+ the clone of an IndexInput retrieved from MMapDirectory. This security fix
+ prevents this as best as it can by throwing AlreadyClosedException
+ also on clones. (Uwe Schindler, Robert Muir)
+
+New Features
+
+* LUCENE-3593: Added a FieldValueFilter that accepts all documents that either
+ have at least one or no value at all in a specific field. (Simon Willnauer,
+ Uwe Schindler, Robert Muir)
+
+Bug fixes
+
+* LUCENE-3595: Fixed FieldCacheRangeFilter and FieldCacheTermsFilter
+ to correctly respect deletions on reopened SegmentReaders. Factored out
+ FieldCacheDocIdSet to be a top-level class. (Uwe Schindler, Simon Willnauer)
+
======================= Lucene 3.5.0 =======================
Changes in backwards compatibility policy
Modified: lucene/dev/branches/solrcloud/lucene/build.xml
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/build.xml?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/build.xml (original)
+++ lucene/dev/branches/solrcloud/lucene/build.xml Sat Nov 26 01:03:02 2011
@@ -86,8 +86,16 @@
description="Runs tests of a previous Lucene version.">
<sequential>
<mkdir dir="${build.dir.backwards}"/>
-
+
+ <!-- TODO: separate test-framework from core tests (because META-INF duplicates in trunk) -->
+
<!-- compile branch tests against previous version JAR file -->
+ <compile-test-macro srcdir="${backwards.dir}/src/test-framework/java" destdir="${build.dir.backwards}/classes/test"
+ test.classpath="backwards.test.compile.classpath" javac.source="${javac.source.backwards}" javac.target="${javac.target.backwards}"/>
+ <!-- Copy the resources folder (if existent) -->
+ <copy todir="${build.dir.backwards}/classes/test">
+ <fileset dir="${backwards.dir}/src/test-framework/resources" erroronmissingdir="no"/>
+ </copy>
<compile-test-macro srcdir="${backwards.dir}/src/test" destdir="${build.dir.backwards}/classes/test"
test.classpath="backwards.test.compile.classpath" javac.source="${javac.source.backwards}" javac.target="${javac.target.backwards}"/>
Modified: lucene/dev/branches/solrcloud/lucene/contrib/CHANGES.txt
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/CHANGES.txt?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/CHANGES.txt (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/CHANGES.txt Sat Nov 26 01:03:02 2011
@@ -81,6 +81,10 @@ Bug Fixes
* LUCENE-3045: fixed QueryNodeImpl.containsTag(String key) that was
not lowercasing the key before checking for the tag (Adriano Crestani)
+======================= Lucene 3.6.0 ================
+
+(No Changes)
+
======================= Lucene 3.5.0 ================
Changes in backwards compatibility policy
Modified: lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/java/org/apache/lucene/search/vectorhighlight/FieldTermStack.java Sat Nov 26 01:03:02 2011
@@ -29,6 +29,7 @@ import org.apache.lucene.index.Terms;
import org.apache.lucene.index.TermsEnum;
import org.apache.lucene.util.BytesRef;
import org.apache.lucene.util.CharsRef;
+import org.apache.lucene.util.UnicodeUtil;
/**
* <code>FieldTermStack</code> is a stack that keeps query terms in the specified field
@@ -95,7 +96,8 @@ public class FieldTermStack {
DocsAndPositionsEnum dpEnum = null;
BytesRef text;
while ((text = termsEnum.next()) != null) {
- final String term = text.utf8ToChars(spare).toString();
+ UnicodeUtil.UTF8toUTF16(text, spare);
+ final String term = spare.toString();
if (!termSet.contains(term)) {
continue;
}
Modified: lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java Sat Nov 26 01:03:02 2011
@@ -177,7 +177,7 @@ public abstract class AbstractTestCase e
while (tokenStream.incrementToken()) {
termAttribute.fillBytesRef();
- bytesRefs.add(new BytesRef(bytesRef));
+ bytesRefs.add(BytesRef.deepCopyOf(bytesRef));
}
tokenStream.end();
Modified: lucene/dev/branches/solrcloud/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java Sat Nov 26 01:03:02 2011
@@ -366,7 +366,7 @@ public class MemoryIndex {
ArrayIntList positions = terms.get(ref);
if (positions == null) { // term not seen before
positions = new ArrayIntList(stride);
- terms.put(new BytesRef(ref), positions);
+ terms.put(BytesRef.deepCopyOf(ref), positions);
}
if (stride == 1) {
positions.add(pos);
@@ -874,7 +874,7 @@ public class MemoryIndex {
public boolean seekExact(BytesRef text, boolean useCache) {
termUpto = Arrays.binarySearch(info.sortedTerms, text, termComparator);
if (termUpto >= 0) {
- br.copy(info.sortedTerms[termUpto].getKey());
+ br.copyBytes(info.sortedTerms[termUpto].getKey());
return true;
} else {
return false;
@@ -889,11 +889,11 @@ public class MemoryIndex {
if (termUpto >= info.sortedTerms.length) {
return SeekStatus.END;
} else {
- br.copy(info.sortedTerms[termUpto].getKey());
+ br.copyBytes(info.sortedTerms[termUpto].getKey());
return SeekStatus.NOT_FOUND;
}
} else {
- br.copy(info.sortedTerms[termUpto].getKey());
+ br.copyBytes(info.sortedTerms[termUpto].getKey());
return SeekStatus.FOUND;
}
}
@@ -910,7 +910,7 @@ public class MemoryIndex {
if (termUpto >= info.sortedTerms.length) {
return null;
} else {
- br.copy(info.sortedTerms[termUpto].getKey());
+ br.copyBytes(info.sortedTerms[termUpto].getKey());
return br;
}
}
Modified: lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/misc/TermStats.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/misc/TermStats.java?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/misc/TermStats.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/misc/src/java/org/apache/lucene/misc/TermStats.java Sat Nov 26 01:03:02 2011
@@ -26,13 +26,13 @@ public final class TermStats {
public long totalTermFreq;
TermStats(String field, BytesRef termtext, int df) {
- this.termtext = new BytesRef(termtext);
+ this.termtext = BytesRef.deepCopyOf(termtext);
this.field = field;
this.docFreq = df;
}
TermStats(String field, BytesRef termtext, int df, long tf) {
- this.termtext = new BytesRef(termtext);
+ this.termtext = BytesRef.deepCopyOf(termtext);
this.field = field;
this.docFreq = df;
this.totalTermFreq = tf;
Modified: lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java (original)
+++ lucene/dev/branches/solrcloud/lucene/contrib/sandbox/src/java/org/apache/lucene/sandbox/queries/FuzzyLikeThisQuery.java Sat Nov 26 01:03:02 2011
@@ -224,7 +224,7 @@ public class FuzzyLikeThisQuery extends
totalVariantDocFreqs+=fe.docFreq();
float score=boostAtt.getBoost();
if (variantsQ.size() < MAX_VARIANTS_PER_TERM || score > minScore){
- ScoreTerm st=new ScoreTerm(new Term(startTerm.field(), new BytesRef(possibleMatch)),score,startTerm);
+ ScoreTerm st=new ScoreTerm(new Term(startTerm.field(), BytesRef.deepCopyOf(possibleMatch)),score,startTerm);
variantsQ.insertWithOverflow(st);
minScore = variantsQ.top().score; // maintain minScore
}
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/analysis/NumericTokenStream.java Sat Nov 26 01:03:02 2011
@@ -186,7 +186,7 @@ public final class NumericTokenStream ex
@Override
public void reflectWith(AttributeReflector reflector) {
fillBytesRef();
- reflector.reflect(TermToBytesRefAttribute.class, "bytes", new BytesRef(bytes));
+ reflector.reflect(TermToBytesRefAttribute.class, "bytes", BytesRef.deepCopyOf(bytes));
reflector.reflect(NumericTermAttribute.class, "shift", shift);
reflector.reflect(NumericTermAttribute.class, "rawValue", getRawValue());
reflector.reflect(NumericTermAttribute.class, "valueSize", valueSize);
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/analysis/tokenattributes/CharTermAttributeImpl.java Sat Nov 26 01:03:02 2011
@@ -213,7 +213,7 @@ public class CharTermAttributeImpl exten
// Do a deep clone
t.termBuffer = new char[this.termLength];
System.arraycopy(this.termBuffer, 0, t.termBuffer, 0, this.termLength);
- t.bytes = new BytesRef(bytes);
+ t.bytes = BytesRef.deepCopyOf(bytes);
return t;
}
@@ -256,7 +256,7 @@ public class CharTermAttributeImpl exten
public void reflectWith(AttributeReflector reflector) {
reflector.reflect(CharTermAttribute.class, "term", toString());
fillBytesRef();
- reflector.reflect(TermToBytesRefAttribute.class, "bytes", new BytesRef(bytes));
+ reflector.reflect(TermToBytesRefAttribute.class, "bytes", BytesRef.deepCopyOf(bytes));
}
@Override
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/document/IndexDocValuesField.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/document/IndexDocValuesField.java?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/document/IndexDocValuesField.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/document/IndexDocValuesField.java Sat Nov 26 01:03:02 2011
@@ -246,9 +246,9 @@ public class IndexDocValuesField extends
}
setDocValuesType(type);
if (bytes == null) {
- bytes = new BytesRef(value);
+ bytes = BytesRef.deepCopyOf(value);
} else {
- bytes.copy(value);
+ bytes.copyBytes(value);
}
bytesComparator = comp;
}
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/AutomatonTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/AutomatonTermsEnum.java?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/AutomatonTermsEnum.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/AutomatonTermsEnum.java Sat Nov 26 01:03:02 2011
@@ -116,7 +116,7 @@ class AutomatonTermsEnum extends Filtere
return seekBytesRef;
}
} else {
- seekBytesRef.copy(term);
+ seekBytesRef.copyBytes(term);
}
// seek to the next possible string;
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/BufferedDeletesStream.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/BufferedDeletesStream.java?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/BufferedDeletesStream.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/BufferedDeletesStream.java Sat Nov 26 01:03:02 2011
@@ -455,7 +455,7 @@ class BufferedDeletesStream {
assert lastDeleteTerm == null || term.compareTo(lastDeleteTerm) > 0: "lastTerm=" + lastDeleteTerm + " vs term=" + term;
}
// TODO: we re-use term now in our merged iterable, but we shouldn't clone, instead copy for this assert
- lastDeleteTerm = term == null ? null : new Term(term.field(), new BytesRef(term.bytes));
+ lastDeleteTerm = term == null ? null : new Term(term.field(), BytesRef.deepCopyOf(term.bytes));
return true;
}
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/CheckIndex.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/CheckIndex.java?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/CheckIndex.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/CheckIndex.java Sat Nov 26 01:03:02 2011
@@ -726,12 +726,12 @@ public class CheckIndex {
// make sure terms arrive in order according to
// the comp
if (lastTerm == null) {
- lastTerm = new BytesRef(term);
+ lastTerm = BytesRef.deepCopyOf(term);
} else {
if (termComp.compare(lastTerm, term) >= 0) {
throw new RuntimeException("terms out of order: lastTerm=" + lastTerm + " term=" + term);
}
- lastTerm.copy(term);
+ lastTerm.copyBytes(term);
}
final int docFreq = termsEnum.docFreq();
@@ -977,7 +977,7 @@ public class CheckIndex {
for(int i=seekCount-1;i>=0;i--) {
long ord = i*(termCount/seekCount);
termsEnum.seekExact(ord);
- seekTerms[i] = new BytesRef(termsEnum.term());
+ seekTerms[i] = BytesRef.deepCopyOf(termsEnum.term());
}
// Seek by term
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocTermOrds.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocTermOrds.java?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocTermOrds.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/DocTermOrds.java Sat Nov 26 01:03:02 2011
@@ -221,7 +221,7 @@ public class DocTermOrds {
protected void uninvert(final IndexReader reader, final BytesRef termPrefix) throws IOException {
//System.out.println("DTO uninvert field=" + field + " prefix=" + termPrefix);
final long startTime = System.currentTimeMillis();
- prefix = termPrefix == null ? null : new BytesRef(termPrefix);
+ prefix = termPrefix == null ? null : BytesRef.deepCopyOf(termPrefix);
final int maxDoc = reader.maxDoc();
final int[] index = new int[maxDoc]; // immediate term numbers, or the index into the byte[] representing the last number
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/FilterIndexReader.java Sat Nov 26 01:03:02 2011
@@ -37,6 +37,11 @@ import java.util.concurrent.ConcurrentHa
* contained index reader. Subclasses of <code>FilterIndexReader</code> may
* further override some of these methods and may also provide additional
* methods and fields.
+ * <p><b>Note:</b> The default implementation of {@link FilterIndexReader#doOpenIfChanged}
+ * throws {@link UnsupportedOperationException} (like the base class),
+ * so it's not possible to reopen a <code>FilterIndexReader</code>.
+ * To reopen, you have to first reopen the underlying reader
+ * and wrap it again with the custom filter.
*/
public class FilterIndexReader extends IndexReader {
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/MultiTermsEnum.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/MultiTermsEnum.java?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/MultiTermsEnum.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/MultiTermsEnum.java Sat Nov 26 01:03:02 2011
@@ -201,7 +201,7 @@ public final class MultiTermsEnum extend
seekOpt = true;
}
- lastSeekScratch.copy(term);
+ lastSeekScratch.copyBytes(term);
lastSeek = lastSeekScratch;
for(int i=0;i<numSubs;i++) {
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/PrefixCodedTerms.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/PrefixCodedTerms.java?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/PrefixCodedTerms.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/PrefixCodedTerms.java Sat Nov 26 01:03:02 2011
@@ -111,7 +111,7 @@ class PrefixCodedTerms implements Iterab
}
output.writeVInt(suffix);
output.writeBytes(term.bytes.bytes, term.bytes.offset + prefix, suffix);
- lastTerm.bytes.copy(term.bytes);
+ lastTerm.bytes.copyBytes(term.bytes);
lastTerm.field = term.field;
} catch (IOException e) {
throw new RuntimeException(e);
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsReader.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsReader.java?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsReader.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsReader.java Sat Nov 26 01:03:02 2011
@@ -85,7 +85,7 @@ public class BlockTermsReader extends Fi
public FieldAndTerm(FieldAndTerm other) {
field = other.field;
- term = new BytesRef(other.term);
+ term = BytesRef.deepCopyOf(other.term);
}
@Override
@@ -437,7 +437,7 @@ public class BlockTermsReader extends Fi
state.ord = indexEnum.ord()-1;
}
- term.copy(indexEnum.term());
+ term.copyBytes(indexEnum.term());
//System.out.println(" seek: term=" + term.utf8ToString());
} else {
//System.out.println(" skip seek");
@@ -720,7 +720,7 @@ public class BlockTermsReader extends Fi
state.copyFrom(otherState);
seekPending = true;
indexIsCurrent = false;
- term.copy(target);
+ term.copyBytes(target);
}
@Override
@@ -757,7 +757,7 @@ public class BlockTermsReader extends Fi
state.ord = indexEnum.ord()-1;
assert state.ord >= -1: "ord=" + state.ord;
- term.copy(indexEnum.term());
+ term.copyBytes(indexEnum.term());
// Now, scan:
int left = (int) (ord - state.ord);
Modified: lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsWriter.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsWriter.java?rev=1206387&r1=1206386&r2=1206387&view=diff
==============================================================================
--- lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsWriter.java (original)
+++ lucene/dev/branches/solrcloud/lucene/src/java/org/apache/lucene/index/codecs/BlockTermsWriter.java Sat Nov 26 01:03:02 2011
@@ -225,7 +225,7 @@ public class BlockTermsWriter extends Fi
pendingTerms = newArray;
}
final TermEntry te = pendingTerms[pendingCount];
- te.term.copy(text);
+ te.term.copyBytes(text);
te.stats = stats;
pendingCount++;
@@ -312,7 +312,7 @@ public class BlockTermsWriter extends Fi
bytesWriter.reset();
postingsWriter.flushTermsBlock(pendingCount, pendingCount);
- lastPrevTerm.copy(pendingTerms[pendingCount-1].term);
+ lastPrevTerm.copyBytes(pendingTerms[pendingCount-1].term);
pendingCount = 0;
}
}