You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by no...@apache.org on 2016/06/16 12:09:19 UTC

[49/50] [abbrv] lucene-solr:apiv2: Merge branch 'master' into apiv2

Merge branch 'master' into apiv2

Conflicts:
	solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
	solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
	solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
	solr/core/src/java/org/apache/solr/servlet/HttpSolrCall.java
	solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
	solr/core/src/test/org/apache/solr/security/BasicAuthIntegrationTest.java


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

Branch: refs/heads/apiv2
Commit: b48f4d696261fcb0bd06943c1f8ff16cbe6caa22
Parents: f72c691 5eabffc
Author: Noble Paul <no...@apache.org>
Authored: Thu Jun 16 15:47:46 2016 +0530
Committer: Noble Paul <no...@apache.org>
Committed: Thu Jun 16 15:47:46 2016 +0530

----------------------------------------------------------------------
 .gitignore                                      |    2 +
 dev-tools/idea/.idea/libraries/Ant.xml          |    9 -
 dev-tools/idea/.idea/libraries/JUnit.xml        |    4 +-
 dev-tools/idea/.idea/modules.xml                |    1 +
 dev-tools/idea/.idea/workspace.xml              |   13 +-
 .../lucene/classification/classification.iml    |    2 +
 dev-tools/idea/lucene/tools/tools.iml           |    1 -
 .../idea/solr/contrib/analytics/analytics.iml   |    1 -
 dev-tools/idea/solr/server/server.iml           |   19 +
 .../solr/test-framework/solr-test-framework.iml |    1 +
 dev-tools/maven/lucene/pom.xml.template         |    6 +-
 dev-tools/maven/lucene/sandbox/pom.xml.template |    7 -
 dev-tools/maven/pom.xml.template                |   10 +-
 dev-tools/maven/solr/pom.xml.template           |   14 +-
 dev-tools/scripts/addVersion.py                 |   80 +-
 dev-tools/scripts/buildAndPushRelease.py        |   89 +-
 dev-tools/scripts/checkJavaDocs.py              |   74 +-
 dev-tools/scripts/scriptutil.py                 |   18 +-
 dev-tools/scripts/smokeTestRelease.py           |   25 +-
 lucene/CHANGES.txt                              |  208 +-
 lucene/MIGRATE.txt                              |    5 +
 .../lucene/analysis/ar/ArabicAnalyzer.java      |    1 -
 .../charfilter/HTMLStripCharFilter.java         |    1 -
 .../analysis/charfilter/NormalizeCharMap.java   |    2 -
 .../lucene/analysis/ckb/SoraniAnalyzer.java     |    1 -
 .../HyphenationCompoundWordTokenFilter.java     |    1 -
 ...phenationCompoundWordTokenFilterFactory.java |    1 -
 .../lucene/analysis/core/LowerCaseFilter.java   |    3 +-
 .../lucene/analysis/core/StopAnalyzer.java      |    1 -
 .../lucene/analysis/core/UpperCaseFilter.java   |    3 +-
 .../analysis/el/GreekLowerCaseFilter.java       |    4 +-
 .../lucene/analysis/en/PorterStemmer.java       |    4 -
 .../lucene/analysis/fa/PersianAnalyzer.java     |    1 -
 .../lucene/analysis/hi/HindiAnalyzer.java       |    1 -
 .../lucene/analysis/minhash/MinHashFilter.java  |  504 +++++
 .../analysis/minhash/MinHashFilterFactory.java  |   57 +
 .../lucene/analysis/minhash/package-info.java   |   21 +
 .../WordDelimiterFilterFactory.java             |    2 -
 .../analysis/ngram/EdgeNGramTokenFilter.java    |    7 +-
 .../analysis/ngram/EdgeNGramTokenizer.java      |    1 -
 .../lucene/analysis/ngram/NGramTokenFilter.java |   13 +-
 .../lucene/analysis/ngram/NGramTokenizer.java   |    8 +-
 .../lucene/analysis/nl/DutchAnalyzer.java       |    1 -
 .../pattern/PatternCaptureGroupTokenFilter.java |    1 -
 .../query/QueryAutoStopWordAnalyzer.java        |    1 -
 .../analysis/standard/ClassicTokenizerImpl.java |    1 -
 .../standard/UAX29URLEmailTokenizerFactory.java |    1 -
 .../analysis/synonym/SynonymFilterFactory.java  |    2 -
 .../lucene/analysis/synonym/SynonymMap.java     |    2 -
 .../apache/lucene/analysis/th/ThaiAnalyzer.java |    1 -
 .../lucene/analysis/tr/TurkishAnalyzer.java     |    1 -
 .../lucene/analysis/util/CharArrayMap.java      |   17 +-
 .../lucene/analysis/util/CharTokenizer.java     |    5 +-
 .../lucene/analysis/util/CharacterUtils.java    |  229 +--
 .../analysis/wikipedia/WikipediaTokenizer.java  |    1 -
 .../lucene/collation/CollationKeyAnalyzer.java  |    2 -
 ...ache.lucene.analysis.util.TokenFilterFactory |    1 +
 .../lucene/analysis/ar/TestArabicAnalyzer.java  |    1 -
 .../ar/TestArabicNormalizationFilter.java       |    1 -
 .../bg/TestBulgarianStemFilterFactory.java      |    1 -
 .../analysis/br/TestBrazilianAnalyzer.java      |    1 -
 .../TestHTMLStripCharFilterFactory.java         |    1 -
 .../analysis/cjk/TestCJKWidthFilterFactory.java |    1 -
 .../lucene/analysis/ckb/TestSoraniAnalyzer.java |    1 -
 .../TestSoraniNormalizationFilterFactory.java   |    1 -
 .../commongrams/CommonGramsFilterTest.java      |    1 -
 .../TestCommonGramsQueryFilterFactory.java      |    3 -
 .../analysis/core/TestKeywordAnalyzer.java      |    1 -
 .../lucene/analysis/core/TestRandomChains.java  |    1 -
 .../de/TestGermanLightStemFilterFactory.java    |    1 -
 .../analysis/de/TestGermanStemFilter.java       |    1 -
 .../el/TestGreekLowerCaseFilterFactory.java     |    1 -
 .../analysis/el/TestGreekStemFilterFactory.java |    1 -
 .../en/TestEnglishMinimalStemFilterFactory.java |    1 -
 .../analysis/en/TestKStemFilterFactory.java     |    1 -
 .../en/TestPorterStemFilterFactory.java         |    1 -
 .../lucene/analysis/fa/TestPersianAnalyzer.java |    1 -
 .../TestPersianNormalizationFilterFactory.java  |    1 -
 .../fr/TestFrenchLightStemFilterFactory.java    |    1 -
 .../fr/TestFrenchMinimalStemFilterFactory.java  |    1 -
 .../ga/TestIrishLowerCaseFilterFactory.java     |    1 -
 .../TestGalicianMinimalStemFilterFactory.java   |    1 -
 .../gl/TestGalicianStemFilterFactory.java       |    1 -
 .../lucene/analysis/hi/TestHindiAnalyzer.java   |    1 -
 .../lucene/analysis/hi/TestHindiFilters.java    |    2 -
 .../lucene/analysis/hi/TestHindiNormalizer.java |    4 -
 .../hu/TestHungarianLightStemFilterFactory.java |    1 -
 .../analysis/hunspell/Test64kAffixes.java       |    2 -
 .../analysis/hunspell/TestAllDictionaries.java  |    1 -
 .../analysis/hunspell/TestAllDictionaries2.java |    1 -
 .../analysis/hunspell/TestDictionary.java       |    1 -
 .../hunspell/TestHunspellStemFilter.java        |    1 -
 .../it/TestItalianLightStemFilterFactory.java   |    1 -
 .../analysis/minhash/MinHashFilterTest.java     |  330 ++++
 .../miscellaneous/TestKeywordMarkerFilter.java  |    2 -
 .../TestStemmerOverrideFilter.java              |    4 +-
 .../miscellaneous/TestTrimFilterFactory.java    |    1 -
 .../no/TestNorwegianLightStemFilterFactory.java |    1 -
 .../TestPatternReplaceCharFilterFactory.java    |    1 -
 .../TestPatternReplaceFilterFactory.java        |    1 -
 .../DelimitedPayloadTokenFilterTest.java        |    4 -
 .../pt/TestPortugueseStemFilterFactory.java     |    1 -
 .../reverse/TestReverseStringFilterFactory.java |    1 -
 .../ru/TestRussianLightStemFilterFactory.java   |    1 -
 .../analysis/shingle/ShingleFilterTest.java     |    1 -
 .../shingle/TestShingleFilterFactory.java       |    1 -
 .../standard/TestStandardFactories.java         |    1 -
 .../lucene/analysis/th/TestThaiAnalyzer.java    |    1 -
 .../analysis/util/TestCharacterUtils.java       |  155 +-
 .../collation/ICUCollationKeyAnalyzer.java      |    3 -
 .../icu/TestICUFoldingFilterFactory.java        |    1 -
 .../icu/TestICUNormalizer2FilterFactory.java    |    1 -
 .../icu/TestICUTransformFilterFactory.java      |    1 -
 .../segmentation/TestICUTokenizerFactory.java   |    1 -
 .../lucene/analysis/ja/JapaneseTokenizer.java   |   11 +-
 .../analysis/ja/dict/ConnectionCosts.java       |    1 -
 .../lucene/analysis/ja/dict/UserDictionary.java |    1 -
 .../analysis/ja/TestJapaneseTokenizer.java      |    9 +
 .../analysis/morfologik/MorfologikFilter.java   |    4 +-
 .../TestDoubleMetaphoneFilterFactory.java       |    3 -
 .../analysis/cn/smart/hhmm/WordDictionary.java  |   18 +-
 .../src/java/org/egothor/stemmer/Compile.java   |   43 +-
 .../src/java/org/egothor/stemmer/DiffIt.java    |   28 +-
 .../TestStempelPolishStemFilterFactory.java     |    1 -
 .../uima/UIMAAnnotationsTokenizerFactory.java   |    1 -
 .../lucene/analysis/uima/UIMABaseAnalyzer.java  |    1 -
 ...IMATypeAwareAnnotationsTokenizerFactory.java |    1 -
 .../uima/UIMATypeAwareAnalyzerTest.java         |    1 -
 .../org/apache/lucene/codecs/Placeholder.java   |    1 -
 .../lucene/codecs/lucene50/Lucene50Codec.java   |    2 +-
 .../lucene50/Lucene50SegmentInfoFormat.java     |  101 +
 .../lucene/codecs/lucene54/Lucene54Codec.java   |    2 +
 .../lucene/codecs/lucene60/Lucene60Codec.java   |  177 ++
 .../apache/lucene/codecs/lucene60/package.html  |   25 +
 .../services/org.apache.lucene.codecs.Codec     |    1 +
 .../lucene/codecs/lucene50/Lucene50RWCodec.java |    7 +
 .../lucene50/Lucene50RWSegmentInfoFormat.java   |  136 ++
 .../index/TestBackwardsCompatibility.java       |    9 +-
 .../org/apache/lucene/index/index.6.0.0-cfs.zip |  Bin 0 -> 13744 bytes
 .../apache/lucene/index/index.6.0.0-nocfs.zip   |  Bin 0 -> 13749 bytes
 .../org/apache/lucene/index/index.6.0.1-cfs.zip |  Bin 0 -> 13734 bytes
 .../apache/lucene/index/index.6.0.1-nocfs.zip   |  Bin 0 -> 13735 bytes
 .../lucene/index/unsupported.5.5.1-cfs.zip      |  Bin 0 -> 15553 bytes
 .../lucene/index/unsupported.5.5.1-nocfs.zip    |  Bin 0 -> 13729 bytes
 .../benchmark/byTask/tasks/AddIndexesTask.java  |    3 -
 .../byTask/tasks/CloseTaxonomyReaderTask.java   |   10 +-
 .../benchmark/byTask/tasks/CreateIndexTask.java |    4 +-
 .../byTask/tasks/NearRealtimeReaderTask.java    |    1 -
 .../benchmark/byTask/tasks/OpenReaderTask.java  |    1 -
 .../lucene/benchmark/byTask/tasks/ReadTask.java |    1 -
 .../byTask/tasks/ReopenReaderTask.java          |    1 -
 .../byTask/tasks/RollbackIndexTask.java         |    2 -
 .../byTask/tasks/WriteEnwikiLineDocTask.java    |    1 -
 .../benchmark/quality/utils/SimpleQQParser.java |    1 -
 .../tasks/WriteEnwikiLineDocTaskTest.java       |    4 -
 lucene/build.xml                                |    2 +-
 lucene/classification/build.xml                 |    6 +-
 .../lucene/classification/Classifier.java       |    4 -
 .../SimpleNaiveBayesClassifier.java             |   28 +-
 .../SimpleNaiveBayesDocumentClassifier.java     |   24 -
 .../utils/ConfusionMatrixGenerator.java         |   84 +-
 .../classification/utils/DatasetSplitter.java   |  116 +-
 .../BooleanPerceptronClassifierTest.java        |    2 +-
 .../CachingNaiveBayesClassifierTest.java        |    2 +-
 .../KNearestNeighborClassifierTest.java         |    2 +-
 .../SimpleNaiveBayesClassifierTest.java         |    3 +-
 .../utils/ConfusionMatrixGeneratorTest.java     |   30 +-
 .../classification/utils/DataSplitterTest.java  |   37 +-
 .../utils/DocToDoubleVectorUtilsTest.java       |    2 -
 .../codecs/blockterms/BlockTermsReader.java     |    1 -
 .../blocktreeords/OrdsIntersectTermsEnum.java   |    2 -
 .../blocktreeords/OrdsSegmentTermsEnum.java     |    2 -
 .../lucene/codecs/memory/FSTOrdTermsReader.java |    1 -
 .../codecs/simpletext/SimpleTextBKDReader.java  |    2 +
 .../simpletext/SimpleTextDocValuesFormat.java   |    2 +-
 .../simpletext/SimpleTextFieldsReader.java      |    1 -
 .../simpletext/SimpleTextFieldsWriter.java      |    2 +
 .../simpletext/SimpleTextLiveDocsFormat.java    |    2 -
 .../simpletext/SimpleTextPostingsFormat.java    |    2 +-
 .../simpletext/SimpleTextSegmentInfoFormat.java |  174 +-
 .../SimpleTextStoredFieldsWriter.java           |    1 -
 .../simpletext/SimpleTextTermVectorsReader.java |    1 -
 .../org.apache.lucene.codecs.DocValuesFormat    |    1 -
 .../org.apache.lucene.codecs.PostingsFormat     |    1 -
 .../TestSimpleTextCompoundFormat.java           |   10 +
 lucene/common-build.xml                         |   90 +-
 .../java/org/apache/lucene/analysis/Token.java  |    1 -
 .../java/org/apache/lucene/codecs/Codec.java    |    2 +-
 .../org/apache/lucene/codecs/CodecUtil.java     |   55 +-
 .../apache/lucene/codecs/CompoundFormat.java    |    4 +-
 .../apache/lucene/codecs/DocValuesConsumer.java |  514 ++---
 .../org/apache/lucene/codecs/NormsConsumer.java |   73 +-
 .../org/apache/lucene/codecs/PointsWriter.java  |    3 +-
 .../lucene/codecs/StoredFieldsWriter.java       |   61 +-
 .../apache/lucene/codecs/TermVectorsWriter.java |   78 +-
 .../CompressingStoredFieldsWriter.java          |    6 +
 .../CompressingTermVectorsWriter.java           |    5 +
 .../codecs/lucene50/Lucene50CompoundFormat.java |   26 +-
 .../codecs/lucene50/Lucene50CompoundReader.java |    5 +-
 .../codecs/lucene50/Lucene50PostingsFormat.java |    1 -
 .../lucene50/Lucene50SegmentInfoFormat.java     |  166 --
 .../lucene/codecs/lucene54/package-info.java    |    4 +-
 .../lucene/codecs/lucene60/Lucene60Codec.java   |  176 --
 .../codecs/lucene60/Lucene60PointsReader.java   |    5 +-
 .../codecs/lucene60/Lucene60PointsWriter.java   |   11 +-
 .../lucene/codecs/lucene60/package-info.java    |  397 +---
 .../lucene/codecs/lucene62/Lucene62Codec.java   |  176 ++
 .../lucene62/Lucene62SegmentInfoFormat.java     |  318 +++
 .../lucene/codecs/lucene62/package-info.java    |   24 +
 .../org/apache/lucene/document/BinaryPoint.java |    3 +-
 .../org/apache/lucene/document/DoublePoint.java |    3 +-
 .../org/apache/lucene/document/FloatPoint.java  |    3 +-
 .../org/apache/lucene/document/IntPoint.java    |    3 +-
 .../org/apache/lucene/document/LongPoint.java   |    3 +-
 .../org/apache/lucene/document/StringField.java |    4 +-
 .../org/apache/lucene/geo/GeoEncodingUtils.java |  147 ++
 .../src/java/org/apache/lucene/geo/Polygon.java |  196 --
 .../java/org/apache/lucene/geo/Polygon2D.java   |  477 +++++
 .../java/org/apache/lucene/geo/Rectangle.java   |    2 +-
 .../apache/lucene/index/BufferedUpdates.java    |    7 +-
 .../lucene/index/BufferedUpdatesStream.java     |   30 +-
 .../org/apache/lucene/index/CheckIndex.java     |   99 +
 .../apache/lucene/index/CoalescedUpdates.java   |   14 +-
 .../org/apache/lucene/index/DocIDMerger.java    |  179 ++
 .../java/org/apache/lucene/index/DocValues.java |    2 +-
 .../apache/lucene/index/DocValuesUpdate.java    |    2 +-
 .../apache/lucene/index/DocumentsWriter.java    |   97 +-
 .../index/DocumentsWriterDeleteQueue.java       |  126 +-
 .../index/DocumentsWriterFlushControl.java      |   24 +-
 .../lucene/index/DocumentsWriterPerThread.java  |   46 +-
 .../index/DocumentsWriterPerThreadPool.java     |   21 +-
 .../apache/lucene/index/FilterCodecReader.java  |    6 +
 .../apache/lucene/index/FilterLeafReader.java   |    7 +
 .../org/apache/lucene/index/IndexWriter.java    |  376 +++-
 .../apache/lucene/index/IndexWriterConfig.java  |   26 +-
 .../org/apache/lucene/index/LeafReader.java     |    4 +
 .../lucene/index/LiveIndexWriterConfig.java     |   13 +
 .../lucene/index/MappingMultiPostingsEnum.java  |  124 +-
 .../org/apache/lucene/index/MergePolicy.java    |   63 +-
 .../apache/lucene/index/MergeReaderWrapper.java |  266 +++
 .../org/apache/lucene/index/MergeState.java     |  234 ++-
 .../org/apache/lucene/index/MultiDocValues.java |    2 +-
 .../apache/lucene/index/MultiPostingsEnum.java  |    8 +-
 .../org/apache/lucene/index/MultiSorter.java    |  353 ++++
 .../apache/lucene/index/ParallelLeafReader.java |   19 +
 .../org/apache/lucene/index/PointValues.java    |   38 +-
 .../org/apache/lucene/index/SegmentInfo.java    |   21 +-
 .../org/apache/lucene/index/SegmentMerger.java  |    5 +
 .../org/apache/lucene/index/SegmentReader.java  |   25 +-
 .../lucene/index/SlowCodecReaderWrapper.java    |   11 +
 .../java/org/apache/lucene/index/Sorter.java    |  288 +++
 .../apache/lucene/index/SortingLeafReader.java  |  914 +++++++++
 .../lucene/index/StandardDirectoryReader.java   |   56 +-
 .../index/TermVectorsConsumerPerField.java      |    1 -
 .../apache/lucene/index/TermsHashPerField.java  |    1 -
 .../lucene/index/TrackingIndexWriter.java       |  168 --
 .../org/apache/lucene/index/TwoPhaseCommit.java |    5 +-
 .../apache/lucene/search/BlendedTermQuery.java  |   22 +-
 .../org/apache/lucene/search/BooleanQuery.java  |   19 +-
 .../org/apache/lucene/search/BooleanScorer.java |    6 +-
 .../org/apache/lucene/search/BoostQuery.java    |   17 +-
 .../apache/lucene/search/ConjunctionDISI.java   |  188 +-
 .../apache/lucene/search/ConjunctionScorer.java |    4 +-
 .../lucene/search/ConstantScoreQuery.java       |   15 +-
 .../search/ControlledRealTimeReopenThread.java  |   17 +-
 .../lucene/search/DisjunctionMaxQuery.java      |   18 +-
 .../apache/lucene/search/DocValuesDocIdSet.java |  157 --
 .../lucene/search/DocValuesRewriteMethod.java   |   24 +-
 .../EarlyTerminatingSortingCollector.java       |  129 ++
 .../apache/lucene/search/ExactPhraseScorer.java |    3 +-
 .../apache/lucene/search/FieldValueQuery.java   |   11 +-
 .../lucene/search/FilterLeafCollector.java      |    7 +-
 .../apache/lucene/search/FuzzyTermsEnum.java    |    1 -
 .../org/apache/lucene/search/IndexSearcher.java |    1 +
 .../org/apache/lucene/search/LRUQueryCache.java |  303 ++-
 .../apache/lucene/search/MatchAllDocsQuery.java |   10 +
 .../apache/lucene/search/MatchNoDocsQuery.java  |   29 +-
 .../apache/lucene/search/MultiPhraseQuery.java  |   20 +-
 .../apache/lucene/search/MultiTermQuery.java    |   27 +-
 .../MultiTermQueryConstantScoreWrapper.java     |   13 +-
 .../java/org/apache/lucene/search/Multiset.java |    2 -
 .../apache/lucene/search/NGramPhraseQuery.java  |   16 +-
 .../org/apache/lucene/search/PhraseQuery.java   |   19 +-
 .../apache/lucene/search/PointInSetQuery.java   |   91 +-
 .../apache/lucene/search/PointRangeQuery.java   |   68 +-
 .../java/org/apache/lucene/search/Query.java    |   49 +-
 .../lucene/search/QueryCachingPolicy.java       |   69 +-
 .../org/apache/lucene/search/RegexpQuery.java   |    1 -
 .../lucene/search/SloppyPhraseScorer.java       |    3 +-
 .../src/java/org/apache/lucene/search/Sort.java |    3 +
 .../org/apache/lucene/search/SortField.java     |    3 -
 .../org/apache/lucene/search/SynonymQuery.java  |   15 +-
 .../org/apache/lucene/search/TermQuery.java     |    9 +-
 .../apache/lucene/search/TwoPhaseIterator.java  |   79 +-
 .../search/UsageTrackingQueryCachingPolicy.java |   29 +-
 .../search/spans/FieldMaskingSpanQuery.java     |   24 +-
 .../lucene/search/spans/SpanBoostQuery.java     |   18 +-
 .../lucene/search/spans/SpanContainQuery.java   |   16 +-
 .../search/spans/SpanMultiTermQueryWrapper.java |   14 +-
 .../lucene/search/spans/SpanNearQuery.java      |   42 +-
 .../lucene/search/spans/SpanNotQuery.java       |   21 +-
 .../apache/lucene/search/spans/SpanOrQuery.java |   13 +-
 .../search/spans/SpanPositionCheckQuery.java    |   13 +-
 .../lucene/search/spans/SpanTermQuery.java      |   14 +-
 .../lucene/store/ByteArrayIndexInput.java       |    2 -
 .../org/apache/lucene/store/IndexInput.java     |    5 +
 .../org/apache/lucene/store/NIOFSDirectory.java |    2 +-
 .../lucene/store/NRTCachingDirectory.java       |    5 +-
 .../lucene/store/NativeFSLockFactory.java       |    4 +-
 .../apache/lucene/store/SimpleFSDirectory.java  |    2 +-
 .../lucene/store/SimpleFSLockFactory.java       |    4 +-
 .../java/org/apache/lucene/util/ArrayUtil.java  |  339 +---
 .../org/apache/lucene/util/BitDocIdSet.java     |    3 +
 .../org/apache/lucene/util/BitSetIterator.java  |    3 +
 .../java/org/apache/lucene/util/BitUtil.java    |    4 +-
 .../apache/lucene/util/BytesRefComparator.java  |   55 +
 .../org/apache/lucene/util/BytesRefHash.java    |   37 +-
 .../org/apache/lucene/util/CharsRefBuilder.java |    1 -
 .../org/apache/lucene/util/DocIdSetBuilder.java |  327 +++-
 .../lucene/util/FixedLengthBytesRefArray.java   |   29 +
 .../apache/lucene/util/InPlaceMergeSorter.java  |    2 +-
 .../org/apache/lucene/util/IntroSorter.java     |    2 +-
 .../org/apache/lucene/util/LSBRadixSorter.java  |   36 +-
 .../org/apache/lucene/util/MSBRadixSorter.java  |  219 +++
 .../java/org/apache/lucene/util/SloppyMath.java |    8 +-
 .../src/java/org/apache/lucene/util/Sorter.java |    2 +-
 .../lucene/util/StringMSBRadixSorter.java       |   76 +
 .../java/org/apache/lucene/util/Version.java    |   20 +-
 .../automaton/DaciukMihovAutomatonBuilder.java  |    1 -
 .../org/apache/lucene/util/bkd/BKDReader.java   |   47 +-
 .../org/apache/lucene/util/bkd/BKDWriter.java   |  129 +-
 .../apache/lucene/util/bkd/HeapPointWriter.java |   21 +-
 .../org/apache/lucene/util/fst/Builder.java     |    9 +-
 .../lucene/util/mutable/MutableValueStr.java    |    1 -
 .../util/packed/MonotonicBlockPackedWriter.java |    1 -
 .../lucene/util/packed/MonotonicLongValues.java |    1 -
 .../services/org.apache.lucene.codecs.Codec     |    2 +-
 .../org/apache/lucene/codecs/TestCodecUtil.java |  306 +++
 .../lucene50/TestLucene50SegmentInfoFormat.java |   39 -
 ...cene50StoredFieldsFormatHighCompression.java |    8 +-
 .../lucene53/TestLucene53NormsFormat.java       |    4 +-
 .../lucene54/TestLucene54DocValuesFormat.java   |    2 -
 .../lucene62/TestLucene62SegmentInfoFormat.java |   39 +
 .../perfield/TestPerFieldDocValuesFormat.java   |    2 +-
 .../perfield/TestPerFieldPostingsFormat2.java   |   12 +-
 .../apache/lucene/document/TestFieldType.java   |    2 -
 .../apache/lucene/geo/TestGeoEncodingUtils.java |  151 ++
 .../org/apache/lucene/geo/TestGeoUtils.java     |   83 +-
 .../test/org/apache/lucene/geo/TestPolygon.java |  186 --
 .../org/apache/lucene/geo/TestPolygon2D.java    |  289 +++
 .../org/apache/lucene/index/Test2BPoints.java   |   10 +-
 .../org/apache/lucene/index/Test2BTerms.java    |    2 +-
 .../lucene/index/Test4GBStoredFields.java       |   24 +-
 .../org/apache/lucene/index/TestAddIndexes.java |   55 +-
 .../index/TestBinaryDocValuesUpdates.java       |    2 -
 .../org/apache/lucene/index/TestCodecUtil.java  |  305 ---
 .../org/apache/lucene/index/TestCodecs.java     |    9 +-
 .../index/TestDemoParallelLeafReader.java       |   38 +-
 .../lucene/index/TestDirectoryReader.java       |    1 -
 .../lucene/index/TestDirectoryReaderReopen.java |  228 +++
 .../test/org/apache/lucene/index/TestDoc.java   |    2 +-
 .../apache/lucene/index/TestDocIDMerger.java    |  203 ++
 .../lucene/index/TestDocsAndPositions.java      |    1 -
 .../index/TestDocumentsWriterDeleteQueue.java   |    6 +-
 .../apache/lucene/index/TestFieldsReader.java   |    1 -
 .../lucene/index/TestIndexFileDeleter.java      |    4 -
 .../org/apache/lucene/index/TestIndexInput.java |    4 -
 .../apache/lucene/index/TestIndexSorting.java   | 1370 +++++++++++++
 .../apache/lucene/index/TestIndexWriter.java    |    2 +-
 .../lucene/index/TestIndexWriterCommit.java     |    1 -
 .../lucene/index/TestIndexWriterConfig.java     |    2 -
 .../lucene/index/TestIndexWriterDelete.java     |    4 +-
 .../lucene/index/TestIndexWriterForceMerge.java |    4 -
 .../lucene/index/TestIndexWriterFromReader.java |    1 -
 .../index/TestIndexWriterLockRelease.java       |    2 -
 .../lucene/index/TestIndexWriterOnDiskFull.java |    2 -
 .../index/TestIndexingSequenceNumbers.java      |  638 ++++++
 .../lucene/index/TestMergeRateLimiter.java      |    2 -
 .../lucene/index/TestMixedDocValuesUpdates.java |    1 -
 .../apache/lucene/index/TestMultiTermsEnum.java |    1 -
 .../apache/lucene/index/TestNeverDelete.java    |    2 -
 .../apache/lucene/index/TestNoMergePolicy.java  |    1 -
 .../index/TestNumericDocValuesUpdates.java      |  114 +-
 .../apache/lucene/index/TestOmitPositions.java  |    1 -
 .../org/apache/lucene/index/TestOmitTf.java     |    2 -
 .../index/TestParallelCompositeReader.java      |    2 -
 .../lucene/index/TestParallelLeafReader.java    |   59 +-
 .../lucene/index/TestParallelTermEnum.java      |    1 -
 .../org/apache/lucene/index/TestPayloads.java   |    1 -
 .../lucene/index/TestPerSegmentDeletes.java     |   11 +-
 .../TestPersistentSnapshotDeletionPolicy.java   |    1 -
 .../apache/lucene/index/TestPointValues.java    |   58 +-
 .../apache/lucene/index/TestReaderClosed.java   |    1 -
 .../apache/lucene/index/TestRollingUpdates.java |    2 +-
 .../apache/lucene/index/TestSegmentInfos.java   |    7 +-
 .../apache/lucene/index/TestSegmentMerger.java  |   24 +-
 .../index/TestSnapshotDeletionPolicy.java       |    2 -
 .../org/apache/lucene/index/TestTryDelete.java  |   17 +-
 .../lucene/index/TestTwoPhaseCommitTool.java    |   14 +-
 .../apache/lucene/search/JustCompileSearch.java |   33 +-
 .../org/apache/lucene/search/TestBoolean2.java  |  130 +-
 .../apache/lucene/search/TestBooleanScorer.java |   12 +-
 .../lucene/search/TestConjunctionDISI.java      |   12 +-
 .../lucene/search/TestConstantScoreQuery.java   |   11 +-
 .../TestControlledRealTimeReopenThread.java     |   45 +-
 .../TestEarlyTerminatingSortingCollector.java   |  254 +++
 .../apache/lucene/search/TestIndexSearcher.java |    3 +-
 .../apache/lucene/search/TestLRUQueryCache.java |   94 +-
 .../lucene/search/TestMatchNoDocsQuery.java     |    1 -
 .../apache/lucene/search/TestNeedsScores.java   |   25 +-
 .../apache/lucene/search/TestPhraseQuery.java   |    1 -
 .../apache/lucene/search/TestPointQueries.java  |   27 +-
 .../lucene/search/TestQueryCachingPolicy.java   |   56 -
 .../apache/lucene/search/TestQueryRescorer.java |   31 +-
 .../apache/lucene/search/TestRegexpRandom2.java |    1 -
 .../lucene/search/TestReqExclBulkScorer.java    |    6 +-
 .../apache/lucene/search/TestScorerPerf.java    |   12 +-
 .../lucene/search/TestSimilarityProvider.java   |    1 -
 .../lucene/search/TestSimpleExplanations.java   |   27 +-
 .../TestSimpleExplanationsWithFillerDocs.java   |  126 ++
 .../apache/lucene/search/TestSortRandom.java    |   16 +-
 .../TestUsageTrackingFilterCachingPolicy.java   |   17 +-
 .../search/spans/JustCompileSearchSpans.java    |   14 +-
 .../search/spans/TestNearSpansOrdered.java      |   24 +-
 .../lucene/search/spans/TestSpanCollection.java |   11 +-
 .../lucene/store/TestBufferedIndexInput.java    |    1 -
 .../org/apache/lucene/store/TestDirectory.java  |    1 -
 .../lucene/store/TestFileSwitchDirectory.java   |    1 -
 .../apache/lucene/store/TestRateLimiter.java    |    3 +-
 .../lucene/store/TestSimpleFSLockFactory.java   |    1 -
 .../apache/lucene/util/Test2BPagedBytes.java    |    1 -
 .../org/apache/lucene/util/TestArrayUtil.java   |   64 +-
 .../apache/lucene/util/TestDocIdSetBuilder.java |  198 +-
 .../org/apache/lucene/util/TestIOUtils.java     |    1 -
 .../apache/lucene/util/TestLSBRadixSorter.java  |   29 +-
 .../apache/lucene/util/TestMSBRadixSorter.java  |  117 ++
 .../util/TestRecyclingByteBlockAllocator.java   |    1 -
 .../util/TestRecyclingIntBlockAllocator.java    |    1 -
 .../org/apache/lucene/util/TestSloppyMath.java  |   66 +-
 .../lucene/util/TestStringMSBRadixSorter.java   |   97 +
 .../automaton/FiniteStringsIteratorTest.java    |    1 -
 .../LimitedFiniteStringsIteratorTest.java       |    1 -
 .../org/apache/lucene/util/bkd/TestBKD.java     |   23 +-
 lucene/default-nested-ivy-settings.xml          |   60 +
 lucene/demo/src/java/overview.html              |    2 +-
 .../test/org/apache/lucene/demo/TestDemo.java   |    2 -
 .../TestExpressionAggregationFacetsExample.java |    3 -
 .../demo/facet/TestRangeFacetsExample.java      |    2 -
 .../facet/TestSimpleSortedSetFacetsExample.java |    1 -
 .../lucene/expressions/js/JavascriptLexer.java  |    3 -
 .../lucene/expressions/js/JavascriptParser.java |    3 -
 .../org/apache/lucene/facet/DrillDownQuery.java |   21 +-
 .../apache/lucene/facet/DrillSidewaysQuery.java |   31 +-
 .../apache/lucene/facet/range/DoubleRange.java  |   19 +-
 .../apache/lucene/facet/range/LongRange.java    |   19 +-
 .../DefaultSortedSetDocValuesReaderState.java   |    1 -
 .../directory/DirectoryTaxonomyWriter.java      |   30 +-
 .../apache/lucene/facet/TestDrillSideways.java  |   25 +-
 .../facet/range/TestRangeFacetCounts.java       |   24 +-
 .../lucene/facet/taxonomy/TestFacetLabel.java   |    2 -
 .../taxonomy/directory/TestAddTaxonomy.java     |   14 -
 .../grouping/AbstractGroupFacetCollector.java   |    1 -
 .../search/highlight/GradientFormatter.java     |    2 +-
 .../search/highlight/TermVectorLeafReader.java  |    7 +-
 .../highlight/WeightedSpanTermExtractor.java    |   50 +-
 .../lucene/search/highlight/package-info.java   |    4 +-
 .../search/highlight/HighlighterTest.java       |   64 +-
 .../highlight/OffsetLimitTokenFilterTest.java   |    1 -
 .../custom/HighlightCustomQueryTest.java        |   25 +-
 .../search/vectorhighlight/FieldQueryTest.java  |  102 +-
 .../vectorhighlight/IndexTimeSynonymTest.java   |    4 -
 lucene/ivy-settings.xml                         |   63 -
 lucene/ivy-versions.properties                  |    6 +-
 .../lucene/search/join/GlobalOrdinalsQuery.java |   23 +-
 .../join/GlobalOrdinalsWithScoreQuery.java      |   29 +-
 .../join/PointInSetIncludingScoreQuery.java     |   23 +-
 .../search/join/TermsIncludingScoreQuery.java   |   27 +-
 .../search/join/ToChildBlockJoinQuery.java      |   23 +-
 .../search/join/ToParentBlockJoinCollector.java |    4 +-
 .../search/join/ToParentBlockJoinQuery.java     |   51 +-
 .../lucene/search/join/TestBlockJoin.java       |  163 +-
 .../apache/lucene/search/join/TestJoinUtil.java |   31 +-
 lucene/licenses/asm-5.0.4.jar.sha1              |    1 -
 lucene/licenses/asm-5.1.jar.sha1                |    1 +
 lucene/licenses/asm-commons-5.0.4.jar.sha1      |    1 -
 lucene/licenses/asm-commons-5.1.jar.sha1        |    1 +
 .../apache/lucene/index/memory/MemoryIndex.java |    8 +-
 .../lucene/index/memory/TestMemoryIndex.java    |    6 -
 .../memory/TestMemoryIndexAgainstRAMDir.java    |    1 -
 .../org/apache/lucene/index/IndexSplitter.java  |    2 +-
 .../apache/lucene/index/MergeReaderWrapper.java |  259 ---
 .../lucene/index/MultiPassIndexSplitter.java    |    1 -
 .../index/SlowCompositeReaderWrapper.java       |  275 ---
 .../java/org/apache/lucene/index/Sorter.java    |  287 ---
 .../apache/lucene/index/SortingLeafReader.java  |  940 ---------
 .../apache/lucene/index/SortingMergePolicy.java |  264 ---
 .../java/org/apache/lucene/index/package.html   |   18 -
 .../org/apache/lucene/misc/IndexMergeTool.java  |    4 +-
 .../search/BlockJoinComparatorSource.java       |  224 ---
 .../EarlyTerminatingSortingCollector.java       |  146 --
 .../store/HardlinkCopyDirectoryWrapper.java     |   95 +
 .../apache/lucene/uninverting/DocTermOrds.java  |  886 ---------
 .../apache/lucene/uninverting/FieldCache.java   |  466 -----
 .../lucene/uninverting/FieldCacheImpl.java      | 1085 -----------
 .../uninverting/FieldCacheSanityChecker.java    |  425 ----
 .../lucene/uninverting/UninvertingReader.java   |  391 ----
 .../apache/lucene/uninverting/package-info.java |   21 -
 .../apache/lucene/index/IndexSortingTest.java   |   89 -
 .../org/apache/lucene/index/SorterTestBase.java |  405 ----
 .../lucene/index/SortingLeafReaderTest.java     |   73 -
 .../lucene/index/TestBlockJoinSorter.java       |  128 --
 .../index/TestMultiPassIndexSplitter.java       |    1 -
 .../index/TestSlowCompositeReaderWrapper.java   |   91 -
 .../lucene/index/TestSortingMergePolicy.java    |  201 --
 .../search/TestDiversifiedTopDocsCollector.java |    6 +-
 .../TestEarlyTerminatingSortingCollector.java   |  305 ---
 .../store/TestHardLinkCopyDirectoryWrapper.java |   89 +
 .../lucene/uninverting/TestDocTermOrds.java     |  681 -------
 .../lucene/uninverting/TestFieldCache.java      |  731 -------
 .../uninverting/TestFieldCacheReopen.java       |   70 -
 .../TestFieldCacheSanityChecker.java            |  164 --
 .../lucene/uninverting/TestFieldCacheSort.java  | 1814 ------------------
 .../uninverting/TestFieldCacheSortRandom.java   |  315 ---
 .../uninverting/TestFieldCacheVsDocValues.java  |  592 ------
 .../uninverting/TestFieldCacheWithThreads.java  |  227 ---
 .../uninverting/TestLegacyFieldCache.java       |  498 -----
 .../lucene/uninverting/TestNumericTerms32.java  |  156 --
 .../lucene/uninverting/TestNumericTerms64.java  |  166 --
 .../uninverting/TestUninvertingReader.java      |  395 ----
 .../apache/lucene/util/fst/TestFSTsMisc.java    |    1 -
 .../apache/lucene/queries/BoostingQuery.java    |   27 +-
 .../apache/lucene/queries/CommonTermsQuery.java |   48 +-
 .../apache/lucene/queries/CustomScoreQuery.java |   28 +-
 .../org/apache/lucene/queries/TermsQuery.java   |   36 +-
 .../lucene/queries/function/BoostedQuery.java   |   16 +-
 .../lucene/queries/function/FunctionQuery.java  |   29 +-
 .../queries/function/FunctionRangeQuery.java    |   23 +-
 .../function/valuesource/DoubleFieldSource.java |    1 -
 .../SumTotalTermFreqValueSource.java            |    1 -
 .../lucene/queries/mlt/MoreLikeThisQuery.java   |   55 +-
 .../queries/payloads/PayloadScoreQuery.java     |   29 +-
 .../queries/payloads/SpanPayloadCheckQuery.java |   13 +-
 .../apache/lucene/queries/TermsQueryTest.java   |   18 +-
 .../queries/TestCustomScoreExplanations.java    |   45 +
 .../lucene/queries/mlt/TestMoreLikeThis.java    |    5 +-
 lucene/queryparser/build.xml                    |    2 +-
 .../lucene/queryparser/classic/QueryParser.java |    3 +-
 .../lucene/queryparser/classic/QueryParser.jj   |    2 +-
 .../classic/QueryParserTokenManager.java        |   10 -
 .../complexPhrase/ComplexPhraseQueryParser.java |   50 +-
 .../queryparser/ext/ExtendableQueryParser.java  |    1 -
 .../flexible/core/nodes/QueryNodeImpl.java      |    2 +-
 .../flexible/standard/StandardQueryParser.java  |    2 +-
 .../builders/DummyQueryNodeBuilder.java         |    1 -
 .../StandardSyntaxParserTokenManager.java       |   22 -
 .../MultiFieldQueryNodeProcessor.java           |    1 -
 .../StandardQueryNodeProcessorPipeline.java     |    3 -
 .../surround/parser/QueryParser.java            |    2 -
 .../parser/QueryParserTokenManager.java         |   13 -
 .../surround/query/RewriteQuery.java            |   33 +-
 .../lucene/queryparser/xml/CoreParser.java      |   33 +-
 .../xml/builders/BooleanQueryBuilder.java       |    3 +-
 .../builders/DisjunctionMaxQueryBuilder.java    |    3 +-
 .../xml/builders/FuzzyLikeThisQueryBuilder.java |    3 +-
 .../LegacyNumericRangeQueryBuilder.java         |   36 +-
 .../xml/builders/PointRangeQueryBuilder.java    |   28 +-
 .../queryparser/classic/TestMultiAnalyzer.java  |   51 +-
 .../classic/TestMultiPhraseQueryParsing.java    |    1 -
 .../precedence/TestPrecedenceQueryParser.java   |    1 -
 .../standard/TestMultiAnalyzerQPHelper.java     |    3 -
 .../flexible/standard/TestStandardQP.java       |    2 -
 .../simple/TestSimpleQueryParser.java           |    1 -
 .../xml/CoreParserTestIndexData.java            |   74 +
 .../LegacyNumericRangeQueryWithoutLowerTerm.xml |   31 +
 .../xml/LegacyNumericRangeQueryWithoutRange.xml |   31 +
 .../LegacyNumericRangeQueryWithoutUpperTerm.xml |   31 +
 .../xml/PointRangeQueryWithoutLowerTerm.xml     |   31 +
 .../xml/PointRangeQueryWithoutRange.xml         |   31 +
 .../xml/PointRangeQueryWithoutUpperTerm.xml     |   31 +
 .../lucene/queryparser/xml/TermQueryEmpty.xml   |   18 +
 .../lucene/queryparser/xml/TestCoreParser.java  |  159 +-
 .../xml/TestCorePlusExtensionsParser.java       |   18 +-
 .../xml/TestCorePlusQueriesParser.java          |   18 +-
 .../xml/TestQueryTemplateManager.java           |    1 -
 .../replicator/http/ReplicationService.java     |    3 +-
 .../lucene/replicator/nrt/CopyOneFile.java      |    2 -
 .../apache/lucene/replicator/nrt/CopyState.java |    1 -
 .../org/apache/lucene/replicator/nrt/Node.java  |   10 -
 .../replicator/nrt/ReplicaFileDeleter.java      |    2 -
 .../nrt/SegmentInfosSearcherManager.java        |    1 -
 .../IndexAndTaxonomyRevisionTest.java           |    1 -
 .../lucene/replicator/IndexRevisionTest.java    |    1 -
 .../lucene/replicator/LocalReplicatorTest.java  |    1 -
 .../lucene/replicator/ReplicatorTestCase.java   |    2 -
 .../lucene/replicator/nrt/Connection.java       |    2 -
 .../org/apache/lucene/replicator/nrt/Jobs.java  |    2 -
 .../lucene/replicator/nrt/SimpleCopyJob.java    |   35 -
 .../lucene/replicator/nrt/SimpleTransLog.java   |    3 -
 .../replicator/nrt/TestNRTReplication.java      |    1 -
 .../nrt/TestStressNRTReplication.java           |    1 -
 lucene/sandbox/build.xml                        |   35 -
 .../idversion/IDVersionPostingsReader.java      |    1 -
 .../idversion/IDVersionSegmentTermsEnum.java    |    1 -
 .../apache/lucene/document/HalfFloatPoint.java  |  425 ++++
 .../lucene/document/InetAddressPoint.java       |   59 +-
 .../lucene/document/LatLonDocValuesField.java   |  135 ++
 .../org/apache/lucene/document/LatLonGrid.java  |  155 --
 .../org/apache/lucene/document/LatLonPoint.java |  267 ++-
 .../document/LatLonPointDistanceComparator.java |   27 +-
 .../document/LatLonPointDistanceQuery.java      |  196 +-
 .../document/LatLonPointInPolygonQuery.java     |  135 +-
 .../apache/lucene/document/NearestNeighbor.java |  308 +++
 .../sandbox/queries/FuzzyLikeThisQuery.java     |   45 +-
 .../sandbox/queries/SlowFuzzyTermsEnum.java     |    1 -
 .../lucene/search/DocValuesNumbersQuery.java    |   20 +-
 .../lucene/search/DocValuesRangeQuery.java      |   24 +-
 .../lucene/search/DocValuesTermsQuery.java      |   19 +-
 .../lucene/search/TermAutomatonQuery.java       |   40 +-
 .../search/TokenStreamToTermAutomatonQuery.java |    2 -
 .../lucene/document/TestHalfFloatPoint.java     |  243 +++
 .../lucene/document/TestInetAddressPoint.java   |   54 +
 .../document/TestLatLonDocValuesField.java      |   30 +
 .../apache/lucene/document/TestLatLonGrid.java  |   50 -
 .../apache/lucene/document/TestLatLonPoint.java |  184 +-
 .../document/TestLatLonPointDistanceSort.java   |   33 +-
 .../org/apache/lucene/document/TestNearest.java |  253 +++
 .../lucene/search/TestLatLonPointQueries.java   |    7 +-
 .../lucene/search/TestTermAutomatonQuery.java   |   18 +-
 lucene/site/changes/changes2html.pl             |    4 +-
 lucene/site/xsl/index.xsl                       |   14 +-
 .../spatial/composite/CompositeVerifyQuery.java |   21 +-
 .../composite/IntersectsRPTVerifyQuery.java     |   28 +-
 .../spatial/prefix/AbstractPrefixTreeQuery.java |   30 +-
 .../spatial/prefix/HeatmapFacetCounter.java     |   34 +-
 .../prefix/IntersectsPrefixTreeQuery.java       |   15 +-
 .../prefix/tree/DateRangePrefixTree.java        |  229 ++-
 .../serialized/SerializedDVStrategy.java        |   14 +-
 .../spatial/prefix/DateNRStrategyTest.java      |    4 +-
 .../spatial/prefix/HeatmapFacetCounterTest.java |   27 +-
 .../prefix/tree/DateRangePrefixTreeTest.java    |   48 +-
 .../lucene/spatial/spatial4j/Geo3dRptTest.java  |   10 +-
 .../Geo3dShapeRectRelationTestCase.java         |    6 +-
 .../Geo3dShapeSphereModelRectRelationTest.java  |    6 +-
 .../geopoint/document/GeoPointField.java        |  224 ++-
 .../geopoint/document/GeoPointTokenStream.java  |   21 +-
 .../geopoint/search/GeoPointDistanceQuery.java  |   27 +-
 .../search/GeoPointDistanceQueryImpl.java       |    5 +-
 .../geopoint/search/GeoPointInBBoxQuery.java    |   54 +-
 .../search/GeoPointInBBoxQueryImpl.java         |    5 +-
 .../geopoint/search/GeoPointInPolygonQuery.java |   42 +-
 .../search/GeoPointInPolygonQueryImpl.java      |   21 +-
 .../geopoint/search/GeoPointMultiTermQuery.java |    7 +-
 .../search/GeoPointNumericTermsEnum.java        |  161 --
 .../search/GeoPointPrefixTermsEnum.java         |  239 ---
 .../GeoPointTermQueryConstantScoreWrapper.java  |   28 +-
 .../geopoint/search/GeoPointTermsEnum.java      |  227 ++-
 .../lucene/spatial/util/GeoEncodingUtils.java   |  152 --
 .../lucene/spatial/util/MortonEncoder.java      |  103 +
 .../geopoint/search/TestGeoPointQuery.java      |   39 +-
 .../search/TestLegacyGeoPointQuery.java         |   81 -
 .../spatial/util/BaseGeoPointTestCase.java      | 1512 ---------------
 .../spatial/util/TestGeoEncodingUtils.java      |  101 -
 .../lucene/spatial/util/TestGeoPointField.java  |   51 +
 .../lucene/spatial/util/TestMortonEncoder.java  |  108 ++
 .../lucene/spatial3d/Geo3DDocValuesField.java   |  426 ++++
 .../org/apache/lucene/spatial3d/Geo3DPoint.java |  121 +-
 .../spatial3d/Geo3DPointDistanceComparator.java |  166 ++
 .../Geo3DPointOutsideDistanceComparator.java    |  137 ++
 .../spatial3d/Geo3DPointOutsideSortField.java   |   96 +
 .../lucene/spatial3d/Geo3DPointSortField.java   |   96 +
 .../org/apache/lucene/spatial3d/Geo3DUtil.java  |  278 ++-
 .../spatial3d/PointInGeo3DShapeQuery.java       |  101 +-
 .../spatial3d/PointInShapeIntersectVisitor.java |  118 ++
 .../lucene/spatial3d/geom/ArcDistance.java      |   15 +
 .../apache/lucene/spatial3d/geom/Bounds.java    |   11 +
 .../lucene/spatial3d/geom/DistanceStyle.java    |   28 +
 .../lucene/spatial3d/geom/GeoBBoxFactory.java   |    3 +-
 .../spatial3d/geom/GeoBaseDistanceShape.java    |   14 +-
 .../spatial3d/geom/GeoComplexPolygon.java       | 1234 ++++++++++++
 .../geom/GeoCompositeMembershipShape.java       |    2 +-
 .../spatial3d/geom/GeoConcavePolygon.java       |  218 ++-
 .../lucene/spatial3d/geom/GeoConvexPolygon.java |  194 +-
 .../spatial3d/geom/GeoDegeneratePoint.java      |    8 +-
 .../lucene/spatial3d/geom/GeoDistance.java      |    7 +-
 .../lucene/spatial3d/geom/GeoDistanceShape.java |   12 +
 .../spatial3d/geom/GeoLongitudeSlice.java       |    1 +
 .../spatial3d/geom/GeoNorthRectangle.java       |    1 +
 .../apache/lucene/spatial3d/geom/GeoPoint.java  |    4 +-
 .../spatial3d/geom/GeoPolygonFactory.java       |  977 ++++++++--
 .../lucene/spatial3d/geom/GeoRectangle.java     |    1 +
 .../spatial3d/geom/GeoSouthRectangle.java       |    1 +
 .../spatial3d/geom/GeoStandardCircle.java       |    6 +
 .../lucene/spatial3d/geom/GeoStandardPath.java  |   22 +-
 .../spatial3d/geom/GeoWideLongitudeSlice.java   |    1 +
 .../spatial3d/geom/GeoWideNorthRectangle.java   |    1 +
 .../lucene/spatial3d/geom/GeoWideRectangle.java |    1 +
 .../spatial3d/geom/GeoWideSouthRectangle.java   |    1 +
 .../lucene/spatial3d/geom/LatLonBounds.java     |   24 +-
 .../lucene/spatial3d/geom/LinearDistance.java   |   15 +
 .../spatial3d/geom/LinearSquaredDistance.java   |   15 +
 .../lucene/spatial3d/geom/NormalDistance.java   |   15 +
 .../spatial3d/geom/NormalSquaredDistance.java   |   15 +
 .../org/apache/lucene/spatial3d/geom/Plane.java |  889 ++++++++-
 .../lucene/spatial3d/geom/PlanetModel.java      |   27 +-
 .../lucene/spatial3d/geom/SidedPlane.java       |   34 +
 .../lucene/spatial3d/geom/StandardXYZSolid.java |   55 +-
 .../apache/lucene/spatial3d/geom/Vector.java    |   64 +-
 .../apache/lucene/spatial3d/geom/XYZBounds.java |   59 +-
 .../lucene/spatial3d/TestGeo3DDocValues.java    |   53 +
 .../apache/lucene/spatial3d/TestGeo3DPoint.java | 1114 ++++++++---
 .../lucene/spatial3d/geom/GeoBBoxTest.java      |   19 +-
 .../lucene/spatial3d/geom/GeoCircleTest.java    |   27 +-
 .../lucene/spatial3d/geom/GeoPathTest.java      |    8 +-
 .../lucene/spatial3d/geom/GeoPolygonTest.java   |  611 +++++-
 .../apache/lucene/spatial3d/geom/PlaneTest.java |   20 +
 .../lucene/search/spell/DirectSpellChecker.java |    2 -
 .../lucene/search/spell/LuceneDictionary.java   |    1 -
 .../search/spell/WordBreakSpellChecker.java     |    1 -
 .../analyzing/AnalyzingInfixSuggester.java      |    9 +-
 .../search/suggest/analyzing/FSTUtil.java       |    1 -
 .../suggest/analyzing/SuggestStopFilter.java    |    1 -
 .../search/suggest/document/ContextQuery.java   |   13 +-
 .../suggest/document/PrefixCompletionQuery.java |   10 +
 .../suggest/document/RegexCompletionQuery.java  |    9 +
 .../suggest/fst/FSTCompletionBuilder.java       |    1 -
 .../search/suggest/jaspell/JaspellLookup.java   |    1 -
 .../jaspell/JaspellTernarySearchTrie.java       |   83 +-
 .../search/suggest/FileDictionaryTest.java      |    1 -
 .../lucene/search/suggest/PersistenceTest.java  |    1 -
 .../analyzing/AnalyzingInfixSuggesterTest.java  |    4 +-
 .../analyzing/AnalyzingSuggesterTest.java       |    1 -
 .../suggest/analyzing/FuzzySuggesterTest.java   |    1 -
 .../suggest/document/TestSuggestField.java      |    4 +-
 .../search/suggest/fst/FSTCompletionTest.java   |    1 -
 .../search/suggest/fst/WFSTCompletionTest.java  |    1 -
 .../lucene/analysis/CollationTestBase.java      |    1 -
 .../apache/lucene/analysis/MockAnalyzer.java    |    1 -
 .../apache/lucene/analysis/MockCharFilter.java  |    1 -
 .../lucene/analysis/MockPayloadAnalyzer.java    |    1 -
 .../codecs/asserting/AssertingPointsFormat.java |    6 +-
 .../codecs/compressing/CompressingCodec.java    |   13 +
 .../codecs/cranky/CrankyPointsFormat.java       |    3 -
 .../mockrandom/MockRandomPostingsFormat.java    |   14 +-
 .../apache/lucene/geo/BaseGeoPointTestCase.java | 1489 ++++++++++++++
 .../org/apache/lucene/geo/EarthDebugger.java    |  293 +++
 .../java/org/apache/lucene/geo/GeoTestUtil.java |  801 +++++---
 .../index/BaseCompoundFormatTestCase.java       |  163 +-
 .../index/BaseFieldInfoFormatTestCase.java      |    2 +-
 .../index/BaseIndexFileFormatTestCase.java      |    2 +-
 .../index/BasePostingsFormatTestCase.java       |  283 ++-
 .../index/BaseSegmentInfoFormatTestCase.java    |   77 +-
 .../index/BaseTermVectorsFormatTestCase.java    |    2 -
 .../java/org/apache/lucene/index/DocHelper.java |    1 -
 .../apache/lucene/index/ForceMergePolicy.java   |    3 -
 .../lucene/index/MockRandomMergePolicy.java     |   50 +-
 .../apache/lucene/index/PointsStackTracker.java |   79 +
 .../org/apache/lucene/index/RandomCodec.java    |   17 +-
 .../apache/lucene/index/RandomIndexWriter.java  |   64 +-
 .../lucene/index/RandomPostingsTester.java      |    2 +-
 .../ThreadedIndexingAndSearchingTestCase.java   |    1 -
 .../lucene/mockfile/MockFileSystemTestCase.java |    1 -
 .../org/apache/lucene/mockfile/WindowsFS.java   |    4 -
 .../apache/lucene/search/AssertingQuery.java    |    9 +-
 .../lucene/search/BaseExplanationTestCase.java  |   43 +-
 .../org/apache/lucene/search/CheckHits.java     |    5 +-
 .../org/apache/lucene/search/QueryUtils.java    |   58 +-
 .../lucene/search/RandomApproximationQuery.java |   14 +-
 .../lucene/search/spans/AssertingSpanQuery.java |   24 +-
 .../lucene/store/BaseDirectoryTestCase.java     |    7 +-
 .../lucene/store/BaseLockFactoryTestCase.java   |    1 -
 .../apache/lucene/util/CloseableDirectory.java  |    1 -
 .../org/apache/lucene/util/LineFileDocs.java    |    1 -
 .../org/apache/lucene/util/LuceneTestCase.java  |   10 +-
 .../util/TestRuleSetupAndRestoreClassEnv.java   |    6 +-
 .../java/org/apache/lucene/util/TestUtil.java   |    4 +-
 .../util/automaton/AutomatonTestUtil.java       |   10 +-
 .../analysis/TestLookaheadTokenFilter.java      |    1 -
 .../TestCompressingStoredFieldsFormat.java      |    4 -
 .../TestCompressingTermVectorsFormat.java       |    1 -
 .../lucene/index/TestAssertingLeafReader.java   |    8 -
 .../lucene/mockfile/TestHandleTrackingFS.java   |    4 -
 .../apache/lucene/mockfile/TestWindowsFS.java   |    2 -
 .../search/TestBaseExplanationTestCase.java     |  120 ++
 .../lucene/store/TestMockDirectoryWrapper.java  |    4 -
 lucene/tools/custom-tasks.xml                   |    4 +-
 lucene/tools/forbiddenApis/base.txt             |    4 -
 lucene/tools/javadoc/ecj.javadocs.prefs         |    2 +-
 lucene/tools/junit4/solr-tests.policy           |    1 +
 lucene/tools/junit4/tests.policy                |    4 +-
 .../lucene/validation/LibVersionsCheckTask.java |   15 +-
 lucene/top-level-ivy-settings.xml               |   24 +
 solr/CHANGES.txt                                |  339 +++-
 solr/bin/post                                   |    9 +-
 solr/bin/solr                                   |    2 +-
 solr/bin/solr.cmd                               |  121 +-
 solr/bin/solr.in.cmd                            |   15 +-
 solr/bin/solr.in.sh                             |    7 +
 solr/common-build.xml                           |   20 +-
 .../apache/solr/schema/ICUCollationField.java   |    4 +-
 .../collection1/conf/schema-folding-extra.xml   |   64 +-
 .../collection1/conf/schema-icucollate-dv.xml   |   53 +-
 .../solr/collection1/conf/schema-icucollate.xml |   53 +-
 .../conf/schema-icucollateoptions.xml           |   70 +-
 .../solr/schema/TestICUCollationField.java      |    2 -
 .../solr/collection1/conf/schema-analytics.xml  |  119 +-
 .../analytics/facet/FieldFacetExtrasTest.java   |    1 -
 .../solr/analytics/facet/FieldFacetTest.java    |    1 -
 .../clustering/solr/collection1/conf/schema.xml |  553 +++---
 .../clustering/src/test-files/log4j.properties  |    2 +-
 .../conf/dataimport-schema-no-unique-key.xml    |  336 ++--
 .../handler/dataimport/DIHCacheSupport.java     |    3 -
 .../handler/dataimport/DataImportHandler.java   |    6 -
 .../dataimport/DataImportHandlerException.java  |    4 +-
 .../handler/dataimport/DateFormatEvaluator.java |   45 +-
 .../solr/handler/dataimport/DebugInfo.java      |    1 -
 .../solr/handler/dataimport/Evaluator.java      |    5 -
 .../dataimport/FileListEntityProcessor.java     |   18 +-
 .../solr/handler/dataimport/JdbcDataSource.java |  150 +-
 .../handler/dataimport/SolrEntityProcessor.java |   10 +-
 .../solr/handler/dataimport/UrlEvaluator.java   |    1 -
 .../dataimport/XPathEntityProcessor.java        |    1 -
 .../apache/solr/handler/dataimport/Zipper.java  |    1 -
 .../dataimport/config/ConfigParseUtil.java      |    6 -
 .../solr/collection1/conf/dataimport-schema.xml |  112 +-
 .../conf/dataimport-solr_id-schema.xml          |  512 +++--
 .../src/test-files/log4j.properties             |    2 +-
 .../dataimport/TestContentStreamDataSource.java |    4 +-
 .../solr/handler/dataimport/TestDataConfig.java |    1 -
 .../solr/handler/dataimport/TestDocBuilder.java |    1 -
 .../handler/dataimport/TestDocBuilder2.java     |    2 +-
 .../handler/dataimport/TestEphemeralCache.java  |    1 -
 .../dataimport/TestFileListEntityProcessor.java |   22 +-
 .../TestFileListWithLineEntityProcessor.java    |    1 -
 .../dataimport/TestHierarchicalDocBuilder.java  |    1 -
 .../handler/dataimport/TestJdbcDataSource.java  |  306 ++-
 .../dataimport/TestNonWritablePersistFile.java  |    1 -
 .../TestPlainTextEntityProcessor.java           |    1 -
 .../dataimport/TestScriptTransformer.java       |    2 -
 .../dataimport/TestSimplePropertiesWriter.java  |    2 -
 .../TestSolrEntityProcessorEndToEnd.java        |    2 +-
 .../dataimport/TestSqlEntityProcessorDelta.java |    1 -
 .../dataimport/TestVariableResolver.java        |   21 +-
 .../extraction/solr/collection1/conf/schema.xml |  825 ++++----
 ...anguageIdentifierUpdateProcessorFactory.java |    1 -
 .../LanguageIdentifierUpdateProcessor.java      |    1 -
 .../langid/solr/collection1/conf/schema.xml     |   91 +-
 .../src/java/org/apache/solr/hadoop/GoLive.java |    6 +-
 .../solr/hadoop/MapReduceIndexerTool.java       |    3 -
 .../apache/solr/hadoop/SolrOutputFormat.java    |    1 -
 .../solr/hadoop/MorphlineGoLiveMiniMRTest.java  |    4 +-
 .../apache/solr/hadoop/MorphlineMapperTest.java |    1 -
 .../solr/SafeConcurrentUpdateSolrClient.java    |    2 +-
 .../solr/morphlines/solr/SolrLocator.java       |    5 +-
 .../test-files/solr/collection1/conf/schema.xml | 1649 ++++++++--------
 .../src/test-files/solr/minimr/conf/schema.xml  | 1675 ++++++++--------
 .../src/test-files/solr/mrunit/conf/schema.xml  | 1674 ++++++++--------
 .../solrcelltest/collection1/conf/schema.xml    | 1576 +++++++--------
 .../solr/AbstractSolrMorphlineTestBase.java     |    2 +-
 .../solr/AbstractSolrMorphlineZkTestBase.java   |  114 +-
 .../solr/SolrMorphlineZkAliasTest.java          |   51 +-
 .../solr/SolrMorphlineZkAvroTest.java           |   48 +-
 .../morphlines/solr/SolrMorphlineZkTest.java    |   17 +-
 .../uima/solr/collection1/conf/schema.xml       |    6 +-
 .../test-files/uima/uima-tokenizers-schema.xml  | 1098 ++++++-----
 .../velocity/solr/collection1/conf/schema.xml   |   17 +-
 solr/core/build.xml                             |    2 +-
 solr/core/ivy.xml                               |    1 +
 .../solrj/embedded/EmbeddedSolrServer.java      |    6 +-
 .../solr/client/solrj/embedded/SSLConfig.java   |   81 +-
 .../src/java/org/apache/solr/cloud/Assign.java  |   18 +-
 .../org/apache/solr/cloud/DistributedMap.java   |    1 -
 .../org/apache/solr/cloud/DistributedQueue.java |   95 +-
 .../cloud/LeaderInitiatedRecoveryThread.java    |    2 +-
 .../java/org/apache/solr/cloud/LockTree.java    |  182 ++
 .../java/org/apache/solr/cloud/Overseer.java    |    8 +-
 .../OverseerAutoReplicaFailoverThread.java      |   86 +-
 .../OverseerCollectionConfigSetProcessor.java   |   17 +-
 .../cloud/OverseerCollectionMessageHandler.java |  399 +++-
 .../cloud/OverseerConfigSetMessageHandler.java  |   42 +-
 .../solr/cloud/OverseerMessageHandler.java      |   33 +-
 .../solr/cloud/OverseerTaskProcessor.java       |  156 +-
 .../apache/solr/cloud/OverseerTaskQueue.java    |   73 +-
 .../org/apache/solr/cloud/RecoveryStrategy.java |   11 +-
 .../solr/cloud/SizeLimitedDistributedMap.java   |    2 -
 .../org/apache/solr/cloud/SyncStrategy.java     |    2 +-
 .../src/java/org/apache/solr/cloud/ZkCLI.java   |   63 +-
 .../org/apache/solr/cloud/ZkController.java     |  136 +-
 .../apache/solr/cloud/ZkSolrResourceLoader.java |   41 +-
 .../cloud/overseer/ClusterStateMutator.java     |   62 +-
 .../solr/cloud/overseer/CollectionMutator.java  |    6 +-
 .../apache/solr/cloud/overseer/NodeMutator.java |   17 +-
 .../solr/cloud/overseer/OverseerAction.java     |    2 -
 .../solr/cloud/overseer/ReplicaMutator.java     |   38 +-
 .../solr/cloud/overseer/SliceMutator.java       |   41 +-
 .../solr/cloud/overseer/ZkStateWriter.java      |   14 +-
 .../apache/solr/cloud/rule/RemoteCallback.java  |    2 +-
 .../apache/solr/cloud/rule/ReplicaAssigner.java |    6 +-
 .../apache/solr/cloud/rule/SnitchContext.java   |    3 +-
 .../org/apache/solr/core/BlobRepository.java    |  220 ++-
 .../solr/core/CachingDirectoryFactory.java      |    6 +-
 .../src/java/org/apache/solr/core/Config.java   |    2 +-
 .../org/apache/solr/core/ConfigOverlay.java     |    4 -
 .../org/apache/solr/core/ConfigSetService.java  |    1 -
 .../org/apache/solr/core/CoreContainer.java     |    6 +-
 .../org/apache/solr/core/DirectoryFactory.java  |   25 +
 .../apache/solr/core/HdfsDirectoryFactory.java  |   33 +-
 .../java/org/apache/solr/core/InitParams.java   |    4 +-
 .../org/apache/solr/core/JmxMonitoredMap.java   |   23 +-
 .../java/org/apache/solr/core/PluginBag.java    |   35 +-
 .../java/org/apache/solr/core/PluginInfo.java   |   16 +-
 .../apache/solr/core/SchemaCodecFactory.java    |    6 +-
 .../solr/core/SimpleFSDirectoryFactory.java     |    1 -
 .../java/org/apache/solr/core/SolrConfig.java   |    6 +-
 .../src/java/org/apache/solr/core/SolrCore.java |   90 +-
 .../java/org/apache/solr/core/SolrCores.java    |   13 -
 .../apache/solr/core/SolrDeletionPolicy.java    |    3 +-
 .../apache/solr/core/SolrInfoMBeanWrapper.java  |   62 +
 .../java/org/apache/solr/core/package-info.java |    2 +-
 .../handler/AnalysisRequestHandlerBase.java     |    4 +-
 .../solr/handler/CdcrReplicatorManager.java     |   18 +-
 .../apache/solr/handler/CdcrRequestHandler.java |    2 +-
 .../solr/handler/CdcrUpdateLogSynchronizer.java |    6 +-
 .../solr/handler/ContentStreamHandlerBase.java  |    1 -
 .../org/apache/solr/handler/GraphHandler.java   |  281 +++
 .../org/apache/solr/handler/IndexFetcher.java   |   52 +-
 .../solr/handler/MoreLikeThisHandler.java       |    2 -
 .../solr/handler/NestedRequestHandler.java      |    4 +-
 .../apache/solr/handler/ReplicationHandler.java |   14 +-
 .../apache/solr/handler/RequestHandlerBase.java |   35 +-
 .../org/apache/solr/handler/RestoreCore.java    |    6 +-
 .../org/apache/solr/handler/SQLHandler.java     |  133 +-
 .../org/apache/solr/handler/SchemaHandler.java  |   40 +-
 .../org/apache/solr/handler/SnapShooter.java    |   92 +-
 .../apache/solr/handler/SolrConfigHandler.java  |    2 +-
 .../solr/handler/StandardRequestHandler.java    |    2 +-
 .../org/apache/solr/handler/StreamHandler.java  |   80 +-
 .../solr/handler/admin/ClusterStatus.java       |   14 +-
 .../solr/handler/admin/CollectionsHandler.java  |  104 +-
 .../solr/handler/admin/CoreAdminHandler.java    |   21 +-
 .../solr/handler/admin/CoreAdminOperation.java  |  111 +-
 .../handler/admin/ShowFileRequestHandler.java   |    2 -
 .../handler/admin/SolrInfoMBeanHandler.java     |    1 -
 .../solr/handler/component/DebugComponent.java  |    5 +
 .../solr/handler/component/ExpandComponent.java |   24 +-
 .../solr/handler/component/FacetComponent.java  |   57 +-
 .../handler/component/HighlightComponent.java   |    1 -
 .../handler/component/HttpShardHandler.java     |    5 +-
 .../component/HttpShardHandlerFactory.java      |    5 +-
 .../component/IterativeMergeStrategy.java       |    7 +-
 .../component/MoreLikeThisComponent.java        |   19 +-
 .../solr/handler/component/QueryComponent.java  |   13 +-
 .../handler/component/RealTimeGetComponent.java |    3 +-
 .../handler/component/ShardHandlerFactory.java  |    2 +-
 .../handler/component/SpellCheckComponent.java  |    2 -
 .../handler/component/SpellCheckMergeData.java  |    1 -
 .../solr/handler/component/StatsField.java      |    2 +-
 .../handler/component/StatsValuesFactory.java   |    7 +-
 .../solr/handler/component/TermsComponent.java  |    1 -
 .../apache/solr/handler/loader/JsonLoader.java  |   40 +-
 .../solr/highlight/DefaultSolrHighlighter.java  |  103 +-
 .../solr/highlight/PostingsSolrHighlighter.java |    1 -
 .../apache/solr/highlight/SolrHighlighter.java  |    2 +-
 .../org/apache/solr/highlight/package-info.java |    2 +-
 .../solr/index/SlowCompositeReaderWrapper.java  |  300 +++
 .../apache/solr/index/SortingMergePolicy.java   |   44 +
 .../solr/index/SortingMergePolicyFactory.java   |    1 -
 .../org/apache/solr/internal/csv/CSVParser.java |    4 +-
 .../apache/solr/internal/csv/CSVPrinter.java    |    2 -
 .../internal/csv/ExtendedBufferedReader.java    |    2 +-
 .../org/apache/solr/logging/LoggerInfo.java     |    2 +-
 .../org/apache/solr/parser/QueryParser.java     |    6 -
 .../solr/parser/QueryParserTokenManager.java    |   13 -
 .../apache/solr/parser/SolrQueryParserBase.java |    1 -
 .../org/apache/solr/query/SolrRangeQuery.java   |    2 +-
 .../apache/solr/request/DocValuesFacets.java    |   12 +-
 .../org/apache/solr/request/SimpleFacets.java   |  175 +-
 .../apache/solr/request/SolrRequestInfo.java    |    1 -
 .../org/apache/solr/request/json/JSONUtil.java  |    6 -
 .../apache/solr/request/json/ObjectUtil.java    |    3 -
 .../response/BinaryQueryResponseWriter.java     |    2 +-
 .../solr/response/BinaryResponseWriter.java     |    6 +-
 .../solr/response/GeoJSONResponseWriter.java    |    1 -
 .../solr/response/GraphMLResponseWriter.java    |  167 ++
 .../solr/response/JSONResponseWriter.java       |    5 -
 .../response/PHPSerializedResponseWriter.java   |    1 -
 .../solr/response/QueryResponseWriter.java      |    2 +-
 .../solr/response/QueryResponseWriterUtil.java  |    2 +-
 .../org/apache/solr/response/ResultContext.java |    3 +-
 .../apache/solr/response/SchemaXmlWriter.java   |   27 +-
 .../solr/response/SortingResponseWriter.java    |  126 +-
 .../solr/response/TextResponseWriter.java       |    7 +
 .../org/apache/solr/response/package-info.java  |    2 +-
 .../transform/ExcludedMarkerFactory.java        |    2 -
 .../transform/SubQueryAugmenterFactory.java     |  360 ++++
 .../response/transform/TransformerFactory.java  |    1 +
 .../java/org/apache/solr/rest/RestManager.java  |    8 +-
 .../org/apache/solr/rest/SolrSchemaRestApi.java |    2 -
 .../schema/analysis/ManagedWordSetResource.java |    1 -
 .../solr/schema/AbstractSpatialFieldType.java   |   79 +-
 .../org/apache/solr/schema/BinaryField.java     |    2 +-
 .../java/org/apache/solr/schema/BoolField.java  |   49 +-
 .../org/apache/solr/schema/CollationField.java  |    4 +-
 .../org/apache/solr/schema/CurrencyField.java   |    4 +-
 .../org/apache/solr/schema/DateRangeField.java  |   40 +-
 .../java/org/apache/solr/schema/EnumField.java  |   14 +-
 .../solr/schema/ExchangeRateProvider.java       |    2 +-
 .../apache/solr/schema/ExternalFileField.java   |    8 +-
 .../java/org/apache/solr/schema/FieldType.java  |    2 +-
 .../org/apache/solr/schema/GeoHashField.java    |   10 +-
 .../org/apache/solr/schema/IndexSchema.java     |  211 +-
 .../solr/schema/JsonPreAnalyzedParser.java      |    1 -
 .../java/org/apache/solr/schema/LatLonType.java |   14 +-
 .../apache/solr/schema/ManagedIndexSchema.java  |    2 +-
 .../solr/schema/ManagedIndexSchemaFactory.java  |    2 +-
 .../java/org/apache/solr/schema/PointType.java  |    4 +-
 .../apache/solr/schema/PreAnalyzedField.java    |    4 +-
 .../org/apache/solr/schema/RandomSortField.java |    4 +-
 .../schema/RptWithGeometrySpatialField.java     |   11 +-
 .../org/apache/solr/schema/SchemaManager.java   |   99 +-
 .../java/org/apache/solr/schema/StrField.java   |    2 +-
 .../java/org/apache/solr/schema/TextField.java  |   14 +-
 .../org/apache/solr/schema/TrieDoubleField.java |    2 +-
 .../java/org/apache/solr/schema/TrieField.java  |    6 +-
 .../org/apache/solr/schema/TrieFloatField.java  |    2 +-
 .../org/apache/solr/schema/TrieIntField.java    |    2 +-
 .../org/apache/solr/schema/TrieLongField.java   |    2 +-
 .../java/org/apache/solr/schema/UUIDField.java  |    2 +-
 .../apache/solr/schema/ZkIndexSchemaReader.java |   56 +-
 .../java/org/apache/solr/search/BitDocSet.java  |   16 +-
 .../solr/search/CollapsingQParserPlugin.java    |   48 +-
 .../java/org/apache/solr/search/CursorMark.java |    2 +-
 .../apache/solr/search/DisMaxQParserPlugin.java |    1 -
 .../src/java/org/apache/solr/search/DocSet.java |    2 +-
 .../java/org/apache/solr/search/DocSetBase.java |   19 +-
 .../org/apache/solr/search/DocSetBuilder.java   |    5 +-
 .../org/apache/solr/search/DocSetCollector.java |   84 +-
 .../java/org/apache/solr/search/DocSlice.java   |    1 -
 .../apache/solr/search/ExportQParserPlugin.java |   25 +-
 .../solr/search/ExtendedDismaxQParser.java      |   37 +-
 .../search/ExtendedDismaxQParserPlugin.java     |    1 -
 .../apache/solr/search/ExtendedQueryBase.java   |    2 +-
 .../apache/solr/search/FieldQParserPlugin.java  |    1 -
 .../solr/search/FunctionQParserPlugin.java      |    1 -
 .../solr/search/FunctionRangeQParserPlugin.java |    1 -
 .../solr/search/GraphTermsQParserPlugin.java    |  311 +++
 .../apache/solr/search/HashQParserPlugin.java   |   38 +-
 .../java/org/apache/solr/search/Insanity.java   |    6 +-
 .../apache/solr/search/JoinQParserPlugin.java   |   27 +-
 .../java/org/apache/solr/search/LFUCache.java   |   10 +-
 .../java/org/apache/solr/search/LRUCache.java   |    1 -
 .../apache/solr/search/LuceneQParserPlugin.java |    2 -
 .../solr/search/OldLuceneQParserPlugin.java     |    1 -
 .../apache/solr/search/PrefixQParserPlugin.java |    3 -
 .../java/org/apache/solr/search/QParser.java    |    1 -
 .../org/apache/solr/search/QParserPlugin.java   |    1 +
 .../org/apache/solr/search/QueryContext.java    |    1 -
 .../org/apache/solr/search/QueryParsing.java    |    3 -
 .../org/apache/solr/search/QueryResultKey.java  |    8 +-
 .../apache/solr/search/QueryWrapperFilter.java  |   12 +-
 .../apache/solr/search/RawQParserPlugin.java    |    1 -
 .../apache/solr/search/ReRankQParserPlugin.java |   14 +-
 .../apache/solr/search/SimpleQParserPlugin.java |    1 -
 .../solr/search/SolrConstantScoreQuery.java     |   11 +-
 .../apache/solr/search/SolrFieldCacheMBean.java |   19 +-
 .../apache/solr/search/SolrIndexSearcher.java   |   63 +-
 .../org/apache/solr/search/SolrQueryParser.java |   18 -
 .../apache/solr/search/SolrReturnFields.java    |    3 +-
 .../org/apache/solr/search/SortedIntDocSet.java |   16 +-
 .../solr/search/SpatialBoxQParserPlugin.java    |    1 -
 .../solr/search/SpatialFilterQParserPlugin.java |    1 -
 .../solr/search/SurroundQParserPlugin.java      |    1 -
 .../apache/solr/search/TermQParserPlugin.java   |    1 -
 .../apache/solr/search/TermsQParserPlugin.java  |    1 -
 .../apache/solr/search/ValueSourceParser.java   |   24 +-
 .../apache/solr/search/XmlQParserPlugin.java    |    1 -
 .../solr/search/facet/AggValueSource.java       |    1 -
 .../org/apache/solr/search/facet/BlockJoin.java |    1 -
 .../solr/search/facet/FacetDebugInfo.java       |    6 +-
 .../apache/solr/search/facet/FacetField.java    |    1 -
 .../facet/FacetFieldProcessorNumeric.java       |    1 -
 .../apache/solr/search/facet/FacetRequest.java  |    2 -
 .../org/apache/solr/search/facet/FieldUtil.java |    2 -
 .../org/apache/solr/search/facet/HLLAgg.java    |    5 -
 .../apache/solr/search/facet/LegacyFacet.java   |    1 -
 .../solr/search/facet/SimpleAggValueSource.java |    3 -
 .../org/apache/solr/search/facet/SlotAcc.java   |    8 -
 .../solr/search/facet/StrAggValueSource.java    |    7 -
 .../solr/search/facet/UnInvertedField.java      |    5 +-
 .../solr/search/facet/UniqueMultiDvSlotAcc.java |   86 +
 .../search/facet/UniqueMultivaluedSlotAcc.java  |   69 +
 .../search/facet/UniqueSinglevaluedSlotAcc.java |   81 +
 .../apache/solr/search/facet/UniqueSlotAcc.java |  165 --
 .../solr/search/function/FileFloatSource.java   |    3 +-
 .../solr/search/function/OrdFieldSource.java    |    6 +-
 .../search/function/ReverseOrdFieldSource.java  |    6 +-
 .../apache/solr/search/grouping/Command.java    |    2 -
 .../TopGroupsShardRequestFactory.java           |    2 +-
 .../TopGroupsShardResponseProcessor.java        |    2 +-
 .../SearchGroupsResultTransformer.java          |    2 -
 .../TopGroupsResultTransformer.java             |    2 +-
 .../EndResultTransformer.java                   |    2 +-
 .../solr/search/join/BlockJoinFacetFilter.java  |   17 +
 .../search/join/BlockJoinParentQParser.java     |   11 +-
 .../join/BlockJoinParentQParserPlugin.java      |    1 -
 .../solr/search/join/GraphQParserPlugin.java    |    1 -
 .../org/apache/solr/search/join/GraphQuery.java |   67 +-
 .../solr/search/join/GraphQueryParser.java      |    1 -
 .../search/join/ScoreJoinQParserPlugin.java     |   43 +-
 .../apache/solr/search/mlt/CloudMLTQParser.java |   19 +-
 .../solr/search/mlt/MLTQParserPlugin.java       |    1 -
 .../SweetSpotSimilarityFactory.java             |    1 -
 .../apache/solr/search/stats/LRUStatsCache.java |    5 -
 .../solr/security/AuthenticationPlugin.java     |    3 +-
 .../solr/security/AuthorizationContext.java     |    1 -
 .../security/AutorizationEditOperation.java     |    2 -
 .../apache/solr/security/KerberosPlugin.java    |    1 -
 .../solr/security/PKIAuthenticationPlugin.java  |    2 +-
 .../org/apache/solr/security/Permission.java    |   49 +-
 .../solr/security/PermissionNameProvider.java   |    2 +
 .../security/RuleBasedAuthorizationPlugin.java  |   11 +-
 .../solr/servlet/DirectSolrConnection.java      |    6 -
 .../org/apache/solr/servlet/HttpSolrCall.java   |   34 +-
 .../apache/solr/servlet/LoadAdminUiServlet.java |    9 +-
 .../solr/servlet/ServletInputStreamWrapper.java |  105 +
 .../servlet/ServletOutputStreamWrapper.java     |  140 ++
 .../apache/solr/servlet/SolrDispatchFilter.java |   92 +
 .../apache/solr/servlet/SolrRequestParsers.java |   41 +-
 .../solr/servlet/cache/HttpCacheHeaderUtil.java |    2 -
 .../spelling/AbstractLuceneSpellChecker.java    |    6 -
 .../solr/spelling/DirectSolrSpellChecker.java   |    6 -
 .../solr/spelling/IndexBasedSpellChecker.java   |    2 +-
 .../solr/spelling/SpellCheckCollator.java       |    3 +
 .../solr/store/blockcache/BlockCache.java       |    1 -
 .../apache/solr/store/blockcache/Metrics.java   |    1 -
 .../apache/solr/uninverting/DocTermOrds.java    |  887 +++++++++
 .../org/apache/solr/uninverting/FieldCache.java |  466 +++++
 .../apache/solr/uninverting/FieldCacheImpl.java | 1085 +++++++++++
 .../uninverting/FieldCacheSanityChecker.java    |  425 ++++
 .../solr/uninverting/UninvertingReader.java     |  391 ++++
 .../apache/solr/uninverting/package-info.java   |   21 +
 .../org/apache/solr/update/CdcrUpdateLog.java   |    2 +-
 .../solr/update/DefaultSolrCoreState.java       |    4 +-
 .../solr/update/DeleteByQueryWrapper.java       |   30 +-
 .../apache/solr/update/DeleteUpdateCommand.java |    2 -
 .../apache/solr/update/SolrCmdDistributor.java  |    3 +-
 .../org/apache/solr/update/SolrCoreState.java   |    2 +-
 .../org/apache/solr/update/SolrIndexConfig.java |   17 +-
 .../solr/update/StreamingSolrClients.java       |   66 +-
 .../apache/solr/update/UpdateShardHandler.java  |    4 +-
 .../org/apache/solr/update/VersionInfo.java     |    2 +-
 ...tractDefaultValueUpdateProcessorFactory.java |    2 -
 ...aluesOrNoneFieldMutatingUpdateProcessor.java |    2 +-
 .../ClassificationUpdateProcessor.java          |    2 +-
 .../ClassificationUpdateProcessorFactory.java   |    2 +-
 .../ConcatFieldUpdateProcessorFactory.java      |    2 +-
 .../CountFieldValuesUpdateProcessorFactory.java |   10 -
 .../DefaultValueUpdateProcessorFactory.java     |    4 -
 .../processor/DistributedUpdateProcessor.java   |    9 +-
 .../DistributingUpdateProcessorFactory.java     |    2 -
 ...BasedVersionConstraintsProcessorFactory.java |    4 +-
 .../DocExpirationUpdateProcessorFactory.java    |   16 +-
 .../FieldMutatingUpdateProcessorFactory.java    |    3 +-
 .../FieldValueSubsetUpdateProcessorFactory.java |    2 -
 .../FirstFieldValueUpdateProcessorFactory.java  |    1 -
 .../LastFieldValueUpdateProcessorFactory.java   |    1 -
 .../solr/update/processor/MD5Signature.java     |    1 -
 .../MaxFieldValueUpdateProcessorFactory.java    |    1 -
 .../MinFieldValueUpdateProcessorFactory.java    |    1 -
 .../NoOpDistributingUpdateProcessorFactory.java |    2 -
 .../ParseDateFieldUpdateProcessorFactory.java   |    2 -
 .../update/processor/RegexpBoostProcessor.java  |    1 -
 .../processor/RunUpdateProcessorFactory.java    |    3 +-
 .../TimestampUpdateProcessorFactory.java        |    7 -
 .../processor/TolerantUpdateProcessor.java      |   22 +-
 .../TolerantUpdateProcessorFactory.java         |    1 -
 .../UniqFieldsUpdateProcessorFactory.java       |    9 -
 .../processor/UpdateRequestProcessorChain.java  |    3 +-
 .../org/apache/solr/util/CommandOperation.java  |    3 -
 .../org/apache/solr/util/DateMathParser.java    |  168 +-
 .../org/apache/solr/util/PivotListEntry.java    |    4 +-
 .../org/apache/solr/util/SimplePostTool.java    |   12 +-
 .../src/java/org/apache/solr/util/SolrCLI.java  |   64 +-
 .../org/apache/solr/util/SolrLogLayout.java     |   10 +-
 .../org/apache/solr/util/SolrPluginUtils.java   |   26 +-
 .../org/apache/solr/util/TestInjection.java     |   28 +-
 .../org/apache/solr/util/VersionedFile.java     |    4 +-
 .../solr/util/xslt/TransformerProvider.java     |    1 -
 solr/core/src/resources/ImplicitPlugins.json    |    7 +
 .../solr/analysisconfs/analysis-err-schema.xml  |   31 +-
 .../bad-schema-analyzer-class-and-nested.xml    |   34 +-
 .../bad-schema-bogus-analysis-parameters.xml    |   16 +-
 .../conf/bad-schema-bogus-field-parameters.xml  |    8 +-
 .../bad-schema-codec-global-vs-ft-mismatch.xml  |   22 +-
 .../bad-schema-currency-dynamic-multivalued.xml |   21 +-
 ...bad-schema-currency-ft-bogus-code-in-xml.xml |   26 +-
 ...ad-schema-currency-ft-bogus-default-code.xml |   26 +-
 .../conf/bad-schema-currency-ft-multivalued.xml |   18 +-
 .../conf/bad-schema-currency-ft-oer-norates.xml |   24 +-
 .../conf/bad-schema-currency-multivalued.xml    |   20 +-
 .../conf/bad-schema-dup-dynamicField.xml        |   27 +-
 .../collection1/conf/bad-schema-dup-field.xml   |   28 +-
 .../conf/bad-schema-dup-fieldType.xml           |   40 +-
 .../bad-schema-dynamicfield-default-val.xml     |   18 +-
 .../conf/bad-schema-dynamicfield-required.xml   |   18 +-
 .../conf/bad-schema-external-filefield.xml      |   10 +-
 .../collection1/conf/bad-schema-init-error.xml  |    8 +-
 ...asterisk-copyfield-dest-should-fail-test.xml |    8 +-
 ...terisk-copyfield-source-should-fail-test.xml |    8 +-
 ...asterisk-copyfield-dest-should-fail-test.xml |    8 +-
 ...terisk-copyfield-source-should-fail-test.xml |    8 +-
 ...source-matching-nothing-should-fail-test.xml |   13 +-
 .../conf/bad-schema-nontext-analyzer.xml        |   25 +-
 .../conf/bad-schema-not-indexed-but-norms.xml   |   24 +-
 .../conf/bad-schema-not-indexed-but-pos.xml     |   24 +-
 .../conf/bad-schema-not-indexed-but-tf.xml      |   23 +-
 .../conf/bad-schema-omit-tf-but-not-pos.xml     |   25 +-
 .../bad-schema-sim-global-vs-ft-mismatch.xml    |   32 +-
 .../conf/bad-schema-sweetspot-both-tf.xml       |   50 +-
 .../bad-schema-sweetspot-partial-baseline.xml   |   32 +-
 .../bad-schema-sweetspot-partial-hyperbolic.xml |   46 +-
 .../conf/bad-schema-sweetspot-partial-norms.xml |   44 +-
 .../bad-schema-uniquekey-is-copyfield-dest.xml  |   20 +-
 .../conf/bad-schema-uniquekey-multivalued.xml   |   16 +-
 .../conf/bad-schema-uniquekey-uses-default.xml  |   16 +-
 .../conf/bad-schema-unsupported-docValues.xml   |   10 +-
 .../conf/schema-HighlighterMaxOffsetTest.xml    |  122 +-
 ...chema-add-schema-fields-update-processor.xml |   22 +-
 .../solr/collection1/conf/schema-behavior.xml   |  218 ++-
 .../collection1/conf/schema-binaryfield.xml     |   78 +-
 .../conf/schema-blockjoinfacetcomponent.xml     |   41 +-
 .../solr/collection1/conf/schema-bm25.xml       |   48 +-
 .../collection1/conf/schema-charfilters.xml     |   52 +-
 ...a-class-name-shortening-on-serialization.xml |   42 +-
 .../solr/collection1/conf/schema-collate-dv.xml |   56 +-
 .../solr/collection1/conf/schema-collate.xml    |   55 +-
 .../collection1/conf/schema-complex-phrase.xml  |   20 +-
 .../collection1/conf/schema-copyfield-test.xml  |  841 ++++----
 .../collection1/conf/schema-custom-field.xml    |   40 +-
 .../collection1/conf/schema-customfield.xml     |   78 +-
 .../solr/collection1/conf/schema-dfi.xml        |   51 +-
 .../solr/collection1/conf/schema-dfr.xml        |   82 +-
 .../conf/schema-distrib-interval-faceting.xml   |  113 +-
 .../conf/schema-distributed-missing-sort.xml    |   87 +-
 .../solr/collection1/conf/schema-docValues.xml  |   80 +-
 .../conf/schema-docValuesFaceting.xml           |   93 +-
 .../collection1/conf/schema-docValuesJoin.xml   |  135 +-
 .../conf/schema-docValuesMissing.xml            |  154 +-
 .../collection1/conf/schema-docValuesMulti.xml  |   43 +-
 .../solr/collection1/conf/schema-eff.xml        |   25 +-
 .../solr/collection1/conf/schema-enums.xml      |   38 +-
 .../conf/schema-field-sort-values.xml           |   32 +-
 .../solr/collection1/conf/schema-folding.xml    |  482 +++--
 .../solr/collection1/conf/schema-hash.xml       | 1070 ++++++-----
 .../solr/collection1/conf/schema-ib.xml         |   57 +-
 .../conf/schema-id-and-version-fields-only.xml  |   12 +-
 .../collection1/conf/schema-lmdirichlet.xml     |   43 +-
 .../collection1/conf/schema-lmjelinekmercer.xml |   43 +-
 .../conf/schema-luceneMatchVersion.xml          |   22 +-
 .../conf/schema-minimal-atomic-stress.xml       |   38 +
 .../solr/collection1/conf/schema-minimal.xml    |    6 +-
 .../conf/schema-not-required-unique-key.xml     |   33 +-
 .../solr/collection1/conf/schema-numeric.xml    |   84 +-
 ...ma-one-field-no-dynamic-field-unique-key.xml |   14 +-
 .../conf/schema-one-field-no-dynamic-field.xml  |   14 +-
 .../collection1/conf/schema-phrasesuggest.xml   |   34 +-
 .../conf/schema-postingshighlight.xml           |   48 +-
 .../collection1/conf/schema-preanalyzed.xml     |   43 +-
 .../collection1/conf/schema-replication1.xml    |   15 +-
 .../collection1/conf/schema-replication2.xml    |   20 +-
 .../collection1/conf/schema-required-fields.xml |  737 +++----
 .../conf/schema-rest-lucene-match-version.xml   |   38 +-
 .../solr/collection1/conf/schema-rest.xml       | 1205 ++++++------
 .../solr/collection1/conf/schema-reversed.xml   |  118 +-
 .../solr/collection1/conf/schema-sim.xml        |   46 +-
 .../collection1/conf/schema-simpleqpplugin.xml  |   74 +-
 .../conf/schema-single-dynamic-copy-field.xml   | 1152 +++++------
 .../collection1/conf/schema-sortingresponse.xml |   67 +-
 .../solr/collection1/conf/schema-sorts.xml      |  535 +++---
 .../solr/collection1/conf/schema-spatial.xml    |   81 +-
 .../collection1/conf/schema-spellchecker.xml    |   50 +-
 .../solr/collection1/conf/schema-sql.xml        | 1087 +++++------
 .../solr/collection1/conf/schema-stop-keep.xml  |   51 +-
 .../solr/collection1/conf/schema-sweetspot.xml  |   93 +-
 .../conf/schema-synonym-tokenizer.xml           |   35 +-
 .../solr/collection1/conf/schema-tiny.xml       |   14 +-
 .../solr/collection1/conf/schema-trie.xml       |  526 ++---
 .../solr/collection1/conf/schema-version-dv.xml |   30 +-
 .../collection1/conf/schema-version-indexed.xml |   30 +-
 .../solr/collection1/conf/schema-xinclude.xml   |   12 +-
 .../test-files/solr/collection1/conf/schema.xml | 1264 ++++++------
 .../solr/collection1/conf/schema11.xml          |    2 +-
 .../solr/collection1/conf/schema12.xml          | 1087 ++++++-----
 .../solr/collection1/conf/schema15.xml          | 1076 ++++++-----
 .../solr/collection1/conf/schema_codec.xml      |   54 +-
 .../solr/collection1/conf/schema_latest.xml     | 1324 ++++++-------
 .../solr/collection1/conf/schemasurround.xml    | 1075 ++++++-----
 .../configsets/bad-mergepolicy/conf/schema.xml  |    6 +-
 .../configsets/cloud-dynamic/conf/schema.xml    |  275 +++
 .../cloud-dynamic/conf/solrconfig.xml           |   48 +
 .../cloud-managed/conf/managed-schema           |   27 +
 .../cloud-managed/conf/solrconfig.xml           |   51 +
 .../configsets/cloud-minimal/conf/schema.xml    |    8 +-
 .../configset-1/conf/schema-minimal.xml         |   25 -
 .../configset-1/conf/solrconfig-minimal.xml     |   56 -
 .../solr/configsets/configset-2/conf/schema.xml |   12 +-
 .../solr/configsets/doc-expiry/conf/schema.xml  |  271 +++
 .../solrconfig.snippet.randomindexconfig.xml    |   47 +
 .../configsets/doc-expiry/conf/solrconfig.xml   |   96 +
 .../exitable-directory/conf/schema.xml          |   28 +
 .../exitable-directory/conf/solrconfig.xml      |  117 ++
 .../solr/configsets/minimal/conf/schema.xml     |    6 +-
 .../solr/configsets/resource-sharing/schema.xml |   21 +
 .../configsets/resource-sharing/solrconfig.xml  |   51 +
 .../org/apache/solr/BasicFunctionalityTest.java |    2 +-
 .../solr/DistributedIntervalFacetingTest.java   |    3 +-
 .../test/org/apache/solr/MinimalSchemaTest.java |    1 +
 .../test/org/apache/solr/SolrInfoMBeanTest.java |    1 -
 .../apache/solr/TestDistributedGrouping.java    |   34 +-
 .../org/apache/solr/TestDistributedSearch.java  |    2 +
 .../solr/TestSimpleTrackingShardHandler.java    |    1 -
 .../org/apache/solr/TestTolerantSearch.java     |    6 +-
 .../core/src/test/org/apache/solr/TestTrie.java |    4 +-
 .../PathHierarchyTokenizerFactoryTest.java      |    3 -
 .../solr/client/solrj/ConnectionReuseTest.java  |   84 +-
 .../solrj/embedded/TestJettySolrRunner.java     |    3 +-
 .../apache/solr/cloud/AliasIntegrationTest.java |   16 +-
 .../test/org/apache/solr/cloud/AssignTest.java  |    2 +-
 .../solr/cloud/AsyncMigrateRouteKeyTest.java    |    2 +-
 .../solr/cloud/BaseCdcrDistributedZkTest.java   |    6 +-
 .../solr/cloud/BasicDistributedZk2Test.java     |    9 +-
 .../solr/cloud/BasicDistributedZkTest.java      |   14 +-
 .../cloud/ChaosMonkeyNothingIsSafeTest.java     |   46 +-
 .../apache/solr/cloud/CleanupOldIndexTest.java  |  105 +-
 .../cloud/CloudExitableDirectoryReaderTest.java |   47 +-
 .../org/apache/solr/cloud/ClusterStateTest.java |   11 +-
 .../apache/solr/cloud/CollectionReloadTest.java |   85 +-
 .../cloud/CollectionsAPIDistributedZkTest.java  |   49 +-
 .../solr/cloud/CollectionsAPISolrJTest.java     |    9 +-
 ...ConcurrentDeleteAndCreateCollectionTest.java |    7 +-
 .../apache/solr/cloud/ConfigSetsAPITest.java    |   39 +-
 .../solr/cloud/ConnectionManagerTest.java       |    5 -
 .../solr/cloud/CreateCollectionCleanupTest.java |   84 +
 .../apache/solr/cloud/CustomCollectionTest.java |   12 +-
 .../solr/cloud/DeleteInactiveReplicaTest.java   |    3 +-
 .../DeleteLastCustomShardedReplicaTest.java     |    1 -
 .../apache/solr/cloud/DeleteReplicaTest.java    |    4 +-
 .../org/apache/solr/cloud/DeleteShardTest.java  |    6 +-
 .../solr/cloud/DistribCursorPagingTest.java     |   15 +-
 ...DistribDocExpirationUpdateProcessorTest.java |  142 +-
 .../cloud/DistribJoinFromCollectionTest.java    |  144 +-
 .../apache/solr/cloud/DistributedQueueTest.java |   47 +-
 .../solr/cloud/DistributedVersionInfoTest.java  |  126 +-
 .../org/apache/solr/cloud/ForceLeaderTest.java  |    2 +-
 .../cloud/FullSolrCloudDistribCmdsTest.java     |    2 +-
 .../apache/solr/cloud/HttpPartitionTest.java    |   19 +-
 .../LeaderInitiatedRecoveryOnCommitTest.java    |    2 +-
 ...aderInitiatedRecoveryOnShardRestartTest.java |    2 +-
 .../apache/solr/cloud/MigrateRouteKeyTest.java  |    4 +-
 .../apache/solr/cloud/MultiThreadedOCPTest.java |   88 +-
 ...verseerCollectionConfigSetProcessorTest.java |  220 +--
 .../solr/cloud/OverseerTaskQueueTest.java       |   66 +
 .../org/apache/solr/cloud/OverseerTest.java     |    9 +-
 .../solr/cloud/RecoveryAfterSoftCommitTest.java |    1 -
 .../apache/solr/cloud/RemoteQueryErrorTest.java |    2 +-
 .../solr/cloud/ReplicationFactorTest.java       |    3 +-
 .../org/apache/solr/cloud/SSLMigrationTest.java |    5 +-
 .../org/apache/solr/cloud/ShardSplitTest.java   |   33 +-
 .../SharedFSAutoReplicaFailoverUtilsTest.java   |   99 +-
 .../cloud/SimpleCollectionCreateDeleteTest.java |    2 -
 .../apache/solr/cloud/SolrCloudExampleTest.java |    6 +-
 .../org/apache/solr/cloud/SyncSliceTest.java    |    4 +-
 .../solr/cloud/TestCloudBackupRestore.java      |  219 +++
 .../solr/cloud/TestCloudDeleteByQuery.java      |   17 +-
 .../apache/solr/cloud/TestCloudInspectUtil.java |    2 -
 .../apache/solr/cloud/TestCloudPivotFacet.java  |   11 +-
 .../apache/solr/cloud/TestCollectionAPI.java    |    1 -
 .../apache/solr/cloud/TestConfigSetsAPI.java    |   21 +-
 .../cloud/TestConfigSetsAPIExclusivity.java     |    5 +-
 .../solr/cloud/TestConfigSetsAPIZkFailure.java  |    5 +-
 .../org/apache/solr/cloud/TestCryptoKeys.java   |   10 +-
 .../org/apache/solr/cloud/TestLockTree.java     |  123 ++
 .../solr/cloud/TestMiniSolrCloudClusterSSL.java |  335 +++-
 .../cloud/TestOnReconnectListenerSupport.java   |  155 ++
 .../cloud/TestRandomRequestDistribution.java    |    6 +-
 .../apache/solr/cloud/TestRebalanceLeaders.java |   18 +-
 .../cloud/TestRequestStatusCollectionAPI.java   |    2 +-
 .../apache/solr/cloud/TestSSLRandomization.java |  254 +++
 .../TestStressCloudBlindAtomicUpdates.java      |  477 +++++
 .../apache/solr/cloud/TestStressLiveNodes.java  |  255 +++
 .../cloud/TestTolerantUpdateProcessorCloud.java |   38 +-
 .../TestTolerantUpdateProcessorRandomCloud.java |   10 +-
 .../solr/cloud/UnloadDistributedZkTest.java     |   30 +-
 .../test/org/apache/solr/cloud/ZkCLITest.java   |   94 +-
 .../org/apache/solr/cloud/ZkControllerTest.java |  136 +-
 .../solr/cloud/hdfs/HdfsThreadLeakTest.java     |    2 -
 .../HdfsWriteToMultipleCollectionsTest.java     |   21 +-
 .../apache/solr/cloud/hdfs/StressHdfsTest.java  |   19 +-
 .../solr/cloud/overseer/ZkStateReaderTest.java  |   81 +-
 .../solr/cloud/overseer/ZkStateWriterTest.java  |    8 +-
 .../solr/core/BlobRepositoryCloudTest.java      |  112 ++
 .../solr/core/BlobRepositoryMockingTest.java    |  163 ++
 .../solr/core/CountUsageValueSourceParser.java  |    2 +-
 .../solr/core/ExitableDirectoryReaderTest.java  |    2 +-
 .../solr/core/HdfsDirectoryFactoryTest.java     |    5 -
 .../org/apache/solr/core/MockInfoMBean.java     |    1 -
 .../solr/core/OpenCloseCoreStressTest.java      |    4 +-
 .../apache/solr/core/QueryResultKeyTest.java    |    4 +-
 .../test/org/apache/solr/core/SolrCoreTest.java |  103 +-
 .../org/apache/solr/core/TestCodecSupport.java  |    5 -
 .../apache/solr/core/TestDynamicLoading.java    |   14 +-
 .../apache/solr/core/TestInfoStreamLogging.java |    1 -
 .../apache/solr/core/TestJmxMonitoredMap.java   |   40 +-
 .../org/apache/solr/core/TestLazyCores.java     |    2 +-
 .../apache/solr/core/TestMergePolicyConfig.java |    2 +-
 .../apache/solr/core/TestSolrConfigHandler.java |   26 +-
 .../apache/solr/handler/CheckBackupStatus.java  |    2 +-
 .../FieldAnalysisRequestHandlerTest.java        |    4 -
 .../org/apache/solr/handler/JsonLoaderTest.java |   68 +-
 .../handler/StandardRequestHandlerTest.java     |    8 -
 .../apache/solr/handler/TestBlobHandler.java    |    1 -
 .../org/apache/solr/handler/TestCSVLoader.java  |    1 -
 .../apache/solr/handler/TestConfigReload.java   |    8 +-
 .../solr/handler/TestReplicationHandler.java    |  110 +-
 .../handler/TestReplicationHandlerBackup.java   |    7 +-
 .../apache/solr/handler/TestReqParamsAPI.java   |    8 +-
 .../apache/solr/handler/TestRestoreCore.java    |   45 +-
 .../org/apache/solr/handler/TestSQLHandler.java |  577 +++---
 .../handler/TestSolrConfigHandlerCloud.java     |    8 +-
 .../TestSolrConfigHandlerConcurrent.java        |    9 +-
 .../handler/ThrowErrorOnInitRequestHandler.java |    1 -
 .../handler/admin/CoreAdminHandlerTest.java     |    4 +-
 .../admin/CoreMergeIndexesAdminHandlerTest.java |    3 -
 .../DistributedDebugComponentTest.java          |    6 +-
 .../DistributedFacetPivotLargeTest.java         |    2 +-
 .../component/DistributedMLTComponentTest.java  |    1 -
 ...stributedQueryComponentOptimizationTest.java |  236 ++-
 .../DistributedQueryElevationComponentTest.java |    3 +-
 .../component/ResourceSharingTestComponent.java |  149 ++
 .../handler/component/SearchHandlerTest.java    |    5 -
 ...estDistributedStatsComponentCardinality.java |    2 +
 .../handler/component/TestExpandComponent.java  |    1 -
 .../handler/component/TestPivotHelperCode.java  |    3 -
 .../highlight/HighlighterMaxOffsetTest.java     |    1 -
 .../apache/solr/highlight/HighlighterTest.java  |   82 +-
 .../index/TestSlowCompositeReaderWrapper.java   |   95 +
 .../solr/internal/csv/CSVPrinterTest.java       |    3 -
 .../solr/internal/csv/CSVStrategyTest.java      |    2 -
 .../csv/ExtendedBufferedReaderTest.java         |    2 -
 .../org/apache/solr/request/JSONWriterTest.java |    4 -
 .../apache/solr/request/SimpleFacetsTest.java   |   33 +-
 .../solr/request/TestBinaryResponseWriter.java  |    1 -
 .../apache/solr/request/TestFacetMethods.java   |  207 ++
 .../org/apache/solr/request/TestFaceting.java   |   51 +-
 .../solr/request/TestIntervalFaceting.java      |    1 -
 .../solr/response/TestChildDocTransformer.java  |  244 ---
 .../solr/response/TestCustomDocTransformer.java |    4 +-
 .../response/TestGraphMLResponseWriter.java     |  155 ++
 .../TestPHPSerializedResponseWriter.java        |    1 -
 .../solr/response/TestRawResponseWriter.java    |   10 +-
 .../transform/TestChildDocTransformer.java      |  403 ++++
 .../transform/TestSubQueryTransformer.java      |  571 ++++++
 .../TestSubQueryTransformerCrossCore.java       |  131 ++
 .../TestSubQueryTransformerDistrib.java         |  213 ++
 .../schema/TestCopyFieldCollectionResource.java |   34 +
 .../TestDynamicFieldCollectionResource.java     |   24 +
 .../schema/TestFieldCollectionResource.java     |   51 +-
 .../solr/rest/schema/TestFieldResource.java     |    6 +
 .../solr/schema/AbstractCurrencyFieldTest.java  |    2 +-
 .../apache/solr/schema/BooleanFieldTest.java    |   78 +
 .../solr/schema/ChangedSchemaMergeTest.java     |    8 -
 .../schema/CurrencyFieldOpenExchangeTest.java   |   10 -
 .../solr/schema/CurrencyFieldXmlFileTest.java   |    9 -
 .../apache/solr/schema/DateRangeFieldTest.java  |   29 +
 .../solr/schema/DocValuesMissingTest.java       |  129 ++
 .../apache/solr/schema/DocValuesMultiTest.java  |  103 +-
 .../org/apache/solr/schema/DocValuesTest.java   |   89 +-
 .../org/apache/solr/schema/EnumFieldTest.java   |    1 -
 .../apache/solr/schema/MyCrazyCustomField.java  |    2 +-
 .../org/apache/solr/schema/PolyFieldTest.java   |    1 -
 .../solr/schema/SpatialRPTFieldTypeTest.java    |   32 +-
 .../solr/schema/TestBulkSchemaConcurrent.java   |    8 +-
 .../TestCloudManagedSchemaConcurrent.java       |   20 +-
 .../apache/solr/schema/TestCloudSchemaless.java |    9 +-
 .../apache/solr/schema/TestCollationField.java  |    1 -
 .../solr/schema/TestManagedSchemaAPI.java       |  101 +
 .../TrieIntPrefixActsAsRangeQueryFieldType.java |    2 +-
 .../solr/search/AnalyticsMergeStrategyTest.java |    5 +-
 .../apache/solr/search/AnalyticsQueryTest.java  |    1 -
 .../solr/search/DelayingSearchComponent.java    |    1 -
 .../apache/solr/search/FooQParserPlugin.java    |    1 -
 .../apache/solr/search/QueryEqualityTest.java   |    9 +
 .../apache/solr/search/QueryParsingTest.java    |    8 -
 .../org/apache/solr/search/RankQueryTest.java   |    1 -
 .../apache/solr/search/SortSpecParsingTest.java |    1 -
 .../solr/search/TestCollapseQParserPlugin.java  |    1 -
 .../test/org/apache/solr/search/TestDocSet.java |   35 +-
 .../solr/search/TestExtendedDismaxParser.java   |  155 ++
 .../solr/search/TestFilteredDocIdSet.java       |   21 +
 .../search/TestGraphTermsQParserPlugin.java     |  123 ++
 .../solr/search/TestHashQParserPlugin.java      |    9 +-
 .../org/apache/solr/search/TestLRUCache.java    |    5 -
 .../apache/solr/search/TestMissingGroups.java   |    4 +-
 .../org/apache/solr/search/TestQueryUtils.java  |    2 -
 .../solr/search/TestQueryWrapperFilter.java     |   14 +-
 .../search/TestRandomCollapseQParserPlugin.java |    7 +-
 .../solr/search/TestReRankQParserPlugin.java    |    1 -
 .../org/apache/solr/search/TestRealTimeGet.java |    1 -
 .../org/apache/solr/search/TestRecovery.java    |    2 +-
 .../apache/solr/search/TestRecoveryHdfs.java    |    1 -
 .../test/org/apache/solr/search/TestReload.java |    2 -
 .../apache/solr/search/TestReloadDeadlock.java  |    4 +-
 .../org/apache/solr/search/TestSearchPerf.java  |    1 -
 .../apache/solr/search/TestSearcherReuse.java   |    2 +-
 .../solr/search/TestSimpleQParserPlugin.java    |    3 -
 .../apache/solr/search/TestSolr4Spatial2.java   |    2 +-
 .../solr/search/TestSolrFieldCacheMBean.java    |   36 +-
 .../test/org/apache/solr/search/TestSolrJ.java  |    4 +-
 .../apache/solr/search/TestSolrQueryParser.java |    1 -
 .../test/org/apache/solr/search/TestSort.java   |   15 +-
 .../solr/search/facet/TestJsonFacets.java       |    3 -
 .../search/function/NvlValueSourceParser.java   |    2 +-
 .../solr/search/function/TestFunctionQuery.java |    3 +-
 .../function/TestMinMaxOnMultiValuedField.java  |    4 -
 .../solr/search/function/TestOrdValues.java     |    4 +-
 .../function/TestSortByMinMaxFunction.java      |    2 -
 .../apache/solr/search/join/BJQParserTest.java  |    1 -
 .../search/join/BlockJoinFacetDistribTest.java  |   97 +-
 .../solr/search/mlt/CloudMLTQParserTest.java    |  277 +--
 .../solr/search/mlt/SimpleMLTQParserTest.java   |    4 -
 .../TestClassicSimilarityFactory.java           |    1 -
 .../similarities/TestDFRSimilarityFactory.java  |    2 +-
 .../similarities/TestIBSimilarityFactory.java   |    2 +-
 .../TestNonDefinedSimilarityFactory.java        |    3 +-
 ...stPerFieldSimilarityWithDefaultOverride.java |    2 -
 .../TestSweetSpotSimilarityFactory.java         |    1 -
 .../solr/search/stats/TestDistribIDF.java       |    9 +-
 .../solr/security/BasicAuthIntegrationTest.java |   89 +-
 .../security/TestPKIAuthenticationPlugin.java   |   41 +-
 .../TestRuleBasedAuthorizationPlugin.java       |   98 +-
 .../apache/solr/servlet/ResponseHeaderTest.java |    4 -
 .../spelling/FileBasedSpellCheckerTest.java     |    1 -
 .../solr/spelling/SimpleQueryConverter.java     |    2 -
 .../solr/spelling/SpellCheckCollatorTest.java   |   30 +
 .../spelling/TestSuggestSpellingConverter.java  |    1 -
 .../suggest/TestFreeTextSuggestions.java        |    1 -
 .../solr/uninverting/TestDocTermOrds.java       |  681 +++++++
 .../apache/solr/uninverting/TestFieldCache.java |  721 +++++++
 .../solr/uninverting/TestFieldCacheReopen.java  |   70 +
 .../TestFieldCacheSanityChecker.java            |  164 ++
 .../solr/uninverting/TestFieldCacheSort.java    | 1814 ++++++++++++++++++
 .../uninverting/TestFieldCacheSortRandom.java   |  318 +++
 .../uninverting/TestFieldCacheVsDocValues.java  |  592 ++++++
 .../uninverting/TestFieldCacheWithThreads.java  |  228 +++
 .../solr/uninverting/TestLegacyFieldCache.java  |  497 +++++
 .../solr/uninverting/TestNumericTerms32.java    |  156 ++
 .../solr/uninverting/TestNumericTerms64.java    |  166 ++
 .../solr/uninverting/TestUninvertingReader.java |  395 ++++
 .../apache/solr/update/AddBlockUpdateTest.java  |    2 -
 .../update/DirectUpdateHandlerOptimizeTest.java |    1 -
 .../apache/solr/update/DocumentBuilderTest.java |   13 +-
 .../apache/solr/update/SoftAutoCommitTest.java  |   16 +-
 .../apache/solr/update/SolrIndexConfigTest.java |    2 +-
 .../update/TestDocBasedVersionConstraints.java  |   22 +-
 .../solr/update/TestExceedMaxTermLength.java    |    1 -
 .../org/apache/solr/update/VersionInfoTest.java |    2 -
 .../update/processor/AtomicUpdatesTest.java     |   44 +
 .../CloneFieldUpdateProcessorFactoryTest.java   |    6 +-
 .../processor/CustomUpdateRequestProcessor.java |    4 -
 .../DefaultValueUpdateProcessorTest.java        |    5 -
 ...DocExpirationUpdateProcessorFactoryTest.java |    1 -
 ...ommitOptimizeUpdateProcessorFactoryTest.java |    5 -
 .../RecordingUpdateProcessorFactory.java        |    7 +-
 .../solr/update/processor/ScriptEngineTest.java |    2 +-
 ...atelessScriptUpdateProcessorFactoryTest.java |    5 -
 .../processor/TestNamedUpdateProcessors.java    |   11 +-
 .../TestPartialUpdateDeduplication.java         |    3 -
 .../processor/TolerantUpdateProcessorTest.java  |    2 -
 .../UniqFieldsUpdateProcessorFactoryTest.java   |    1 -
 .../processor/UpdateProcessorTestBase.java      |    1 -
 .../UpdateRequestProcessorFactoryTest.java      |    2 +-
 .../apache/solr/util/DateMathParserTest.java    |  226 ++-
 .../apache/solr/util/SolrPluginUtilsTest.java   |   28 +
 .../org/apache/solr/util/TestFastWriter.java    |    3 -
 .../apache/solr/util/TestSolrCLIRunExample.java |    4 +-
 .../example-DIH/solr/db/conf/managed-schema     |    2 +-
 .../example-DIH/solr/mail/conf/managed-schema   |    2 +-
 .../example-DIH/solr/rss/conf/managed-schema    |    2 +-
 .../example-DIH/solr/solr/conf/managed-schema   |    2 +-
 .../example-DIH/solr/tika/conf/managed-schema   |    2 +-
 solr/example/films/README.txt                   |    2 +
 solr/example/resources/log4j.properties         |    2 +-
 solr/licenses/asm-5.0.4.jar.sha1                |    1 -
 solr/licenses/asm-5.1.jar.sha1                  |    1 +
 solr/licenses/asm-commons-5.0.4.jar.sha1        |    1 -
 solr/licenses/asm-commons-5.1.jar.sha1          |    1 +
 solr/licenses/commons-fileupload-1.2.1.jar.sha1 |    1 -
 solr/licenses/commons-fileupload-1.3.1.jar.sha1 |    1 +
 solr/licenses/commons-io-2.4.jar.sha1           |    1 -
 solr/licenses/commons-io-2.5.jar.sha1           |    1 +
 solr/server/resources/log4j.properties          |    2 +-
 .../scripts/cloud-scripts/log4j.properties      |    2 +-
 solr/server/scripts/cloud-scripts/zkcli.bat     |   15 +-
 solr/server/scripts/cloud-scripts/zkcli.sh      |   15 +-
 .../basic_configs/conf/managed-schema           |    2 +-
 .../conf/managed-schema                         |    2 +-
 .../conf/managed-schema                         |    2 +-
 .../conf/velocity/cluster.vm                    |    2 +-
 solr/server/solr/solr.xml                       |    2 +
 .../org/apache/solr/client/solrj/SolrQuery.java |   11 +-
 .../solr/client/solrj/impl/CloudSolrClient.java |  271 ++-
 .../solrj/impl/ConcurrentUpdateSolrClient.java  |  213 +-
 .../solr/client/solrj/impl/HttpClientUtil.java  |   32 +-
 .../solr/client/solrj/impl/HttpSolrClient.java  |   77 +-
 .../solrj/impl/InputStreamResponseParser.java   |    4 -
 .../solrj/impl/Krb5HttpClientBuilder.java       |    7 -
 .../client/solrj/impl/LBHttpSolrClient.java     |  126 +-
 .../solr/client/solrj/io/SolrClientCache.java   |   12 +-
 .../org/apache/solr/client/solrj/io/Tuple.java  |   53 +-
 .../client/solrj/io/comp/FieldComparator.java   |   13 +
 .../solr/client/solrj/io/comp/HashKey.java      |    2 -
 .../solrj/io/comp/MultipleFieldComparator.java  |   13 +-
 .../solr/client/solrj/io/eq/FieldEqualitor.java |   17 +-
 .../solrj/io/eq/MultipleFieldEqualitor.java     |   12 +
 .../solrj/io/graph/GatherNodesStream.java       |  675 +++++++
 .../apache/solr/client/solrj/io/graph/Node.java |   90 +
 .../solrj/io/graph/ShortestPathStream.java      |   78 +-
 .../solr/client/solrj/io/graph/Traversal.java   |   96 +
 .../solrj/io/graph/TraversalIterator.java       |  120 ++
 .../client/solrj/io/ops/ConcatOperation.java    |   15 +-
 .../client/solrj/io/ops/DistinctOperation.java  |   33 +-
 .../client/solrj/io/ops/GroupOperation.java     |   42 +-
 .../client/solrj/io/ops/ReplaceOperation.java   |    6 +
 .../solrj/io/ops/ReplaceWithFieldOperation.java |   12 +
 .../solrj/io/ops/ReplaceWithValueOperation.java |   12 +
 .../client/solrj/io/ops/StreamOperation.java    |    3 -
 .../client/solrj/io/sql/ConnectionImpl.java     |    6 +-
 .../solrj/io/sql/DatabaseMetaDataImpl.java      |    4 +-
 .../solrj/io/sql/PreparedStatementImpl.java     |  394 ++++
 .../solr/client/solrj/io/sql/ResultSetImpl.java |   78 +-
 .../solr/client/solrj/io/sql/StatementImpl.java |   67 +-
 .../client/solrj/io/stream/BiJoinStream.java    |    8 -
 .../client/solrj/io/stream/CloudSolrStream.java |  157 +-
 .../solrj/io/stream/ComplementStream.java       |   57 +-
 .../client/solrj/io/stream/DaemonStream.java    |   57 +-
 .../client/solrj/io/stream/ExceptionStream.java |   14 +
 .../client/solrj/io/stream/FacetStream.java     |  107 +-
 .../client/solrj/io/stream/HashJoinStream.java  |   89 +-
 .../client/solrj/io/stream/IntersectStream.java |   56 +-
 .../solr/client/solrj/io/stream/JDBCStream.java |   37 +
 .../solr/client/solrj/io/stream/JoinStream.java |   33 +-
 .../solrj/io/stream/LeftOuterJoinStream.java    |    4 -
 .../client/solrj/io/stream/MergeStream.java     |   35 +-
 .../solrj/io/stream/OuterHashJoinStream.java    |   18 +-
 .../client/solrj/io/stream/ParallelStream.java  |   62 +-
 .../client/solrj/io/stream/PushBackStream.java  |    7 +-
 .../client/solrj/io/stream/RandomStream.java    |  237 +++
 .../solr/client/solrj/io/stream/RankStream.java |   43 +-
 .../client/solrj/io/stream/ReducerStream.java   |   37 +-
 .../client/solrj/io/stream/RollupStream.java    |   43 +-
 .../client/solrj/io/stream/SelectStream.java    |   41 +-
 .../solr/client/solrj/io/stream/SolrStream.java |   57 +-
 .../solr/client/solrj/io/stream/SortStream.java |  199 ++
 .../client/solrj/io/stream/StatsStream.java     |   88 +-
 .../client/solrj/io/stream/StreamContext.java   |    6 +-
 .../client/solrj/io/stream/TopicStream.java     |  148 +-
 .../client/solrj/io/stream/TupleStream.java     |   10 +
 .../client/solrj/io/stream/UniqueStream.java    |   37 +-
 .../client/solrj/io/stream/UpdateStream.java    |   54 +-
 .../solrj/io/stream/expr/Explanation.java       |  158 ++
 .../solrj/io/stream/expr/Expressible.java       |    9 +
 .../solrj/io/stream/expr/StreamExplanation.java |   70 +
 .../client/solrj/io/stream/metrics/Bucket.java  |    8 +-
 .../solrj/io/stream/metrics/CountMetric.java    |   13 +-
 .../solrj/io/stream/metrics/MaxMetric.java      |   16 +-
 .../solrj/io/stream/metrics/MeanMetric.java     |   22 +-
 .../client/solrj/io/stream/metrics/Metric.java  |   35 +-
 .../solrj/io/stream/metrics/MinMetric.java      |   10 +-
 .../solrj/io/stream/metrics/SumMetric.java      |   19 +-
 .../solrj/request/CollectionAdminRequest.java   |  199 ++
 .../client/solrj/request/UpdateRequest.java     |   18 +-
 .../solr/client/solrj/response/FacetField.java  |    1 -
 .../solr/client/solrj/response/PivotField.java  |    2 -
 .../solrj/response/schema/SchemaResponse.java   |   64 +-
 .../solrj/util/SolrIdentifierValidator.java     |   12 +-
 .../apache/solr/common/SolrInputDocument.java   |    6 +-
 .../solr/common/cloud/ClusterProperties.java    |  126 ++
 .../apache/solr/common/cloud/ClusterState.java  |   92 +-
 .../solr/common/cloud/ClusterStateUtil.java     |   24 +-
 .../common/cloud/CollectionStatePredicate.java  |   42 +
 .../common/cloud/CollectionStateWatcher.java    |   42 +
 .../apache/solr/common/cloud/DocCollection.java |   60 +-
 .../apache/solr/common/cloud/OnReconnect.java   |    9 +-
 .../org/apache/solr/common/cloud/Replica.java   |   15 +-
 .../org/apache/solr/common/cloud/Slice.java     |   40 +-
 .../apache/solr/common/cloud/SolrZkClient.java  |    1 -
 .../solr/common/cloud/ZkConfigManager.java      |   26 +-
 .../apache/solr/common/cloud/ZkStateReader.java |  549 ++++--
 .../solr/common/params/CollectionParams.java    |  125 +-
 .../solr/common/params/CoreAdminParams.java     |   21 +-
 .../apache/solr/common/params/FacetParams.java  |   17 +
 .../solr/common/params/HighlightParams.java     |    1 +
 .../apache/solr/common/util/ExecutorUtil.java   |   14 +-
 .../apache/solr/common/util/JavaBinCodec.java   |    8 +-
 .../solr/common/util/JsonRecordReader.java      |  132 +-
 .../org/apache/solr/common/util/NamedList.java  |   69 +
 .../java/org/apache/solr/common/util/Pair.java  |   41 +-
 .../org/apache/solr/common/util/StrUtils.java   |   10 +-
 .../java/org/apache/solr/common/util/Utils.java |    1 +
 .../collection1/conf/schema-replication1.xml    |   15 +-
 .../solrj/solr/collection1/conf/schema-sql.xml  | 1087 +++++------
 .../solr/collection1/conf/schema-streaming.xml  |  600 ------
 .../solrj/solr/collection1/conf/schema.xml      |  975 +++++-----
 .../collection1/conf/solrconfig-streaming.xml   |   51 -
 .../configset-1/conf/schema-minimal.xml         |    6 +-
 .../solr/configsets/configset-2/conf/schema.xml |    6 +-
 .../solr/configsets/shared/conf/schema.xml      |   76 +-
 .../solr/configsets/streaming/conf/schema.xml   |  612 ++++++
 .../configsets/streaming/conf/solrconfig.xml    |   51 +
 .../solrj/solr/crazy-path-to-schema.xml         |    9 +-
 .../apache/solr/client/solrj/GetByIdTest.java   |    2 -
 .../solrj/MergeIndexesExampleTestBase.java      |    1 -
 .../client/solrj/SolrExampleBinaryTest.java     |    2 +-
 .../solr/client/solrj/SolrExampleTests.java     |    2 +-
 .../solr/client/solrj/SolrExampleXMLTest.java   |    2 +-
 .../solr/client/solrj/SolrExceptionTest.java    |    4 +-
 .../client/solrj/SolrSchemalessExampleTest.java |    3 +-
 .../solr/client/solrj/TestLBHttpSolrClient.java |    8 +-
 .../solrj/beans/TestDocumentObjectBinder.java   |    2 -
 .../client/solrj/embedded/JettyWebappTest.java  |    4 +-
 .../embedded/LargeVolumeBinaryJettyTest.java    |    1 -
 .../solrj/embedded/LargeVolumeEmbeddedTest.java |    1 -
 .../solrj/embedded/LargeVolumeJettyTest.java    |    1 -
 .../solrj/embedded/SolrExampleEmbeddedTest.java |    1 -
 .../solrj/embedded/SolrExampleJettyTest.java    |    2 +-
 .../embedded/SolrExampleStreamingTest.java      |   23 +-
 .../solrj/impl/BasicHttpSolrClientTest.java     |   47 +-
 .../solrj/impl/CloudSolrClientBuilderTest.java  |   90 +
 .../client/solrj/impl/CloudSolrClientTest.java  |  428 ++---
 .../ConcurrentUpdateSolrClientBuilderTest.java  |   33 +
 .../impl/ConcurrentUpdateSolrClientTest.java    |  115 +-
 .../solrj/impl/HttpSolrClientBuilderTest.java   |   76 +
 .../solrj/impl/LBHttpSolrClientBuilderTest.java |   65 +
 .../solrj/io/graph/GraphExpressionTest.java     |  727 +++++--
 .../solr/client/solrj/io/graph/GraphTest.java   |  243 +--
 .../client/solrj/io/sql/JdbcDriverTest.java     |    7 +-
 .../solr/client/solrj/io/sql/JdbcTest.java      |  252 ++-
 .../client/solrj/io/stream/JDBCStreamTest.java  |  435 ++---
 .../solrj/io/stream/RecordCountStream.java      |   37 +-
 .../solrj/io/stream/StreamExpressionTest.java   | 1593 ++++++++-------
 .../StreamExpressionToExplanationTest.java      |  289 +++
 .../client/solrj/io/stream/StreamingTest.java   | 1372 +++++++------
 .../io/stream/ops/ConcatOperationTest.java      |    1 -
 .../solrj/request/TestUpdateRequestCodec.java   |    2 -
 .../cloud/TestCollectionStateWatchers.java      |  278 +++
 .../solr/common/cloud/TestZkConfigManager.java  |    6 +
 .../solr/common/util/TestJsonRecordReader.java  |   63 +-
 solr/test-framework/build.xml                   |    6 +
 .../solr/BaseDistributedSearchTestCase.java     |    2 +-
 .../java/org/apache/solr/SolrJettyTestBase.java |    2 +-
 .../java/org/apache/solr/SolrTestCaseHS.java    |   40 +-
 .../java/org/apache/solr/SolrTestCaseJ4.java    |  182 +-
 .../solr/analysis/MockTokenizerFactory.java     |    1 -
 .../solr/cloud/AbstractDistribZkTestBase.java   |   28 +-
 .../cloud/AbstractFullDistribZkTestBase.java    |  119 +-
 .../java/org/apache/solr/cloud/ChaosMonkey.java |    1 -
 .../apache/solr/cloud/MiniSolrCloudCluster.java |   50 +-
 .../org/apache/solr/cloud/MockSolrZkClient.java |    1 -
 .../apache/solr/cloud/SolrCloudTestCase.java    |    6 +
 .../org/apache/solr/util/BaseTestHarness.java   |    1 -
 .../org/apache/solr/util/ExternalPaths.java     |    4 -
 .../apache/solr/util/RESTfulServerProvider.java |    2 +-
 .../org/apache/solr/util/RandomMergePolicy.java |    8 -
 .../java/org/apache/solr/util/RandomizeSSL.java |  174 ++
 .../java/org/apache/solr/util/RestTestBase.java |    7 +-
 .../org/apache/solr/util/SSLTestConfig.java     |  335 +++-
 .../resources/SSLTestConfig.testing.keystore    |  Bin 0 -> 2208 bytes
 solr/webapp/web/css/angular/menu.css            |    1 +
 solr/webapp/web/css/angular/stream.css          |  233 +++
 solr/webapp/web/index.html                      |    7 +-
 solr/webapp/web/js/angular/app.js               |    8 +
 .../webapp/web/js/angular/controllers/stream.js |  240 +++
 solr/webapp/web/partials/schema.html            |    2 +-
 solr/webapp/web/partials/stream.html            |   64 +
 1783 files changed, 78601 insertions(+), 49057 deletions(-)
----------------------------------------------------------------------