lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From is...@apache.org
Subject [lucene-solr] 01/02: Merge branch 'master' into jira/solr-13350
Date Fri, 20 Sep 2019 20:31:47 GMT
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 5ee97ad0df092e3493e156210c9924cb7f360b19
Merge: 60d71d5 5a01a8b
Author: Ishan Chattopadhyaya <ishan@apache.org>
AuthorDate: Fri Sep 20 07:03:45 2019 +0530

    Merge branch 'master' into jira/solr-13350

 .github/PULL_REQUEST_TEMPLATE.md                   |    3 +-
 .github/workflows/ant.yml                          |   22 +
 .gitignore                                         |    1 +
 README.md                                          |    2 +-
 dev-tools/scripts/addVersion.py                    |   14 +-
 lucene/CHANGES.txt                                 |   87 +-
 lucene/MIGRATE.txt                                 |   38 +
 .../lucene/analysis/custom/CustomAnalyzer.java     |   12 +-
 .../analysis/el/GreekLowerCaseFilterFactory.java   |    2 +-
 .../analysis/ga/IrishLowerCaseFilterFactory.java   |    2 +-
 .../standard/UAX29URLEmailTokenizerFactory.java    |    2 +-
 .../analysis/tr/TurkishLowerCaseFilterFactory.java |    2 +-
 .../analysis/util/AbstractAnalysisFactory.java     |    3 +
 lucene/analysis/icu/src/data/utr30/nfc.txt         |   17 +-
 lucene/analysis/icu/src/data/utr30/nfkc.txt        |    2 +-
 lucene/analysis/icu/src/data/utr30/nfkc_cf.txt     |   81 +-
 .../icu/ICUNormalizer2CharFilterFactory.java       |    6 +-
 .../analysis/icu/ICUNormalizer2FilterFactory.java  |    6 +-
 .../org/apache/lucene/analysis/icu/utr30.nrm       |  Bin 59232 -> 59664 bytes
 .../icu/TestICUNormalizer2CharFilterFactory.java   |   14 +-
 .../icu/TestICUNormalizer2FilterFactory.java       |   12 +
 .../analysis/icu/GenerateUTR30DataFiles.java       |    2 +-
 .../lucene/analysis/ja/JapaneseTokenizer.java      |   40 +-
 .../lucene/analysis/ja/dict/BinaryDictionary.java  |   13 +-
 .../lucene/analysis/ja/dict/ConnectionCosts.java   |   14 +-
 .../analysis/ja/dict/TokenInfoDictionary.java      |    2 +-
 .../lucene/analysis/ja/dict/UnknownDictionary.java |    9 +
 .../lucene/analysis/ja/dict/UserDictionary.java    |   14 +-
 .../lucene/analysis/ja/util/DictionaryBuilder.java |   12 +-
 .../lucene/analysis/ja/TestJapaneseTokenizer.java  |   20 +
 .../analysis/ja/dict/UserDictionaryTest.java       |   22 +
 .../lucene/analysis/ko/GraphvizFormatter.java      |   19 +-
 .../apache/lucene/analysis/ko/KoreanAnalyzer.java  |    3 +-
 .../lucene/analysis/ko/KoreanNumberFilter.java     |    9 +-
 .../analysis/ko/KoreanPartOfSpeechStopFilter.java  |    6 +-
 .../apache/lucene/analysis/ko/KoreanTokenizer.java |   36 +-
 .../lucene/analysis/ko/dict/BinaryDictionary.java  |   18 +-
 .../analysis/ko/dict/CharacterDefinition.java      |    8 +-
 .../lucene/analysis/ko/dict/ConnectionCosts.java   |    2 +-
 .../lucene/analysis/ko/dict/TokenInfoFST.java      |    4 +-
 .../lucene/analysis/ko/dict/UserDictionary.java    |   16 +-
 .../analysis/ko/util/BinaryDictionaryWriter.java   |    4 +-
 .../apache/lucene/analysis/ko/util/CSVUtil.java    |    4 +-
 .../ko/util/TokenInfoDictionaryBuilder.java        |    2 +-
 .../analysis/ko/StringMockResourceLoader.java      |    2 +-
 .../lucene/analysis/ko/TestKoreanAnalyzer.java     |    4 +-
 .../analysis/ko/TestKoreanNumberFilterFactory.java |   12 +-
 .../TestKoreanPartOfSpeechStopFilterFactory.java   |   16 +-
 .../ko/TestKoreanReadingFormFilterFactory.java     |   17 +-
 .../lucene/analysis/ko/TestKoreanTokenizer.java    |   16 +
 .../analysis/ko/TestKoreanTokenizerFactory.java    |   41 +-
 .../analysis/ko/dict/TokenInfoDictionaryTest.java  |    6 +-
 .../analysis/ko/dict/UserDictionaryTest.java       |    5 +-
 .../codecs/memory/DirectDocValuesConsumer.java     |  350 --
 .../codecs/memory/DirectDocValuesFormat.java       |   83 -
 .../codecs/memory/DirectDocValuesProducer.java     |  780 ----
 .../lucene/codecs/uniformsplit/BlockDecoder.java   |   48 +
 .../lucene/codecs/uniformsplit/BlockEncoder.java   |   59 +
 .../lucene/codecs/uniformsplit/BlockHeader.java    |  167 +
 .../lucene/codecs/uniformsplit/BlockLine.java      |  260 ++
 .../lucene/codecs/uniformsplit/BlockReader.java    |  537 +++
 .../lucene/codecs/uniformsplit/BlockWriter.java    |  258 ++
 .../uniformsplit/DeltaBaseTermStateSerializer.java |  219 ++
 .../uniformsplit/DictionaryBrowserSupplier.java    |   81 +
 .../lucene/codecs/uniformsplit/FSTDictionary.java  |  234 ++
 .../lucene/codecs/uniformsplit/FieldMetadata.java  |  256 ++
 .../codecs/uniformsplit/IndexDictionary.java       |  127 +
 .../codecs/uniformsplit/IntersectBlockReader.java  |  558 +++
 .../lucene/codecs/uniformsplit/RamUsageUtil.java   |   87 +
 .../lucene/codecs/uniformsplit/TermBytes.java      |  123 +
 .../uniformsplit/UniformSplitPostingsFormat.java   |  136 +
 .../codecs/uniformsplit/UniformSplitTerms.java     |  153 +
 .../uniformsplit/UniformSplitTermsReader.java      |  204 +
 .../uniformsplit/UniformSplitTermsWriter.java      |  315 ++
 .../lucene/codecs/uniformsplit/package-info.java   |   29 +-
 .../sharedterms/FieldMetadataTermState.java        |   23 +-
 .../uniformsplit/sharedterms/STBlockLine.java      |  194 +
 .../uniformsplit/sharedterms/STBlockReader.java    |  139 +
 .../uniformsplit/sharedterms/STBlockWriter.java    |  105 +
 .../sharedterms/STIntersectBlockReader.java        |  112 +
 .../sharedterms/STMergingBlockReader.java          |  111 +
 .../sharedterms/STMergingTermsEnum.java            |  243 ++
 .../sharedterms/STUniformSplitPostingsFormat.java  |   84 +
 .../sharedterms/STUniformSplitTerms.java           |   65 +
 .../sharedterms/STUniformSplitTermsReader.java     |   98 +
 .../sharedterms/STUniformSplitTermsWriter.java     |  477 +++
 .../sharedterms/UnionFieldMetadataBuilder.java     |   60 +
 .../uniformsplit/sharedterms/package-info.java     |   26 +-
 .../org.apache.lucene.codecs.PostingsFormat        |    3 +-
 .../codecs/lucene50/MockTermStateFactory.java      |   21 +-
 .../codecs/uniformsplit/TestBlockWriter.java       |  126 +
 .../codecs/uniformsplit/TestFSTDictionary.java     |  145 +
 .../lucene/codecs/uniformsplit/TestTermBytes.java  |  217 ++
 .../uniformsplit/TestTermBytesComparator.java      |  189 +
 .../TestUniformSplitPostingFormat.java             |   59 +
 .../sharedterms/STBlockReaderTest.java             |  352 ++
 .../TestSTUniformSplitPostingFormat.java}          |   11 +-
 .../codecs/lucene50/Lucene50PostingsFormat.java    |   40 +-
 .../org/apache/lucene/document/DoublePoint.java    |    9 +-
 .../org/apache/lucene/document/FloatPoint.java     |    9 +-
 .../java/org/apache/lucene/document/IntPoint.java  |    9 +-
 .../lucene/document/LatLonDocValuesField.java      |   16 +
 .../LatLonDocValuesPointInPolygonQuery.java        |  146 +
 .../lucene/document/LatLonPointInPolygonQuery.java |  150 +-
 .../java/org/apache/lucene/document/LongPoint.java |   11 +-
 .../lucene/geo/SimpleGeoJSONPolygonParser.java     |    2 +
 .../org/apache/lucene/index/DirectoryReader.java   |    1 -
 .../org/apache/lucene/index/IndexFileDeleter.java  |    4 +-
 .../org/apache/lucene/index/IndexFileNames.java    |    3 -
 .../java/org/apache/lucene/index/SegmentInfos.java |   11 +-
 .../lucene/search/DisjunctionMatchesIterator.java  |   84 +-
 .../apache/lucene/search/HitsThresholdChecker.java |  119 +
 .../org/apache/lucene/search/IndexSearcher.java    |   27 +-
 .../org/apache/lucene/search/LRUQueryCache.java    |   14 +-
 .../src/java/org/apache/lucene/search/Matches.java |    7 +
 .../org/apache/lucene/search/MatchesUtils.java     |   24 +-
 .../org/apache/lucene/search/MultiPhraseQuery.java |    7 +-
 .../org/apache/lucene/search/NamedMatches.java     |  158 +
 .../java/org/apache/lucene/search/PhraseQuery.java |    6 +-
 .../org/apache/lucene/search/QueryRescorer.java    |   39 +-
 .../org/apache/lucene/search/SynonymQuery.java     |    7 +-
 .../java/org/apache/lucene/search/TermQuery.java   |    2 +-
 .../org/apache/lucene/search/TopDocsCollector.java |   15 +-
 .../apache/lucene/search/TopFieldCollector.java    |   79 +-
 .../apache/lucene/search/TopScoreDocCollector.java |   67 +-
 .../org/apache/lucene/search/spans/SpanWeight.java |    8 +-
 .../src/java/org/apache/lucene/util/ArrayUtil.java |   23 +-
 .../org/apache/lucene/util/packed/Direct16.java    |  106 -
 .../org/apache/lucene/util/packed/Direct32.java    |  106 -
 .../org/apache/lucene/util/packed/Direct64.java    |   96 -
 .../org/apache/lucene/util/packed/Direct8.java     |  104 -
 .../lucene/util/packed/Packed16ThreeBlocks.java    |  125 -
 .../lucene/util/packed/Packed8ThreeBlocks.java     |  123 -
 .../org/apache/lucene/util/packed/PackedInts.java  |   65 +-
 .../perfield/TestPerFieldDocValuesFormat.java      |    2 +-
 .../test/org/apache/lucene/geo/TestPolygon.java    |   17 +
 .../lucene/search/TestLatLonDocValuesQueries.java  |    5 +-
 .../apache/lucene/search/TestMatchesIterator.java  |  106 +-
 .../apache/lucene/search/TestMinShouldMatch2.java  |    4 +-
 .../apache/lucene/search/TestQueryRescorer.java    |   92 +
 .../apache/lucene/search/TestTopDocsCollector.java |   94 +-
 .../lucene/search/TestTopFieldCollector.java       |   36 +
 .../apache/lucene/util/packed/TestPackedInts.java  |   55 +-
 lucene/ivy-versions.properties                     |    8 +-
 .../app/desktop/components/MenuBarProvider.java    |   19 +
 .../dialog/menubar/ExportTermsDialogFactory.java   |  325 ++
 .../lucene/luke/models/tools/IndexTools.java       |   10 +
 .../lucene/luke/models/tools/IndexToolsImpl.java   |   29 +
 .../luke/app/desktop/messages/messages.properties  |   10 +
 .../search/TestDiversifiedTopDocsCollector.java    |   12 +-
 .../apache/lucene/queryparser/xml/CoreParser.java  |   39 +-
 .../xml/builders/SpanPositionRangeBuilder.java     |   50 +
 .../queryparser/xml/SpanPositionRangeQuery.xml     |   41 +-
 .../lucene/queryparser/xml/TestCoreParser.java     |   15 +-
 .../lucene/replicator/IndexReplicationHandler.java |    2 +-
 .../document/DoublePointMultiRangeBuilder.java     |   54 +
 .../document/FloatPointMultiRangeBuilder.java      |   55 +
 .../lucene/document/FloatPointNearestNeighbor.java |  186 +-
 .../lucene/document/IntPointMultiRangeBuilder.java |   53 +
 .../document/LatLonShapeBoundingBoxQuery.java      |   22 +-
 .../lucene/document/LatLonShapeLineQuery.java      |   23 +-
 .../lucene/document/LatLonShapePolygonQuery.java   |   23 +-
 .../document/LongPointMultiRangeBuilder.java       |   53 +
 .../org/apache/lucene/document/ShapeField.java     |  198 +-
 .../org/apache/lucene/document/ShapeQuery.java     |  488 ++-
 .../lucene/document/XYShapeBoundingBoxQuery.java   |   22 +-
 .../apache/lucene/document/XYShapeLineQuery.java   |   23 +-
 .../lucene/document/XYShapePolygonQuery.java       |   25 +-
 .../java/org/apache/lucene/geo/Tessellator.java    |  210 +-
 .../java/org/apache/lucene/search/BM25FQuery.java  |    7 +-
 .../lucene/search/LatLonPointPrototypeQueries.java |    4 +-
 .../org/apache/lucene/search/MultiRangeQuery.java  |  389 ++
 .../org/apache/lucene/search/NearestNeighbor.java  |   75 +-
 .../apache/lucene/search/TermAutomatonQuery.java   |    6 +-
 .../lucene/document/BaseLatLonShapeTestCase.java   |   16 +-
 .../lucene/document/BaseShapeEncodingTestCase.java |  378 +-
 .../apache/lucene/document/BaseShapeTestCase.java  |    4 +-
 .../lucene/document/BaseXYShapeTestCase.java       |   16 +-
 .../document/TestFloatPointNearestNeighbor.java    |   11 +-
 .../document/TestLatLonLineShapeQueries.java       |    8 +-
 .../document/TestLatLonPolygonShapeQueries.java    |   12 +-
 .../apache/lucene/document/TestLatLonShape.java    |    9 +-
 .../lucene/document/TestXYLineShapeQueries.java    |    8 +-
 .../lucene/document/TestXYPolygonShapeQueries.java |   12 +-
 .../org/apache/lucene/geo/TestTessellator.java     |   76 +
 .../lucene/search/TestMultiRangeQueries.java       |  590 +++
 .../test/org/apache/lucene/search/TestNearest.java |   29 +-
 .../spatial/prefix/tree/PackedQuadPrefixTree.java  |   68 +-
 .../lucene/spatial/prefix/tree/QuadPrefixTree.java |  104 +-
 .../prefix/tree/SpatialPrefixTreeFactory.java      |   33 +-
 .../codecs/uniformsplit/Rot13CypherTestUtil.java   |   72 +
 .../UniformSplitRot13PostingsFormat.java           |  147 +
 .../apache/lucene/codecs/uniformsplit/package.html |   43 +
 .../STUniformSplitRot13PostingsFormat.java         |   59 +
 .../codecs/uniformsplit/sharedterms/package.html   |   43 +
 .../java/org/apache/lucene/index/RandomCodec.java  |    4 +-
 .../org/apache/lucene/search/AssertingMatches.java |   14 +
 .../lucene/search/ShardSearchingTestBase.java      |   35 +-
 .../org.apache.lucene.codecs.PostingsFormat        |    2 +
 .../tools/src/groovy/check-source-patterns.groovy  |   12 +
 solr/CHANGES.txt                                   |  128 +-
 solr/bin/solr                                      |    7 +-
 solr/bin/solr.cmd                                  | 4060 ++++++++++----------
 solr/bin/solr.in.sh                                |    2 +-
 .../solr/collection1/conf/schema-folding-extra.xml |    2 +-
 .../org/apache/solr/analytics/facet/PivotNode.java |    6 +-
 solr/contrib/clustering/ivy.xml                    |    2 +-
 .../dataimport/config/ConfigNameConstants.java     |    9 +-
 .../handler/dataimport/TestJdbcDataSource.java     |   37 +-
 .../dataimport/TestSimplePropertiesWriter.java     |   32 +-
 .../TestSolrEntityProcessorEndToEnd.java           |   41 +-
 .../extraction/ExtractingRequestHandlerTest.java   |   74 +-
 .../org/apache/solr/ltr/TestLTRQParserExplain.java |   12 +-
 .../test/org/apache/solr/ltr/TestLTRWithFacet.java |   21 +-
 .../test/org/apache/solr/ltr/TestLTRWithSort.java  |   20 +-
 .../test/org/apache/solr/ltr/TestRerankBase.java   |   11 +-
 .../solr/ltr/feature/TestEdisMaxSolrFeature.java   |   12 +-
 .../solr/ltr/feature/TestFeatureLogging.java       |   12 +-
 .../solr/ltr/feature/TestFieldLengthFeature.java   |   12 +-
 .../solr/ltr/feature/TestFieldValueFeature.java    |   12 +-
 .../solr/ltr/feature/TestFilterSolrFeature.java    |   12 +-
 .../solr/ltr/feature/TestNoMatchSolrFeature.java   |   12 +-
 .../solr/ltr/feature/TestOriginalScoreFeature.java |   12 +-
 .../solr/ltr/feature/TestRankingFeature.java       |   13 +-
 .../solr/ltr/feature/TestUserTermScoreWithQ.java   |   12 +-
 .../solr/ltr/feature/TestUserTermScorerQuery.java  |   12 +-
 .../solr/ltr/feature/TestUserTermScorereQDF.java   |   12 +-
 .../apache/solr/ltr/feature/TestValueFeature.java  |   33 +-
 .../apache/solr/ltr/model/TestAdapterModel.java    |   15 +-
 .../solr/ltr/model/TestDefaultWrapperModel.java    |   17 +-
 .../org/apache/solr/ltr/model/TestLinearModel.java |  150 +-
 .../ltr/model/TestMultipleAdditiveTreesModel.java  |  142 +-
 .../solr/ltr/model/TestNeuralNetworkModel.java     |   78 +-
 .../apache/solr/ltr/model/TestWrapperModel.java    |   52 +-
 .../apache/solr/ltr/norm/TestMinMaxNormalizer.java |   20 +-
 .../solr/ltr/norm/TestStandardNormalizer.java      |   46 +-
 .../ltr/store/rest/TestManagedFeatureStore.java    |   32 +-
 .../store/rest/TestModelManagerPersistence.java    |   11 +-
 solr/contrib/prometheus-exporter/bin/solr-exporter |   23 +-
 .../prometheus-exporter/bin/solr-exporter.cmd      |    7 +-
 .../solr/velocity/VelocityResponseWriterTest.java  |   15 +-
 .../solr/client/solrj/embedded/JettyConfig.java    |   14 +-
 .../client/solrj/embedded/JettySolrRunner.java     |   11 +
 .../org/apache/solr/cloud/ReplicateFromLeader.java |    2 +-
 .../cloud/api/collections/CategoryRoutedAlias.java |   10 +-
 .../cloud/api/collections/CreateCollectionCmd.java |    5 +-
 .../OverseerCollectionMessageHandler.java          |    2 +-
 .../solr/cloud/api/collections/SplitShardCmd.java  |   49 +-
 .../solr/cloud/autoscaling/ComputePlanAction.java  |    3 +
 .../solr/cloud/autoscaling/IndexSizeTrigger.java   |   28 +-
 .../solr/cloud/autoscaling/NodeAddedTrigger.java   |   17 +-
 .../solr/cloud/autoscaling/ScheduledTriggers.java  |    5 +-
 .../cloud/autoscaling/sim/SimCloudManager.java     |    6 +-
 .../autoscaling/sim/SimClusterStateProvider.java   |  106 +-
 .../autoscaling/sim/SimNodeStateProvider.java      |   18 +
 .../solr/cloud/autoscaling/sim/SimUtils.java       |   48 +-
 .../autoscaling/sim/SnapshotCloudManager.java      |   44 +-
 .../sim/SnapshotClusterStateProvider.java          |    5 +-
 .../sim/SnapshotDistribStateManager.java           |   33 +-
 .../autoscaling/sim/SnapshotNodeStateProvider.java |   20 +-
 .../java/org/apache/solr/core/BlobRepository.java  |  187 +-
 .../java/org/apache/solr/core/CoreContainer.java   |   20 +-
 .../java/org/apache/solr/core/CoreDescriptor.java  |    6 +-
 .../src/java/org/apache/solr/core/InitParams.java  |    3 +-
 .../java/org/apache/solr/core/MemClassLoader.java  |    8 +
 .../core/{LibListener.java => PackageManager.java} |  215 +-
 .../src/java/org/apache/solr/core/PluginBag.java   |   85 +-
 .../src/java/org/apache/solr/core/PluginInfo.java  |   72 +-
 .../src/java/org/apache/solr/core/RuntimeLib.java  |   33 +-
 .../src/java/org/apache/solr/core/SolrConfig.java  |   55 +-
 .../src/java/org/apache/solr/core/SolrCore.java    |   42 +-
 .../org/apache/solr/core/SolrResourceLoader.java   |   27 +-
 .../java/org/apache/solr/handler/BlobHandler.java  |    4 +-
 .../handler/{FilesStream.java => CatStream.java}   |   21 +-
 .../apache/solr/handler/CdcrReplicatorManager.java |   29 -
 .../apache/solr/handler/CdcrRequestHandler.java    |   15 +
 .../apache/solr/handler/ReplicationHandler.java    |    2 +-
 .../apache/solr/handler/RequestHandlerBase.java    |   57 +-
 .../org/apache/solr/handler/SolrConfigHandler.java |   77 +-
 .../solr/handler/SolrDefaultStreamFactory.java     |    2 +-
 .../solr/handler/admin/CollectionHandlerApi.java   |   47 +-
 .../solr/handler/admin/CollectionsHandler.java     |    7 +-
 .../solr/handler/admin/IndexSizeEstimator.java     |    8 +-
 .../org/apache/solr/handler/admin/SplitOp.java     |  158 +-
 .../solr/handler/admin/ZookeeperInfoHandler.java   |    8 +-
 .../solr/handler/admin/ZookeeperStatusHandler.java |   71 +-
 .../component/AffinityReplicaListTransformer.java  |  107 +
 .../AffinityReplicaListTransformerFactory.java     |   91 +
 .../solr/handler/component/DebugComponent.java     |    4 +-
 .../solr/handler/component/ExpandComponent.java    |   48 +-
 .../handler/component/HttpShardHandlerFactory.java |  283 +-
 .../handler/component/QueryElevationComponent.java |  518 ++-
 .../component/ReplicaListTransformerFactory.java   |   28 +-
 .../solr/handler/component/SuggestComponent.java   |    2 +-
 .../apache/solr/logging/log4j2/Log4j2Watcher.java  |    4 +-
 .../solr/metrics/FilteringSolrMetricReporter.java  |    3 +
 .../org/apache/solr/metrics/SolrMetricManager.java |  165 +-
 .../apache/solr/metrics/SolrMetricProducer.java    |   12 +-
 .../metrics/reporters/jmx/JmxMetricsReporter.java  |    3 +
 .../solr/metrics/reporters/solr/SolrReporter.java  |    3 +
 .../java/org/apache/solr/query/SolrRangeQuery.java |    3 +
 .../org/apache/solr/request/DocValuesFacets.java   |    4 +
 .../org/apache/solr/request/NumericFacets.java     |   20 +-
 .../request/PerSegmentSingleValuedFaceting.java    |   10 +
 .../java/org/apache/solr/request/SimpleFacets.java |   19 +-
 .../org/apache/solr/request/json/RequestUtil.java  |    5 +-
 .../transform/ExplainAugmenterFactory.java         |   17 +-
 .../java/org/apache/solr/rest/ManagedResource.java |    6 +-
 .../apache/solr/rest/ManagedResourceStorage.java   |   12 +-
 .../src/java/org/apache/solr/rest/RestManager.java |    5 +-
 .../solr/rest/schema/FieldTypeXmlAdapter.java      |   14 +-
 .../analysis/ManagedSynonymGraphFilterFactory.java |   17 +-
 .../schema/AbstractSpatialPrefixTreeFieldType.java |    2 +
 .../src/java/org/apache/solr/schema/FieldType.java |   47 +-
 .../apache/solr/schema/FieldTypePluginLoader.java  |   52 +-
 .../java/org/apache/solr/schema/IndexSchema.java   |   11 +
 .../java/org/apache/solr/search/CacheConfig.java   |   80 +-
 .../java/org/apache/solr/search/DisMaxQParser.java |    6 +-
 .../apache/solr/search/ExtendedDismaxQParser.java  |    6 +-
 .../java/org/apache/solr/search/FastLRUCache.java  |  189 +-
 .../src/java/org/apache/solr/search/LFUCache.java  |  153 +-
 .../src/java/org/apache/solr/search/LRUCache.java  |  244 +-
 .../src/java/org/apache/solr/search/SolrCache.java |   63 +-
 .../org/apache/solr/search/SolrCacheHolder.java    |   96 +-
 .../org/apache/solr/search/SolrIndexSearcher.java  |   11 +-
 .../org/apache/solr/search/facet/FacetRequest.java |   10 +-
 .../distance/GeoDistValueSourceParser.java         |   15 +-
 .../StoredFieldsShardRequestFactory.java           |   15 +-
 .../solr/search/join/BlockJoinChildQParser.java    |    2 +-
 .../solr/search/join/BlockJoinParentQParser.java   |   13 +-
 .../search/join/ChildFieldValueSourceParser.java   |    4 +-
 .../apache/solr/search/mlt/SimpleMLTQParser.java   |    8 +-
 .../apache/solr/search/stats/ExactStatsCache.java  |   12 +-
 .../apache/solr/search/stats/LRUStatsCache.java    |    5 +-
 .../apache/solr/search/stats/LocalStatsSource.java |    5 +-
 .../org/apache/solr/search/stats/StatsSource.java  |    3 +-
 .../apache/solr/security/AuditLoggerPlugin.java    |    1 -
 .../apache/solr/security/AuthenticationPlugin.java |   17 +-
 .../org/apache/solr/security/BasicAuthPlugin.java  |    2 +-
 .../org/apache/solr/security/JWTAuthPlugin.java    |  533 ++-
 .../org/apache/solr/security/JWTIssuerConfig.java  |  438 +++
 .../solr/security/JWTVerificationkeyResolver.java  |  153 +
 .../solr/security/PermissionNameProvider.java      |    2 +
 .../security/Sha256AuthenticationProvider.java     |   17 +-
 .../apache/solr/servlet/SolrDispatchFilter.java    |   12 +-
 .../org/apache/solr/store/hdfs/HdfsFileWriter.java |    3 +-
 .../org/apache/solr/update/DocumentBuilder.java    |    4 +-
 .../processor/AtomicUpdateDocumentMerger.java      |    5 +-
 .../processor/DistributedUpdateProcessor.java      |    9 +
 .../org/apache/solr/util/ConcurrentLFUCache.java   |  129 +-
 .../org/apache/solr/util/ConcurrentLRUCache.java   |  133 +-
 .../src/java/org/apache/solr/util/ExportTool.java  |  512 +++
 .../src/java/org/apache/solr/util/FileUtils.java   |   30 +-
 .../java/org/apache/solr/util/RedactionUtils.java  |   83 +-
 .../src/java/org/apache/solr/util/SolrCLI.java     |   71 +-
 .../java/org/apache/solr/util/TimeZoneUtils.java   |   11 +-
 .../solr/util/plugin/AbstractPluginLoader.java     |   11 +-
 ....apache.lucene.analysis.util.TokenFilterFactory |    5 +-
 .../src/test-files/runtimecode/MyDocCache.java     |   23 +-
 solr/core/src/test-files/runtimecode/cache.jar.bin |  Bin 0 -> 820 bytes
 .../src/test-files/runtimecode/cache_v2.jar.bin    |  Bin 0 -> 818 bytes
 solr/core/src/test-files/runtimecode/sig.txt       |   34 +-
 ...elevate.xml => bad-schema-analyzer-by-name.xml} |   46 +-
 ...l => bad-schema-analyzer-class-and-name-cf.xml} |   47 +-
 ...l => bad-schema-analyzer-class-and-name-tf.xml} |   47 +-
 ... => bad-schema-analyzer-class-and-name-tok.xml} |   46 +-
 .../test-files/solr/collection1/conf/elevate.xml   |   22 +
 .../collection1/conf/schema-analyzer-by-name.xml   |   78 +
 .../solr/collection1/conf/schema-spatial.xml       |    8 +-
 .../test-files/solr/collection1/conf/schema.xml    |    4 +
 .../solr/collection1/conf/schema_codec.xml         |    5 +-
 .../solr/collection1/conf/solrconfig-elevate.xml   |    2 +-
 .../solr/collection1/conf/solrconfig.xml           |   10 +-
 .../solr/configsets/_default/conf/managed-schema   |  494 +--
 .../solr/security/jwt_plugin_jwk_security.json     |    6 +-
 .../solr/security/jwt_plugin_jwk_url_security.json |    2 +-
 .../solr/simSnapshot/autoscalingState.json         | 3923 +++++++++++++++++++
 .../test-files/solr/simSnapshot/clusterState.json  | 2854 ++++++++++++++
 .../test-files/solr/simSnapshot/distribState.json  |  206 +
 .../test-files/solr/simSnapshot/managerState.json  |    1 +
 .../src/test-files/solr/simSnapshot/nodeState.json | 3823 ++++++++++++++++++
 .../test-files/solr/simSnapshot/statistics.json    | 2045 ++++++++++
 .../org/apache/solr/TestDistributedGrouping.java   |  128 +-
 .../test/org/apache/solr/TestRandomFaceting.java   |   19 +-
 .../test/org/apache/solr/TestSolrTestCaseJ4.java}  |   28 +-
 .../embedded/TestEmbeddedSolrServerSchemaAPI.java  |   14 +-
 .../apache/solr/cloud/AliasIntegrationTest.java    |   76 +-
 .../cloud/CloudExitableDirectoryReaderTest.java    |   52 +-
 .../org/apache/solr/cloud/CollectionPropsTest.java |   90 +-
 .../org/apache/solr/cloud/TestConfigSetsAPI.java   |    1 +
 .../cloud/api/collections/SplitByPrefixTest.java   |   37 +-
 .../AutoAddReplicasIntegrationTest.java            |    7 +
 .../cloud/autoscaling/ComputePlanActionTest.java   |   53 +-
 .../cloud/autoscaling/IndexSizeTriggerTest.java    |   53 +-
 .../cloud/autoscaling/sim/FakeDocIterator.java     |   56 +
 .../autoscaling/sim/TestSimExtremeIndexing.java    |   35 -
 .../cloud/autoscaling/sim/TestSimLargeCluster.java |   87 +
 .../autoscaling/sim/TestSnapshotCloudManager.java  |   69 +-
 .../apache/solr/cloud/cdcr/CdcrBootstrapTest.java  |   52 +
 .../test/org/apache/solr/cloud/rule/RulesTest.java |   27 +-
 .../solr/core/BlobRepositoryMockingTest.java       |   22 +-
 .../test/org/apache/solr/core/PluginInfoTest.java  |    7 +-
 .../solr/core/SolrCoreCheckLockOnStartupTest.java  |    6 +-
 .../org/apache/solr/core/TestCodecSupport.java     |   10 +-
 .../test/org/apache/solr/core/TestConfigSets.java  |    7 +-
 .../org/apache/solr/core/TestCoreContainer.java    |   16 +-
 .../org/apache/solr/core/TestDynamicLoading.java   |   21 +-
 .../apache/solr/core/TestDynamicLoadingUrl.java    |    8 +-
 .../src/test/org/apache/solr/core/TestNRTOpen.java |   14 +-
 .../handler/FieldAnalysisRequestHandlerTest.java   |   12 +-
 .../org/apache/solr/handler/JsonLoaderTest.java    |   60 +-
 .../solr/handler/PingRequestHandlerTest.java       |   13 +-
 .../org/apache/solr/handler/TestBlobHandler.java   |   12 +-
 .../org/apache/solr/handler/TestCSVLoader.java     |   21 +-
 .../solr/handler/TestContainerReqHandler.java      |  337 +-
 .../solr/handler/TestReplicationHandler.java       |   27 +-
 .../org/apache/solr/handler/TestRestoreCore.java   |    2 -
 .../solr/handler/TestSQLHandlerNonCloud.java       |    8 +-
 .../apache/solr/handler/V2ApiIntegrationTest.java  |   10 +-
 .../handler/admin/CoreAdminCreateDiscoverTest.java |   13 +-
 .../solr/handler/admin/CoreAdminHandlerTest.java   |   82 +-
 .../solr/handler/admin/CoreAdminOperationTest.java |  440 +--
 .../admin/CoreMergeIndexesAdminHandlerTest.java    |   19 +-
 .../solr/handler/admin/IndexSizeEstimatorTest.java |   25 +
 .../apache/solr/handler/admin/InfoHandlerTest.java |   20 +-
 .../solr/handler/admin/MetricsHandlerTest.java     |   22 +-
 .../handler/admin/SecurityConfHandlerTest.java     |    9 +-
 .../handler/admin/ShowFileRequestHandlerTest.java  |   44 +-
 .../solr/handler/admin/SplitHandlerTest.java       |   74 +
 .../solr/handler/admin/TestApiFramework.java       |   57 +-
 .../solr/handler/admin/TestCollectionAPIs.java     |   19 +-
 .../handler/admin/ZookeeperStatusHandlerTest.java  |   74 +
 .../component/DistributedDebugComponentTest.java   |   35 +-
 .../component/DistributedExpandComponentTest.java  |   13 +-
 .../component/DistributedFacetExistsSmallTest.java |   20 +-
 .../component/DistributedFacetPivotLargeTest.java  |   36 +-
 .../handler/component/FacetPivotSmallTest.java     |   12 +
 .../component/QueryElevationComponentTest.java     |  170 +-
 .../handler/component/SpellCheckComponentTest.java |   40 +-
 .../solr/handler/component/StatsComponentTest.java |  109 +-
 .../SuggestComponentContextFilterQueryTest.java    |   23 +-
 .../handler/component/TestExpandComponent.java     |   54 +-
 .../component/TestHttpShardHandlerFactory.java     |  175 +-
 .../solr/handler/export/TestExportWriter.java      |    5 +-
 .../org/apache/solr/highlight/HighlighterTest.java |   12 +-
 .../highlight/TestPostingsSolrHighlighter.java     |    9 +-
 .../solr/highlight/TestUnifiedSolrHighlighter.java |   17 +-
 .../solr/index/WrapperMergePolicyFactoryTest.java  |    8 +-
 .../apache/solr/internal/csv/CharBufferTest.java   |    9 +-
 .../apache/solr/metrics/SolrMetricManagerTest.java |    7 +-
 .../solr/metrics/SolrMetricsIntegrationTest.java   |    6 +-
 .../reporters/SolrGraphiteReporterTest.java        |    6 +-
 .../reporters/SolrJmxReporterCloudTest.java        |    7 +-
 .../metrics/reporters/SolrSlf4jReporterTest.java   |    6 +-
 .../org/apache/solr/request/SimpleFacetsTest.java  |  109 +-
 .../apache/solr/request/TestIntervalFaceting.java  |   10 +-
 .../apache/solr/request/TestRemoteStreaming.java   |   28 +-
 .../org/apache/solr/request/TestStreamBody.java    |   10 +-
 .../transform/TestExplainDocTransformer.java       |   75 +
 .../apache/solr/rest/schema/TestBulkSchemaAPI.java |   56 +
 .../apache/solr/schema/ChangedSchemaMergeTest.java |   15 +-
 .../test/org/apache/solr/schema/CopyFieldTest.java |   69 +-
 .../apache/solr/schema/CurrencyFieldTypeTest.java  |    8 +-
 .../apache/solr/schema/PreAnalyzedFieldTest.java   |   19 +-
 .../solr/schema/ResolveAnalyzerByNameTest.java     |  135 +
 .../solr/schema/SpatialRPTFieldTypeTest.java       |   16 +-
 .../apache/solr/schema/TestCloudSchemaless.java    |   41 +-
 .../solr/schema/TestUseDocValuesAsStored.java      |    2 +
 .../solr/search/TestExtendedDismaxParser.java      |   11 +-
 .../org/apache/solr/search/TestFastLRUCache.java   |   48 +-
 .../test/org/apache/solr/search/TestLFUCache.java  |   36 +-
 .../test/org/apache/solr/search/TestLRUCache.java  |   53 +-
 .../test/org/apache/solr/search/TestRecovery.java  |   61 +-
 .../org/apache/solr/search/TestSolr4Spatial2.java  |   17 +
 .../solr/search/function/TestFunctionQuery.java    |    5 +-
 .../join/another/BJQFilterAccessibleTest.java      |   52 +
 .../solr/search/mlt/SimpleMLTQParserTest.java      |   39 +-
 .../solr/security/BasicAuthIntegrationTest.java    |   62 +-
 .../solr/security/BasicAuthOnSingleNodeTest.java   |    6 +-
 .../security/JWTAuthPluginIntegrationTest.java     |   59 +-
 .../apache/solr/security/JWTAuthPluginTest.java    |  239 +-
 .../apache/solr/security/JWTIssuerConfigTest.java  |  156 +
 .../security/JWTVerificationkeyResolverTest.java   |  156 +
 .../security/PKIAuthenticationIntegrationTest.java |   15 +-
 .../solr/security/TestAuthorizationFramework.java  |    5 +-
 .../security/TestSha256AuthenticationProvider.java |   58 +-
 .../hadoop/TestDelegationWithHadoopAuth.java       |   20 +-
 .../hadoop/TestImpersonationWithHadoopAuth.java    |   51 +-
 .../org/apache/solr/servlet/CacheHeaderTest.java   |   26 +-
 .../solr/servlet/DirectSolrConnectionTest.java     |   11 +-
 .../apache/solr/servlet/SolrRequestParserTest.java |   68 +-
 .../spelling/ConjunctionSolrSpellCheckerTest.java  |    7 +-
 .../apache/solr/store/hdfs/HdfsDirectoryTest.java  |    6 +-
 .../org/apache/solr/update/AddBlockUpdateTest.java |    8 +-
 .../solr/update/AnalysisErrorHandlingTest.java     |   13 +-
 .../apache/solr/update/DocumentBuilderTest.java    |   71 +-
 .../test/org/apache/solr/update/RootFieldTest.java |    4 +-
 .../solr/update/TestAtomicUpdateErrorCases.java    |   52 +-
 .../test/org/apache/solr/update/TestUpdate.java    |   62 +-
 .../AtomicUpdateProcessorFactoryTest.java          |  117 +-
 .../solr/update/processor/AtomicUpdatesTest.java   |   31 +
 .../IgnoreLargeDocumentProcessorFactoryTest.java   |   14 +-
 .../StatelessScriptUpdateProcessorFactoryTest.java |   49 +-
 .../processor/TestDocBasedVersionConstraints.java  |  157 +-
 .../processor/TestNamedUpdateProcessors.java       |   21 +-
 .../processor/TolerantUpdateProcessorTest.java     |  129 +-
 .../org/apache/solr/util/DateMathParserTest.java   |   11 +-
 .../test/org/apache/solr/util/TestExportTool.java  |  232 ++
 .../org/apache/solr/util/TestTestInjection.java    |   26 +-
 .../BigEndianAscendingWordDeserializerTest.java    |   24 +-
 .../hll/BigEndianAscendingWordSerializerTest.java  |   42 +-
 .../example-DIH/solr/atom/conf/managed-schema      |   36 +-
 .../example-DIH/solr/db/conf/managed-schema        |  488 +--
 .../example-DIH/solr/mail/conf/managed-schema      |  490 +--
 .../example-DIH/solr/solr/conf/managed-schema      |  488 +--
 .../example-DIH/solr/tika/conf/managed-schema      |    4 +-
 solr/example/files/conf/managed-schema             |  438 +--
 solr/licenses/jackson-annotations-2.9.8.jar.sha1   |    1 -
 solr/licenses/jackson-annotations-2.9.9.jar.sha1   |    1 +
 solr/licenses/jackson-core-2.9.8.jar.sha1          |    1 -
 solr/licenses/jackson-core-2.9.9.jar.sha1          |    1 +
 solr/licenses/jackson-databind-2.9.8.jar.sha1      |    1 -
 solr/licenses/jackson-databind-2.9.9.3.jar.sha1    |    1 +
 .../jackson-dataformat-smile-2.9.8.jar.sha1        |    1 -
 .../jackson-dataformat-smile-2.9.9.jar.sha1        |    1 +
 solr/licenses/simple-xml-2.7.1.jar.sha1            |    1 -
 solr/licenses/simple-xml-NOTICE.txt                |    2 -
 solr/licenses/simple-xml-safe-2.7.1.jar.sha1       |    1 +
 ...NSE-ASL.txt => simple-xml-safe-LICENSE-ASL.txt} |    0
 solr/licenses/simple-xml-safe-NOTICE.txt           |    2 +
 .../solr/configsets/_default/conf/managed-schema   |  494 +--
 .../conf/managed-schema                            |  534 +--
 solr/solr-ref-guide/src/about-filters.adoc         |   21 +
 solr/solr-ref-guide/src/about-tokenizers.adoc      |   19 +
 .../adding-custom-plugins-in-solrcloud-mode.adoc   |   16 +-
 solr/solr-ref-guide/src/analyzers.adoc             |   64 +-
 .../src/basic-authentication-plugin.adoc           |    2 +-
 solr/solr-ref-guide/src/charfilterfactories.adoc   |   79 +-
 solr/solr-ref-guide/src/distributed-requests.adoc  |   20 +-
 solr/solr-ref-guide/src/filter-descriptions.adoc   |  963 ++++-
 solr/solr-ref-guide/src/format-of-solr-xml.adoc    |   14 +
 solr/solr-ref-guide/src/how-solrcloud-works.adoc   |    6 +
 .../src/jwt-authentication-plugin.adoc             |  119 +-
 solr/solr-ref-guide/src/language-analysis.adoc     | 1025 ++++-
 .../src/major-changes-in-solr-9.adoc               |   46 +
 ...onitoring-solr-with-prometheus-and-grafana.adoc |   24 +-
 solr/solr-ref-guide/src/other-parsers.adoc         |    1 +
 .../src/query-settings-in-solrconfig.adoc          |    6 +-
 solr/solr-ref-guide/src/schema-api.adoc            |   24 +-
 .../src/solr-control-script-reference.adoc         |   29 +-
 solr/solr-ref-guide/src/solr-upgrade-notes.adoc    |    2 +-
 .../src/solrcloud-autoscaling-triggers.adoc        |   12 +-
 .../src/stream-source-reference.adoc               |   14 +-
 .../src/the-query-elevation-component.adoc         |    8 +
 solr/solr-ref-guide/src/tokenizers.adoc            |  368 +-
 .../org/apache/solr/client/solrj/SolrRequest.java  |    8 +-
 .../cloud/autoscaling/MoveReplicaSuggester.java    |    9 +-
 .../client/solrj/cloud/autoscaling/Policy.java     |    2 +-
 .../solrj/cloud/autoscaling/ReplicaInfo.java       |    2 +-
 .../cloud/autoscaling/SplitShardSuggester.java     |    4 +
 .../client/solrj/cloud/autoscaling/Variable.java   |    8 +-
 .../solrj/impl/DelegationTokenHttpSolrClient.java  |    2 +-
 .../solr/client/solrj/impl/Http2SolrClient.java    |   10 +-
 .../solr/client/solrj/impl/HttpSolrClient.java     |   13 +-
 .../java/org/apache/solr/client/solrj/io/Lang.java |    4 +
 .../solr/client/solrj/io/eval/ColumnEvaluator.java |    2 +-
 .../client/solrj/io/eval/ConversionEvaluator.java  |    2 +-
 .../client/solrj/io/eval/FieldValueEvaluator.java  |    6 +-
 .../solr/client/solrj/io/eval/IsNullEvaluator.java |    4 +
 .../solrj/io/eval/KolmogorovSmirnovEvaluator.java  |    8 +-
 .../{IsNullEvaluator.java => LowerEvaluator.java}  |   36 +-
 .../client/solrj/io/eval/NotNullEvaluator.java     |    4 +
 .../{IsNullEvaluator.java => SplitEvaluator.java}  |   37 +-
 .../{IsNullEvaluator.java => TrimEvaluator.java}   |   36 +-
 .../{IsNullEvaluator.java => UpperEvaluator.java}  |   36 +-
 .../solr/client/solrj/io/stream/CsvStream.java     |   11 +-
 .../solr/client/solrj/io/stream/KnnStream.java     |   10 +-
 .../client/solrj/io/stream/RandomFacadeStream.java |    4 +-
 .../solr/client/solrj/io/stream/RandomStream.java  |   10 +-
 .../solr/client/solrj/io/stream/SearchStream.java  |    4 +-
 .../solr/client/solrj/io/stream/SelectStream.java  |    6 +-
 .../client/solrj/request/CollectionApiMapping.java |   10 +-
 .../solr/client/solrj/request/V2Request.java       |   17 +
 .../org/apache/solr/common/SolrInputDocument.java  |   48 +-
 .../solr/common/cloud/CompositeIdRouter.java       |    5 +-
 .../apache/solr/common/cloud/ZkStateReader.java    |    6 +-
 .../solr/common/cloud/rule/ImplicitSnitch.java     |    3 +-
 .../solr/common/params/AutoScalingParams.java      |    1 +
 .../apache/solr/common/params/CommonParams.java    |    9 +-
 .../org/apache/solr/common/params/ShardParams.java |   15 +
 .../org/apache/solr/common/util/ExecutorUtil.java  |    1 +
 .../java/org/apache/solr/common/util/StrUtils.java |   11 +-
 .../src/resources/apispec/cluster.Commands.json    |   12 +-
 .../cluster.Commands.runtimelib.properties.json    |    6 +-
 solr/solrj/src/resources/apispec/core.config.json  |    3 +-
 .../solrj/src/resources/apispec/node.blob.GET.json |   11 +
 .../org/apache/solr/client/solrj/GetByIdTest.java  |   34 +-
 .../solr/client/solrj/LargeVolumeTestBase.java     |   14 +-
 .../apache/solr/client/solrj/SolrExampleTests.java |  131 +-
 .../autoscaling/MoveReplicaSuggesterTest.java      |  104 +
 .../client/solrj/cloud/autoscaling/TestPolicy.java |  100 +-
 .../solrj/embedded/LargeVolumeBinaryJettyTest.java |    2 +-
 .../solrj/embedded/LargeVolumeJettyTest.java       |    2 +-
 .../solrj/embedded/SolrExampleEmbeddedTest.java    |    2 +-
 .../solrj/embedded/SolrExampleJettyTest.java       |   18 +-
 .../client/solrj/embedded/TestSolrProperties.java  |   20 +-
 .../client/solrj/impl/BasicHttpSolrClientTest.java |  154 +-
 .../client/solrj/impl/CloudSolrClientTest.java     |   33 +-
 .../solrj/impl/SolrPortAwareCookieSpecTest.java    |   66 +-
 .../solrj/impl/TestCloudSolrClientConnections.java |   17 +-
 .../org/apache/solr/client/solrj/io/TestLang.java  |    3 +-
 .../client/solrj/io/stream/MathExpressionTest.java |  122 +-
 .../solrj/io/stream/StreamExpressionTest.java      |   76 +-
 .../io/stream/eval/AbsoluteValueEvaluatorTest.java |    4 +-
 .../solrj/io/stream/eval/AddEvaluatorTest.java     |    6 +-
 .../io/stream/eval/ArcCosineEvaluatorTest.java     |    5 +-
 .../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   |    6 +-
 .../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      |    6 +-
 .../io/stream/eval/NaturalLogEvaluatorTest.java    |    4 +-
 .../solrj/io/stream/eval/PowerEvaluatorTest.java   |    2 +-
 .../solrj/io/stream/eval/RoundEvaluatorTest.java   |    5 +-
 .../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 +-
 .../solr/client/solrj/request/SchemaTest.java      |   15 +-
 .../solr/client/solrj/request/SolrPingTest.java    |    8 +-
 .../solrj/request/TestConfigSetAdminRequest.java   |   11 +-
 .../solr/client/solrj/request/TestCoreAdmin.java   |   41 +-
 .../solr/client/solrj/request/TestV2Request.java   |   11 +
 .../client/solrj/response/TermsResponseTest.java   |   20 +-
 .../response/TestDelegationTokenResponse.java      |   28 +-
 .../solrj/response/TestSpellCheckResponse.java     |   33 +-
 .../solrj/response/TestSuggesterResponse.java      |    8 +-
 .../solr/common/TestToleratedUpdateError.java      |   26 +-
 .../apache/solr/common/util/JsonValidatorTest.java |   27 +-
 .../org/apache/solr/common/util/NamedListTest.java |   11 +-
 .../solr/common/util/TestValidatingJsonMap.java    |    7 +-
 .../apache/solr/EmbeddedSolrServerTestBase.java    |  160 +
 .../java/org/apache/solr/SolrJettyTestBase.java    |   54 +-
 .../src/java/org/apache/solr/SolrTestCaseJ4.java   |   65 +-
 .../solr/analysis/MockCharFilterFactory.java       |    4 +
 .../solr/analysis/MockTokenFilterFactory.java      |    4 +
 .../apache/solr/analysis/MockTokenizerFactory.java |    4 +
 .../solr/cloud/AbstractDistribZkTestBase.java      |    1 +
 .../solr/cloud/AbstractFullDistribZkTestBase.java  |    6 +-
 .../apache/solr/cloud/MiniSolrCloudCluster.java    |    6 +-
 .../apache/solr/cloud/SolrCloudAuthTestCase.java   |   50 +-
 .../org/apache/solr/cloud/SolrCloudTestCase.java   |   97 +-
 .../java/org/apache/solr/cloud/ZkTestServer.java   |    2 +
 .../solr/cloud/MiniSolrCloudClusterTest.java       |   14 +-
 solr/webapp/web/css/angular/collections.css        |   38 +-
 solr/webapp/web/css/angular/overview.css           |   42 +
 solr/webapp/web/index.html                         |   17 +-
 solr/webapp/web/js/angular/app.js                  |   59 +-
 .../web/js/angular/controllers/alias-overview.js}  |   47 +-
 solr/webapp/web/js/angular/controllers/cloud.js    |   11 +-
 .../web/js/angular/controllers/collections.js      |   43 +-
 solr/webapp/web/js/angular/services.js             |    6 +
 solr/webapp/web/partials/alias_overview.html       |   46 +
 solr/webapp/web/partials/cloud.html                |    2 +-
 solr/webapp/web/partials/collection_overview.html  |    2 +-
 solr/webapp/web/partials/collections.html          |  223 +-
 673 files changed, 42176 insertions(+), 12929 deletions(-)

