You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by da...@apache.org on 2018/09/14 03:30:23 UTC

[06/43] lucene-solr:jira/http2: Merge remote-tracking branch 'upstream/master' into LUCENE-8343

Merge remote-tracking branch 'upstream/master' into LUCENE-8343


Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/1a83a146
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/1a83a146
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/1a83a146

Branch: refs/heads/jira/http2
Commit: 1a83a146684f20f431ba646fecb7db311e1e0afa
Parents: e0232f1 331ccf3
Author: Alessandro Benedetti <a....@sease.io>
Authored: Wed Jul 18 10:19:21 2018 +0100
Committer: Alessandro Benedetti <a....@sease.io>
Committed: Wed Jul 18 10:19:21 2018 +0100

----------------------------------------------------------------------
 build.xml                                       |     4 +-
 dev-tools/doap/lucene.rdf                       |    14 +
 dev-tools/doap/solr.rdf                         |    14 +
 dev-tools/idea/.idea/ant.xml                    |     2 -
 dev-tools/idea/.idea/modules.xml                |     2 -
 dev-tools/idea/.idea/workspace.xml              |    18 -
 .../idea/lucene/analysis/uima/analysis-uima.iml |    30 -
 dev-tools/idea/solr/contrib/uima/uima.iml       |    36 -
 .../maven/lucene/analysis/pom.xml.template      |     1 -
 .../maven/lucene/analysis/uima/pom.xml.template |    74 -
 dev-tools/maven/solr/contrib/pom.xml.template   |     1 -
 .../maven/solr/contrib/uima/pom.xml.template    |    83 -
 dev-tools/scripts/SOLR-2452.patch.hack.pl       |    15 -
 dev-tools/scripts/addVersion.py                 |     1 -
 dev-tools/scripts/jenkins.build.ref.guide.sh    |     2 +
 dev-tools/scripts/reproduceJenkinsFailures.py   |    12 +-
 .../test-patch/lucene-solr-yetus-personality.sh |     2 +-
 lucene/CHANGES.txt                              |   131 +-
 lucene/MIGRATE.txt                              |    24 +
 lucene/analysis/README.txt                      |     6 -
 lucene/analysis/build.xml                       |     7 +-
 lucene/analysis/common/build.xml                |     1 +
 .../lucene/analysis/bg/BulgarianAnalyzer.java   |    10 +-
 .../lucene/analysis/bn/BengaliAnalyzer.java     |    17 +-
 .../lucene/analysis/br/BrazilianAnalyzer.java   |     8 +-
 .../lucene/analysis/ca/CatalanAnalyzer.java     |    11 +-
 .../lucene/analysis/ckb/SoraniAnalyzer.java     |     9 +-
 .../commongrams/CommonGramsFilterFactory.java   |     8 +-
 .../lucene/analysis/core/StopAnalyzer.java      |    12 -
 .../lucene/analysis/core/StopFilterFactory.java |     7 +-
 .../lucene/analysis/cz/CzechAnalyzer.java       |    13 +-
 .../lucene/analysis/da/DanishAnalyzer.java      |    10 +-
 .../lucene/analysis/de/GermanAnalyzer.java      |     9 +-
 .../lucene/analysis/el/GreekAnalyzer.java       |     8 +-
 .../lucene/analysis/en/EnglishAnalyzer.java     |    42 +-
 .../lucene/analysis/es/SpanishAnalyzer.java     |    10 +-
 .../lucene/analysis/eu/BasqueAnalyzer.java      |    10 +-
 .../lucene/analysis/fa/PersianAnalyzer.java     |     4 +-
 .../lucene/analysis/fi/FinnishAnalyzer.java     |    10 +-
 .../lucene/analysis/fr/FrenchAnalyzer.java      |    11 +-
 .../lucene/analysis/ga/IrishAnalyzer.java       |     9 +-
 .../lucene/analysis/gl/GalicianAnalyzer.java    |    10 +-
 .../lucene/analysis/hi/HindiAnalyzer.java       |     4 +-
 .../lucene/analysis/hu/HungarianAnalyzer.java   |    10 +-
 .../lucene/analysis/hy/ArmenianAnalyzer.java    |    10 +-
 .../lucene/analysis/id/IndonesianAnalyzer.java  |    10 +-
 .../lucene/analysis/it/ItalianAnalyzer.java     |     9 +-
 .../lucene/analysis/lt/LithuanianAnalyzer.java  |    10 +-
 .../lucene/analysis/lv/LatvianAnalyzer.java     |    10 +-
 .../miscellaneous/ConditionalTokenFilter.java   |    64 +-
 .../miscellaneous/WordDelimiterGraphFilter.java |     1 +
 .../analysis/ngram/EdgeNGramTokenFilter.java    |     6 +
 .../lucene/analysis/ngram/NGramTokenFilter.java |     6 +
 .../lucene/analysis/nl/DutchAnalyzer.java       |    12 +-
 .../lucene/analysis/no/NorwegianAnalyzer.java   |    10 +-
 .../lucene/analysis/pt/PortugueseAnalyzer.java  |    10 +-
 .../lucene/analysis/ro/RomanianAnalyzer.java    |    10 +-
 .../lucene/analysis/ru/RussianAnalyzer.java     |    10 +-
 .../analysis/shingle/FixedShingleFilter.java    |     1 +
 .../analysis/standard/ASCIITLD.jflex-macro      |   263 +-
 .../analysis/standard/ClassicAnalyzer.java      |     4 +-
 .../standard/StandardFilterFactory.java         |    50 -
 .../standard/UAX29URLEmailAnalyzer.java         |    10 +-
 .../standard/UAX29URLEmailTokenizerImpl.java    | 47679 +++++++++--------
 .../standard/UAX29URLEmailTokenizerImpl.jflex   |    26 +-
 .../lucene/analysis/standard/package.html       |     6 +-
 .../lucene/analysis/sv/SwedishAnalyzer.java     |    10 +-
 .../lucene/analysis/tr/TurkishAnalyzer.java     |    10 +-
 .../lucene/analysis/util/UnicodeProps.java      |     6 +-
 ...ache.lucene.analysis.util.TokenFilterFactory |     1 -
 .../lucene/analysis/core/TestAnalyzers.java     |     9 +-
 .../lucene/analysis/core/TestRandomChains.java  |    21 +-
 .../lucene/analysis/core/TestStopAnalyzer.java  |     5 +-
 .../analysis/core/TestStopFilterFactory.java    |     3 +-
 .../TestConditionalTokenFilter.java             |    81 +-
 .../miscellaneous/TestWordDelimiterFilter.java  |    28 +-
 .../TestWordDelimiterGraphFilter.java           |    48 +-
 .../ngram/EdgeNGramTokenFilterTest.java         |    10 +
 .../analysis/ngram/NGramTokenFilterTest.java    |    21 +-
 .../analysis/sinks/TestTeeSinkTokenFilter.java  |    11 +-
 .../standard/TestStandardFactories.java         |     5 -
 .../standard/TestUAX29URLEmailTokenizer.java    |   158 +
 .../lucene/analysis/th/TestThaiAnalyzer.java    |     4 +-
 .../TestWikipediaTokenizerFactory.java          |     6 +-
 .../standard/GenerateJflexTLDMacros.java        |   148 +-
 lucene/analysis/icu/src/data/uax29/Default.rbbi |    46 +-
 .../icu/src/data/utr30/DiacriticFolding.txt     |     4 +
 .../icu/src/data/utr30/NativeDigitFolding.txt   |    20 +
 .../icu/segmentation/BreakIteratorWrapper.java  |    12 +-
 lucene/analysis/icu/src/java/overview.html      |     2 +-
 .../analysis/icu/segmentation/Default.brk       |   Bin 50760 -> 43176 bytes
 .../icu/segmentation/MyanmarSyllable.brk        |   Bin 21272 -> 21808 bytes
 .../org/apache/lucene/analysis/icu/utr30.nrm    |   Bin 59056 -> 59232 bytes
 .../Latin-dont-break-on-hyphens.rbbi            |   187 +-
 .../icu/segmentation/TestICUTokenizer.java      |    15 +
 .../analysis/ja/TestJapaneseAnalyzer.java       |     2 +-
 .../analysis/ja/TestJapaneseTokenizer.java      |    12 +-
 .../analysis/morfologik/MorfologikAnalyzer.java |    11 +-
 .../uk/UkrainianMorfologikAnalyzer.java         |     9 +-
 .../morfologik/TestMorfologikAnalyzer.java      |     4 +-
 .../lucene/analysis/pl/PolishAnalyzer.java      |    10 +-
 .../src/java/org/egothor/stemmer/Trie.java      |    16 +-
 lucene/analysis/uima/build.xml                  |    50 -
 lucene/analysis/uima/ivy.xml                    |    30 -
 .../lucene/analysis/uima/BaseUIMATokenizer.java |    96 -
 .../analysis/uima/UIMAAnnotationsTokenizer.java |    90 -
 .../uima/UIMAAnnotationsTokenizerFactory.java   |    47 -
 .../lucene/analysis/uima/UIMABaseAnalyzer.java  |    44 -
 .../analysis/uima/UIMATypeAwareAnalyzer.java    |    44 -
 .../uima/UIMATypeAwareAnnotationsTokenizer.java |   113 -
 ...IMATypeAwareAnnotationsTokenizerFactory.java |    50 -
 .../lucene/analysis/uima/ae/AEProvider.java     |    34 -
 .../analysis/uima/ae/AEProviderFactory.java     |    76 -
 .../analysis/uima/ae/BasicAEProvider.java       |    87 -
 .../uima/ae/OverridingParamsAEProvider.java     |    69 -
 .../lucene/analysis/uima/ae/package-info.java   |    21 -
 .../lucene/analysis/uima/package-info.java      |    21 -
 lucene/analysis/uima/src/java/overview.html     |    29 -
 ...apache.lucene.analysis.util.TokenizerFactory |    17 -
 .../src/resources/uima/AggregateSentenceAE.xml  |    70 -
 .../test-files/uima/TestAggregateSentenceAE.xml |    55 -
 .../test-files/uima/TestEntityAnnotatorAE.xml   |    66 -
 .../src/test-files/uima/TestPoSTaggerAE.xml     |    44 -
 .../src/test-files/uima/TestWSTokenizerAE.xml   |    78 -
 .../analysis/uima/UIMABaseAnalyzerTest.java     |   137 -
 .../uima/UIMATypeAwareAnalyzerTest.java         |    70 -
 .../analysis/uima/ae/AEProviderFactoryTest.java |    44 -
 .../analysis/uima/ae/BasicAEProviderTest.java   |    36 -
 .../uima/ae/OverridingParamsAEProviderTest.java |    59 -
 .../analysis/uima/an/SampleEntityAnnotator.java |    64 -
 .../analysis/uima/an/SamplePoSTagger.java       |    57 -
 .../uima/an/SampleWSTokenizerAnnotator.java     |    66 -
 .../index/TestBackwardsCompatibility.java       |    11 +-
 .../org/apache/lucene/index/index.7.4.0-cfs.zip |   Bin 0 -> 15484 bytes
 .../apache/lucene/index/index.7.4.0-nocfs.zip   |   Bin 0 -> 15493 bytes
 .../org/apache/lucene/index/sorted.7.4.0.zip    |   Bin 0 -> 158939 bytes
 .../lucene/index/unsupported.6.6.5-cfs.zip      |   Bin 0 -> 15765 bytes
 .../lucene/index/unsupported.6.6.5-nocfs.zip    |   Bin 0 -> 15763 bytes
 .../conf/english-porter-comparison.alg          |     6 +-
 .../lucene/benchmark/byTask/tasks/ReadTask.java |     7 -
 .../byTask/tasks/SearchWithSortTask.java        |     9 -
 .../lucene/benchmark/byTask/utils/Config.java   |     2 +-
 lucene/build.xml                                |     1 -
 .../lucene/classification/BM25NBClassifier.java |     4 +-
 .../classification/KNearestFuzzyClassifier.java |     2 +-
 .../KNearestNeighborClassifier.java             |     2 +-
 lucene/common-build.xml                         |     2 -
 .../org/apache/lucene/analysis/Analyzer.java    |     2 -
 .../lucene/analysis/FilteringTokenFilter.java   |     2 -
 .../lucene/analysis/TokenStreamToAutomaton.java |     8 +-
 .../analysis/standard/StandardAnalyzer.java     |    38 +-
 .../analysis/standard/StandardFilter.java       |    39 -
 .../lucene/analysis/standard/package-info.java  |     1 -
 .../java/org/apache/lucene/geo/GeoUtils.java    |    38 +
 .../src/java/org/apache/lucene/geo/Polygon.java |    49 +-
 .../java/org/apache/lucene/geo/Polygon2D.java   |    22 +-
 .../org/apache/lucene/index/CheckIndex.java     |    13 +
 .../apache/lucene/index/FilterCodecReader.java  |    23 +
 .../apache/lucene/index/FilterLeafReader.java   |     5 -
 .../org/apache/lucene/index/IndexWriter.java    |    65 +-
 .../apache/lucene/index/LeafReaderContext.java  |     4 +-
 .../apache/lucene/index/PendingSoftDeletes.java |     6 +-
 .../org/apache/lucene/index/PostingsEnum.java   |     9 -
 .../org/apache/lucene/index/ReaderPool.java     |    37 +-
 .../apache/lucene/index/SegmentCommitInfo.java  |     4 +-
 .../index/SoftDeletesRetentionMergePolicy.java  |    35 +-
 .../apache/lucene/index/TieredMergePolicy.java  |   605 +-
 .../apache/lucene/search/DocIdSetIterator.java  |    41 +
 .../org/apache/lucene/search/IndexSearcher.java |    32 +-
 .../java/org/apache/lucene/search/Matches.java  |    13 +-
 .../apache/lucene/search/MultiCollector.java    |    14 +
 .../org/apache/lucene/search/QueryRescorer.java |     2 +-
 .../lucene/search/SloppyPhraseMatcher.java      |     4 +-
 .../org/apache/lucene/search/SortRescorer.java  |     2 +-
 .../org/apache/lucene/search/TermQuery.java     |     7 +
 .../java/org/apache/lucene/search/TopDocs.java  |    35 +-
 .../apache/lucene/search/TopDocsCollector.java  |     2 +-
 .../apache/lucene/search/TopFieldCollector.java |    81 +-
 .../org/apache/lucene/search/TopFieldDocs.java  |     5 +-
 .../lucene/search/TopScoreDocCollector.java     |    16 +-
 .../org/apache/lucene/util/PriorityQueue.java   |    11 +-
 .../lucene/util/fst/PositiveIntOutputs.java     |     3 +-
 .../src/test/org/apache/lucene/TestDemo.java    |     4 +-
 .../org/apache/lucene/TestExternalCodecs.java   |    14 +-
 .../lucene/analysis/TestCharArraySet.java       |     4 +-
 .../perfield/TestPerFieldDocValuesFormat.java   |     2 +-
 .../org/apache/lucene/index/Test2BTerms.java    |     2 +-
 .../index/TestBinaryDocValuesUpdates.java       |     5 +-
 .../lucene/index/TestDirectoryReaderReopen.java |     8 +-
 .../apache/lucene/index/TestIndexSorting.java   |     5 +-
 .../apache/lucene/index/TestIndexWriter.java    |    26 +-
 .../lucene/index/TestIndexWriterDelete.java     |     1 +
 .../lucene/index/TestIndexWriterExceptions.java |     9 +-
 .../index/TestIndexWriterWithThreads.java       |    15 +-
 .../apache/lucene/index/TestLogMergePolicy.java |    17 +
 .../org/apache/lucene/index/TestManyFields.java |     2 +-
 .../apache/lucene/index/TestNoMergePolicy.java  |    25 +
 .../index/TestNumericDocValuesUpdates.java      |     1 +
 .../lucene/index/TestPendingSoftDeletes.java    |     2 +
 .../apache/lucene/index/TestReadOnlyIndex.java  |     4 +-
 .../org/apache/lucene/index/TestReaderPool.java |    32 +
 .../TestSoftDeletesDirectoryReaderWrapper.java  |     2 +-
 .../TestSoftDeletesRetentionMergePolicy.java    |    65 +-
 .../lucene/index/TestTieredMergePolicy.java     |   396 +-
 .../index/TestUpgradeIndexMergePolicy.java      |    13 +
 .../lucene/search/MultiCollectorTest.java       |     3 +
 .../org/apache/lucene/search/TestBoolean2.java  |     8 +-
 .../lucene/search/TestConstantScoreQuery.java   |     4 +-
 .../lucene/search/TestDocIdSetIterator.java     |    55 +
 .../lucene/search/TestDoubleValuesSource.java   |     4 +-
 .../lucene/search/TestElevationComparator.java  |     2 +-
 .../lucene/search/TestFieldValueQuery.java      |     6 +-
 .../apache/lucene/search/TestIndexSearcher.java |    36 +-
 .../lucene/search/TestLongValuesSource.java     |     4 +-
 .../lucene/search/TestMultiCollector.java       |    74 +-
 .../lucene/search/TestMultiPhraseQuery.java     |     8 +-
 .../search/TestNormsFieldExistsQuery.java       |     6 +-
 .../apache/lucene/search/TestPhraseQuery.java   |     6 +-
 .../apache/lucene/search/TestPrefixQuery.java   |     2 +-
 .../apache/lucene/search/TestSearchAfter.java   |     9 +-
 .../lucene/search/TestShardSearching.java       |     4 +-
 .../apache/lucene/search/TestSortRandom.java    |     2 +-
 .../search/TestSortedNumericSortField.java      |     4 +-
 .../lucene/search/TestSortedSetSortField.java   |     4 +-
 .../org/apache/lucene/search/TestTermQuery.java |    30 +
 .../lucene/search/TestTopDocsCollector.java     |    22 +-
 .../apache/lucene/search/TestTopDocsMerge.java  |    10 +-
 .../lucene/search/TestTopFieldCollector.java    |   155 +-
 .../TestTopFieldCollectorEarlyTermination.java  |     7 +-
 .../spans/TestSpanMultiTermQueryWrapper.java    |    56 +-
 .../apache/lucene/search/spans/TestSpans.java   |     2 +-
 .../apache/lucene/util/TestPriorityQueue.java   |    19 +-
 .../org/apache/lucene/util/TestSetOnce.java     |    10 +-
 .../org/apache/lucene/util/fst/TestFSTs.java    |     4 +-
 .../lucene/expressions/TestDemoExpressions.java |    10 +-
 .../lucene/expressions/TestExpressionSorts.java |     4 +-
 .../org/apache/lucene/facet/DrillSideways.java  |     6 +-
 .../apache/lucene/facet/FacetsCollector.java    |    21 +-
 .../org/apache/lucene/facet/FacetsConfig.java   |    37 +-
 .../apache/lucene/facet/range/DoubleRange.java  |    16 +
 .../apache/lucene/facet/range/LongRange.java    |    16 +
 .../directory/DirectoryTaxonomyWriter.java      |     5 +
 .../writercache/LruTaxonomyWriterCache.java     |     3 +-
 .../writercache/NameHashIntCacheLRU.java        |     4 +-
 .../writercache/UTF8TaxonomyWriterCache.java    |    30 +-
 .../apache/lucene/facet/TestDrillDownQuery.java |    40 +
 .../apache/lucene/facet/TestDrillSideways.java  |     5 +-
 .../facet/range/TestRangeFacetCounts.java       |    26 +
 .../TestTaxonomyFacetSumValueSource.java        |     2 +-
 .../directory/TestDirectoryTaxonomyWriter.java  |     2 +
 .../TestUTF8TaxonomyWriterCache.java            |    12 +-
 .../search/grouping/BlockGroupingCollector.java |     8 +-
 .../lucene/search/grouping/TopGroups.java       |     6 +-
 .../search/grouping/TopGroupsCollector.java     |    93 +-
 .../lucene/search/uhighlight/PhraseHelper.java  |     4 +-
 .../TestUnifiedHighlighterStrictPhrases.java    |    32 +-
 lucene/ivy-versions.properties                  |    28 +-
 .../lucene/search/join/TestBlockJoin.java       |    20 +-
 .../apache/lucene/search/join/TestJoinUtil.java |     3 +-
 .../join/TestParentChildrenBlockJoinQuery.java  |     1 -
 lucene/licenses/Tagger-2.3.1.jar.sha1           |     1 -
 lucene/licenses/Tagger-LICENSE-ASL.txt          |   202 -
 lucene/licenses/Tagger-NOTICE.txt               |     7 -
 .../licenses/WhitespaceTokenizer-2.3.1.jar.sha1 |     1 -
 .../WhitespaceTokenizer-LICENSE-ASL.txt         |   202 -
 lucene/licenses/WhitespaceTokenizer-NOTICE.txt  |     7 -
 lucene/licenses/commons-compress-1.14.jar.sha1  |     1 -
 .../licenses/commons-compress-1.16.1.jar.sha1   |     1 +
 lucene/licenses/icu4j-61.1.jar.sha1             |     1 -
 lucene/licenses/icu4j-62.1.jar.sha1             |     1 +
 ...jetty-continuation-9.4.10.v20180503.jar.sha1 |     1 -
 ...jetty-continuation-9.4.11.v20180605.jar.sha1 |     1 +
 .../jetty-http-9.4.10.v20180503.jar.sha1        |     1 -
 .../jetty-http-9.4.11.v20180605.jar.sha1        |     1 +
 .../licenses/jetty-io-9.4.10.v20180503.jar.sha1 |     1 -
 .../licenses/jetty-io-9.4.11.v20180605.jar.sha1 |     1 +
 .../jetty-server-9.4.10.v20180503.jar.sha1      |     1 -
 .../jetty-server-9.4.11.v20180605.jar.sha1      |     1 +
 .../jetty-servlet-9.4.10.v20180503.jar.sha1     |     1 -
 .../jetty-servlet-9.4.11.v20180605.jar.sha1     |     1 +
 .../jetty-util-9.4.10.v20180503.jar.sha1        |     1 -
 .../jetty-util-9.4.11.v20180605.jar.sha1        |     1 +
 lucene/licenses/opennlp-tools-1.8.3.jar.sha1    |     1 -
 lucene/licenses/opennlp-tools-1.8.4.jar.sha1    |     1 +
 lucene/licenses/uimaj-core-2.3.1.jar.sha1       |     1 -
 lucene/licenses/uimaj-core-LICENSE-ASL.txt      |   202 -
 lucene/licenses/uimaj-core-NOTICE.txt           |    13 -
 .../search/DiversifiedTopDocsCollector.java     |    16 +-
 .../util/fst/UpToTwoPositiveIntOutputs.java     |     2 +
 lucene/module-build.xml                         |    22 -
 .../queries/function/FunctionScoreQuery.java    |    22 +
 .../function/TestFunctionQueryExplanations.java |     2 +-
 .../function/TestFunctionScoreQuery.java        |    10 +-
 .../function/TestIndexReaderFunctions.java      |     2 +-
 .../queries/function/TestValueSources.java      |     2 +-
 .../queries/payloads/TestPayloadTermQuery.java  |     2 -
 .../document/FloatPointNearestNeighbor.java     |     2 +-
 .../org/apache/lucene/document/LatLonPoint.java |     2 +-
 .../org/apache/lucene/document/LatLonShape.java |   113 +
 .../document/LatLonShapeBoundingBoxQuery.java   |   415 +
 .../java/org/apache/lucene/geo/Tessellator.java |   910 +
 .../src/java/org/apache/lucene/geo/package.html |    31 +
 .../apache/lucene/document/TestLatLonShape.java |   163 +
 .../lucene/document/TestLatLonShapeQueries.java |   278 +
 .../org/apache/lucene/geo/TestTessellator.java  |    45 +
 .../spatial3d/geom/GeoComplexPolygon.java       |     2 +-
 .../spatial3d/geom/GeoDegeneratePath.java       |     2 +-
 .../lucene/spatial3d/geom/GeoStandardPath.java  |     2 +-
 .../org/apache/lucene/spatial3d/geom/Plane.java |    13 +-
 .../apache/lucene/spatial3d/geom/XYZBounds.java |    12 +-
 .../apache/lucene/spatial3d/geom/PlaneTest.java |     2 +-
 .../spatial3d/geom/RandomGeoPolygonTest.java    |     3 +-
 .../analyzing/AnalyzingInfixSuggester.java      |     2 +-
 .../analyzing/SuggestStopFilterFactory.java     |     8 +-
 .../search/suggest/document/TopSuggestDocs.java |     8 +-
 .../document/TopSuggestDocsCollector.java       |     2 +-
 .../jaspell/JaspellTernarySearchTrie.java       |     6 +-
 .../analyzing/AnalyzingSuggesterTest.java       |    31 +-
 .../analyzing/TestSuggestStopFilterFactory.java |     4 +-
 .../document/TestPrefixCompletionQuery.java     |   132 +-
 .../lucene/analysis/ValidatingTokenFilter.java  |     9 +-
 .../java/org/apache/lucene/geo/GeoTestUtil.java |    39 +-
 .../index/BaseDocValuesFormatTestCase.java      |    18 +-
 .../lucene/index/BaseMergePolicyTestCase.java   |   293 +-
 .../apache/lucene/index/RandomIndexWriter.java  |     4 +-
 .../org/apache/lucene/util/LuceneTestCase.java  |     4 +-
 .../java/org/apache/lucene/util/TestUtil.java   |     1 -
 .../lucene/analysis/TestMockAnalyzer.java       |     8 +-
 .../lucene/index/TestAssertingLeafReader.java   |     2 +-
 lucene/tools/forbiddenApis/base.txt             |    18 +
 lucene/tools/junit4/cached-timehints.txt        |  1164 -
 lucene/tools/junit4/tests.policy                |     3 +-
 .../src/groovy/check-source-patterns.groovy     |     4 +
 .../lucene/validation/LibVersionsCheckTask.java |     4 +-
 solr/CHANGES.txt                                |   187 +-
 solr/NOTICE.txt                                 |    14 +-
 solr/bin/solr                                   |    65 +-
 solr/bin/solr.cmd                               |   113 +-
 solr/bin/solr.in.cmd                            |     0
 solr/common-build.xml                           |     3 +-
 .../analytics/util/FacetRangeGenerator.java     |     8 +-
 .../mapping/FillMissingFunctionTest.java        |    18 +-
 .../function/mapping/FilterFunctionTest.java    |    10 +-
 .../function/mapping/IfFunctionTest.java        |    26 +-
 .../function/mapping/RemoveFunctionTest.java    |    22 +-
 .../function/mapping/ReplaceFunctionTest.java   |    22 +-
 .../analytics/legacy/LegacyNoFacetTest.java     |     8 +-
 .../legacy/facet/LegacyFieldFacetTest.java      |    10 +-
 .../legacy/facet/LegacyQueryFacetTest.java      |     6 +-
 .../value/CastingBooleanValueStreamTest.java    |     2 +-
 .../value/CastingBooleanValueTest.java          |     6 +-
 .../value/CastingDoubleValueStreamTest.java     |     2 +-
 .../analytics/value/CastingDoubleValueTest.java |     6 +-
 .../value/CastingFloatValueStreamTest.java      |     2 +-
 .../analytics/value/CastingFloatValueTest.java  |     6 +-
 .../value/CastingIntValueStreamTest.java        |     2 +-
 .../analytics/value/CastingIntValueTest.java    |     6 +-
 .../value/CastingLongValueStreamTest.java       |     2 +-
 .../analytics/value/CastingLongValueTest.java   |     6 +-
 .../solr/analytics/value/ConstantValueTest.java |    24 +-
 .../handler/clustering/ClusteringComponent.java |     2 +-
 .../clustering/src/test-files/log4j2.xml        |    37 -
 .../handler/dataimport/SolrEntityProcessor.java |     2 +-
 .../dataimporthandler/src/test-files/log4j2.xml |    36 -
 .../dataimport/AbstractDIHCacheTestCase.java    |    16 +-
 .../dataimport/TestBuiltInEvaluators.java       |     2 +-
 .../dataimport/TestNumberFormatTransformer.java |    10 +-
 .../dataimport/TestSortedMapBackedCache.java    |    12 +-
 solr/contrib/extraction/ivy.xml                 |     2 +-
 .../handler/extraction/ParseContextConfig.java  |    12 +-
 .../langid/solr/collection1/conf/schema.xml     |     1 -
 .../java/org/apache/solr/ltr/LTRRescorer.java   |     4 +-
 .../org/apache/solr/ltr/model/LinearModel.java  |     2 +-
 .../ltr/model/MultipleAdditiveTreesModel.java   |     4 +-
 .../LTRFeatureLoggerTransformerFactory.java     |     2 +-
 solr/contrib/ltr/src/test-files/log4j2.xml      |    40 -
 .../solr/ltr/TestLTRReRankingPipeline.java      |     6 +-
 ...stFeatureExtractionFromMultipleSegments.java |    36 +-
 .../prometheus-exporter/bin/solr-exporter       |     2 +-
 .../prometheus-exporter/bin/solr-exporter.cmd   |     2 +-
 .../contrib/prometheus-exporter/conf/log4j2.xml |    53 -
 .../prometheus/collector/SolrCollector.java     |    24 +-
 .../solr/prometheus/exporter/SolrExporter.java  |     6 +-
 .../solr/prometheus/scraper/SolrScraper.java    |    10 +-
 .../src/test-files/conf/log4j2.xml              |    35 -
 .../configsets/collection1/conf/managed-schema  |     2 +-
 solr/contrib/uima/README.txt                    |   109 -
 solr/contrib/uima/build.xml                     |    63 -
 solr/contrib/uima/ivy.xml                       |    35 -
 .../uima/processor/FieldMappingException.java   |    27 -
 .../uima/processor/SolrUIMAConfiguration.java   |   117 -
 .../processor/SolrUIMAConfigurationReader.java  |   116 -
 .../solr/uima/processor/UIMAToSolrMapper.java   |    87 -
 .../processor/UIMAUpdateRequestProcessor.java   |   189 -
 .../UIMAUpdateRequestProcessorFactory.java      |    72 -
 .../solr/uima/processor/package-info.java       |    25 -
 solr/contrib/uima/src/java/overview.html        |    21 -
 .../apache/uima/desc/AggregateSentenceAE.xml    |    41 -
 .../org/apache/uima/desc/HmmTagger.xml          |   121 -
 .../apache/uima/desc/OpenCalaisAnnotator.xml    |   194 -
 .../uima/desc/OverridingParamsExtServicesAE.xml |   147 -
 .../desc/TextCategorizationAEDescriptor.xml     |   102 -
 .../desc/TextConceptTaggingAEDescriptor.xml     |   196 -
 .../desc/TextKeywordExtractionAEDescriptor.xml  |   107 -
 .../desc/TextLanguageDetectionAEDescriptor.xml  |   107 -
 .../TextRankedEntityExtractionAEDescriptor.xml  |   403 -
 .../apache/uima/desc/WhitespaceTokenizer.xml    |   115 -
 .../desc/baseAlchemyTypeSystemDescriptor.xml    |    41 -
 .../collection1/conf/aggregate-uima-config.xml  |    48 -
 .../solr/collection1/conf/uima-fields.xml       |     9 -
 .../src/test-files/uima/AggregateSentenceAE.xml |    70 -
 .../test-files/uima/DummyEntityAEDescriptor.xml |    68 -
 .../uima/DummyExceptionAEDescriptor.xml         |    40 -
 .../uima/DummySentimentAnalysisAEDescriptor.xml |    60 -
 .../contrib/uima/src/test-files/uima/TestAE.xml |    72 -
 .../src/test-files/uima/TestExceptionAE.xml     |    54 -
 .../uima/solr/collection1/conf/protwords.txt    |    21 -
 .../uima/solr/collection1/conf/schema.xml       |   612 -
 .../uima/solr/collection1/conf/solrconfig.xml   |   773 -
 .../uima/solr/collection1/conf/spellings.txt    |     2 -
 .../uima/solr/collection1/conf/stopwords.txt    |    58 -
 .../uima/solr/collection1/conf/synonyms.txt     |    31 -
 .../uima/src/test-files/uima/stoptypes.txt      |    25 -
 .../test-files/uima/uima-tokenizers-schema.xml  |   613 -
 .../uima/uima-tokenizers-solrconfig.xml         |   653 -
 .../UIMATokenizersSolrIntegrationTest.java      |    72 -
 .../UIMAUpdateRequestProcessorTest.java         |   186 -
 .../uima/processor/an/DummyEntityAnnotator.java |    47 -
 .../processor/an/DummyExceptionAnnotator.java   |    30 -
 .../processor/an/DummySentimentAnnotator.java   |    60 -
 .../solr/uima/ts/DummySentimentAnnotation.java  |    81 -
 .../uima/ts/DummySentimentAnnotation_Type.java  |    80 -
 .../apache/solr/uima/ts/EntityAnnotation.java   |    99 -
 .../solr/uima/ts/EntityAnnotation_Type.java     |   102 -
 .../src/java/org/apache/solr/api/ApiBag.java    |     6 +-
 .../solrj/embedded/EmbeddedSolrServer.java      |    54 +-
 .../java/org/apache/solr/cloud/Overseer.java    |    33 +-
 .../solr/cloud/OverseerTaskProcessor.java       |     8 +-
 .../org/apache/solr/cloud/RecoveryStrategy.java |    16 +-
 .../org/apache/solr/cloud/SyncStrategy.java     |     3 +-
 .../org/apache/solr/cloud/ZkController.java     |    56 +
 .../cloud/api/collections/AddReplicaCmd.java    |     2 +-
 .../solr/cloud/api/collections/Assign.java      |     2 +-
 .../solr/cloud/api/collections/BackupCmd.java   |     2 +-
 .../api/collections/CreateCollectionCmd.java    |     2 +-
 .../api/collections/MaintainRoutedAliasCmd.java |     2 +-
 .../solr/cloud/api/collections/MigrateCmd.java  |     3 +-
 .../OverseerCollectionMessageHandler.java       |    15 +-
 .../solr/cloud/api/collections/RestoreCmd.java  |    37 +-
 .../cloud/api/collections/SplitShardCmd.java    |   188 +-
 .../cloud/api/collections/TimeRoutedAlias.java  |     2 +
 .../cloud/autoscaling/AutoScalingHandler.java   |     6 +-
 .../cloud/autoscaling/IndexSizeTrigger.java     |     9 +-
 .../cloud/overseer/ClusterStateMutator.java     |     4 +-
 .../solr/cloud/overseer/CollectionMutator.java  |    28 +-
 .../org/apache/solr/core/CoreContainer.java     |    90 +-
 .../apache/solr/core/HdfsDirectoryFactory.java  |     2 +-
 .../src/java/org/apache/solr/core/SolrCore.java |    12 +-
 .../org/apache/solr/handler/IndexFetcher.java   |     2 +-
 .../apache/solr/handler/RequestHandlerBase.java |     3 +
 .../apache/solr/handler/SolrConfigHandler.java  |    11 +-
 .../solr/handler/admin/CollectionsHandler.java  |    55 +-
 .../solr/handler/admin/ConfigSetsHandler.java   |     5 +
 .../solr/handler/admin/CoreAdminOperation.java  |    22 +-
 .../handler/admin/MetricsHistoryHandler.java    |   295 +-
 .../admin/SegmentsInfoRequestHandler.java       |     8 +-
 .../solr/handler/component/ExpandComponent.java |     6 +-
 .../component/QueryElevationComponent.java      |  1312 +-
 .../handler/component/RangeFacetRequest.java    |     8 +-
 .../handler/component/RealTimeGetComponent.java |    33 +-
 .../handler/component/SpatialHeatmapFacets.java |   405 +-
 .../handler/component/TermVectorComponent.java  |     2 +-
 .../apache/solr/handler/loader/JsonLoader.java  |   167 +-
 .../apache/solr/metrics/rrd/SolrRrdBackend.java |    30 +-
 .../solr/metrics/rrd/SolrRrdBackendFactory.java |    76 +-
 .../org/apache/solr/request/SimpleFacets.java   |    27 +-
 .../solr/request/json/JsonQueryConverter.java   |    28 +-
 .../apache/solr/response/CSVResponseWriter.java |     2 +-
 .../solr/response/GraphMLResponseWriter.java    |     5 -
 .../solr/response/JSONResponseWriter.java       |   592 +-
 .../org/apache/solr/response/JSONWriter.java    |   181 +
 .../apache/solr/response/PHPResponseWriter.java |     4 +-
 .../response/PHPSerializedResponseWriter.java   |     2 +-
 .../solr/response/QueryResponseWriterUtil.java  |     2 +-
 .../solr/response/RubyResponseWriter.java       |     4 +-
 .../solr/response/SmileResponseWriter.java      |     4 +-
 .../solr/response/TextResponseWriter.java       |   222 +-
 .../apache/solr/response/WriteableValue.java    |    25 -
 .../transform/BaseEditorialTransformer.java     |    17 +-
 .../transform/ElevatedMarkerFactory.java        |     6 +-
 .../transform/ExcludedMarkerFactory.java        |     6 +-
 .../transform/RawValueTransformerFactory.java   |     9 +-
 .../response/transform/WriteableGeoJSON.java    |     6 +-
 .../apache/solr/schema/AbstractEnumField.java   |   101 +-
 .../solr/schema/FileExchangeRateProvider.java   |   106 +-
 .../org/apache/solr/schema/IndexSchema.java     |     5 +-
 .../solr/schema/LatLonPointSpatialField.java    |     2 +-
 .../apache/solr/search/AbstractReRankQuery.java |     7 +-
 .../solr/search/CollapsingQParserPlugin.java    |    25 +-
 .../apache/solr/search/ExportQParserPlugin.java |     2 +-
 .../java/org/apache/solr/search/Grouping.java   |    33 +-
 .../apache/solr/search/MaxScoreCollector.java   |    55 +
 .../java/org/apache/solr/search/QParser.java    |    30 +-
 .../org/apache/solr/search/ReRankCollector.java |    12 +-
 .../search/SignificantTermsQParserPlugin.java   |     2 +-
 .../apache/solr/search/SolrIndexSearcher.java   |    21 +-
 .../solr/search/facet/FacetFieldMerger.java     |     3 +-
 .../solr/search/facet/FacetFieldProcessor.java  |     7 +
 .../FacetFieldProcessorByEnumTermsStream.java   |     6 +
 .../apache/solr/search/facet/FacetHeatmap.java  |   520 +
 .../apache/solr/search/facet/FacetModule.java   |    29 +-
 .../solr/search/facet/FacetProcessor.java       |    49 +-
 .../apache/solr/search/facet/FacetRange.java    |   386 +-
 .../solr/search/facet/FacetRangeMerger.java     |    68 +-
 .../apache/solr/search/facet/FacetRequest.java  |   150 +-
 .../search/facet/FacetRequestSortedMerger.java  |    29 +-
 .../distributed/command/QueryCommand.java       |    26 +-
 .../distributed/command/QueryCommandResult.java |     8 +-
 .../TopGroupsShardResponseProcessor.java        |    14 +-
 .../TopGroupsResultTransformer.java             |    10 +-
 .../GroupedEndResultTransformer.java            |     4 +-
 ...tContinuesRecorderAuthenticationHandler.java |     2 +-
 .../apache/solr/update/AddUpdateCommand.java    |   204 +-
 .../org/apache/solr/update/CdcrUpdateLog.java   |     2 +-
 .../apache/solr/update/CommitUpdateCommand.java |     2 +-
 .../solr/update/DirectUpdateHandler2.java       |    97 +-
 .../org/apache/solr/update/DocumentBuilder.java |    37 +-
 .../org/apache/solr/update/HdfsUpdateLog.java   |     1 +
 .../java/org/apache/solr/update/PeerSync.java   |   794 +-
 .../apache/solr/update/PeerSyncWithLeader.java  |   372 +
 .../org/apache/solr/update/SolrCoreState.java   |     9 +
 .../org/apache/solr/update/TransactionLog.java  |     1 +
 .../java/org/apache/solr/update/UpdateLog.java  |     9 +
 .../IgnoreLargeDocumentProcessorFactory.java    |    39 +-
 .../processor/NestedUpdateProcessorFactory.java |   137 +
 .../TimeRoutedAliasUpdateProcessor.java         |    32 +-
 .../java/org/apache/solr/util/FastWriter.java   |   157 -
 .../org/apache/solr/util/SafeXMLParsing.java    |   120 +
 .../src/java/org/apache/solr/util/SolrCLI.java  |    13 +-
 .../org/apache/solr/util/TestInjection.java     |    22 +-
 .../collection1/conf/schema-copyfield-test.xml  |     4 -
 .../solr/collection1/conf/schema-hash.xml       |     4 -
 .../conf/schema-luceneMatchVersion.xml          |     2 -
 .../conf/schema-not-required-unique-key.xml     |     1 -
 .../collection1/conf/schema-required-fields.xml |     4 -
 .../solr/collection1/conf/schema-rest.xml       |     3 -
 .../collection1/conf/schema-spellchecker.xml    |     3 -
 .../solr/collection1/conf/schema-sql.xml        |     4 -
 .../test-files/solr/collection1/conf/schema.xml |     6 -
 .../solr/collection1/conf/schema11.xml          |     1 -
 .../solr/collection1/conf/schema12.xml          |     3 -
 .../solr/collection1/conf/schema15.xml          |     6 +-
 .../solr/collection1/conf/schemasurround.xml    |     3 -
 .../conf/solrconfig-update-processor-chains.xml |     5 +
 .../configsets/_default/conf/managed-schema     |     2 +-
 .../configsets/_default/conf/solrconfig.xml     |     2 +
 .../cloud-minimal/conf/solrconfig.xml           |     3 +
 .../test-files/solr/crazy-path-to-schema.xml    |     1 -
 .../org/apache/solr/TestDistributedSearch.java  |    33 +-
 .../apache/solr/cloud/AliasIntegrationTest.java |     3 -
 .../cloud/AssignBackwardCompatibilityTest.java  |     2 +-
 .../solr/cloud/BasicDistributedZkTest.java      |    56 +-
 .../cloud/ChaosMonkeyNothingIsSafeTest.java     |     2 +-
 .../solr/cloud/ChaosMonkeySafeLeaderTest.java   |     2 +-
 ...aosMonkeySafeLeaderWithPullReplicasTest.java |     2 +-
 .../solr/cloud/CollectionsAPISolrJTest.java     |    48 +
 .../solr/cloud/CreateRoutedAliasTest.java       |     4 -
 .../apache/solr/cloud/DeleteReplicaTest.java    |     5 +-
 .../solr/cloud/DocValuesNotIndexedTest.java     |     6 +-
 .../org/apache/solr/cloud/ForceLeaderTest.java  |     2 +-
 .../apache/solr/cloud/HttpPartitionTest.java    |     4 +-
 .../solr/cloud/LIRRollingUpdatesTest.java       |     8 +-
 .../cloud/LeaderElectionIntegrationTest.java    |     2 +-
 .../cloud/LeaderFailoverAfterPartitionTest.java |     2 +-
 .../solr/cloud/LeaderTragicEventTest.java       |   185 +
 .../solr/cloud/LeaderVoteWaitTimeoutTest.java   |     2 +-
 .../solr/cloud/LegacyCloudClusterPropTest.java  |     2 +-
 .../cloud/MetricsHistoryIntegrationTest.java    |     9 +-
 .../solr/cloud/MissingSegmentRecoveryTest.java  |     2 +-
 .../apache/solr/cloud/MoveReplicaHDFSTest.java  |     4 +-
 .../org/apache/solr/cloud/MoveReplicaTest.java  |     2 +-
 .../solr/cloud/OverseerTaskQueueTest.java       |     3 +-
 .../org/apache/solr/cloud/RecoveryZkTest.java   |     1 +
 .../solr/cloud/ReplaceNodeNoTargetTest.java     |     2 +-
 .../solr/cloud/ReplicationFactorTest.java       |     3 +-
 .../apache/solr/cloud/RollingRestartTest.java   |     2 +
 .../solr/cloud/SaslZkACLProviderTest.java       |     1 +
 .../cloud/SegmentTerminateEarlyTestState.java   |    22 +-
 .../cloud/SharedFSAutoReplicaFailoverTest.java  |     2 +-
 .../apache/solr/cloud/SolrCloudExampleTest.java |    12 +-
 .../apache/solr/cloud/TestCloudConsistency.java |     2 +
 .../solr/cloud/TestCloudJSONFacetSKG.java       |    53 +-
 .../apache/solr/cloud/TestCloudPivotFacet.java  |    45 +-
 .../apache/solr/cloud/TestCloudRecovery.java    |     1 -
 .../solr/cloud/TestCloudSearcherWarming.java    |    41 +-
 .../apache/solr/cloud/TestConfigSetsAPI.java    |    58 +-
 .../org/apache/solr/cloud/TestPrepRecovery.java |     4 +-
 .../org/apache/solr/cloud/TestPullReplica.java  |     4 +-
 .../apache/solr/cloud/TestSegmentSorting.java   |     4 +-
 .../cloud/TestSolrCloudWithKerberosAlt.java     |     4 +-
 .../TestStressCloudBlindAtomicUpdates.java      |     2 +-
 .../solr/cloud/UnloadDistributedZkTest.java     |     2 +-
 .../AbstractCloudBackupRestoreTestCase.java     |   139 +-
 .../CollectionsAPIDistributedZkTest.java        |     2 +-
 .../api/collections/CustomCollectionTest.java   |     2 +-
 .../HdfsCollectionsAPIDistributedZkTest.java    |     2 +
 .../cloud/api/collections/ShardSplitTest.java   |   101 +-
 .../api/collections/TestCollectionAPI.java      |   120 +
 .../TestCollectionsAPIViaSolrCloudCluster.java  |     2 +-
 .../collections/TestHdfsCloudBackupRestore.java |     5 +-
 .../AutoAddReplicasIntegrationTest.java         |     2 +-
 .../autoscaling/AutoScalingHandlerTest.java     |     4 +-
 .../autoscaling/ComputePlanActionTest.java      |     4 +-
 .../cloud/autoscaling/IndexSizeTriggerTest.java |    15 +-
 .../cloud/autoscaling/NodeLostTriggerTest.java  |     2 +-
 .../ScheduledTriggerIntegrationTest.java        |     3 +-
 .../cloud/autoscaling/ScheduledTriggerTest.java |     2 +-
 .../autoscaling/SearchRateTriggerTest.java      |     2 +
 .../solr/cloud/autoscaling/TestPolicyCloud.java |    23 +-
 .../cloud/autoscaling/sim/SimCloudManager.java  |    53 +-
 .../sim/SimClusterStateProvider.java            |   112 +-
 .../autoscaling/sim/TestComputePlanAction.java  |     2 +
 .../autoscaling/sim/TestExecutePlanAction.java  |     2 +
 .../sim/TestGenericDistributedQueue.java        |     2 +-
 .../cloud/autoscaling/sim/TestLargeCluster.java |    16 +-
 .../cloud/autoscaling/sim/TestPolicyCloud.java  |     2 +-
 .../sim/TestSimDistributedQueue.java            |     1 +
 .../autoscaling/sim/TestTriggerIntegration.java |     3 +
 .../cloud/cdcr/BaseCdcrDistributedZkTest.java   |     2 +-
 .../solr/cloud/cdcr/CdcrBootstrapTest.java      |     2 +-
 .../cdcr/CdcrReplicationDistributedZkTest.java  |     9 +
 .../cloud/hdfs/HdfsBasicDistributedZkTest.java  |     2 +
 .../solr/cloud/hdfs/HdfsNNFailoverTest.java     |     2 +
 .../hdfs/HdfsRestartWhileUpdatingTest.java      |     3 +-
 .../solr/cloud/hdfs/HdfsSyncSliceTest.java      |     2 +
 ...HdfsTlogReplayBufferedWhileIndexingTest.java |     3 +-
 .../HdfsWriteToMultipleCollectionsTest.java     |     2 +
 .../apache/solr/cloud/hdfs/StressHdfsTest.java  |     2 +-
 .../apache/solr/core/ResourceLoaderTest.java    |     4 +-
 .../org/apache/solr/core/TestCodecSupport.java  |     2 +-
 .../apache/solr/core/TestDynamicLoading.java    |     2 +-
 .../apache/solr/core/TestMergePolicyConfig.java |    16 +-
 .../apache/solr/core/TestSolrConfigHandler.java |    38 +
 .../handler/AnalysisRequestHandlerTestBase.java |     6 +-
 .../DocumentAnalysisRequestHandlerTest.java     |    47 +-
 .../FieldAnalysisRequestHandlerTest.java        |    62 +-
 .../org/apache/solr/handler/JsonLoaderTest.java |   318 +-
 .../solr/handler/TestReplicationHandler.java    |     4 +-
 .../org/apache/solr/handler/TestSQLHandler.java |     2 +-
 .../admin/AutoscalingHistoryHandlerTest.java    |     1 -
 .../admin/MetricsHistoryHandlerTest.java        |     9 +-
 .../solr/handler/admin/TestCollectionAPIs.java  |     8 +-
 .../component/CustomHighlightComponentTest.java |     7 +-
 .../component/QueryElevationComponentTest.java  |   315 +-
 .../component/SpatialHeatmapFacetsTest.java     |   215 -
 .../handler/component/TestPivotHelperCode.java  |     2 +
 .../tagger/EmbeddedSolrNoSerializeTest.java     |    11 +-
 .../solr/index/hdfs/CheckHdfsIndexTest.java     |     2 +
 .../org/apache/solr/legacy/TestLegacyTerms.java |     8 +-
 .../metrics/rrd/SolrRrdBackendFactoryTest.java  |    84 +-
 .../apache/solr/request/SimpleFacetsTest.java   |    12 +-
 .../apache/solr/response/JSONWriterTest.java    |    53 +-
 .../solr/rest/schema/TestFieldTypeResource.java |     1 -
 .../solr/schema/SchemaApiFailureTest.java       |     4 -
 .../apache/solr/schema/TestCloudSchemaless.java |     2 +-
 .../search/CurrencyRangeFacetCloudTest.java     |     9 +-
 .../apache/solr/search/QueryEqualityTest.java   |     3 +-
 .../SignificantTermsQParserPluginTest.java      |    35 +
 .../org/apache/solr/search/TestQueryTypes.java  |     4 +-
 .../apache/solr/search/TestRankQueryPlugin.java |     4 +-
 .../org/apache/solr/search/TestRecovery.java    |     4 +-
 .../apache/solr/search/TestRecoveryHdfs.java    |     2 +
 .../apache/solr/search/TestSolr4Spatial2.java   |     5 +-
 .../test/org/apache/solr/search/TestSort.java   |     3 +-
 .../apache/solr/search/TestStressRecovery.java  |     2 +-
 .../org/apache/solr/search/facet/DebugAgg.java  |     2 +
 .../solr/search/facet/RangeFacetCloudTest.java  |   786 +
 .../search/facet/SpatialHeatmapFacetsTest.java  |   349 +
 .../search/facet/TestJsonFacetRefinement.java   |   137 +-
 .../solr/search/facet/TestJsonFacets.java       |   101 +-
 .../solr/search/json/TestJsonRequest.java       |    11 +-
 .../TestSolrCloudWithHadoopAuthPlugin.java      |     2 +
 .../solr/spelling/SpellCheckCollatorTest.java   |     2 +-
 .../TestHighFrequencyDictionaryFactory.java     |    10 +-
 .../solr/store/blockcache/BlockCacheTest.java   |     1 +
 .../store/blockcache/BlockDirectoryTest.java    |     2 +
 .../solr/store/hdfs/HdfsDirectoryTest.java      |     2 +-
 .../TestDocTermOrdsUninvertLimit.java           |     1 +
 .../solr/uninverting/TestFieldCacheSort.java    |    20 +-
 .../uninverting/TestFieldCacheSortRandom.java   |     4 +-
 .../apache/solr/update/AddBlockUpdateTest.java  |   169 +-
 .../update/DirectUpdateHandlerOptimizeTest.java |   101 -
 .../solr/update/DirectUpdateHandlerTest.java    |     2 +-
 .../solr/update/MaxSizeAutoCommitTest.java      |     4 +
 .../update/PeerSyncWithBufferUpdatesTest.java   |   223 +
 ...ithLeaderAndIndexFingerprintCachingTest.java |    36 +
 .../solr/update/PeerSyncWithLeaderTest.java     |    39 +
 .../apache/solr/update/TestHdfsUpdateLog.java   |     2 +-
 .../solr/update/TestInPlaceUpdatesDistrib.java  |     2 +-
 .../solr/update/TestNestedUpdateProcessor.java  |   195 +
 .../update/processor/AtomicUpdatesTest.java     |    16 +-
 .../FieldMutatingUpdateProcessorTest.java       |    40 +-
 ...ommitOptimizeUpdateProcessorFactoryTest.java |     2 +-
 ...IgnoreLargeDocumentProcessorFactoryTest.java |    97 +-
 .../SignatureUpdateProcessorFactoryTest.java    |     4 +-
 ...atelessScriptUpdateProcessorFactoryTest.java |    12 +-
 .../TimeRoutedAliasUpdateProcessorTest.java     |   228 +-
 .../TrackingUpdateProcessorFactory.java         |   226 +
 .../org/apache/solr/util/CircularListTest.java  |    12 +-
 .../apache/solr/util/SolrPluginUtilsTest.java   |     2 +-
 .../org/apache/solr/util/TestFastWriter.java    |   124 -
 .../apache/solr/util/TestSafeXMLParsing.java    |    99 +
 .../test/org/apache/solr/util/TestUtils.java    |     8 +-
 solr/example/README.txt                         |     4 +-
 solr/example/resources/log4j2.xml               |    76 -
 .../licenses/AlchemyAPIAnnotator-2.3.1.jar.sha1 |     1 -
 .../AlchemyAPIAnnotator-LICENSE-ASL.txt         |   202 -
 solr/licenses/AlchemyAPIAnnotator-NOTICE.txt    |     7 -
 .../licenses/OpenCalaisAnnotator-2.3.1.jar.sha1 |     1 -
 .../OpenCalaisAnnotator-LICENSE-ASL.txt         |   202 -
 solr/licenses/OpenCalaisAnnotator-NOTICE.txt    |     7 -
 solr/licenses/Tagger-2.3.1.jar.sha1             |     1 -
 solr/licenses/Tagger-LICENSE-ASL.txt            |   202 -
 solr/licenses/Tagger-NOTICE.txt                 |     7 -
 .../licenses/WhitespaceTokenizer-2.3.1.jar.sha1 |     1 -
 .../WhitespaceTokenizer-LICENSE-ASL.txt         |   202 -
 solr/licenses/WhitespaceTokenizer-NOTICE.txt    |     7 -
 solr/licenses/commons-compress-1.14.jar.sha1    |     1 -
 solr/licenses/commons-compress-1.16.1.jar.sha1  |     1 +
 solr/licenses/commons-digester-2.1.jar.sha1     |     1 -
 solr/licenses/fontbox-2.0.8.jar.sha1            |     1 -
 solr/licenses/fontbox-2.0.9.jar.sha1            |     1 +
 solr/licenses/icu4j-61.1.jar.sha1               |     1 -
 solr/licenses/icu4j-62.1.jar.sha1               |     1 +
 solr/licenses/jackcess-2.1.10.jar.sha1          |     1 +
 solr/licenses/jackcess-2.1.8.jar.sha1           |     1 -
 solr/licenses/jdom-2.0.2.jar.sha1               |     1 -
 solr/licenses/jdom-LICENSE-BSD_LIKE.txt         |    56 -
 solr/licenses/jdom-NOTICE.txt                   |     6 -
 solr/licenses/jdom2-2.0.6.jar.sha1              |     1 +
 solr/licenses/jdom2-LICENSE-BSD_LIKE.txt        |    56 +
 solr/licenses/jdom2-NOTICE.txt                  |     6 +
 ...jetty-continuation-9.4.10.v20180503.jar.sha1 |     1 -
 ...jetty-continuation-9.4.11.v20180605.jar.sha1 |     1 +
 .../jetty-deploy-9.4.10.v20180503.jar.sha1      |     1 -
 .../jetty-deploy-9.4.11.v20180605.jar.sha1      |     1 +
 .../jetty-http-9.4.10.v20180503.jar.sha1        |     1 -
 .../jetty-http-9.4.11.v20180605.jar.sha1        |     1 +
 .../licenses/jetty-io-9.4.10.v20180503.jar.sha1 |     1 -
 .../licenses/jetty-io-9.4.11.v20180605.jar.sha1 |     1 +
 .../jetty-jmx-9.4.10.v20180503.jar.sha1         |     1 -
 .../jetty-jmx-9.4.11.v20180605.jar.sha1         |     1 +
 .../jetty-rewrite-9.4.10.v20180503.jar.sha1     |     1 -
 .../jetty-rewrite-9.4.11.v20180605.jar.sha1     |     1 +
 .../jetty-security-9.4.10.v20180503.jar.sha1    |     1 -
 .../jetty-security-9.4.11.v20180605.jar.sha1    |     1 +
 .../jetty-server-9.4.10.v20180503.jar.sha1      |     1 -
 .../jetty-server-9.4.11.v20180605.jar.sha1      |     1 +
 .../jetty-servlet-9.4.10.v20180503.jar.sha1     |     1 -
 .../jetty-servlet-9.4.11.v20180605.jar.sha1     |     1 +
 .../jetty-servlets-9.4.10.v20180503.jar.sha1    |     1 -
 .../jetty-servlets-9.4.11.v20180605.jar.sha1    |     1 +
 .../jetty-util-9.4.10.v20180503.jar.sha1        |     1 -
 .../jetty-util-9.4.11.v20180605.jar.sha1        |     1 +
 .../jetty-webapp-9.4.10.v20180503.jar.sha1      |     1 -
 .../jetty-webapp-9.4.11.v20180605.jar.sha1      |     1 +
 .../jetty-xml-9.4.10.v20180503.jar.sha1         |     1 -
 .../jetty-xml-9.4.11.v20180605.jar.sha1         |     1 +
 solr/licenses/jsoup-1.11.2.jar.sha1             |     1 +
 solr/licenses/jsoup-1.8.2.jar.sha1              |     1 -
 solr/licenses/opennlp-tools-1.8.3.jar.sha1      |     1 -
 solr/licenses/opennlp-tools-1.8.4.jar.sha1      |     1 +
 solr/licenses/pdfbox-2.0.8.jar.sha1             |     1 -
 solr/licenses/pdfbox-2.0.9.jar.sha1             |     1 +
 solr/licenses/pdfbox-tools-2.0.8.jar.sha1       |     1 -
 solr/licenses/pdfbox-tools-2.0.9.jar.sha1       |     1 +
 solr/licenses/start.jar.sha1                    |     2 +-
 solr/licenses/tika-core-1.17.jar.sha1           |     1 -
 solr/licenses/tika-core-1.18.jar.sha1           |     1 +
 solr/licenses/tika-java7-1.17.jar.sha1          |     1 -
 solr/licenses/tika-java7-1.18.jar.sha1          |     1 +
 solr/licenses/tika-parsers-1.17.jar.sha1        |     1 -
 solr/licenses/tika-parsers-1.18.jar.sha1        |     1 +
 solr/licenses/tika-xmp-1.17.jar.sha1            |     1 -
 solr/licenses/tika-xmp-1.18.jar.sha1            |     1 +
 solr/licenses/uimaj-core-2.3.1.jar.sha1         |     1 -
 solr/licenses/uimaj-core-LICENSE-ASL.txt        |   202 -
 solr/licenses/uimaj-core-NOTICE.txt             |    13 -
 solr/licenses/xz-1.6.jar.sha1                   |     1 -
 solr/licenses/xz-1.8.jar.sha1                   |     1 +
 solr/server/README.txt                          |     2 +-
 solr/server/resources/log4j2-console.xml        |    39 +
 solr/server/scripts/cloud-scripts/log4j2.xml    |    37 -
 .../scripts/cloud-scripts/snapshotscli.sh       |     2 +-
 solr/server/scripts/cloud-scripts/zkcli.bat     |     4 +-
 solr/server/scripts/cloud-scripts/zkcli.sh      |     2 +-
 .../configsets/_default/conf/managed-schema     |     2 +-
 .../configsets/_default/conf/solrconfig.xml     |     2 +
 solr/solr-ref-guide/src/about-filters.adoc      |     3 +-
 solr/solr-ref-guide/src/analyzers.adoc          |     1 -
 .../src/basic-authentication-plugin.adoc        |     2 +
 solr/solr-ref-guide/src/blockjoin-faceting.adoc |     2 +-
 solr/solr-ref-guide/src/cdcr-config.adoc        |    66 +-
 solr/solr-ref-guide/src/collections-api.adoc    |    21 +-
 solr/solr-ref-guide/src/configsets-api.adoc     |     2 +
 .../solr-ref-guide/src/configuring-logging.adoc |     2 +-
 .../src/distributed-requests.adoc               |    40 +-
 solr/solr-ref-guide/src/enabling-ssl.adoc       |     2 +
 .../solr-ref-guide/src/filter-descriptions.adoc |    15 +-
 solr/solr-ref-guide/src/format-of-solr-xml.adoc |     3 +-
 solr/solr-ref-guide/src/how-to-contribute.adoc  |     4 +-
 .../src/images/diagrams/splitshard-seq.png      |   Bin 0 -> 98871 bytes
 .../src/images/diagrams/splitshard-seq.puml     |   115 +
 solr/solr-ref-guide/src/index-replication.adoc  |     4 +-
 .../src/indexconfig-in-solrconfig.adoc          |     5 +-
 .../src/indexing-and-basic-data-operations.adoc |     4 +-
 solr/solr-ref-guide/src/json-facet-api.adoc     |   363 +-
 solr/solr-ref-guide/src/json-query-dsl.adoc     |    17 +
 solr/solr-ref-guide/src/json-request-api.adoc   |     6 +-
 .../src/kerberos-authentication-plugin.adoc     |     4 +-
 solr/solr-ref-guide/src/language-analysis.adoc  |     2 +-
 solr/solr-ref-guide/src/learning-to-rank.adoc   |     4 +-
 solr/solr-ref-guide/src/managed-resources.adoc  |     2 +-
 solr/solr-ref-guide/src/meta-docs/jekyll.adoc   |     4 +-
 solr/solr-ref-guide/src/meta-docs/publish.adoc  |   165 +-
 solr/solr-ref-guide/src/metrics-history.adoc    |   450 +-
 solr/solr-ref-guide/src/metrics-reporting.adoc  |     2 +-
 solr/solr-ref-guide/src/schemaless-mode.adoc    |     4 +-
 ...tting-up-an-external-zookeeper-ensemble.adoc |    24 +-
 .../src/solr-control-script-reference.adoc      |    85 +-
 solr/solr-ref-guide/src/solr-tutorial.adoc      |     4 +-
 solr/solr-ref-guide/src/solr-upgrade-notes.adoc |    26 +
 .../src/solrcloud-autoscaling-api.adoc          |     2 +-
 ...olrcloud-autoscaling-policy-preferences.adoc |    71 +-
 .../src/solrcloud-autoscaling-triggers.adoc     |    21 +-
 solr/solr-ref-guide/src/spatial-search.adoc     |    18 +-
 solr/solr-ref-guide/src/suggester.adoc          |     1 -
 .../src/the-extended-dismax-query-parser.adoc   |     4 +-
 .../src/the-query-elevation-component.adoc      |    11 +
 solr/solr-ref-guide/src/the-tagger-handler.adoc |   177 +-
 .../solr-ref-guide/src/time-routed-aliases.adoc |    33 +-
 solr/solr-ref-guide/src/tokenizers.adoc         |     2 +-
 solr/solr-ref-guide/src/uima-integration.adoc   |   122 -
 .../src/update-request-processors.adoc          |     6 +-
 .../src/updatehandlers-in-solrconfig.adoc       |     6 +-
 .../src/updating-parts-of-documents.adoc        |    21 +-
 .../src/uploading-data-with-index-handlers.adoc |     8 +-
 ...zookeeper-to-manage-configuration-files.adoc |     2 +
 solr/solr-ref-guide/src/v2-api.adoc             |     2 +-
 .../cloud/autoscaling/AddReplicaSuggester.java  |     5 +-
 .../client/solrj/cloud/autoscaling/Clause.java  |   503 +-
 .../cloud/autoscaling/MoveReplicaSuggester.java |     2 +-
 .../client/solrj/cloud/autoscaling/Operand.java |    93 +-
 .../client/solrj/cloud/autoscaling/Policy.java  |   406 +-
 .../solrj/cloud/autoscaling/PolicyHelper.java   |     2 +-
 .../solrj/cloud/autoscaling/Preference.java     |     2 +-
 .../solrj/cloud/autoscaling/ReplicaCount.java   |    22 +-
 .../solrj/cloud/autoscaling/ReplicaInfo.java    |     2 +
 .../client/solrj/cloud/autoscaling/Row.java     |     2 +-
 .../solrj/cloud/autoscaling/SealedClause.java   |    29 +
 .../solrj/cloud/autoscaling/Suggester.java      |    20 +-
 .../solrj/cloud/autoscaling/Suggestion.java     |   492 +-
 .../solrj/cloud/autoscaling/Violation.java      |    69 +-
 .../solr/client/solrj/impl/CloudSolrClient.java |    33 +-
 .../solrj/impl/SolrClientNodeStateProvider.java |    93 +-
 .../solrj/io/eval/ConvolutionEvaluator.java     |     2 +-
 .../solrj/io/eval/NormalizeEvaluator.java       |     2 +-
 .../client/solrj/io/eval/RankEvaluator.java     |     2 +-
 .../client/solrj/io/eval/ScaleEvaluator.java    |     2 +-
 .../solr/client/solrj/io/stream/EvalStream.java |     5 -
 .../client/solrj/io/stream/PriorityStream.java  |     5 -
 .../solrj/io/stream/SignificantTermsStream.java |     2 +-
 .../solr/client/solrj/io/stream/SolrStream.java |     5 -
 .../client/solrj/io/stream/TopicStream.java     |     5 -
 .../client/solrj/io/stream/TupleStream.java     |     5 -
 .../solrj/request/AbstractUpdateRequest.java    |     3 +-
 .../solrj/request/CollectionAdminRequest.java   |   135 +-
 .../request/ContentStreamUpdateRequest.java     |    26 +-
 .../solrj/request/StreamingUpdateRequest.java   |    76 +
 .../solr/client/solrj/request/V2Request.java    |     7 +-
 .../request/schema/AbstractSchemaRequest.java   |     8 -
 .../solrj/request/schema/SchemaRequest.java     |    86 +-
 .../solrj/response/AnalysisResponseBase.java    |    29 +-
 .../response/DocumentAnalysisResponse.java      |    12 +-
 .../solrj/response/FieldAnalysisResponse.java   |    14 +-
 .../java/org/apache/solr/common/MapWriter.java  |     5 +
 .../org/apache/solr/common/SolrDocument.java    |     1 -
 .../apache/solr/common/SolrDocumentBase.java    |    10 +
 .../apache/solr/common/SolrInputDocument.java   |     8 +-
 .../org/apache/solr/common/SolrInputField.java  |     4 +-
 .../org/apache/solr/common/cloud/Aliases.java   |     6 +-
 .../apache/solr/common/cloud/ZkStateReader.java |    15 +
 .../common/params/CollectionAdminParams.java    |    21 +-
 .../apache/solr/common/params/CommonParams.java |     6 +
 .../common/params/QueryElevationParams.java     |     9 +-
 .../apache/solr/common/params/UpdateParams.java |     2 +-
 .../solr/common/util/ContentStreamBase.java     |     6 +-
 .../org/apache/solr/common/util/FastWriter.java |   157 +
 .../solr/common/util/JsonRecordReader.java      |    32 +-
 .../apache/solr/common/util/JsonTextWriter.java |   499 +
 .../apache/solr/common/util/SolrJSONWriter.java |   114 +
 .../org/apache/solr/common/util/TextWriter.java |   231 +
 .../java/org/apache/solr/common/util/Utils.java |    12 +
 .../apache/solr/common/util/WriteableValue.java |    25 +
 solr/solrj/src/test-files/log4j2.xml            |    39 -
 .../solrj/solr/collection1/conf/schema-sql.xml  |     4 -
 .../solrj/solr/collection1/conf/schema.xml      |     4 -
 .../solr/configsets/shared/conf/schema.xml      |     4 -
 .../solr/configsets/streaming/conf/schema.xml   |     4 -
 .../solrj/solr/crazy-path-to-schema.xml         |     1 -
 ...ollectionAdminRequestRequiredParamsTest.java |     6 +-
 .../solr/client/solrj/SolrExampleTests.java     |    23 +-
 .../solr/client/solrj/SolrExampleTestsBase.java |     2 +-
 .../solrj/cloud/autoscaling/TestPolicy.java     |   609 +-
 .../solrj/io/graph/GraphExpressionTest.java     |    44 +-
 .../solrj/io/stream/MathExpressionTest.java     |     6 +-
 .../solrj/io/stream/StreamExpressionTest.java   |     2 +-
 .../io/stream/eval/NormalizeEvaluatorTest.java  |     6 +-
 .../client/solrj/request/TestV2Request.java     |     8 +-
 .../solrj/response/AnlysisResponseBaseTest.java |    13 +
 .../response/DocumentAnalysisResponseTest.java  |     2 +-
 .../response/FieldAnalysisResponseTest.java     |     2 +-
 .../response/TestDelegationTokenResponse.java   |     2 +-
 .../apache/solr/common/SolrDocumentTest.java    |     8 +-
 .../cloud/TestCollectionStateWatchers.java      |     8 +
 .../solr/common/params/SolrParamTest.java       |     6 +-
 .../apache/solr/common/util/TestFastWriter.java |   125 +
 .../solr/common/util/TestJsonRecordReader.java  |    10 +-
 .../solr/common/util/TestNamedListCodec.java    |     4 +-
 .../solr/common/util/TestSolrJsonWriter.java    |    60 +
 .../apache/solr/common/util/TestTimeSource.java |    12 +-
 .../solr/common/util/TestValidatingJsonMap.java |     2 +-
 .../solr/BaseDistributedSearchTestCase.java     |    17 +-
 .../java/org/apache/solr/SolrTestCaseJ4.java    |    27 +-
 .../cloud/AbstractFullDistribZkTestBase.java    |     2 +-
 .../org/apache/solr/cloud/ConfigRequest.java    |    55 +
 .../apache/solr/cloud/MiniSolrCloudCluster.java |     1 +
 .../solr/core/MockConcurrentMergeScheduler.java |    35 +
 .../apache/solr/core/MockDirectoryFactory.java  |     6 +-
 solr/test-framework/src/test-files/log4j2.xml   |    39 -
 solr/webapp/web/css/angular/cloud.css           |    15 +
 solr/webapp/web/css/angular/common.css          |     4 +-
 solr/webapp/web/css/angular/jquery-ui.min.css   |    28 +
 .../web/css/angular/jquery-ui.structure.min.css |    24 +
 solr/webapp/web/index.html                      |     3 +
 solr/webapp/web/js/angular/controllers/cloud.js |    64 +-
 .../web/js/angular/controllers/segments.js      |     2 +-
 solr/webapp/web/libs/jquery-ui.min.js           |    30 +
 solr/webapp/web/partials/cloud.html             |     1 +
 949 files changed, 44281 insertions(+), 43922 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/1a83a146/solr/solr-ref-guide/src/suggester.adoc
----------------------------------------------------------------------