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 2017/01/24 03:33:46 UTC

[50/50] [abbrv] lucene-solr:apiv2: Merge remote-tracking branch 'remotes/origin/master' into apiv2

Merge remote-tracking branch 'remotes/origin/master' into apiv2


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

Branch: refs/heads/apiv2
Commit: a6e77729429ecfd7f401b6f4482a1babe26e0014
Parents: 4841ce1 ee5a360
Author: Noble Paul <no...@apache.org>
Authored: Tue Jan 24 14:02:12 2017 +1030
Committer: Noble Paul <no...@apache.org>
Committed: Tue Jan 24 14:02:12 2017 +1030

----------------------------------------------------------------------
 .gitignore                                      |    1 +
 build.xml                                       |   42 +-
 .../dot.settings/org.eclipse.jdt.core.prefs     |    7 +-
 dev-tools/idea/lucene/suggest/suggest.iml       |    2 -
 .../idea/solr/contrib/analytics/analytics.iml   |    1 +
 .../lucene/analysis/common/pom.xml.template     |   36 +-
 .../maven/lucene/analysis/icu/pom.xml.template  |   42 +-
 .../lucene/analysis/kuromoji/pom.xml.template   |   38 +-
 .../lucene/analysis/morfologik/pom.xml.template |   38 +-
 .../lucene/analysis/phonetic/pom.xml.template   |   38 +-
 .../maven/lucene/analysis/pom.xml.template      |   36 +-
 .../lucene/analysis/smartcn/pom.xml.template    |   36 +-
 .../lucene/analysis/stempel/pom.xml.template    |   36 +-
 .../maven/lucene/analysis/uima/pom.xml.template |   36 +-
 .../lucene/backward-codecs/pom.xml.template     |   36 +-
 .../maven/lucene/benchmark/pom.xml.template     |   36 +-
 .../lucene/classification/pom.xml.template      |   36 +-
 dev-tools/maven/lucene/codecs/pom.xml.template  |   36 +-
 .../lucene/codecs/src/java/pom.xml.template     |   36 +-
 .../lucene/codecs/src/test/pom.xml.template     |   36 +-
 dev-tools/maven/lucene/core/pom.xml.template    |   36 +-
 .../maven/lucene/core/src/java/pom.xml.template |   36 +-
 .../maven/lucene/core/src/test/pom.xml.template |   36 +-
 dev-tools/maven/lucene/demo/pom.xml.template    |   36 +-
 .../maven/lucene/expressions/pom.xml.template   |   36 +-
 dev-tools/maven/lucene/facet/pom.xml.template   |   36 +-
 .../maven/lucene/grouping/pom.xml.template      |   36 +-
 .../maven/lucene/highlighter/pom.xml.template   |   36 +-
 dev-tools/maven/lucene/join/pom.xml.template    |   36 +-
 dev-tools/maven/lucene/memory/pom.xml.template  |   36 +-
 dev-tools/maven/lucene/misc/pom.xml.template    |   36 +-
 dev-tools/maven/lucene/pom.xml.template         |   36 +-
 dev-tools/maven/lucene/queries/pom.xml.template |   36 +-
 .../maven/lucene/queryparser/pom.xml.template   |   36 +-
 .../maven/lucene/replicator/pom.xml.template    |   38 +-
 dev-tools/maven/lucene/sandbox/pom.xml.template |   36 +-
 .../lucene/spatial-extras/pom.xml.template      |   36 +-
 dev-tools/maven/lucene/spatial/pom.xml.template |   38 +-
 .../maven/lucene/spatial3d/pom.xml.template     |   36 +-
 dev-tools/maven/lucene/suggest/pom.xml.template |   36 +-
 .../lucene/test-framework/pom.xml.template      |   36 +-
 dev-tools/maven/pom.xml.template                |   36 +-
 .../contrib/analysis-extras/pom.xml.template    |   36 +-
 .../solr/contrib/analytics/pom.xml.template     |   36 +-
 .../solr/contrib/clustering/pom.xml.template    |   36 +-
 .../dataimporthandler-extras/pom.xml.template   |   36 +-
 .../contrib/dataimporthandler/pom.xml.template  |   36 +-
 .../solr/contrib/extraction/pom.xml.template    |   36 +-
 .../maven/solr/contrib/langid/pom.xml.template  |   36 +-
 .../maven/solr/contrib/ltr/pom.xml.template     |   36 +-
 .../solr/contrib/map-reduce/pom.xml.template    |   36 +-
 .../contrib/morphlines-cell/pom.xml.template    |   36 +-
 .../contrib/morphlines-core/pom.xml.template    |   36 +-
 dev-tools/maven/solr/contrib/pom.xml.template   |   36 +-
 .../maven/solr/contrib/uima/pom.xml.template    |   36 +-
 .../solr/contrib/velocity/pom.xml.template      |   36 +-
 dev-tools/maven/solr/core/pom.xml.template      |   36 +-
 .../maven/solr/core/src/java/pom.xml.template   |   36 +-
 .../maven/solr/core/src/test/pom.xml.template   |   36 +-
 dev-tools/maven/solr/pom.xml.template           |   36 +-
 dev-tools/maven/solr/solrj/pom.xml.template     |   36 +-
 .../maven/solr/solrj/src/java/pom.xml.template  |   36 +-
 .../maven/solr/solrj/src/test/pom.xml.template  |   36 +-
 .../maven/solr/test-framework/pom.xml.template  |   36 +-
 lucene/CHANGES.txt                              |  187 +-
 .../analysis/charfilter/BaseCharFilter.java     |   26 +-
 .../analysis/core/FlattenGraphFilter.java       |  418 ++++
 .../core/FlattenGraphFilterFactory.java         |   44 +
 .../lucene/analysis/custom/CustomAnalyzer.java  |    2 +-
 .../miscellaneous/FixBrokenOffsetsFilter.java   |   78 +
 .../FixBrokenOffsetsFilterFactory.java          |   39 +
 .../miscellaneous/WordDelimiterFilter.java      |    9 +-
 .../WordDelimiterFilterFactory.java             |    6 +
 .../miscellaneous/WordDelimiterGraphFilter.java |  706 +++++++
 .../WordDelimiterGraphFilterFactory.java        |  199 ++
 .../miscellaneous/WordDelimiterIterator.java    |   59 +-
 .../analysis/ngram/EdgeNGramTokenFilter.java    |   16 +-
 .../lucene/analysis/ngram/NGramTokenFilter.java |   18 +-
 .../lucene/analysis/synonym/SynonymFilter.java  |    5 +
 .../analysis/synonym/SynonymFilterFactory.java  |    5 +
 .../analysis/synonym/SynonymGraphFilter.java    |  587 ++++++
 .../synonym/SynonymGraphFilterFactory.java      |  204 ++
 .../lucene/analysis/synonym/SynonymMap.java     |    7 +-
 .../lucene/analysis/util/CharTokenizer.java     |    6 +-
 ...ache.lucene.analysis.util.TokenFilterFactory |    4 +
 .../analysis/core/TestFlattenGraphFilter.java   |  284 +++
 .../lucene/analysis/core/TestRandomChains.java  |  180 +-
 .../analysis/custom/TestCustomAnalyzer.java     |   21 +
 .../apache/lucene/analysis/custom/mapping1.txt  |    1 +
 .../apache/lucene/analysis/custom/mapping2.txt  |    1 +
 .../TestFixBrokenOffsetsFilter.java             |   50 +
 .../miscellaneous/TestWordDelimiterFilter.java  |  125 +-
 .../TestWordDelimiterGraphFilter.java           |  897 ++++++++
 .../lucene/analysis/ngram/TestNGramFilters.java |   47 +
 .../synonym/TestSynonymGraphFilter.java         | 1925 ++++++++++++++++++
 .../apache/lucene/index/FixBrokenOffsets.java   |  125 ++
 .../java/org/apache/lucene/index/package.html   |   27 +
 .../lucene/index/TestFixBrokenOffsets.java      |  115 ++
 .../lucene/index/index.630.brokenoffsets.zip    |  Bin 0 -> 3203 bytes
 .../classification/utils/DatasetSplitter.java   |    3 +-
 .../codecs/simpletext/SimpleTextBKDReader.java  |   50 +
 .../simpletext/SimpleTextPointsWriter.java      |    2 +-
 lucene/common-build.xml                         |   27 +-
 .../lucene/analysis/TokenStreamToAutomaton.java |   50 +-
 .../tokenattributes/OffsetAttributeImpl.java    |    2 +-
 .../PackedTokenAttributeImpl.java               |   11 +-
 .../PositionIncrementAttributeImpl.java         |    3 +-
 .../PositionLengthAttributeImpl.java            |    3 +-
 .../apache/lucene/codecs/DocValuesConsumer.java |   10 +-
 .../org/apache/lucene/codecs/NormsConsumer.java |    2 +-
 .../org/apache/lucene/codecs/PointsWriter.java  |    5 +
 .../lucene/codecs/StoredFieldsWriter.java       |    2 +-
 .../apache/lucene/codecs/TermVectorsWriter.java |    2 +-
 .../CompressingStoredFieldsWriter.java          |   87 +-
 .../CompressingTermVectorsWriter.java           |   11 +-
 .../GrowableByteArrayDataOutput.java            |   83 -
 .../lucene50/Lucene50StoredFieldsFormat.java    |    2 +-
 .../codecs/lucene60/Lucene60PointsWriter.java   |   11 +-
 .../lucene70/Lucene70DocValuesConsumer.java     |  163 +-
 .../lucene70/Lucene70DocValuesFormat.java       |    5 +-
 .../lucene70/Lucene70DocValuesProducer.java     |  220 +-
 .../org/apache/lucene/document/DoublePoint.java |   30 +-
 .../org/apache/lucene/document/FloatPoint.java  |   30 +-
 .../lucene/document/NumericDocValuesField.java  |   48 +
 .../lucene/document/SortedDocValuesField.java   |   42 +
 .../document/SortedNumericDocValuesField.java   |   54 +
 .../SortedNumericDocValuesRangeQuery.java       |  145 ++
 .../document/SortedSetDocValuesField.java       |   43 +
 .../document/SortedSetDocValuesRangeQuery.java  |  188 ++
 .../apache/lucene/index/AutomatonTermsEnum.java |    3 +
 .../lucene/index/BinaryDocValuesWriter.java     |   39 +-
 .../org/apache/lucene/index/CheckIndex.java     |   66 +-
 .../lucene/index/DefaultIndexingChain.java      |  133 +-
 .../org/apache/lucene/index/DocConsumer.java    |    2 +-
 .../org/apache/lucene/index/DocIDMerger.java    |  211 +-
 .../apache/lucene/index/DocValuesWriter.java    |    4 +-
 .../lucene/index/DocumentsWriterPerThread.java  |   31 +-
 .../lucene/index/FreqProxTermsWriter.java       |    8 +-
 .../org/apache/lucene/index/IndexWriter.java    |   42 +-
 .../apache/lucene/index/IndexWriterConfig.java  |    3 +
 .../org/apache/lucene/index/LeafReader.java     |    2 +-
 .../lucene/index/LiveIndexWriterConfig.java     |   13 +
 .../lucene/index/MappingMultiPostingsEnum.java  |    2 +-
 .../org/apache/lucene/index/MergeState.java     |    8 +-
 .../apache/lucene/index/NormValuesWriter.java   |   17 +-
 .../lucene/index/NumericDocValuesWriter.java    |   51 +-
 .../org/apache/lucene/index/PointValues.java    |    7 +
 .../apache/lucene/index/PointValuesWriter.java  |  106 +-
 .../apache/lucene/index/PrefixCodedTerms.java   |    4 +-
 .../apache/lucene/index/SegmentCoreReaders.java |    8 +
 .../org/apache/lucene/index/SegmentInfos.java   |    7 +-
 .../apache/lucene/index/SortedDocValues.java    |   22 +
 .../lucene/index/SortedDocValuesWriter.java     |   76 +-
 .../index/SortedNumericDocValuesWriter.java     |   64 +-
 .../apache/lucene/index/SortedSetDocValues.java |   22 +
 .../lucene/index/SortedSetDocValuesWriter.java  |   98 +-
 .../java/org/apache/lucene/index/Sorter.java    |   57 +-
 .../apache/lucene/index/SortingLeafReader.java  |   26 +-
 .../index/SortingStoredFieldsConsumer.java      |  206 ++
 .../index/SortingTermVectorsConsumer.java       |  181 ++
 .../lucene/index/StoredFieldsConsumer.java      |   85 +
 .../lucene/index/TermVectorsConsumer.java       |    7 +-
 .../java/org/apache/lucene/index/TermsHash.java |    4 +-
 .../TrackingTmpOutputDirectoryWrapper.java      |   53 +
 .../lucene/search/Boolean2ScorerSupplier.java   |  217 ++
 .../org/apache/lucene/search/BooleanWeight.java |  136 +-
 .../apache/lucene/search/ConjunctionDISI.java   |    2 +-
 .../apache/lucene/search/ConjunctionScorer.java |    3 +-
 .../lucene/search/ConstantScoreQuery.java       |   46 +-
 .../org/apache/lucene/search/DoubleValues.java  |   38 +
 .../lucene/search/DoubleValuesSource.java       |  400 ++++
 .../lucene/search/FieldComparatorSource.java    |    8 +-
 .../lucene/search/FieldValueHitQueue.java       |   11 +-
 .../org/apache/lucene/search/GraphQuery.java    |  136 ++
 .../lucene/search/IndexOrDocValuesQuery.java    |  166 ++
 .../lucene/search/LeafFieldComparator.java      |    2 +-
 .../org/apache/lucene/search/LongValues.java    |   38 +
 .../apache/lucene/search/LongValuesSource.java  |  244 +++
 .../lucene/search/MinShouldMatchSumScorer.java  |   22 +-
 .../lucene/search/MultiCollectorManager.java    |  107 +
 .../apache/lucene/search/PointRangeQuery.java   |  214 +-
 .../apache/lucene/search/ScorerSupplier.java    |   47 +
 .../lucene/search/SimpleFieldComparator.java    |    2 +-
 .../org/apache/lucene/search/SortField.java     |    2 +-
 .../lucene/search/SortedNumericSortField.java   |    2 +-
 .../lucene/search/SortedSetSortField.java       |    2 +-
 .../apache/lucene/search/TermInSetQuery.java    |  322 +++
 .../java/org/apache/lucene/search/TopDocs.java  |   14 +-
 .../apache/lucene/search/TopFieldCollector.java |    4 +-
 .../search/UsageTrackingQueryCachingPolicy.java |    5 +-
 .../java/org/apache/lucene/search/Weight.java   |   25 +
 .../store/GrowableByteArrayDataOutput.java      |  103 +
 .../org/apache/lucene/store/MMapDirectory.java  |  128 +-
 .../java/org/apache/lucene/util/LongValues.java |    9 +
 .../org/apache/lucene/util/QueryBuilder.java    |  113 +-
 .../java/org/apache/lucene/util/Version.java    |    7 +
 .../apache/lucene/util/automaton/Automaton.java |    5 +-
 .../lucene/util/automaton/Operations.java       |    6 +-
 .../apache/lucene/util/automaton/StatePair.java |    4 +-
 .../org/apache/lucene/util/bkd/BKDReader.java   |   96 +
 .../org/apache/lucene/util/bkd/BKDWriter.java   |  150 +-
 .../apache/lucene/util/bkd/DocIdsWriter.java    |    4 +-
 .../graph/GraphTokenStreamFiniteStrings.java    |  230 +++
 .../apache/lucene/util/graph/package-info.java  |   21 +
 .../apache/lucene/util/packed/DirectWriter.java |    8 +-
 .../lucene/analysis/TestGraphTokenizers.java    |  645 ++++++
 .../TestGrowableByteArrayDataOutput.java        |   80 -
 .../lucene60/TestLucene60PointsFormat.java      |  200 +-
 .../lucene70/TestLucene70DocValuesFormat.java   |  152 ++
 .../lucene/index/Test4GBStoredFields.java       |    2 +
 .../org/apache/lucene/index/TestCheckIndex.java |    5 -
 .../apache/lucene/index/TestDocIDMerger.java    |    4 +-
 .../apache/lucene/index/TestIndexSorting.java   |   32 +-
 .../apache/lucene/index/TestIndexWriter.java    |    3 +-
 .../org/apache/lucene/index/TestTermsEnum.java  |    8 +
 .../index/TestTragicIndexWriterDeadlock.java    |   69 +-
 .../lucene/search/TermInSetQueryTest.java       |  291 +++
 .../search/TestBoolean2ScorerSupplier.java      |  332 +++
 .../search/TestBooleanQueryVisitSubscorers.java |    4 +-
 .../lucene/search/TestDocValuesQueries.java     |  271 +++
 .../lucene/search/TestDoubleValuesSource.java   |  167 ++
 .../lucene/search/TestElevationComparator.java  |   22 +-
 .../apache/lucene/search/TestFilterWeight.java  |    3 +-
 .../apache/lucene/search/TestGraphQuery.java    |   79 +
 .../search/TestIndexOrDocValuesQuery.java       |   89 +
 .../apache/lucene/search/TestLRUQueryCache.java |    7 +
 .../lucene/search/TestLongValuesSource.java     |  149 ++
 .../apache/lucene/search/TestPointQueries.java  |   63 +
 .../org/apache/lucene/store/TestDirectory.java  |   13 +-
 .../store/TestGrowableByteArrayDataOutput.java  |   80 +
 .../apache/lucene/store/TestMmapDirectory.java  |    3 +-
 .../org/apache/lucene/store/TestMultiMMap.java  |    3 +-
 .../apache/lucene/util/TestDocIdSetBuilder.java |    5 +
 .../apache/lucene/util/TestQueryBuilder.java    |   15 +-
 .../org/apache/lucene/util/bkd/TestBKD.java     |  138 +-
 .../util/bkd/TestMutablePointsReaderUtils.java  |    5 +
 .../org/apache/lucene/util/fst/Test2BFST.java   |    2 +
 .../TestGraphTokenStreamFiniteStrings.java      |  217 ++
 .../demo/facet/DistanceFacetsExample.java       |   18 +-
 .../ExpressionAggregationFacetsExample.java     |    2 +-
 lucene/expressions/build.xml                    |   11 -
 .../org/apache/lucene/expressions/Bindings.java |   14 +-
 .../apache/lucene/expressions/Expression.java   |   21 +-
 .../expressions/ExpressionComparator.java       |  100 -
 .../expressions/ExpressionFunctionValues.java   |   35 +-
 .../lucene/expressions/ExpressionRescorer.java  |   33 +-
 .../lucene/expressions/ExpressionSortField.java |   77 -
 .../expressions/ExpressionValueSource.java      |   70 +-
 .../lucene/expressions/ScoreFunctionValues.java |   46 -
 .../lucene/expressions/ScoreValueSource.java    |   61 -
 .../lucene/expressions/SimpleBindings.java      |   30 +-
 .../expressions/js/JavascriptCompiler.java      |   15 +-
 .../apache/lucene/expressions/package-info.java |    5 +-
 .../lucene/expressions/TestDemoExpressions.java |   44 +-
 .../expressions/TestExpressionSortField.java    |    2 +-
 .../expressions/TestExpressionValueSource.java  |  111 +-
 .../expressions/js/TestCustomFunctions.java     |   20 +-
 .../expressions/js/TestJavascriptFunction.java  |    2 +-
 .../js/TestJavascriptOperations.java            |    2 +-
 .../org/apache/lucene/facet/DrillSideways.java  |  331 ++-
 .../org/apache/lucene/facet/FacetQuery.java     |   52 +
 .../lucene/facet/FacetsCollectorManager.java    |   55 +
 .../apache/lucene/facet/MultiFacetQuery.java    |   60 +
 .../org/apache/lucene/facet/package-info.java   |    2 +-
 .../apache/lucene/facet/range/DoubleRange.java  |   28 +-
 .../facet/range/DoubleRangeFacetCounts.java     |   63 +-
 .../apache/lucene/facet/range/LongRange.java    |   28 +-
 .../facet/range/LongRangeFacetCounts.java       |   26 +-
 .../org/apache/lucene/facet/range/Range.java    |   31 -
 .../lucene/facet/taxonomy/FakeScorer.java       |   53 -
 .../taxonomy/TaxonomyFacetSumValueSource.java   |  114 +-
 .../apache/lucene/facet/TestDrillSideways.java  |  315 +--
 .../org/apache/lucene/facet/TestFacetQuery.java |  103 +
 .../lucene/facet/TestParallelDrillSideways.java |   90 +
 .../facet/range/TestRangeFacetCounts.java       |   61 +-
 .../TestTaxonomyFacetSumValueSource.java        |   54 +-
 .../AbstractAllGroupHeadsCollector.java         |  176 --
 .../grouping/AbstractAllGroupsCollector.java    |   67 -
 .../AbstractDistinctValuesCollector.java        |   59 -
 .../AbstractFirstPassGroupingCollector.java     |  354 ----
 .../grouping/AbstractGroupFacetCollector.java   |  319 ---
 .../AbstractSecondPassGroupingCollector.java    |  162 --
 .../search/grouping/AllGroupHeadsCollector.java |  176 ++
 .../search/grouping/AllGroupsCollector.java     |   67 +
 .../search/grouping/BlockGroupingCollector.java |    2 +-
 .../search/grouping/CollectedSearchGroup.java   |    2 +-
 .../grouping/DistinctValuesCollector.java       |   59 +
 .../grouping/FirstPassGroupingCollector.java    |  362 ++++
 .../lucene/search/grouping/GroupDocs.java       |    8 +-
 .../search/grouping/GroupFacetCollector.java    |  324 +++
 .../apache/lucene/search/grouping/Grouper.java  |   56 +
 .../lucene/search/grouping/GroupingSearch.java  |  130 +-
 .../lucene/search/grouping/SearchGroup.java     |   29 +-
 .../grouping/SecondPassGroupingCollector.java   |  169 ++
 .../lucene/search/grouping/TopGroups.java       |   13 +-
 .../FunctionAllGroupHeadsCollector.java         |   32 +-
 .../function/FunctionAllGroupsCollector.java    |    4 +-
 .../FunctionDistinctValuesCollector.java        |   35 +-
 .../FunctionFirstPassGroupingCollector.java     |    6 +-
 .../grouping/function/FunctionGrouper.java      |   69 +
 .../FunctionSecondPassGroupingCollector.java    |    6 +-
 .../term/TermAllGroupHeadsCollector.java        |   26 +-
 .../grouping/term/TermAllGroupsCollector.java   |    8 +-
 .../term/TermDistinctValuesCollector.java       |   26 +-
 .../term/TermFirstPassGroupingCollector.java    |    6 +-
 .../grouping/term/TermGroupFacetCollector.java  |   10 +-
 .../search/grouping/term/TermGrouper.java       |   81 +
 .../term/TermSecondPassGroupingCollector.java   |    6 +-
 .../grouping/AllGroupHeadsCollectorTest.java    |   14 +-
 .../search/grouping/AllGroupsCollectorTest.java |    6 +-
 .../grouping/DistinctValuesCollectorTest.java   |   46 +-
 .../grouping/GroupFacetCollectorTest.java       |   10 +-
 .../lucene/search/grouping/TestGrouping.java    |   79 +-
 .../search/uhighlight/FieldHighlighter.java     |    4 +-
 .../uhighlight/LengthGoalBreakIterator.java     |  185 ++
 .../lucene/search/uhighlight/OffsetsEnum.java   |   45 +-
 .../lucene/search/uhighlight/Passage.java       |    1 +
 .../search/highlight/TokenSourcesTest.java      |    2 +-
 .../uhighlight/LengthGoalBreakIteratorTest.java |  104 +
 .../TestUnifiedHighlighterExtensibility.java    |   57 +-
 lucene/ivy-versions.properties                  |   10 +-
 .../search/join/ToParentBlockJoinCollector.java |    2 +-
 .../search/join/ToParentBlockJoinSortField.java |    2 +-
 .../apache/lucene/index/memory/MemoryIndex.java |    5 +
 .../apache/lucene/search/DocValuesStats.java    |  409 ++++
 .../lucene/search/DocValuesStatsCollector.java  |   64 +
 .../search/TestDocValuesStatsCollector.java     |  463 +++++
 .../org/apache/lucene/queries/TermsQuery.java   |  381 ----
 .../queries/function/FunctionMatchQuery.java    |   99 +
 .../queries/function/FunctionScoreQuery.java    |  151 ++
 .../lucene/queries/function/ValueSource.java    |  113 +-
 .../apache/lucene/queries/TermsQueryTest.java   |  339 ---
 .../function/TestFunctionMatchQuery.java        |   61 +
 .../function/TestFunctionScoreExplanations.java |  105 +
 .../function/TestFunctionScoreQuery.java        |  114 ++
 .../queryparser/classic/QueryParserBase.java    |   42 +-
 .../complexPhrase/ComplexPhraseQueryParser.java |    4 +-
 .../lucene/queryparser/xml/CoreParser.java      |    2 -
 .../classic/TestMultiFieldQueryParser.java      |   11 +-
 .../queryparser/classic/TestQueryParser.java    |  131 +-
 .../complexPhrase/TestComplexPhraseQuery.java   |    6 +
 .../lucene/document/LatLonPointSortField.java   |    6 +-
 .../apache/lucene/document/RangeFieldQuery.java |    1 +
 .../lucene/search/DocValuesNumbersQuery.java    |   26 +-
 .../lucene/search/DocValuesRangeQuery.java      |  273 ---
 .../lucene/search/DocValuesTermsQuery.java      |   49 +-
 .../org/apache/lucene/search/LongHashSet.java   |  156 ++
 .../lucene/document/TestHalfFloatPoint.java     |    2 +
 .../search/BaseRangeFieldQueryTestCase.java     |    2 +-
 .../apache/lucene/search/LongHashSetTests.java  |  100 +
 .../lucene/search/TestDocValuesRangeQuery.java  |  307 ---
 .../lucene/search/TestDocValuesTermsQuery.java  |    1 +
 .../lucene/search/TestTermAutomatonQuery.java   |    3 +
 lucene/site/changes/changes2html.pl             |    3 +-
 .../prefix/TermQueryPrefixTreeStrategy.java     |   10 +-
 .../spatial/prefix/NumberRangeFacetsTest.java   |   12 +-
 .../spatial3d/Geo3DPointOutsideSortField.java   |    5 +-
 .../lucene/spatial3d/Geo3DPointSortField.java   |    5 +-
 .../lucene/spatial3d/geom/GeoBBoxFactory.java   |   34 +-
 .../lucene/spatial3d/geom/GeoCircleFactory.java |    2 +-
 .../spatial3d/geom/GeoPolygonFactory.java       |    6 +-
 .../apache/lucene/spatial3d/geom/Vector.java    |    4 +
 lucene/suggest/build.xml                        |    8 +-
 .../suggest/DocumentValueSourceDictionary.java  |   58 +-
 .../analyzing/AnalyzingInfixSuggester.java      |  137 +-
 .../suggest/analyzing/AnalyzingSuggester.java   |    3 +-
 .../suggest/analyzing/FreeTextSuggester.java    |   45 -
 .../DocumentValueSourceDictionaryTest.java      |  287 ++-
 .../analysis/BaseTokenStreamTestCase.java       |  151 +-
 .../apache/lucene/analysis/MockTokenizer.java   |    3 +-
 .../lucene/analysis/TokenStreamToDot.java       |    5 +-
 .../codecs/cranky/CrankyPointsFormat.java       |    5 +
 .../lucene/index/AssertingLeafReader.java       |    7 +
 .../index/BaseDocValuesFormatTestCase.java      |   32 +
 .../index/BaseStoredFieldsFormatTestCase.java   |    2 +
 .../index/BaseTermVectorsFormatTestCase.java    |   17 +-
 .../apache/lucene/index/BaseTestCheckIndex.java |   19 -
 .../org/apache/lucene/index/RandomCodec.java    |    2 +-
 .../apache/lucene/search/AssertingWeight.java   |   42 +-
 .../org/apache/lucene/search/QueryUtils.java    |    4 -
 .../org/apache/lucene/util/LuceneTestCase.java  |  110 +-
 .../org/apache/lucene/util/RamUsageTester.java  |  102 +-
 .../java/org/apache/lucene/util/TestUtil.java   |    4 +-
 .../lucene/analysis/TestGraphTokenizers.java    |  588 ------
 lucene/tools/javadoc/ecj.javadocs.prefs         |    2 +-
 lucene/tools/junit4/tests.policy                |    1 -
 lucene/tools/prettify/inject-javadocs.js        |   27 +
 lucene/tools/prettify/lang-apollo.js            |   18 -
 lucene/tools/prettify/lang-css.js               |   18 -
 lucene/tools/prettify/lang-hs.js                |   18 -
 lucene/tools/prettify/lang-lisp.js              |   19 -
 lucene/tools/prettify/lang-lua.js               |   18 -
 lucene/tools/prettify/lang-ml.js                |   18 -
 lucene/tools/prettify/lang-proto.js             |   17 -
 lucene/tools/prettify/lang-sql.js               |   18 -
 lucene/tools/prettify/lang-vb.js                |   18 -
 lucene/tools/prettify/lang-wiki.js              |   18 -
 lucene/tools/prettify/prettify.css              |   30 +-
 lucene/tools/prettify/prettify.js               |   90 +-
 solr/CHANGES.txt                                |  239 ++-
 solr/bin/solr                                   |   37 +-
 solr/bin/solr.cmd                               |   49 +-
 solr/bin/solr.in.cmd                            |    5 +
 solr/bin/solr.in.sh                             |    5 +
 .../apache/solr/schema/ICUCollationField.java   |   10 +-
 .../plugin/AnalyticsStatisticsCollector.java    |    4 +-
 .../solr/collection1/conf/solrconfig.xml        |    5 -
 .../solr/handler/dataimport/JdbcDataSource.java |    4 +-
 .../handler/dataimport/SolrEntityProcessor.java |  192 +-
 .../dataimport/MockSolrEntityProcessor.java     |   18 +-
 .../handler/dataimport/TestJdbcDataSource.java  |   50 +-
 .../TestPlainTextEntityProcessor.java           |  106 +
 .../TestSolrEntityProcessorEndToEnd.java        |   27 +-
 .../dataimport/TestSolrEntityProcessorUnit.java |   70 +
 solr/contrib/ltr/README.md                      |  406 +---
 solr/contrib/ltr/example/README.md              |  132 ++
 solr/contrib/ltr/example/config.json            |   13 +-
 solr/contrib/ltr/example/exampleFeatures.json   |   26 +
 solr/contrib/ltr/example/libsvm_formatter.py    |   12 +-
 solr/contrib/ltr/example/solrconfig.xml         | 1722 ----------------
 .../ltr/example/techproducts-features.json      |   26 -
 .../contrib/ltr/example/techproducts-model.json |   18 -
 .../ltr/example/train_and_upload_demo_model.py  |  143 +-
 solr/contrib/ltr/example/user_queries.txt       |   12 +-
 .../org/apache/solr/ltr/CSVFeatureLogger.java   |   62 +
 .../java/org/apache/solr/ltr/FeatureLogger.java |  132 +-
 .../java/org/apache/solr/ltr/LTRRescorer.java   |    2 +-
 .../org/apache/solr/ltr/LTRScoringQuery.java    |   24 +-
 .../org/apache/solr/ltr/LTRThreadModule.java    |   29 +
 .../solr/ltr/SolrQueryRequestContextUtils.java  |    6 +-
 .../org/apache/solr/ltr/feature/Feature.java    |    3 +-
 .../solr/ltr/feature/FieldValueFeature.java     |   18 +-
 .../solr/ltr/feature/OriginalScoreFeature.java  |   12 +-
 .../apache/solr/ltr/feature/SolrFeature.java    |   17 +-
 .../org/apache/solr/ltr/model/LinearModel.java  |   10 +
 .../ltr/model/MultipleAdditiveTreesModel.java   |    5 +
 .../LTRFeatureLoggerTransformerFactory.java     |  100 +-
 .../ltr/store/rest/ManagedFeatureStore.java     |    4 -
 .../solr/ltr/store/rest/ManagedModelStore.java  |   38 +-
 solr/contrib/ltr/src/java/overview.html         |    2 +-
 .../multipleadditivetreesmodel.json             |    2 +-
 .../test-files/solr/collection1/conf/schema.xml |    2 +
 .../solr/collection1/conf/solrconfig-ltr.xml    |    6 +-
 .../collection1/conf/solrconfig-ltr_Th10_10.xml |    5 +-
 .../collection1/conf/solrconfig-multiseg.xml    |   12 +-
 .../apache/solr/ltr/FeatureLoggerTestUtils.java |   44 +
 .../org/apache/solr/ltr/TestLTROnSolrCloud.java |   17 +-
 .../apache/solr/ltr/TestLTRQParserExplain.java  |    2 +-
 .../apache/solr/ltr/TestLTRQParserPlugin.java   |    5 +-
 .../org/apache/solr/ltr/TestLTRWithFacet.java   |    2 +-
 .../org/apache/solr/ltr/TestLTRWithSort.java    |    2 +-
 .../org/apache/solr/ltr/TestRerankBase.java     |   63 +-
 .../solr/ltr/TestSelectiveWeightCreation.java   |   13 +-
 .../ltr/feature/TestEdisMaxSolrFeature.java     |    2 +-
 .../solr/ltr/feature/TestExternalFeatures.java  |   39 +-
 .../ltr/feature/TestExternalValueFeatures.java  |   23 +-
 .../solr/ltr/feature/TestFeatureLogging.java    |  115 +-
 .../ltr/feature/TestFeatureLtrScoringModel.java |    2 +-
 .../solr/ltr/feature/TestFeatureStore.java      |    2 +-
 .../ltr/feature/TestFieldLengthFeature.java     |    2 +-
 .../solr/ltr/feature/TestFieldValueFeature.java |   57 +-
 .../solr/ltr/feature/TestFilterSolrFeature.java |    8 +-
 .../ltr/feature/TestNoMatchSolrFeature.java     |   94 +-
 .../ltr/feature/TestOriginalScoreFeature.java   |   11 +-
 .../ltr/feature/TestOriginalScoreScorer.java    |   47 +
 .../solr/ltr/feature/TestRankingFeature.java    |    2 +-
 .../ltr/feature/TestUserTermScoreWithQ.java     |    2 +-
 .../ltr/feature/TestUserTermScorerQuery.java    |    2 +-
 .../ltr/feature/TestUserTermScorereQDF.java     |    2 +-
 .../solr/ltr/feature/TestValueFeature.java      |    2 +-
 .../apache/solr/ltr/model/TestLinearModel.java  |    2 +-
 .../model/TestMultipleAdditiveTreesModel.java   |   55 +-
 .../solr/ltr/store/rest/TestModelManager.java   |   49 +-
 .../store/rest/TestModelManagerPersistence.java |    6 +-
 solr/contrib/morphlines-core/ivy.xml            |    8 +-
 .../solr/solrcloud/conf/solrconfig.xml          |   11 -
 .../solr/SolrMorphlineZkAliasTest.java          |    7 -
 solr/core/ivy.xml                               |    5 +-
 .../solr/cloud/CloudConfigSetService.java       |   24 +-
 .../org/apache/solr/cloud/CloudDescriptor.java  |    2 +-
 .../org/apache/solr/cloud/CreateAliasCmd.java   |   21 +-
 .../apache/solr/cloud/CreateCollectionCmd.java  |  146 +-
 .../org/apache/solr/cloud/ElectionContext.java  |   20 +-
 .../org/apache/solr/cloud/LeaderElector.java    |    9 +-
 .../java/org/apache/solr/cloud/Overseer.java    |    2 +-
 .../OverseerAutoReplicaFailoverThread.java      |    9 +-
 .../apache/solr/cloud/OverseerStatusCmd.java    |    4 +-
 .../org/apache/solr/cloud/ZkController.java     |  128 +-
 .../apache/solr/cloud/ZkSolrResourceLoader.java |    2 +-
 .../apache/solr/cloud/rule/ReplicaAssigner.java |   31 +-
 .../java/org/apache/solr/cloud/rule/Rule.java   |    4 +-
 .../org/apache/solr/core/ConfigSetService.java  |    7 +-
 .../org/apache/solr/core/CoreContainer.java     |  195 +-
 .../org/apache/solr/core/DirectoryFactory.java  |   54 +
 .../apache/solr/core/HdfsDirectoryFactory.java  |   29 +
 .../org/apache/solr/core/JmxMonitoredMap.java   |   63 +-
 .../solr/core/MetricsDirectoryFactory.java      |  505 +++++
 .../java/org/apache/solr/core/NodeConfig.java   |   18 +-
 .../java/org/apache/solr/core/PluginInfo.java   |    4 +-
 .../java/org/apache/solr/core/SolrConfig.java   |    2 +-
 .../src/java/org/apache/solr/core/SolrCore.java |  297 ++-
 .../apache/solr/core/SolrDeletionPolicy.java    |    6 +
 .../org/apache/solr/core/SolrInfoMBean.java     |   11 +-
 .../org/apache/solr/core/SolrXmlConfig.java     |   23 +-
 .../solr/core/StandardDirectoryFactory.java     |   46 +-
 .../apache/solr/handler/CdcrRequestHandler.java |    5 +
 .../org/apache/solr/handler/GraphHandler.java   |    4 +-
 .../org/apache/solr/handler/IndexFetcher.java   |   71 +-
 .../apache/solr/handler/PingRequestHandler.java |    5 +
 .../apache/solr/handler/ReplicationHandler.java |   21 +-
 .../apache/solr/handler/RequestHandlerBase.java |   56 +-
 .../org/apache/solr/handler/RestoreCore.java    |    2 +-
 .../org/apache/solr/handler/SchemaHandler.java  |    5 +
 .../org/apache/solr/handler/SnapShooter.java    |    6 +-
 .../apache/solr/handler/SolrConfigHandler.java  |    2 +-
 .../org/apache/solr/handler/StreamHandler.java  |   24 +-
 .../solr/handler/UpdateRequestHandler.java      |    5 +
 .../solr/handler/admin/CollectionsHandler.java  |    9 +-
 .../solr/handler/admin/ConfigSetsHandler.java   |    6 +-
 .../solr/handler/admin/CoreAdminHandler.java    |   14 +
 .../solr/handler/admin/CoreAdminOperation.java  |    1 +
 .../apache/solr/handler/admin/InfoHandler.java  |    5 +
 .../solr/handler/admin/LoggingHandler.java      |    6 +
 .../solr/handler/admin/LukeRequestHandler.java  |   30 +-
 .../solr/handler/admin/MetricsHandler.java      |  207 ++
 .../solr/handler/admin/PluginInfoHandler.java   |    5 +
 .../handler/admin/PropertiesRequestHandler.java |    5 +
 .../solr/handler/admin/SecurityConfHandler.java |    5 +
 .../admin/SegmentsInfoRequestHandler.java       |    6 +
 .../handler/admin/ShowFileRequestHandler.java   |    4 +
 .../handler/admin/SolrInfoMBeanHandler.java     |    5 +
 .../solr/handler/admin/SystemInfoHandler.java   |   58 +-
 .../solr/handler/admin/ThreadDumpHandler.java   |    5 +
 .../handler/admin/ZookeeperInfoHandler.java     |    5 +
 .../solr/handler/component/DebugComponent.java  |    5 +
 .../solr/handler/component/ExpandComponent.java |   30 +-
 .../solr/handler/component/FacetComponent.java  |   17 +-
 .../handler/component/HighlightComponent.java   |    5 +
 .../handler/component/HttpShardHandler.java     |   48 +-
 .../component/HttpShardHandlerFactory.java      |  129 +-
 .../component/MoreLikeThisComponent.java        |    7 +-
 .../solr/handler/component/QueryComponent.java  |   48 +-
 .../component/QueryElevationComponent.java      |   64 +-
 .../handler/component/RangeFacetProcessor.java  |    3 +-
 .../handler/component/RangeFacetRequest.java    |   31 +-
 .../handler/component/RealTimeGetComponent.java |    5 +
 .../solr/handler/component/ResponseBuilder.java |    1 -
 .../solr/handler/component/SearchHandler.java   |    2 +-
 .../component/ShardFieldSortedHitQueue.java     |    8 +-
 .../solr/handler/component/ShardHandler.java    |    5 +-
 .../handler/component/SpellCheckComponent.java  |    5 +
 .../solr/handler/component/StatsComponent.java  |    6 +
 .../handler/component/StatsValuesFactory.java   |    2 +-
 .../handler/component/TermVectorComponent.java  |    5 +
 .../solr/handler/component/TermsComponent.java  |    5 +
 .../solr/highlight/HighlightingPluginBase.java  |    2 +-
 .../solr/highlight/LuceneRegexFragmenter.java   |  217 ++
 .../apache/solr/highlight/RegexFragmenter.java  |  196 --
 .../solr/highlight/UnifiedSolrHighlighter.java  |  473 +++--
 .../solr/index/SlowCompositeReaderWrapper.java  |    3 -
 .../solr/metrics/OperatingSystemMetricSet.java  |   92 +
 .../solr/metrics/SolrCoreMetricManager.java     |  148 ++
 .../org/apache/solr/metrics/SolrMetricInfo.java |  104 +
 .../apache/solr/metrics/SolrMetricManager.java  |  675 ++++++
 .../apache/solr/metrics/SolrMetricProducer.java |   32 +
 .../apache/solr/metrics/SolrMetricReporter.java |   83 +
 .../org/apache/solr/metrics/package-info.java   |   23 +
 .../metrics/reporters/JmxObjectNameFactory.java |  155 ++
 .../metrics/reporters/SolrGangliaReporter.java  |  144 ++
 .../metrics/reporters/SolrGraphiteReporter.java |  129 ++
 .../solr/metrics/reporters/SolrJmxReporter.java |  179 ++
 .../metrics/reporters/SolrSlf4jReporter.java    |  127 ++
 .../solr/metrics/reporters/package-info.java    |   22 +
 .../apache/solr/parser/SolrQueryParserBase.java |   16 +-
 .../org/apache/solr/request/IntervalFacets.java |    4 +
 .../request/PerSegmentSingleValuedFaceting.java |    9 +-
 .../org/apache/solr/request/SimpleFacets.java   |   78 +-
 .../apache/solr/request/json/RequestUtil.java   |   16 +-
 .../org/apache/solr/response/DocsStreamer.java  |    8 +
 .../solr/response/JSONResponseWriter.java       |   86 +-
 .../java/org/apache/solr/schema/BoolField.java  |    4 +-
 .../org/apache/solr/schema/CollationField.java  |    3 +-
 .../apache/solr/schema/DoublePointField.java    |  186 ++
 .../java/org/apache/solr/schema/EnumField.java  |   20 +-
 .../java/org/apache/solr/schema/FieldType.java  |   29 +-
 .../org/apache/solr/schema/FloatPointField.java |  186 ++
 .../org/apache/solr/schema/IntPointField.java   |  186 ++
 .../org/apache/solr/schema/LongPointField.java  |  185 ++
 .../apache/solr/schema/NumericFieldType.java    |  151 ++
 .../java/org/apache/solr/schema/PointField.java |  233 +++
 .../apache/solr/schema/PreAnalyzedField.java    |   11 +
 .../org/apache/solr/schema/SchemaField.java     |   10 +
 .../org/apache/solr/schema/SchemaManager.java   |   99 +-
 .../org/apache/solr/schema/TrieDateField.java   |    2 +-
 .../org/apache/solr/schema/TrieDoubleField.java |    2 +-
 .../java/org/apache/solr/schema/TrieField.java  |  150 +-
 .../org/apache/solr/schema/TrieFloatField.java  |    2 +-
 .../org/apache/solr/schema/TrieIntField.java    |    2 +-
 .../org/apache/solr/schema/TrieLongField.java   |    2 +-
 .../org/apache/solr/search/CacheConfig.java     |    2 +-
 .../solr/search/CollapsingQParserPlugin.java    |   16 +-
 .../solr/search/ComplexPhraseQParserPlugin.java |   70 +-
 .../org/apache/solr/search/FastLRUCache.java    |    2 +-
 .../java/org/apache/solr/search/Grouping.java   |   14 +-
 .../apache/solr/search/SolrFieldCacheMBean.java |    4 +-
 .../apache/solr/search/SolrIndexSearcher.java   |   45 +-
 .../apache/solr/search/TermQParserPlugin.java   |   10 +-
 .../apache/solr/search/TermsQParserPlugin.java  |   14 +-
 .../facet/FacetFieldProcessorByArrayDV.java     |   49 +-
 .../apache/solr/search/facet/FacetModule.java   |    5 +
 .../apache/solr/search/facet/FacetRange.java    |   28 +-
 .../org/apache/solr/search/facet/FieldUtil.java |  147 ++
 .../org/apache/solr/search/facet/HLLAgg.java    |   13 +-
 .../apache/solr/search/facet/PercentileAgg.java |    7 +-
 .../org/apache/solr/search/facet/SlotAcc.java   |    5 +-
 .../apache/solr/search/facet/UniqueSlotAcc.java |    2 +-
 .../solr/search/grouping/CommandHandler.java    |    4 +-
 .../search/grouping/GroupingSpecification.java  |   18 +-
 .../distributed/command/GroupConverter.java     |    2 +-
 .../command/SearchGroupsFieldCommand.java       |    8 +-
 .../command/TopGroupsFieldCommand.java          |    4 +-
 .../SearchGroupShardResponseProcessor.java      |  160 +-
 .../TopGroupsShardResponseProcessor.java        |  114 +-
 .../org/apache/solr/search/join/GraphQuery.java |    4 +-
 .../apache/solr/search/mlt/CloudMLTQParser.java |   49 +-
 .../solr/search/mlt/SimpleMLTQParser.java       |   30 +-
 .../security/AttributeOnlyServletContext.java   |  291 +++
 .../ConfigurableInternodeAuthHadoopPlugin.java  |   68 +
 .../security/DelegationTokenKerberosFilter.java |    6 +-
 .../apache/solr/security/HadoopAuthFilter.java  |  198 ++
 .../apache/solr/security/HadoopAuthPlugin.java  |  241 +++
 .../apache/solr/security/KerberosFilter.java    |    6 +-
 .../apache/solr/security/KerberosPlugin.java    |  314 +--
 .../solr/security/PKIAuthenticationPlugin.java  |    6 +
 .../solr/security/PermissionNameProvider.java   |    1 +
 ...tContinuesRecorderAuthenticationHandler.java |   71 +
 .../apache/solr/servlet/SolrDispatchFilter.java |   46 +-
 .../apache/solr/servlet/SolrRequestParsers.java |   31 +-
 .../solr/spelling/DirectSolrSpellChecker.java   |   18 +-
 .../DocumentExpressionDictionaryFactory.java    |   18 +-
 .../org/apache/solr/uninverting/FieldCache.java |   16 +-
 .../apache/solr/uninverting/FieldCacheImpl.java |  182 +-
 .../uninverting/FieldCacheSanityChecker.java    |    3 +-
 .../solr/uninverting/UninvertingReader.java     |   23 +-
 .../solr/update/DirectUpdateHandler2.java       |    5 -
 .../java/org/apache/solr/update/PeerSync.java   |   50 +-
 .../org/apache/solr/update/SolrIndexConfig.java |   16 +-
 .../org/apache/solr/update/SolrIndexWriter.java |  144 ++
 .../org/apache/solr/update/UpdateHandler.java   |    5 +
 .../java/org/apache/solr/update/UpdateLog.java  |   74 +-
 .../apache/solr/update/UpdateShardHandler.java  |   81 +-
 .../solr/update/UpdateShardHandlerConfig.java   |   14 +-
 .../AddSchemaFieldsUpdateProcessorFactory.java  |    3 +-
 .../processor/DistributedUpdateProcessor.java   |    8 +-
 .../SkipExistingDocumentsProcessorFactory.java  |  255 +++
 .../src/java/org/apache/solr/util/DOMUtil.java  |    5 +
 .../src/java/org/apache/solr/util/JmxUtil.java  |   78 +
 .../src/java/org/apache/solr/util/SolrCLI.java  |   65 +-
 .../solr/util/SolrFileCleaningTracker.java      |  147 ++
 .../src/java/org/apache/solr/util/TimeOut.java  |   13 +-
 .../stats/HttpClientMetricNameStrategy.java     |   28 +
 .../stats/InstrumentedHttpRequestExecutor.java  |  136 ++
 ...entedPoolingHttpClientConnectionManager.java |   72 +
 .../org/apache/solr/util/stats/MetricUtils.java |  203 ++
 .../org/apache/solr/util/stats/TimerUtils.java  |   58 -
 .../resources/EditableSolrConfigAttributes.json |   16 +-
 .../conf/schema-distrib-interval-faceting.xml   |   14 +-
 .../conf/schema-docValuesFaceting.xml           |   12 +
 .../schema-minimal-with-another-uniqkey.xml     |   23 +
 .../solr/collection1/conf/schema-point.xml      |   92 +
 .../solr/collection1/conf/schema-sorts.xml      |   44 +-
 .../test-files/solr/collection1/conf/schema.xml |   26 +-
 .../solr/collection1/conf/schema11.xml          |   19 +-
 .../solr/collection1/conf/schema12.xml          |   15 +-
 .../solr/collection1/conf/schema_latest.xml     |   21 +-
 ...dd-schema-fields-update-processor-chains.xml |    8 +-
 .../conf/solrconfig-cache-enable-disable.xml    |   80 +
 .../conf/solrconfig-indexmetrics.xml            |   57 +
 .../collection1/conf/solrconfig-schemaless.xml  |   45 +-
 .../solr/collection1/conf/solrconfig_perf.xml   |    1 -
 .../configsets/cloud-hdfs/conf/solrconfig.xml   |    2 +
 .../solrconfig.snippet.randomindexconfig.xml    |   47 -
 .../configsets/doc-expiry/conf/solrconfig.xml   |   15 +-
 .../solr/security/hadoop_kerberos_config.json   |   16 +
 .../hadoop_simple_auth_with_delegation.json     |   29 +
 .../test-files/solr/solr-gangliareporter.xml    |   32 +
 .../test-files/solr/solr-graphitereporter.xml   |   31 +
 .../src/test-files/solr/solr-metricreporter.xml |   57 +
 .../src/test-files/solr/solr-slf4jreporter.xml  |   35 +
 .../apache/solr/TestDistributedGrouping.java    |   10 +-
 .../org/apache/solr/TestDistributedSearch.java  |   46 +-
 .../core/src/test/org/apache/solr/TestJoin.java |    6 +-
 .../org/apache/solr/TestRandomDVFaceting.java   |    8 +
 .../org/apache/solr/TestRandomFaceting.java     |   12 +-
 .../TestReversedWildcardFilterFactory.java      |   56 +-
 .../apache/solr/cloud/AliasIntegrationTest.java |   50 +-
 .../solr/cloud/BasicDistributedZkTest.java      |    2 +-
 .../apache/solr/cloud/CdcrBootstrapTest.java    |   25 +-
 .../org/apache/solr/cloud/ClusterStateTest.java |    8 +
 .../solr/cloud/CollectionsAPISolrJTest.java     |  466 ++---
 .../DeleteLastCustomShardedReplicaTest.java     |  104 +-
 .../org/apache/solr/cloud/DeleteShardTest.java  |  211 +-
 .../solr/cloud/DocValuesNotIndexedTest.java     |   54 +-
 .../apache/solr/cloud/LeaderElectionTest.java   |    2 +
 .../cloud/LeaderFailoverAfterPartitionTest.java |    2 +-
 .../cloud/LeaderFailureAfterFreshStartTest.java |   68 +-
 .../solr/cloud/MissingSegmentRecoveryTest.java  |  123 ++
 ...verseerCollectionConfigSetProcessorTest.java |   37 +-
 .../cloud/OverseerModifyCollectionTest.java     |   92 +-
 .../apache/solr/cloud/OverseerRolesTest.java    |  252 +--
 .../apache/solr/cloud/OverseerStatusTest.java   |   55 +-
 .../solr/cloud/PeerSyncReplicationTest.java     |   70 +-
 .../apache/solr/cloud/RemoteQueryErrorTest.java |   53 +-
 .../cloud/SegmentTerminateEarlyTestState.java   |   12 +-
 .../apache/solr/cloud/TestCloudPivotFacet.java  |    2 +
 .../apache/solr/cloud/TestCloudRecovery.java    |   26 +
 .../solr/cloud/TestDownShardTolerantSearch.java |   40 +-
 .../TestExclusionRuleCollectionAccess.java      |   38 +-
 .../solr/cloud/TestMiniSolrCloudCluster.java    |   50 -
 .../apache/solr/cloud/TestSegmentSorting.java   |  133 ++
 .../TestSolrCloudWithSecureImpersonation.java   |    8 +-
 .../apache/solr/cloud/TestStressLiveNodes.java  |    2 +-
 .../org/apache/solr/cloud/ZkSolrClientTest.java |   54 +
 .../HdfsCollectionsAPIDistributedZkTest.java    |    1 +
 .../apache/solr/cloud/rule/RuleEngineTest.java  |    2 +-
 .../solr/core/BlobRepositoryMockingTest.java    |    9 +-
 .../org/apache/solr/core/CoreSorterTest.java    |    7 +
 .../solr/core/MockShardHandlerFactory.java      |    2 +-
 .../test/org/apache/solr/core/TestConfig.java   |   34 +
 .../solr/handler/TestReplicationHandler.java    |   20 +-
 .../handler/XsltUpdateRequestHandlerTest.java   |    2 +-
 .../admin/CoreMergeIndexesAdminHandlerTest.java |   10 +-
 .../handler/admin/LukeRequestHandlerTest.java   |    8 +-
 .../solr/handler/admin/MBeansHandlerTest.java   |    4 +-
 .../solr/handler/admin/MetricsHandlerTest.java  |  149 ++
 .../admin/SegmentsInfoRequestHandlerTest.java   |   35 +-
 .../solr/handler/admin/StatsReloadRaceTest.java |   82 +-
 .../component/SpellCheckComponentTest.java      |   36 +
 .../handler/component/TestExpandComponent.java  |    8 +-
 .../highlight/TestUnifiedSolrHighlighter.java   |   39 +-
 .../solr/index/hdfs/CheckHdfsIndexTest.java     |    5 -
 .../org/apache/solr/metrics/JvmMetricsTest.java |   68 +
 .../solr/metrics/SolrCoreMetricManagerTest.java |  171 ++
 .../solr/metrics/SolrMetricManagerTest.java     |  273 +++
 .../solr/metrics/SolrMetricReporterTest.java    |   69 +
 .../solr/metrics/SolrMetricTestUtils.java       |  103 +
 .../metrics/SolrMetricsIntegrationTest.java     |  143 ++
 .../metrics/reporters/MockMetricReporter.java   |   80 +
 .../reporters/SolrGangliaReporterTest.java      |   82 +
 .../reporters/SolrGraphiteReporterTest.java     |  116 ++
 .../metrics/reporters/SolrJmxReporterTest.java  |  156 ++
 .../reporters/SolrSlf4jReporterTest.java        |   77 +
 .../apache/solr/request/SimpleFacetsTest.java   |   12 +-
 .../apache/solr/request/TestFacetMethods.java   |   12 +
 .../apache/solr/response/JSONWriterTest.java    |   20 +-
 .../TestSubQueryTransformerDistrib.java         |   55 +-
 .../apache/solr/schema/SortableBinaryField.java |    3 +-
 .../org/apache/solr/schema/TestPointFields.java | 1495 ++++++++++++++
 .../schema/TestSchemalessBufferedUpdates.java   |  160 ++
 .../ApacheLuceneSolrNearQueryBuilder.java       |   50 +
 .../apache/solr/search/GoodbyeQueryBuilder.java |    1 -
 .../apache/solr/search/HandyQueryBuilder.java   |    1 -
 .../apache/solr/search/HelloQueryBuilder.java   |    1 -
 .../solr/search/TestCollapseQParserPlugin.java  |    4 +-
 .../TestComplexPhraseLeadingWildcard.java       |  113 +
 .../solr/search/TestMaxScoreQueryParser.java    |    2 +-
 .../org/apache/solr/search/TestRTGBase.java     |   12 -
 .../search/TestRandomCollapseQParserPlugin.java |    2 +
 .../org/apache/solr/search/TestRealTimeGet.java |    2 +-
 .../org/apache/solr/search/TestRecovery.java    |  179 +-
 .../apache/solr/search/TestRecoveryHdfs.java    |   11 -
 .../apache/solr/search/TestSolrCoreParser.java  |  110 +
 .../solr/search/TestSolrFieldCacheMBean.java    |    2 +
 .../apache/solr/search/TestSolrQueryParser.java |   35 +-
 .../apache/solr/search/TestStressLucene.java    |    2 +-
 .../apache/solr/search/TestStressRecovery.java  |    2 +-
 .../apache/solr/search/TestStressReorder.java   |    5 +-
 .../solr/search/TestStressUserVersions.java     |    4 +-
 .../apache/solr/search/TestStressVersions.java  |    2 +-
 .../solr/search/facet/TestJsonFacets.java       |   73 +-
 .../solr/search/mlt/CloudMLTQParserTest.java    |   23 +-
 .../solr/search/mlt/SimpleMLTQParserTest.java   |   33 +-
 .../PKIAuthenticationIntegrationTest.java       |   40 +-
 .../security/TestPKIAuthenticationPlugin.java   |    8 +
 .../solr/security/hadoop/ImpersonationUtil.java |   73 +
 .../hadoop/ImpersonatorCollectionsHandler.java  |   60 +
 .../hadoop/TestDelegationWithHadoopAuth.java    |  400 ++++
 .../hadoop/TestImpersonationWithHadoopAuth.java |  215 ++
 .../TestSolrCloudWithHadoopAuthPlugin.java      |  138 ++
 .../solr/servlet/SolrRequestParserTest.java     |    3 +
 .../org/apache/solr/update/AutoCommitTest.java  |    2 +-
 .../apache/solr/update/CdcrUpdateLogTest.java   |   17 -
 .../apache/solr/update/SoftAutoCommitTest.java  |    2 +-
 .../apache/solr/update/SolrIndexConfigTest.java |    1 +
 .../solr/update/SolrIndexMetricsTest.java       |   94 +
 ...ipExistingDocumentsProcessorFactoryTest.java |  335 +++
 .../apache/solr/util/stats/MetricUtilsTest.java |   56 +
 .../apache/solr/util/stats/TimerUtilsTest.java  |   58 -
 .../example-DIH/solr/db/conf/solrconfig.xml     |   11 -
 .../example-DIH/solr/mail/conf/solrconfig.xml   |   11 -
 .../example-DIH/solr/rss/conf/solrconfig.xml    |   11 -
 .../example-DIH/solr/solr/conf/solrconfig.xml   |   11 -
 .../example-DIH/solr/tika/conf/solrconfig.xml   |   11 -
 solr/example/files/conf/solrconfig.xml          |   16 +-
 solr/licenses/byte-buddy-1.6.2.jar.sha1         |    1 +
 solr/licenses/byte-buddy-LICENSE-ASL.txt        |  202 ++
 solr/licenses/byte-buddy-NOTICE.txt             |    4 +
 solr/licenses/gmetric4j-1.0.7.jar.sha1          |    1 +
 solr/licenses/gmetric4j-LICENSE-BSD.txt         |   31 +
 solr/licenses/gmetric4j-NOTICE.txt              |    0
 solr/licenses/metrics-ganglia-3.1.2.jar.sha1    |    1 +
 solr/licenses/metrics-ganglia-LICENSE-ASL.txt   |  203 ++
 solr/licenses/metrics-ganglia-NOTICE.txt        |   12 +
 solr/licenses/metrics-graphite-3.1.2.jar.sha1   |    1 +
 solr/licenses/metrics-graphite-LICENSE-ASL.txt  |  203 ++
 solr/licenses/metrics-graphite-NOTICE.txt       |   12 +
 solr/licenses/metrics-jetty-LICENSE-ASL.txt     |  203 ++
 solr/licenses/metrics-jetty-NOTICE.txt          |   12 +
 solr/licenses/metrics-jetty9-3.1.2.jar.sha1     |    1 +
 solr/licenses/metrics-json-LICENSE-ASL.txt      |  203 ++
 solr/licenses/metrics-json-NOTICE.txt           |   12 +
 solr/licenses/metrics-jvm-3.1.2.jar.sha1        |    1 +
 solr/licenses/metrics-jvm-LICENSE-ASL.txt       |  203 ++
 solr/licenses/metrics-jvm-NOTICE.txt            |   12 +
 solr/licenses/metrics-servlets-LICENSE-ASL.txt  |  203 ++
 solr/licenses/metrics-servlets-NOTICE.txt       |   12 +
 solr/licenses/mockito-core-1.9.5.jar.sha1       |    1 -
 solr/licenses/mockito-core-2.6.2.jar.sha1       |    1 +
 solr/licenses/objenesis-1.2.jar.sha1            |    1 -
 solr/licenses/objenesis-2.5.jar.sha1            |    1 +
 solr/server/build.xml                           |    4 +-
 solr/server/etc/jetty.xml                       |   20 +-
 solr/server/ivy.xml                             |   14 +-
 solr/server/scripts/cloud-scripts/zkcli.bat     |    2 +-
 solr/server/scripts/cloud-scripts/zkcli.sh      |    2 +-
 .../basic_configs/conf/solrconfig.xml           |   17 +-
 .../conf/solrconfig.xml                         |   16 +-
 .../conf/solrconfig.xml                         |   65 +-
 .../impl/DelegationTokenHttpSolrClient.java     |   34 +-
 .../solrj/impl/HttpClientBuilderFactory.java    |   41 +
 .../solr/client/solrj/impl/HttpClientUtil.java  |   35 +-
 .../solr/client/solrj/impl/HttpSolrClient.java  |   56 +-
 .../solrj/impl/Krb5HttpClientBuilder.java       |   10 +-
 .../solr/client/solrj/io/ops/AndOperation.java  |  101 +
 .../client/solrj/io/ops/BooleanOperation.java   |   26 +
 .../client/solrj/io/ops/EqualsOperation.java    |   70 +
 .../io/ops/GreaterThanEqualToOperation.java     |   70 +
 .../solrj/io/ops/GreaterThanOperation.java      |   70 +
 .../solr/client/solrj/io/ops/LeafOperation.java |   67 +
 .../solrj/io/ops/LessThanEqualToOperation.java  |   70 +
 .../client/solrj/io/ops/LessThanOperation.java  |   70 +
 .../solr/client/solrj/io/ops/NotOperation.java  |   87 +
 .../solr/client/solrj/io/ops/OrOperation.java   |   71 +
 .../client/solrj/io/stream/CloudSolrStream.java |    4 +
 .../client/solrj/io/stream/HavingStream.java    |  173 ++
 .../solr/client/solrj/io/stream/NullStream.java |  155 ++
 .../client/solrj/io/stream/PriorityStream.java  |  161 ++
 .../solrj/io/stream/expr/StreamFactory.java     |    2 +
 .../solrj/request/CollectionAdminRequest.java   |    2 +
 .../apache/solr/common/cloud/SolrZkClient.java  |   29 +-
 .../apache/solr/common/cloud/ZkCmdExecutor.java |   15 +-
 .../apache/solr/common/params/CommonParams.java |    4 +-
 .../solr/common/params/HighlightParams.java     |    4 +-
 .../solr/client/solrj/LargeVolumeTestBase.java  |    3 +-
 .../solr/client/solrj/SolrExampleTestBase.java  |    1 -
 .../apache/solr/client/solrj/SolrQueryTest.java |    2 +-
 .../solrj/impl/BasicHttpSolrClientTest.java     |   31 +
 .../solrj/impl/CloudSolrClientCacheTest.java    |    7 +
 .../client/solrj/impl/CloudSolrClientTest.java  |    8 +-
 .../solrj/io/graph/GraphExpressionTest.java     |    3 +-
 .../solr/client/solrj/io/sql/JdbcTest.java      |    7 +-
 .../client/solrj/io/stream/JDBCStreamTest.java  |    9 +-
 .../solrj/io/stream/StreamExpressionTest.java   |  467 ++++-
 .../client/solrj/io/stream/StreamingTest.java   |   10 +-
 .../solr/common/params/CommonParamsTest.java    |    2 +
 .../java/org/apache/solr/SolrJettyTestBase.java |    2 -
 .../java/org/apache/solr/SolrTestCaseHS.java    |    4 +
 .../java/org/apache/solr/SolrTestCaseJ4.java    |   68 +-
 .../solr/cloud/AbstractDistribZkTestBase.java   |   30 +-
 .../java/org/apache/solr/cloud/ChaosMonkey.java |    2 -
 .../apache/solr/cloud/MiniSolrCloudCluster.java |   29 +-
 .../apache/solr/cloud/SolrCloudTestCase.java    |   30 +-
 .../component/TrackingShardHandlerFactory.java  |    2 +-
 .../java/org/apache/solr/util/TestHarness.java  |   12 +-
 solr/webapp/web/js/angular/services.js          |   46 +-
 885 files changed, 43196 insertions(+), 13840 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6e77729/solr/core/src/java/org/apache/solr/core/CoreContainer.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 5268bb6,023e7b1..23df22b
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@@ -48,7 -55,8 +55,9 @@@ import org.apache.solr.cloud.Overseer
  import org.apache.solr.cloud.ZkController;
  import org.apache.solr.common.SolrException;
  import org.apache.solr.common.SolrException.ErrorCode;