diff --cc solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
index 1350093,192adb1..f0170ef
--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
@@@ -47,44 -48,10 +47,43 @@@ import org.apache.lucene.index.MultiPos
  import org.apache.lucene.index.PostingsEnum;
  import org.apache.lucene.index.StoredFieldVisitor;
  import org.apache.lucene.index.Term;
- import org.apache.lucene.index.TermStates;
  import org.apache.lucene.index.Terms;
  import org.apache.lucene.index.TermsEnum;
 -import org.apache.lucene.search.*;
 +import org.apache.lucene.search.BooleanClause;
  import org.apache.lucene.search.BooleanClause.Occur;
 +import org.apache.lucene.search.BooleanQuery;
 +import org.apache.lucene.search.CollectionStatistics;
 +import org.apache.lucene.search.Collector;
 +import org.apache.lucene.search.CollectorManager;
 +import org.apache.lucene.search.ConstantScoreQuery;
 +import org.apache.lucene.search.DocIdSet;
 +import org.apache.lucene.search.DocIdSetIterator;
 +import org.apache.lucene.search.Explanation;
 +import org.apache.lucene.search.FieldDoc;
 +import org.apache.lucene.search.IndexSearcher;
 +import org.apache.lucene.search.LeafCollector;
 +import org.apache.lucene.search.MatchAllDocsQuery;
 +import org.apache.lucene.search.MultiCollector;
 +import org.apache.lucene.search.Query;
 +import org.apache.lucene.search.QueryVisitor;
 +import org.apache.lucene.search.Scorable;
 +import org.apache.lucene.search.ScoreDoc;
 +import org.apache.lucene.search.ScoreMode;
 +import org.apache.lucene.search.Scorer;
 +import org.apache.lucene.search.SimpleCollector;
 +import org.apache.lucene.search.Sort;
 +import org.apache.lucene.search.SortField;
 +import org.apache.lucene.search.TermQuery;
 +import org.apache.lucene.search.TermStatistics;
 +import org.apache.lucene.search.TimeLimitingCollector;
 +import org.apache.lucene.search.TopDocs;
 +import org.apache.lucene.search.TopDocsCollector;
 +import org.apache.lucene.search.TopFieldCollector;
 +import org.apache.lucene.search.TopFieldDocs;
 +import org.apache.lucene.search.TopScoreDocCollector;
 +import org.apache.lucene.search.TotalHitCountCollector;
 +import org.apache.lucene.search.TotalHits;
 +import org.apache.lucene.search.Weight;
  import org.apache.lucene.store.Directory;
  import org.apache.lucene.util.Bits;
  import org.apache.lucene.util.BytesRef;


Mime
View raw message