You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by cp...@apache.org on 2017/03/30 17:25:41 UTC
[72/73] [abbrv] lucene-solr:jira/solr-6203: Merge branch 'master'
into jira/solr-6203
Merge branch 'master' into jira/solr-6203
Yet To Be Resolved Conflicts:
solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/770265fb
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/770265fb
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/770265fb
Branch: refs/heads/jira/solr-6203
Commit: 770265fb33178e4002bee6c67e710cff37a46751
Parents: 2cd3f71 edafcba
Author: Christine Poerschke <cp...@apache.org>
Authored: Thu Mar 30 17:18:22 2017 +0100
Committer: Christine Poerschke <cp...@apache.org>
Committed: Thu Mar 30 17:18:22 2017 +0100
----------------------------------------------------------------------
.gitignore | 1 -
build.xml | 10 +-
dev-tools/doap/lucene.rdf | 14 +
dev-tools/doap/solr.rdf | 14 +
dev-tools/idea/.idea/ant.xml | 3 -
.../libraries/Solr_morphlines_cell_library.xml | 10 -
.../libraries/Solr_morphlines_core_library.xml | 10 -
.../Solr_morphlines_core_test_library.xml | 10 -
dev-tools/idea/.idea/modules.xml | 3 -
dev-tools/idea/.idea/workspace.xml | 37 +-
.../idea/solr/contrib/map-reduce/map-reduce.iml | 43 -
.../contrib/morphlines-cell/morphlines-cell.iml | 29 -
.../contrib/morphlines-core/morphlines-core.iml | 28 -
.../maven/solr/contrib/ltr/pom.xml.template | 10 +-
.../solr/contrib/map-reduce/pom.xml.template | 90 --
.../contrib/morphlines-cell/pom.xml.template | 90 --
.../contrib/morphlines-core/pom.xml.template | 91 --
dev-tools/maven/solr/contrib/pom.xml.template | 3 -
dev-tools/maven/solr/pom.xml.template | 9 -
dev-tools/scripts/buildAndPushRelease.py | 66 +-
dev-tools/scripts/smokeTestRelease.py | 4 +
lucene/CHANGES.txt | 99 +-
lucene/MIGRATE.txt | 14 +
.../charfilter/HTMLStripCharFilter.java | 2 +-
.../charfilter/HTMLStripCharFilter.jflex | 7 +-
.../compound/hyphenation/TernaryTree.java | 2 +-
.../lucene/analysis/shingle/ShingleFilter.java | 9 +-
.../analysis/hunspell/TestDictionary.java | 2 +-
.../miscellaneous/TestWordDelimiterFilter.java | 2 +-
.../TestWordDelimiterGraphFilter.java | 2 +-
.../payloads/NumericPayloadTokenFilterTest.java | 2 +-
.../payloads/TypeAsPayloadTokenFilterTest.java | 2 +-
.../analysis/shingle/ShingleFilterTest.java | 94 +-
.../analysis/sinks/TestTeeSinkTokenFilter.java | 4 +-
.../lucene/analysis/snowball/TestSnowball.java | 2 +-
.../standard/TestUAX29URLEmailTokenizer.java | 4 +-
.../lucene/analysis/icu/ICUTransformFilter.java | 2 +-
.../lucene/analysis/cn/smart/Utility.java | 8 +-
.../apache/lucene/index/FixBrokenOffsets.java | 10 +
.../index/TestBackwardsCompatibility.java | 55 +-
.../lucene/index/TestFixBrokenOffsets.java | 7 +-
.../lucene/index/TestIndexWriterOnOldIndex.java | 55 +
.../org/apache/lucene/index/index.6.4.2-cfs.zip | Bin 0 -> 15856 bytes
.../apache/lucene/index/index.6.4.2-nocfs.zip | Bin 0 -> 15886 bytes
.../org/apache/lucene/index/index.6.5.0-cfs.zip | Bin 0 -> 15832 bytes
.../apache/lucene/index/index.6.5.0-nocfs.zip | Bin 0 -> 15836 bytes
.../lucene/index/index.single-empty-doc.630.zip | Bin 0 -> 1363 bytes
.../apache/lucene/legacy/TestLegacyField.java | 10 -
.../byTask/feeds/EnwikiContentSource.java | 2 +-
.../benchmark/byTask/tasks/ForceMergeTask.java | 2 +-
lucene/build.xml | 6 +-
.../CachingNaiveBayesClassifierTest.java | 2 +-
.../SimpleNaiveBayesClassifierTest.java | 2 +-
.../bloom/BloomFilteringPostingsFormat.java | 8 +-
.../codecs/memory/MemoryPostingsFormat.java | 2 +-
.../simpletext/SimpleTextTermVectorsReader.java | 2 +-
lucene/common-build.xml | 65 +-
.../apache/lucene/codecs/DocValuesConsumer.java | 4 +-
.../lucene/codecs/StoredFieldsWriter.java | 5 -
.../codecs/blocktree/BlockTreeTermsReader.java | 30 +-
.../blocktree/IntersectTermsEnumFrame.java | 70 +-
.../codecs/blocktree/SegmentTermsEnumFrame.java | 154 +-
.../CompressingStoredFieldsReader.java | 19 +-
.../CompressingStoredFieldsWriter.java | 5 +-
.../CompressingTermVectorsReader.java | 21 +-
.../CompressingTermVectorsWriter.java | 5 +-
.../org/apache/lucene/document/DoubleRange.java | 271 ++++
.../java/org/apache/lucene/document/Field.java | 32 -
.../org/apache/lucene/document/FieldType.java | 6 +-
.../org/apache/lucene/document/FloatRange.java | 271 ++++
.../org/apache/lucene/document/IntRange.java | 271 ++++
.../org/apache/lucene/document/LongRange.java | 269 ++++
.../apache/lucene/document/RangeFieldQuery.java | 340 ++++
.../lucene/index/ConcurrentMergeScheduler.java | 75 +-
.../lucene/index/DefaultIndexingChain.java | 8 -
.../lucene/index/ExitableDirectoryReader.java | 21 +-
.../apache/lucene/index/FieldInvertState.java | 20 +-
.../apache/lucene/index/FilterCodecReader.java | 13 +-
.../apache/lucene/index/FilterLeafReader.java | 73 +-
.../org/apache/lucene/index/IndexReader.java | 115 +-
.../apache/lucene/index/IndexReaderContext.java | 10 +-
.../org/apache/lucene/index/IndexWriter.java | 116 +-
.../org/apache/lucene/index/IndexableField.java | 24 -
.../org/apache/lucene/index/LeafReader.java | 84 +-
.../org/apache/lucene/index/MergePolicy.java | 184 ++-
.../apache/lucene/index/MergeRateLimiter.java | 177 +--
.../apache/lucene/index/MergeReaderWrapper.java | 20 +-
.../org/apache/lucene/index/MergeScheduler.java | 12 +
.../org/apache/lucene/index/MultiDocValues.java | 22 +-
.../org/apache/lucene/index/MultiReader.java | 11 +
.../apache/lucene/index/NoMergeScheduler.java | 7 +
.../lucene/index/ParallelCompositeReader.java | 16 +-
.../apache/lucene/index/ParallelLeafReader.java | 38 +-
.../org/apache/lucene/index/PointValues.java | 2 +-
.../apache/lucene/index/SegmentCoreReaders.java | 39 +-
.../org/apache/lucene/index/SegmentInfos.java | 77 +-
.../org/apache/lucene/index/SegmentReader.java | 57 +-
.../lucene/index/SlowCodecReaderWrapper.java | 8 +-
.../apache/lucene/index/SortingLeafReader.java | 12 +
.../index/SortingStoredFieldsConsumer.java | 5 -
.../lucene/index/StandardDirectoryReader.java | 42 +
.../org/apache/lucene/search/BooleanQuery.java | 1 -
.../lucene/search/ConstantScoreQuery.java | 2 +-
.../java/org/apache/lucene/search/FieldDoc.java | 6 +-
.../org/apache/lucene/search/IndexSearcher.java | 5 +-
.../org/apache/lucene/search/LRUQueryCache.java | 39 +-
.../lucene/search/MultiLeafFieldComparator.java | 92 ++
.../java/org/apache/lucene/search/TopDocs.java | 68 +-
.../apache/lucene/search/TopFieldCollector.java | 212 +--
.../org/apache/lucene/search/package-info.java | 25 +-
.../search/similarities/BM25Similarity.java | 12 +-
.../search/similarities/ClassicSimilarity.java | 5 +-
.../search/similarities/SimilarityBase.java | 8 +-
.../search/similarities/TFIDFSimilarity.java | 46 +-
.../lucene/search/spans/NearSpansUnordered.java | 211 +--
.../org/apache/lucene/util/QueryBuilder.java | 46 +-
.../java/org/apache/lucene/util/Version.java | 14 +
.../org/apache/lucene/util/VirtualMethod.java | 2 +-
.../lucene/util/packed/BlockPackedReader.java | 3 +-
.../org/apache/lucene/document/TestField.java | 30 -
.../org/apache/lucene/index/TestCodecs.java | 8 +-
.../apache/lucene/index/TestCustomNorms.java | 14 +-
.../index/TestDemoParallelLeafReader.java | 11 +-
.../lucene/index/TestDirectoryReader.java | 8 +-
.../lucene/index/TestDirectoryReaderReopen.java | 12 +-
.../index/TestExitableDirectoryReader.java | 10 +
.../org/apache/lucene/index/TestFieldReuse.java | 5 -
.../lucene/index/TestFilterDirectoryReader.java | 5 +
.../lucene/index/TestFilterLeafReader.java | 21 +-
.../index/TestFlushByRamOrCountsPolicy.java | 2 +-
.../lucene/index/TestIndexReaderClose.java | 62 +-
.../apache/lucene/index/TestIndexSorting.java | 8 +-
.../apache/lucene/index/TestIndexWriter.java | 13 +-
.../lucene/index/TestIndexWriterExceptions.java | 68 +-
.../lucene/index/TestIndexWriterMerging.java | 2 +-
.../index/TestIndexWriterWithThreads.java | 2 +-
.../apache/lucene/index/TestIndexableField.java | 12 +-
.../lucene/index/TestMaxTermFrequency.java | 2 +-
.../lucene/index/TestMergeRateLimiter.java | 4 +-
.../apache/lucene/index/TestMultiTermsEnum.java | 10 +
.../test/org/apache/lucene/index/TestNorms.java | 15 +-
.../org/apache/lucene/index/TestOmitTf.java | 2 +-
.../index/TestParallelCompositeReader.java | 33 +-
.../lucene/index/TestPerSegmentDeletes.java | 2 +-
.../apache/lucene/index/TestReadOnlyIndex.java | 2 +-
.../apache/lucene/index/TestReaderClosed.java | 8 +-
.../apache/lucene/index/TestSegmentInfos.java | 11 +-
.../lucene/index/TestStressIndexing2.java | 2 +-
.../lucene/index/TestTermVectorsReader.java | 2 +-
.../lucene/index/TestTransactionRollback.java | 6 +-
.../lucene/index/TestUniqueTermCount.java | 2 +-
.../lucene/search/TermInSetQueryTest.java | 17 +-
.../lucene/search/TestCustomSearcherSort.java | 4 +-
.../lucene/search/TestDisjunctionMaxQuery.java | 2 +-
.../org/apache/lucene/search/TestDocBoost.java | 98 --
.../search/TestDoubleRangeFieldQueries.java | 251 +++
.../TestEarlyTerminatingSortingCollector.java | 4 +-
.../search/TestFloatRangeFieldQueries.java | 251 +++
.../apache/lucene/search/TestFuzzyQuery.java | 5 +-
.../lucene/search/TestIntRangeFieldQueries.java | 251 +++
.../apache/lucene/search/TestLRUQueryCache.java | 61 +-
.../search/TestLongRangeFieldQueries.java | 251 +++
.../lucene/search/TestMatchAllDocsQuery.java | 9 +-
.../apache/lucene/search/TestPrefixRandom.java | 4 +-
.../apache/lucene/search/TestRegexpRandom2.java | 2 +-
.../lucene/search/TestSearcherManager.java | 15 +
.../apache/lucene/search/TestSimilarity.java | 2 +-
.../lucene/search/TestSimilarityProvider.java | 6 +-
.../org/apache/lucene/search/TestTermQuery.java | 15 +
.../apache/lucene/search/TestTermScorer.java | 12 +-
.../search/TestTimeLimitingCollector.java | 2 +-
.../apache/lucene/search/TestTopDocsMerge.java | 38 +-
.../similarities/TestBooleanSimilarity.java | 3 +-
.../search/similarities/TestSimilarityBase.java | 1 -
.../apache/lucene/store/TestLockFactory.java | 4 +-
.../lucene/util/TestCloseableThreadLocal.java | 2 +-
.../apache/lucene/util/TestQueryBuilder.java | 2 +-
.../lucene/util/TestRamUsageEstimator.java | 8 +-
.../org/apache/lucene/util/fst/TestFSTs.java | 6 +-
.../apache/lucene/expressions/Expression.java | 24 +-
.../DefaultSortedSetDocValuesReaderState.java | 3 +-
.../facet/taxonomy/CachedOrdinalsReader.java | 7 +-
.../taxonomy/OrdinalMappingLeafReader.java | 10 +
.../taxonomy/writercache/CollisionMap.java | 2 +-
.../grouping/GroupFacetCollectorTest.java | 4 +-
.../search/highlight/TermVectorLeafReader.java | 20 +-
.../highlight/WeightedSpanTermExtractor.java | 10 +
.../MultiTermHighlighting.java | 20 +-
.../uhighlight/MultiTermHighlighting.java | 20 +-
.../lucene/search/uhighlight/PhraseHelper.java | 10 +
.../TermVectorFilteredLeafReader.java | 10 +
.../search/uhighlight/UnifiedHighlighter.java | 15 +
.../uhighlight/TestUnifiedHighlighterMTQ.java | 30 +-
.../TestUnifiedHighlighterTermVec.java | 15 +
.../TestUnifiedHighlighterExtensibility.java | 2 +-
lucene/ivy-ignore-conflicts.properties | 1 -
lucene/ivy-versions.properties | 59 -
.../lucene/search/join/GlobalOrdinalsQuery.java | 16 +-
.../join/GlobalOrdinalsWithScoreQuery.java | 16 +-
.../org/apache/lucene/search/join/JoinUtil.java | 8 +-
.../lucene/search/join/QueryBitSetProducer.java | 14 +-
.../lucene/search/join/TestBlockJoin.java | 2 +-
.../apache/lucene/search/join/TestJoinUtil.java | 10 +-
.../search/join/TestQueryBitSetProducer.java | 110 ++
.../apache/lucene/index/memory/MemoryIndex.java | 92 +-
.../lucene/index/memory/TestMemoryIndex.java | 8 +-
.../memory/TestMemoryIndexAgainstRAMDir.java | 5 +-
.../lucene/document/InetAddressPoint.java | 313 ++++
.../lucene/document/InetAddressRange.java | 168 ++
.../apache/lucene/document/LazyDocument.java | 5 -
.../org/apache/lucene/index/IndexSplitter.java | 4 +-
.../lucene/index/MultiPassIndexSplitter.java | 15 +
.../apache/lucene/index/PKIndexSplitter.java | 10 +
.../apache/lucene/misc/SweetSpotSimilarity.java | 2 +-
.../lucene/document/TestInetAddressPoint.java | 176 +++
.../lucene/misc/SweetSpotSimilarityTest.java | 8 -
.../search/TestDiversifiedTopDocsCollector.java | 2 +-
.../search/TestInetAddressRangeQueries.java | 215 +++
.../apache/lucene/queries/BoostingQuery.java | 2 +-
.../apache/lucene/queries/CustomScoreQuery.java | 2 +-
.../lucene/queries/TestCustomScoreQuery.java | 2 +-
.../function/TestLongNormValueSource.java | 3 +-
.../queries/function/TestValueSources.java | 6 +-
.../queries/payloads/TestPayloadScoreQuery.java | 2 +-
.../queries/payloads/TestPayloadSpans.java | 6 +-
.../queries/payloads/TestPayloadTermQuery.java | 2 +-
.../queryparser/classic/QueryParserBase.java | 6 +-
.../complexPhrase/ComplexPhraseQueryParser.java | 21 +-
.../standard/parser/StandardSyntaxParser.java | 8 +-
.../standard/parser/StandardSyntaxParser.jj | 8 +-
.../queryparser/simple/SimpleQueryParser.java | 8 +-
.../surround/parser/QueryParser.java | 2 +-
.../queryparser/surround/parser/QueryParser.jj | 2 +-
.../xml/builders/PointRangeQueryBuilder.java | 16 +-
.../queryparser/classic/TestMultiAnalyzer.java | 8 +-
.../classic/TestMultiFieldQueryParser.java | 2 +-
.../queryparser/classic/TestQueryParser.java | 2 +-
.../complexPhrase/TestComplexPhraseQuery.java | 36 +-
.../standard/TestMultiAnalyzerQPHelper.java | 8 +-
.../flexible/standard/TestQPHelper.java | 8 +-
.../simple/TestSimpleQueryParser.java | 2 +-
.../queryparser/util/QueryParserTestBase.java | 10 +-
.../xml/CoreParserTestIndexData.java | 2 +-
.../lucene/replicator/nrt/ReplicaNode.java | 3 +-
.../nrt/SegmentInfosSearcherManager.java | 8 +-
.../lucene/document/DoubleRangeField.java | 282 ----
.../apache/lucene/document/FloatRangeField.java | 282 ----
.../lucene/document/InetAddressPoint.java | 313 ----
.../apache/lucene/document/IntRangeField.java | 282 ----
.../lucene/document/LatLonDocValuesField.java | 2 +-
.../apache/lucene/document/LongRangeField.java | 280 ----
.../apache/lucene/document/RangeFieldQuery.java | 340 ----
.../org/apache/lucene/document/package.html | 3 +-
.../sandbox/queries/FuzzyLikeThisQuery.java | 2 +-
.../lucene/document/TestDoubleRangeField.java | 10 +-
.../lucene/document/TestInetAddressPoint.java | 176 ---
.../lucene/payloads/TestPayloadSpanUtil.java | 4 +-
.../search/BaseRangeFieldQueryTestCase.java | 344 -----
.../search/TestDoubleRangeFieldQueries.java | 251 ---
.../search/TestFloatRangeFieldQueries.java | 251 ---
.../lucene/search/TestIntRangeFieldQueries.java | 251 ---
.../search/TestLongRangeFieldQueries.java | 251 ---
.../lucene/spatial3d/Geo3DDocValuesField.java | 2 +-
.../search/spell/WordBreakSpellChecker.java | 10 +-
.../lucene/search/suggest/FileDictionary.java | 8 +-
.../search/suggest/document/ContextQuery.java | 2 +-
.../search/suggest/document/SuggestField.java | 2 +-
.../search/suggest/fst/ExternalRefSorter.java | 2 +-
.../suggest/fst/WFSTCompletionLookup.java | 2 +-
.../search/suggest/jaspell/JaspellLookup.java | 8 +-
.../jaspell/JaspellTernarySearchTrie.java | 2 +-
.../search/suggest/DocumentDictionaryTest.java | 2 +-
.../analyzing/AnalyzingInfixSuggesterTest.java | 2 +-
.../suggest/analyzing/FuzzySuggesterTest.java | 2 +-
.../lucene/index/AllDeletedFilterReader.java | 10 +
.../lucene/index/AssertingDirectoryReader.java | 9 +-
.../lucene/index/AssertingLeafReader.java | 30 +-
.../index/BaseStoredFieldsFormatTestCase.java | 15 +
.../lucene/index/FieldFilterLeafReader.java | 12 +-
.../lucene/index/MismatchedDirectoryReader.java | 5 +
.../lucene/index/MismatchedLeafReader.java | 10 +
.../lucene/index/MockRandomMergePolicy.java | 13 +-
.../lucene/index/OwnCacheKeyMultiReader.java | 76 +
.../lucene/search/BaseExplanationTestCase.java | 1 -
.../search/BaseRangeFieldQueryTestCase.java | 346 +++++
.../org/apache/lucene/search/QueryUtils.java | 43 +-
.../lucene/store/BaseLockFactoryTestCase.java | 2 +-
.../org/apache/lucene/util/LuceneTestCase.java | 30 +-
.../dependencies/GetMavenDependenciesTask.java | 2 +-
.../lucene/validation/LibVersionsCheckTask.java | 2 +-
solr/CHANGES.txt | 247 ++-
solr/bin/install_solr_service.sh | 2 +-
solr/bin/solr | 89 +-
solr/bin/solr.cmd | 31 +-
solr/bin/solr.in.sh | 11 +-
solr/build.xml | 9 +-
solr/common-build.xml | 9 +-
.../apache/solr/schema/ICUCollationField.java | 11 +-
.../solr/analytics/request/AnalyticsStats.java | 2 +-
.../analytics/util/RangeEndpointCalculator.java | 8 +-
.../handler/clustering/ClusteringComponent.java | 64 +-
.../clustering/solr/collection1/conf/schema.xml | 40 +-
.../solr/collection1/conf/synonyms.txt | 2 +-
.../clustering/ClusteringComponentTest.java | 68 +-
.../carrot2/CarrotClusteringEngineTest.java | 3 +-
.../handler/dataimport/MailEntityProcessor.java | 6 +-
.../conf/dataimport-schema-no-unique-key.xml | 11 +-
.../solr/handler/dataimport/DocBuilder.java | 24 +-
.../dataimport/EntityProcessorWrapper.java | 23 +
.../handler/dataimport/VariableResolver.java | 2 +-
.../handler/dataimport/XPathRecordReader.java | 10 +-
.../handler/dataimport/config/EntityField.java | 6 -
.../solr/collection1/conf/dataimport-schema.xml | 17 +-
.../conf/dataimport-solr_id-schema.xml | 29 +-
.../dataimport/AbstractDIHCacheTestCase.java | 4 +-
.../AbstractSqlEntityProcessorTestCase.java | 4 +-
.../dataimport/TestContentStreamDataSource.java | 2 +-
.../handler/dataimport/TestJdbcDataSource.java | 80 +-
.../handler/extraction/ExtractingParams.java | 13 -
.../handler/extraction/SolrContentHandler.java | 17 +-
.../handler/extraction/XLSXResponseWriter.java | 2 +-
.../extraction/solr/collection1/conf/schema.xml | 61 +-
.../ExtractingRequestHandlerTest.java | 4 +-
.../LanguageIdentifierUpdateProcessor.java | 2 +-
.../TikaLanguageIdentifierUpdateProcessor.java | 5 +-
.../org/apache/solr/ltr/LTRScoringQuery.java | 2 +-
.../apache/solr/ltr/feature/SolrFeature.java | 3 +
.../featureExamples/external_features.json | 6 +
.../test-files/solr/collection1/conf/schema.xml | 2 +-
.../solr/collection1/conf/synonyms.txt | 2 +-
.../solr/ltr/TestLTRReRankingPipeline.java | 2 +-
.../solr/ltr/TestSelectiveWeightCreation.java | 8 +-
.../solr/ltr/feature/TestExternalFeatures.java | 25 +-
solr/contrib/map-reduce/README.txt | 20 -
solr/contrib/map-reduce/build.xml | 157 --
solr/contrib/map-reduce/ivy.xml | 37 -
.../map-reduce/src/java/assembly/hadoop-job.xml | 39 -
.../solr/hadoop/AlphaNumericComparator.java | 75 -
.../org/apache/solr/hadoop/BatchWriter.java | 243 ---
.../solr/hadoop/DataInputInputStream.java | 58 -
.../solr/hadoop/DataOutputOutputStream.java | 66 -
.../solr/hadoop/DryRunDocumentLoader.java | 57 -
.../src/java/org/apache/solr/hadoop/GoLive.java | 182 ---
.../apache/solr/hadoop/HdfsFileFieldNames.java | 41 -
.../org/apache/solr/hadoop/HeartBeater.java | 159 --
.../solr/hadoop/LineRandomizerMapper.java | 67 -
.../solr/hadoop/LineRandomizerReducer.java | 48 -
.../solr/hadoop/MapReduceIndexerTool.java | 1388 -----------------
.../apache/solr/hadoop/PathArgumentType.java | 233 ---
.../java/org/apache/solr/hadoop/PathParts.java | 130 --
.../solr/hadoop/SolrCloudPartitioner.java | 143 --
.../org/apache/solr/hadoop/SolrCounters.java | 53 -
.../solr/hadoop/SolrInputDocumentWritable.java | 66 -
.../java/org/apache/solr/hadoop/SolrMapper.java | 39 -
.../apache/solr/hadoop/SolrOutputFormat.java | 280 ----
.../apache/solr/hadoop/SolrRecordWriter.java | 479 ------
.../org/apache/solr/hadoop/SolrReducer.java | 188 ---
.../solr/hadoop/ToolRunnerHelpFormatter.java | 90 --
.../org/apache/solr/hadoop/TreeMergeMapper.java | 46 -
.../solr/hadoop/TreeMergeOutputFormat.java | 200 ---
.../hadoop/UnbufferedDataInputInputStream.java | 114 --
.../src/java/org/apache/solr/hadoop/Utils.java | 59 -
.../apache/solr/hadoop/ZooKeeperInspector.java | 213 ---
.../dedup/NoChangeUpdateConflictResolver.java | 36 -
.../dedup/RejectingUpdateConflictResolver.java | 48 -
.../RetainMostRecentUpdateConflictResolver.java | 114 --
.../dedup/SolrInputDocumentComparator.java | 84 -
.../dedup/SortingUpdateConflictResolver.java | 79 -
.../hadoop/dedup/UpdateConflictResolver.java | 71 -
.../apache/solr/hadoop/dedup/package-info.java | 25 -
.../hadoop/morphline/MorphlineCounters.java | 47 -
.../hadoop/morphline/MorphlineMapRunner.java | 268 ----
.../solr/hadoop/morphline/MorphlineMapper.java | 193 ---
.../solr/hadoop/morphline/package-info.java | 25 -
.../org/apache/solr/hadoop/package-info.java | 25 -
solr/contrib/map-reduce/src/java/overview.html | 21 -
.../map-reduce/src/test-files/README.txt | 1 -
.../solr/hadoop/AlphaNumericComparatorTest.java | 46 -
.../org/apache/solr/hadoop/IdentityMapper.java | 38 -
.../org/apache/solr/hadoop/IdentityReducer.java | 37 -
.../hadoop/LineRandomizerMapperReducerTest.java | 94 --
.../test/org/apache/solr/hadoop/MRUnitBase.java | 66 -
.../MapReduceIndexerToolArgumentParserTest.java | 469 ------
.../solr/hadoop/MorphlineBasicMiniMRTest.java | 416 -----
.../solr/hadoop/MorphlineGoLiveMiniMRTest.java | 881 -----------
.../apache/solr/hadoop/MorphlineMapperTest.java | 76 -
.../solr/hadoop/MorphlineReducerTest.java | 131 --
.../org/apache/solr/hadoop/UtilsForTests.java | 57 -
.../solr/hadoop/hack/MiniMRClientCluster.java | 41 -
.../hadoop/hack/MiniMRClientClusterFactory.java | 88 --
.../apache/solr/hadoop/hack/MiniMRCluster.java | 266 ----
.../solr/hadoop/hack/MiniMRYarnCluster.java | 205 ---
.../hadoop/hack/MiniMRYarnClusterAdapter.java | 78 -
.../solr/hadoop/hack/MiniYARNCluster.java | 409 -----
solr/contrib/morphlines-cell/README.txt | 6 -
solr/contrib/morphlines-cell/build.xml | 144 --
solr/contrib/morphlines-cell/ivy.xml | 35 -
.../solr/morphlines/cell/SolrCellBuilder.java | 348 -----
.../StripNonCharSolrContentHandlerFactory.java | 81 -
.../cell/TrimSolrContentHandlerFactory.java | 58 -
.../solr/morphlines/cell/package-info.java | 25 -
.../morphlines-cell/src/java/overview.html | 21 -
.../morphlines-cell/src/test-files/README.txt | 1 -
.../morphlines/cell/SolrCellMorphlineTest.java | 294 ----
solr/contrib/morphlines-core/README.txt | 6 -
solr/contrib/morphlines-core/build.xml | 105 --
solr/contrib/morphlines-core/ivy.xml | 128 --
.../solr/morphlines/solr/DocumentLoader.java | 73 -
.../apache/solr/morphlines/solr/FileUtils.java | 140 --
.../solr/GenerateSolrSequenceKeyBuilder.java | 143 --
.../solr/morphlines/solr/LoadSolrBuilder.java | 153 --
.../solr/SafeConcurrentUpdateSolrClient.java | 70 -
.../solr/SanitizeUnknownSolrFieldsBuilder.java | 101 --
.../solr/SolrClientDocumentLoader.java | 124 --
.../solr/morphlines/solr/SolrLocator.java | 254 ---
.../morphlines/solr/SolrMorphlineContext.java | 80 -
.../morphlines/solr/TokenizeTextBuilder.java | 154 --
.../morphlines/solr/ZooKeeperDownloader.java | 142 --
.../solr/morphlines/solr/package-info.java | 25 -
.../morphlines-core/src/java/overview.html | 21 -
.../src/test-files/custom-mimetypes.xml | 38 -
.../src/test-files/log4j.properties | 7 -
.../src/test-files/morphlines-core.marker | 1 -
.../solr/collection1/conf/currency.xml | 67 -
.../solr/collection1/conf/elevate.xml | 42 -
.../collection1/conf/lang/contractions_ca.txt | 8 -
.../collection1/conf/lang/contractions_fr.txt | 9 -
.../collection1/conf/lang/contractions_ga.txt | 5 -
.../collection1/conf/lang/contractions_it.txt | 23 -
.../collection1/conf/lang/hyphenations_ga.txt | 5 -
.../solr/collection1/conf/lang/stemdict_nl.txt | 6 -
.../solr/collection1/conf/lang/stoptags_ja.txt | 420 -----
.../solr/collection1/conf/lang/stopwords_ar.txt | 125 --
.../solr/collection1/conf/lang/stopwords_bg.txt | 193 ---
.../solr/collection1/conf/lang/stopwords_ca.txt | 220 ---
.../solr/collection1/conf/lang/stopwords_cz.txt | 172 ---
.../solr/collection1/conf/lang/stopwords_da.txt | 108 --
.../solr/collection1/conf/lang/stopwords_de.txt | 292 ----
.../solr/collection1/conf/lang/stopwords_el.txt | 78 -
.../solr/collection1/conf/lang/stopwords_en.txt | 54 -
.../solr/collection1/conf/lang/stopwords_es.txt | 354 -----
.../solr/collection1/conf/lang/stopwords_eu.txt | 99 --
.../solr/collection1/conf/lang/stopwords_fa.txt | 313 ----
.../solr/collection1/conf/lang/stopwords_fi.txt | 95 --
.../solr/collection1/conf/lang/stopwords_fr.txt | 183 ---
.../solr/collection1/conf/lang/stopwords_ga.txt | 110 --
.../solr/collection1/conf/lang/stopwords_gl.txt | 161 --
.../solr/collection1/conf/lang/stopwords_hi.txt | 235 ---
.../solr/collection1/conf/lang/stopwords_hu.txt | 209 ---
.../solr/collection1/conf/lang/stopwords_hy.txt | 46 -
.../solr/collection1/conf/lang/stopwords_id.txt | 359 -----
.../solr/collection1/conf/lang/stopwords_it.txt | 301 ----
.../solr/collection1/conf/lang/stopwords_ja.txt | 127 --
.../solr/collection1/conf/lang/stopwords_lv.txt | 172 ---
.../solr/collection1/conf/lang/stopwords_nl.txt | 117 --
.../solr/collection1/conf/lang/stopwords_no.txt | 192 ---
.../solr/collection1/conf/lang/stopwords_pt.txt | 251 ---
.../solr/collection1/conf/lang/stopwords_ro.txt | 233 ---
.../solr/collection1/conf/lang/stopwords_ru.txt | 241 ---
.../solr/collection1/conf/lang/stopwords_sv.txt | 131 --
.../solr/collection1/conf/lang/stopwords_th.txt | 119 --
.../solr/collection1/conf/lang/stopwords_tr.txt | 212 ---
.../solr/collection1/conf/lang/userdict_ja.txt | 29 -
.../solr/collection1/conf/protwords.txt | 21 -
.../test-files/solr/collection1/conf/schema.xml | 927 -----------
.../solr/collection1/conf/solrconfig.xml | 1426 -----------------
.../solr/collection1/conf/stopwords.txt | 14 -
.../solr/collection1/conf/synonyms.txt | 29 -
.../test-files/solr/minimr/conf/currency.xml | 67 -
.../src/test-files/solr/minimr/conf/elevate.xml | 42 -
.../solr/minimr/conf/lang/contractions_ca.txt | 8 -
.../solr/minimr/conf/lang/contractions_fr.txt | 9 -
.../solr/minimr/conf/lang/contractions_ga.txt | 5 -
.../solr/minimr/conf/lang/contractions_it.txt | 23 -
.../solr/minimr/conf/lang/hyphenations_ga.txt | 5 -
.../solr/minimr/conf/lang/stemdict_nl.txt | 6 -
.../solr/minimr/conf/lang/stoptags_ja.txt | 420 -----
.../solr/minimr/conf/lang/stopwords_ar.txt | 125 --
.../solr/minimr/conf/lang/stopwords_bg.txt | 193 ---
.../solr/minimr/conf/lang/stopwords_ca.txt | 220 ---
.../solr/minimr/conf/lang/stopwords_cz.txt | 172 ---
.../solr/minimr/conf/lang/stopwords_da.txt | 108 --
.../solr/minimr/conf/lang/stopwords_de.txt | 292 ----
.../solr/minimr/conf/lang/stopwords_el.txt | 78 -
.../solr/minimr/conf/lang/stopwords_en.txt | 54 -
.../solr/minimr/conf/lang/stopwords_es.txt | 354 -----
.../solr/minimr/conf/lang/stopwords_eu.txt | 99 --
.../solr/minimr/conf/lang/stopwords_fa.txt | 313 ----
.../solr/minimr/conf/lang/stopwords_fi.txt | 95 --
.../solr/minimr/conf/lang/stopwords_fr.txt | 183 ---
.../solr/minimr/conf/lang/stopwords_ga.txt | 110 --
.../solr/minimr/conf/lang/stopwords_gl.txt | 161 --
.../solr/minimr/conf/lang/stopwords_hi.txt | 235 ---
.../solr/minimr/conf/lang/stopwords_hu.txt | 209 ---
.../solr/minimr/conf/lang/stopwords_hy.txt | 46 -
.../solr/minimr/conf/lang/stopwords_id.txt | 359 -----
.../solr/minimr/conf/lang/stopwords_it.txt | 301 ----
.../solr/minimr/conf/lang/stopwords_ja.txt | 127 --
.../solr/minimr/conf/lang/stopwords_lv.txt | 172 ---
.../solr/minimr/conf/lang/stopwords_nl.txt | 117 --
.../solr/minimr/conf/lang/stopwords_no.txt | 192 ---
.../solr/minimr/conf/lang/stopwords_pt.txt | 251 ---
.../solr/minimr/conf/lang/stopwords_ro.txt | 233 ---
.../solr/minimr/conf/lang/stopwords_ru.txt | 241 ---
.../solr/minimr/conf/lang/stopwords_sv.txt | 131 --
.../solr/minimr/conf/lang/stopwords_th.txt | 119 --
.../solr/minimr/conf/lang/stopwords_tr.txt | 212 ---
.../solr/minimr/conf/lang/userdict_ja.txt | 29 -
.../test-files/solr/minimr/conf/protwords.txt | 21 -
.../src/test-files/solr/minimr/conf/schema.xml | 941 ------------
.../test-files/solr/minimr/conf/solrconfig.xml | 1446 -----------------
.../test-files/solr/minimr/conf/stopwords.txt | 14 -
.../test-files/solr/minimr/conf/synonyms.txt | 29 -
.../src/test-files/solr/minimr/solr.xml | 46 -
.../test-files/solr/mrunit/conf/currency.xml | 67 -
.../src/test-files/solr/mrunit/conf/elevate.xml | 42 -
.../solr/mrunit/conf/lang/contractions_ca.txt | 8 -
.../solr/mrunit/conf/lang/contractions_fr.txt | 9 -
.../solr/mrunit/conf/lang/contractions_ga.txt | 5 -
.../solr/mrunit/conf/lang/contractions_it.txt | 23 -
.../solr/mrunit/conf/lang/hyphenations_ga.txt | 5 -
.../solr/mrunit/conf/lang/stemdict_nl.txt | 6 -
.../solr/mrunit/conf/lang/stoptags_ja.txt | 420 -----
.../solr/mrunit/conf/lang/stopwords_ar.txt | 125 --
.../solr/mrunit/conf/lang/stopwords_bg.txt | 193 ---
.../solr/mrunit/conf/lang/stopwords_ca.txt | 220 ---
.../solr/mrunit/conf/lang/stopwords_cz.txt | 172 ---
.../solr/mrunit/conf/lang/stopwords_da.txt | 108 --
.../solr/mrunit/conf/lang/stopwords_de.txt | 292 ----
.../solr/mrunit/conf/lang/stopwords_el.txt | 78 -
.../solr/mrunit/conf/lang/stopwords_en.txt | 54 -
.../solr/mrunit/conf/lang/stopwords_es.txt | 354 -----
.../solr/mrunit/conf/lang/stopwords_eu.txt | 99 --
.../solr/mrunit/conf/lang/stopwords_fa.txt | 313 ----
.../solr/mrunit/conf/lang/stopwords_fi.txt | 95 --
.../solr/mrunit/conf/lang/stopwords_fr.txt | 183 ---
.../solr/mrunit/conf/lang/stopwords_ga.txt | 110 --
.../solr/mrunit/conf/lang/stopwords_gl.txt | 161 --
.../solr/mrunit/conf/lang/stopwords_hi.txt | 235 ---
.../solr/mrunit/conf/lang/stopwords_hu.txt | 209 ---
.../solr/mrunit/conf/lang/stopwords_hy.txt | 46 -
.../solr/mrunit/conf/lang/stopwords_id.txt | 359 -----
.../solr/mrunit/conf/lang/stopwords_it.txt | 301 ----
.../solr/mrunit/conf/lang/stopwords_ja.txt | 127 --
.../solr/mrunit/conf/lang/stopwords_lv.txt | 172 ---
.../solr/mrunit/conf/lang/stopwords_nl.txt | 117 --
.../solr/mrunit/conf/lang/stopwords_no.txt | 192 ---
.../solr/mrunit/conf/lang/stopwords_pt.txt | 251 ---
.../solr/mrunit/conf/lang/stopwords_ro.txt | 233 ---
.../solr/mrunit/conf/lang/stopwords_ru.txt | 241 ---
.../solr/mrunit/conf/lang/stopwords_sv.txt | 131 --
.../solr/mrunit/conf/lang/stopwords_th.txt | 119 --
.../solr/mrunit/conf/lang/stopwords_tr.txt | 212 ---
.../solr/mrunit/conf/lang/userdict_ja.txt | 29 -
.../test-files/solr/mrunit/conf/protwords.txt | 21 -
.../src/test-files/solr/mrunit/conf/schema.xml | 940 ------------
.../test-files/solr/mrunit/conf/solrconfig.xml | 1449 ------------------
.../test-files/solr/mrunit/conf/stopwords.txt | 14 -
.../test-files/solr/mrunit/conf/synonyms.txt | 29 -
.../src/test-files/solr/mrunit/solr.xml | 45 -
.../src/test-files/solr/solr.xml | 34 -
.../solrcelltest/collection1/conf/currency.xml | 67 -
.../solrcelltest/collection1/conf/elevate.xml | 42 -
.../collection1/conf/lang/contractions_ca.txt | 8 -
.../collection1/conf/lang/contractions_fr.txt | 9 -
.../collection1/conf/lang/contractions_ga.txt | 5 -
.../collection1/conf/lang/contractions_it.txt | 23 -
.../collection1/conf/lang/hyphenations_ga.txt | 5 -
.../collection1/conf/lang/stemdict_nl.txt | 6 -
.../collection1/conf/lang/stoptags_ja.txt | 420 -----
.../collection1/conf/lang/stopwords_ar.txt | 125 --
.../collection1/conf/lang/stopwords_bg.txt | 193 ---
.../collection1/conf/lang/stopwords_ca.txt | 220 ---
.../collection1/conf/lang/stopwords_cz.txt | 172 ---
.../collection1/conf/lang/stopwords_da.txt | 108 --
.../collection1/conf/lang/stopwords_de.txt | 292 ----
.../collection1/conf/lang/stopwords_el.txt | 78 -
.../collection1/conf/lang/stopwords_en.txt | 54 -
.../collection1/conf/lang/stopwords_es.txt | 354 -----
.../collection1/conf/lang/stopwords_eu.txt | 99 --
.../collection1/conf/lang/stopwords_fa.txt | 313 ----
.../collection1/conf/lang/stopwords_fi.txt | 95 --
.../collection1/conf/lang/stopwords_fr.txt | 183 ---
.../collection1/conf/lang/stopwords_ga.txt | 110 --
.../collection1/conf/lang/stopwords_gl.txt | 161 --
.../collection1/conf/lang/stopwords_hi.txt | 235 ---
.../collection1/conf/lang/stopwords_hu.txt | 209 ---
.../collection1/conf/lang/stopwords_hy.txt | 46 -
.../collection1/conf/lang/stopwords_id.txt | 359 -----
.../collection1/conf/lang/stopwords_it.txt | 301 ----
.../collection1/conf/lang/stopwords_ja.txt | 127 --
.../collection1/conf/lang/stopwords_lv.txt | 172 ---
.../collection1/conf/lang/stopwords_nl.txt | 117 --
.../collection1/conf/lang/stopwords_no.txt | 192 ---
.../collection1/conf/lang/stopwords_pt.txt | 251 ---
.../collection1/conf/lang/stopwords_ro.txt | 233 ---
.../collection1/conf/lang/stopwords_ru.txt | 241 ---
.../collection1/conf/lang/stopwords_sv.txt | 131 --
.../collection1/conf/lang/stopwords_th.txt | 119 --
.../collection1/conf/lang/stopwords_tr.txt | 212 ---
.../collection1/conf/lang/userdict_ja.txt | 29 -
.../solrcelltest/collection1/conf/protwords.txt | 21 -
.../solrcelltest/collection1/conf/schema.xml | 893 -----------
.../collection1/conf/solrconfig.xml | 1426 -----------------
.../solrcelltest/collection1/conf/stopwords.txt | 14 -
.../solrcelltest/collection1/conf/synonyms.txt | 29 -
.../solr/solrcloud/conf/solrconfig.xml | 1437 -----------------
.../test-files/test-documents/NullHeader.docx | Bin 4355 -> 0 bytes
.../test-files/test-documents/boilerplate.html | 58 -
.../src/test-files/test-documents/cars.csv | 6 -
.../src/test-files/test-documents/cars.csv.gz | Bin 167 -> 0 bytes
.../src/test-files/test-documents/cars.tar.gz | Bin 298 -> 0 bytes
.../src/test-files/test-documents/complex.mbox | 291 ----
.../src/test-files/test-documents/email.eml | 40 -
.../src/test-files/test-documents/rsstest.rss | 36 -
.../sample-statuses-20120521-100919.avro | Bin 3192 -> 0 bytes
.../sample-statuses-20120906-141433 | 4 -
.../sample-statuses-20120906-141433-medium.avro | Bin 249540 -> 0 bytes
.../sample-statuses-20120906-141433.avro | Bin 1208 -> 0 bytes
.../sample-statuses-20120906-141433.bz2 | Bin 1054 -> 0 bytes
.../sample-statuses-20120906-141433.gz | Bin 907 -> 0 bytes
.../test-files/test-documents/test-outlook.msg | Bin 19968 -> 0 bytes
.../src/test-files/test-documents/testAIFF.aif | Bin 3894 -> 0 bytes
.../src/test-files/test-documents/testBMP.bmp | Bin 22554 -> 0 bytes
.../src/test-files/test-documents/testBMPfp.txt | 3 -
.../src/test-files/test-documents/testEMLX.emlx | 72 -
.../src/test-files/test-documents/testEXCEL.xls | Bin 13824 -> 0 bytes
.../test-files/test-documents/testEXCEL.xlsx | Bin 9453 -> 0 bytes
.../src/test-files/test-documents/testFLAC.flac | Bin 10604 -> 0 bytes
.../src/test-files/test-documents/testFLV.flv | Bin 90580 -> 0 bytes
.../test-files/test-documents/testJPEG_EXIF.jpg | Bin 16357 -> 0 bytes
.../test-documents/testJPEG_EXIF.jpg.gz | Bin 8595 -> 0 bytes
.../test-documents/testJPEG_EXIF.jpg.tar.gz | Bin 8722 -> 0 bytes
.../test-files/test-documents/testMP3i18n.mp3 | Bin 40832 -> 0 bytes
.../src/test-files/test-documents/testMP4.m4a | Bin 4770 -> 0 bytes
.../src/test-files/test-documents/testPDF.pdf | Bin 34824 -> 0 bytes
.../src/test-files/test-documents/testPNG.png | Bin 17041 -> 0 bytes
.../test-documents/testPPT_various.ppt | Bin 164352 -> 0 bytes
.../test-documents/testPPT_various.pptx | Bin 56659 -> 0 bytes
.../src/test-files/test-documents/testPSD.psd | Bin 69410 -> 0 bytes
.../test-files/test-documents/testPages.pages | Bin 134152 -> 0 bytes
.../src/test-files/test-documents/testRFC822 | 41 -
.../test-documents/testRTFVarious.rtf | 329 ----
.../src/test-files/test-documents/testSVG.svg | 23 -
.../src/test-files/test-documents/testTIFF.tif | Bin 25584 -> 0 bytes
.../src/test-files/test-documents/testVISIO.vsd | Bin 45568 -> 0 bytes
.../src/test-files/test-documents/testWAV.wav | Bin 3884 -> 0 bytes
.../test-documents/testWORD_various.doc | Bin 35328 -> 0 bytes
.../src/test-files/test-documents/testXML.xml | 48 -
.../src/test-files/test-documents/testXML2.xml | 22 -
.../test-morphlines/loadSolrBasic.conf | 63 -
.../test-morphlines/solrCellDocumentTypes.conf | 283 ----
.../test-morphlines/solrCellJPGCompressed.conf | 135 --
.../test-files/test-morphlines/solrCellXML.conf | 69 -
.../test-morphlines/tokenizeText.conf | 34 -
.../tutorialReadAvroContainer.conf | 140 --
.../solr/AbstractSolrMorphlineTestBase.java | 320 ----
.../solr/AbstractSolrMorphlineZkTestBase.java | 145 --
.../solr/CollectingDocumentLoader.java | 95 --
.../morphlines/solr/EmbeddedTestSolrServer.java | 46 -
.../solr/morphlines/solr/SolrMorphlineTest.java | 69 -
.../solr/SolrMorphlineZkAliasTest.java | 96 --
.../solr/SolrMorphlineZkAvroTest.java | 140 --
.../morphlines/solr/SolrMorphlineZkTest.java | 92 --
.../solr/uima/processor/UIMAToSolrMapper.java | 2 +-
.../uima/solr/collection1/conf/schema.xml | 47 +-
.../uima/solr/collection1/conf/synonyms.txt | 2 +-
.../test-files/uima/uima-tokenizers-schema.xml | 36 +-
.../java/org/apache/solr/response/PageTool.java | 2 +-
.../solr/response/VelocityResponseWriter.java | 6 +-
.../java/org/apache/solr/api/V2HttpCall.java | 2 +-
.../solrj/embedded/EmbeddedSolrServer.java | 55 +-
.../org/apache/solr/cloud/ElectionContext.java | 37 +-
.../java/org/apache/solr/cloud/Overseer.java | 17 +-
.../OverseerAutoReplicaFailoverThread.java | 6 +-
.../cloud/OverseerCollectionMessageHandler.java | 1 +
.../solr/cloud/OverseerNodePrioritizer.java | 9 +-
.../solr/cloud/OverseerTaskProcessor.java | 13 +-
.../apache/solr/cloud/OverseerTaskQueue.java | 2 +-
.../org/apache/solr/cloud/RecoveryStrategy.java | 137 +-
.../apache/solr/cloud/ReplicateFromLeader.java | 124 ++
.../org/apache/solr/cloud/SyncStrategy.java | 4 +-
.../org/apache/solr/cloud/ZkController.java | 47 +-
.../apache/solr/cloud/ZkSolrResourceLoader.java | 2 +-
.../solr/core/CachingDirectoryFactory.java | 2 +-
.../java/org/apache/solr/core/ConfigSet.java | 10 +-
.../org/apache/solr/core/ConfigSetService.java | 29 +-
.../org/apache/solr/core/CoreContainer.java | 78 +-
.../org/apache/solr/core/CoreDescriptor.java | 17 +
.../org/apache/solr/core/DirectoryFactory.java | 9 +-
.../org/apache/solr/core/JmxMonitoredMap.java | 13 +-
.../apache/solr/core/MMapDirectoryFactory.java | 4 +
.../solr/core/MetricsDirectoryFactory.java | 537 -------
.../java/org/apache/solr/core/PluginBag.java | 2 +-
.../apache/solr/core/QuerySenderListener.java | 22 +-
.../org/apache/solr/core/RequestParams.java | 2 +-
.../apache/solr/core/RunExecutableListener.java | 13 +-
.../java/org/apache/solr/core/SolrConfig.java | 2 +
.../src/java/org/apache/solr/core/SolrCore.java | 86 +-
.../core/SolrCoreInitializationException.java | 32 +
.../apache/solr/core/SolrDeletionPolicy.java | 6 -
.../org/apache/solr/core/SolrInfoMBean.java | 4 +-
.../org/apache/solr/core/SolrXmlConfig.java | 3 +-
.../org/apache/solr/handler/BlobHandler.java | 15 +-
.../org/apache/solr/handler/CdcrReplicator.java | 17 +-
.../solr/handler/CdcrReplicatorState.java | 6 +-
.../apache/solr/handler/CdcrRequestHandler.java | 2 +-
.../handler/DocumentAnalysisRequestHandler.java | 4 +-
.../org/apache/solr/handler/ExportWriter.java | 20 +-
.../org/apache/solr/handler/GraphHandler.java | 4 +-
.../org/apache/solr/handler/IndexFetcher.java | 123 +-
.../apache/solr/handler/PingRequestHandler.java | 6 +-
.../apache/solr/handler/ReplicationHandler.java | 38 +-
.../apache/solr/handler/RequestHandlerBase.java | 7 +-
.../org/apache/solr/handler/SQLHandler.java | 39 +-
.../org/apache/solr/handler/StreamHandler.java | 72 +-
.../solr/handler/admin/CollectionsHandler.java | 4 +-
.../solr/handler/admin/ConfigSetsHandler.java | 93 +-
.../solr/handler/admin/LukeRequestHandler.java | 3 +-
.../handler/admin/MetricsCollectorHandler.java | 228 +++
.../solr/handler/admin/MetricsHandler.java | 6 +-
.../handler/admin/PropertiesRequestHandler.java | 27 +-
.../solr/handler/admin/SystemInfoHandler.java | 20 +-
.../solr/handler/admin/ThreadDumpHandler.java | 5 +-
.../solr/handler/component/ExpandComponent.java | 102 +-
.../component/HttpShardHandlerFactory.java | 2 +-
.../component/IterativeMergeStrategy.java | 4 +-
.../component/MoreLikeThisComponent.java | 4 +-
.../PivotFacetFieldValueCollection.java | 4 +-
.../solr/handler/component/QueryComponent.java | 5 +-
.../component/QueryElevationComponent.java | 4 +-
.../handler/component/RangeFacetRequest.java | 13 +-
.../handler/component/RealTimeGetComponent.java | 77 +-
.../solr/handler/component/SearchHandler.java | 10 +-
.../component/SortedDateStatsValues.java | 89 ++
.../handler/component/StatsValuesFactory.java | 8 +-
.../solr/handler/component/TermsComponent.java | 68 +-
.../solr/handler/loader/CSVLoaderBase.java | 4 +-
.../solr/handler/loader/JavabinLoader.java | 3 +-
.../apache/solr/handler/loader/JsonLoader.java | 39 +-
.../apache/solr/handler/loader/XMLLoader.java | 44 +-
.../apache/solr/handler/sql/SolrAggregate.java | 6 +-
.../apache/solr/handler/sql/SolrEnumerator.java | 5 +-
.../apache/solr/handler/sql/SolrProject.java | 2 +-
.../org/apache/solr/handler/sql/SolrRel.java | 10 +-
.../org/apache/solr/handler/sql/SolrRules.java | 14 +
.../org/apache/solr/handler/sql/SolrSchema.java | 4 +
.../org/apache/solr/handler/sql/SolrTable.java | 65 +-
.../apache/solr/handler/sql/SolrTableScan.java | 4 +
.../handler/sql/SolrToEnumerableConverter.java | 1 +
.../solr/highlight/DefaultSolrHighlighter.java | 15 +-
.../solr/highlight/PostingsSolrHighlighter.java | 35 +-
.../apache/solr/highlight/SolrHighlighter.java | 2 +-
.../solr/highlight/UnifiedSolrHighlighter.java | 28 +-
.../solr/index/SlowCompositeReaderWrapper.java | 35 +-
.../solr/index/SortingMergePolicyFactory.java | 7 +-
.../UninvertDocValuesMergePolicyFactory.java | 218 +++
.../solr/internal/csv/writer/CSVConfig.java | 2 +-
.../internal/csv/writer/CSVConfigGuesser.java | 8 +-
.../apache/solr/metrics/AggregateMetric.java | 200 +++
.../solr/metrics/SolrCoreMetricManager.java | 125 +-
.../apache/solr/metrics/SolrMetricManager.java | 330 +++-
.../metrics/reporters/JmxObjectNameFactory.java | 6 +-
.../reporters/solr/SolrClusterReporter.java | 281 ++++
.../metrics/reporters/solr/SolrReporter.java | 392 +++++
.../reporters/solr/SolrShardReporter.java | 189 +++
.../metrics/reporters/solr/package-info.java | 22 +
.../org/apache/solr/parser/QueryParser.java | 416 +++--
.../java/org/apache/solr/parser/QueryParser.jj | 275 ++--
.../apache/solr/parser/SolrQueryParserBase.java | 217 ++-
.../org/apache/solr/request/NumericFacets.java | 4 +-
.../org/apache/solr/request/SimpleFacets.java | 14 +-
.../solr/request/SolrQueryRequestBase.java | 17 +-
.../apache/solr/request/json/RequestUtil.java | 5 +-
.../org/apache/solr/response/DocsStreamer.java | 78 +-
.../solr/response/TextResponseWriter.java | 2 +-
.../transform/BaseEditorialTransformer.java | 36 +-
.../transform/ChildDocTransformerFactory.java | 2 +-
.../solr/rest/schema/FieldTypeXmlAdapter.java | 25 +-
.../solr/schema/AbstractSpatialFieldType.java | 8 +-
.../solr/schema/AbstractSubTypeFieldType.java | 17 +-
.../java/org/apache/solr/schema/BBoxField.java | 2 +-
.../org/apache/solr/schema/BinaryField.java | 16 +-
.../java/org/apache/solr/schema/BoolField.java | 7 +-
.../org/apache/solr/schema/CollationField.java | 11 +-
.../org/apache/solr/schema/CurrencyField.java | 8 +-
.../org/apache/solr/schema/DatePointField.java | 269 ++++
.../org/apache/solr/schema/DateRangeField.java | 4 +-
.../apache/solr/schema/DoublePointField.java | 17 +-
.../java/org/apache/solr/schema/EnumField.java | 30 +-
.../org/apache/solr/schema/FieldProperties.java | 43 +-
.../java/org/apache/solr/schema/FieldType.java | 57 +-
.../org/apache/solr/schema/FloatPointField.java | 18 +-
.../org/apache/solr/schema/IntPointField.java | 16 +-
.../solr/schema/LatLonPointSpatialField.java | 271 ++++
.../java/org/apache/solr/schema/LatLonType.java | 18 +-
.../org/apache/solr/schema/LongPointField.java | 16 +-
.../apache/solr/schema/ManagedIndexSchema.java | 4 +-
.../apache/solr/schema/NumericFieldType.java | 4 +-
.../java/org/apache/solr/schema/PointField.java | 10 +-
.../java/org/apache/solr/schema/PointType.java | 20 +-
.../apache/solr/schema/PreAnalyzedField.java | 10 +-
.../apache/solr/schema/PrimitiveFieldType.java | 4 +
.../org/apache/solr/schema/RandomSortField.java | 2 +-
.../schema/RptWithGeometrySpatialField.java | 7 +-
.../org/apache/solr/schema/SchemaField.java | 17 +-
.../schema/SpatialPointVectorFieldType.java | 7 -
.../java/org/apache/solr/schema/StrField.java | 8 +-
.../java/org/apache/solr/schema/TrieField.java | 29 +-
.../solr/search/CollapsingQParserPlugin.java | 74 +-
.../solr/search/ComplexPhraseQParserPlugin.java | 4 +-
.../apache/solr/search/ExportQParserPlugin.java | 2 +-
.../solr/search/ExtendedDismaxQParser.java | 171 ++-
.../java/org/apache/solr/search/Grouping.java | 4 +-
.../apache/solr/search/HashQParserPlugin.java | 18 +-
.../java/org/apache/solr/search/Insanity.java | 9 +-
.../org/apache/solr/search/LuceneQParser.java | 3 +
.../apache/solr/search/LuceneQParserPlugin.java | 2 +
.../org/apache/solr/search/QueryParsing.java | 1 +
.../org/apache/solr/search/ReRankCollector.java | 2 +-
.../apache/solr/search/ReRankQParserPlugin.java | 2 +-
.../apache/solr/search/SolrDocumentFetcher.java | 571 +++++++
.../apache/solr/search/SolrIndexSearcher.java | 470 +-----
.../org/apache/solr/search/SolrQueryParser.java | 2 +-
.../solr/search/facet/FacetFieldMerger.java | 2 +-
.../solr/search/facet/FacetFieldProcessor.java | 79 +-
.../facet/FacetFieldProcessorByArray.java | 4 +
.../FacetFieldProcessorByEnumTermsStream.java | 2 +-
.../apache/solr/search/facet/FacetModule.java | 128 +-
.../solr/search/facet/FacetProcessor.java | 25 +-
.../apache/solr/search/facet/FacetQuery.java | 6 +-
.../apache/solr/search/facet/FacetRange.java | 12 +-
.../apache/solr/search/facet/FacetRequest.java | 6 +-
.../search/facet/FacetRequestSortedMerger.java | 16 +-
.../apache/solr/search/facet/LegacyFacet.java | 8 +-
.../org/apache/solr/search/facet/UniqueAgg.java | 2 +-
.../search/function/CollapseScoreFunction.java | 2 +-
.../TopGroupsShardRequestFactory.java | 4 +-
.../SearchGroupShardResponseProcessor.java | 2 +-
.../SearchGroupsResultTransformer.java | 40 +-
.../TopGroupsResultTransformer.java | 18 +-
.../GroupedEndResultTransformer.java | 2 +-
.../org/apache/solr/search/join/GraphQuery.java | 2 +-
.../apache/solr/search/mlt/CloudMLTQParser.java | 5 +-
.../security/AutorizationEditOperation.java | 2 +-
.../solr/security/PKIAuthenticationPlugin.java | 44 +-
.../solr/security/PermissionNameProvider.java | 2 +-
.../org/apache/solr/servlet/HttpSolrCall.java | 4 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 13 +-
.../apache/solr/servlet/SolrRequestParsers.java | 11 +-
.../solr/spelling/PossibilityIterator.java | 6 +-
.../solr/spelling/SpellCheckCollation.java | 2 +-
.../solr/spelling/SpellCheckCollator.java | 4 +-
.../solr/store/blockcache/BlockCache.java | 15 +-
.../store/blockcache/BlockDirectoryCache.java | 5 -
.../apache/solr/store/blockcache/Metrics.java | 121 +-
.../org/apache/solr/uninverting/FieldCache.java | 18 +-
.../apache/solr/uninverting/FieldCacheImpl.java | 70 +-
.../uninverting/FieldCacheSanityChecker.java | 426 -----
.../solr/uninverting/UninvertingReader.java | 21 +-
.../apache/solr/update/AddUpdateCommand.java | 3 +-
.../org/apache/solr/update/CommitTracker.java | 5 +
.../solr/update/DefaultSolrCoreState.java | 15 +-
.../solr/update/DirectUpdateHandler2.java | 151 +-
.../org/apache/solr/update/DocumentBuilder.java | 108 +-
.../apache/solr/update/HdfsTransactionLog.java | 50 +
.../java/org/apache/solr/update/PeerSync.java | 22 +-
.../org/apache/solr/update/SolrCoreState.java | 6 +
.../apache/solr/update/SolrIndexSplitter.java | 13 +-
.../org/apache/solr/update/SolrIndexWriter.java | 31 +-
.../org/apache/solr/update/TransactionLog.java | 50 +
.../org/apache/solr/update/UpdateCommand.java | 1 +
.../org/apache/solr/update/UpdateHandler.java | 16 +
.../java/org/apache/solr/update/UpdateLog.java | 184 ++-
.../org/apache/solr/update/VersionInfo.java | 6 +-
...aluesOrNoneFieldMutatingUpdateProcessor.java | 3 +-
.../processor/AtomicUpdateDocumentMerger.java | 32 +-
.../update/processor/CdcrUpdateProcessor.java | 3 +-
.../CloneFieldUpdateProcessorFactory.java | 3 +-
.../ConcatFieldUpdateProcessorFactory.java | 3 +-
.../CountFieldValuesUpdateProcessorFactory.java | 3 +-
.../processor/DistributedUpdateProcessor.java | 66 +-
...BasedVersionConstraintsProcessorFactory.java | 4 +-
.../FieldValueMutatingUpdateProcessor.java | 3 +-
.../FieldValueSubsetUpdateProcessorFactory.java | 3 +-
.../PreAnalyzedUpdateProcessorFactory.java | 9 +-
.../StatelessScriptUpdateProcessorFactory.java | 6 +
.../TolerantUpdateProcessorFactory.java | 2 +-
.../org/apache/solr/util/DateMathParser.java | 2 +-
.../src/java/org/apache/solr/util/RTimer.java | 2 +-
.../org/apache/solr/util/RedactionUtils.java | 51 +
.../org/apache/solr/util/SimplePostTool.java | 4 +-
.../src/java/org/apache/solr/util/SolrCLI.java | 3 +-
.../org/apache/solr/util/SolrPluginUtils.java | 11 +-
.../org/apache/solr/util/TestInjection.java | 62 +
...entedPoolingHttpClientConnectionManager.java | 38 +-
.../org/apache/solr/util/stats/MetricUtils.java | 303 +++-
.../collection1/conf/multiword-synonyms.txt | 13 +
.../conf/schema-HighlighterMaxOffsetTest.xml | 9 +-
.../collection1/conf/schema-copyfield-test.xml | 50 +-
.../solr/collection1/conf/schema-docValues.xml | 1 +
.../conf/schema-docValuesFaceting.xml | 5 +-
.../collection1/conf/schema-docValuesJoin.xml | 7 +-
.../solr/collection1/conf/schema-folding.xml | 2 +-
.../solr/collection1/conf/schema-hash.xml | 59 +-
.../conf/schema-multiword-synonyms.xml | 50 +
.../solr/collection1/conf/schema-point.xml | 11 +
.../collection1/conf/schema-psuedo-fields.xml | 7 +-
.../collection1/conf/schema-required-fields.xml | 39 +-
.../solr/collection1/conf/schema-rest.xml | 97 +-
.../conf/schema-single-dynamic-copy-field.xml | 97 +-
.../solr/collection1/conf/schema-sorts.xml | 11 +-
.../solr/collection1/conf/schema-spatial.xml | 4 +
.../collection1/conf/schema-spellchecker.xml | 2 +-
.../solr/collection1/conf/schema-sql.xml | 59 +-
.../conf/schema-synonym-tokenizer.xml | 5 +-
.../solr/collection1/conf/schema-trie.xml | 29 +-
.../conf/schema-unifiedhighlight.xml | 4 +-
.../test-files/solr/collection1/conf/schema.xml | 107 +-
.../solr/collection1/conf/schema11.xml | 40 +-
.../solr/collection1/conf/schema12.xml | 101 +-
.../solr/collection1/conf/schema15.xml | 92 +-
.../solr/collection1/conf/schema_latest.xml | 58 +-
.../solr/collection1/conf/schemasurround.xml | 99 +-
.../solrconfig-configurerecoverystrategy.xml | 28 +
.../conf/solrconfig-customrecoverystrategy.xml | 32 +
.../conf/solrconfig-indexmetrics.xml | 2 -
.../conf/solrconfig-managed-schema.xml | 29 +-
...lrconfig-parsing-update-processor-chains.xml | 7 +
...nfig-uninvertdocvaluesmergepolicyfactory.xml | 38 +
.../conf/solrconfig-update-processor-chains.xml | 2 +
.../solr/collection1/conf/synonyms.txt | 5 +-
.../solr/collection1/conf/wdftypes.txt | 2 +-
.../configsets/cloud-dynamic/conf/schema.xml | 35 +-
.../conf/schema.xml | 31 +
.../conf/solrconfig.xml | 48 +
.../solr/configsets/doc-expiry/conf/schema.xml | 35 +-
.../dih-script-transformer/managed-schema | 25 +
.../dih-script-transformer/solrconfig.xml | 61 +
.../configsets/upload/regular/managed-schema | 25 +
.../configsets/upload/regular/solrconfig.xml | 61 +
.../regular/xslt/xsl-update-handler-test.xsl | 49 +
.../with-run-executable-listener/managed-schema | 25 +
.../with-run-executable-listener/solrconfig.xml | 69 +
.../upload/with-script-processor/managed-schema | 25 +
...missleading.extension.updateprocessor.js.txt | 23 +
.../upload/with-script-processor/solrconfig.xml | 65 +
.../src/test-files/solr/solr-solrreporter.xml | 66 +
.../org/apache/solr/BasicFunctionalityTest.java | 12 +-
.../org/apache/solr/ConvertedLegacyTest.java | 2 +-
.../apache/solr/TestDistributedGrouping.java | 2 -
.../org/apache/solr/TestDocumentBuilder.java | 1 -
.../org/apache/solr/TestGroupingSearch.java | 8 -
.../TestEmbeddedSolrServerSchemaAPI.java | 111 ++
.../solr/cloud/BaseCdcrDistributedZkTest.java | 4 +-
.../solr/cloud/BasicDistributedZk2Test.java | 6 +
.../solr/cloud/BasicDistributedZkTest.java | 9 +-
.../solr/cloud/CdcrVersionReplicationTest.java | 4 +-
.../cloud/ChaosMonkeyNothingIsSafeTest.java | 11 +-
.../apache/solr/cloud/CleanupOldIndexTest.java | 18 +-
.../solr/cloud/ConnectionManagerTest.java | 2 +-
.../apache/solr/cloud/DistributedQueueTest.java | 2 +-
.../org/apache/solr/cloud/ForceLeaderTest.java | 6 +
.../cloud/FullSolrCloudDistribCmdsTest.java | 18 +-
.../apache/solr/cloud/HttpPartitionTest.java | 7 +
.../apache/solr/cloud/LeaderElectionTest.java | 4 +-
.../LeaderInitiatedRecoveryOnCommitTest.java | 7 +
.../solr/cloud/OnlyLeaderIndexesTest.java | 435 ++++++
...rriddenZkACLAndCredentialsProvidersTest.java | 4 +-
...verseerCollectionConfigSetProcessorTest.java | 2 +-
.../solr/cloud/RecoveryAfterSoftCommitTest.java | 7 +-
.../cloud/SegmentTerminateEarlyTestState.java | 4 +-
.../org/apache/solr/cloud/ShardSplitTest.java | 6 +
.../cloud/SharedFSAutoReplicaFailoverTest.java | 29 +
.../apache/solr/cloud/SolrCLIZkUtilsTest.java | 100 +-
.../solr/cloud/TestCloudDeleteByQuery.java | 2 +-
.../apache/solr/cloud/TestCloudRecovery.java | 22 +-
.../apache/solr/cloud/TestCollectionAPI.java | 6 +-
.../apache/solr/cloud/TestConfigSetsAPI.java | 401 ++++-
.../apache/solr/cloud/TestRandomFlRTGCloud.java | 6 +-
.../apache/solr/cloud/TestSegmentSorting.java | 2 -
.../TestStressCloudBlindAtomicUpdates.java | 6 +-
.../cloud/TestTolerantUpdateProcessorCloud.java | 2 +-
.../test/org/apache/solr/cloud/ZkCLITest.java | 4 +-
.../org/apache/solr/cloud/ZkSolrClientTest.java | 2 +-
.../cloud/hdfs/HdfsBasicDistributedZkTest.java | 7 +-
.../HdfsWriteToMultipleCollectionsTest.java | 7 +-
.../org/apache/solr/cloud/rule/RulesTest.java | 2 +-
.../solr/core/CachingDirectoryFactoryTest.java | 2 +-
.../core/ConfigureRecoveryStrategyTest.java | 112 ++
.../org/apache/solr/core/TestCodecSupport.java | 2 +-
.../org/apache/solr/core/TestCoreDiscovery.java | 4 +-
.../apache/solr/core/TestDynamicLoading.java | 13 +-
.../apache/solr/core/TestJmxMonitoredMap.java | 2 +-
.../test/org/apache/solr/core/TestNRTOpen.java | 2 +-
.../apache/solr/core/TestSolrConfigHandler.java | 14 +-
.../core/snapshots/TestSolrCloudSnapshots.java | 2 +-
.../core/snapshots/TestSolrCoreSnapshots.java | 2 +-
.../handler/AnalysisRequestHandlerTestBase.java | 2 +-
.../FieldAnalysisRequestHandlerTest.java | 14 +-
.../org/apache/solr/handler/JsonLoaderTest.java | 5 +-
.../solr/handler/PingRequestHandlerTest.java | 2 +-
.../solr/handler/TestReplicationHandler.java | 9 +-
.../apache/solr/handler/TestReqParamsAPI.java | 3 +
.../org/apache/solr/handler/TestSQLHandler.java | 293 +++-
.../solr/handler/V2ApiIntegrationTest.java | 4 +-
.../handler/XmlUpdateRequestHandlerTest.java | 9 +-
.../admin/CoreMergeIndexesAdminHandlerTest.java | 10 +-
.../handler/admin/LukeRequestHandlerTest.java | 4 +-
.../solr/handler/admin/MetricsHandlerTest.java | 31 +-
.../admin/PropertiesRequestHandlerTest.java | 73 +
.../DistributedFacetPivotSmallTest.java | 5 +-
.../DistributedTermsComponentTest.java | 3 +-
.../handler/component/TermsComponentTest.java | 38 +
.../handler/component/TestExpandComponent.java | 2 -
.../highlight/TestPostingsSolrHighlighter.java | 13 +
.../highlight/TestUnifiedSolrHighlighter.java | 25 +-
.../index/TestSlowCompositeReaderWrapper.java | 54 +-
.../index/UninvertDocValuesMergePolicyTest.java | 243 +++
.../apache/solr/internal/csv/CSVParserTest.java | 2 +-
.../solr/metrics/SolrCoreMetricManagerTest.java | 31 +-
.../solr/metrics/SolrMetricManagerTest.java | 34 +-
.../metrics/SolrMetricsIntegrationTest.java | 15 +-
.../reporters/SolrGraphiteReporterTest.java | 2 +-
.../metrics/reporters/SolrJmxReporterTest.java | 13 +-
.../reporters/solr/SolrCloudReportersTest.java | 163 ++
.../reporters/solr/SolrShardReporterTest.java | 117 ++
.../response/TestGraphMLResponseWriter.java | 2 +-
.../solr/response/TestSolrQueryResponse.java | 2 +-
.../apache/solr/rest/TestManagedResource.java | 4 +-
.../org/apache/solr/rest/TestRestManager.java | 2 +-
.../solr/rest/schema/TestBulkSchemaAPI.java | 103 +-
.../solr/schema/AbstractCurrencyFieldTest.java | 2 +-
.../org/apache/solr/schema/DateFieldTest.java | 16 +-
.../org/apache/solr/schema/DocValuesTest.java | 2 +-
.../apache/solr/schema/NumericFieldsTest.java | 108 +-
.../org/apache/solr/schema/PolyFieldTest.java | 46 +-
.../solr/schema/PreAnalyzedFieldTest.java | 10 +-
.../apache/solr/schema/SortableBinaryField.java | 9 +-
.../TestCloudManagedSchemaConcurrent.java | 2 +-
.../org/apache/solr/schema/TestPointFields.java | 666 +++++++-
.../schema/TestSchemalessBufferedUpdates.java | 2 +-
.../TrieIntPrefixActsAsRangeQueryFieldType.java | 2 +-
.../solr/search/AnalyticsTestQParserPlugin.java | 10 +-
.../org/apache/solr/search/LargeFieldTest.java | 133 ++
.../solr/search/TestCollapseQParserPlugin.java | 218 ++-
.../test/org/apache/solr/search/TestDocSet.java | 20 +-
.../solr/search/TestExtendedDismaxParser.java | 1059 +++++++++----
.../org/apache/solr/search/TestFiltering.java | 2 +-
.../solr/search/TestMultiWordSynonyms.java | 100 ++
.../search/TestRandomCollapseQParserPlugin.java | 5 -
.../apache/solr/search/TestRankQueryPlugin.java | 14 +-
.../apache/solr/search/TestSolr4Spatial.java | 61 +-
.../apache/solr/search/TestSolr4Spatial2.java | 2 +-
.../solr/search/TestSolrFieldCacheMBean.java | 4 +-
.../apache/solr/search/TestSolrQueryParser.java | 603 +++++++-
.../search/facet/TestJsonFacetRefinement.java | 139 +-
.../solr/search/function/TestFunctionQuery.java | 1 -
.../solr/search/mlt/CloudMLTQParserTest.java | 14 +-
.../solr/security/BasicAuthDistributedTest.java | 136 --
.../solr/security/BasicAuthIntegrationTest.java | 4 +-
.../security/TestPKIAuthenticationPlugin.java | 44 +-
.../TestRuleBasedAuthorizationPlugin.java | 23 +
.../ConjunctionSolrSpellCheckerTest.java | 4 +-
.../spelling/IndexBasedSpellCheckerTest.java | 2 +-
.../solr/store/blockcache/BlockCacheTest.java | 36 +-
.../store/blockcache/BlockDirectoryTest.java | 2 +-
.../solr/uninverting/TestDocTermOrds.java | 4 +-
.../apache/solr/uninverting/TestFieldCache.java | 4 +-
.../TestFieldCacheSanityChecker.java | 164 --
.../solr/uninverting/TestLegacyFieldCache.java | 35 +-
.../solr/update/DirectUpdateHandlerTest.java | 114 +-
.../apache/solr/update/DocumentBuilderTest.java | 382 +----
.../solr/update/SolrIndexMetricsTest.java | 49 +-
.../solr/update/TestInPlaceUpdatesDistrib.java | 158 +-
.../update/TestInPlaceUpdatesStandalone.java | 33 +-
.../org/apache/solr/update/UpdateLogTest.java | 13 +-
.../update/processor/AtomicUpdatesTest.java | 28 +-
.../CloneFieldUpdateProcessorFactoryTest.java | 14 +-
.../DefaultValueUpdateProcessorTest.java | 7 +-
.../FieldMutatingUpdateProcessorTest.java | 14 +-
.../ParsingFieldUpdateProcessorsTest.java | 10 +-
.../processor/TolerantUpdateProcessorTest.java | 16 +-
.../UUIDUpdateProcessorFallbackTest.java | 3 +-
.../processor/UpdateProcessorTestBase.java | 7 +-
.../apache/solr/util/SimplePostToolTest.java | 2 +-
.../apache/solr/util/SolrPluginUtilsTest.java | 89 +-
.../apache/solr/util/TestSolrCLIRunExample.java | 2 +-
.../apache/solr/util/stats/MetricUtilsTest.java | 107 +-
.../example-DIH/solr/db/conf/managed-schema | 44 +-
.../example-DIH/solr/db/conf/synonyms.txt | 2 +-
.../example-DIH/solr/mail/conf/managed-schema | 45 +-
.../example-DIH/solr/mail/conf/synonyms.txt | 2 +-
.../example-DIH/solr/rss/conf/managed-schema | 53 +-
.../example-DIH/solr/rss/conf/synonyms.txt | 2 +-
.../example-DIH/solr/solr/conf/managed-schema | 44 +-
.../example-DIH/solr/solr/conf/synonyms.txt | 2 +-
.../example-DIH/solr/tika/conf/managed-schema | 23 +-
solr/example/files/conf/managed-schema | 30 +-
solr/example/files/conf/synonyms.txt | 2 +-
solr/licenses/Saxon-HE-9.6.0-2.jar.sha1 | 1 -
solr/licenses/Saxon-HE-LICENSE-MPL.txt | 108 --
solr/licenses/aopalliance-1.0.jar.sha1 | 1 -
solr/licenses/aopalliance-LICENSE-PD.txt | 1 -
solr/licenses/argparse4j-0.4.3.jar.sha1 | 1 -
solr/licenses/argparse4j-LICENSE-MIT.txt | 23 -
solr/licenses/avro-1.7.5.jar.sha1 | 1 -
solr/licenses/avro-LICENSE-ASL.txt | 308 ----
solr/licenses/avro-NOTICE.txt | 9 -
solr/licenses/bcpkix-jdk15on-1.47.jar.sha1 | 1 -
.../bcpkix-jdk15on-LICENSE-BSD_LIKE.txt | 15 -
solr/licenses/bcpkix-jdk15on-NOTICE.txt | 2 -
solr/licenses/config-1.0.2.jar.sha1 | 1 -
solr/licenses/config-LICENSE-ASL.txt | 202 ---
solr/licenses/config-NOTICE.txt | 0
solr/licenses/guice-3.0.jar.sha1 | 1 -
solr/licenses/guice-LICENSE-ASL.txt | 202 ---
solr/licenses/guice-NOTICE.txt | 0
solr/licenses/guice-servlet-3.0.jar.sha1 | 1 -
solr/licenses/guice-servlet-LICENSE-ASL.txt | 202 ---
solr/licenses/guice-servlet-NOTICE.txt | 0
.../hadoop-mapreduce-client-app-2.7.2.jar.sha1 | 1 -
.../hadoop-mapreduce-client-app-LICENSE-ASL.txt | 244 ---
.../hadoop-mapreduce-client-app-NOTICE.txt | 2 -
...adoop-mapreduce-client-common-2.7.2.jar.sha1 | 1 -
...doop-mapreduce-client-common-LICENSE-ASL.txt | 244 ---
.../hadoop-mapreduce-client-common-NOTICE.txt | 2 -
.../hadoop-mapreduce-client-core-2.7.2.jar.sha1 | 1 -
...hadoop-mapreduce-client-core-LICENSE-ASL.txt | 244 ---
.../hadoop-mapreduce-client-core-NOTICE.txt | 2 -
.../hadoop-mapreduce-client-hs-2.7.2.jar.sha1 | 1 -
.../hadoop-mapreduce-client-hs-LICENSE-ASL.txt | 244 ---
.../hadoop-mapreduce-client-hs-NOTICE.txt | 2 -
...reduce-client-jobclient-2.7.2-tests.jar.sha1 | 1 -
...op-mapreduce-client-jobclient-2.7.2.jar.sha1 | 1 -
...p-mapreduce-client-jobclient-LICENSE-ASL.txt | 244 ---
...hadoop-mapreduce-client-jobclient-NOTICE.txt | 2 -
...doop-mapreduce-client-shuffle-2.7.2.jar.sha1 | 1 -
...oop-mapreduce-client-shuffle-LICENSE-ASL.txt | 244 ---
.../hadoop-mapreduce-client-shuffle-NOTICE.txt | 2 -
solr/licenses/hadoop-yarn-api-2.7.2.jar.sha1 | 1 -
solr/licenses/hadoop-yarn-api-LICENSE-ASL.txt | 244 ---
solr/licenses/hadoop-yarn-api-NOTICE.txt | 2 -
solr/licenses/hadoop-yarn-client-2.7.2.jar.sha1 | 1 -
.../licenses/hadoop-yarn-client-LICENSE-ASL.txt | 244 ---
solr/licenses/hadoop-yarn-client-NOTICE.txt | 2 -
solr/licenses/hadoop-yarn-common-2.7.2.jar.sha1 | 1 -
.../licenses/hadoop-yarn-common-LICENSE-ASL.txt | 244 ---
solr/licenses/hadoop-yarn-common-NOTICE.txt | 2 -
...ver-applicationhistoryservice-2.7.2.jar.sha1 | 1 -
...er-applicationhistoryservice-LICENSE-ASL.txt | 244 ---
...-server-applicationhistoryservice-NOTICE.txt | 2 -
.../hadoop-yarn-server-common-2.7.2.jar.sha1 | 1 -
.../hadoop-yarn-server-common-LICENSE-ASL.txt | 244 ---
.../hadoop-yarn-server-common-NOTICE.txt | 2 -
...adoop-yarn-server-nodemanager-2.7.2.jar.sha1 | 1 -
...doop-yarn-server-nodemanager-LICENSE-ASL.txt | 244 ---
.../hadoop-yarn-server-nodemanager-NOTICE.txt | 2 -
...p-yarn-server-resourcemanager-2.7.2.jar.sha1 | 1 -
...-yarn-server-resourcemanager-LICENSE-ASL.txt | 244 ---
...adoop-yarn-server-resourcemanager-NOTICE.txt | 2 -
...adoop-yarn-server-tests-2.7.2-tests.jar.sha1 | 1 -
.../hadoop-yarn-server-tests-LICENSE-ASL.txt | 244 ---
.../hadoop-yarn-server-tests-NOTICE.txt | 2 -
.../hadoop-yarn-server-web-proxy-2.7.2.jar.sha1 | 1 -
...hadoop-yarn-server-web-proxy-LICENSE-ASL.txt | 244 ---
.../hadoop-yarn-server-web-proxy-NOTICE.txt | 2 -
solr/licenses/jackson-jaxrs-1.9.13.jar.sha1 | 1 -
solr/licenses/jackson-jaxrs-LICENSE-ASL.txt | 13 -
solr/licenses/jackson-jaxrs-NOTICE.txt | 7 -
solr/licenses/javax.inject-1.jar.sha1 | 1 -
solr/licenses/javax.inject-LICENSE-ASL.txt | 202 ---
solr/licenses/javax.inject-NOTICE.txt | 0
solr/licenses/jaxb-impl-2.2.3-1.jar.sha1 | 1 -
solr/licenses/jaxb-impl-LICENSE-CDDL.txt | 135 --
solr/licenses/jersey-bundle-1.9.jar.sha1 | 1 -
solr/licenses/jersey-bundle-LICENSE-CDDL.txt | 85 -
solr/licenses/jersey-guice-1.9.jar.sha1 | 1 -
solr/licenses/jersey-guice-LICENSE-CDDL.txt | 85 -
solr/licenses/jersey-json-1.9.jar.sha1 | 1 -
solr/licenses/jersey-json-LICENSE-CDDL.txt | 85 -
.../kite-morphlines-avro-1.1.0.jar.sha1 | 1 -
.../kite-morphlines-avro-LICENSE-ASL.txt | 202 ---
solr/licenses/kite-morphlines-avro-NOTICE.txt | 8 -
.../kite-morphlines-core-1.1.0-tests.jar.sha1 | 1 -
.../kite-morphlines-core-1.1.0.jar.sha1 | 1 -
.../kite-morphlines-core-LICENSE-ASL.txt | 202 ---
solr/licenses/kite-morphlines-core-NOTICE.txt | 8 -
...orphlines-hadoop-sequencefile-1.1.0.jar.sha1 | 1 -
...rphlines-hadoop-sequencefile-LICENSE-ASL.txt | 202 ---
...te-morphlines-hadoop-sequencefile-NOTICE.txt | 8 -
.../kite-morphlines-json-1.1.0.jar.sha1 | 1 -
.../kite-morphlines-json-LICENSE-ASL.txt | 202 ---
solr/licenses/kite-morphlines-json-NOTICE.txt | 8 -
.../kite-morphlines-saxon-1.1.0.jar.sha1 | 1 -
.../kite-morphlines-saxon-LICENSE-ASL.txt | 202 ---
solr/licenses/kite-morphlines-saxon-NOTICE.txt | 8 -
.../kite-morphlines-tika-core-1.1.0.jar.sha1 | 1 -
.../kite-morphlines-tika-core-LICENSE-ASL.txt | 202 ---
.../kite-morphlines-tika-core-NOTICE.txt | 8 -
...te-morphlines-tika-decompress-1.1.0.jar.sha1 | 1 -
...e-morphlines-tika-decompress-LICENSE-ASL.txt | 202 ---
.../kite-morphlines-tika-decompress-NOTICE.txt | 8 -
.../kite-morphlines-twitter-1.1.0.jar.sha1 | 1 -
.../kite-morphlines-twitter-LICENSE-ASL.txt | 202 ---
.../licenses/kite-morphlines-twitter-NOTICE.txt | 8 -
solr/licenses/leveldb-0.7.jar.sha1 | 1 -
solr/licenses/leveldb-LICENSE-BSD.txt | 27 -
solr/licenses/leveldb-NOTICE.txt | 0
solr/licenses/leveldb-api-0.7.jar.sha1 | 1 -
solr/licenses/leveldb-api-LICENSE-BSD.txt | 27 -
solr/licenses/leveldb-api-NOTICE.txt | 0
solr/licenses/leveldbjni-1.8.jar.sha1 | 1 -
solr/licenses/leveldbjni-LICENSE-BSD.txt | 27 -
solr/licenses/leveldbjni-NOTICE.txt | 0
.../metrics-healthchecks-3.1.2.jar.sha1 | 1 -
.../metrics-healthchecks-LICENSE-ASL.txt | 202 ---
solr/licenses/metrics-healthchecks-NOTICE.txt | 11 -
solr/licenses/mrunit-1.0.0-hadoop2.jar.sha1 | 1 -
solr/licenses/mrunit-LICENSE-ASL.txt | 479 ------
solr/licenses/mrunit-NOTICE.txt | 5 -
solr/licenses/netty-3.2.4.Final.jar.sha1 | 1 -
solr/licenses/netty-LICENSE-ASL.txt | 202 ---
solr/licenses/netty-NOTICE.txt | 98 --
solr/licenses/paranamer-2.3.jar.sha1 | 1 -
solr/licenses/paranamer-LICENSE-BSD.txt | 28 -
solr/licenses/paranamer-NOTICE.txt | 0
solr/licenses/rome-1.6.1.jar.sha1 | 1 -
solr/licenses/snappy-java-1.0.5.jar.sha1 | 1 -
solr/licenses/snappy-java-LICENSE-ASL.txt | 201 ---
solr/licenses/snappy-java-NOTICE.txt | 0
solr/scripts/README.txt | 13 -
solr/scripts/abc | 159 --
solr/scripts/abo | 158 --
solr/scripts/backup | 109 --
solr/scripts/backupcleaner | 134 --
solr/scripts/commit | 109 --
solr/scripts/optimize | 109 --
solr/scripts/rsyncd-disable | 77 -
solr/scripts/rsyncd-enable | 76 -
solr/scripts/rsyncd-start | 147 --
solr/scripts/rsyncd-stop | 105 --
solr/scripts/scripts-util | 141 --
solr/scripts/snapcleaner | 146 --
solr/scripts/snapinstaller | 190 ---
solr/scripts/snappuller | 261 ----
solr/scripts/snappuller-disable | 77 -
solr/scripts/snappuller-enable | 77 -
solr/scripts/snapshooter | 128 --
solr/server/etc/jetty.xml | 54 +-
solr/server/scripts/cloud-scripts/zkcli.bat | 2 +-
solr/server/scripts/cloud-scripts/zkcli.sh | 2 +-
.../map-reduce/set-map-reduce-classpath.sh | 52 -
.../basic_configs/conf/managed-schema | 120 +-
.../configsets/basic_configs/conf/synonyms.txt | 2 +-
.../conf/managed-schema | 117 +-
.../conf/synonyms.txt | 2 +-
.../conf/managed-schema | 136 +-
.../conf/solrconfig.xml | 2 +-
.../conf/synonyms.txt | 2 +-
solr/site/quickstart.mdtext | 2 -
.../solrj/beans/DocumentObjectBinder.java | 4 +-
.../client/solrj/impl/BinaryRequestWriter.java | 4 +-
.../solr/client/solrj/impl/CloudSolrClient.java | 38 +-
.../solrj/impl/ConcurrentUpdateSolrClient.java | 2 +-
.../apache/solr/client/solrj/io/ModelCache.java | 14 +-
.../solr/client/solrj/io/SolrClientCache.java | 26 +-
.../org/apache/solr/client/solrj/io/Tuple.java | 21 +-
.../client/solrj/io/comp/FieldComparator.java | 5 +
.../solrj/io/comp/MultipleFieldComparator.java | 22 +
.../client/solrj/io/comp/StreamComparator.java | 1 +
.../client/solrj/io/eval/EqualsEvaluator.java | 2 +-
.../client/solrj/io/eval/FieldEvaluator.java | 28 +-
.../solrj/io/eval/NaturalLogEvaluator.java | 60 +
.../solrj/io/graph/GatherNodesStream.java | 6 +-
.../solrj/io/graph/ShortestPathStream.java | 6 +-
.../client/solrj/io/ops/GroupOperation.java | 8 +-
.../solrj/io/stream/CartesianProductStream.java | 301 ++++
.../client/solrj/io/stream/CloudSolrStream.java | 9 +-
.../client/solrj/io/stream/DaemonStream.java | 9 +-
.../client/solrj/io/stream/ExecutorStream.java | 4 +-
.../client/solrj/io/stream/FacetStream.java | 8 +-
.../io/stream/FeaturesSelectionStream.java | 7 +-
.../client/solrj/io/stream/FetchStream.java | 9 +-
.../solr/client/solrj/io/stream/JDBCStream.java | 8 +-
.../client/solrj/io/stream/ModelStream.java | 6 +-
.../client/solrj/io/stream/ParallelStream.java | 13 +-
.../client/solrj/io/stream/RandomStream.java | 14 +-
.../solr/client/solrj/io/stream/RankStream.java | 8 +-
.../solrj/io/stream/ScoreNodesStream.java | 8 +-
.../solrj/io/stream/SignificantTermsStream.java | 66 +-
.../client/solrj/io/stream/StatsStream.java | 14 +-
.../client/solrj/io/stream/TextLogitStream.java | 9 +-
.../client/solrj/io/stream/TopicStream.java | 27 +-
.../client/solrj/io/stream/TupleStream.java | 94 ++
.../client/solrj/io/stream/UpdateStream.java | 4 +-
.../solrj/io/stream/metrics/MeanMetric.java | 35 +-
.../client/solrj/io/stream/metrics/Metric.java | 1 +
.../solrj/request/CollectionAdminRequest.java | 6 +
.../request/JavaBinUpdateRequestCodec.java | 34 +-
.../client/solrj/request/UpdateRequest.java | 9 +-
.../client/solrj/response/QueryResponse.java | 6 +-
.../solrj/response/SpellCheckResponse.java | 4 +-
.../client/solrj/response/TermsResponse.java | 37 +-
.../solr/client/solrj/util/ClientUtils.java | 32 +-
.../apache/solr/common/SolrInputDocument.java | 53 +-
.../org/apache/solr/common/SolrInputField.java | 28 +-
.../solr/common/ToleratedUpdateError.java | 10 +-
.../apache/solr/common/cloud/DocCollection.java | 14 +-
.../org/apache/solr/common/cloud/DocRouter.java | 4 +-
.../solr/common/cloud/HashBasedRouter.java | 8 +-
.../solr/common/cloud/ZkMaintenanceUtils.java | 147 +-
.../apache/solr/common/cloud/ZkStateReader.java | 5 +-
.../apache/solr/common/params/CommonParams.java | 8 +-
.../solr/common/params/ConfigSetParams.java | 1 +
.../solr/common/params/HighlightParams.java | 1 +
.../common/params/ModifiableSolrParams.java | 13 +
.../apache/solr/common/params/ShardParams.java | 24 +-
.../apache/solr/common/params/TermsParams.java | 24 +-
.../apache/solr/common/util/JavaBinCodec.java | 34 +-
.../solr/common/util/JsonRecordReader.java | 2 +-
.../org/apache/solr/common/util/StrUtils.java | 2 +-
.../solrj/solr/collection1/conf/schema-sql.xml | 59 +-
.../solrj/solr/collection1/conf/schema.xml | 59 +-
.../solr/configsets/streaming/conf/schema.xml | 57 +-
.../solr/client/solrj/SolrExampleTests.java | 92 +-
.../solr/client/solrj/SolrExampleTestsBase.java | 14 +-
.../solr/client/solrj/TestLBHttpSolrClient.java | 2 +-
.../solrj/embedded/SolrExampleJettyTest.java | 2 +-
.../embedded/SolrExampleStreamingTest.java | 4 +-
.../client/solrj/impl/CloudSolrClientTest.java | 73 +
.../impl/ConcurrentUpdateSolrClientTest.java | 6 +-
.../solrj/io/graph/GraphExpressionTest.java | 11 +-
.../solr/client/solrj/io/sql/JdbcTest.java | 19 +
.../solrj/io/stream/StreamExpressionTest.java | 366 ++++-
.../stream/StreamExpressionToExpessionTest.java | 8 +-
.../stream/eval/AbsoluteValueEvaluatorTest.java | 8 +-
.../solrj/io/stream/eval/AddEvaluatorTest.java | 8 +-
.../solrj/io/stream/eval/AndEvaluatorTest.java | 8 +-
.../io/stream/eval/CompoundEvaluatorTest.java | 8 +-
.../io/stream/eval/DivideEvaluatorTest.java | 10 +-
.../io/stream/eval/EqualsEvaluatorTest.java | 8 +-
.../stream/eval/ExclusiveOrEvaluatorTest.java | 8 +-
.../io/stream/eval/FieldEvaluatorTest.java | 114 ++
.../eval/GreaterThanEqualToEvaluatorTest.java | 8 +-
.../stream/eval/GreaterThanEvaluatorTest.java | 8 +-
.../eval/LessThanEqualToEvaluatorTest.java | 8 +-
.../io/stream/eval/LessThanEvaluatorTest.java | 8 +-
.../io/stream/eval/MultiplyEvaluatorTest.java | 8 +-
.../io/stream/eval/NaturalLogEvaluatorTest.java | 98 ++
.../solrj/io/stream/eval/NotEvaluatorTest.java | 10 +-
.../solrj/io/stream/eval/OrEvaluatorTest.java | 8 +-
.../io/stream/eval/RawValueEvaluatorTest.java | 8 +-
.../io/stream/eval/SubtractEvaluatorTest.java | 8 +-
.../solr/client/solrj/request/SchemaTest.java | 2 +-
.../client/solrj/request/TestCoreAdmin.java | 4 +-
.../solrj/request/TestUpdateRequestCodec.java | 20 +-
.../apache/solr/common/SolrDocumentTest.java | 6 +-
.../common/params/ModifiableSolrParamsTest.java | 26 +
.../solr/common/params/SolrParamTest.java | 4 +-
.../solr/BaseDistributedSearchTestCase.java | 37 +-
.../java/org/apache/solr/SolrTestCaseJ4.java | 90 +-
.../cloud/AbstractFullDistribZkTestBase.java | 14 +-
.../apache/solr/cloud/MiniSolrCloudCluster.java | 6 +-
solr/webapp/web/WEB-INF/web.xml | 2 +-
solr/webapp/web/css/angular/cloud.css | 24 +
solr/webapp/web/css/angular/collections.css | 17 +
solr/webapp/web/js/angular/controllers/cloud.js | 19 +-
.../web/js/angular/controllers/collections.js | 14 +
solr/webapp/web/js/angular/services.js | 1 +
solr/webapp/web/partials/cloud.html | 1 +
solr/webapp/web/partials/collections.html | 18 +-
1372 files changed, 24074 insertions(+), 73768 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/770265fb/solr/core/src/java/org/apache/solr/handler/component/QueryComponent.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/770265fb/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/770265fb/solr/core/src/java/org/apache/solr/search/grouping/distributed/responseprocessor/SearchGroupShardResponseProcessor.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/770265fb/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java
index 9c08406,2602221..bb2d821
--- a/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java
+++ b/solr/core/src/java/org/apache/solr/search/grouping/distributed/shardresultserializer/SearchGroupsResultTransformer.java
@@@ -16,9 -16,11 +16,11 @@@
*/
package org.apache.solr.search.grouping.distributed.shardresultserializer;
-import org.apache.lucene.search.Sort;
+import org.apache.lucene.search.SortField;
import org.apache.lucene.search.grouping.SearchGroup;
import org.apache.lucene.util.BytesRef;
+ import org.apache.lucene.util.BytesRefBuilder;
+ import org.apache.lucene.util.CharsRefBuilder;
import org.apache.solr.common.util.NamedList;
import org.apache.solr.schema.SchemaField;
import org.apache.solr.search.SolrIndexSearcher;
@@@ -57,7 -58,7 +59,13 @@@ public class SearchGroupsResultTransfor
final SearchGroupsFieldCommandResult fieldCommandResult = fieldCommand.result();
final Collection<SearchGroup<BytesRef>> searchGroups = fieldCommandResult.getSearchGroups();
if (searchGroups != null) {
++<<<<<<< HEAD
+ commandResult.add(TOP_GROUPS, serializeSearchGroup(searchGroups, fieldCommand.getGroupSortSpec()));
++||||||| merged common ancestors
++ commandResult.add(TOP_GROUPS, serializeSearchGroup(searchGroups, fieldCommand.getGroupSort()));
++=======
+ commandResult.add(TOP_GROUPS, serializeSearchGroup(searchGroups, fieldCommand));
++>>>>>>> master
}
final Integer groupedCount = fieldCommandResult.getGroupCount();
if (groupedCount != null) {
@@@ -92,10 -87,21 +100,20 @@@
if (rawSearchGroups != null) {
for (Map.Entry<String, List<Comparable>> rawSearchGroup : rawSearchGroups){
SearchGroup<BytesRef> searchGroup = new SearchGroup<>();
- searchGroup.groupValue = rawSearchGroup.getKey() != null ? new BytesRef(rawSearchGroup.getKey()) : null;
+ SchemaField groupField = rawSearchGroup.getKey() != null? searcher.getSchema().getFieldOrNull(command.getKey()) : null;
+ searchGroup.groupValue = null;
+ if (rawSearchGroup.getKey() != null) {
+ if (groupField != null) {
+ BytesRefBuilder builder = new BytesRefBuilder();
+ groupField.getType().readableToIndexed(rawSearchGroup.getKey(), builder);
+ searchGroup.groupValue = builder.get();
+ } else {
+ searchGroup.groupValue = new BytesRef(rawSearchGroup.getKey());
+ }
+ }
searchGroup.sortValues = rawSearchGroup.getValue().toArray(new Comparable[rawSearchGroup.getValue().size()]);
for (int i = 0; i < searchGroup.sortValues.length; i++) {
- SchemaField field = groupSort.getSort()[i].getField() != null ? searcher.getSchema().getFieldOrNull(groupSort.getSort()[i].getField()) : null;
- searchGroup.sortValues[i] = ShardResultTransformerUtils.unmarshalSortValue(searchGroup.sortValues[i], field);
+ searchGroup.sortValues[i] = ShardResultTransformerUtils.unmarshalSortValue(searchGroup.sortValues[i], groupSchemaFields.get(i));
}
searchGroups.add(searchGroup);
}
@@@ -107,20 -113,19 +125,38 @@@
return result;
}
++<<<<<<< HEAD
+
+ private NamedList serializeSearchGroup(Collection<SearchGroup<BytesRef>> data, SortSpec groupSortSpec) {
++||||||| merged common ancestors
++ private NamedList serializeSearchGroup(Collection<SearchGroup<BytesRef>> data, Sort groupSort) {
++=======
+ private NamedList serializeSearchGroup(Collection<SearchGroup<BytesRef>> data, SearchGroupsFieldCommand command) {
++>>>>>>> master
final NamedList<Object[]> result = new NamedList<>(data.size());
+ final List<SchemaField> groupSchemaFields = groupSortSpec.getSchemaFields();
+ final SortField[] groupSortFields = groupSortSpec.getSort().getSort();
+
+ assert (groupSchemaFields.size() == groupSortFields.length);
for (SearchGroup<BytesRef> searchGroup : data) {
Object[] convertedSortValues = new Object[searchGroup.sortValues.length];
for (int i = 0; i < searchGroup.sortValues.length; i++) {
++<<<<<<< HEAD
+ convertedSortValues[i] = ShardResultTransformerUtils.marshalSortValue(searchGroup.sortValues[i], groupSchemaFields.get(i));
++||||||| merged common ancestors
++ Object sortValue = searchGroup.sortValues[i];
++ SchemaField field = groupSort.getSort()[i].getField() != null ? searcher.getSchema().getFieldOrNull(groupSort.getSort()[i].getField()) : null;
++ convertedSortValues[i] = ShardResultTransformerUtils.marshalSortValue(sortValue, field);
++=======
+ Object sortValue = searchGroup.sortValues[i];
+ SchemaField field = command.getGroupSort().getSort()[i].getField() != null ?
+ searcher.getSchema().getFieldOrNull(command.getGroupSort().getSort()[i].getField()) : null;
+ convertedSortValues[i] = ShardResultTransformerUtils.marshalSortValue(sortValue, field);
++>>>>>>> master
}
- String groupValue = searchGroup.groupValue != null ? searchGroup.groupValue.utf8ToString() : null;
+ SchemaField field = searcher.getSchema().getFieldOrNull(command.getKey());
+ String groupValue = searchGroup.groupValue != null ? field.getType().indexedToReadable(searchGroup.groupValue, new CharsRefBuilder()).toString() : null;
result.add(groupValue, convertedSortValues);
}