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

[11/27] lucene-solr:solr7896-login-page: Merge branch 'master' into solr7896-login-page

Merge branch 'master' into solr7896-login-page


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

Branch: refs/heads/solr7896-login-page
Commit: 08f7e67090d0078d52f4f69425c281dd9356876f
Parents: d531b92 baf40d5
Author: Jan Høydahl <ja...@apache.org>
Authored: Mon Sep 24 14:00:40 2018 +0200
Committer: Jan Høydahl <ja...@apache.org>
Committed: Mon Sep 24 14:00:40 2018 +0200

----------------------------------------------------------------------
 dev-tools/doap/lucene.rdf                       |    7 +
 dev-tools/doap/solr.rdf                         |    9 +-
 dev-tools/idea/solr/core/src/java/solr-core.iml |    1 +
 dev-tools/scripts/buildAndPushRelease.py        |   79 +-
 dev-tools/scripts/smokeTestRelease.py           |   53 +-
 lucene/CHANGES.txt                              |  133 +-
 lucene/MIGRATE.txt                              |   47 +-
 .../analysis/core/LowerCaseTokenizer.java       |   72 -
 .../core/LowerCaseTokenizerFactory.java         |   75 -
 .../lucene/analysis/core/SimpleAnalyzer.java    |    4 +-
 .../lucene/analysis/core/StopAnalyzer.java      |    6 +-
 .../miscellaneous/LimitTokenCountAnalyzer.java  |    2 +-
 .../query/QueryAutoStopWordAnalyzer.java        |    2 +-
 .../shingle/ShingleAnalyzerWrapper.java         |    2 +-
 .../analysis/standard/ClassicAnalyzer.java      |   11 +-
 .../standard/UAX29URLEmailAnalyzer.java         |   13 +-
 .../lucene/analysis/util/CharTokenizer.java     |   86 +-
 .../apache/lucene/collation/package-info.java   |   21 +-
 ...apache.lucene.analysis.util.TokenizerFactory |    1 -
 .../analysis/br/TestBrazilianAnalyzer.java      |    7 +-
 .../lucene/analysis/core/TestAnalyzers.java     |    8 -
 .../analysis/custom/TestCustomAnalyzer.java     |   13 +-
 .../lucene/analysis/de/TestGermanAnalyzer.java  |    8 +-
 .../TestPerFieldAnalyzerWrapper.java            |    2 +-
 .../standard/TestStandardFactories.java         |   16 -
 .../analysis/util/TestCharTokenizers.java       |  122 +-
 lucene/analysis/icu/src/java/overview.html      |   21 +-
 .../ko/KoreanPartOfSpeechStopFilterFactory.java |   17 +-
 .../ko/KoreanReadingFormFilterFactory.java      |    8 +
 .../analysis/ko/KoreanTokenizerFactory.java     |   22 +
 .../lucene/analysis/ko/dict/UserDictionary.java |    6 +-
 .../lucene/codecs/lucene70/Lucene70Codec.java   |  133 ++
 .../apache/lucene/codecs/lucene70/package.html  |   25 +
 .../services/org.apache.lucene.codecs.Codec     |    1 +
 .../index/TestBackwardsCompatibility.java       |    7 +-
 .../org/apache/lucene/index/index.7.5.0-cfs.zip |  Bin 0 -> 15615 bytes
 .../apache/lucene/index/index.7.5.0-nocfs.zip   |  Bin 0 -> 15629 bytes
 .../org/apache/lucene/index/sorted.7.5.0.zip    |  Bin 0 -> 82239 bytes
 .../benchmark/byTask/tasks/CreateIndexTask.java |    4 +-
 lucene/build.xml                                |   15 +-
 .../codecs/simpletext/SimpleTextBKDWriter.java  |   18 +-
 lucene/common-build.xml                         |   33 +-
 .../org/apache/lucene/analysis/Analyzer.java    |   42 +-
 .../analysis/standard/StandardAnalyzer.java     |   13 +-
 .../java/org/apache/lucene/codecs/Codec.java    |    2 +-
 .../codecs/blocktree/BlockTreeTermsReader.java  |   10 -
 .../lucene/codecs/blocktree/FieldReader.java    |    3 +-
 .../codecs/blocktree/IntersectTermsEnum.java    |  220 +--
 .../blocktree/IntersectTermsEnumFrame.java      |   15 -
 .../codecs/blocktree/SegmentTermsEnum.java      |    5 +-
 .../apache/lucene/codecs/blocktree/Stats.java   |    2 -
 .../lucene/codecs/lucene70/Lucene70Codec.java   |  175 ---
 .../lucene/codecs/lucene80/Lucene80Codec.java   |  177 +++
 .../lucene/codecs/lucene80/package-info.java    |  409 ++++++
 .../java/org/apache/lucene/document/Field.java  |   30 +-
 .../org/apache/lucene/document/LatLonPoint.java |   24 +
 .../document/LatLonPointDistanceComparator.java |    7 +-
 .../LatLonPointDistanceFeatureQuery.java        |  480 +++++++
 .../document/LatLonPointDistanceQuery.java      |   42 +-
 .../document/LatLonPointInPolygonQuery.java     |   10 +-
 .../document/LongDistanceFeatureQuery.java      |  438 ++++++
 .../org/apache/lucene/document/LongPoint.java   |   26 +
 .../apache/lucene/document/RangeFieldQuery.java |   38 +-
 .../org/apache/lucene/document/StoredField.java |   23 +-
 .../org/apache/lucene/index/CheckIndex.java     |   92 +-
 .../apache/lucene/index/DocumentsWriter.java    |    9 +
 .../index/DocumentsWriterFlushControl.java      |    8 +-
 .../apache/lucene/index/FilterCodecReader.java  |   18 +-
 .../lucene/index/FilterDirectoryReader.java     |   16 +-
 .../apache/lucene/index/FilterLeafReader.java   |    2 +-
 .../lucene/index/FrozenBufferedUpdates.java     |   23 +-
 .../org/apache/lucene/index/IndexWriter.java    |    8 +
 .../org/apache/lucene/index/MultiFields.java    |   27 +-
 .../org/apache/lucene/index/PendingDeletes.java |   13 +-
 .../apache/lucene/index/PendingSoftDeletes.java |    7 +-
 .../org/apache/lucene/index/PointValues.java    |    6 +-
 .../apache/lucene/index/ReadersAndUpdates.java  |    3 +
 .../SoftDeletesDirectoryReaderWrapper.java      |   14 +
 .../index/SoftDeletesRetentionMergePolicy.java  |    2 +-
 .../java/org/apache/lucene/index/Sorter.java    |   27 -
 .../src/java/org/apache/lucene/index/Terms.java |    8 +-
 .../org/apache/lucene/index/package-info.java   |  278 ++--
 .../search/BlockMaxConjunctionScorer.java       |    9 +-
 .../lucene/search/Boolean2ScorerSupplier.java   |    6 +-
 .../org/apache/lucene/search/BooleanScorer.java |   18 +-
 .../org/apache/lucene/search/BooleanWeight.java |    6 +-
 .../apache/lucene/search/CachingCollector.java  |   20 +-
 .../apache/lucene/search/ConjunctionScorer.java |   10 +-
 .../lucene/search/ConstantScoreQuery.java       |   14 +-
 .../lucene/search/DisjunctionMaxQuery.java      |    2 +-
 .../apache/lucene/search/DisjunctionScorer.java |    6 +-
 .../lucene/search/DocValuesRewriteMethod.java   |    2 +-
 .../lucene/search/DoubleValuesSource.java       |    6 +-
 .../org/apache/lucene/search/FakeScorer.java    |   62 -
 .../apache/lucene/search/FieldComparator.java   |   10 +-
 .../lucene/search/FilterLeafCollector.java      |    2 +-
 .../lucene/search/FilterMatchesIterator.java    |   74 +
 .../apache/lucene/search/FilterScorable.java    |   58 +
 .../org/apache/lucene/search/LRUQueryCache.java |    4 +-
 .../org/apache/lucene/search/LeafCollector.java |    2 +-
 .../lucene/search/LeafFieldComparator.java      |    2 +-
 .../apache/lucene/search/LongValuesSource.java  |    2 +-
 .../apache/lucene/search/MatchAllDocsQuery.java |    2 +-
 .../java/org/apache/lucene/search/Matches.java  |   96 --
 .../org/apache/lucene/search/MatchesUtils.java  |  132 ++
 .../lucene/search/MaxScoreSumPropagator.java    |  102 +-
 .../lucene/search/MinShouldMatchSumScorer.java  |    6 +-
 .../apache/lucene/search/MultiCollector.java    |    9 +-
 .../lucene/search/MultiCollectorManager.java    |    6 +-
 .../lucene/search/MultiLeafFieldComparator.java |    2 +-
 .../MultiTermQueryConstantScoreWrapper.java     |    2 +-
 .../org/apache/lucene/search/PhraseWeight.java  |    2 +-
 .../apache/lucene/search/PointInSetQuery.java   |    6 +-
 .../apache/lucene/search/PointRangeQuery.java   |   30 +-
 .../search/PositiveScoresOnlyCollector.java     |    4 +-
 .../org/apache/lucene/search/ReqExclScorer.java |    6 +-
 .../apache/lucene/search/ReqOptSumScorer.java   |  191 ++-
 .../java/org/apache/lucene/search/Scorable.java |   86 ++
 .../org/apache/lucene/search/ScoreAndDoc.java   |   35 +
 .../search/ScoreCachingWrappingScorer.java      |   24 +-
 .../java/org/apache/lucene/search/Scorer.java   |   77 +-
 .../apache/lucene/search/SimpleCollector.java   |    2 +-
 .../lucene/search/SimpleFieldComparator.java    |    2 +-
 .../org/apache/lucene/search/SortRescorer.java  |   10 +-
 .../org/apache/lucene/search/SynonymQuery.java  |    2 +-
 .../apache/lucene/search/TermInSetQuery.java    |    2 +-
 .../org/apache/lucene/search/TermQuery.java     |    4 +-
 .../apache/lucene/search/TermRangeQuery.java    |    4 +
 .../apache/lucene/search/TopFieldCollector.java |   45 +-
 .../lucene/search/TopScoreDocCollector.java     |    8 +-
 .../org/apache/lucene/search/WANDScorer.java    |    9 +-
 .../java/org/apache/lucene/search/Weight.java   |    4 +-
 .../org/apache/lucene/search/package-info.java  |  127 +-
 .../search/similarities/package-info.java       |   52 +-
 .../apache/lucene/search/spans/SpanWeight.java  |    3 +-
 .../lucene/store/ByteArrayIndexInput.java       |  107 +-
 .../lucene/store/ByteBuffersDataInput.java      |  323 +++++
 .../lucene/store/ByteBuffersDataOutput.java     |  541 +++++++
 .../lucene/store/ByteBuffersDirectory.java      |  274 ++++
 .../lucene/store/ByteBuffersIndexInput.java     |  200 +++
 .../lucene/store/ByteBuffersIndexOutput.java    |  171 +++
 .../org/apache/lucene/store/RAMDirectory.java   |    5 +
 .../java/org/apache/lucene/store/RAMFile.java   |    8 +-
 .../org/apache/lucene/store/RAMInputStream.java |   12 +-
 .../apache/lucene/store/RAMOutputStream.java    |    4 +
 .../apache/lucene/util/RamUsageEstimator.java   |   51 +-
 .../org/apache/lucene/util/StringHelper.java    |   11 -
 .../java/org/apache/lucene/util/Version.java    |    7 +
 .../org/apache/lucene/util/bkd/BKDReader.java   |   70 +-
 .../org/apache/lucene/util/bkd/BKDWriter.java   |   76 +-
 .../util/bkd/MutablePointsReaderUtils.java      |    8 +-
 .../org/apache/lucene/util/packed/Direct16.java |    2 +-
 .../org/apache/lucene/util/packed/Direct32.java |    2 +-
 .../org/apache/lucene/util/packed/Direct64.java |    2 +-
 .../org/apache/lucene/util/packed/Direct8.java  |    2 +-
 .../lucene/util/packed/Packed16ThreeBlocks.java |    2 +-
 .../lucene/util/packed/Packed64SingleBlock.java |    2 +-
 .../lucene/util/packed/Packed8ThreeBlocks.java  |    2 +-
 lucene/core/src/java/overview.html              |   25 +-
 .../services/org.apache.lucene.codecs.Codec     |    2 +-
 .../src/test/org/apache/lucene/TestDemo.java    |   69 +-
 .../lucene/analysis/TestAnalyzerWrapper.java    |   58 +
 ...cene50StoredFieldsFormatHighCompression.java |    8 +-
 .../lucene60/TestLucene60PointsFormat.java      |   10 +-
 .../lucene70/TestLucene70NormsFormat.java       |    4 +-
 .../TestLatLonPointDistanceFeatureQuery.java    |  411 ++++++
 .../document/TestLongDistanceFeatureQuery.java  |  350 +++++
 .../org/apache/lucene/index/Test2BPoints.java   |    2 +-
 .../org/apache/lucene/index/TestAddIndexes.java |    2 +
 .../lucene/index/TestFilterCodecReader.java     |   18 +
 .../index/TestFlushByRamOrCountsPolicy.java     |   14 +-
 .../apache/lucene/index/TestIndexSorting.java   |   60 +
 .../org/apache/lucene/index/TestOmitTf.java     |   18 +-
 .../lucene/index/TestPendingSoftDeletes.java    |    8 +-
 .../apache/lucene/index/TestPointValues.java    |    8 +-
 .../TestSoftDeletesDirectoryReaderWrapper.java  |   51 +
 .../TestSoftDeletesRetentionMergePolicy.java    |  121 +-
 .../apache/lucene/search/JustCompileSearch.java |    2 +-
 .../lucene/search/MultiCollectorTest.java       |   28 +-
 .../org/apache/lucene/search/TestBoolean2.java  |    8 +-
 .../search/TestBoolean2ScorerSupplier.java      |   80 +-
 .../org/apache/lucene/search/TestBooleanOr.java |    4 +-
 .../apache/lucene/search/TestBooleanQuery.java  |    4 +-
 .../search/TestBooleanQueryVisitSubscorers.java |   19 +-
 .../apache/lucene/search/TestBooleanScorer.java |    2 +-
 .../lucene/search/TestCachingCollector.java     |   23 +-
 .../lucene/search/TestConjunctionDISI.java      |   50 +-
 .../apache/lucene/search/TestConjunctions.java  |    8 +-
 .../lucene/search/TestConstantScoreQuery.java   |   30 +-
 .../lucene/search/TestDoubleValuesSource.java   |    6 +-
 .../lucene/search/TestElevationComparator.java  |    2 +-
 .../search/TestMaxScoreSumPropagator.java       |  230 +++
 .../lucene/search/TestMultiCollector.java       |   22 +-
 .../apache/lucene/search/TestPointQueries.java  |   14 +-
 .../apache/lucene/search/TestQueryRescorer.java |    2 +-
 .../lucene/search/TestReqExclBulkScorer.java    |    4 +-
 .../lucene/search/TestReqOptSumScorer.java      |  241 +++-
 .../search/TestScoreCachingWrappingScorer.java  |    4 +-
 .../apache/lucene/search/TestSimilarity.java    |   16 +-
 .../lucene/search/TestSloppyPhraseQuery.java    |   14 +-
 .../lucene/search/TestSubScorerFreqs.java       |   22 +-
 .../apache/lucene/search/TestTermScorer.java    |    4 +-
 .../search/TestTimeLimitingCollector.java       |    2 +-
 .../lucene/search/TestTopDocsCollector.java     |   24 +-
 .../lucene/search/TestTopFieldCollector.java    |   21 +-
 .../lucene/store/BaseDataOutputTestCase.java    |  181 +++
 .../lucene/store/TestByteBuffersDataInput.java  |  206 +++
 .../lucene/store/TestByteBuffersDataOutput.java |  157 +++
 .../lucene/store/TestByteBuffersDirectory.java  |   86 ++
 .../org/apache/lucene/util/bkd/TestBKD.java     |   24 +-
 .../util/bkd/TestMutablePointsReaderUtils.java  |   10 +-
 .../apache/lucene/expressions/FakeScorer.java   |   53 -
 .../lucene/facet/DrillSidewaysScorer.java       |   28 +-
 .../apache/lucene/facet/FacetsCollector.java    |    6 +-
 .../facet/taxonomy/SearcherTaxonomyManager.java |   14 +
 .../directory/DirectoryTaxonomyReader.java      |    8 +-
 .../taxonomy/directory/TaxonomyIndexArrays.java |    2 +-
 .../facet/AssertingSubDocsAtOnceCollector.java  |   11 +-
 .../taxonomy/TestSearcherTaxonomyManager.java   |   14 +
 .../search/grouping/AllGroupHeadsCollector.java |   24 +-
 .../search/grouping/AllGroupsCollector.java     |    4 +-
 .../search/grouping/BlockGroupingCollector.java |   24 +-
 .../lucene/search/grouping/FakeScorer.java      |   52 -
 .../grouping/FirstPassGroupingCollector.java    |    4 +-
 .../search/grouping/GroupFacetCollector.java    |    4 +-
 .../lucene/search/grouping/GroupReducer.java    |    4 +-
 .../grouping/SecondPassGroupingCollector.java   |    4 +-
 .../search/grouping/TopGroupsCollector.java     |    6 +-
 .../uhighlight/AnalysisOffsetStrategy.java      |   16 +-
 .../uhighlight/DefaultPassageFormatter.java     |   25 +-
 .../search/uhighlight/FieldHighlighter.java     |    5 +-
 .../search/uhighlight/FieldOffsetStrategy.java  |  121 +-
 .../uhighlight/MemoryIndexOffsetStrategy.java   |   51 +-
 .../search/uhighlight/NoOpOffsetStrategy.java   |    8 +-
 .../lucene/search/uhighlight/OffsetsEnum.java   |  220 ++-
 .../OverlaySingleDocTermsLeafReader.java        |  113 ++
 .../lucene/search/uhighlight/Passage.java       |   11 +-
 .../uhighlight/PostingsOffsetStrategy.java      |   24 +-
 .../PostingsWithTermVectorsOffsetStrategy.java  |   26 +-
 .../TermVectorFilteredLeafReader.java           |   11 +-
 .../uhighlight/TermVectorOffsetStrategy.java    |   23 +-
 .../uhighlight/TokenStreamOffsetStrategy.java   |   20 +-
 .../lucene/search/uhighlight/UHComponents.java  |   80 ++
 .../search/uhighlight/UnifiedHighlighter.java   |   73 +-
 .../search/vectorhighlight/FieldTermStack.java  |   11 +-
 .../search/highlight/HighlighterPhraseTest.java |    5 +-
 .../uhighlight/TestUnifiedHighlighter.java      |  154 +-
 .../uhighlight/TestUnifiedHighlighterMTQ.java   |    2 +-
 .../TestUnifiedHighlighterRanking.java          |   20 +
 .../TestUnifiedHighlighterStrictPhrases.java    |  146 +-
 .../TestUnifiedHighlighterTermVec.java          |   34 +-
 .../TestUnifiedHighlighterExtensibility.java    |   36 +-
 lucene/ivy-versions.properties                  |    4 +-
 .../apache/lucene/search/join/FakeScorer.java   |   52 -
 .../search/join/GlobalOrdinalsCollector.java    |    6 +-
 .../join/GlobalOrdinalsWithScoreCollector.java  |   14 +-
 .../org/apache/lucene/search/join/JoinUtil.java |   10 +-
 .../search/join/TermsWithScoreCollector.java    |    6 +-
 .../search/join/ToChildBlockJoinQuery.java      |    4 +-
 .../search/join/ToParentBlockJoinQuery.java     |    7 +-
 .../apache/lucene/search/join/TestJoinUtil.java |   10 +-
 .../licenses/commons-compress-1.16.1.jar.sha1   |    1 -
 lucene/licenses/commons-compress-1.18.jar.sha1  |    1 +
 .../randomizedtesting-runner-2.6.0.jar.sha1     |    1 -
 .../randomizedtesting-runner-2.6.4.jar.sha1     |    1 +
 .../apache/lucene/index/memory/MemoryIndex.java |   12 +-
 .../lucene/document/InetAddressPoint.java       |    4 +-
 .../lucene/document/InetAddressRange.java       |    4 +-
 .../search/DiversifiedTopDocsCollector.java     |    4 +-
 .../lucene/search/DocValuesStatsCollector.java  |    4 +-
 .../search/TestInetAddressRangeQueries.java     |   22 +-
 .../queries/function/FunctionRangeQuery.java    |    4 +-
 .../lucene/queries/function/FunctionValues.java |   15 +-
 .../lucene/queries/function/ValueSource.java    |   26 +-
 .../queries/function/ValueSourceScorer.java     |    8 +-
 .../docvalues/DocTermsIndexDocValues.java       |    5 +-
 .../function/docvalues/DoubleDocValues.java     |   11 +-
 .../function/docvalues/IntDocValues.java        |    5 +-
 .../function/docvalues/LongDocValues.java       |    5 +-
 .../function/valuesource/EnumFieldSource.java   |    5 +-
 .../function/valuesource/MultiFunction.java     |    4 +-
 .../surround/query/BooleanQueryTst.java         |   10 +-
 .../document/FloatPointNearestNeighbor.java     |    2 +-
 .../org/apache/lucene/document/LatLonShape.java |   13 +-
 .../document/LatLonShapeBoundingBoxQuery.java   |  420 ++----
 .../document/LatLonShapePolygonQuery.java       |  301 +---
 .../lucene/document/LatLonShapeQuery.java       |  394 ++++++
 .../java/org/apache/lucene/geo/Tessellator.java |  101 +-
 .../org/apache/lucene/search/CoveringQuery.java |    2 +-
 .../apache/lucene/search/CoveringScorer.java    |    6 +-
 .../apache/lucene/search/NearestNeighbor.java   |    2 +-
 .../intervals/ConjunctionIntervalsSource.java   |  113 +-
 .../intervals/DifferenceIntervalsSource.java    |   23 +-
 .../intervals/DisjunctionIntervalsSource.java   |   14 +
 .../lucene/search/intervals/IntervalFilter.java |    2 +-
 .../search/intervals/IntervalFunction.java      |    4 +-
 .../search/intervals/IntervalIterator.java      |    5 +
 .../search/intervals/IntervalMatches.java       |  156 +++
 .../lucene/search/intervals/IntervalQuery.java  |   20 +
 .../lucene/search/intervals/Intervals.java      |    4 +-
 .../search/intervals/IntervalsSource.java       |   13 +
 .../intervals/LowpassIntervalsSource.java       |   16 +
 .../MinimizingConjunctionIntervalsSource.java   |  236 ++++
 .../search/intervals/TermIntervalsSource.java   |   66 +
 .../document/BaseLatLonShapeTestCase.java       |   46 +-
 .../document/TestFloatPointNearestNeighbor.java |    2 +-
 .../lucene/document/TestHalfFloatPoint.java     |    4 +-
 .../document/TestLatLonLineShapeQueries.java    |   40 +-
 .../document/TestLatLonPointShapeQueries.java   |   20 +-
 .../document/TestLatLonPolygonShapeQueries.java |   38 +-
 .../apache/lucene/document/TestLatLonShape.java |   26 +-
 .../org/apache/lucene/geo/TestTessellator.java  |   22 +
 .../org/apache/lucene/search/TestNearest.java   |    2 +-
 .../lucene/search/intervals/TestIntervals.java  |  232 ++-
 .../prefix/BytesRefIteratorTokenStream.java     |    2 +-
 .../spatial/prefix/PrefixTreeStrategy.java      |   17 +
 .../Geo3dShapeWGS84ModelRectRelationTest.java   |    2 +-
 .../spatial3d/Geo3DPointDistanceComparator.java |    4 +-
 .../Geo3DPointOutsideDistanceComparator.java    |    4 +-
 .../spatial3d/geom/GeoComplexPolygon.java       |  115 +-
 .../spatial3d/geom/GeoLongitudeSlice.java       |   17 +-
 .../spatial3d/geom/GeoNorthRectangle.java       |   18 +-
 .../spatial3d/geom/GeoPolygonFactory.java       |   48 +-
 .../lucene/spatial3d/geom/GeoRectangle.java     |   12 +-
 .../spatial3d/geom/GeoSouthRectangle.java       |   16 +-
 .../lucene/spatial3d/geom/SidedPlane.java       |   16 +
 .../apache/lucene/spatial3d/TestGeo3DPoint.java |   10 +-
 .../lucene/spatial3d/geom/GeoPolygonTest.java   |   40 +
 .../lucene/spatial3d/geom/XYZSolidTest.java     |   19 +
 .../analyzing/AnalyzingInfixSuggester.java      |    2 +-
 .../analyzing/BlendedInfixSuggester.java        |    7 +-
 .../suggest/analyzing/FreeTextSuggester.java    |    2 +-
 .../suggest/document/CompletionAnalyzer.java    |    2 +-
 .../document/TopSuggestDocsCollector.java       |    2 +-
 .../analyzing/AnalyzingSuggesterTest.java       |  365 ++---
 .../analyzing/BlendedInfixSuggesterTest.java    |   73 +-
 .../suggest/analyzing/FuzzySuggesterTest.java   |  159 +--
 .../suggest/document/TestSuggestField.java      |    4 +-
 .../analysis/CannedBinaryTokenStream.java       |    2 +-
 .../lucene/analysis/CannedTokenStream.java      |    8 +-
 .../apache/lucene/geo/BaseGeoPointTestCase.java |    2 +-
 .../lucene/index/AssertingLeafReader.java       |   10 +-
 .../lucene/index/BasePointsFormatTestCase.java  |   28 +-
 .../apache/lucene/index/PointsStackTracker.java |    6 +-
 .../lucene/search/AssertingBulkScorer.java      |    4 +-
 .../lucene/search/AssertingCollector.java       |   11 +-
 .../lucene/search/AssertingIndexSearcher.java   |    2 +-
 .../lucene/search/AssertingLeafCollector.java   |   13 +-
 .../apache/lucene/search/AssertingScorable.java |   64 +
 .../apache/lucene/search/AssertingScorer.java   |    6 +-
 .../lucene/search/BulkScorerWrapperScorer.java  |    4 +-
 .../org/apache/lucene/search/CheckHits.java     |    6 +-
 .../org/apache/lucene/search/QueryUtils.java    |   14 +-
 .../lucene/search/RandomApproximationQuery.java |   10 +-
 .../org/apache/lucene/util/LuceneTestCase.java  |    2 +
 .../util/TestRuleSetupAndRestoreClassEnv.java   |   30 +-
 .../java/org/apache/lucene/util/TestUtil.java   |    4 +-
 .../src/groovy/check-source-patterns.groovy     |    9 +-
 solr/CHANGES.txt                                |  230 ++-
 solr/bin/solr.cmd                               |    4 +-
 solr/build.xml                                  |   12 +-
 solr/common-build.xml                           |    6 +-
 .../stream/AnalyticsShardRequestManager.java    |    2 +-
 .../handler/dataimport/MailEntityProcessor.java |   74 +-
 .../handler/dataimport/BinURLDataSource.java    |   10 +-
 .../handler/dataimport/DataImportHandler.java   |    6 +-
 .../solr/handler/dataimport/DataImporter.java   |   24 +-
 .../dataimport/DateFormatTransformer.java       |    4 +-
 .../solr/handler/dataimport/DocBuilder.java     |   34 +-
 .../dataimport/FieldReaderDataSource.java       |    6 +-
 .../dataimport/FieldStreamDataSource.java       |    4 +-
 .../solr/handler/dataimport/FileDataSource.java |    8 +-
 .../solr/handler/dataimport/JdbcDataSource.java |   20 +-
 .../solr/handler/dataimport/LogTransformer.java |   22 +-
 .../handler/dataimport/RegexTransformer.java    |    4 +-
 .../handler/dataimport/SolrEntityProcessor.java |    6 +-
 .../handler/dataimport/SqlEntityProcessor.java  |    8 +-
 .../handler/dataimport/TemplateTransformer.java |    4 +-
 .../solr/handler/dataimport/URLDataSource.java  |   10 +-
 .../dataimport/XPathEntityProcessor.java        |   24 +-
 .../handler/dataimport/XPathRecordReader.java   |    6 +-
 .../dataimport/config/DIHConfiguration.java     |    6 +-
 .../TestSolrEntityProcessorEndToEnd.java        |   20 +-
 .../extraction/solr/collection1/conf/schema.xml |   15 -
 .../solr/collection1/conf/solrconfig.xml        |   19 +
 .../ExtractingRequestHandlerTest.java           |   10 +-
 .../org/apache/solr/ltr/LTRScoringQuery.java    |   14 +-
 .../org/apache/solr/ltr/TestLTROnSolrCloud.java |    3 +-
 .../solr/ltr/TestLTRReRankingPipeline.java      |    6 +-
 solr/core/ivy.xml                               |    2 +-
 .../client/solrj/embedded/JettySolrRunner.java  |    6 +-
 .../org/apache/solr/cloud/ActionThrottle.java   |    2 +-
 .../java/org/apache/solr/cloud/LockTree.java    |    6 +-
 .../java/org/apache/solr/cloud/Overseer.java    |    5 +
 .../cloud/OverseerConfigSetMessageHandler.java  |   30 +-
 .../solr/cloud/OverseerTaskProcessor.java       |    5 +
 .../apache/solr/cloud/OverseerTaskQueue.java    |   14 +-
 .../org/apache/solr/cloud/RecoveryStrategy.java |  172 +--
 .../apache/solr/cloud/ReplicateFromLeader.java  |    6 +-
 .../org/apache/solr/cloud/SolrZkServer.java     |    4 +-
 .../apache/solr/cloud/ZkDistributedQueue.java   |    6 +-
 .../cloud/api/collections/AddReplicaCmd.java    |  334 +++--
 .../solr/cloud/api/collections/Assign.java      |   56 +-
 .../solr/cloud/api/collections/BackupCmd.java   |    2 +-
 .../api/collections/CreateCollectionCmd.java    |   23 +-
 .../cloud/api/collections/CreateShardCmd.java   |  157 +--
 .../cloud/api/collections/DeleteNodeCmd.java    |    4 -
 .../api/collections/MaintainRoutedAliasCmd.java |    7 +-
 .../cloud/api/collections/MoveReplicaCmd.java   |   15 +-
 .../OverseerCollectionMessageHandler.java       |    2 +-
 .../cloud/api/collections/ReplaceNodeCmd.java   |    2 +-
 .../cloud/api/collections/TimeRoutedAlias.java  |   19 +
 .../autoscaling/AutoAddReplicasPlanAction.java  |    2 +-
 .../cloud/autoscaling/AutoScalingHandler.java   |   13 +-
 .../cloud/autoscaling/ComputePlanAction.java    |   82 +-
 .../cloud/autoscaling/HttpTriggerListener.java  |    4 +-
 .../cloud/autoscaling/IndexSizeTrigger.java     |    3 +
 .../solr/cloud/autoscaling/LoggingListener.java |    4 +-
 .../cloud/autoscaling/NodeAddedTrigger.java     |   30 +-
 .../solr/cloud/autoscaling/NodeLostTrigger.java |   31 +-
 .../cloud/autoscaling/ScheduledTriggers.java    |    7 +-
 .../cloud/autoscaling/SearchRateTrigger.java    |  173 ++-
 .../autoscaling/TriggerActionException.java     |   33 +
 .../solr/cloud/autoscaling/TriggerBase.java     |    8 +-
 .../solr/cloud/autoscaling/TriggerEvent.java    |   81 +-
 .../cloud/autoscaling/TriggerEventQueue.java    |   24 +-
 .../apache/solr/core/HdfsDirectoryFactory.java  |   50 +-
 .../solr/core/IndexDeletionPolicyWrapper.java   |    4 +-
 .../apache/solr/core/SchemaCodecFactory.java    |    4 +-
 .../src/java/org/apache/solr/core/SolrCore.java |    4 +-
 .../org/apache/solr/core/SolrXmlConfig.java     |    9 +-
 .../repository/BackupRepositoryFactory.java     |    6 +-
 .../solr/handler/HaversineMetersEvaluator.java  |   59 +
 .../org/apache/solr/handler/IndexFetcher.java   |  142 +-
 .../apache/solr/handler/ReplicationHandler.java |   68 +-
 .../org/apache/solr/handler/SnapShooter.java    |   16 +-
 .../solr/handler/SolrDefaultStreamFactory.java  |    1 +
 .../org/apache/solr/handler/StreamHandler.java  |    4 +
 .../admin/AutoscalingHistoryHandler.java        |    4 +-
 .../apache/solr/handler/admin/BackupCoreOp.java |    4 +-
 .../solr/handler/admin/CollectionsHandler.java  |    9 +-
 .../solr/handler/admin/ConfigSetsHandler.java   |   20 +-
 .../handler/admin/MetricsHistoryHandler.java    |    8 +-
 .../solr/handler/component/ExpandComponent.java |    6 +-
 .../component/HttpShardHandlerFactory.java      |    8 +-
 .../PhrasesIdentificationComponent.java         | 1129 +++++++++++++++
 .../solr/handler/component/QueryComponent.java  |   35 +-
 .../handler/component/SpellCheckComponent.java  |   24 +-
 .../solr/handler/component/StatsField.java      |    4 +-
 .../handler/component/SuggestComponent.java     |   26 +-
 .../handler/component/TermVectorComponent.java  |   41 +-
 .../solr/handler/export/BoolFieldWriter.java    |   23 +-
 .../solr/handler/export/DateFieldWriter.java    |   22 +-
 .../solr/handler/export/DoubleFieldWriter.java  |   27 +-
 .../apache/solr/handler/export/DoubleValue.java |   20 +
 .../solr/handler/export/DoubleValueSortDoc.java |  102 ++
 .../solr/handler/export/ExportWriter.java       |   15 +-
 .../apache/solr/handler/export/FieldWriter.java |    2 +-
 .../solr/handler/export/FloatFieldWriter.java   |   27 +-
 .../apache/solr/handler/export/FloatValue.java  |   20 +
 .../solr/handler/export/IntFieldWriter.java     |   22 +-
 .../apache/solr/handler/export/IntValue.java    |   25 +-
 .../solr/handler/export/LongFieldWriter.java    |   20 +-
 .../apache/solr/handler/export/LongValue.java   |   20 +
 .../solr/handler/export/MultiFieldWriter.java   |    6 +-
 .../solr/handler/export/QuadValueSortDoc.java   |  139 ++
 .../solr/handler/export/SingleValueSortDoc.java |   89 ++
 .../org/apache/solr/handler/export/SortDoc.java |   17 +-
 .../apache/solr/handler/export/SortValue.java   |    8 +
 .../solr/handler/export/StringFieldWriter.java  |   24 +-
 .../apache/solr/handler/export/StringValue.java |   24 +-
 .../solr/handler/export/TripleValueSortDoc.java |  121 ++
 .../org/apache/solr/handler/sql/SolrSchema.java |    4 +
 .../metrics/reporters/ReporterClientCache.java  |    6 +-
 .../reporters/jmx/JmxMetricsReporter.java       |   68 +-
 .../reporters/solr/SolrShardReporter.java       |    2 +-
 .../org/apache/solr/request/SimpleFacets.java   |    4 +-
 .../solr/response/BinaryResponseWriter.java     |    4 +-
 .../org/apache/solr/response/DocsStreamer.java  |   26 +-
 .../solr/response/RetrieveFieldsOptimizer.java  |  130 --
 .../response/transform/ChildDocTransformer.java |  253 ++++
 .../transform/ChildDocTransformerFactory.java   |  211 ++-
 .../solr/response/transform/DocTransformer.java |   23 +
 .../transform/RawValueTransformerFactory.java   |   20 +-
 .../AbstractSpatialPrefixTreeFieldType.java     |   35 +-
 .../apache/solr/schema/CurrencyFieldType.java   |    8 +-
 .../java/org/apache/solr/schema/FieldType.java  |    4 +-
 .../org/apache/solr/schema/IndexSchema.java     |    2 +-
 .../solr/schema/JsonPreAnalyzedParser.java      |   12 +-
 .../apache/solr/schema/ManagedIndexSchema.java  |    4 +-
 .../apache/solr/schema/PreAnalyzedField.java    |   27 +-
 .../solr/search/CollapsingQParserPlugin.java    |   64 +-
 .../apache/solr/search/DelegatingCollector.java |    8 +-
 .../org/apache/solr/search/DocSetCollector.java |    4 +-
 .../apache/solr/search/ExportQParserPlugin.java |    4 +-
 .../src/java/org/apache/solr/search/Filter.java |    2 +-
 .../apache/solr/search/FunctionRangeQuery.java  |   12 +-
 .../solr/search/GraphTermsQParserPlugin.java    |    6 +-
 .../apache/solr/search/HashQParserPlugin.java   |   30 +-
 .../apache/solr/search/MaxScoreCollector.java   |    6 +-
 .../apache/solr/search/SolrDocumentFetcher.java |  198 ++-
 .../apache/solr/search/SolrIndexSearcher.java   |    8 +-
 .../apache/solr/search/SolrReturnFields.java    |   31 +
 .../solr/search/SurroundQParserPlugin.java      |    2 +-
 .../search/function/ValueSourceRangeFilter.java |    9 +-
 .../search/join/ScoreJoinQParserPlugin.java     |    2 +-
 .../search/stats/ExactSharedStatsCache.java     |    6 +-
 .../solr/search/stats/ExactStatsCache.java      |   28 +-
 .../apache/solr/search/stats/LRUStatsCache.java |   10 +-
 .../solr/search/stats/LocalStatsCache.java      |   18 +-
 .../org/apache/solr/search/stats/StatsUtil.java |   22 +-
 .../solr/servlet/CheckLoggingConfiguration.java |    4 +-
 .../org/apache/solr/servlet/HttpSolrCall.java   |   35 +-
 .../solr/spelling/DirectSolrSpellChecker.java   |    6 +-
 .../solr/spelling/SpellCheckCollator.java       |   10 +-
 .../solr/spelling/suggest/SolrSuggester.java    |   34 +-
 .../apache/solr/spelling/suggest/Suggester.java |   26 +-
 .../suggest/jaspell/JaspellLookupFactory.java   |    4 +-
 .../solr/store/blockcache/BlockDirectory.java   |    8 +-
 .../apache/solr/store/hdfs/HdfsDirectory.java   |   16 +-
 .../org/apache/solr/update/CommitTracker.java   |   13 +-
 .../java/org/apache/solr/update/PeerSync.java   |    2 +-
 .../apache/solr/update/PeerSyncWithLeader.java  |    6 +-
 .../apache/solr/update/SolrCmdDistributor.java  |   50 +-
 .../apache/solr/update/UpdateShardHandler.java  |    4 +-
 .../solr/update/UpdateShardHandlerConfig.java   |   10 +-
 .../AddSchemaFieldsUpdateProcessorFactory.java  |   36 +-
 .../processor/AtomicUpdateDocumentMerger.java   |    4 +-
 .../CloneFieldUpdateProcessorFactory.java       |    4 +-
 .../processor/DistributedUpdateProcessor.java   |    6 +-
 .../DistributedUpdateProcessorFactory.java      |    2 +-
 .../DocExpirationUpdateProcessorFactory.java    |    9 +-
 .../ParseDateFieldUpdateProcessorFactory.java   |   36 +-
 .../TimeRoutedAliasUpdateProcessor.java         |  362 +++--
 .../TolerantUpdateProcessorFactory.java         |    2 +-
 .../org/apache/solr/util/stats/MetricUtils.java |    6 +-
 .../collection1/conf/schema-copyfield-test.xml  |   14 -
 .../solr/collection1/conf/schema-folding.xml    |    3 +-
 .../solr/collection1/conf/schema-hash.xml       |   13 -
 .../solr/collection1/conf/schema-nest.xml       |   65 +
 .../conf/schema-phrases-identification.xml      |   97 ++
 .../collection1/conf/schema-required-fields.xml |   14 -
 .../solr/collection1/conf/schema-rest.xml       |    9 +-
 .../solr/collection1/conf/schema-sql.xml        |   40 +-
 .../collection1/conf/schema-tokenizer-test.xml  |   11 +-
 .../test-files/solr/collection1/conf/schema.xml |   15 +-
 .../solr/collection1/conf/schema12.xml          |    9 +-
 .../solr/collection1/conf/schema15.xml          |   17 -
 .../solr/collection1/conf/schemasurround.xml    |   14 -
 ...dd-schema-fields-update-processor-chains.xml |    8 +-
 ...lrconfig-parsing-update-processor-chains.xml |   20 +-
 .../conf/solrconfig-phrases-identification.xml  |   53 +
 .../collection1/conf/solrconfig-schemaless.xml  |    8 +-
 .../conf/solrconfig-update-processor-chains.xml |    2 +-
 .../configsets/_default/conf/managed-schema     |   34 +
 .../configsets/_default/conf/solrconfig.xml     |    8 +-
 .../org/apache/solr/BasicFunctionalityTest.java |  160 +--
 .../test/org/apache/solr/CursorPagingTest.java  |   10 +-
 .../solr/TestCursorMarkWithoutUniqueKey.java    |    9 +-
 .../org/apache/solr/TestDistributedSearch.java  |   47 +-
 .../org/apache/solr/TestTolerantSearch.java     |   18 +-
 .../apache/solr/cloud/ActionThrottleTest.java   |    2 +-
 .../org/apache/solr/cloud/AddReplicaTest.java   |   90 +-
 .../cloud/AssignBackwardCompatibilityTest.java  |    1 +
 .../solr/cloud/BasicDistributedZk2Test.java     |   30 +-
 .../solr/cloud/BasicDistributedZkTest.java      |   19 +-
 .../test/org/apache/solr/cloud/BasicZkTest.java |   14 +-
 .../org/apache/solr/cloud/CloudTestUtils.java   |   29 +-
 .../solr/cloud/CollectionsAPISolrJTest.java     |   46 +-
 .../apache/solr/cloud/DeleteReplicaTest.java    |   28 +-
 .../org/apache/solr/cloud/DeleteShardTest.java  |    1 +
 .../solr/cloud/DistribCursorPagingTest.java     |    1 +
 .../solr/cloud/DocValuesNotIndexedTest.java     |    3 +-
 .../org/apache/solr/cloud/ForceLeaderTest.java  |   10 +-
 .../cloud/FullSolrCloudDistribCmdsTest.java     |    3 +-
 .../solr/cloud/LIROnShardRestartTest.java       |    4 +-
 .../solr/cloud/LIRRollingUpdatesTest.java       |    7 +-
 .../cloud/LeaderElectionIntegrationTest.java    |    3 +-
 .../solr/cloud/LeaderVoteWaitTimeoutTest.java   |   19 +-
 .../solr/cloud/LegacyCloudClusterPropTest.java  |    1 +
 .../apache/solr/cloud/MoveReplicaHDFSTest.java  |    6 +-
 .../org/apache/solr/cloud/MoveReplicaTest.java  |   17 +-
 .../apache/solr/cloud/MultiThreadedOCPTest.java |    1 +
 .../apache/solr/cloud/OverseerRolesTest.java    |    1 +
 .../apache/solr/cloud/OverseerStatusTest.java   |   17 +-
 .../solr/cloud/SaslZkACLProviderTest.java       |    3 +-
 .../cloud/SharedFSAutoReplicaFailoverTest.java  |    2 +-
 .../org/apache/solr/cloud/SolrXmlInZkTest.java  |   10 +-
 .../solr/cloud/TestAuthenticationFramework.java |   10 +-
 .../apache/solr/cloud/TestCloudConsistency.java |    5 +-
 .../solr/cloud/TestCloudDeleteByQuery.java      |   11 +-
 .../apache/solr/cloud/TestCloudInspectUtil.java |   19 +-
 .../cloud/TestCloudJSONFacetJoinDomain.java     |    8 +-
 .../solr/cloud/TestCloudJSONFacetSKG.java       |    4 +-
 ...TestCloudPhrasesIdentificationComponent.java |  200 +++
 .../apache/solr/cloud/TestCloudRecovery.java    |    2 +-
 .../solr/cloud/TestClusterProperties.java       |   25 +-
 .../apache/solr/cloud/TestConfigSetsAPI.java    |   25 +-
 .../solr/cloud/TestConfigSetsAPIZkFailure.java  |   14 +-
 .../solr/cloud/TestDownShardTolerantSearch.java |   17 +-
 .../TestLeaderInitiatedRecoveryThread.java      |   67 +-
 .../org/apache/solr/cloud/TestPullReplica.java  |   18 +-
 .../cloud/TestPullReplicaErrorHandling.java     |   27 +-
 .../solr/cloud/TestSkipOverseerOperations.java  |    3 +
 .../TestSolrCloudWithDelegationTokens.java      |   26 +-
 .../TestSolrCloudWithSecureImpersonation.java   |  101 +-
 .../TestStressCloudBlindAtomicUpdates.java      |    2 +-
 .../org/apache/solr/cloud/TestTlogReplica.java  |   13 +-
 .../cloud/TestTolerantUpdateProcessorCloud.java |  238 ++--
 .../apache/solr/cloud/TestWithCollection.java   |   20 +-
 .../org/apache/solr/cloud/TestZkChroot.java     |   23 +-
 .../solr/cloud/UnloadDistributedZkTest.java     |    1 +
 .../test/org/apache/solr/cloud/ZkCLITest.java   |   18 +-
 .../org/apache/solr/cloud/ZkShardTermsTest.java |    1 +
 .../org/apache/solr/cloud/ZkSolrClientTest.java |   59 +-
 .../CollectionTooManyReplicasTest.java          |    2 +-
 .../CollectionsAPIAsyncDistributedZkTest.java   |    6 +-
 .../CollectionsAPIDistributedZkTest.java        |    1 +
 .../api/collections/CustomCollectionTest.java   |    1 +
 .../HdfsCollectionsAPIDistributedZkTest.java    |    3 +-
 .../cloud/api/collections/ShardSplitTest.java   |  379 ++---
 .../TestCollectionsAPIViaSolrCloudCluster.java  |    2 +-
 .../collections/TestHdfsCloudBackupRestore.java |   12 +-
 .../TestLocalFSCloudBackupRestore.java          |   13 +-
 .../AutoAddReplicasIntegrationTest.java         |    3 +-
 .../AutoAddReplicasPlanActionTest.java          |    2 +-
 .../autoscaling/AutoScalingHandlerTest.java     |   44 +-
 .../solr/cloud/autoscaling/CapturedEvent.java   |    2 +
 .../autoscaling/ComputePlanActionTest.java      |  187 ++-
 .../autoscaling/ExecutePlanActionTest.java      |    2 +-
 .../HdfsAutoAddReplicasIntegrationTest.java     |    2 +-
 .../cloud/autoscaling/IndexSizeTriggerTest.java |   68 +-
 .../MetricTriggerIntegrationTest.java           |   11 +-
 .../ScheduledMaintenanceTriggerTest.java        |   23 +-
 .../ScheduledTriggerIntegrationTest.java        |    3 +-
 .../cloud/autoscaling/ScheduledTriggerTest.java |    3 +-
 .../SearchRateTriggerIntegrationTest.java       |   44 +-
 .../autoscaling/SearchRateTriggerTest.java      |   14 +-
 .../solr/cloud/autoscaling/TestPolicyCloud.java |   40 +
 .../autoscaling/TriggerEventQueueTest.java      |   98 ++
 .../autoscaling/TriggerIntegrationTest.java     |   40 +-
 .../sim/GenericDistributedQueue.java            |    6 +-
 .../cloud/autoscaling/sim/SimCloudManager.java  |   18 +-
 .../sim/SimClusterStateProvider.java            |  273 ++--
 .../autoscaling/sim/SimDistribStateManager.java |    2 +-
 .../sim/SimDistributedQueueFactory.java         |    4 +-
 .../autoscaling/sim/SimNodeStateProvider.java   |   26 +-
 .../sim/TestClusterStateProvider.java           |  225 ---
 .../autoscaling/sim/TestComputePlanAction.java  |  359 -----
 .../sim/TestDistribStateManager.java            |  342 -----
 .../autoscaling/sim/TestExecutePlanAction.java  |  207 ---
 .../sim/TestGenericDistributedQueue.java        |   35 -
 .../cloud/autoscaling/sim/TestLargeCluster.java |  680 ---------
 .../autoscaling/sim/TestNodeAddedTrigger.java   |  327 -----
 .../autoscaling/sim/TestNodeLostTrigger.java    |  346 -----
 .../cloud/autoscaling/sim/TestPolicyCloud.java  |  366 -----
 .../sim/TestSimClusterStateProvider.java        |  225 +++
 .../sim/TestSimComputePlanAction.java           |  358 +++++
 .../sim/TestSimDistribStateManager.java         |  342 +++++
 .../sim/TestSimExecutePlanAction.java           |  209 +++
 .../sim/TestSimGenericDistributedQueue.java     |   38 +
 .../autoscaling/sim/TestSimLargeCluster.java    |  728 ++++++++++
 .../sim/TestSimNodeAddedTrigger.java            |  327 +++++
 .../autoscaling/sim/TestSimNodeLostTrigger.java |  346 +++++
 .../autoscaling/sim/TestSimPolicyCloud.java     |  368 +++++
 .../sim/TestSimTriggerIntegration.java          | 1325 ++++++++++++++++++
 .../autoscaling/sim/TestTriggerIntegration.java | 1262 -----------------
 .../solr/cloud/cdcr/CdcrBootstrapTest.java      |    4 +-
 .../cloud/cdcr/CdcrOpsAndBoundariesTest.java    |  321 +++++
 .../cdcr/CdcrReplicationDistributedZkTest.java  |  681 ---------
 .../apache/solr/cloud/cdcr/CdcrTestsUtil.java   |  132 +-
 .../cloud/cdcr/CdcrWithNodesRestartsTest.java   |  343 +++++
 .../cloud/hdfs/HdfsBasicDistributedZk2Test.java |    2 +
 .../apache/solr/cloud/hdfs/StressHdfsTest.java  |    1 +
 .../solr/cloud/rule/ImplicitSnitchTest.java     |    2 +
 .../apache/solr/core/TestDynamicLoading.java    |    2 +-
 .../FieldAnalysisRequestHandlerTest.java        |    2 +-
 .../apache/solr/handler/RequestLoggingTest.java |    6 +-
 .../solr/handler/TestReplicationHandler.java    |    5 +-
 .../org/apache/solr/handler/TestSQLHandler.java |  244 +++-
 .../TestSolrConfigHandlerConcurrent.java        |   38 +-
 .../solr/handler/admin/MetricsHandlerTest.java  |    4 +-
 .../admin/MetricsHistoryHandlerTest.java        |    1 +
 .../admin/SegmentsInfoRequestHandlerTest.java   |   59 +-
 .../admin/ZookeeperStatusHandlerTest.java       |    1 +
 .../DistributedDebugComponentTest.java          |    4 +-
 .../component/DistributedMLTComponentTest.java  |    3 +-
 .../PhrasesIdentificationComponentTest.java     |  796 +++++++++++
 .../handler/component/StatsComponentTest.java   |   10 +-
 .../solr/handler/export/TestExportWriter.java   |   49 +
 .../solr/metrics/SolrMetricReporterTest.java    |    4 +-
 .../reporters/solr/SolrCloudReportersTest.java  |    5 +-
 .../metrics/rrd/SolrRrdBackendFactoryTest.java  |    3 +-
 .../apache/solr/request/SimpleFacetsTest.java   |    2 +-
 .../response/TestRetrieveFieldsOptimizer.java   |  642 ++++++++-
 .../transform/TestChildDocTransformer.java      |   58 +-
 .../TestChildDocTransformerHierarchy.java       |  387 +++++
 .../solr/rest/TestManagedResourceStorage.java   |    3 +-
 .../schema/TestFieldCollectionResource.java     |   10 +-
 .../solr/rest/schema/TestFieldTypeResource.java |    3 +-
 .../solr/schema/CurrencyFieldTypeTest.java      |    2 +-
 .../solr/schema/SchemaApiFailureTest.java       |    1 +
 .../org/apache/solr/schema/TestPointFields.java |    2 +-
 .../solr/schema/TestSortableTextField.java      |    4 +-
 .../search/CurrencyRangeFacetCloudTest.java     |    4 +-
 .../apache/solr/search/QueryEqualityTest.java   |    2 +-
 .../solr/search/TestCollapseQParserPlugin.java  |   18 +-
 .../solr/search/TestHashQParserPlugin.java      |   35 +-
 .../org/apache/solr/search/TestRangeQuery.java  |    2 +-
 .../apache/solr/search/TestRankQueryPlugin.java |   39 +-
 .../apache/solr/search/TestStressRecovery.java  |    3 +
 .../solr/search/facet/RangeFacetCloudTest.java  |    2 +-
 .../search/function/SortByFunctionTest.java     |    8 +-
 .../solr/search/stats/TestDistribIDF.java       |    3 +-
 .../solr/security/BasicAuthIntegrationTest.java |    2 +-
 .../hadoop/TestDelegationWithHadoopAuth.java    |    3 +-
 .../solr/servlet/HttpSolrCallGetCoreTest.java   |    3 +-
 .../solr/store/hdfs/HdfsDirectoryTest.java      |    7 +-
 .../TestDocTermOrdsUninvertLimit.java           |    2 +-
 .../solr/update/MaxSizeAutoCommitTest.java      |  268 +---
 .../apache/solr/update/TestHdfsUpdateLog.java   |    2 +
 .../solr/update/TestInPlaceUpdatesDistrib.java  |    3 +-
 .../solr/update/TestNestedUpdateProcessor.java  |   14 +-
 ...dSchemaFieldsUpdateProcessorFactoryTest.java |   15 +
 .../ParsingFieldUpdateProcessorsTest.java       |  145 +-
 .../processor/TestNamedUpdateProcessors.java    |    2 +-
 .../TimeRoutedAliasUpdateProcessorTest.java     |  237 +++-
 .../TrackingUpdateProcessorFactory.java         |  136 +-
 .../apache/solr/util/DateMathParserTest.java    |    4 +-
 .../solr/util/TestMaxTokenLenTokenizer.java     |   20 +-
 .../example-DIH/solr/db/conf/managed-schema     |   34 +
 .../example-DIH/solr/mail/conf/managed-schema   |   34 +
 .../example-DIH/solr/solr/conf/managed-schema   |   34 +
 solr/example/files/conf/managed-schema          |    9 +
 solr/example/files/conf/solrconfig.xml          |    8 +-
 solr/licenses/commons-compress-1.16.1.jar.sha1  |    1 -
 solr/licenses/commons-compress-1.18.jar.sha1    |    1 +
 solr/licenses/junit4-ant-2.6.0.jar.sha1         |    1 -
 solr/licenses/junit4-ant-2.6.4.jar.sha1         |    1 +
 .../randomizedtesting-runner-2.6.0.jar.sha1     |    1 -
 .../randomizedtesting-runner-2.6.4.jar.sha1     |    1 +
 .../configsets/_default/conf/managed-schema     |   34 +
 .../configsets/_default/conf/solrconfig.xml     |    8 +-
 .../conf/managed-schema                         |   34 +
 solr/solr-ref-guide/build.xml                   |   18 +-
 solr/solr-ref-guide/src/_layouts/page.html      |    2 +-
 solr/solr-ref-guide/src/analytics.adoc          |    2 +-
 .../src/basic-authentication-plugin.adoc        |    4 +-
 solr/solr-ref-guide/src/cloud-screens.adoc      |   12 +-
 solr/solr-ref-guide/src/collections-api.adoc    |   92 +-
 .../src/colocating-collections.adoc             |   26 +-
 .../src/common-query-parameters.adoc            |    6 +-
 solr/solr-ref-guide/src/configsets-api.adoc     |    2 +-
 .../src/configuring-solrconfig-xml.adoc         |    4 +-
 solr/solr-ref-guide/src/coreadmin-api.adoc      |    8 +-
 solr/solr-ref-guide/src/css/ref-guide.css       |    5 +
 solr/solr-ref-guide/src/css/theme-solr.css      |   21 +-
 solr/solr-ref-guide/src/curve-fitting.adoc      |  166 ++-
 .../detecting-languages-during-indexing.adoc    |    2 +-
 .../src/distributed-requests.adoc               |    4 +-
 solr/solr-ref-guide/src/docvalues.adoc          |   22 +-
 solr/solr-ref-guide/src/dsp.adoc                |   74 +-
 .../solr-ref-guide/src/filter-descriptions.adoc |    8 +-
 solr/solr-ref-guide/src/format-of-solr-xml.adoc |    4 +-
 solr/solr-ref-guide/src/index.adoc              |   19 +-
 .../src/indexconfig-in-solrconfig.adoc          |   14 +-
 .../src/initparams-in-solrconfig.adoc           |    2 +-
 solr/solr-ref-guide/src/json-facet-api.adoc     |  123 +-
 solr/solr-ref-guide/src/language-analysis.adoc  |   45 +-
 solr/solr-ref-guide/src/learning-to-rank.adoc   |    2 +-
 .../src/lib-directives-in-solrconfig.adoc       |   38 -
 .../src/local-parameters-in-queries.adoc        |    2 +-
 solr/solr-ref-guide/src/machine-learning.adoc   |  406 ++++--
 .../src/making-and-restoring-backups.adoc       |    2 +
 solr/solr-ref-guide/src/math-expressions.adoc   |   30 +-
 solr/solr-ref-guide/src/matrix-math.adoc        |   20 +-
 solr/solr-ref-guide/src/metrics-reporting.adoc  |    6 +-
 solr/solr-ref-guide/src/numerical-analysis.adoc |  114 +-
 solr/solr-ref-guide/src/other-parsers.adoc      |    6 +-
 .../src/other-schema-elements.adoc              |    2 +-
 .../src/pagination-of-results.adoc              |    2 +-
 .../src/probability-distributions.adoc          |  100 +-
 solr/solr-ref-guide/src/regression.adoc         |   77 +-
 .../src/resource-and-plugin-loading.adoc        |   86 ++
 .../src/rule-based-replica-placement.adoc       |    2 +-
 solr/solr-ref-guide/src/scalar-math.adoc        |    4 +-
 solr/solr-ref-guide/src/schemaless-mode.adoc    |    8 +-
 solr/solr-ref-guide/src/searching.adoc          |    2 -
 solr/solr-ref-guide/src/simulations.adoc        |  122 +-
 solr/solr-ref-guide/src/solr-upgrade-notes.adoc |   73 +-
 ...solrcloud-autoscaling-auto-add-replicas.adoc |    6 +-
 .../src/solrcloud-autoscaling-overview.adoc     |   25 +-
 ...olrcloud-autoscaling-policy-preferences.adoc |  316 +++--
 .../src/solrcloud-autoscaling-triggers.adoc     |  391 ++++--
 ...rcloud-query-routing-and-read-tolerance.adoc |   60 +-
 solr/solr-ref-guide/src/spell-checking.adoc     |    2 +-
 .../src/statistical-programming.adoc            |  741 ----------
 solr/solr-ref-guide/src/statistics.adoc         |   58 +-
 .../src/stream-decorator-reference.adoc         |  160 ++-
 .../src/stream-evaluator-reference.adoc         |    4 +-
 .../src/stream-source-reference.adoc            |   36 +-
 .../src/streaming-expressions.adoc              |    2 +-
 solr/solr-ref-guide/src/suggester.adoc          |    8 +-
 solr/solr-ref-guide/src/term-vectors.adoc       |   91 +-
 solr/solr-ref-guide/src/time-series.adoc        |   14 +-
 solr/solr-ref-guide/src/tokenizers.adoc         |    2 +-
 .../transforming-and-indexing-custom-json.adoc  |    2 +-
 .../src/transforming-result-documents.adoc      |   65 +-
 .../src/update-request-processors.adoc          |    4 +-
 .../src/uploading-data-with-index-handlers.adoc |   83 +-
 ...store-data-with-the-data-import-handler.adoc |   33 +-
 solr/solr-ref-guide/src/variables.adoc          |  197 ++-
 solr/solr-ref-guide/src/vector-math.adoc        |   50 +-
 solr/solr-ref-guide/src/vectorization.adoc      |  108 +-
 .../tools/CheckLinksAndAnchors.java             |    2 +-
 .../cloud/autoscaling/AddReplicaSuggester.java  |   10 +-
 .../cloud/autoscaling/AutoScalingConfig.java    |   44 +-
 .../client/solrj/cloud/autoscaling/Clause.java  |  270 ++--
 .../solrj/cloud/autoscaling/Condition.java      |   18 +-
 .../solrj/cloud/autoscaling/CoresVariable.java  |    8 +-
 .../cloud/autoscaling/FreeDiskVariable.java     |   40 +-
 .../cloud/autoscaling/MoveReplicaSuggester.java |    3 +-
 .../solrj/cloud/autoscaling/NodeVariable.java   |    5 +-
 .../client/solrj/cloud/autoscaling/Operand.java |    1 +
 .../client/solrj/cloud/autoscaling/Policy.java  |   32 +-
 .../solrj/cloud/autoscaling/PolicyHelper.java   |   70 +-
 .../solrj/cloud/autoscaling/RangeVal.java       |   10 +-
 .../solrj/cloud/autoscaling/ReplicaCount.java   |   54 +-
 .../solrj/cloud/autoscaling/ReplicaInfo.java    |   45 +-
 .../cloud/autoscaling/ReplicaVariable.java      |   19 +-
 .../client/solrj/cloud/autoscaling/Row.java     |   35 +-
 .../solrj/cloud/autoscaling/Suggester.java      |   14 +-
 .../solrj/cloud/autoscaling/Suggestion.java     |   43 +-
 .../solrj/cloud/autoscaling/Variable.java       |   31 +-
 .../solrj/cloud/autoscaling/VariableBase.java   |   31 +-
 .../solrj/cloud/autoscaling/Violation.java      |   39 +-
 .../autoscaling/WithCollectionVariable.java     |    3 +-
 .../solr/client/solrj/impl/CloudSolrClient.java |   13 +-
 .../solr/client/solrj/impl/HttpClientUtil.java  |   14 +-
 .../solrj/impl/Krb5HttpClientBuilder.java       |   12 +-
 .../solrj/impl/SolrClientNodeStateProvider.java |    2 +-
 .../org/apache/solr/client/solrj/io/Lang.java   |   10 +
 .../client/solrj/io/eval/GaussFitEvaluator.java |   91 ++
 .../client/solrj/io/eval/GetCacheEvaluator.java |   57 +
 .../solr/client/solrj/io/eval/KnnEvaluator.java |   22 +-
 .../solrj/io/eval/KnnRegressionEvaluator.java   |  238 ++++
 .../solrj/io/eval/LatLonVectorsEvaluator.java   |  115 ++
 .../solrj/io/eval/ListCacheEvaluator.java       |   73 +
 .../solrj/io/eval/MinMaxScaleEvaluator.java     |    2 +-
 .../client/solrj/io/eval/OutliersEvaluator.java |  138 ++
 .../client/solrj/io/eval/PredictEvaluator.java  |   34 +-
 .../client/solrj/io/eval/PutCacheEvaluator.java |   61 +
 .../solrj/io/eval/RemoveCacheEvaluator.java     |   57 +
 .../solr/client/solrj/io/sql/StatementImpl.java |    2 +-
 .../client/solrj/io/stream/CloudSolrStream.java |   10 +-
 .../client/solrj/io/stream/CommitStream.java    |    4 +-
 .../client/solrj/io/stream/DaemonStream.java    |   14 +-
 .../client/solrj/io/stream/ExecutorStream.java  |    8 +-
 .../client/solrj/io/stream/FacetStream.java     |    7 +-
 .../io/stream/FeaturesSelectionStream.java      |    2 +-
 .../solr/client/solrj/io/stream/SolrStream.java |    6 +-
 .../client/solrj/io/stream/StreamContext.java   |   10 +
 .../client/solrj/io/stream/TextLogitStream.java |    2 +-
 .../solrj/io/stream/TimeSeriesStream.java       |    2 +
 .../client/solrj/io/stream/TopicStream.java     |    6 +-
 .../client/solrj/io/stream/TupleStream.java     |    2 +-
 .../client/solrj/io/stream/UpdateStream.java    |    6 +-
 .../solrj/request/CollectionAdminRequest.java   |   72 +
 .../solrj/request/ConfigSetAdminRequest.java    |    5 +-
 .../solr/client/solrj/request/V2Request.java    |    2 +-
 .../solrj/request/schema/SchemaRequest.java     |    2 +-
 .../solr/common/ConditionalMapWriter.java       |   82 ++
 .../java/org/apache/solr/common/MapWriter.java  |    6 +
 .../org/apache/solr/common/SolrDocument.java    |    4 +-
 .../solr/common/cloud/ClusterProperties.java    |   23 +-
 .../solr/common/cloud/ClusterStateUtil.java     |    4 +-
 .../solr/common/cloud/CompositeIdRouter.java    |    2 +-
 .../apache/solr/common/cloud/DocCollection.java |    9 +
 .../solr/common/cloud/HashBasedRouter.java      |    3 +-
 .../solr/common/cloud/ZkConfigManager.java      |    4 +-
 .../apache/solr/common/cloud/ZkStateReader.java |  140 +-
 .../org/apache/solr/common/util/IOUtils.java    |    4 +-
 .../java/org/apache/solr/common/util/Utils.java |   56 +-
 .../apispec/cluster.configs.Commands.json       |    2 +-
 .../resources/apispec/collections.Commands.json |    4 +
 .../testAutoScalingHandlerFailure.json          |  141 ++
 .../testScheduledTriggerFailure.json            |   52 +
 .../solrj/solr/autoscaling/testSortError.json   |  225 +++
 .../autoscaling/testSysPropSuggestions.json     |  119 ++
 .../autoscaling/testUtilizeNodeFailure.json     |   69 +
 .../autoscaling/testUtilizeNodeFailure2.json    |   66 +
 .../solrj/solr/collection1/conf/schema-sql.xml  |   13 -
 .../solrj/solr/collection1/conf/schema.xml      |   13 -
 .../solr/configsets/streaming/conf/schema.xml   |   11 -
 .../solr/client/solrj/SolrExampleTests.java     |    4 +-
 .../solr/client/solrj/SolrExceptionTest.java    |    3 +
 .../solrj/beans/TestDocumentObjectBinder.java   |    4 +
 .../solrj/cloud/autoscaling/TestPolicy.java     |  611 +-------
 .../solrj/cloud/autoscaling/TestPolicy2.java    |  111 +-
 .../solrj/embedded/LargeVolumeJettyTest.java    |    3 +-
 .../solrj/impl/CloudSolrClientBuilderTest.java  |    6 +
 .../CloudSolrClientMultiConstructorTest.java    |    3 +
 .../solrj/impl/CloudSolrClientRetryTest.java    |   79 ++
 .../client/solrj/impl/CloudSolrClientTest.java  |    5 +-
 .../ConcurrentUpdateSolrClientBuilderTest.java  |    1 +
 .../client/solrj/impl/HttpClientUtilTest.java   |    6 +-
 .../client/solrj/impl/LBHttpSolrClientTest.java |    2 +
 .../apache/solr/client/solrj/io/TestLang.java   |    3 +-
 .../solrj/io/graph/GraphExpressionTest.java     |    2 +-
 .../solr/client/solrj/io/graph/GraphTest.java   |    2 +-
 .../solrj/io/stream/MathExpressionTest.java     |  334 ++++-
 .../solrj/io/stream/StreamDecoratorTest.java    |   29 +-
 .../solrj/io/stream/StreamExpressionTest.java   |   18 +-
 .../stream/StreamExpressionToExpessionTest.java |    2 +
 .../StreamExpressionToExplanationTest.java      |    2 +
 .../client/solrj/io/stream/StreamingTest.java   |   68 +
 .../request/TestCollectionAdminRequest.java     |    5 +
 .../request/TestConfigSetAdminRequest.java      |    2 -
 .../solrj/request/TestUpdateRequestCodec.java   |    5 +-
 .../solrj/request/TestV1toV2ApiMapper.java      |   11 +-
 .../solrj/response/QueryResponseTest.java       |    6 +-
 .../response/TestDelegationTokenResponse.java   |    2 +
 .../solr/common/TestToleratedUpdateError.java   |    5 +-
 .../cloud/TestCloudCollectionsListeners.java    |    3 +
 .../solr/common/params/ShardParamsTest.java     |    5 +-
 .../apache/solr/common/util/NamedListTest.java  |    7 +-
 .../solr/common/util/TestFastInputStream.java   |    1 +
 .../solr/common/util/TestNamedListCodec.java    |   11 +-
 .../solr/BaseDistributedSearchTestCase.java     |    2 +-
 .../apache/solr/cloud/MiniSolrCloudCluster.java |    9 +-
 .../apache/solr/cloud/SolrCloudTestCase.java    |   88 +-
 .../java/org/apache/solr/util/TestHarness.java  |    5 +-
 solr/webapp/web/WEB-INF/web.xml                 |  101 +-
 solr/webapp/web/js/angular/controllers/cloud.js |    9 +-
 934 files changed, 31484 insertions(+), 15805 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/08f7e670/solr/CHANGES.txt
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/08f7e670/solr/webapp/web/WEB-INF/web.xml
----------------------------------------------------------------------