+ import org.apache.solr.common.cloud.Replica;
+ import org.apache.solr.common.cloud.Replica.State;
 +import org.apache.solr.common.cloud.ZkStateReader;
  import org.apache.solr.common.util.ExecutorUtil;
  import org.apache.solr.common.util.IOUtils;
  import org.apache.solr.common.util.Utils;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6e77729/solr/core/src/java/org/apache/solr/handler/CdcrRequestHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6e77729/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java
index 8bf00ea,04b930a..8230bf5
--- a/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/PingRequestHandler.java
@@@ -330,7 -330,7 +330,12 @@@ public class PingRequestHandler extend
    }
  
    @Override
 +  public Boolean registerV2() {
 +    return Boolean.TRUE;
 +  }
++
++  @Override
+   public Category getCategory() {
+     return Category.ADMIN;
+   }
  }

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6e77729/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
index 4ec1985,b70c096..3c6f5fa
--- a/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
+++ b/solr/core/src/java/org/apache/solr/handler/RequestHandlerBase.java
@@@ -18,10 -18,9 +18,11 @@@ package org.apache.solr.handler
  
  import java.lang.invoke.MethodHandles;
  import java.net.URL;
 +import java.util.Collection;
- import java.util.concurrent.atomic.LongAdder;
  
 +import com.google.common.collect.ImmutableList;
