You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by kw...@apache.org on 2016/10/02 19:18:46 UTC

[2/2] lucene-solr:master: Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr

Merge branch 'master' of https://git-wip-us.apache.org/repos/asf/lucene-solr


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

Branch: refs/heads/master
Commit: 3182cd9872af3cb73a1f73e36de68b8d76646e59
Parents: 08ca33f 67a9d3a
Author: Karl Wright <Da...@gmail.com>
Authored: Sun Oct 2 15:18:22 2016 -0400
Committer: Karl Wright <Da...@gmail.com>
Committed: Sun Oct 2 15:18:22 2016 -0400

----------------------------------------------------------------------
 .../solr/test-framework/solr-test-framework.iml |    2 +
 .../maven/solr/test-framework/pom.xml.template  |    5 +
 dev-tools/scripts/addVersion.py                 |   39 +-
 dev-tools/scripts/checkJavadocLinks.py          |    3 +
 dev-tools/scripts/poll-mirrors.pl               |  155 ---
 dev-tools/scripts/poll-mirrors.py               |  162 +++
 lucene/CHANGES.txt                              |   73 +-
 .../lucene/analysis/core/LowerCaseFilter.java   |   41 +
 .../analysis/core/LowerCaseFilterFactory.java   |    1 -
 .../apache/lucene/analysis/core/StopFilter.java |   47 +
 .../lucene/analysis/core/StopFilterFactory.java |    1 -
 .../lucene/analysis/minhash/MinHashFilter.java  |   17 +-
 .../lucene/analysis/standard/package.html       |    4 +
 .../core/TestAllAnalyzersHaveFactories.java     |    4 +-
 .../lucene/analysis/core/TestRandomChains.java  |    5 +-
 .../collation/TestCollationDocValuesField.java  |    3 +-
 .../TestICUCollationDocValuesField.java         |    3 +-
 .../index/TestBackwardsCompatibility.java       |   69 +-
 .../org/apache/lucene/index/index.6.2.1-cfs.zip |  Bin 0 -> 15851 bytes
 .../apache/lucene/index/index.6.2.1-nocfs.zip   |  Bin 0 -> 15845 bytes
 .../lucene/index/unsupported.5.5.3-cfs.zip      |  Bin 0 -> 13724 bytes
 .../lucene/index/unsupported.5.5.3-nocfs.zip    |  Bin 0 -> 13725 bytes
 .../codecs/memory/DirectDocValuesConsumer.java  |   33 +-
 .../codecs/memory/DirectDocValuesProducer.java  |  100 +-
 .../codecs/memory/MemoryDocValuesConsumer.java  |   45 +-
 .../codecs/memory/MemoryDocValuesProducer.java  |  104 +-
 .../simpletext/SimpleTextDocValuesReader.java   |   64 +-
 .../simpletext/SimpleTextDocValuesWriter.java   |   31 +-
 .../simpletext/SimpleTextNormsFormat.java       |    9 +-
 lucene/common-build.xml                         |    4 +-
 .../apache/lucene/analysis/LowerCaseFilter.java |    2 +-
 .../org/apache/lucene/analysis/StopFilter.java  |    2 +-
 .../apache/lucene/codecs/DocValuesConsumer.java | 1069 ++++++++----------
 .../apache/lucene/codecs/DocValuesProducer.java |    7 -
 .../lucene/codecs/LegacyDocValuesIterables.java |  514 +++++++++
 .../lucene/codecs/MultiLevelSkipListReader.java |    9 +-
 .../org/apache/lucene/codecs/NormsConsumer.java |  133 +--
 .../lucene/codecs/blocktree/FieldReader.java    |    2 +-
 .../codecs/lucene53/Lucene53NormsConsumer.java  |    8 +-
 .../codecs/lucene53/Lucene53NormsProducer.java  |   47 +-
 .../lucene54/Lucene54DocValuesConsumer.java     |   41 +-
 .../lucene54/Lucene54DocValuesProducer.java     |  345 ++++--
 .../lucene/codecs/lucene54/package-info.java    |    2 +-
 .../perfield/PerFieldDocValuesFormat.java       |   28 +-
 .../lucene/document/BinaryDocValuesField.java   |    1 -
 .../apache/lucene/index/BinaryDocValues.java    |   19 +-
 .../lucene/index/BinaryDocValuesWriter.java     |   80 +-
 .../org/apache/lucene/index/CheckIndex.java     |  178 ++-
 .../org/apache/lucene/index/CodecReader.java    |  151 +--
 .../lucene/index/DefaultIndexingChain.java      |    2 -
 .../org/apache/lucene/index/DocIDMerger.java    |   11 +-
 .../java/org/apache/lucene/index/DocValues.java |  327 ++++--
 .../index/DocumentsWriterDeleteQueue.java       |   16 +-
 .../lucene/index/EmptyDocValuesProducer.java    |   71 ++
 .../lucene/index/FilterBinaryDocValues.java     |   61 +
 .../apache/lucene/index/FilterLeafReader.java   |    6 -
 .../lucene/index/FilterNumericDocValues.java    |   59 +
 .../org/apache/lucene/index/LeafReader.java     |   15 +-
 .../lucene/index/LegacyBinaryDocValues.java     |   39 +
 .../index/LegacyBinaryDocValuesWrapper.java     |   82 ++
 .../lucene/index/LegacyNumericDocValues.java    |   38 +
 .../index/LegacyNumericDocValuesWrapper.java    |   92 ++
 .../lucene/index/LegacySortedDocValues.java     |  110 ++
 .../index/LegacySortedDocValuesWrapper.java     |   92 ++
 .../index/LegacySortedNumericDocValues.java     |   49 +
 .../LegacySortedNumericDocValuesWrapper.java    |   88 ++
 .../lucene/index/LegacySortedSetDocValues.java  |  109 ++
 .../index/LegacySortedSetDocValuesWrapper.java  |  102 ++
 .../org/apache/lucene/index/LogMergePolicy.java |    6 +-
 .../apache/lucene/index/MergeReaderWrapper.java |   15 -
 .../org/apache/lucene/index/MultiDocValues.java |  642 ++++++++---
 .../org/apache/lucene/index/MultiSorter.java    |  339 +++---
 .../apache/lucene/index/NormValuesWriter.java   |   69 +-
 .../apache/lucene/index/NumericDocValues.java   |    9 +-
 .../index/NumericDocValuesFieldUpdates.java     |    3 +-
 .../lucene/index/NumericDocValuesWriter.java    |   65 +-
 .../apache/lucene/index/ParallelLeafReader.java |    9 +-
 .../apache/lucene/index/RandomAccessOrds.java   |   53 -
 .../apache/lucene/index/ReadersAndUpdates.java  |  216 ++--
 .../lucene/index/SegmentDocValuesProducer.java  |    8 -
 .../org/apache/lucene/index/SegmentReader.java  |   12 +-
 .../index/SingletonSortedNumericDocValues.java  |   55 +-
 .../index/SingletonSortedSetDocValues.java      |   47 +-
 .../lucene/index/SlowCodecReaderWrapper.java    |    7 +-
 .../apache/lucene/index/SortedDocValues.java    |   33 +-
 .../lucene/index/SortedDocValuesWriter.java     |  112 +-
 .../lucene/index/SortedNumericDocValues.java    |   25 +-
 .../index/SortedNumericDocValuesWriter.java     |  103 +-
 .../apache/lucene/index/SortedSetDocValues.java |   22 +-
 .../lucene/index/SortedSetDocValuesWriter.java  |  191 ++--
 .../java/org/apache/lucene/index/Sorter.java    |  204 +++-
 .../apache/lucene/index/SortingLeafReader.java  |  460 ++++++--
 .../org/apache/lucene/search/BooleanQuery.java  |   14 +-
 .../lucene/search/DocValuesRewriteMethod.java   |   18 +-
 .../apache/lucene/search/ExactPhraseScorer.java |    2 +-
 .../apache/lucene/search/FieldComparator.java   |  288 ++---
 .../apache/lucene/search/FieldValueQuery.java   |   45 +-
 .../org/apache/lucene/search/FuzzyQuery.java    |    2 +-
 .../apache/lucene/search/FuzzyTermsEnum.java    |  367 +++---
 .../org/apache/lucene/search/LRUQueryCache.java |    8 +-
 .../apache/lucene/search/PointInSetQuery.java   |    2 +-
 .../lucene/search/SloppyPhraseScorer.java       |    2 +-
 .../lucene/search/SortedNumericSelector.java    |  101 +-
 .../lucene/search/SortedNumericSortField.java   |    2 +-
 .../apache/lucene/search/SortedSetSelector.java |  249 +++-
 .../lucene/search/SortedSetSortField.java       |    5 +-
 .../apache/lucene/search/TopTermsRewrite.java   |    4 +-
 .../org/apache/lucene/search/package-info.java  |    2 +-
 .../search/similarities/BM25Similarity.java     |   31 +-
 .../search/similarities/MultiSimilarity.java    |    4 +-
 .../lucene/search/similarities/Similarity.java  |    4 +-
 .../search/similarities/SimilarityBase.java     |   26 +-
 .../search/similarities/TFIDFSimilarity.java    |   35 +-
 .../src/java/org/apache/lucene/util/Bits.java   |    4 +-
 .../org/apache/lucene/util/ByteBlockPool.java   |    2 +-
 .../java/org/apache/lucene/util/LongValues.java |   11 +-
 .../java/org/apache/lucene/util/Version.java    |    7 +
 .../apache/lucene/util/packed/PackedInts.java   |    4 +-
 .../lucene54/TestLucene54DocValuesFormat.java   |   82 +-
 .../perfield/TestPerFieldDocValuesFormat.java   |   10 +-
 .../lucene/index/Test2BBinaryDocValues.java     |    6 +-
 .../org/apache/lucene/index/Test2BDocs.java     |  135 +++
 .../lucene/index/Test2BNumericDocValues.java    |    3 +-
 .../index/Test2BSortedDocValuesFixedSorted.java |    5 +-
 .../lucene/index/Test2BSortedDocValuesOrds.java |    5 +-
 .../index/TestBinaryDocValuesUpdates.java       |  139 ++-
 .../apache/lucene/index/TestCustomNorms.java    |    3 +-
 .../index/TestDemoParallelLeafReader.java       |   58 +-
 .../lucene/index/TestDirectoryReader.java       |   11 +-
 .../lucene/index/TestDirectoryReaderReopen.java |   23 +-
 .../org/apache/lucene/index/TestDocValues.java  |   11 +-
 .../lucene/index/TestDocValuesIndexing.java     |   28 +-
 .../index/TestExitableDirectoryReader.java      |    5 +-
 .../apache/lucene/index/TestIndexSorting.java   |  171 +--
 .../apache/lucene/index/TestIndexWriter.java    |    4 +-
 .../lucene/index/TestIndexWriterExceptions.java |    8 +-
 .../index/TestIndexingSequenceNumbers.java      |    6 +-
 .../lucene/index/TestMaxTermFrequency.java      |    3 +-
 .../lucene/index/TestMixedDocValuesUpdates.java |   26 +-
 .../apache/lucene/index/TestMultiDocValues.java |  142 ++-
 .../test/org/apache/lucene/index/TestNorms.java |    9 +-
 .../index/TestNumericDocValuesUpdates.java      |  139 ++-
 .../org/apache/lucene/index/TestOmitNorms.java  |   19 +-
 .../org/apache/lucene/index/TestOrdinalMap.java |   10 +-
 .../lucene/index/TestPostingsOffsets.java       |   20 +-
 .../org/apache/lucene/index/TestTermsEnum.java  |    9 +-
 .../lucene/index/TestUniqueTermCount.java       |    3 +-
 .../search/FuzzyTermOnShortTermsTest.java       |   15 +-
 .../org/apache/lucene/search/TestBoolean2.java  |   50 +-
 .../lucene/search/TestBooleanRewrites.java      |   28 +
 .../lucene/search/TestDocValuesScoring.java     |   26 +-
 .../lucene/search/TestElevationComparator.java  |   20 +-
 .../apache/lucene/search/TestFuzzyQuery.java    |  213 ++++
 .../lucene/search/TestMinShouldMatch2.java      |    7 +-
 .../apache/lucene/search/TestPointQueries.java  |   13 +-
 .../lucene/search/TestSearcherManager.java      |    6 +-
 .../lucene/search/TestSimilarityProvider.java   |    4 +-
 .../apache/lucene/search/TestSortRandom.java    |    3 +-
 .../lucene/util/packed/TestDirectPacked.java    |    6 +-
 .../lucene/expressions/SimpleBindings.java      |    2 +-
 .../expressions/js/JavascriptCompiler.java      |    2 +-
 .../expressions/TestExpressionValueSource.java  |    1 +
 .../DefaultSortedSetDocValuesReaderState.java   |    8 +-
 .../SortedSetDocValuesFacetCounts.java          |   54 +-
 .../facet/taxonomy/DocValuesOrdinalsReader.java |   19 +-
 .../facet/taxonomy/FastTaxonomyFacetCounts.java |   35 +-
 .../taxonomy/OrdinalMappingLeafReader.java      |   18 +-
 .../facet/taxonomy/TaxonomyFacetCounts.java     |    2 +-
 .../TaxonomyFacetSumFloatAssociations.java      |   39 +-
 .../TaxonomyFacetSumIntAssociations.java        |   39 +-
 .../lucene/facet/TestMultipleIndexFields.java   |    2 +-
 .../taxonomy/TestOrdinalMappingLeafReader.java  |    6 +-
 .../AbstractFirstPassGroupingCollector.java     |    2 +-
 .../FunctionFirstPassGroupingCollector.java     |    2 +-
 .../term/TermAllGroupHeadsCollector.java        |  170 ++-
 .../grouping/term/TermAllGroupsCollector.java   |   22 +-
 .../term/TermDistinctValuesCollector.java       |   37 +-
 .../term/TermFirstPassGroupingCollector.java    |   16 +-
 .../grouping/term/TermGroupFacetCollector.java  |   61 +-
 .../term/TermSecondPassGroupingCollector.java   |   17 +-
 .../grouping/AllGroupHeadsCollectorTest.java    |   11 +-
 .../lucene/search/grouping/TestGrouping.java    |   41 +-
 .../search/highlight/TermVectorLeafReader.java  |    5 -
 .../highlight/WeightedSpanTermExtractor.java    |   33 +-
 .../search/highlight/HighlighterTest.java       |   30 +-
 .../search/join/BaseGlobalOrdinalScorer.java    |    6 +-
 .../lucene/search/join/BlockJoinSelector.java   |  196 +++-
 .../search/join/DocValuesTermsCollector.java    |    5 +-
 .../search/join/GenericTermsCollector.java      |   30 +-
 .../search/join/GlobalOrdinalsCollector.java    |   21 +-
 .../lucene/search/join/GlobalOrdinalsQuery.java |   21 +-
 .../join/GlobalOrdinalsWithScoreCollector.java  |   36 +-
 .../join/GlobalOrdinalsWithScoreQuery.java      |   30 +-
 .../org/apache/lucene/search/join/JoinUtil.java |   44 +-
 .../lucene/search/join/TermsCollector.java      |   23 +-
 .../search/join/TermsWithScoreCollector.java    |   89 +-
 .../search/join/ToChildBlockJoinQuery.java      |    5 +-
 .../search/join/ToParentBlockJoinQuery.java     |   21 +-
 .../search/join/ToParentBlockJoinSortField.java |   54 +-
 .../search/join/TestBlockJoinSelector.java      |  197 +++-
 .../search/join/TestBlockJoinSorting.java       |    9 +-
 .../search/join/TestBlockJoinValidation.java    |    4 +-
 .../apache/lucene/search/join/TestJoinUtil.java |   51 +-
 lucene/licenses/javax.servlet-LICENSE-CDDL.txt  |  139 ---
 .../jcl-over-slf4j-LICENSE-BSD_LIKE.txt         |   21 -
 lucene/licenses/jcl-over-slf4j-LICENSE-MIT.txt  |   21 +
 lucene/licenses/servlet-api-LICENSE-CDDL.txt    |  137 ---
 lucene/licenses/slf4j-LICENSE-BSD_LIKE.txt      |   21 -
 lucene/licenses/slf4j-LICENSE-MIT.txt           |   21 +
 .../apache/lucene/index/memory/MemoryIndex.java |   88 +-
 .../lucene/index/memory/TestMemoryIndex.java    |   42 +-
 .../memory/TestMemoryIndexAgainstRAMDir.java    |   58 +-
 .../search/DiversifiedTopDocsCollector.java     |   14 +-
 .../search/TestDiversifiedTopDocsCollector.java |   70 +-
 .../lucene/queries/function/FunctionValues.java |   60 +-
 .../lucene/queries/function/ValueSource.java    |   10 +-
 .../queries/function/ValueSourceScorer.java     |    2 +-
 .../function/docvalues/BoolDocValues.java       |   24 +-
 .../docvalues/DocTermsIndexDocValues.java       |   78 +-
 .../function/docvalues/DoubleDocValues.java     |   32 +-
 .../function/docvalues/FloatDocValues.java      |   22 +-
 .../function/docvalues/IntDocValues.java        |   24 +-
 .../function/docvalues/LongDocValues.java       |   26 +-
 .../function/docvalues/StrDocValues.java        |   12 +-
 .../valuesource/BytesRefFieldSource.java        |   56 +-
 .../valuesource/ComparisonBoolFunction.java     |    8 +-
 .../function/valuesource/DefFunction.java       |   26 +-
 .../function/valuesource/DivFloatFunction.java  |    4 +-
 .../function/valuesource/DoubleFieldSource.java |   43 +-
 .../function/valuesource/DualFloatFunction.java |    8 +-
 .../function/valuesource/EnumFieldSource.java   |   37 +-
 .../function/valuesource/FloatFieldSource.java  |   40 +-
 .../function/valuesource/IfFunction.java        |   24 +-
 .../function/valuesource/IntFieldSource.java    |   40 +-
 .../valuesource/JoinDocFreqValueSource.java     |   27 +-
 .../valuesource/LinearFloatFunction.java        |    6 +-
 .../function/valuesource/LongFieldSource.java   |   56 +-
 .../function/valuesource/MaxFloatFunction.java  |    6 +-
 .../function/valuesource/MinFloatFunction.java  |    6 +-
 .../function/valuesource/MultiBoolFunction.java |    6 +-
 .../valuesource/MultiFloatFunction.java         |   10 +-
 .../function/valuesource/MultiFunction.java     |   13 +-
 .../function/valuesource/NormValueSource.java   |   23 +-
 .../function/valuesource/PowFloatFunction.java  |    4 +-
 .../valuesource/ProductFloatFunction.java       |    4 +-
 .../valuesource/RangeMapFloatFunction.java      |    4 +-
 .../valuesource/ReciprocalFloatFunction.java    |    6 +-
 .../valuesource/ScaleFloatFunction.java         |    6 +-
 .../valuesource/SimpleBoolFunction.java         |    6 +-
 .../valuesource/SimpleFloatFunction.java        |    6 +-
 .../valuesource/SortedSetFieldSource.java       |    6 +-
 .../function/valuesource/SumFloatFunction.java  |    6 +-
 .../function/valuesource/VectorValueSource.java |   33 +-
 .../lucene/queries/TestCustomScoreQuery.java    |   11 +-
 .../queries/function/TestValueSources.java      |    4 +-
 .../xml/builders/FuzzyLikeThisQueryBuilder.java |    4 +-
 .../document/LatLonPointDistanceComparator.java |   58 +-
 .../sandbox/queries/FuzzyLikeThisQuery.java     |  312 ++---
 .../lucene/sandbox/queries/SlowFuzzyQuery.java  |  201 ----
 .../sandbox/queries/SlowFuzzyTermsEnum.java     |  263 -----
 .../lucene/search/DocValuesNumbersQuery.java    |   31 +-
 .../lucene/search/DocValuesRangeQuery.java      |   36 +-
 .../lucene/search/DocValuesTermsQuery.java      |   16 +-
 .../lucene/search/TermAutomatonScorer.java      |    2 +-
 .../sandbox/queries/FuzzyLikeThisQueryTest.java |   14 +-
 .../sandbox/queries/TestSlowFuzzyQuery.java     |  487 --------
 .../search/BaseRangeFieldQueryTestCase.java     |    5 +-
 .../search/TestDoubleRangeFieldQueries.java     |   34 +-
 .../search/TestFloatRangeFieldQueries.java      |   34 +-
 .../lucene/search/TestIntRangeFieldQueries.java |   34 +-
 .../search/TestLongRangeFieldQueries.java       |   34 +-
 .../spatial/bbox/BBoxSimilarityValueSource.java |    9 +-
 .../lucene/spatial/bbox/BBoxValueSource.java    |   54 +-
 .../serialized/SerializedDVStrategy.java        |   35 +-
 .../spatial/util/CachingDoubleValueSource.java  |    6 +-
 .../util/DistanceToShapeValueSource.java        |    4 +-
 .../spatial/util/ShapeAreaValueSource.java      |    6 +-
 .../spatial/util/ShapePredicateValueSource.java |    4 +-
 .../spatial/vector/DistanceValueSource.java     |   33 +-
 .../GeoPointTermQueryConstantScoreWrapper.java  |   16 +-
 .../spatial3d/Geo3DPointDistanceComparator.java |   43 +-
 .../Geo3DPointOutsideDistanceComparator.java    |   41 +-
 .../apache/lucene/spatial3d/TestGeo3DPoint.java |    7 +-
 .../lucene/search/spell/DirectSpellChecker.java |   20 +-
 .../search/suggest/DocumentDictionary.java      |   12 +-
 .../suggest/DocumentValueSourceDictionary.java  |    8 +-
 .../analyzing/AnalyzingInfixSuggester.java      |   31 +-
 .../analyzing/BlendedInfixSuggester.java        |   26 +-
 .../document/TestPrefixCompletionQuery.java     |   33 +-
 .../asserting/AssertingDocValuesFormat.java     |  173 ++-
 .../asserting/AssertingLiveDocsFormat.java      |    2 +-
 .../codecs/asserting/AssertingNormsFormat.java  |   22 +-
 .../codecs/cranky/CrankyDocValuesFormat.java    |   21 +-
 .../lucene/codecs/cranky/CrankyNormsFormat.java |    4 +-
 .../apache/lucene/geo/BaseGeoPointTestCase.java |   21 +-
 .../lucene/index/AssertingLeafReader.java       |  372 +++---
 .../index/BaseDocValuesFormatTestCase.java      |  724 ++++++------
 .../index/BaseIndexFileFormatTestCase.java      |  101 +-
 .../lucene/index/BaseNormsFormatTestCase.java   |   14 +-
 .../lucene/index/BasePointsFormatTestCase.java  |   31 +-
 .../index/BaseStoredFieldsFormatTestCase.java   |    3 +-
 .../lucene/index/FieldFilterLeafReader.java     |   13 -
 .../org/apache/lucene/search/QueryUtils.java    |   11 +-
 .../org/apache/lucene/util/LuceneTestCase.java  |   77 +-
 .../java/org/apache/lucene/util/TestUtil.java   |    3 +-
 solr/CHANGES.txt                                |  218 +++-
 solr/NOTICE.txt                                 |    2 +-
 solr/bin/install_solr_service.sh                |   62 +-
 solr/bin/solr                                   |   82 +-
 solr/bin/solr.cmd                               |   36 +-
 solr/bin/solr.in.cmd                            |    7 +-
 solr/bin/solr.in.sh                             |    7 +-
 solr/build.xml                                  |   21 +-
 .../facet/FieldFacetAccumulator.java            |   44 +-
 .../AbstractDelegatingStatsCollector.java       |    2 +-
 .../statistics/MedianStatsCollector.java        |    3 +-
 .../statistics/MinMaxStatsCollector.java        |    2 +-
 .../statistics/NumericStatsCollector.java       |    3 +-
 .../statistics/PercentileStatsCollector.java    |    3 +-
 .../analytics/statistics/StatsCollector.java    |    2 +-
 .../statistics/UniqueStatsCollector.java        |    3 +-
 .../AbsoluteValueDoubleFunction.java            |    4 +-
 .../util/valuesource/AddDoubleFunction.java     |    4 +-
 .../util/valuesource/ConcatStringFunction.java  |    4 +-
 .../util/valuesource/DateFieldSource.java       |   36 +-
 .../util/valuesource/DateMathFunction.java      |    3 +-
 .../util/valuesource/DivDoubleFunction.java     |    4 +-
 .../util/valuesource/DualDoubleFunction.java    |    8 +-
 .../util/valuesource/FilterFieldSource.java     |   22 +-
 .../util/valuesource/LogDoubleFunction.java     |    4 +-
 .../util/valuesource/MultiDateFunction.java     |   10 +-
 .../util/valuesource/MultiDoubleFunction.java   |    8 +-
 .../util/valuesource/MultiStringFunction.java   |   12 +-
 .../valuesource/MultiplyDoubleFunction.java     |    4 +-
 .../util/valuesource/NegateDoubleFunction.java  |    4 +-
 .../util/valuesource/PowDoubleFunction.java     |    4 +-
 .../util/valuesource/ReverseStringFunction.java |    4 +-
 .../util/valuesource/SingleDoubleFunction.java  |    8 +-
 .../util/valuesource/SingleStringFunction.java  |   14 +-
 .../solr/collection1/conf/solrconfig.xml        |    8 -
 .../dataimport/SimplePropertiesWriter.java      |   33 +-
 .../handler/dataimport/TemplateTransformer.java |   25 +-
 .../handler/dataimport/ZKPropertiesWriter.java  |   20 +-
 .../dataimport/TestTemplateTransformer.java     |   38 +
 .../handler/extraction/XLSXResponseWriter.java  |  414 +++++++
 .../extraction/solr/collection1/conf/schema.xml |    2 +
 .../extraction/TestXLSXResponseWriter.java      |  257 +++++
 .../solr/hadoop/TreeMergeOutputFormat.java      |   10 +-
 .../solr/collection1/conf/solrconfig.xml        |   65 --
 .../test-files/solr/minimr/conf/solrconfig.xml  |   65 --
 .../test-files/solr/mrunit/conf/solrconfig.xml  |   65 --
 .../collection1/conf/solrconfig.xml             |   65 --
 .../solr/solrcloud/conf/solrconfig.xml          |   66 --
 .../uima/solr/collection1/conf/solrconfig.xml   |   55 -
 .../uima/uima-tokenizers-solrconfig.xml         |   53 -
 solr/core/ivy.xml                               |    4 +-
 .../client/solrj/embedded/JettySolrRunner.java  |   18 +-
 .../java/org/apache/solr/cloud/BackupCmd.java   |    6 +-
 .../apache/solr/cloud/CreateCollectionCmd.java  |   11 +-
 .../org/apache/solr/cloud/DeleteNodeCmd.java    |   15 +-
 .../org/apache/solr/cloud/DeleteReplicaCmd.java |  144 ++-
 .../org/apache/solr/cloud/DeleteShardCmd.java   |   94 +-
 .../org/apache/solr/cloud/ElectionContext.java  |   68 +-
 .../solr/cloud/ExclusiveSliceProperty.java      |  345 ++++++
 .../org/apache/solr/cloud/LeaderElector.java    |   14 +-
 .../java/org/apache/solr/cloud/Overseer.java    |  335 +-----
 .../OverseerAutoReplicaFailoverThread.java      |    3 +-
 .../cloud/OverseerCollectionMessageHandler.java |   30 +-
 .../solr/cloud/OverseerTaskProcessor.java       |   14 +-
 .../apache/solr/cloud/OverseerTaskQueue.java    |    2 +-
 .../org/apache/solr/cloud/RecoveryStrategy.java |    6 +-
 .../org/apache/solr/cloud/ReplaceNodeCmd.java   |    5 +-
 .../java/org/apache/solr/cloud/RestoreCmd.java  |    6 +-
 .../org/apache/solr/cloud/SplitShardCmd.java    |   76 +-
 .../org/apache/solr/cloud/SyncStrategy.java     |   34 +-
 .../org/apache/solr/cloud/ZkController.java     |   64 +-
 .../cloud/overseer/ClusterStateMutator.java     |    2 +-
 .../solr/cloud/overseer/CollectionMutator.java  |    8 +
 .../apache/solr/cloud/overseer/NodeMutator.java |    4 +-
 .../solr/cloud/overseer/ReplicaMutator.java     |   77 +-
 .../solr/cloud/overseer/SliceMutator.java       |    6 +-
 .../solr/cloud/overseer/ZkStateWriter.java      |    6 +-
 .../apache/solr/cloud/rule/ImplicitSnitch.java  |  155 +--
 .../apache/solr/cloud/rule/RemoteCallback.java  |   23 -
 .../apache/solr/cloud/rule/ReplicaAssigner.java |   17 +-
 .../java/org/apache/solr/cloud/rule/Rule.java   |    2 +-
 .../solr/cloud/rule/ServerSnitchContext.java    |  108 ++
 .../java/org/apache/solr/cloud/rule/Snitch.java |    2 +-
 .../apache/solr/cloud/rule/SnitchContext.java   |  168 ---
 .../solr/core/CachingDirectoryFactory.java      |   18 +-
 .../src/java/org/apache/solr/core/Config.java   |    2 +-
 .../org/apache/solr/core/ConfigOverlay.java     |   10 +-
 .../apache/solr/core/ConfigSetProperties.java   |    4 +-
 .../org/apache/solr/core/CoreContainer.java     |   23 +-
 .../org/apache/solr/core/CoreDescriptor.java    |    2 +-
 .../apache/solr/core/CorePropertiesLocator.java |   12 +-
 .../org/apache/solr/core/DirectoryFactory.java  |    2 +-
 .../org/apache/solr/core/JmxMonitoredMap.java   |   20 +-
 .../org/apache/solr/core/MapSerializable.java   |   23 -
 .../java/org/apache/solr/core/PluginBag.java    |    9 +-
 .../java/org/apache/solr/core/PluginInfo.java   |   15 +-
 .../org/apache/solr/core/RequestHandlers.java   |    2 +-
 .../org/apache/solr/core/RequestParams.java     |    8 +-
 .../apache/solr/core/SchemaCodecFactory.java    |    4 +-
 .../java/org/apache/solr/core/SolrConfig.java   |   41 +-
 .../src/java/org/apache/solr/core/SolrCore.java |   39 +-
 .../apache/solr/core/SolrDeletionPolicy.java    |   17 +-
 .../apache/solr/core/SolrResourceLoader.java    |   44 +-
 .../apache/solr/core/backup/BackupManager.java  |   34 +-
 .../backup/repository/BackupRepository.java     |   14 +-
 .../backup/repository/HdfsBackupRepository.java |   29 +-
 .../repository/LocalFileSystemRepository.java   |   36 +-
 .../snapshots/SolrSnapshotMetaDataManager.java  |    2 +-
 .../org/apache/solr/handler/ClassifyStream.java |  229 ++++
 .../org/apache/solr/handler/IndexFetcher.java   |    6 +-
 .../apache/solr/handler/ReplicationHandler.java |   12 +-
 .../apache/solr/handler/RequestHandlerBase.java |   23 +-
 .../org/apache/solr/handler/RestoreCore.java    |    6 +-
 .../org/apache/solr/handler/SnapShooter.java    |   11 +-
 .../apache/solr/handler/SolrConfigHandler.java  |   98 +-
 .../org/apache/solr/handler/StreamHandler.java  |   15 +-
 .../apache/solr/handler/admin/BackupCoreOp.java |   84 ++
 .../solr/handler/admin/CollectionsHandler.java  |   14 +-
 .../solr/handler/admin/CoreAdminOperation.java  |  701 +-----------
 .../solr/handler/admin/CreateSnapshotOp.java    |   62 +
 .../solr/handler/admin/DeleteSnapshotOp.java    |   68 ++
 .../org/apache/solr/handler/admin/InvokeOp.java |   58 +
 .../solr/handler/admin/MergeIndexesOp.java      |  142 +++
 .../solr/handler/admin/PrepRecoveryOp.java      |  217 ++++
 .../handler/admin/RequestApplyUpdatesOp.java    |   71 ++
 .../solr/handler/admin/RequestSyncShardOp.java  |  100 ++
 .../solr/handler/admin/RestoreCoreOp.java       |   71 ++
 .../org/apache/solr/handler/admin/SplitOp.java  |  142 +++
 .../org/apache/solr/handler/admin/StatusOp.java |   64 ++
 .../solr/handler/component/ExpandComponent.java |   68 +-
 .../solr/handler/component/FacetComponent.java  |   31 +-
 .../solr/handler/component/FieldFacetStats.java |   22 +-
 .../component/HttpShardHandlerFactory.java      |    2 +-
 .../solr/handler/component/QueryComponent.java  |    5 +-
 .../handler/component/RealTimeGetComponent.java |   23 +-
 .../solr/handler/component/StatsValues.java     |    2 +-
 .../handler/component/StatsValuesFactory.java   |    8 +-
 .../apache/solr/handler/loader/XMLLoader.java   |    2 +-
 .../solr/index/SlowCompositeReaderWrapper.java  |   39 +-
 .../org/apache/solr/logging/LogWatcher.java     |    8 +-
 .../apache/solr/request/DocValuesFacets.java    |   70 +-
 .../org/apache/solr/request/DocValuesStats.java |   48 +-
 .../org/apache/solr/request/IntervalFacets.java |   58 +-
 .../org/apache/solr/request/NumericFacets.java  |   33 +-
 .../request/PerSegmentSingleValuedFaceting.java |   40 +-
 .../org/apache/solr/request/SimpleFacets.java   |   71 +-
 .../solr/request/macro/MacroExpander.java       |    1 -
 .../solr/response/JSONResponseWriter.java       |   25 +-
 .../solr/response/SortingResponseWriter.java    |  155 ++-
 .../solr/response/TextResponseWriter.java       |    8 +-
 .../transform/SubQueryAugmenterFactory.java     |    1 -
 .../response/transform/TransformerFactory.java  |    2 +-
 .../transform/ValueSourceAugmenter.java         |    8 +-
 .../solr/rest/ManagedResourceStorage.java       |   10 +-
 .../java/org/apache/solr/rest/RestManager.java  |    4 +-
 .../analysis/ManagedStopFilterFactory.java      |    2 +-
 .../java/org/apache/solr/schema/BoolField.java  |   34 +-
 .../org/apache/solr/schema/CurrencyField.java   |   34 +-
 .../org/apache/solr/schema/IndexSchema.java     |   36 +-
 .../java/org/apache/solr/schema/LatLonType.java |    2 +-
 .../solr/schema/ManagedIndexSchemaFactory.java  |    1 +
 .../schema/OpenExchangeRatesOrgProvider.java    |    4 +-
 .../schema/RptWithGeometrySpatialField.java     |   10 +-
 .../org/apache/solr/schema/SchemaManager.java   |   14 +-
 .../org/apache/solr/schema/StrFieldSource.java  |    8 +-
 .../org/apache/solr/schema/TrieDoubleField.java |   48 +-
 .../org/apache/solr/schema/TrieFloatField.java  |   49 +-
 .../org/apache/solr/schema/TrieIntField.java    |   49 +-
 .../org/apache/solr/schema/TrieLongField.java   |   49 +-
 .../apache/solr/schema/ZkIndexSchemaReader.java |   10 +-
 .../apache/solr/search/AbstractReRankQuery.java |   83 ++
 .../org/apache/solr/search/CacheConfig.java     |    4 +-
 .../solr/search/CollapsingQParserPlugin.java    |  251 +++-
 .../java/org/apache/solr/search/DocSetUtil.java |   33 +
 .../apache/solr/search/HashQParserPlugin.java   |   29 +-
 .../solr/search/IGainTermsQParserPlugin.java    |   13 +-
 .../org/apache/solr/search/ReRankCollector.java |  175 +++
 .../apache/solr/search/ReRankQParserPlugin.java |  245 +---
 .../org/apache/solr/search/ReturnFields.java    |    7 +
 .../apache/solr/search/SolrFieldCacheMBean.java |    6 +-
 .../apache/solr/search/SolrIndexSearcher.java   |  103 +-
 .../apache/solr/search/SolrReturnFields.java    |   11 +
 .../TextLogisticRegressionQParserPlugin.java    |   11 +-
 .../apache/solr/search/ValueSourceParser.java   |   78 +-
 .../apache/solr/search/facet/FacetField.java    |   70 +-
 .../solr/search/facet/FacetFieldProcessor.java  |  150 ++-
 .../facet/FacetFieldProcessorByArray.java       |  144 +--
 .../facet/FacetFieldProcessorByArrayDV.java     |   78 +-
 .../facet/FacetFieldProcessorByHashDV.java      |  443 ++++++++
 .../facet/FacetFieldProcessorByHashNumeric.java |  439 -------
 .../org/apache/solr/search/facet/HLLAgg.java    |   13 +-
 .../apache/solr/search/facet/PercentileAgg.java |    2 +-
 .../org/apache/solr/search/facet/SlotAcc.java   |   27 +-
 .../org/apache/solr/search/facet/UniqueAgg.java |   12 +-
 .../solr/search/facet/UniqueMultiDvSlotAcc.java |   35 +-
 .../search/facet/UniqueSinglevaluedSlotAcc.java |   24 +-
 .../solr/search/function/OrdFieldSource.java    |   33 +-
 .../search/function/ReverseOrdFieldSource.java  |   13 +-
 .../function/SolrComparisonBoolFunction.java    |    4 +-
 .../function/distance/GeohashFunction.java      |    4 +-
 .../distance/GeohashHaversineFunction.java      |    6 +-
 .../distance/HaversineConstFunction.java        |    4 +-
 .../function/distance/HaversineFunction.java    |    6 +-
 .../distance/SquaredEuclideanFunction.java      |    4 +-
 .../distance/StringDistanceFunction.java        |    6 +-
 .../distance/VectorDistanceFunction.java        |    6 +-
 .../join/BlockJoinFieldFacetAccumulator.java    |   31 +-
 .../solr/search/join/GraphTermsCollector.java   |   20 +-
 .../apache/solr/security/BasicAuthPlugin.java   |    1 +
 .../apache/solr/servlet/SolrDispatchFilter.java |   57 +-
 .../solr/servlet/StartupLoggingUtils.java       |  107 ++
 .../apache/solr/uninverting/DocTermOrds.java    |    6 +-
 .../org/apache/solr/uninverting/FieldCache.java |   15 +-
 .../apache/solr/uninverting/FieldCacheImpl.java |  325 ++++--
 .../solr/uninverting/UninvertingReader.java     |   68 +-
 .../apache/solr/update/AddUpdateCommand.java    |    1 -
 .../solr/update/DefaultSolrCoreState.java       |   15 +-
 .../solr/update/DirectUpdateHandler2.java       |   22 +-
 .../apache/solr/update/HdfsTransactionLog.java  |  141 +--
 .../org/apache/solr/update/HdfsUpdateLog.java   |    9 +-
 .../apache/solr/update/IndexFingerprint.java    |   48 +-
 .../java/org/apache/solr/update/PeerSync.java   |  105 +-
 .../org/apache/solr/update/SolrCoreState.java   |    2 +-
 .../org/apache/solr/update/SolrIndexConfig.java |   12 +-
 .../apache/solr/update/SolrIndexSplitter.java   |   11 +-
 .../org/apache/solr/update/SolrIndexWriter.java |   16 +-
 .../org/apache/solr/update/TransactionLog.java  |    5 +
 .../java/org/apache/solr/update/UpdateLog.java  |    6 +-
 .../apache/solr/update/UpdateShardHandler.java  |    2 +-
 .../org/apache/solr/update/VersionInfo.java     |    6 +-
 .../AddSchemaFieldsUpdateProcessorFactory.java  |   35 +-
 .../ConcatFieldUpdateProcessorFactory.java      |   66 +-
 .../CountFieldValuesUpdateProcessorFactory.java |   17 +-
 .../processor/DistributedUpdateProcessor.java   |   22 +-
 .../FieldLengthUpdateProcessorFactory.java      |   29 +-
 .../processor/FieldMutatingUpdateProcessor.java |   72 +-
 .../FieldMutatingUpdateProcessorFactory.java    |   16 +-
 .../FieldValueMutatingUpdateProcessor.java      |   12 +
 .../FieldValueSubsetUpdateProcessorFactory.java |   23 +-
 .../FirstFieldValueUpdateProcessorFactory.java  |   13 +-
 .../HTMLStripFieldUpdateProcessorFactory.java   |   51 +-
 .../IgnoreFieldUpdateProcessorFactory.java      |   33 +-
 .../LastFieldValueUpdateProcessorFactory.java   |    9 +-
 .../MaxFieldValueUpdateProcessorFactory.java    |   15 +-
 .../MinFieldValueUpdateProcessorFactory.java    |   15 +-
 ...ParseBooleanFieldUpdateProcessorFactory.java |   28 +-
 .../ParseDateFieldUpdateProcessorFactory.java   |   25 +-
 ...ParseNumericFieldUpdateProcessorFactory.java |   16 +-
 .../processor/RegexReplaceProcessorFactory.java |   25 +-
 .../RemoveBlankFieldUpdateProcessorFactory.java |   18 +-
 .../TrimFieldUpdateProcessorFactory.java        |   17 +-
 .../TruncateFieldUpdateProcessorFactory.java    |   28 +-
 .../UniqFieldsUpdateProcessorFactory.java       |    9 +-
 .../processor/UpdateRequestProcessorChain.java  |   35 +-
 .../org/apache/solr/util/SolrPluginUtils.java   |    5 +-
 .../org/apache/solr/util/TestInjection.java     |   20 +
 solr/core/src/resources/ImplicitPlugins.json    |   61 +-
 .../resources/SystemCollectionSolrConfig.xml    |    1 -
 .../conf/solrconfig-analytics-query.xml         |    8 -
 .../conf/solrconfig-collapseqparser.xml         |    8 -
 .../conf/solrconfig-plugcollector.xml           |    9 -
 .../solr/collection1/conf/solrconfig.xml        |    8 -
 .../cloud-managed-upgrade/conf/schema.xml       |   27 +
 .../cloud-managed-upgrade/conf/solrconfig.xml   |   50 +
 .../test/org/apache/solr/MinimalSchemaTest.java |    5 +-
 .../org/apache/solr/TestDistributedSearch.java  |    4 +-
 .../org/apache/solr/TestRandomFaceting.java     |  261 ++++-
 .../AbstractCloudBackupRestoreTestCase.java     |   12 +-
 .../solr/cloud/BasicDistributedZkTest.java      |    5 -
 .../solr/cloud/ClusterStateUpdateTest.java      |    5 -
 .../apache/solr/cloud/CustomCollectionTest.java |    5 -
 .../solr/cloud/DeleteInactiveReplicaTest.java   |  185 ++-
 .../apache/solr/cloud/DeleteReplicaTest.java    |  242 ++--
 .../apache/solr/cloud/HttpPartitionTest.java    |   19 +-
 .../cloud/LeaderElectionIntegrationTest.java    |   10 +-
 .../cloud/LeaderFailureAfterFreshStartTest.java |  295 +++++
 .../org/apache/solr/cloud/OverseerTest.java     |   18 +-
 .../solr/cloud/PeerSyncReplicationTest.java     |    9 +-
 .../org/apache/solr/cloud/ShardSplitTest.java   |  421 +++++++
 .../TestLeaderElectionWithEmptyReplica.java     |  125 ++
 .../TestLeaderRecoverFromLogOnStartup.java      |   77 ++
 .../cloud/TestLocalFSCloudBackupRestore.java    |   10 +-
 .../solr/cloud/TestMiniSolrCloudCluster.java    |   67 --
 .../cloud/TestMiniSolrCloudClusterBase.java     |  207 ----
 .../cloud/TestMiniSolrCloudClusterKerberos.java |   14 -
 .../TestSolrCloudWithSecureImpersonation.java   |   25 +-
 .../solr/cloud/UnloadDistributedZkTest.java     |    4 -
 .../test/org/apache/solr/cloud/ZkCLITest.java   |    7 +-
 .../org/apache/solr/cloud/ZkControllerTest.java |    5 -
 .../org/apache/solr/cloud/ZkSolrClientTest.java |   16 -
 .../solr/cloud/rule/ImplicitSnitchTest.java     |   16 +-
 .../apache/solr/cloud/rule/RuleEngineTest.java  |    9 +-
 .../org/apache/solr/cloud/rule/RulesTest.java   |   38 +-
 .../test/org/apache/solr/core/SolrCoreTest.java |    3 +
 .../apache/solr/core/TestArbitraryIndexDir.java |  113 --
 .../test/org/apache/solr/core/TestConfig.java   |    5 +-
 .../DocumentAnalysisRequestHandlerTest.java     |    8 +-
 .../FieldAnalysisRequestHandlerTest.java        |   10 +-
 .../apache/solr/handler/TestReqParamsAPI.java   |   15 +
 .../solr/handler/admin/StatsReloadRaceTest.java |   99 ++
 .../DistributedFacetExistsSmallTest.java        |  236 ++++
 ...DistributedQueryComponentCustomSortTest.java |   15 +-
 .../org/apache/solr/request/JSONWriterTest.java |  138 ---
 .../apache/solr/request/SimpleFacetsTest.java   |  286 ++++-
 .../apache/solr/request/SmileWriterTest.java    |  253 -----
 .../solr/request/TestBinaryResponseWriter.java  |  105 --
 .../apache/solr/response/JSONWriterTest.java    |  144 +++
 .../apache/solr/response/SmileWriterTest.java   |  253 +++++
 .../solr/response/TestBinaryResponseWriter.java |  104 ++
 .../solr/rest/schema/TestBulkSchemaAPI.java     |   69 +-
 .../apache/solr/schema/DocValuesMultiTest.java  |   10 +-
 .../org/apache/solr/schema/DocValuesTest.java   |   48 +-
 .../schema/TestManagedSchemaThreadSafety.java   |  162 +++
 .../solr/search/TestCollapseQParserPlugin.java  |   17 +
 .../test/org/apache/solr/search/TestDocSet.java |    5 -
 .../apache/solr/search/TestRankQueryPlugin.java |   18 +-
 .../apache/solr/search/TestSmileRequest.java    |    2 +-
 .../solr/search/facet/TestJsonFacets.java       |   53 +-
 .../search/function/NvlValueSourceParser.java   |    6 +-
 .../solr/security/BasicAuthIntegrationTest.java |  105 +-
 .../solr/uninverting/TestDocTermOrds.java       |   44 +-
 .../apache/solr/uninverting/TestFieldCache.java |  211 ++--
 .../solr/uninverting/TestFieldCacheReopen.java  |   10 +-
 .../TestFieldCacheSanityChecker.java            |   18 +-
 .../uninverting/TestFieldCacheSortRandom.java   |    3 +-
 .../uninverting/TestFieldCacheVsDocValues.java  |   55 +-
 .../uninverting/TestFieldCacheWithThreads.java  |   60 +-
 .../solr/uninverting/TestLegacyFieldCache.java  |  147 +--
 .../solr/uninverting/TestUninvertingReader.java |   16 +-
 .../org/apache/solr/update/AutoCommitTest.java  |   29 +
 .../apache/solr/update/DocumentBuilderTest.java |    9 +-
 .../apache/solr/update/HardAutoCommitTest.java  |    2 +
 .../apache/solr/update/SolrIndexConfigTest.java |   12 +-
 .../solr/util/TestObjectReleaseTracker.java     |   12 +-
 .../example-DIH/solr/db/conf/solrconfig.xml     |   84 +-
 .../example-DIH/solr/mail/conf/solrconfig.xml   |   84 +-
 .../example-DIH/solr/rss/conf/solrconfig.xml    |   84 +-
 .../example-DIH/solr/solr/conf/solrconfig.xml   |   85 +-
 .../example-DIH/solr/tika/conf/solrconfig.xml   |   85 +-
 solr/example/files/conf/solrconfig.xml          |   66 --
 solr/licenses/gimap-LICENSE-CDDL.txt            |  262 ++---
 solr/licenses/javax.mail-LICENSE-CDDL.txt       |  262 ++---
 .../licenses/javax.servlet-api-LICENSE-CDDL.txt |  137 ---
 solr/licenses/jaxb-impl-LICENSE-CDDL.txt        |  262 ++---
 .../jcl-over-slf4j-LICENSE-BSD_LIKE.txt         |   21 -
 solr/licenses/jcl-over-slf4j-LICENSE-MIT.txt    |   21 +
 solr/licenses/jul-to-slf4j-LICENSE-BSD_LIKE.txt |   21 -
 solr/licenses/jul-to-slf4j-LICENSE-MIT.txt      |   21 +
 solr/licenses/mail-LICENSE-CDDL.txt             |  263 -----
 solr/licenses/servlet-api-LICENSE-CDDL.txt      |  137 ---
 solr/licenses/slf4j-LICENSE-BSD_LIKE.txt        |   21 -
 solr/licenses/slf4j-LICENSE-MIT.txt             |   21 +
 solr/server/resources/log4j.properties          |   11 +-
 .../basic_configs/conf/managed-schema           |    3 +-
 .../basic_configs/conf/solrconfig.xml           |   66 --
 .../conf/managed-schema                         |    3 +-
 .../conf/solrconfig.xml                         |   65 --
 .../conf/managed-schema                         |    3 +-
 .../conf/params.json                            |   11 +
 .../conf/solrconfig.xml                         |   78 --
 .../quickstart-admin-ui-facet-options.png       |  Bin 8787 -> 10646 bytes
 .../assets/images/quickstart-query-screen.png   |  Bin 400716 -> 278938 bytes
 solr/site/quickstart.mdtext                     |  279 ++---
 .../solr/client/solrj/impl/CloudSolrClient.java |   17 +-
 .../client/solrj/impl/LBHttpSolrClient.java     |   20 +-
 .../apache/solr/client/solrj/io/ModelCache.java |  143 +++
 .../client/solrj/io/stream/CommitStream.java    |  260 +++++
 .../client/solrj/io/stream/FacetStream.java     |    8 +
 .../client/solrj/io/stream/ModelStream.java     |  200 ++++
 .../solrj/io/stream/ScoreNodesStream.java       |   25 +-
 .../client/solrj/io/stream/StreamContext.java   |   11 +
 .../client/solrj/io/stream/TopicStream.java     |   10 +-
 .../client/solrj/io/stream/UpdateStream.java    |    3 +-
 .../solrj/io/stream/expr/StreamFactory.java     |   35 +
 .../solrj/request/CollectionAdminRequest.java   |   64 +-
 .../client/solrj/request/CoreAdminRequest.java  |    6 +
 .../solr/client/solrj/request/CoreStatus.java   |   42 +
 .../client/solrj/response/LukeResponse.java     |   15 +-
 .../org/apache/solr/common/MapSerializable.java |   30 +
 .../solr/common/cloud/ConnectionManager.java    |   16 +-
 .../org/apache/solr/common/cloud/Slice.java     |   11 +-
 .../apache/solr/common/cloud/SolrZkClient.java  |   25 +-
 .../apache/solr/common/cloud/ZkStateReader.java |   53 +-
 .../solr/common/cloud/rule/ImplicitSnitch.java  |  163 +++
 .../solr/common/cloud/rule/RemoteCallback.java  |   23 +
 .../apache/solr/common/cloud/rule/Snitch.java   |   34 +
 .../solr/common/cloud/rule/SnitchContext.java   |  103 ++
 .../solr/common/cloud/rule/package-info.java    |   23 +
 .../common/params/CollectionAdminParams.java    |    9 +-
 .../apache/solr/common/params/CommonParams.java |  150 +--
 .../apache/solr/common/params/FacetParams.java  |    8 +
 .../apache/solr/common/params/SolrParams.java   |   22 +-
 .../apache/solr/common/util/JavaBinCodec.java   |    7 +
 .../solr/common/util/JsonRecordReader.java      |   27 +-
 .../org/apache/solr/common/util/NamedList.java  |   31 +-
 .../solr/common/util/ObjectReleaseTracker.java  |   21 +-
 .../solrj/solr/configsets/ml/conf/schema.xml    |    2 +-
 .../solr/multicore/core0/conf/solrconfig.xml    |    1 -
 .../solr/multicore/core1/conf/solrconfig.xml    |    2 -
 .../solr/client/solrj/SolrExampleTests.java     |   39 +-
 .../client/solrj/impl/CloudSolrClientTest.java  |   68 +-
 .../solrj/io/graph/GraphExpressionTest.java     |   75 ++
 .../solrj/io/stream/StreamExpressionTest.java   |  485 +++++++-
 .../solr/client/solrj/request/SchemaTest.java   |   11 +-
 .../apache/solr/common/util/NamedListTest.java  |   18 +
 .../solr/common/util/TestJavaBinCodec.java      |  104 +-
 solr/test-framework/build.xml                   |    3 -
 .../java/org/apache/solr/SolrTestCaseJ4.java    |   59 +-
 .../solr/cloud/AbstractDistribZkTestBase.java   |    4 -
 .../apache/solr/cloud/AbstractZkTestCase.java   |    6 -
 .../apache/solr/cloud/MiniSolrCloudCluster.java |   14 +-
 .../apache/solr/cloud/SolrCloudTestCase.java    |  144 ++-
 .../src/java/org/apache/solr/util/LogLevel.java |   91 ++
 .../src/test-files/log4j.properties             |   11 +
 .../apache/solr/TestLogLevelAnnotations.java    |   47 +
 .../apache/solr/cloud/JettySolrRunnerTest.java  |   66 ++
 .../solr/cloud/MiniSolrCloudClusterTest.java    |  105 ++
 solr/webapp/web/WEB-INF/web.xml                 |   17 +
 723 files changed, 23949 insertions(+), 15391 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/3182cd98/lucene/spatial3d/src/test/org/apache/lucene/spatial3d/TestGeo3DPoint.java
----------------------------------------------------------------------