You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by is...@apache.org on 2019/08/01 10:18:58 UTC
[lucene-solr] 01/01: Merge branch 'master' into jira/solr-13350
This is an automated email from the ASF dual-hosted git repository.
ishan pushed a commit to branch jira/solr-13350
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 60d71d588597d74c9d4e1076c69451c723087b9e
Merge: 0f37824 15c2fd6
Author: Ishan Chattopadhyaya <is...@apache.org>
AuthorDate: Thu Aug 1 13:10:32 2019 +0530
Merge branch 'master' into jira/solr-13350
.github/PULL_REQUEST_TEMPLATE.md | 14 +-
README.md | 8 +-
dev-tools/doap/lucene.rdf | 7 +
dev-tools/doap/solr.rdf | 7 +
lucene/CHANGES.txt | 58 +-
.../analysis/charfilter/MappingCharFilter.java | 8 +-
.../analysis/charfilter/NormalizeCharMap.java | 6 +-
.../analysis/es/SpanishMinimalStemFilter.java | 58 ++
.../es/SpanishMinimalStemFilterFactory.java | 52 ++
.../lucene/analysis/es/SpanishMinimalStemmer.java | 80 +++
.../lucene/analysis/fr/FrenchMinimalStemmer.java | 2 +-
.../lucene/analysis/hunspell/Dictionary.java | 12 +-
.../apache/lucene/analysis/hunspell/Stemmer.java | 12 +-
.../miscellaneous/StemmerOverrideFilter.java | 4 +-
.../lucene/analysis/synonym/SynonymFilter.java | 8 +-
.../analysis/synonym/SynonymGraphFilter.java | 8 +-
....apache.lucene.analysis.util.TokenFilterFactory | 1 +
.../TestSpanishMinimalStemFilter.java} | 66 +-
.../es/TestSpanishMinimalStemFilterFactory.java | 47 ++
.../analysis/fr/TestFrenchMinimalStemFilter.java | 19 +-
.../analysis/shingle/FixedShingleFilterTest.java | 17 +
.../analysis/synonym/TestSynonymGraphFilter.java | 25 +-
.../lucene/analysis/ja/JapaneseTokenizer.java | 8 +-
.../lucene/analysis/ja/dict/UserDictionary.java | 4 +-
lucene/analysis/nori/build.xml | 63 +-
.../apache/lucene/analysis/ko/KoreanTokenizer.java | 8 +-
.../analysis/ko/dict/TokenInfoDictionary.java | 14 +-
.../lucene/analysis/ko/dict/UserDictionary.java | 4 +-
.../analysis/ko/util/BinaryDictionaryWriter.java | 66 +-
.../ko/util/CharacterDefinitionWriter.java | 25 +-
.../analysis/ko/util/ConnectionCostsBuilder.java | 61 ++
.../analysis/ko/util/ConnectionCostsWriter.java | 30 +-
.../lucene/analysis/ko/util/DictionaryBuilder.java | 54 ++
.../ko/util/TokenInfoDictionaryBuilder.java | 127 ++++
.../ko/util/TokenInfoDictionaryWriter.java | 18 +-
.../analysis/ko/util/UnknownDictionaryBuilder.java | 118 ++++
.../analysis/ko/util/UnknownDictionaryWriter.java | 5 +-
.../analysis/ko/dict/TokenInfoDictionary$fst.dat | Bin 5640903 -> 5641400 bytes
...ictionary.java => TokenInfoDictionaryTest.java} | 69 +-
.../analysis/ko/util}/UnknownDictionaryTest.java | 5 +-
.../analysis/ko/util/ConnectionCostsBuilder.java | 67 --
.../lucene/analysis/ko/util/DictionaryBuilder.java | 67 --
.../ko/util/TokenInfoDictionaryBuilder.java | 152 -----
.../analysis/ko/util/UnknownDictionaryBuilder.java | 134 ----
.../analysis/ko/dict/TokenInfoDictionaryTest.java | 80 ---
.../lucene/index/TestBackwardsCompatibility.java | 7 +-
.../org/apache/lucene/index/index.8.2.0-cfs.zip | Bin 0 -> 15617 bytes
.../org/apache/lucene/index/index.8.2.0-nocfs.zip | Bin 0 -> 15630 bytes
.../test/org/apache/lucene/index/sorted.8.2.0.zip | Bin 0 -> 131154 bytes
.../benchmark/byTask/feeds/DemoHTMLParser.java | 21 +-
.../blocktreeords/OrdsIntersectTermsEnum.java | 6 +-
.../codecs/blocktreeords/OrdsSegmentTermsEnum.java | 78 ++-
.../lucene/codecs/memory/FSTOrdTermsReader.java | 35 +-
.../lucene/codecs/memory/FSTTermsReader.java | 45 +-
.../codecs/blocktree/IntersectTermsEnum.java | 6 +-
.../lucene/codecs/blocktree/SegmentTermsEnum.java | 48 +-
.../java/org/apache/lucene/index/FieldInfos.java | 10 +-
.../java/org/apache/lucene/index/IndexWriter.java | 16 -
.../lucene/search/Boolean2ScorerSupplier.java | 13 +
.../org/apache/lucene/search/BooleanQuery.java | 28 +
.../apache/lucene/search/DisjunctionMaxScorer.java | 28 +-
.../DisjunctionScoreBlockBoundaryPropagator.java | 112 ++++
.../java/org/apache/lucene/search/PhraseQuery.java | 7 +
.../java/org/apache/lucene/store/FSDirectory.java | 2 +-
.../java/org/apache/lucene/store/RateLimiter.java | 12 +-
.../src/java/org/apache/lucene/util/Version.java | 7 +
.../apache/lucene/util/fst/BytesRefFSTEnum.java | 2 +-
.../src/java/org/apache/lucene/util/fst/FST.java | 391 ++++++-----
.../java/org/apache/lucene/util/fst/FSTEnum.java | 209 +++---
.../org/apache/lucene/util/fst/IntsRefFSTEnum.java | 2 +-
.../java/org/apache/lucene/util/fst/NodeHash.java | 21 +-
.../src/java/org/apache/lucene/util/fst/Util.java | 223 +++----
.../util/graph/GraphTokenStreamFiniteStrings.java | 84 ++-
.../apache/lucene/analysis/TestCharArrayMap.java | 134 ++--
.../apache/lucene/analysis/TestCharArraySet.java | 110 +---
.../lucene/index/TestAllFilesCheckIndexHeader.java | 20 +-
.../lucene/index/TestAllFilesDetectTruncation.java | 21 +-
.../apache/lucene/index/TestDirectoryReader.java | 19 +-
.../apache/lucene/index/TestIndexableField.java | 7 +-
.../apache/lucene/index/TestSwappedIndexFiles.java | 21 +-
.../apache/lucene/search/TestBooleanScorer.java | 84 +++
...estDisjunctionScoreBlockBoundaryPropagator.java | 121 ++++
.../org/apache/lucene/search/TestPhraseQuery.java | 11 +
.../TestTopFieldCollectorEarlyTermination.java | 12 +-
.../org/apache/lucene/store/TestRateLimiter.java | 7 +-
.../test/org/apache/lucene/util/fst/TestFSTs.java | 20 +-
.../org/apache/lucene/util/fst/TestFstDirect.java | 54 +-
.../test/org/apache/lucene/util/fst/TestUtil.java | 115 ++++
.../graph/TestGraphTokenStreamFiniteStrings.java | 9 +-
.../lucene/search/join/TestCheckJoinIndex.java | 15 +-
.../queryparser/classic/TestQueryParser.java | 14 +-
.../queryparser/util/QueryParserTestBase.java | 55 +-
.../apache/lucene/replicator/nrt/PrimaryNode.java | 2 +-
.../lucene/replicator/LocalReplicatorTest.java | 8 +-
.../lucene/replicator/http/HttpReplicatorTest.java | 11 +-
.../idversion/IDVersionSegmentTermsEnum.java | 48 +-
.../lucene/document/FloatPointNearestNeighbor.java | 31 +-
.../lucene/document/BaseLatLonShapeTestCase.java | 2 +-
.../lucene/search/TestTermAutomatonQuery.java | 7 +-
.../suggest/analyzing/AnalyzingSuggester.java | 2 +-
.../lucene/search/suggest/analyzing/FSTUtil.java | 18 +-
.../suggest/analyzing/FreeTextSuggester.java | 4 +-
.../search/suggest/document/NRTSuggester.java | 2 +-
.../lucene/search/suggest/fst/FSTCompletion.java | 10 +-
.../search/suggest/fst/WFSTCompletionLookup.java | 6 +-
.../suggest/analyzing/AnalyzingSuggesterTest.java | 11 +-
.../org/apache/lucene/util/LuceneTestCase.java | 7 +-
.../java/org/apache/lucene/util/fst/FSTTester.java | 8 +-
.../TestCompressingTermVectorsFormat.java | 17 +-
.../apache/lucene/mockfile/TestHandleLimitFS.java | 9 +-
.../lucene/mockfile/TestHandleTrackingFS.java | 56 +-
.../org/apache/lucene/mockfile/TestLeakFS.java | 43 +-
.../org/apache/lucene/mockfile/TestVerboseFS.java | 76 +--
.../org/apache/lucene/mockfile/TestWindowsFS.java | 28 +-
.../lucene/store/TestMockDirectoryWrapper.java | 24 +-
.../util/TestRunWithRestrictedPermissions.java | 22 +-
solr/.gitignore | 1 +
solr/CHANGES.txt | 80 ++-
.../org/apache/solr/analytics/AnalyticsDriver.java | 10 +-
.../apache/solr/analytics/AnalyticsExpression.java | 14 +-
.../solr/analytics/AnalyticsGroupingManager.java | 48 +-
.../solr/analytics/AnalyticsRequestManager.java | 82 +--
.../solr/analytics/AnalyticsRequestParser.java | 106 +--
.../apache/solr/analytics/ExpressionFactory.java | 116 ++--
.../analytics/facet/AbstractSolrQueryFacet.java | 20 +-
.../solr/analytics/facet/AnalyticsFacet.java | 40 +-
.../apache/solr/analytics/facet/PivotFacet.java | 18 +-
.../org/apache/solr/analytics/facet/PivotNode.java | 32 +-
.../apache/solr/analytics/facet/QueryFacet.java | 4 +-
.../apache/solr/analytics/facet/RangeFacet.java | 10 +-
.../apache/solr/analytics/facet/SortableFacet.java | 36 +-
.../apache/solr/analytics/facet/ValueFacet.java | 6 +-
.../facet/compare/DelegatingComparator.java | 6 +-
.../facet/compare/ExpressionComparator.java | 6 +-
.../facet/compare/FacetResultsComparator.java | 10 +-
.../facet/compare/FacetValueComparator.java | 4 +-
.../solr/analytics/facet/compare/package-info.java | 4 +-
.../apache/solr/analytics/facet/package-info.java | 4 +-
.../analytics/function/ExpressionCalculator.java | 8 +-
.../MergingReductionCollectionManager.java | 8 +-
.../function/ReductionCollectionManager.java | 90 +--
.../solr/analytics/function/ReductionFunction.java | 2 +-
.../analytics/function/field/AnalyticsField.java | 22 +-
.../analytics/function/field/BooleanField.java | 4 +-
.../function/field/BooleanMultiField.java | 8 +-
.../solr/analytics/function/field/DateField.java | 4 +-
.../function/field/DateMultiPointField.java | 2 +-
.../function/field/DateMultiTrieField.java | 2 +-
.../solr/analytics/function/field/DoubleField.java | 4 +-
.../function/field/DoubleMultiPointField.java | 6 +-
.../function/field/DoubleMultiTrieField.java | 6 +-
.../solr/analytics/function/field/FloatField.java | 4 +-
.../function/field/FloatMultiPointField.java | 8 +-
.../function/field/FloatMultiTrieField.java | 8 +-
.../solr/analytics/function/field/IntField.java | 6 +-
.../function/field/IntMultiPointField.java | 8 +-
.../function/field/IntMultiTrieField.java | 8 +-
.../function/field/LongMultiPointField.java | 8 +-
.../function/field/LongMultiTrieField.java | 6 +-
.../analytics/function/field/StringMultiField.java | 4 +-
.../analytics/function/field/package-info.java | 4 +-
.../analytics/function/mapping/AddFunction.java | 6 +-
.../analytics/function/mapping/BottomFunction.java | 2 +-
.../function/mapping/ComparisonFunction.java | 18 +-
.../analytics/function/mapping/ConcatFunction.java | 8 +-
.../function/mapping/DateMathFunction.java | 6 +-
.../function/mapping/DateParseFunction.java | 10 +-
.../mapping/DecimalNumericConversionFunction.java | 22 +-
.../analytics/function/mapping/DivideFunction.java | 4 +-
.../analytics/function/mapping/EqualFunction.java | 14 +-
.../analytics/function/mapping/ExistsFunction.java | 10 +-
.../function/mapping/FillMissingFunction.java | 78 +--
.../analytics/function/mapping/FilterFunction.java | 82 +--
.../analytics/function/mapping/IfFunction.java | 42 +-
.../analytics/function/mapping/LambdaFunction.java | 408 ++++++------
.../analytics/function/mapping/LogFunction.java | 4 +-
.../analytics/function/mapping/LogicFunction.java | 10 +-
.../analytics/function/mapping/MultFunction.java | 6 +-
.../analytics/function/mapping/PowerFunction.java | 4 +-
.../analytics/function/mapping/RemoveFunction.java | 94 +--
.../function/mapping/ReplaceFunction.java | 84 +--
.../function/mapping/SubtractFunction.java | 2 +-
.../analytics/function/mapping/TopFunction.java | 2 +-
.../analytics/function/mapping/package-info.java | 4 +-
.../solr/analytics/function/package-info.java | 4 +-
.../function/reduction/CountFunction.java | 4 +-
.../function/reduction/DocCountFunction.java | 4 +-
.../analytics/function/reduction/MaxFunction.java | 14 +-
.../analytics/function/reduction/MeanFunction.java | 4 +-
.../function/reduction/MedianFunction.java | 6 +-
.../analytics/function/reduction/MinFunction.java | 14 +-
.../function/reduction/MissingFunction.java | 2 +-
.../function/reduction/OrdinalFunction.java | 16 +-
.../function/reduction/PercentileFunction.java | 16 +-
.../analytics/function/reduction/SumFunction.java | 4 +-
.../function/reduction/UniqueFunction.java | 2 +-
.../function/reduction/data/CountCollector.java | 28 +-
.../function/reduction/data/MaxCollector.java | 62 +-
.../function/reduction/data/MinCollector.java | 62 +-
.../reduction/data/ReductionDataCollector.java | 70 +-
.../reduction/data/SortedListCollector.java | 76 +--
.../function/reduction/data/SumCollector.java | 16 +-
.../function/reduction/data/UniqueCollector.java | 42 +-
.../function/reduction/data/package-info.java | 4 +-
.../analytics/function/reduction/package-info.java | 4 +-
.../org/apache/solr/analytics/package-info.java | 6 +-
.../apache/solr/analytics/plugin/package-info.java | 6 +-
.../stream/AnalyticsShardRequestManager.java | 28 +-
.../stream/AnalyticsShardResponseParser.java | 6 +-
.../apache/solr/analytics/stream/package-info.java | 4 +-
.../reservation/BooleanArrayReservation.java | 2 +-
.../reservation/BooleanCheckedReservation.java | 2 +-
.../stream/reservation/BooleanReservation.java | 2 +-
.../stream/reservation/DoubleArrayReservation.java | 2 +-
.../reservation/DoubleCheckedReservation.java | 2 +-
.../stream/reservation/DoubleReservation.java | 2 +-
.../stream/reservation/FloatArrayReservation.java | 2 +-
.../reservation/FloatCheckedReservation.java | 2 +-
.../stream/reservation/FloatReservation.java | 2 +-
.../stream/reservation/IntArrayReservation.java | 2 +-
.../stream/reservation/IntCheckedReservation.java | 2 +-
.../stream/reservation/IntReservation.java | 2 +-
.../stream/reservation/LongArrayReservation.java | 2 +-
.../stream/reservation/LongCheckedReservation.java | 2 +-
.../stream/reservation/LongReservation.java | 2 +-
.../ReductionCheckedDataReservation.java | 2 +-
.../reservation/ReductionDataArrayReservation.java | 2 +-
.../reservation/ReductionDataReservation.java | 10 +-
.../stream/reservation/StringArrayReservation.java | 2 +-
.../reservation/StringCheckedReservation.java | 2 +-
.../stream/reservation/StringReservation.java | 2 +-
.../analytics/stream/reservation/package-info.java | 4 +-
.../reservation/read/BooleanCheckedDataReader.java | 2 +-
.../reservation/read/BooleanDataArrayReader.java | 2 +-
.../stream/reservation/read/BooleanDataReader.java | 2 +-
.../reservation/read/DoubleCheckedDataReader.java | 2 +-
.../reservation/read/DoubleDataArrayReader.java | 2 +-
.../stream/reservation/read/DoubleDataReader.java | 2 +-
.../reservation/read/FloatCheckedDataReader.java | 2 +-
.../reservation/read/FloatDataArrayReader.java | 2 +-
.../stream/reservation/read/FloatDataReader.java | 2 +-
.../reservation/read/IntCheckedDataReader.java | 2 +-
.../reservation/read/IntDataArrayReader.java | 2 +-
.../stream/reservation/read/IntDataReader.java | 2 +-
.../reservation/read/LongCheckedDataReader.java | 2 +-
.../reservation/read/LongDataArrayReader.java | 2 +-
.../stream/reservation/read/LongDataReader.java | 2 +-
.../read/ReductionCheckedDataReader.java | 10 +-
.../reservation/read/ReductionDataArrayReader.java | 12 +-
.../reservation/read/ReductionDataReader.java | 6 +-
.../reservation/read/StringCheckedDataReader.java | 2 +-
.../reservation/read/StringDataArrayReader.java | 2 +-
.../stream/reservation/read/StringDataReader.java | 2 +-
.../stream/reservation/read/package-info.java | 4 +-
.../write/BooleanCheckedDataWriter.java | 2 +-
.../reservation/write/BooleanDataArrayWriter.java | 2 +-
.../reservation/write/BooleanDataWriter.java | 2 +-
.../reservation/write/DoubleCheckedDataWriter.java | 2 +-
.../reservation/write/DoubleDataArrayWriter.java | 2 +-
.../stream/reservation/write/DoubleDataWriter.java | 2 +-
.../reservation/write/FloatCheckedDataWriter.java | 2 +-
.../reservation/write/FloatDataArrayWriter.java | 2 +-
.../stream/reservation/write/FloatDataWriter.java | 2 +-
.../reservation/write/IntCheckedDataWriter.java | 2 +-
.../reservation/write/IntDataArrayWriter.java | 2 +-
.../stream/reservation/write/IntDataWriter.java | 2 +-
.../reservation/write/LongCheckedDataWriter.java | 2 +-
.../reservation/write/LongDataArrayWriter.java | 2 +-
.../stream/reservation/write/LongDataWriter.java | 2 +-
.../write/ReductionCheckedDataWriter.java | 12 +-
.../write/ReductionDataArrayWriter.java | 12 +-
.../reservation/write/ReductionDataWriter.java | 4 +-
.../reservation/write/StringCheckedDataWriter.java | 2 +-
.../reservation/write/StringDataArrayWriter.java | 2 +-
.../stream/reservation/write/StringDataWriter.java | 2 +-
.../stream/reservation/write/package-info.java | 4 +-
.../analytics/util/AnalyticsResponseHeadings.java | 2 +-
.../solr/analytics/util/FacetRangeGenerator.java | 94 +--
.../solr/analytics/util/OldAnalyticsParams.java | 24 +-
.../util/OldAnalyticsRequestConverter.java | 36 +-
.../solr/analytics/util/OrdinalCalculator.java | 2 +-
.../solr/analytics/util/function/package-info.java | 4 +-
.../apache/solr/analytics/util/package-info.java | 4 +-
.../solr/analytics/value/AnalyticsValue.java | 8 +-
.../solr/analytics/value/AnalyticsValueStream.java | 36 +-
.../apache/solr/analytics/value/BooleanValue.java | 8 +-
.../solr/analytics/value/BooleanValueStream.java | 8 +-
.../solr/analytics/value/ComparableValue.java | 2 +-
.../org/apache/solr/analytics/value/DateValue.java | 6 +-
.../solr/analytics/value/DateValueStream.java | 6 +-
.../apache/solr/analytics/value/DoubleValue.java | 6 +-
.../solr/analytics/value/DoubleValueStream.java | 4 +-
.../apache/solr/analytics/value/FloatValue.java | 4 +-
.../solr/analytics/value/FloatValueStream.java | 4 +-
.../org/apache/solr/analytics/value/IntValue.java | 4 +-
.../solr/analytics/value/IntValueStream.java | 6 +-
.../org/apache/solr/analytics/value/LongValue.java | 4 +-
.../solr/analytics/value/LongValueStream.java | 6 +-
.../apache/solr/analytics/value/StringValue.java | 4 +-
.../solr/analytics/value/StringValueStream.java | 4 +-
.../analytics/value/constant/ConstantValue.java | 18 +-
.../analytics/value/constant/package-info.java | 4 +-
.../apache/solr/analytics/value/package-info.java | 4 +-
.../org/apache/solr/handler/AnalyticsHandler.java | 12 +-
.../solr/handler/component/AnalyticsComponent.java | 87 +--
.../response/AnalyticsShardResponseWriter.java | 10 +-
.../solr/analytics/ExpressionFactoryTest.java | 58 +-
.../org/apache/solr/analytics/NoFacetTest.java | 62 +-
.../solr/analytics/OverallAnalyticsTest.java | 24 +-
.../solr/analytics/SolrAnalyticsTestCase.java | 62 +-
.../solr/analytics/facet/PivotFacetTest.java | 22 +-
.../solr/analytics/facet/QueryFacetTest.java | 24 +-
.../solr/analytics/facet/RangeFacetTest.java | 92 +--
.../facet/SolrAnalyticsFacetTestCase.java | 14 +-
.../solr/analytics/facet/ValueFacetTest.java | 90 +--
.../function/field/AbstractAnalyticsFieldTest.java | 100 +--
.../function/field/BooleanFieldsTest.java | 10 +-
.../analytics/function/field/DateFieldsTest.java | 18 +-
.../analytics/function/field/DoubleFieldsTest.java | 18 +-
.../analytics/function/field/FloatFieldsTest.java | 18 +-
.../analytics/function/field/IntFieldsTest.java | 18 +-
.../analytics/function/field/LongFieldsTest.java | 18 +-
.../analytics/function/field/StringFieldsTest.java | 10 +-
.../mapping/AbsoluteValueFunctionTest.java | 24 +-
.../function/mapping/AddFunctionTest.java | 28 +-
.../function/mapping/AndFunctionTest.java | 32 +-
.../function/mapping/BottomFunctionTest.java | 86 +--
.../function/mapping/CeilingFunctionTest.java | 18 +-
.../function/mapping/ConcatFunctionTest.java | 48 +-
.../function/mapping/DateMathFunctionTest.java | 14 +-
.../function/mapping/DateParseFunctionTest.java | 28 +-
.../function/mapping/DivideFunctionTest.java | 20 +-
.../function/mapping/EqualFunctionTest.java | 56 +-
.../function/mapping/FillMissingFunctionTest.java | 56 +-
.../function/mapping/FilterFunctionTest.java | 132 ++--
.../function/mapping/FloorFunctionTest.java | 18 +-
.../function/mapping/GTEFunctionTest.java | 30 +-
.../analytics/function/mapping/GTFunctionTest.java | 30 +-
.../analytics/function/mapping/IfFunctionTest.java | 112 ++--
.../function/mapping/LTEFunctionTest.java | 30 +-
.../analytics/function/mapping/LTFunctionTest.java | 30 +-
.../function/mapping/LogFunctionTest.java | 28 +-
.../function/mapping/MultFunctionTest.java | 26 +-
.../function/mapping/NegateFunctionTest.java | 30 +-
.../analytics/function/mapping/OrFunctionTest.java | 32 +-
.../function/mapping/PowerFunctionTest.java | 20 +-
.../function/mapping/RemoveFunctionTest.java | 68 +-
.../function/mapping/ReplaceFunctionTest.java | 130 ++--
.../function/mapping/RoundFunctionTest.java | 18 +-
.../function/mapping/StringCastFunctionTest.java | 6 +-
.../function/mapping/SubtractFunctionTest.java | 20 +-
.../function/mapping/TopFunctionTest.java | 86 +--
.../legacy/LegacyAbstractAnalyticsCloudTest.java | 8 +-
.../legacy/LegacyAbstractAnalyticsTest.java | 12 +-
.../analytics/legacy/LegacyNoFacetCloudTest.java | 128 ++--
.../solr/analytics/legacy/LegacyNoFacetTest.java | 118 ++--
.../legacy/expression/LegacyFunctionTest.java | 80 +--
.../LegacyAbstractAnalyticsFacetCloudTest.java | 14 +-
.../facet/LegacyAbstractAnalyticsFacetTest.java | 24 +-
.../legacy/facet/LegacyFacetSortingTest.java | 6 +-
.../legacy/facet/LegacyFieldFacetCloudTest.java | 216 +++---
.../facet/LegacyFieldFacetExtrasCloudTest.java | 52 +-
.../legacy/facet/LegacyFieldFacetExtrasTest.java | 46 +-
.../legacy/facet/LegacyFieldFacetTest.java | 190 +++---
.../legacy/facet/LegacyQueryFacetCloudTest.java | 24 +-
.../legacy/facet/LegacyQueryFacetTest.java | 18 +-
.../legacy/facet/LegacyRangeFacetCloudTest.java | 62 +-
.../legacy/facet/LegacyRangeFacetTest.java | 62 +-
.../analytics/value/CastingAnalyticsValueTest.java | 6 +-
.../value/CastingBooleanValueStreamTest.java | 10 +-
.../analytics/value/CastingBooleanValueTest.java | 18 +-
.../value/CastingDateValueStreamTest.java | 14 +-
.../solr/analytics/value/CastingDateValueTest.java | 22 +-
.../value/CastingDoubleValueStreamTest.java | 10 +-
.../analytics/value/CastingDoubleValueTest.java | 18 +-
.../value/CastingFloatValueStreamTest.java | 14 +-
.../analytics/value/CastingFloatValueTest.java | 24 +-
.../analytics/value/CastingIntValueStreamTest.java | 22 +-
.../solr/analytics/value/CastingIntValueTest.java | 36 +-
.../value/CastingLongValueStreamTest.java | 14 +-
.../solr/analytics/value/CastingLongValueTest.java | 24 +-
.../value/CastingStringValueStreamTest.java | 6 +-
.../analytics/value/CastingStringValueTest.java | 12 +-
.../solr/analytics/value/ConstantValueTest.java | 40 +-
.../solr/analytics/value/FillableTestValue.java | 94 +--
.../handler/dataimport/TestXPathRecordReader.java | 26 +-
solr/core/src/java/org/apache/solr/api/ApiBag.java | 26 +-
.../org/apache/solr/cloud/OverseerTaskQueue.java | 59 +-
.../solr/cloud/api/collections/AliasCmd.java | 29 +-
.../cloud/api/collections/CategoryRoutedAlias.java | 142 ++--
.../solr/cloud/api/collections/CreateAliasCmd.java | 3 +-
.../cloud/api/collections/DeleteCollectionCmd.java | 18 +-
.../api/collections/DimensionalRoutedAlias.java | 365 +++++++++++
.../MaintainCategoryRoutedAliasCmd.java | 183 ------
.../api/collections/MaintainRoutedAliasCmd.java | 182 ++++++
.../collections/MaintainTimeRoutedAliasCmd.java | 257 --------
.../OverseerCollectionMessageHandler.java | 37 +-
.../solr/cloud/api/collections/RoutedAlias.java | 392 +++++++++--
.../solr/cloud/api/collections/SplitShardCmd.java | 50 +-
.../cloud/api/collections/TimeRoutedAlias.java | 468 ++++++-------
.../java/org/apache/solr/core/BlobRepository.java | 7 +-
.../java/org/apache/solr/core/CoreContainer.java | 19 +
.../src/java/org/apache/solr/core/LibListener.java | 273 ++++++++
.../java/org/apache/solr/core/MemClassLoader.java | 17 +-
.../src/java/org/apache/solr/core/PluginBag.java | 284 +++-----
.../src/java/org/apache/solr/core/PluginInfo.java | 25 +-
.../src/java/org/apache/solr/core/RuntimeLib.java | 220 +++++++
.../src/java/org/apache/solr/core/SolrConfig.java | 11 +-
.../src/java/org/apache/solr/core/SolrCore.java | 18 +-
.../org/apache/solr/core/SolrResourceLoader.java | 26 +
.../java/org/apache/solr/handler/FilesStream.java | 262 ++++++++
.../org/apache/solr/handler/SolrConfigHandler.java | 511 ++++++++-------
.../solr/handler/SolrDefaultStreamFactory.java | 1 +
.../solr/handler/admin/BaseHandlerApiSupport.java | 29 +
.../solr/handler/admin/CollectionHandlerApi.java | 300 ++++++++-
.../solr/handler/admin/CollectionsHandler.java | 62 +-
.../org/apache/solr/handler/admin/SplitOp.java | 248 ++++++-
.../solr/handler/component/ResponseBuilder.java | 42 +-
.../java/org/apache/solr/request/SimpleFacets.java | 4 +-
.../java/org/apache/solr/search/CacheConfig.java | 168 ++---
.../java/org/apache/solr/search/FastLRUCache.java | 162 ++++-
.../src/java/org/apache/solr/search/LFUCache.java | 158 ++++-
.../src/java/org/apache/solr/search/LRUCache.java | 175 +++--
.../src/java/org/apache/solr/search/SolrCache.java | 19 +
.../org/apache/solr/search/SolrCacheHolder.java | 142 ++++
.../apache/solr/search/SolrDocumentFetcher.java | 3 +-
.../org/apache/solr/search/SolrIndexSearcher.java | 28 +-
.../SearchGroupsResultTransformer.java | 64 +-
.../org/apache/solr/security/BasicAuthPlugin.java | 2 +-
.../solr/security/PermissionNameProvider.java | 1 +
.../apache/solr/servlet/SolrDispatchFilter.java | 6 +-
.../solr/servlet/cache/HttpCacheHeaderUtil.java | 15 +-
.../processor/AtomicUpdateDocumentMerger.java | 5 -
.../processor/RoutedAliasUpdateProcessor.java | 6 +-
.../processor/UpdateRequestProcessorChain.java | 16 +-
.../org/apache/solr/util/ConcurrentLFUCache.java | 65 +-
.../org/apache/solr/util/ConcurrentLRUCache.java | 67 +-
.../src/java/org/apache/solr/util/CryptoKeys.java | 22 +-
.../src/java/org/apache/solr/util/SolrCLI.java | 6 +-
.../src/test-files/cryptokeys/priv_key2048.pem | 27 +
.../core/src/test-files/cryptokeys/priv_key512.pem | 9 +
.../core/src/test-files/cryptokeys/pub_key2048.der | Bin 0 -> 294 bytes
solr/core/src/test-files/cryptokeys/pub_key512.der | Bin 0 -> 94 bytes
.../test-files/runtimecode/runtimelibs_v3.jar.bin | Bin 0 -> 7337 bytes
solr/core/src/test-files/runtimecode/sig.txt | 65 ++
.../solr/collection1/conf/bad-mpf-solrconfig.xml | 2 +-
.../collection1/conf/schema-inplace-updates.xml | 1 +
.../solr/configsets/_default/conf/solrconfig.xml | 16 +-
.../configsets/cloud-managed/conf/managed-schema | 11 +
.../apache/solr/cloud/AliasIntegrationTest.java | 30 +-
.../apache/solr/cloud/ClusterStateMockUtil.java | 9 +-
.../apache/solr/cloud/CreateRoutedAliasTest.java | 5 +-
...OverriddenZkACLAndCredentialsProvidersTest.java | 12 +-
.../apache/solr/cloud/TestClusterProperties.java | 6 +-
.../test/org/apache/solr/cloud/TestCryptoKeys.java | 2 +-
.../VMParamsZkACLAndCredentialsProvidersTest.java | 4 +-
.../AbstractCloudBackupRestoreTestCase.java | 2 +-
.../cloud/api/collections/SplitByPrefixTest.java | 261 ++++++++
.../collections/TestHdfsCloudBackupRestore.java | 3 +
.../collections/TestLocalFSCloudBackupRestore.java | 98 ++-
.../cloud/autoscaling/HttpTriggerListenerTest.java | 3 +-
.../test/org/apache/solr/cloud/rule/RulesTest.java | 172 ++++-
.../solr/core/TestBackupRepositoryFactory.java | 21 +-
.../apache/solr/core/TestCorePropertiesReload.java | 4 +-
.../org/apache/solr/core/TestDynamicLoading.java | 10 +-
.../apache/solr/core/TestDynamicLoadingUrl.java | 154 ++---
.../apache/solr/core/TestSolrConfigHandler.java | 6 +-
.../solr/handler/TestContainerReqHandler.java | 565 ++++++++++++++++
.../solr/handler/admin/SplitHandlerTest.java | 218 +++++++
.../{ => component}/ResponseBuilderTest.java | 34 +-
.../reporters/SolrGraphiteReporterTest.java | 4 +-
.../org/apache/solr/request/SimpleFacetsTest.java | 33 +
.../org/apache/solr/response/TestPushWriter.java | 6 +-
.../org/apache/solr/search/TestFastLRUCache.java | 71 ++
.../test/org/apache/solr/search/TestLFUCache.java | 46 +-
.../test/org/apache/solr/search/TestLRUCache.java | 84 ++-
.../solr/security/BasicAuthIntegrationTest.java | 4 +-
.../apache/solr/update/SolrIndexConfigTest.java | 21 +-
.../solr/update/TestInPlaceUpdatesDistrib.java | 41 +-
.../solr/update/TestInPlaceUpdatesStandalone.java | 97 ++-
.../CategoryRoutedAliasUpdateProcessorTest.java | 6 +
.../DimensionalRoutedAliasUpdateProcessorTest.java | 726 +++++++++++++++++++++
.../processor/RoutedAliasUpdateProcessorTest.java | 68 +-
.../apache/solr/update/processor/RuntimeUrp.java | 2 +-
.../TimeRoutedAliasUpdateProcessorTest.java | 175 +++--
.../solr/configsets/_default/conf/solrconfig.xml | 16 +-
.../conf/solrconfig.xml | 2 +
solr/site/index.xsl | 22 +-
solr/solr-ref-guide/src/aliases.adoc | 126 +++-
solr/solr-ref-guide/src/analytics.adoc | 4 +-
solr/solr-ref-guide/src/collection-aliasing.adoc | 209 +++++-
.../solr-ref-guide/src/command-line-utilities.adoc | 2 +-
.../src/stream-source-reference.adoc | 27 +
.../solr/client/solrj/RoutedAliasTypes.java} | 36 +-
.../org/apache/solr/client/solrj/SolrResponse.java | 9 +-
.../java/org/apache/solr/client/solrj/io/Lang.java | 9 +-
.../solr/client/solrj/io/eval/ConcatEvaluator.java | 63 ++
.../solr/client/solrj/io/eval/DateEvaluator.java | 73 +++
...owLabelsEvaluator.java => DoubleEvaluator.java} | 35 +-
...tRowLabelsEvaluator.java => LongEvaluator.java} | 35 +-
.../client/solrj/io/eval/RecursiveEvaluator.java | 21 +
.../solrj/io/eval/RecursiveNumericEvaluator.java | 11 +-
.../io/eval/RecursiveNumericListEvaluator.java | 2 +
.../solrj/io/eval/SetColumnLabelsEvaluator.java | 12 +-
.../solrj/io/eval/SetRowLabelsEvaluator.java | 14 +-
.../solr/client/solrj/io/eval/UuidEvaluator.java | 2 +-
.../solr/client/solrj/io/stream/CsvStream.java | 172 +++++
.../client/solrj/io/stream/JSONTupleStream.java | 3 +-
.../solr/client/solrj/io/stream/SolrStream.java | 15 +-
.../solr/client/solrj/io/stream/TsvStream.java | 81 +++
.../solrj/request/CollectionAdminRequest.java | 188 +++++-
.../client/solrj/request/CollectionApiMapping.java | 17 +
.../solr/common/cloud/ClusterProperties.java | 14 +-
.../solr/common/cloud/CompositeIdRouter.java | 17 +
.../solr/common/cloud/ConnectionManager.java | 41 +-
.../org/apache/solr/common/cloud/DocRouter.java | 8 +
...eSetCredentialsDigestZkCredentialsProvider.java | 9 +-
.../common/cloud/ZkClientConnectionStrategy.java | 36 +-
.../apache/solr/common/cloud/ZkStateReader.java | 90 +--
.../solr/common/params/CollectionParams.java | 3 +-
.../solr/common/params/CommonAdminParams.java | 2 +
.../apache/solr/common/params/CoreAdminParams.java | 2 +
.../apache/solr/common/util/CommandOperation.java | 9 +-
.../java/org/apache/solr/common/util/Utils.java | 337 +++++-----
.../src/resources/apispec/cluster.Commands.json | 37 ++
.../cluster.Commands.runtimelib.properties.json | 23 +
.../resources/apispec/collections.Commands.json | 8 +
...nfig.Commands.addRequestHandler.properties.json | 2 +-
.../apispec/core.config.Commands.generic.json | 2 +-
solr/solrj/src/resources/apispec/node.ext.json | 13 +
.../client/solrj/SolrSchemalessExampleTest.java | 10 +-
.../solrj/embedded/SolrExampleJettyTest.java | 4 +-
.../org/apache/solr/client/solrj/io/TestLang.java | 2 +-
.../client/solrj/io/graph/GraphExpressionTest.java | 3 +-
.../client/solrj/io/stream/MathExpressionTest.java | 117 ++++
.../solrj/io/stream/StreamDecoratorTest.java | 95 ++-
.../solrj/io/stream/StreamExpressionTest.java | 176 ++++-
.../io/stream/eval/AbsoluteValueEvaluatorTest.java | 4 +-
.../solrj/io/stream/eval/AddEvaluatorTest.java | 7 +-
.../io/stream/eval/ArcCosineEvaluatorTest.java | 4 +-
.../solrj/io/stream/eval/ArcSineEvaluatorTest.java | 4 +-
.../io/stream/eval/ArcTangentEvaluatorTest.java | 4 +-
.../solrj/io/stream/eval/CeilingEvaluatorTest.java | 4 +-
.../solrj/io/stream/eval/CosineEvaluatorTest.java | 4 +-
.../io/stream/eval/CubedRootEvaluatorTest.java | 4 +-
.../solrj/io/stream/eval/DivideEvaluatorTest.java | 10 +-
.../solrj/io/stream/eval/FloorEvaluatorTest.java | 4 +-
.../stream/eval/HyperbolicCosineEvaluatorTest.java | 4 +-
.../stream/eval/HyperbolicSineEvaluatorTest.java | 4 +-
.../eval/HyperbolicTangentEvaluatorTest.java | 4 +-
.../solrj/io/stream/eval/ModuloEvaluatorTest.java | 10 +-
.../io/stream/eval/MultiplyEvaluatorTest.java | 7 +-
.../io/stream/eval/NaturalLogEvaluatorTest.java | 4 +-
.../solrj/io/stream/eval/PowerEvaluatorTest.java | 2 +-
.../solrj/io/stream/eval/RoundEvaluatorTest.java | 4 +-
.../solrj/io/stream/eval/SineEvaluatorTest.java | 4 +-
.../io/stream/eval/SquareRootEvaluatorTest.java | 4 +-
.../io/stream/eval/SubtractEvaluatorTest.java | 6 +-
.../solrj/io/stream/eval/TangentEvaluatorTest.java | 4 +-
.../solrj/io/stream/eval/UuidEvaluatorTest.java | 13 +-
.../java/org/apache/solr/SolrJettyTestBase.java | 4 +-
.../solr/cloud/AbstractFullDistribZkTestBase.java | 55 +-
.../org/apache/solr/cloud/SolrCloudTestCase.java | 4 +-
.../java/org/apache/solr/cloud/ZkTestServer.java | 5 +-
.../src/java/org/apache/solr/util/TestHarness.java | 3 +-
solr/webapp/build.xml | 4 +-
solr/webapp/web/index.html | 4 +-
solr/webapp/web/js/angular/controllers/query.js | 2 +
solr/webapp/web/partials/query.html | 18 +-
569 files changed, 14340 insertions(+), 7696 deletions(-)
diff --cc solr/core/src/java/org/apache/solr/core/CoreContainer.java
index b96fa09,d6098fb..e3d755f
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@@ -903,9 -902,14 +908,15 @@@ public class CoreContainer
}
public void shutdown() {
+
+ ZkController zkController = getZkController();
+ if (zkController != null) {
+ OverseerTaskQueue overseerCollectionQueue = zkController.getOverseerCollectionQueue();
+ overseerCollectionQueue.allowOverseerPendingTasksToComplete();
+ }
log.info("Shutting down CoreContainer instance=" + System.identityHashCode(this));
+ ExecutorUtil.shutdownAndAwaitTermination(collectorExecutor);
ExecutorUtil.shutdownAndAwaitTermination(coreContainerAsyncTaskExecutor);
ExecutorService customThreadPool = ExecutorUtil.newMDCAwareCachedThreadPool(new SolrjNamedThreadFactory("closeThreadPool"));