+ import com.codahale.metrics.Counter;
+ import com.codahale.metrics.Meter;
  import com.codahale.metrics.Timer;
  import org.apache.solr.common.SolrException;
  import org.apache.solr.common.params.SolrParams;
@@@ -36,10 -37,7 +39,10 @@@ import org.apache.solr.request.SolrRequ
  import org.apache.solr.response.SolrQueryResponse;
  import org.apache.solr.search.SyntaxError;
  import org.apache.solr.util.SolrPluginUtils;
- import org.apache.solr.util.stats.TimerUtils;
 +import org.apache.solr.api.Api;
 +import org.apache.solr.api.ApiBag;
 +import org.apache.solr.api.ApiSupport;
+ import org.apache.solr.util.stats.MetricUtils;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  
@@@ -48,7 -46,7 +51,7 @@@ import static org.apache.solr.core.Requ
  /**
   *
   */
- public abstract class RequestHandlerBase implements SolrRequestHandler, SolrInfoMBean, NestedRequestHandler, ApiSupport {
 -public abstract class RequestHandlerBase implements SolrRequestHandler, SolrInfoMBean, SolrMetricProducer, NestedRequestHandler {
++public abstract class RequestHandlerBase implements SolrRequestHandler, SolrInfoMBean, SolrMetricProducer, NestedRequestHandler,ApiSupport {
  
    protected NamedList initArgs = null;
    protected SolrParams defaults;
@@@ -273,19 -282,14 +287,19 @@@
    public NamedList<Object> getStatistics() {
      NamedList<Object> lst = new SimpleOrderedMap<>();
      lst.add("handlerStart",handlerStart);
-     lst.add("requests", numRequests.longValue());
-     lst.add("errors", numServerErrors.longValue() + numClientErrors.longValue());
-     lst.add("serverErrors", numServerErrors.longValue());
-     lst.add("clientErrors", numClientErrors.longValue());
-     lst.add("timeouts", numTimeouts.longValue());
-     TimerUtils.addMetrics(lst, requestTimes);
+     lst.add("requests", requests.getCount());
+     lst.add("errors", numErrors.getCount());
+     lst.add("serverErrors", numServerErrors.getCount());
+     lst.add("clientErrors", numClientErrors.getCount());
+     lst.add("timeouts", numTimeouts.getCount());
+     MetricUtils.addMetrics(lst, requestTimes);
      return lst;
    }
 +
 +  @Override
 +  public Collection<Api> getApis() {
 +    return ImmutableList.of(new ApiBag.ReqHandlerToApi(this, ApiBag.constructSpec(pluginInfo)));
 +  }
  }
  
  

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6e77729/solr/core/src/java/org/apache/solr/handler/SchemaHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6e77729/solr/core/src/java/org/apache/solr/handler/SolrConfigHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6e77729/solr/core/src/java/org/apache/solr/handler/UpdateRequestHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6e77729/solr/core/src/java/org/apache/solr/handler/admin/CollectionsHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6e77729/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java
index 28092f2,f3a8dd2..5d6f02c
--- a/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/ConfigSetsHandler.java
@@@ -168,8 -160,13 +168,12 @@@ public class ConfigSetsHandler extends 
    public String getDescription() {
      return "Manage SolrCloud ConfigSets";
    }
 -
+   @Override
+   public Category getCategory() {
+     return Category.ADMIN;
+   }
  
-   public enum ConfigSetOperation {
+   enum ConfigSetOperation {
      CREATE_OP(CREATE) {
        @Override
        Map<String, Object> call(SolrQueryRequest req, SolrQueryResponse rsp, ConfigSetsHandler h) throws Exception {

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6e77729/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
index 3e9b447,a415d8a..af782f8
--- a/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/CoreAdminHandler.java
@@@ -48,7 -48,7 +49,8 @@@ import org.apache.solr.response.SolrQue
  import org.apache.solr.security.AuthorizationContext;
  import org.apache.solr.security.PermissionNameProvider;
  import org.apache.solr.util.DefaultSolrThreadFactory;
 +import org.apache.solr.api.Api;
+ import org.apache.solr.util.stats.MetricUtils;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  import org.slf4j.MDC;
@@@ -117,10 -114,12 +119,17 @@@ public class CoreAdminHandler extends R
    }
  
    @Override
 +  public Boolean registerV2() {
 +    return Boolean.TRUE;
 +  }
 +
++  @Override
+   public void initializeMetrics(SolrMetricManager manager, String registryName, String scope) {
+     super.initializeMetrics(manager, registryName, scope);
+     parallelExecutor = MetricUtils.instrumentedExecutorService(parallelExecutor, manager.registry(registryName),
+         SolrMetricManager.mkName("parallelCoreAdminExecutor", getCategory().name(),scope, "threadPool"));
+   }
+ 
    /**
     * The instance of CoreContainer this handler handles. This should be the CoreContainer instance that created this
     * handler.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6e77729/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java
index 326eb9a,8fdac21..e2dc337
--- a/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/InfoHandler.java
@@@ -104,9 -103,13 +104,14 @@@ public class InfoHandler extends Reques
      return "System Information";
    }
  
+   @Override
+   public Category getCategory() {
+     return Category.ADMIN;
+   }
+ 
    protected PropertiesRequestHandler getPropertiesHandler() {
 -    return propertiesHandler;
 +    return (PropertiesRequestHandler) handlers.get("properties");
 +
    }
  
    protected ThreadDumpHandler getThreadDumpHandler() {

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6e77729/solr/core/src/java/org/apache/solr/handler/admin/SecurityConfHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6e77729/solr/core/src/java/org/apache/solr/schema/SchemaManager.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6e77729/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
index ed81466,a411bb3..5c7783f
--- a/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrDispatchFilter.java
@@@ -62,7 -73,7 +73,8 @@@ import org.apache.solr.metrics.SolrMetr
  import org.apache.solr.request.SolrRequestInfo;
  import org.apache.solr.security.AuthenticationPlugin;
  import org.apache.solr.security.PKIAuthenticationPlugin;
+ import org.apache.solr.util.SolrFileCleaningTracker;
 +import org.apache.solr.api.V2HttpCall;
  import org.slf4j.Logger;
  import org.slf4j.LoggerFactory;
  

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6e77729/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
index 94a8e7d,968320e..737a821
--- a/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
+++ b/solr/core/src/java/org/apache/solr/servlet/SolrRequestParsers.java
@@@ -43,9 -42,9 +43,10 @@@ import java.util.Map
  import org.apache.commons.fileupload.FileItem;
  import org.apache.commons.fileupload.disk.DiskFileItemFactory;
  import org.apache.commons.fileupload.servlet.ServletFileUpload;
+ import org.apache.commons.io.FileCleaningTracker;
  import org.apache.commons.io.input.CloseShieldInputStream;
  import org.apache.lucene.util.IOUtils;
 +import org.apache.solr.api.V2HttpCall;
  import org.apache.solr.common.SolrException;
  import org.apache.solr.common.SolrException.ErrorCode;
  import org.apache.solr.common.params.CommonParams;
@@@ -59,8 -58,8 +60,9 @@@ import org.apache.solr.core.SolrConfig
  import org.apache.solr.core.SolrCore;
  import org.apache.solr.request.SolrQueryRequest;
  import org.apache.solr.request.SolrQueryRequestBase;
 +import org.apache.solr.util.CommandOperation;
  import org.apache.solr.util.RTimerTree;
+ import org.apache.solr.util.SolrFileCleaningTracker;
  
  import static org.apache.solr.common.params.CommonParams.PATH;
  

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6e77729/solr/core/src/test/org/apache/solr/servlet/SolrRequestParserTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/a6e77729/solr/server/solr/configsets/sample_techproducts_configs/conf/solrconfig.xml
----------------------------------------------------------------------