1519ed34bc6eb9834ffa6c13b1b122e4825831a2 - lucene

commit	1519ed34bc6eb9834ffa6c13b1b122e4825831a2	[log] [tgz]
author	Michael McCandless <mikemccand@apache.org>	Wed Aug 17 22:49:16 2011 +0000
committer	Michael McCandless <mikemccand@apache.org>	Wed Aug 17 22:49:16 2011 +0000
tree	bc4788c9c61c612d5e33cb4fa2168895e5b92f8a
parent	0f19d46a2e2a17a5e12103ca3af0d11a99e17675 [diff]

LUCENE-2308: more merging

git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/branches/fieldtype_conflicted@1158958 13f79535-47bb-0310-9956-ffa450edef68

lucene/contrib/demo/src/java/org/apache/lucene/demo/IndexFiles.java[diff]
lucene/contrib/highlighter/src/test/org/apache/lucene/search/vectorhighlight/AbstractTestCase.java[diff]
lucene/contrib/memory/src/java/org/apache/lucene/index/memory/MemoryIndex.java[diff]
lucene/contrib/misc/src/java/org/apache/lucene/document/FieldSelectorVisitor.java[diff]
lucene/contrib/misc/src/test/org/apache/lucene/index/TestIndexSplitter.java[diff]
lucene/contrib/misc/src/test/org/apache/lucene/index/TestNRTManager.java[diff]
lucene/contrib/misc/src/test/org/apache/lucene/index/TestPKIndexSplitter.java[diff]
lucene/contrib/queries/src/test/org/apache/lucene/search/BooleanFilterTest.java[diff]
lucene/contrib/queries/src/test/org/apache/lucene/search/DuplicateFilterTest.java[diff]
lucene/contrib/queries/src/test/org/apache/lucene/search/FuzzyLikeThisQueryTest.java[diff]
lucene/contrib/queries/src/test/org/apache/lucene/search/TermsFilterTest.java[diff]
lucene/contrib/xml-query-parser/src/test/org/apache/lucene/xmlparser/TestParser.java[diff]
lucene/src/java/org/apache/lucene/document/AbstractField.java[diff]
lucene/src/java/org/apache/lucene/index/DocumentStoredFieldVisitor.java[diff]
lucene/src/test-framework/org/apache/lucene/index/DocHelper.java[diff]
lucene/src/test/org/apache/lucene/index/TestFieldsReader.java[diff]
lucene/src/test/org/apache/lucene/index/TestIndexWriterWithThreads.java[diff]
lucene/src/test/org/apache/lucene/index/TestUniqueTermCount.java[diff]
lucene/src/test/org/apache/lucene/index/codecs/pulsing/Test10KPulsings.java[diff]
lucene/src/test/org/apache/lucene/index/values/TestDocValuesIndexing.java[diff]
lucene/src/test/org/apache/lucene/search/TestDocValuesScoring.java[diff]
lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery32.java[diff]
lucene/src/test/org/apache/lucene/search/TestNumericRangeQuery64.java[diff]
lucene/src/test/org/apache/lucene/search/TestSimilarity.java[diff]
lucene/src/test/org/apache/lucene/search/TestSort.java[diff]
lucene/src/test/org/apache/lucene/search/TestTopDocsMerge.java[diff]
lucene/src/test/org/apache/lucene/search/payloads/TestPayloadTermQuery.java[diff]
modules/facet/src/examples/org/apache/lucene/facet/example/association/AssociationIndexer.java[diff]
modules/facet/src/examples/org/apache/lucene/facet/example/multiCL/MultiCLIndexer.java[diff]
modules/facet/src/examples/org/apache/lucene/facet/example/simple/SimpleIndexer.java[diff]
modules/facet/src/java/org/apache/lucene/facet/index/CategoryDocumentBuilder.java[diff]
modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/Consts.java[diff]
modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyReader.java[diff]
modules/facet/src/java/org/apache/lucene/facet/taxonomy/lucene/LuceneTaxonomyWriter.java[diff]
modules/facet/src/test/org/apache/lucene/facet/FacetTestBase.java[diff]
modules/facet/src/test/org/apache/lucene/facet/FacetTestUtils.java[diff]
modules/facet/src/test/org/apache/lucene/facet/search/CategoryListIteratorTest.java[diff]
modules/facet/src/test/org/apache/lucene/facet/search/DrillDownTest.java[diff]
modules/facet/src/test/org/apache/lucene/facet/search/TestTopKInEachNodeResultHandler.java[diff]
modules/facet/src/test/org/apache/lucene/facet/util/TestScoredDocIDsUtils.java[diff]
modules/grouping/src/test/org/apache/lucene/search/grouping/TermAllGroupHeadsCollectorTest.java[diff]
modules/grouping/src/test/org/apache/lucene/search/grouping/TestGrouping.java[diff]
modules/join/src/test/org/apache/lucene/search/TestBlockJoin.java[diff]
modules/queries/src/java/org/apache/lucene/queries/mlt/MoreLikeThis.java[diff]
modules/queries/src/test/org/apache/lucene/queries/function/FunctionTestSetup.java[diff]
modules/queryparser/src/test/org/apache/lucene/queryparser/flexible/standard/TestNumericQueryParser.java[diff]
modules/suggest/src/java/org/apache/lucene/search/spell/SpellChecker.java[diff]
modules/suggest/src/test/org/apache/lucene/search/spell/TestDirectSpellChecker.java[diff]
solr/contrib/dataimporthandler/src/java/org/apache/solr/handler/dataimport/DataImportHandler.java[diff]
solr/core/src/java/org/apache/solr/core/RequestHandlers.java[diff]
solr/core/src/java/org/apache/solr/core/SolrCore.java[diff]
solr/core/src/java/org/apache/solr/handler/BinaryUpdateRequestHandler.java[diff]
solr/core/src/java/org/apache/solr/handler/CSVRequestHandler.java[diff]
solr/core/src/java/org/apache/solr/handler/DocumentAnalysisRequestHandler.java[diff]
solr/core/src/java/org/apache/solr/handler/DumpRequestHandler.java[diff]
solr/core/src/java/org/apache/solr/handler/FieldAnalysisRequestHandler.java[diff]
solr/core/src/java/org/apache/solr/handler/JsonUpdateRequestHandler.java[diff]
solr/core/src/java/org/apache/solr/handler/MoreLikeThisHandler.java[diff]
solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java[diff]
solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java[diff]
solr/core/src/java/org/apache/solr/handler/StandardRequestHandler.java[diff]
solr/core/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java[diff]
solr/core/src/java/org/apache/solr/handler/admin/AdminHandlers.java[diff]
solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java[diff]
solr/core/src/java/org/apache/solr/handler/admin/LukeRequestHandler.java[diff]
solr/core/src/java/org/apache/solr/handler/admin/PluginInfoHandler.java[diff]
solr/core/src/java/org/apache/solr/handler/admin/PropertiesRequestHandler.java[diff]
solr/core/src/java/org/apache/solr/handler/admin/ShowFileRequestHandler.java[diff]
solr/core/src/java/org/apache/solr/handler/admin/SolrInfoMBeanHandler.java[diff]
solr/core/src/java/org/apache/solr/handler/admin/SystemInfoHandler.java[diff]
solr/core/src/java/org/apache/solr/handler/admin/ThreadDumpHandler.java[diff]
solr/core/src/java/org/apache/solr/handler/component/DebugComponent.java[diff]
solr/core/src/java/org/apache/solr/handler/component/FacetComponent.java[diff]
solr/core/src/java/org/apache/solr/handler/component/HighlightComponent.java[diff]
solr/core/src/java/org/apache/solr/handler/component/MoreLikeThisComponent.java[diff]
solr/core/src/java/org/apache/solr/handler/component/PivotFacetHelper.java[diff]
solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java[diff]
solr/core/src/java/org/apache/solr/handler/component/QueryElevationComponent.java[diff]
solr/core/src/java/org/apache/solr/handler/component/SearchHandler.java[diff]
solr/core/src/java/org/apache/solr/handler/component/SpellCheckComponent.java[diff]
solr/core/src/java/org/apache/solr/handler/component/StatsComponent.java[diff]
solr/core/src/java/org/apache/solr/handler/component/TermVectorComponent.java[diff]
solr/core/src/java/org/apache/solr/handler/component/TermsComponent.java[diff]
solr/core/src/java/org/apache/solr/highlight/DefaultEncoder.java[diff]
solr/core/src/java/org/apache/solr/highlight/GapFragmenter.java[diff]
solr/core/src/java/org/apache/solr/highlight/HtmlEncoder.java[diff]
solr/core/src/java/org/apache/solr/highlight/HtmlFormatter.java[diff]
solr/core/src/java/org/apache/solr/highlight/RegexFragmenter.java[diff]
solr/core/src/java/org/apache/solr/highlight/ScoreOrderFragmentsBuilder.java[diff]
solr/core/src/java/org/apache/solr/highlight/SimpleFragListBuilder.java[diff]
solr/core/src/java/org/apache/solr/highlight/SimpleFragmentsBuilder.java[diff]
solr/core/src/java/org/apache/solr/highlight/SingleFragListBuilder.java[diff]
solr/core/src/java/org/apache/solr/response/JSONResponseWriter.java[diff]
solr/core/src/java/org/apache/solr/response/TextResponseWriter.java[diff]
solr/core/src/java/org/apache/solr/schema/BCDIntField.java[diff]
solr/core/src/java/org/apache/solr/schema/BoolField.java[diff]
solr/core/src/java/org/apache/solr/schema/ByteField.java[diff]
solr/core/src/java/org/apache/solr/schema/DateField.java[diff]
solr/core/src/java/org/apache/solr/schema/DoubleField.java[diff]
solr/core/src/java/org/apache/solr/schema/ExternalFileField.java[diff]
solr/core/src/java/org/apache/solr/schema/FieldType.java[diff]
solr/core/src/java/org/apache/solr/schema/FloatField.java[diff]
solr/core/src/java/org/apache/solr/schema/GeoHashField.java[diff]
solr/core/src/java/org/apache/solr/schema/IntField.java[diff]
solr/core/src/java/org/apache/solr/schema/LatLonType.java[diff]
solr/core/src/java/org/apache/solr/schema/LongField.java[diff]
solr/core/src/java/org/apache/solr/schema/PointType.java[diff]
solr/core/src/java/org/apache/solr/schema/ShortField.java[diff]
solr/core/src/java/org/apache/solr/schema/SortableDoubleField.java[diff]
solr/core/src/java/org/apache/solr/schema/SortableFloatField.java[diff]
solr/core/src/java/org/apache/solr/schema/SortableIntField.java[diff]
solr/core/src/java/org/apache/solr/schema/SortableLongField.java[diff]
solr/core/src/java/org/apache/solr/schema/TrieField.java[diff]
solr/core/src/java/org/apache/solr/search/FastLRUCache.java[diff]
solr/core/src/java/org/apache/solr/search/Grouping.java[diff]
solr/core/src/java/org/apache/solr/search/LRUCache.java[diff]
solr/core/src/java/org/apache/solr/search/SolrFieldCacheMBean.java[diff]
solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java[diff]
solr/core/src/java/org/apache/solr/search/function/FileFloatSource.java[diff]
solr/core/src/java/org/apache/solr/update/AddUpdateCommand.java[diff]
solr/core/src/java/org/apache/solr/update/DirectUpdateHandler2.java[diff]
solr/core/src/java/org/apache/solr/update/UpdateHandler.java[diff]
solr/core/src/test/org/apache/solr/BasicFunctionalityTest.java[diff]
solr/core/src/test/org/apache/solr/schema/PolyFieldTest.java[diff]
solr/core/src/test/org/apache/solr/update/DirectUpdateHandlerOptimizeTest.java[diff]
solr/core/src/test/org/apache/solr/update/TestIndexingPerformance.java[diff]

126 files changed

tree: bc4788c9c61c612d5e33cb4fa2168895e5b92f8a

dev-tools/
lucene/
modules/
solr/
.gitignore
.hgignore
build.xml
README.txt