You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2020/02/09 02:27:46 UTC

[lucene-solr] 01/02: Merge branch 'master' into jira/solr-13996

This is an automated email from the ASF dual-hosted git repository.

shalin pushed a commit to branch jira/solr-13996
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit 8b700836137c3c5d076bb6c5c300200cd36b97a2
Merge: dc76002a f5c132b
Author: Shalin Shekhar Mangar <sh...@apache.org>
AuthorDate: Sat Feb 8 12:24:36 2020 +0530

    Merge branch 'master' into jira/solr-13996

 .github/workflows/gradle-precommit.yml             |    23 +
 build.gradle                                       |     5 +-
 .../org/apache/lucene/gradle/ProfileResults.java   |   215 +
 dev-tools/scripts/checkJavaDocs.py                 |     7 +-
 gradle/defaults-java.gradle                        |     6 +-
 gradle/defaults-javadoc.gradle                     |     5 +-
 gradle/generation/javacc.gradle                    |   385 +
 gradle/generation/jflex.gradle                     |    31 +
 gradle/testing/profiling.gradle                    |    47 +
 gradle/testing/profiling.jfc                       |    41 +
 help/tests.txt                                     |    29 +
 lucene/CHANGES.txt                                 |    33 +
 lucene/MIGRATE.txt                                 |    16 +
 lucene/analysis/common/build.xml                   |     3 +-
 .../lucene/analysis/br/BrazilianStemmer.java       |     4 +-
 .../charfilter/HTMLCharacterEntities.jflex         |     2 +-
 .../analysis/charfilter/HTMLStripCharFilter.java   | 58714 +++++++++----------
 .../lucene/analysis/compound/package-info.java     |     9 +-
 .../apache/lucene/analysis/de/GermanStemmer.java   |     6 +-
 .../ConcatenateGraphFilterFactory.java             |     8 +-
 .../analysis/ngram/EdgeNGramTokenFilter.java       |     2 +-
 .../lucene/analysis/ngram/EdgeNGramTokenizer.java  |     2 +-
 .../lucene/analysis/ngram/NGramTokenizer.java      |     5 +-
 .../lucene/analysis/standard/ClassicFilter.java    |     2 +-
 .../analysis/standard/ClassicTokenizerImpl.java    |     4 +-
 .../standard/UAX29URLEmailTokenizerImpl.java       |     4 +-
 .../analysis/wikipedia/WikipediaTokenizerImpl.java |     4 +-
 .../lucene/analysis/core/TestDuelingAnalyzers.java |    26 +-
 .../icu/segmentation/ICUTokenizerFactory.java      |     2 +-
 lucene/analysis/icu/src/java/overview.html         |    28 +-
 .../lucene/analysis/ja/JapaneseAnalyzer.java       |     2 +-
 .../lucene/analysis/ja/JapaneseTokenizer.java      |    42 +-
 .../analysis/ja/JapaneseTokenizerFactory.java      |     7 +-
 .../lucene/analysis/ja/TestJapaneseAnalyzer.java   |    31 +-
 .../analysis/ja/TestJapaneseNumberFilter.java      |     2 +-
 .../lucene/analysis/ja/TestJapaneseTokenizer.java  |    51 +-
 .../analysis/ja/TestJapaneseTokenizerFactory.java  |    17 +-
 .../apache/lucene/analysis/ja/TestSearchMode.java  |    61 +-
 .../analysis/opennlp/OpenNLPLemmatizerFilter.java  |     2 +-
 .../stempel/src/java/org/egothor/stemmer/Diff.java |     4 +-
 .../src/java/org/egothor/stemmer/Gener.java        |     4 +-
 .../stempel/src/java/org/egothor/stemmer/Lift.java |     2 +-
 .../src/java/org/egothor/stemmer/MultiTrie.java    |     4 +-
 .../src/java/org/egothor/stemmer/MultiTrie2.java   |     4 +-
 .../src/java/org/egothor/stemmer/Optimizer.java    |     4 +-
 .../src/java/org/egothor/stemmer/Optimizer2.java   |     4 +-
 .../stempel/src/java/org/egothor/stemmer/Row.java  |     4 +-
 .../stempel/src/java/org/egothor/stemmer/Trie.java |     4 +-
 lucene/analysis/stempel/src/java/overview.html     |    40 +-
 .../codecs/lucene50/Lucene50PostingsFormat.java    |    20 +-
 .../lucene/benchmark/byTask/package-info.java      |    17 +-
 .../byTask/tasks/AnalyzerFactoryTask.java          |     6 +-
 lucene/build.xml                                   |     9 +-
 .../lucene/codecs/memory/FSTTermsWriter.java       |     4 +-
 .../codecs/simpletext/SimpleTextBKDReader.java     |    18 +-
 .../codecs/simpletext/SimpleTextBKDWriter.java     |    20 +-
 .../simpletext/SimpleTextFieldInfosFormat.java     |     6 +-
 .../codecs/simpletext/SimpleTextPointsReader.java  |     2 +-
 .../codecs/simpletext/SimpleTextPointsWriter.java  |     2 +-
 lucene/common-build.xml                            |    56 +-
 lucene/core/src/data/jflex/skeleton.default        |     4 +-
 .../jflex/skeleton.disable.buffer.expansion.txt    |     4 +-
 .../org/apache/lucene/analysis/package-info.java   |    16 +-
 .../analysis/standard/StandardTokenizerImpl.java   |     4 +-
 .../org/apache/lucene/codecs/PointsWriter.java     |     8 +-
 .../codecs/blocktree/BlockTreeTermsWriter.java     |    92 +-
 .../codecs/blocktree/IntersectTermsEnumFrame.java  |    56 +-
 .../codecs/blocktree/SegmentTermsEnumFrame.java    |    65 +-
 .../org/apache/lucene/codecs/blocktree/Stats.java  |    11 +-
 .../compressing/CompressingStoredFieldsFormat.java |    26 +-
 .../CompressingStoredFieldsIndexWriter.java        |   213 -
 .../compressing/CompressingStoredFieldsReader.java |    90 +-
 .../compressing/CompressingStoredFieldsWriter.java |    41 +-
 .../compressing/CompressingTermVectorsReader.java  |    79 +-
 .../compressing/CompressingTermVectorsWriter.java  |    31 +-
 .../lucene/codecs/compressing/FieldsIndex.java}    |    23 +-
 .../codecs/compressing/FieldsIndexReader.java      |   139 +
 .../codecs/compressing/FieldsIndexWriter.java      |   200 +
 ...dexReader.java => LegacyFieldsIndexReader.java} |    15 +-
 .../codecs/lucene50/Lucene50CompoundFormat.java    |     4 +-
 .../codecs/lucene50/Lucene50FieldInfosFormat.java  |     2 +-
 .../lucene50/Lucene50StoredFieldsFormat.java       |    80 +-
 .../codecs/lucene50/Lucene50TermVectorsFormat.java |    14 +-
 .../codecs/lucene60/Lucene60FieldInfosFormat.java  |     6 +-
 .../codecs/lucene60/Lucene60PointsReader.java      |     2 +-
 .../codecs/lucene60/Lucene60PointsWriter.java      |    12 +-
 .../codecs/lucene70/Lucene70SegmentInfoFormat.java |     2 +-
 .../codecs/lucene80/Lucene80DocValuesFormat.java   |     8 +-
 .../codecs/lucene80/Lucene80NormsFormat.java       |     8 +-
 .../codecs/lucene84/Lucene84PostingsFormat.java    |    20 +-
 .../lucene/codecs/lucene84/package-info.java       |    27 +-
 .../codecs/perfield/PerFieldDocValuesFormat.java   |     4 +-
 .../lucene/codecs/perfield/PerFieldMergeState.java |     2 +-
 .../codecs/perfield/PerFieldPostingsFormat.java    |     4 +-
 .../org/apache/lucene/document/BinaryPoint.java    |     4 +-
 .../org/apache/lucene/document/DoublePoint.java    |    10 +-
 .../org/apache/lucene/document/DoubleRange.java    |    10 +-
 .../java/org/apache/lucene/document/FieldType.java |    49 +-
 .../org/apache/lucene/document/FloatPoint.java     |    10 +-
 .../org/apache/lucene/document/FloatRange.java     |    10 +-
 .../java/org/apache/lucene/document/IntPoint.java  |    10 +-
 .../java/org/apache/lucene/document/IntRange.java  |    10 +-
 .../LatLonDocValuesPointInPolygonQuery.java        |     4 +-
 .../org/apache/lucene/document/LatLonPoint.java    |     6 +-
 .../lucene/document/LatLonPointInPolygonQuery.java |     4 +-
 .../org/apache/lucene/document/LatLonShape.java    |    44 +-
 .../lucene/document/LatLonShapeLineQuery.java      |   143 -
 .../lucene/document/LatLonShapePointQuery.java     |   123 -
 ...hapePolygonQuery.java => LatLonShapeQuery.java} |    69 +-
 .../java/org/apache/lucene/document/LongPoint.java |    10 +-
 .../java/org/apache/lucene/document/LongRange.java |    10 +-
 .../apache/lucene/document/RangeFieldQuery.java    |     4 +-
 .../org/apache/lucene/document/ShapeQuery.java     |     2 +-
 .../java/org/apache/lucene/document/XYShape.java   |    47 +-
 .../lucene/document/XYShapeBoundingBoxQuery.java   |   142 -
 .../apache/lucene/document/XYShapeLineQuery.java   |   146 -
 .../apache/lucene/document/XYShapePointQuery.java  |   126 -
 ...{XYShapePolygonQuery.java => XYShapeQuery.java} |    57 +-
 .../java/org/apache/lucene/geo/ComponentTree.java  |    16 +-
 .../src/java/org/apache/lucene/geo/EdgeTree.java   |    89 +-
 .../java/org/apache/lucene/geo/LatLonGeometry.java |    51 +
 .../core/src/java/org/apache/lucene/geo/Line.java  |     9 +-
 .../src/java/org/apache/lucene/geo/Line2D.java     |    43 +-
 .../core/src/java/org/apache/lucene/geo/Point.java |    87 +
 .../src/java/org/apache/lucene/geo/Point2D.java    |    63 +-
 .../src/java/org/apache/lucene/geo/Polygon.java    |     7 +-
 .../src/java/org/apache/lucene/geo/Polygon2D.java  |    61 +-
 .../src/java/org/apache/lucene/geo/XYGeometry.java |    51 +
 .../src/java/org/apache/lucene/geo/XYLine.java     |    30 +-
 .../src/java/org/apache/lucene/geo/XYPoint.java    |    85 +
 .../src/java/org/apache/lucene/geo/XYPolygon.java  |    34 +-
 .../java/org/apache/lucene/geo/XYPolygon2D.java    |    44 -
 .../java/org/apache/lucene/geo/XYRectangle.java    |     7 +-
 .../java/org/apache/lucene/geo/XYRectangle2D.java  |    22 +-
 .../apache/lucene/index/BaseCompositeReader.java   |     2 +-
 .../java/org/apache/lucene/index/CheckIndex.java   |     4 +-
 .../java/org/apache/lucene/index/CodecReader.java  |     2 +-
 .../org/apache/lucene/index/CompositeReader.java   |     2 +-
 .../apache/lucene/index/DefaultIndexingChain.java  |    14 +-
 .../org/apache/lucene/index/DirectoryReader.java   |     2 +-
 .../lucene/index/ExitableDirectoryReader.java      |     4 +-
 .../java/org/apache/lucene/index/FieldInfo.java    |    56 +-
 .../java/org/apache/lucene/index/FieldInfos.java   |    41 +-
 .../java/org/apache/lucene/index/IndexReader.java  |     2 +-
 .../apache/lucene/index/IndexReaderContext.java    |     4 +-
 .../java/org/apache/lucene/index/IndexWriter.java  |    16 +-
 .../apache/lucene/index/IndexableFieldType.java    |     4 +-
 .../java/org/apache/lucene/index/LeafReader.java   |     2 +-
 .../java/org/apache/lucene/index/MergePolicy.java  |     4 +-
 .../java/org/apache/lucene/index/MultiReader.java  |     2 +-
 .../java/org/apache/lucene/index/PointValues.java  |    10 +-
 .../org/apache/lucene/index/PointValuesWriter.java |    10 +-
 .../java/org/apache/lucene/index/SegmentInfos.java |     4 +-
 .../src/java/org/apache/lucene/index/Sorter.java   |     4 +-
 .../org/apache/lucene/index/SortingLeafReader.java |     4 +-
 .../index/TrackingTmpOutputDirectoryWrapper.java   |     3 +-
 .../java/org/apache/lucene/index/package-info.java |    38 +-
 .../org/apache/lucene/search/CachingCollector.java |     2 +-
 .../java/org/apache/lucene/search/FuzzyQuery.java  |    10 +-
 .../org/apache/lucene/search/IndexSearcher.java    |     2 +-
 .../org/apache/lucene/search/LRUQueryCache.java    |     2 +-
 .../org/apache/lucene/search/PointInSetQuery.java  |     4 +-
 .../apache/lucene/search/QueryCachingPolicy.java   |     2 +-
 .../org/apache/lucene/search/package-info.java     |    28 +-
 .../lucene/search/similarities/Similarity.java     |     8 +-
 .../search/similarities/TFIDFSimilarity.java       |   114 +-
 .../lucene/search/similarities/package-info.java   |    14 +-
 .../java/org/apache/lucene/store/DataOutput.java   |    11 +-
 .../java/org/apache/lucene/store/FSDirectory.java  |     2 +-
 .../lucene/store/OutputStreamIndexOutput.java      |     2 +-
 .../src/java/org/apache/lucene/util/BitUtil.java   |    64 +-
 .../java/org/apache/lucene/util/ByteBlockPool.java |     6 +-
 .../src/java/org/apache/lucene/util/Constants.java |     4 +-
 .../org/apache/lucene/util/FilterIterator.java     |     2 +-
 .../src/java/org/apache/lucene/util/IOUtils.java   |    24 +-
 .../java/org/apache/lucene/util/IntBlockPool.java  |     2 +-
 .../java/org/apache/lucene/util/PriorityQueue.java |     2 +-
 .../org/apache/lucene/util/SparseFixedBitSet.java  |     6 +-
 .../src/java/org/apache/lucene/util/TimSorter.java |     2 +-
 .../org/apache/lucene/util/WeakIdentityMap.java    |     2 +-
 .../apache/lucene/util/automaton/FrozenIntSet.java |    46 +-
 .../org/apache/lucene/util/automaton/IntSet.java   |    46 +
 .../apache/lucene/util/automaton/Operations.java   |    11 +-
 .../org/apache/lucene/util/automaton/RegExp.java   |    71 +-
 .../apache/lucene/util/automaton/SortedIntSet.java |   135 +-
 .../apache/lucene/util/automaton/StatePair.java    |     2 +-
 .../apache/lucene/util/automaton/package-info.java |     8 +-
 .../java/org/apache/lucene/util/bkd/BKDReader.java |     2 +-
 .../java/org/apache/lucene/util/bkd/BKDWriter.java |    20 +-
 .../java/org/apache/lucene/util/compress/LZ4.java  |     8 -
 .../util/packed/AbstractBlockPackedWriter.java     |     2 +-
 .../util/packed/BlockPackedReaderIterator.java     |     2 +-
 .../lucene/util/packed/BlockPackedWriter.java      |     8 +-
 .../lucene/util/packed/DirectMonotonicReader.java  |   112 +-
 .../lucene/util/packed/DirectMonotonicWriter.java  |    17 +-
 .../util/packed/MonotonicBlockPackedWriter.java    |     2 +-
 lucene/core/src/java/overview.html                 |    32 +-
 .../compressing/AbstractTestCompressionMode.java   |    40 +-
 .../codecs/lucene60/TestLucene60PointsFormat.java  |     2 +-
 .../lucene/codecs/lucene80/TestIndexedDISI.java    |    15 +-
 .../lucene80/TestLucene80DocValuesFormat.java      |     4 +-
 .../lucene/document/BaseLatLonShapeTestCase.java   |    16 +-
 .../lucene/document/BaseXYShapeTestCase.java       |    26 +-
 .../org/apache/lucene/document/TestFieldType.java  |     6 +-
 .../apache/lucene/document/TestLatLonShape.java    |    55 +-
 .../lucene/document/TestLatLonShapeEncoding.java   |     4 +-
 .../lucene/document/TestXYLineShapeQueries.java    |    20 +-
 .../document/TestXYMultiLineShapeQueries.java      |     4 +-
 .../document/TestXYMultiPointShapeQueries.java     |     4 +-
 .../document/TestXYMultiPolygonShapeQueries.java   |     6 +-
 .../lucene/document/TestXYPointShapeQueries.java   |    18 +-
 .../lucene/document/TestXYPolygonShapeQueries.java |     4 +-
 .../org/apache/lucene/document/TestXYShape.java    |    13 +-
 .../lucene/document/TestXYShapeEncoding.java       |     8 +-
 .../test/org/apache/lucene/geo/ShapeTestUtil.java  |    55 +-
 .../test/org/apache/lucene/geo/TestGeoUtils.java   |    42 +-
 .../src/test/org/apache/lucene/geo/TestPoint.java} |    38 +-
 .../test/org/apache/lucene/geo/TestPoint2D.java    |    17 +-
 .../test/org/apache/lucene/geo/TestPolygon2D.java  |    22 +-
 .../org/apache/lucene/geo/TestXYRectangle2D.java   |    17 +-
 .../org/apache/lucene/index/TestAddIndexes.java    |    19 +-
 .../org/apache/lucene/index/TestAtomicUpdate.java  |   125 +-
 .../lucene/index/TestBinaryDocValuesUpdates.java   |     7 +-
 .../org/apache/lucene/index/TestByteSlices.java    |    25 +-
 .../lucene/index/TestConcurrentMergeScheduler.java |     3 +-
 .../apache/lucene/index/TestDeletionPolicy.java    |     2 +
 .../index/TestDocumentsWriterStallControl.java     |     4 +-
 .../org/apache/lucene/index/TestIndexWriter.java   |     4 +-
 .../apache/lucene/index/TestIndexWriterDelete.java |     4 +-
 .../lucene/index/TestIndexWriterNRTIsCurrent.java  |     4 +-
 .../apache/lucene/index/TestIndexWriterReader.java |     6 +-
 .../lucene/index/TestIndexWriterUnicode.java       |     2 +-
 .../lucene/index/TestIndexWriterWithThreads.java   |     3 +-
 .../apache/lucene/index/TestIndexableField.java    |     2 +-
 .../lucene/index/TestMixedDocValuesUpdates.java    |     3 +-
 .../lucene/index/TestNRTReaderWithThreads.java     |    52 +-
 .../test/org/apache/lucene/index/TestNorms.java    |    12 +-
 .../lucene/index/TestNumericDocValuesUpdates.java  |     4 +-
 .../org/apache/lucene/index/TestPointValues.java   |    16 +-
 .../org/apache/lucene/index/TestStressAdvance.java |     3 +-
 .../org/apache/lucene/index/TestTermsEnum.java     |     3 +-
 .../apache/lucene/index/TestTieredMergePolicy.java |    32 +-
 .../apache/lucene/search/TestAutomatonQuery.java   |     2 +-
 .../lucene/search/TestDisjunctionMaxQuery.java     |     2 +-
 .../lucene/search/TestDoubleValuesSource.java      |    28 +-
 .../lucene/search/TestMultiThreadTermVectors.java  |   159 +-
 .../org/apache/lucene/search/TestPointQueries.java |     2 +-
 .../org/apache/lucene/search/TestPrefixQuery.java  |     2 +-
 .../lucene/search/TestSameScoresWithThreads.java   |     2 +-
 .../org/apache/lucene/search/TestScorerPerf.java   |     5 +-
 .../lucene/search/TestSearchWithThreads.java       |    35 +-
 .../apache/lucene/search/TestSearcherManager.java  |    16 +-
 .../lucene/store/TestByteBuffersDataInput.java     |     2 +-
 .../lucene/store/TestFileSwitchDirectory.java      |     3 +-
 .../org/apache/lucene/store/TestMultiMMap.java     |     9 +-
 .../test/org/apache/lucene/util/TestBitUtil.java   |     6 +-
 .../apache/lucene/util/TestDocIdSetBuilder.java    |     2 +-
 .../org/apache/lucene/util/TestNumericUtils.java   |     4 +-
 .../org/apache/lucene/util/TestPagedBytes.java     |    12 +-
 .../org/apache/lucene/util/TestSloppyMath.java     |     3 +-
 .../apache/lucene/util/TestWeakIdentityMap.java    |     3 +-
 .../apache/lucene/util/automaton/TestIntSet.java   |    94 +
 .../apache/lucene/util/automaton/TestMinimize.java |     2 +-
 .../test/org/apache/lucene/util/bkd/TestBKD.java   |    52 +-
 .../util/bkd/TestMutablePointsReaderUtils.java     |     2 +-
 .../lucene/util/packed/TestDirectMonotonic.java    |   104 +-
 .../lucene/util/packed/TestDirectPacked.java       |     2 +-
 .../apache/lucene/util/packed/TestPackedInts.java  |    87 +-
 lucene/demo/src/java/overview.html                 |    17 +-
 lucene/expressions/src/java/overview.html          |     4 +-
 .../lucene/search/grouping/GroupingSearch.java     |     4 +-
 .../search/vectorhighlight/package-info.java       |     5 +-
 .../lucene/search/highlight/HighlighterTest.java   |     2 +-
 .../highlight/custom/HighlightCustomQueryTest.java |     2 +-
 .../uhighlight/TestUnifiedHighlighterMTQ.java      |     2 +-
 lucene/ivy-versions.properties                     |     2 +-
 .../search/join/PointInSetIncludingScoreQuery.java |     4 +-
 .../documents/IndexOptionsDialogFactory.java       |     2 +-
 .../luke/models/documents/DocumentField.java       |     2 +-
 .../lucene/luke/models/search/SearchImpl.java      |     2 +-
 .../luke/models/commits/CommitsImplTest.java       |     2 +-
 .../luke/models/documents/DocumentsImplTest.java   |     2 +-
 .../apache/lucene/index/memory/MemoryIndex.java    |    20 +-
 .../org/apache/lucene/misc/IndexMergeTool.java     |    90 +-
 lucene/misc/src/java/overview.html                 |    12 +-
 .../org/apache/lucene/misc/TestIndexMergeTool.java |    65 +
 .../apache/lucene/queries/CommonTermsQuery.java    |     4 +-
 .../queries/intervals/CachingMatchesIterator.java  |    13 +-
 .../intervals/ConjunctionIntervalsSource.java      |    24 +-
 .../intervals/DifferenceIntervalsSource.java       |     7 +-
 .../intervals/DisjunctionIntervalsSource.java      |    88 +-
 .../queries/intervals/ExtendedIntervalsSource.java |     5 +-
 .../queries/intervals/FilteredIntervalsSource.java |     5 +-
 .../intervals/FixedFieldIntervalsSource.java       |     3 +-
 .../lucene/queries/intervals/IntervalIterator.java |     7 +
 .../lucene/queries/intervals/IntervalMatches.java  |    38 +-
 .../queries/intervals/IntervalMatchesIterator.java |    19 +-
 .../lucene/queries/intervals/IntervalsSource.java  |     2 +-
 .../MinimizingConjunctionMatchesIterator.java      |     7 +-
 .../MinimumShouldMatchIntervalsSource.java         |    42 +-
 .../intervals/MultiTermIntervalsSource.java        |    54 +-
 .../queries/intervals/OffsetIntervalsSource.java   |     5 +-
 .../queries/intervals/OrderedIntervalsSource.java  |    52 +-
 .../PayloadFilteredTermIntervalsSource.java        |    16 +-
 .../intervals/RepeatingIntervalsSource.java        |   323 +
 .../queries/intervals/TermIntervalsSource.java     |    16 +-
 .../intervals/UnorderedIntervalsSource.java        |    50 +-
 .../lucene/queries/intervals/TestIntervals.java    |    70 +-
 .../queries/intervals/TestSimplifications.java     |    14 +
 .../queries/payloads/TestPayloadCheckQuery.java    |     8 +-
 .../queries/payloads/TestPayloadScoreQuery.java    |     2 +-
 .../lucene/queryparser/classic/CharStream.java     |     2 +-
 .../lucene/queryparser/classic/FastCharStream.java |     2 +
 .../lucene/queryparser/classic/QueryParser.java    |     9 +-
 .../lucene/queryparser/classic/QueryParser.jj      |     2 +-
 .../queryparser/classic/QueryParserBase.java       |     2 +-
 .../classic/QueryParserTokenManager.java           |     8 +-
 .../lucene/queryparser/classic/package-info.java   |    40 +-
 .../flexible/core/builders/package-info.java       |     2 +-
 .../flexible/core/config/package-info.java         |     2 +-
 .../flexible/core/messages/package-info.java       |     2 +-
 .../flexible/core/nodes/package-info.java          |     2 +-
 .../flexible/core/parser/package-info.java         |     2 +-
 .../flexible/core/processors/package-info.java     |     2 +-
 .../standard/CommonQueryParserConfiguration.java   |     2 +-
 .../flexible/standard/StandardQueryParser.java     |     4 +-
 .../flexible/standard/config/FuzzyConfig.java      |     2 +-
 .../flexible/standard/parser/CharStream.java       |     2 +-
 .../flexible/standard/parser/FastCharStream.java   |     2 +
 .../standard/parser/StandardSyntaxParser.java      |     9 +-
 .../standard/parser/StandardSyntaxParser.jj        |     2 +-
 .../parser/StandardSyntaxParserTokenManager.java   |     7 +-
 .../queryparser/simple/SimpleQueryParser.java      |    18 +-
 .../queryparser/surround/parser/CharStream.java    |     2 +-
 .../surround/parser/FastCharStream.java            |     2 +
 .../queryparser/surround/parser/QueryParser.java   |     8 +-
 .../surround/parser/QueryParserTokenManager.java   |     6 +-
 .../xml/builders/FuzzyLikeThisQueryBuilder.java    |     2 +-
 .../xml/builders/PointRangeQueryBuilder.java       |    11 +-
 lucene/queryparser/src/java/overview.html          |    19 +-
 .../core/builders/TestQueryTreeBuilder.java        |     6 +-
 .../apache/lucene/document/BigIntegerPoint.java    |    10 +-
 .../org/apache/lucene/document/HalfFloatPoint.java |    10 +-
 .../org/apache/lucene/search/CoveringQuery.java    |     4 +-
 .../document/TestFloatPointNearestNeighbor.java    |     2 +-
 .../apache/lucene/spatial/bbox/BBoxStrategy.java   |     2 +-
 .../lucene/spatial/vector/PointVectorStrategy.java |     2 +-
 lucene/spatial-extras/src/java/overview.html       |     1 -
 .../suggest/document/CompletionPostingsFormat.java |     8 +-
 .../lucene/analysis/BaseTokenStreamTestCase.java   |    72 +-
 .../org/apache/lucene/analysis/MockTokenizer.java  |     6 +-
 .../java/org/apache/lucene/analysis/package.html   |     1 -
 .../codecs/asserting/AssertingPointsFormat.java    |     4 +-
 .../codecs/compressing/CompressingCodec.java       |    25 +-
 .../codecs/compressing/FastCompressingCodec.java   |     4 +-
 .../FastDecompressionCompressingCodec.java         |     4 +-
 .../HighCompressionCompressingCodec.java           |     8 +-
 .../compressing/dummy/DummyCompressingCodec.java   |     4 +-
 .../lucene/codecs/cranky/CrankyPointsFormat.java   |     4 +-
 .../apache/lucene/index/AssertingLeafReader.java   |     6 +-
 .../lucene/index/BaseIndexFileFormatTestCase.java  |     2 +-
 .../lucene/index/BaseMergePolicyTestCase.java      |     9 +-
 .../lucene/index/BasePointsFormatTestCase.java     |    38 +-
 .../apache/lucene/index/MismatchedLeafReader.java  |     2 +-
 .../java/org/apache/lucene/index/RandomCodec.java  |     2 +-
 .../org/apache/lucene/index/RandomIndexWriter.java |     2 +-
 .../apache/lucene/index/RandomPostingsTester.java  |     2 +-
 .../ThreadedIndexingAndSearchingTestCase.java      |     2 +-
 .../src/java/org/apache/lucene/index/package.html  |     1 -
 .../java/org/apache/lucene/search/CheckHits.java   |     1 +
 .../src/java/org/apache/lucene/search/package.html |     1 -
 .../similarities/BaseSimilarityTestCase.java       |    17 +-
 .../apache/lucene/search/similarities/package.html |     1 -
 .../org/apache/lucene/util/BaseBitSetTestCase.java |    27 +-
 .../apache/lucene/util/BaseDocIdSetTestCase.java   |    24 +-
 .../org/apache/lucene/util/LuceneTestCase.java     |     8 +-
 .../src/java/org/apache/lucene/util/TestUtil.java  |     2 +-
 .../javadoc/table_padding.css}                     |    27 +-
 .../apache/lucene/validation/LicenseCheckTask.java |     4 +-
 solr/CHANGES.txt                                   |    32 +-
 solr/bin/solr                                      |    10 +-
 solr/bin/solr.cmd                                  |     6 +-
 solr/bin/solr.in.cmd                               |     3 +-
 solr/bin/solr.in.sh                                |     2 +-
 solr/build.xml                                     |     6 -
 solr/contrib/ltr/src/java/overview.html            |     2 +-
 .../apache/solr/cloud/OverseerSolrResponse.java    |    53 +-
 ...se.java => OverseerSolrResponseSerializer.java} |    38 +-
 .../apache/solr/cloud/OverseerTaskProcessor.java   |     6 +-
 .../java/org/apache/solr/cloud/ZkShardTerms.java   |     4 +-
 .../cloud/api/collections/CreateCollectionCmd.java |     1 +
 .../solr/core/IndexDeletionPolicyWrapper.java      |     2 +-
 .../src/java/org/apache/solr/core/SolrCore.java    |    10 +-
 .../solr/handler/FieldAnalysisRequestHandler.java  |    13 +-
 .../apache/solr/handler/RequestHandlerBase.java    |     3 +-
 .../solr/handler/admin/CollectionsHandler.java     |     7 +-
 .../solr/handler/admin/ConfigSetsHandler.java      |     3 +-
 .../handler/admin/SegmentsInfoRequestHandler.java  |     6 +-
 .../apache/solr/handler/export/PriorityQueue.java  |     2 +-
 .../java/org/apache/solr/legacy/BBoxStrategy.java  |     2 +-
 .../solr/legacy/LegacyNumericRangeQuery.java       |     4 +-
 .../org/apache/solr/legacy/LegacyNumericUtils.java |     8 +-
 .../apache/solr/legacy/PointVectorStrategy.java    |     2 +-
 .../java/org/apache/solr/parser/CharStream.java    |    18 +-
 .../org/apache/solr/parser/FastCharStream.java     |     9 +-
 .../org/apache/solr/parser/ParseException.java     |     2 +-
 .../java/org/apache/solr/parser/QueryParser.java   |    40 +-
 .../src/java/org/apache/solr/parser/QueryParser.jj |     7 +-
 .../solr/parser/QueryParserTokenManager.java       |    32 +-
 .../apache/solr/parser/SolrQueryParserBase.java    |     2 +-
 .../java/org/apache/solr/parser/TokenMgrError.java |     2 +-
 .../apache/solr/response/SolrQueryResponse.java    |     6 +-
 .../org/apache/solr/schema/ManagedIndexSchema.java |     6 +-
 .../java/org/apache/solr/schema/SchemaField.java   |     2 +-
 .../solr/search/CollapsingQParserPlugin.java       |     2 +-
 .../src/java/org/apache/solr/search/Insanity.java  |     2 +-
 .../org/apache/solr/search/JoinQParserPlugin.java  |   157 +-
 .../search/LegacyNumericRangeQueryBuilder.java     |    11 +-
 .../org/apache/solr/search/TopLevelJoinQuery.java  |   221 +
 .../org/apache/solr/search/ValueSourceParser.java  |     8 +-
 .../org/apache/solr/search/facet/FacetRange.java   |    10 +-
 .../apache/solr/search/facet/UniqueBlockAgg.java   |    32 +-
 .../solr/search/facet/UniqueBlockFieldAgg.java     |    45 +
 .../solr/search/facet/UniqueBlockQueryAgg.java     |    71 +
 .../join/MultiValueTermOrdinalCollector.java       |    65 +
 .../org/apache/solr/store/hdfs/HdfsDirectory.java  |    24 +-
 .../org/apache/solr/store/hdfs/HdfsFileWriter.java |     3 +-
 .../apache/solr/uninverting/FieldCacheImpl.java    |     6 +-
 .../apache/solr/uninverting/UninvertingReader.java |     6 +-
 .../test-files/solr/collection1/conf/schema12.xml  |     2 +
 .../solr/collection1/conf/schema_latest.xml        |     4 +
 solr/core/src/test/org/apache/solr/TestJoin.java   |   166 +-
 .../apache/solr/cloud/ClusterStateMockUtil.java    |   120 +-
 .../solr/cloud/ClusterStateMockUtilTest.java       |    99 +
 .../org/apache/solr/cloud/ClusterStateTest.java    |     2 +
 .../OverseerCollectionConfigSetProcessorTest.java  |     2 +-
 .../solr/cloud/OverseerSolrResponseTest.java       |     6 +-
 ...verseerSolrResponseUnsafeSerializationTest.java |     4 +-
 .../test/org/apache/solr/cloud/SliceStateTest.java |     2 +
 .../apache/solr/rest/schema/TestBulkSchemaAPI.java |    77 +-
 .../apache/solr/search/facet/TestJsonFacets.java   |    97 +-
 .../facet/TestJsonFacetsWithNestedObjects.java     |    31 +-
 .../apache/solr/store/hdfs/HdfsDirectoryTest.java  |    38 +-
 .../solr/uninverting/TestUninvertingReader.java    |     4 +-
 solr/licenses/org.restlet-2.3.0.jar.sha1           |     1 -
 solr/licenses/org.restlet-2.4.0.jar.sha1           |     1 +
 .../org.restlet.ext.servlet-2.3.0.jar.sha1         |     1 -
 .../org.restlet.ext.servlet-2.4.0.jar.sha1         |     1 +
 solr/server/solr/zoo.cfg                           |     3 +
 solr/solr-ref-guide/src/format-of-solr-xml.adoc    |    10 +-
 solr/solr-ref-guide/src/json-facet-api.adoc        |     4 +-
 solr/solr-ref-guide/src/other-parsers.adoc         |    85 +-
 solr/solr-ref-guide/src/schema-api.adoc            |     2 +-
 solr/solr-ref-guide/src/securing-solr.adoc         |     4 -
 .../src/stream-decorator-reference.adoc            |    44 +-
 .../solrj/cloud/autoscaling/ReplicaInfo.java       |    21 +-
 .../solr/client/solrj/impl/Http2SolrClient.java    |     4 +-
 .../java/org/apache/solr/client/solrj/io/Lang.java |     3 +-
 .../solr/client/solrj/io/stream/DeleteStream.java  |   112 +
 .../solr/client/solrj/io/stream/JDBCStream.java    |     7 +-
 .../solr/client/solrj/io/stream/UpdateStream.java  |    50 +-
 .../io/stream/expr/StreamExpressionParser.java     |    11 +
 .../org/apache/solr/common/SolrInputDocument.java  |     4 +-
 .../java/org/apache/solr/common/cloud/Replica.java |    17 +-
 .../solr/configsets/streaming/conf/solrconfig.xml  |     5 +
 .../client/solrj/cloud/autoscaling/TestPolicy.java |    69 +-
 .../client/solrj/impl/Http2SolrClientTest.java     |    11 +
 .../org/apache/solr/client/solrj/io/TestLang.java  |     2 +-
 .../solrj/io/stream/CloudAuthStreamTest.java       |   830 +
 .../solrj/io/stream/StreamDecoratorTest.java       |   155 +-
 .../solrj/io/stream/StreamExpressionTest.java      |    28 +-
 .../solrj/routing/ReplicaListTransformerTest.java  |     3 +
 .../ShufflingReplicaListTransformerTest.java       |     9 +-
 versions.lock                                      |     4 +-
 versions.props                                     |     2 +-
 475 files changed, 37169 insertions(+), 33307 deletions(-)