lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [48/52] [abbrv] lucene-solr:jira/solr-9959: Merge branch 'master' into jira/solr-9959
Date Mon, 03 Apr 2017 18:45:54 GMT
Merge branch 'master' into jira/solr-9959


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

Branch: refs/heads/jira/solr-9959
Commit: 04a71229303c0b6e19c56b556a7b46387325a43f
Parents: 5be37ef 99af830
Author: Andrzej Bialecki <ab@apache.org>
Authored: Mon Apr 3 12:56:34 2017 +0200
Committer: Andrzej Bialecki <ab@apache.org>
Committed: Mon Apr 3 12:56:34 2017 +0200

----------------------------------------------------------------------
 .gitignore                                      |    1 -
 dev-tools/doap/lucene.rdf                       |    7 +
 dev-tools/doap/solr.rdf                         |    7 +
 dev-tools/idea/.idea/ant.xml                    |    3 -
 .../libraries/Solr_morphlines_cell_library.xml  |   10 -
 .../libraries/Solr_morphlines_core_library.xml  |   10 -
 .../Solr_morphlines_core_test_library.xml       |   10 -
 dev-tools/idea/.idea/modules.xml                |    3 -
 dev-tools/idea/.idea/workspace.xml              |   39 +-
 .../idea/solr/contrib/map-reduce/map-reduce.iml |   43 -
 .../contrib/morphlines-cell/morphlines-cell.iml |   29 -
 .../contrib/morphlines-core/morphlines-core.iml |   28 -
 dev-tools/maven/pom.xml.template                |    1 +
 .../solr/contrib/map-reduce/pom.xml.template    |   90 -
 .../contrib/morphlines-cell/pom.xml.template    |   90 -
 .../contrib/morphlines-core/pom.xml.template    |   91 -
 dev-tools/maven/solr/contrib/pom.xml.template   |    3 -
 lucene/CHANGES.txt                              |   30 +-
 .../charfilter/HTMLStripCharFilter.java         |    2 +-
 .../charfilter/HTMLStripCharFilter.jflex        |    7 +-
 .../compound/hyphenation/TernaryTree.java       |    2 +-
 .../lucene/analysis/shingle/ShingleFilter.java  |    2 +-
 .../analysis/hunspell/TestDictionary.java       |    2 +-
 .../miscellaneous/TestWordDelimiterFilter.java  |    2 +-
 .../TestWordDelimiterGraphFilter.java           |    2 +-
 .../payloads/NumericPayloadTokenFilterTest.java |    2 +-
 .../payloads/TypeAsPayloadTokenFilterTest.java  |    2 +-
 .../analysis/sinks/TestTeeSinkTokenFilter.java  |    4 +-
 .../lucene/analysis/snowball/TestSnowball.java  |    2 +-
 .../standard/TestUAX29URLEmailTokenizer.java    |    4 +-
 .../lucene/analysis/icu/ICUTransformFilter.java |    2 +-
 .../lucene/analysis/cn/smart/Utility.java       |    8 +-
 .../index/TestBackwardsCompatibility.java       |    4 +-
 .../org/apache/lucene/index/index.6.5.0-cfs.zip |  Bin 0 -> 15832 bytes
 .../apache/lucene/index/index.6.5.0-nocfs.zip   |  Bin 0 -> 15836 bytes
 .../byTask/feeds/EnwikiContentSourceTest.java   |    4 +-
 .../CachingNaiveBayesClassifierTest.java        |    2 +-
 .../SimpleNaiveBayesClassifierTest.java         |    2 +-
 .../bloom/BloomFilteringPostingsFormat.java     |    8 +-
 .../codecs/memory/MemoryPostingsFormat.java     |    2 +-
 .../simpletext/SimpleTextTermVectorsReader.java |    2 +-
 lucene/common-build.xml                         |    3 +
 .../CompressingTermVectorsReader.java           |    2 +-
 .../apache/lucene/index/IndexReaderContext.java |   10 +-
 .../org/apache/lucene/index/IndexWriter.java    |    2 +-
 .../apache/lucene/index/IndexWriterConfig.java  |    2 +-
 .../apache/lucene/index/ParallelLeafReader.java |    2 +-
 .../lucene/search/ConstantScoreQuery.java       |    2 +-
 .../org/apache/lucene/search/IndexSearcher.java |    1 -
 .../org/apache/lucene/search/ReqExclScorer.java |    2 +-
 .../org/apache/lucene/util/VirtualMethod.java   |    2 +-
 .../org/apache/lucene/index/TestCodecs.java     |    8 +-
 .../apache/lucene/index/TestCustomNorms.java    |   14 +-
 .../index/TestFlushByRamOrCountsPolicy.java     |    2 +-
 .../apache/lucene/index/TestIndexWriter.java    |    2 +-
 .../lucene/index/TestIndexWriterExceptions.java |    2 +-
 .../lucene/index/TestIndexWriterMerging.java    |    2 +-
 .../index/TestIndexWriterWithThreads.java       |    2 +-
 .../apache/lucene/index/TestIndexableField.java |    2 +-
 .../lucene/index/TestMaxTermFrequency.java      |    2 +-
 .../test/org/apache/lucene/index/TestNorms.java |   14 +-
 .../lucene/index/TestPerSegmentDeletes.java     |    2 +-
 .../lucene/index/TestSameTokenSamePosition.java |    4 +-
 .../lucene/index/TestStressIndexing2.java       |    2 +-
 .../lucene/index/TestTermVectorsReader.java     |    2 +-
 .../lucene/index/TestTransactionRollback.java   |    6 +-
 .../lucene/index/TestUniqueTermCount.java       |    2 +-
 .../lucene/search/TestAutomatonQuery.java       |    2 +-
 .../search/TestAutomatonQueryUnicode.java       |    2 +-
 .../lucene/search/TestCustomSearcherSort.java   |    4 +-
 .../TestEarlyTerminatingSortingCollector.java   |   16 +-
 .../apache/lucene/search/TestPrefixRandom.java  |    4 +-
 .../apache/lucene/search/TestRegexpQuery.java   |    2 +-
 .../apache/lucene/search/TestRegexpRandom2.java |    2 +-
 .../lucene/search/TestSearchWithThreads.java    |    2 +-
 .../lucene/search/TestSimilarityProvider.java   |    6 +-
 .../apache/lucene/search/TestTermScorer.java    |    2 +-
 .../search/TestTimeLimitingCollector.java       |    2 +-
 .../apache/lucene/store/TestLockFactory.java    |    4 +-
 .../apache/lucene/store/TestRAMDirectory.java   |   26 +-
 .../lucene/util/TestCloseableThreadLocal.java   |    2 +-
 .../apache/lucene/util/TestQueryBuilder.java    |    2 +-
 .../lucene/util/TestRamUsageEstimator.java      |    8 +-
 .../org/apache/lucene/util/fst/TestFSTs.java    |    2 +-
 .../taxonomy/writercache/CollisionMap.java      |    2 +-
 .../grouping/DistinctValuesCollectorTest.java   |   48 +-
 .../grouping/GroupFacetCollectorTest.java       |    4 +-
 .../uhighlight/LengthGoalBreakIteratorTest.java |   26 +-
 .../TestUnifiedHighlighterExtensibility.java    |    2 +-
 .../vectorhighlight/AbstractTestCase.java       |    6 +-
 lucene/ivy-ignore-conflicts.properties          |    1 -
 lucene/ivy-versions.properties                  |   59 -
 .../lucene/search/join/GlobalOrdinalsQuery.java |   16 +-
 .../join/GlobalOrdinalsWithScoreQuery.java      |   16 +-
 .../org/apache/lucene/search/join/JoinUtil.java |    8 +-
 .../search/DiversifiedTopDocsCollector.java     |    5 +-
 .../apache/lucene/queries/CustomScoreQuery.java |    2 +-
 .../lucene/queries/TestCustomScoreQuery.java    |    2 +-
 .../queries/payloads/TestPayloadSpans.java      |    6 +-
 .../surround/parser/QueryParser.java            |   41 +-
 .../queryparser/surround/parser/QueryParser.jj  |   45 +-
 .../queryparser/surround/query/FieldsQuery.java |    4 +-
 .../queryparser/classic/TestMultiAnalyzer.java  |    8 +-
 .../classic/TestMultiFieldQueryParser.java      |    2 +-
 .../standard/TestMultiAnalyzerQPHelper.java     |    8 +-
 .../flexible/standard/TestQPHelper.java         |    8 +-
 .../queryparser/util/QueryParserTestBase.java   |   10 +-
 .../sandbox/queries/FuzzyLikeThisQuery.java     |    2 +-
 .../lucene/payloads/TestPayloadSpanUtil.java    |    4 +-
 .../lucene/spatial3d/geom/GeoBBoxTest.java      |    2 +-
 .../search/spell/WordBreakSpellChecker.java     |   10 +-
 .../lucene/search/suggest/FileDictionary.java   |    8 +-
 .../search/suggest/document/ContextQuery.java   |    2 +-
 .../search/suggest/document/SuggestField.java   |    2 +-
 .../search/suggest/fst/ExternalRefSorter.java   |    2 +-
 .../suggest/fst/WFSTCompletionLookup.java       |    2 +-
 .../search/suggest/jaspell/JaspellLookup.java   |    8 +-
 .../jaspell/JaspellTernarySearchTrie.java       |    2 +-
 .../search/suggest/DocumentDictionaryTest.java  |    2 +-
 .../analyzing/AnalyzingInfixSuggesterTest.java  |    2 +-
 .../suggest/analyzing/FuzzySuggesterTest.java   |    2 +-
 .../mockrandom/MockRandomPostingsFormat.java    |    2 +-
 .../lucene/store/BaseLockFactoryTestCase.java   |    2 +-
 .../dependencies/GetMavenDependenciesTask.java  |    2 +-
 .../lucene/validation/LibVersionsCheckTask.java |    2 +-
 solr/CHANGES.txt                                |   71 +-
 solr/README.txt                                 |    2 +-
 solr/bin/solr                                   |   32 +-
 solr/bin/solr.cmd                               |   31 +-
 .../request/AnalyticsContentHandler.java        |   44 +-
 .../solr/analytics/request/AnalyticsStats.java  |    2 +-
 .../handler/clustering/ClusteringComponent.java |   64 +-
 .../clustering/solr/collection1/conf/schema.xml |   40 +-
 .../solr/collection1/conf/synonyms.txt          |    2 +-
 .../clustering/ClusteringComponentTest.java     |   68 +-
 .../carrot2/CarrotClusteringEngineTest.java     |    3 +-
 .../handler/dataimport/MailEntityProcessor.java |    4 +-
 .../conf/dataimport-schema-no-unique-key.xml    |   11 +-
 .../dataimport/EntityProcessorWrapper.java      |   23 +
 .../handler/dataimport/VariableResolver.java    |    2 +-
 .../handler/dataimport/XPathRecordReader.java   |   10 +-
 .../solr/collection1/conf/dataimport-schema.xml |   17 +-
 .../conf/dataimport-solr_id-schema.xml          |   29 +-
 .../dataimport/AbstractDIHCacheTestCase.java    |    4 +-
 .../AbstractSqlEntityProcessorTestCase.java     |    4 +-
 .../dataimport/TestContentStreamDataSource.java |    2 +-
 .../handler/dataimport/TestDocBuilder2.java     |   48 +-
 .../dataimport/TestHierarchicalDocBuilder.java  |   16 +-
 .../handler/extraction/XLSXResponseWriter.java  |    2 +-
 .../extraction/solr/collection1/conf/schema.xml |   61 +-
 .../org/apache/solr/ltr/LTRScoringQuery.java    |    2 +-
 .../test-files/solr/collection1/conf/schema.xml |    2 +-
 .../solr/collection1/conf/synonyms.txt          |    2 +-
 .../solr/ltr/TestLTRReRankingPipeline.java      |    2 +-
 solr/contrib/map-reduce/README.txt              |   20 -
 solr/contrib/map-reduce/build.xml               |  157 -
 solr/contrib/map-reduce/ivy.xml                 |   37 -
 .../map-reduce/src/java/assembly/hadoop-job.xml |   39 -
 .../solr/hadoop/AlphaNumericComparator.java     |   75 -
 .../org/apache/solr/hadoop/BatchWriter.java     |  243 --
 .../solr/hadoop/DataInputInputStream.java       |   58 -
 .../solr/hadoop/DataOutputOutputStream.java     |   66 -
 .../solr/hadoop/DryRunDocumentLoader.java       |   57 -
 .../src/java/org/apache/solr/hadoop/GoLive.java |  182 -
 .../apache/solr/hadoop/HdfsFileFieldNames.java  |   41 -
 .../org/apache/solr/hadoop/HeartBeater.java     |  159 -
 .../solr/hadoop/LineRandomizerMapper.java       |   67 -
 .../solr/hadoop/LineRandomizerReducer.java      |   48 -
 .../solr/hadoop/MapReduceIndexerTool.java       | 1388 -------
 .../apache/solr/hadoop/PathArgumentType.java    |  233 --
 .../java/org/apache/solr/hadoop/PathParts.java  |  130 -
 .../solr/hadoop/SolrCloudPartitioner.java       |  143 -
 .../org/apache/solr/hadoop/SolrCounters.java    |   53 -
 .../solr/hadoop/SolrInputDocumentWritable.java  |   66 -
 .../java/org/apache/solr/hadoop/SolrMapper.java |   39 -
 .../apache/solr/hadoop/SolrOutputFormat.java    |  280 --
 .../apache/solr/hadoop/SolrRecordWriter.java    |  479 ---
 .../org/apache/solr/hadoop/SolrReducer.java     |  188 -
 .../solr/hadoop/ToolRunnerHelpFormatter.java    |   90 -
 .../org/apache/solr/hadoop/TreeMergeMapper.java |   46 -
 .../solr/hadoop/TreeMergeOutputFormat.java      |  201 -
 .../hadoop/UnbufferedDataInputInputStream.java  |  114 -
 .../src/java/org/apache/solr/hadoop/Utils.java  |   59 -
 .../apache/solr/hadoop/ZooKeeperInspector.java  |  213 -
 .../dedup/NoChangeUpdateConflictResolver.java   |   36 -
 .../dedup/RejectingUpdateConflictResolver.java  |   48 -
 .../RetainMostRecentUpdateConflictResolver.java |  114 -
 .../dedup/SolrInputDocumentComparator.java      |   84 -
 .../dedup/SortingUpdateConflictResolver.java    |   79 -
 .../hadoop/dedup/UpdateConflictResolver.java    |   71 -
 .../apache/solr/hadoop/dedup/package-info.java  |   25 -
 .../hadoop/morphline/MorphlineCounters.java     |   47 -
 .../hadoop/morphline/MorphlineMapRunner.java    |  268 --
 .../solr/hadoop/morphline/MorphlineMapper.java  |  193 -
 .../solr/hadoop/morphline/package-info.java     |   25 -
 .../org/apache/solr/hadoop/package-info.java    |   25 -
 solr/contrib/map-reduce/src/java/overview.html  |   21 -
 .../map-reduce/src/test-files/README.txt        |    1 -
 .../solr/hadoop/AlphaNumericComparatorTest.java |   46 -
 .../org/apache/solr/hadoop/IdentityMapper.java  |   38 -
 .../org/apache/solr/hadoop/IdentityReducer.java |   37 -
 .../hadoop/LineRandomizerMapperReducerTest.java |   94 -
 .../test/org/apache/solr/hadoop/MRUnitBase.java |   64 -
 .../MapReduceIndexerToolArgumentParserTest.java |  468 ---
 .../solr/hadoop/MorphlineBasicMiniMRTest.java   |  415 --
 .../solr/hadoop/MorphlineGoLiveMiniMRTest.java  |  881 ----
 .../apache/solr/hadoop/MorphlineMapperTest.java |   76 -
 .../solr/hadoop/MorphlineReducerTest.java       |  131 -
 .../org/apache/solr/hadoop/UtilsForTests.java   |   57 -
 .../solr/hadoop/hack/MiniMRClientCluster.java   |   41 -
 .../hadoop/hack/MiniMRClientClusterFactory.java |   88 -
 .../apache/solr/hadoop/hack/MiniMRCluster.java  |  266 --
 .../solr/hadoop/hack/MiniMRYarnCluster.java     |  205 -
 .../hadoop/hack/MiniMRYarnClusterAdapter.java   |   78 -
 .../solr/hadoop/hack/MiniYARNCluster.java       |  409 --
 solr/contrib/morphlines-cell/README.txt         |    6 -
 solr/contrib/morphlines-cell/build.xml          |  144 -
 solr/contrib/morphlines-cell/ivy.xml            |   35 -
 .../solr/morphlines/cell/SolrCellBuilder.java   |  348 --
 .../StripNonCharSolrContentHandlerFactory.java  |   81 -
 .../cell/TrimSolrContentHandlerFactory.java     |   58 -
 .../solr/morphlines/cell/package-info.java      |   25 -
 .../morphlines-cell/src/java/overview.html      |   21 -
 .../morphlines-cell/src/test-files/README.txt   |    1 -
 .../morphlines/cell/SolrCellMorphlineTest.java  |  292 --
 solr/contrib/morphlines-core/README.txt         |    6 -
 solr/contrib/morphlines-core/build.xml          |  105 -
 solr/contrib/morphlines-core/ivy.xml            |  128 -
 .../solr/morphlines/solr/DocumentLoader.java    |   73 -
 .../apache/solr/morphlines/solr/FileUtils.java  |  140 -
 .../solr/GenerateSolrSequenceKeyBuilder.java    |  143 -
 .../solr/morphlines/solr/LoadSolrBuilder.java   |  153 -
 .../solr/SafeConcurrentUpdateSolrClient.java    |   70 -
 .../solr/SanitizeUnknownSolrFieldsBuilder.java  |  101 -
 .../solr/SolrClientDocumentLoader.java          |  124 -
 .../solr/morphlines/solr/SolrLocator.java       |  254 --
 .../morphlines/solr/SolrMorphlineContext.java   |   80 -
 .../morphlines/solr/TokenizeTextBuilder.java    |  154 -
 .../morphlines/solr/ZooKeeperDownloader.java    |  142 -
 .../solr/morphlines/solr/package-info.java      |   25 -
 .../morphlines-core/src/java/overview.html      |   21 -
 .../src/test-files/custom-mimetypes.xml         |   38 -
 .../src/test-files/log4j.properties             |    7 -
 .../src/test-files/morphlines-core.marker       |    1 -
 .../solr/collection1/conf/currency.xml          |   67 -
 .../solr/collection1/conf/elevate.xml           |   42 -
 .../collection1/conf/lang/contractions_ca.txt   |    8 -
 .../collection1/conf/lang/contractions_fr.txt   |    9 -
 .../collection1/conf/lang/contractions_ga.txt   |    5 -
 .../collection1/conf/lang/contractions_it.txt   |   23 -
 .../collection1/conf/lang/hyphenations_ga.txt   |    5 -
 .../solr/collection1/conf/lang/stemdict_nl.txt  |    6 -
 .../solr/collection1/conf/lang/stoptags_ja.txt  |  420 --
 .../solr/collection1/conf/lang/stopwords_ar.txt |  125 -
 .../solr/collection1/conf/lang/stopwords_bg.txt |  193 -
 .../solr/collection1/conf/lang/stopwords_ca.txt |  220 -
 .../solr/collection1/conf/lang/stopwords_cz.txt |  172 -
 .../solr/collection1/conf/lang/stopwords_da.txt |  108 -
 .../solr/collection1/conf/lang/stopwords_de.txt |  292 --
 .../solr/collection1/conf/lang/stopwords_el.txt |   78 -
 .../solr/collection1/conf/lang/stopwords_en.txt |   54 -
 .../solr/collection1/conf/lang/stopwords_es.txt |  354 --
 .../solr/collection1/conf/lang/stopwords_eu.txt |   99 -
 .../solr/collection1/conf/lang/stopwords_fa.txt |  313 --
 .../solr/collection1/conf/lang/stopwords_fi.txt |   95 -
 .../solr/collection1/conf/lang/stopwords_fr.txt |  183 -
 .../solr/collection1/conf/lang/stopwords_ga.txt |  110 -
 .../solr/collection1/conf/lang/stopwords_gl.txt |  161 -
 .../solr/collection1/conf/lang/stopwords_hi.txt |  235 --
 .../solr/collection1/conf/lang/stopwords_hu.txt |  209 -
 .../solr/collection1/conf/lang/stopwords_hy.txt |   46 -
 .../solr/collection1/conf/lang/stopwords_id.txt |  359 --
 .../solr/collection1/conf/lang/stopwords_it.txt |  301 --
 .../solr/collection1/conf/lang/stopwords_ja.txt |  127 -
 .../solr/collection1/conf/lang/stopwords_lv.txt |  172 -
 .../solr/collection1/conf/lang/stopwords_nl.txt |  117 -
 .../solr/collection1/conf/lang/stopwords_no.txt |  192 -
 .../solr/collection1/conf/lang/stopwords_pt.txt |  251 --
 .../solr/collection1/conf/lang/stopwords_ro.txt |  233 --
 .../solr/collection1/conf/lang/stopwords_ru.txt |  241 --
 .../solr/collection1/conf/lang/stopwords_sv.txt |  131 -
 .../solr/collection1/conf/lang/stopwords_th.txt |  119 -
 .../solr/collection1/conf/lang/stopwords_tr.txt |  212 -
 .../solr/collection1/conf/lang/userdict_ja.txt  |   29 -
 .../solr/collection1/conf/protwords.txt         |   21 -
 .../test-files/solr/collection1/conf/schema.xml |  927 -----
 .../solr/collection1/conf/solrconfig.xml        | 1426 -------
 .../solr/collection1/conf/stopwords.txt         |   14 -
 .../solr/collection1/conf/synonyms.txt          |   29 -
 .../test-files/solr/minimr/conf/currency.xml    |   67 -
 .../src/test-files/solr/minimr/conf/elevate.xml |   42 -
 .../solr/minimr/conf/lang/contractions_ca.txt   |    8 -
 .../solr/minimr/conf/lang/contractions_fr.txt   |    9 -
 .../solr/minimr/conf/lang/contractions_ga.txt   |    5 -
 .../solr/minimr/conf/lang/contractions_it.txt   |   23 -
 .../solr/minimr/conf/lang/hyphenations_ga.txt   |    5 -
 .../solr/minimr/conf/lang/stemdict_nl.txt       |    6 -
 .../solr/minimr/conf/lang/stoptags_ja.txt       |  420 --
 .../solr/minimr/conf/lang/stopwords_ar.txt      |  125 -
 .../solr/minimr/conf/lang/stopwords_bg.txt      |  193 -
 .../solr/minimr/conf/lang/stopwords_ca.txt      |  220 -
 .../solr/minimr/conf/lang/stopwords_cz.txt      |  172 -
 .../solr/minimr/conf/lang/stopwords_da.txt      |  108 -
 .../solr/minimr/conf/lang/stopwords_de.txt      |  292 --
 .../solr/minimr/conf/lang/stopwords_el.txt      |   78 -
 .../solr/minimr/conf/lang/stopwords_en.txt      |   54 -
 .../solr/minimr/conf/lang/stopwords_es.txt      |  354 --
 .../solr/minimr/conf/lang/stopwords_eu.txt      |   99 -
 .../solr/minimr/conf/lang/stopwords_fa.txt      |  313 --
 .../solr/minimr/conf/lang/stopwords_fi.txt      |   95 -
 .../solr/minimr/conf/lang/stopwords_fr.txt      |  183 -
 .../solr/minimr/conf/lang/stopwords_ga.txt      |  110 -
 .../solr/minimr/conf/lang/stopwords_gl.txt      |  161 -
 .../solr/minimr/conf/lang/stopwords_hi.txt      |  235 --
 .../solr/minimr/conf/lang/stopwords_hu.txt      |  209 -
 .../solr/minimr/conf/lang/stopwords_hy.txt      |   46 -
 .../solr/minimr/conf/lang/stopwords_id.txt      |  359 --
 .../solr/minimr/conf/lang/stopwords_it.txt      |  301 --
 .../solr/minimr/conf/lang/stopwords_ja.txt      |  127 -
 .../solr/minimr/conf/lang/stopwords_lv.txt      |  172 -
 .../solr/minimr/conf/lang/stopwords_nl.txt      |  117 -
 .../solr/minimr/conf/lang/stopwords_no.txt      |  192 -
 .../solr/minimr/conf/lang/stopwords_pt.txt      |  251 --
 .../solr/minimr/conf/lang/stopwords_ro.txt      |  233 --
 .../solr/minimr/conf/lang/stopwords_ru.txt      |  241 --
 .../solr/minimr/conf/lang/stopwords_sv.txt      |  131 -
 .../solr/minimr/conf/lang/stopwords_th.txt      |  119 -
 .../solr/minimr/conf/lang/stopwords_tr.txt      |  212 -
 .../solr/minimr/conf/lang/userdict_ja.txt       |   29 -
 .../test-files/solr/minimr/conf/protwords.txt   |   21 -
 .../src/test-files/solr/minimr/conf/schema.xml  |  941 -----
 .../test-files/solr/minimr/conf/solrconfig.xml  | 1446 -------
 .../test-files/solr/minimr/conf/stopwords.txt   |   14 -
 .../test-files/solr/minimr/conf/synonyms.txt    |   29 -
 .../src/test-files/solr/minimr/solr.xml         |   46 -
 .../test-files/solr/mrunit/conf/currency.xml    |   67 -
 .../src/test-files/solr/mrunit/conf/elevate.xml |   42 -
 .../solr/mrunit/conf/lang/contractions_ca.txt   |    8 -
 .../solr/mrunit/conf/lang/contractions_fr.txt   |    9 -
 .../solr/mrunit/conf/lang/contractions_ga.txt   |    5 -
 .../solr/mrunit/conf/lang/contractions_it.txt   |   23 -
 .../solr/mrunit/conf/lang/hyphenations_ga.txt   |    5 -
 .../solr/mrunit/conf/lang/stemdict_nl.txt       |    6 -
 .../solr/mrunit/conf/lang/stoptags_ja.txt       |  420 --
 .../solr/mrunit/conf/lang/stopwords_ar.txt      |  125 -
 .../solr/mrunit/conf/lang/stopwords_bg.txt      |  193 -
 .../solr/mrunit/conf/lang/stopwords_ca.txt      |  220 -
 .../solr/mrunit/conf/lang/stopwords_cz.txt      |  172 -
 .../solr/mrunit/conf/lang/stopwords_da.txt      |  108 -
 .../solr/mrunit/conf/lang/stopwords_de.txt      |  292 --
 .../solr/mrunit/conf/lang/stopwords_el.txt      |   78 -
 .../solr/mrunit/conf/lang/stopwords_en.txt      |   54 -
 .../solr/mrunit/conf/lang/stopwords_es.txt      |  354 --
 .../solr/mrunit/conf/lang/stopwords_eu.txt      |   99 -
 .../solr/mrunit/conf/lang/stopwords_fa.txt      |  313 --
 .../solr/mrunit/conf/lang/stopwords_fi.txt      |   95 -
 .../solr/mrunit/conf/lang/stopwords_fr.txt      |  183 -
 .../solr/mrunit/conf/lang/stopwords_ga.txt      |  110 -
 .../solr/mrunit/conf/lang/stopwords_gl.txt      |  161 -
 .../solr/mrunit/conf/lang/stopwords_hi.txt      |  235 --
 .../solr/mrunit/conf/lang/stopwords_hu.txt      |  209 -
 .../solr/mrunit/conf/lang/stopwords_hy.txt      |   46 -
 .../solr/mrunit/conf/lang/stopwords_id.txt      |  359 --
 .../solr/mrunit/conf/lang/stopwords_it.txt      |  301 --
 .../solr/mrunit/conf/lang/stopwords_ja.txt      |  127 -
 .../solr/mrunit/conf/lang/stopwords_lv.txt      |  172 -
 .../solr/mrunit/conf/lang/stopwords_nl.txt      |  117 -
 .../solr/mrunit/conf/lang/stopwords_no.txt      |  192 -
 .../solr/mrunit/conf/lang/stopwords_pt.txt      |  251 --
 .../solr/mrunit/conf/lang/stopwords_ro.txt      |  233 --
 .../solr/mrunit/conf/lang/stopwords_ru.txt      |  241 --
 .../solr/mrunit/conf/lang/stopwords_sv.txt      |  131 -
 .../solr/mrunit/conf/lang/stopwords_th.txt      |  119 -
 .../solr/mrunit/conf/lang/stopwords_tr.txt      |  212 -
 .../solr/mrunit/conf/lang/userdict_ja.txt       |   29 -
 .../test-files/solr/mrunit/conf/protwords.txt   |   21 -
 .../src/test-files/solr/mrunit/conf/schema.xml  |  940 -----
 .../test-files/solr/mrunit/conf/solrconfig.xml  | 1449 -------
 .../test-files/solr/mrunit/conf/stopwords.txt   |   14 -
 .../test-files/solr/mrunit/conf/synonyms.txt    |   29 -
 .../src/test-files/solr/mrunit/solr.xml         |   45 -
 .../src/test-files/solr/solr.xml                |   34 -
 .../solrcelltest/collection1/conf/currency.xml  |   67 -
 .../solrcelltest/collection1/conf/elevate.xml   |   42 -
 .../collection1/conf/lang/contractions_ca.txt   |    8 -
 .../collection1/conf/lang/contractions_fr.txt   |    9 -
 .../collection1/conf/lang/contractions_ga.txt   |    5 -
 .../collection1/conf/lang/contractions_it.txt   |   23 -
 .../collection1/conf/lang/hyphenations_ga.txt   |    5 -
 .../collection1/conf/lang/stemdict_nl.txt       |    6 -
 .../collection1/conf/lang/stoptags_ja.txt       |  420 --
 .../collection1/conf/lang/stopwords_ar.txt      |  125 -
 .../collection1/conf/lang/stopwords_bg.txt      |  193 -
 .../collection1/conf/lang/stopwords_ca.txt      |  220 -
 .../collection1/conf/lang/stopwords_cz.txt      |  172 -
 .../collection1/conf/lang/stopwords_da.txt      |  108 -
 .../collection1/conf/lang/stopwords_de.txt      |  292 --
 .../collection1/conf/lang/stopwords_el.txt      |   78 -
 .../collection1/conf/lang/stopwords_en.txt      |   54 -
 .../collection1/conf/lang/stopwords_es.txt      |  354 --
 .../collection1/conf/lang/stopwords_eu.txt      |   99 -
 .../collection1/conf/lang/stopwords_fa.txt      |  313 --
 .../collection1/conf/lang/stopwords_fi.txt      |   95 -
 .../collection1/conf/lang/stopwords_fr.txt      |  183 -
 .../collection1/conf/lang/stopwords_ga.txt      |  110 -
 .../collection1/conf/lang/stopwords_gl.txt      |  161 -
 .../collection1/conf/lang/stopwords_hi.txt      |  235 --
 .../collection1/conf/lang/stopwords_hu.txt      |  209 -
 .../collection1/conf/lang/stopwords_hy.txt      |   46 -
 .../collection1/conf/lang/stopwords_id.txt      |  359 --
 .../collection1/conf/lang/stopwords_it.txt      |  301 --
 .../collection1/conf/lang/stopwords_ja.txt      |  127 -
 .../collection1/conf/lang/stopwords_lv.txt      |  172 -
 .../collection1/conf/lang/stopwords_nl.txt      |  117 -
 .../collection1/conf/lang/stopwords_no.txt      |  192 -
 .../collection1/conf/lang/stopwords_pt.txt      |  251 --
 .../collection1/conf/lang/stopwords_ro.txt      |  233 --
 .../collection1/conf/lang/stopwords_ru.txt      |  241 --
 .../collection1/conf/lang/stopwords_sv.txt      |  131 -
 .../collection1/conf/lang/stopwords_th.txt      |  119 -
 .../collection1/conf/lang/stopwords_tr.txt      |  212 -
 .../collection1/conf/lang/userdict_ja.txt       |   29 -
 .../solrcelltest/collection1/conf/protwords.txt |   21 -
 .../solrcelltest/collection1/conf/schema.xml    |  893 ----
 .../collection1/conf/solrconfig.xml             | 1426 -------
 .../solrcelltest/collection1/conf/stopwords.txt |   14 -
 .../solrcelltest/collection1/conf/synonyms.txt  |   29 -
 .../solr/solrcloud/conf/solrconfig.xml          | 1437 -------
 .../test-files/test-documents/NullHeader.docx   |  Bin 4355 -> 0 bytes
 .../test-files/test-documents/boilerplate.html  |   58 -
 .../src/test-files/test-documents/cars.csv      |    6 -
 .../src/test-files/test-documents/cars.csv.gz   |  Bin 167 -> 0 bytes
 .../src/test-files/test-documents/cars.tar.gz   |  Bin 298 -> 0 bytes
 .../src/test-files/test-documents/complex.mbox  |  291 --
 .../src/test-files/test-documents/email.eml     |   40 -
 .../src/test-files/test-documents/rsstest.rss   |   36 -
 .../sample-statuses-20120521-100919.avro        |  Bin 3192 -> 0 bytes
 .../sample-statuses-20120906-141433             |    4 -
 .../sample-statuses-20120906-141433-medium.avro |  Bin 249540 -> 0 bytes
 .../sample-statuses-20120906-141433.avro        |  Bin 1208 -> 0 bytes
 .../sample-statuses-20120906-141433.bz2         |  Bin 1054 -> 0 bytes
 .../sample-statuses-20120906-141433.gz          |  Bin 907 -> 0 bytes
 .../test-files/test-documents/test-outlook.msg  |  Bin 19968 -> 0 bytes
 .../src/test-files/test-documents/testAIFF.aif  |  Bin 3894 -> 0 bytes
 .../src/test-files/test-documents/testBMP.bmp   |  Bin 22554 -> 0 bytes
 .../src/test-files/test-documents/testBMPfp.txt |    3 -
 .../src/test-files/test-documents/testEMLX.emlx |   72 -
 .../src/test-files/test-documents/testEXCEL.xls |  Bin 13824 -> 0 bytes
 .../test-files/test-documents/testEXCEL.xlsx    |  Bin 9453 -> 0 bytes
 .../src/test-files/test-documents/testFLAC.flac |  Bin 10604 -> 0 bytes
 .../src/test-files/test-documents/testFLV.flv   |  Bin 90580 -> 0 bytes
 .../test-files/test-documents/testJPEG_EXIF.jpg |  Bin 16357 -> 0 bytes
 .../test-documents/testJPEG_EXIF.jpg.gz         |  Bin 8595 -> 0 bytes
 .../test-documents/testJPEG_EXIF.jpg.tar.gz     |  Bin 8722 -> 0 bytes
 .../test-files/test-documents/testMP3i18n.mp3   |  Bin 40832 -> 0 bytes
 .../src/test-files/test-documents/testMP4.m4a   |  Bin 4770 -> 0 bytes
 .../src/test-files/test-documents/testPDF.pdf   |  Bin 34824 -> 0 bytes
 .../src/test-files/test-documents/testPNG.png   |  Bin 17041 -> 0 bytes
 .../test-documents/testPPT_various.ppt          |  Bin 164352 -> 0 bytes
 .../test-documents/testPPT_various.pptx         |  Bin 56659 -> 0 bytes
 .../src/test-files/test-documents/testPSD.psd   |  Bin 69410 -> 0 bytes
 .../test-files/test-documents/testPages.pages   |  Bin 134152 -> 0 bytes
 .../src/test-files/test-documents/testRFC822    |   41 -
 .../test-documents/testRTFVarious.rtf           |  329 --
 .../src/test-files/test-documents/testSVG.svg   |   23 -
 .../src/test-files/test-documents/testTIFF.tif  |  Bin 25584 -> 0 bytes
 .../src/test-files/test-documents/testVISIO.vsd |  Bin 45568 -> 0 bytes
 .../src/test-files/test-documents/testWAV.wav   |  Bin 3884 -> 0 bytes
 .../test-documents/testWORD_various.doc         |  Bin 35328 -> 0 bytes
 .../src/test-files/test-documents/testXML.xml   |   48 -
 .../src/test-files/test-documents/testXML2.xml  |   22 -
 .../test-morphlines/loadSolrBasic.conf          |   68 -
 .../test-morphlines/solrCellDocumentTypes.conf  |  304 --
 .../test-morphlines/solrCellJPGCompressed.conf  |  150 -
 .../test-files/test-morphlines/solrCellXML.conf |   78 -
 .../test-morphlines/tokenizeText.conf           |   38 -
 .../tutorialReadAvroContainer.conf              |  145 -
 .../solr/AbstractSolrMorphlineTestBase.java     |  318 --
 .../solr/AbstractSolrMorphlineZkTestBase.java   |  141 -
 .../solr/CollectingDocumentLoader.java          |   95 -
 .../morphlines/solr/EmbeddedTestSolrServer.java |   46 -
 .../solr/morphlines/solr/SolrMorphlineTest.java |   69 -
 .../solr/SolrMorphlineZkAliasTest.java          |   96 -
 .../solr/SolrMorphlineZkAvroTest.java           |  140 -
 .../morphlines/solr/SolrMorphlineZkTest.java    |   92 -
 .../uima/solr/collection1/conf/schema.xml       |   47 +-
 .../uima/solr/collection1/conf/synonyms.txt     |    2 +-
 .../test-files/uima/uima-tokenizers-schema.xml  |   36 +-
 .../solr/response/VelocityResponseWriter.java   |    2 +-
 .../org/apache/solr/cloud/DistributedMap.java   |   10 +-
 .../java/org/apache/solr/cloud/Overseer.java    |    2 +-
 .../apache/solr/cloud/OverseerTaskQueue.java    |    8 +-
 .../org/apache/solr/cloud/RecoveryStrategy.java |    2 +-
 .../org/apache/solr/cloud/ZkController.java     |    6 +-
 .../apache/solr/cloud/ZkSolrResourceLoader.java |    2 +-
 .../solr/core/CachingDirectoryFactory.java      |    2 +-
 .../java/org/apache/solr/core/ConfigSet.java    |   10 +-
 .../org/apache/solr/core/ConfigSetService.java  |   29 +-
 .../org/apache/solr/core/CoreContainer.java     |    9 +-
 .../org/apache/solr/core/CoreDescriptor.java    |   17 +
 .../apache/solr/core/RunExecutableListener.java |   13 +-
 .../src/java/org/apache/solr/core/SolrCore.java |    1 +
 .../core/SolrCoreInitializationException.java   |   32 +
 .../apache/solr/handler/AnalyzeEvaluator.java   |  111 +
 .../org/apache/solr/handler/CdcrReplicator.java |    2 +-
 .../solr/handler/CdcrReplicatorState.java       |    6 +-
 .../apache/solr/handler/CdcrRequestHandler.java |    2 +-
 .../org/apache/solr/handler/ExportWriter.java   |   18 +-
 .../org/apache/solr/handler/IndexFetcher.java   |   85 +-
 .../apache/solr/handler/ReplicationHandler.java |   10 +-
 .../org/apache/solr/handler/SQLHandler.java     |    2 +-
 .../org/apache/solr/handler/StreamHandler.java  |   82 +-
 .../solr/handler/admin/ConfigSetsHandler.java   |   93 +-
 .../solr/handler/component/ExpandComponent.java |   81 +-
 .../component/HttpShardHandlerFactory.java      |    2 +-
 .../PivotFacetFieldValueCollection.java         |    4 +-
 .../handler/component/RealTimeGetComponent.java |   22 +-
 .../solr/handler/component/TermsComponent.java  |   68 +-
 .../apache/solr/handler/loader/XMLLoader.java   |    7 +
 .../apache/solr/handler/sql/SolrAggregate.java  |    6 +-
 .../apache/solr/handler/sql/SolrEnumerator.java |    1 +
 .../apache/solr/handler/sql/SolrProject.java    |    2 +-
 .../org/apache/solr/handler/sql/SolrRel.java    |   10 +-
 .../org/apache/solr/handler/sql/SolrSchema.java |    4 +
 .../org/apache/solr/handler/sql/SolrTable.java  |   43 +-
 .../handler/sql/SolrToEnumerableConverter.java  |    1 +
 .../solr/highlight/DefaultSolrHighlighter.java  |    5 +-
 .../apache/solr/highlight/SolrHighlighter.java  |    2 +-
 .../solr/internal/csv/writer/CSVConfig.java     |    2 +-
 .../internal/csv/writer/CSVConfigGuesser.java   |    8 +-
 .../org/apache/solr/parser/QueryParser.java     |   11 +-
 .../java/org/apache/solr/parser/QueryParser.jj  |   11 +-
 .../org/apache/solr/request/SimpleFacets.java   |   16 +-
 .../org/apache/solr/response/DocsStreamer.java  |   76 +-
 .../solr/response/TextResponseWriter.java       |    2 +-
 .../transform/ChildDocTransformerFactory.java   |    2 +-
 .../org/apache/solr/schema/CurrencyField.java   |    2 +-
 .../apache/solr/schema/ManagedIndexSchema.java  |    4 +-
 .../org/apache/solr/schema/RandomSortField.java |    2 +-
 .../solr/search/ComplexPhraseQParserPlugin.java |    4 +-
 .../apache/solr/search/ExportQParserPlugin.java |    2 +-
 .../solr/search/ExtendedDismaxQParser.java      |   12 +-
 .../apache/solr/search/HashQParserPlugin.java   |   18 +-
 .../QueryParserConfigurationException.java      |   24 -
 .../org/apache/solr/search/ReRankCollector.java |    2 +-
 .../apache/solr/search/ReRankQParserPlugin.java |    2 +-
 .../apache/solr/search/SolrDocumentFetcher.java |  571 +++
 .../apache/solr/search/SolrIndexSearcher.java   |  572 +--
 .../solr/search/facet/FacetFieldMerger.java     |   27 +-
 .../solr/search/facet/FacetFieldProcessor.java  |   29 +-
 .../search/facet/FacetRequestSortedMerger.java  |   24 +-
 .../org/apache/solr/search/facet/UniqueAgg.java |    2 +-
 .../search/function/CollapseScoreFunction.java  |    2 +-
 .../TopGroupsResultTransformer.java             |    6 +-
 .../org/apache/solr/search/join/GraphQuery.java |    2 +-
 .../solr/security/PermissionNameProvider.java   |    2 +-
 .../solr/spelling/PossibilityIterator.java      |    6 +-
 .../solr/spelling/SpellCheckCollation.java      |    2 +-
 .../org/apache/solr/update/CommitTracker.java   |    6 +-
 .../org/apache/solr/update/UpdateHandler.java   |   16 +
 .../java/org/apache/solr/update/UpdateLog.java  |    2 +-
 .../StatelessScriptUpdateProcessorFactory.java  |    6 +
 .../src/java/org/apache/solr/util/RTimer.java   |    2 +-
 .../org/apache/solr/util/SimplePostTool.java    |    6 +-
 .../org/apache/solr/util/SolrPluginUtils.java   |    7 +-
 .../org/apache/solr/util/TestInjection.java     |   26 +-
 .../conf/schema-HighlighterMaxOffsetTest.xml    |    9 +-
 .../collection1/conf/schema-copyfield-test.xml  |   50 +-
 .../collection1/conf/schema-docValuesJoin.xml   |    7 +-
 .../solr/collection1/conf/schema-folding.xml    |    2 +-
 .../solr/collection1/conf/schema-hash.xml       |   59 +-
 .../collection1/conf/schema-psuedo-fields.xml   |    7 +-
 .../collection1/conf/schema-required-fields.xml |   39 +-
 .../solr/collection1/conf/schema-rest.xml       |   97 +-
 .../conf/schema-single-dynamic-copy-field.xml   |   97 +-
 .../collection1/conf/schema-spellchecker.xml    |    2 +-
 .../solr/collection1/conf/schema-sql.xml        |   59 +-
 .../conf/schema-synonym-tokenizer.xml           |    5 +-
 .../solr/collection1/conf/schema-trie.xml       |   29 +-
 .../test-files/solr/collection1/conf/schema.xml |   81 +-
 .../solr/collection1/conf/schema11.xml          |   37 +-
 .../solr/collection1/conf/schema12.xml          |   92 +-
 .../solr/collection1/conf/schema15.xml          |   92 +-
 .../solr/collection1/conf/schema_latest.xml     |   45 +-
 .../solr/collection1/conf/schemasurround.xml    |   99 +-
 .../solr/collection1/conf/synonyms.txt          |    3 +-
 .../solr/collection1/conf/wdftypes.txt          |    2 +-
 .../configsets/cloud-dynamic/conf/schema.xml    |   35 +-
 .../solr/configsets/doc-expiry/conf/schema.xml  |   35 +-
 .../dih-script-transformer/managed-schema       |   25 +
 .../dih-script-transformer/solrconfig.xml       |   61 +
 .../configsets/upload/regular/managed-schema    |   25 +
 .../configsets/upload/regular/solrconfig.xml    |   61 +
 .../regular/xslt/xsl-update-handler-test.xsl    |   49 +
 .../with-run-executable-listener/managed-schema |   25 +
 .../with-run-executable-listener/solrconfig.xml |   69 +
 .../upload/with-script-processor/managed-schema |   25 +
 ...missleading.extension.updateprocessor.js.txt |   23 +
 .../upload/with-script-processor/solrconfig.xml |   65 +
 .../test/SecureRandomAlgorithmTesterApp.java    |   41 +
 .../org/apache/solr/ConvertedLegacyTest.java    |    2 +-
 .../solr/cloud/BaseCdcrDistributedZkTest.java   |    4 +-
 .../cloud/ChaosMonkeyNothingIsSafeTest.java     |    4 +-
 .../solr/cloud/ConnectionManagerTest.java       |    2 +-
 .../apache/solr/cloud/DistributedQueueTest.java |    2 +-
 .../apache/solr/cloud/LeaderElectionTest.java   |    4 +-
 ...rriddenZkACLAndCredentialsProvidersTest.java |    4 +-
 ...verseerCollectionConfigSetProcessorTest.java |    2 +-
 .../org/apache/solr/cloud/OverseerTest.java     |  134 +-
 .../cloud/SegmentTerminateEarlyTestState.java   |   78 +-
 .../apache/solr/cloud/SolrCLIZkUtilsTest.java   |  100 +-
 .../org/apache/solr/cloud/SolrXmlInZkTest.java  |    2 +-
 .../apache/solr/cloud/TestConfigSetsAPI.java    |  401 +-
 .../apache/solr/cloud/TestRandomFlRTGCloud.java |    4 +-
 .../apache/solr/cloud/TestSegmentSorting.java   |    2 +-
 .../test/org/apache/solr/cloud/ZkCLITest.java   |    4 +-
 .../org/apache/solr/cloud/ZkSolrClientTest.java |    2 +-
 .../solr/core/CachingDirectoryFactoryTest.java  |    2 +-
 .../solr/core/OpenCloseCoreStressTest.java      |    6 +-
 .../org/apache/solr/core/TestCodecSupport.java  |    2 +-
 .../apache/solr/core/TestDynamicLoading.java    |   11 +-
 .../handler/AnalysisRequestHandlerTestBase.java |    2 +-
 .../FieldAnalysisRequestHandlerTest.java        |   14 +-
 .../solr/handler/PingRequestHandlerTest.java    |    2 +-
 .../org/apache/solr/handler/TestSQLHandler.java |  250 +-
 .../handler/XmlUpdateRequestHandlerTest.java    |    2 +-
 .../admin/CoreMergeIndexesAdminHandlerTest.java |    2 +-
 .../DistributedFacetPivotSmallTest.java         |    5 +-
 .../DistributedTermsComponentTest.java          |    3 +-
 .../handler/component/TermsComponentTest.java   |   38 +
 .../handler/component/TestExpandComponent.java  |    2 -
 .../apache/solr/internal/csv/CSVParserTest.java |    2 +-
 .../reporters/SolrGraphiteReporterTest.java     |    2 +-
 .../response/TestGraphMLResponseWriter.java     |    2 +-
 .../solr/response/TestSolrQueryResponse.java    |    2 +-
 .../apache/solr/rest/TestManagedResource.java   |    4 +-
 .../org/apache/solr/rest/TestRestManager.java   |    2 +-
 .../solr/rest/schema/TestBulkSchemaAPI.java     |   29 +-
 .../apache/solr/schema/NumericFieldsTest.java   |  108 +-
 .../solr/schema/SpatialRPTFieldTypeTest.java    |   12 +-
 .../TestCloudManagedSchemaConcurrent.java       |    2 +-
 .../TrieIntPrefixActsAsRangeQueryFieldType.java |    2 +-
 .../solr/search/AnalyticsTestQParserPlugin.java |   10 +-
 .../org/apache/solr/search/LargeFieldTest.java  |    8 +-
 .../solr/search/TestExtendedDismaxParser.java   |  151 +-
 .../org/apache/solr/search/TestFiltering.java   |    2 +-
 .../org/apache/solr/search/TestRTGBase.java     |    2 +-
 .../apache/solr/search/TestRankQueryPlugin.java |   14 +-
 .../org/apache/solr/search/TestRealTimeGet.java |    4 +-
 .../apache/solr/search/TestReloadDeadlock.java  |    2 +-
 .../apache/solr/search/TestSolrQueryParser.java |   48 +-
 .../apache/solr/search/TestStressLucene.java    |    8 +-
 .../apache/solr/search/TestStressRecovery.java  |    4 +-
 .../apache/solr/search/TestStressReorder.java   |    4 +-
 .../solr/search/TestStressUserVersions.java     |    6 +-
 .../apache/solr/search/TestStressVersions.java  |    4 +-
 .../search/facet/TestJsonFacetRefinement.java   |  103 +-
 .../ConjunctionSolrSpellCheckerTest.java        |    4 +-
 .../spelling/IndexBasedSpellCheckerTest.java    |    2 +-
 .../store/blockcache/BlockDirectoryTest.java    |    2 +-
 .../solr/update/TestInPlaceUpdatesDistrib.java  |   22 +-
 .../apache/solr/util/SimplePostToolTest.java    |    2 +-
 .../apache/solr/util/SolrPluginUtilsTest.java   |   89 +-
 .../apache/solr/util/TestSolrCLIRunExample.java |    2 +-
 .../apache/solr/util/stats/MetricUtilsTest.java |    6 +
 solr/example/README.txt                         |    2 +-
 solr/example/example-DIH/README.txt             |   11 +-
 .../solr/atom/conf/atom-data-config.xml         |   35 +
 .../solr/atom/conf/lang/stopwords_en.txt        |   54 +
 .../example-DIH/solr/atom/conf/managed-schema   |  106 +
 .../example-DIH/solr/atom/conf/protwords.txt    |   17 +
 .../example-DIH/solr/atom/conf/solrconfig.xml   |   61 +
 .../example-DIH/solr/atom/conf/synonyms.txt     |   29 +
 .../example-DIH/solr/atom/conf/url_types.txt    |    1 +
 .../example-DIH/solr/atom/core.properties       |    0
 .../example-DIH/solr/db/conf/managed-schema     |   44 +-
 .../example-DIH/solr/db/conf/synonyms.txt       |    2 +-
 .../example-DIH/solr/mail/conf/managed-schema   |   45 +-
 .../example-DIH/solr/mail/conf/synonyms.txt     |    2 +-
 .../example-DIH/solr/rss/conf/admin-extra.html  |   24 -
 .../solr/rss/conf/admin-extra.menu-bottom.html  |   25 -
 .../solr/rss/conf/admin-extra.menu-top.html     |   25 -
 .../clustering/carrot2/kmeans-attributes.xml    |   19 -
 .../clustering/carrot2/lingo-attributes.xml     |   24 -
 .../conf/clustering/carrot2/stc-attributes.xml  |   19 -
 .../example-DIH/solr/rss/conf/currency.xml      |   67 -
 .../example-DIH/solr/rss/conf/elevate.xml       |   42 -
 .../solr/rss/conf/lang/contractions_ca.txt      |    8 -
 .../solr/rss/conf/lang/contractions_fr.txt      |   15 -
 .../solr/rss/conf/lang/contractions_ga.txt      |    5 -
 .../solr/rss/conf/lang/contractions_it.txt      |   23 -
 .../solr/rss/conf/lang/hyphenations_ga.txt      |    5 -
 .../solr/rss/conf/lang/stemdict_nl.txt          |    6 -
 .../solr/rss/conf/lang/stoptags_ja.txt          |  420 --
 .../solr/rss/conf/lang/stopwords_ar.txt         |  125 -
 .../solr/rss/conf/lang/stopwords_bg.txt         |  193 -
 .../solr/rss/conf/lang/stopwords_ca.txt         |  220 -
 .../solr/rss/conf/lang/stopwords_ckb.txt        |  136 -
 .../solr/rss/conf/lang/stopwords_cz.txt         |  172 -
 .../solr/rss/conf/lang/stopwords_da.txt         |  110 -
 .../solr/rss/conf/lang/stopwords_de.txt         |  294 --
 .../solr/rss/conf/lang/stopwords_el.txt         |   78 -
 .../solr/rss/conf/lang/stopwords_en.txt         |   54 -
 .../solr/rss/conf/lang/stopwords_es.txt         |  356 --
 .../solr/rss/conf/lang/stopwords_eu.txt         |   99 -
 .../solr/rss/conf/lang/stopwords_fa.txt         |  313 --
 .../solr/rss/conf/lang/stopwords_fi.txt         |   97 -
 .../solr/rss/conf/lang/stopwords_fr.txt         |  186 -
 .../solr/rss/conf/lang/stopwords_ga.txt         |  110 -
 .../solr/rss/conf/lang/stopwords_gl.txt         |  161 -
 .../solr/rss/conf/lang/stopwords_hi.txt         |  235 --
 .../solr/rss/conf/lang/stopwords_hu.txt         |  211 -
 .../solr/rss/conf/lang/stopwords_hy.txt         |   46 -
 .../solr/rss/conf/lang/stopwords_id.txt         |  359 --
 .../solr/rss/conf/lang/stopwords_it.txt         |  303 --
 .../solr/rss/conf/lang/stopwords_ja.txt         |  127 -
 .../solr/rss/conf/lang/stopwords_lv.txt         |  172 -
 .../solr/rss/conf/lang/stopwords_nl.txt         |  119 -
 .../solr/rss/conf/lang/stopwords_no.txt         |  194 -
 .../solr/rss/conf/lang/stopwords_pt.txt         |  253 --
 .../solr/rss/conf/lang/stopwords_ro.txt         |  233 --
 .../solr/rss/conf/lang/stopwords_ru.txt         |  243 --
 .../solr/rss/conf/lang/stopwords_sv.txt         |  133 -
 .../solr/rss/conf/lang/stopwords_th.txt         |  119 -
 .../solr/rss/conf/lang/stopwords_tr.txt         |  212 -
 .../solr/rss/conf/lang/userdict_ja.txt          |   29 -
 .../example-DIH/solr/rss/conf/managed-schema    | 1079 -----
 .../solr/rss/conf/mapping-FoldToASCII.txt       | 3813 ------------------
 .../solr/rss/conf/mapping-ISOLatin1Accent.txt   |  246 --
 .../example-DIH/solr/rss/conf/protwords.txt     |   21 -
 .../solr/rss/conf/rss-data-config.xml           |   26 -
 .../example-DIH/solr/rss/conf/solrconfig.xml    | 1396 -------
 .../example-DIH/solr/rss/conf/spellings.txt     |    2 -
 .../example-DIH/solr/rss/conf/stopwords.txt     |   14 -
 .../example-DIH/solr/rss/conf/synonyms.txt      |   29 -
 .../example-DIH/solr/rss/conf/update-script.js  |   53 -
 .../example-DIH/solr/rss/conf/xslt/example.xsl  |  132 -
 .../solr/rss/conf/xslt/example_atom.xsl         |   67 -
 .../solr/rss/conf/xslt/example_rss.xsl          |   66 -
 .../example-DIH/solr/rss/conf/xslt/luke.xsl     |  337 --
 .../solr/rss/conf/xslt/updateXml.xsl            |   70 -
 .../example-DIH/solr/rss/core.properties        |    0
 .../example-DIH/solr/solr/conf/managed-schema   |   44 +-
 .../example-DIH/solr/solr/conf/synonyms.txt     |    2 +-
 .../example-DIH/solr/tika/conf/admin-extra.html |   24 -
 .../solr/tika/conf/admin-extra.menu-bottom.html |   25 -
 .../solr/tika/conf/admin-extra.menu-top.html    |   25 -
 .../example-DIH/solr/tika/conf/managed-schema   |  899 +----
 .../example-DIH/solr/tika/conf/solrconfig.xml   | 1354 +------
 .../solr/tika/conf/tika-data-config.xml         |   33 +-
 solr/example/files/conf/managed-schema          |   30 +-
 solr/example/files/conf/synonyms.txt            |    2 +-
 solr/licenses/Saxon-HE-9.6.0-2.jar.sha1         |    1 -
 solr/licenses/Saxon-HE-LICENSE-MPL.txt          |  108 -
 solr/licenses/aopalliance-1.0.jar.sha1          |    1 -
 solr/licenses/aopalliance-LICENSE-PD.txt        |    1 -
 solr/licenses/argparse4j-0.4.3.jar.sha1         |    1 -
 solr/licenses/argparse4j-LICENSE-MIT.txt        |   23 -
 solr/licenses/avro-1.7.5.jar.sha1               |    1 -
 solr/licenses/avro-LICENSE-ASL.txt              |  308 --
 solr/licenses/avro-NOTICE.txt                   |    9 -
 solr/licenses/bcpkix-jdk15on-1.47.jar.sha1      |    1 -
 .../bcpkix-jdk15on-LICENSE-BSD_LIKE.txt         |   15 -
 solr/licenses/bcpkix-jdk15on-NOTICE.txt         |    2 -
 solr/licenses/config-1.0.2.jar.sha1             |    1 -
 solr/licenses/config-LICENSE-ASL.txt            |  202 -
 solr/licenses/config-NOTICE.txt                 |    0
 solr/licenses/guice-3.0.jar.sha1                |    1 -
 solr/licenses/guice-LICENSE-ASL.txt             |  202 -
 solr/licenses/guice-NOTICE.txt                  |    0
 solr/licenses/guice-servlet-3.0.jar.sha1        |    1 -
 solr/licenses/guice-servlet-LICENSE-ASL.txt     |  202 -
 solr/licenses/guice-servlet-NOTICE.txt          |    0
 .../hadoop-mapreduce-client-app-2.7.2.jar.sha1  |    1 -
 .../hadoop-mapreduce-client-app-LICENSE-ASL.txt |  244 --
 .../hadoop-mapreduce-client-app-NOTICE.txt      |    2 -
 ...adoop-mapreduce-client-common-2.7.2.jar.sha1 |    1 -
 ...doop-mapreduce-client-common-LICENSE-ASL.txt |  244 --
 .../hadoop-mapreduce-client-common-NOTICE.txt   |    2 -
 .../hadoop-mapreduce-client-core-2.7.2.jar.sha1 |    1 -
 ...hadoop-mapreduce-client-core-LICENSE-ASL.txt |  244 --
 .../hadoop-mapreduce-client-core-NOTICE.txt     |    2 -
 .../hadoop-mapreduce-client-hs-2.7.2.jar.sha1   |    1 -
 .../hadoop-mapreduce-client-hs-LICENSE-ASL.txt  |  244 --
 .../hadoop-mapreduce-client-hs-NOTICE.txt       |    2 -
 ...reduce-client-jobclient-2.7.2-tests.jar.sha1 |    1 -
 ...op-mapreduce-client-jobclient-2.7.2.jar.sha1 |    1 -
 ...p-mapreduce-client-jobclient-LICENSE-ASL.txt |  244 --
 ...hadoop-mapreduce-client-jobclient-NOTICE.txt |    2 -
 ...doop-mapreduce-client-shuffle-2.7.2.jar.sha1 |    1 -
 ...oop-mapreduce-client-shuffle-LICENSE-ASL.txt |  244 --
 .../hadoop-mapreduce-client-shuffle-NOTICE.txt  |    2 -
 solr/licenses/hadoop-yarn-api-2.7.2.jar.sha1    |    1 -
 solr/licenses/hadoop-yarn-api-LICENSE-ASL.txt   |  244 --
 solr/licenses/hadoop-yarn-api-NOTICE.txt        |    2 -
 solr/licenses/hadoop-yarn-client-2.7.2.jar.sha1 |    1 -
 .../licenses/hadoop-yarn-client-LICENSE-ASL.txt |  244 --
 solr/licenses/hadoop-yarn-client-NOTICE.txt     |    2 -
 solr/licenses/hadoop-yarn-common-2.7.2.jar.sha1 |    1 -
 .../licenses/hadoop-yarn-common-LICENSE-ASL.txt |  244 --
 solr/licenses/hadoop-yarn-common-NOTICE.txt     |    2 -
 ...ver-applicationhistoryservice-2.7.2.jar.sha1 |    1 -
 ...er-applicationhistoryservice-LICENSE-ASL.txt |  244 --
 ...-server-applicationhistoryservice-NOTICE.txt |    2 -
 .../hadoop-yarn-server-common-2.7.2.jar.sha1    |    1 -
 .../hadoop-yarn-server-common-LICENSE-ASL.txt   |  244 --
 .../hadoop-yarn-server-common-NOTICE.txt        |    2 -
 ...adoop-yarn-server-nodemanager-2.7.2.jar.sha1 |    1 -
 ...doop-yarn-server-nodemanager-LICENSE-ASL.txt |  244 --
 .../hadoop-yarn-server-nodemanager-NOTICE.txt   |    2 -
 ...p-yarn-server-resourcemanager-2.7.2.jar.sha1 |    1 -
 ...-yarn-server-resourcemanager-LICENSE-ASL.txt |  244 --
 ...adoop-yarn-server-resourcemanager-NOTICE.txt |    2 -
 ...adoop-yarn-server-tests-2.7.2-tests.jar.sha1 |    1 -
 .../hadoop-yarn-server-tests-LICENSE-ASL.txt    |  244 --
 .../hadoop-yarn-server-tests-NOTICE.txt         |    2 -
 .../hadoop-yarn-server-web-proxy-2.7.2.jar.sha1 |    1 -
 ...hadoop-yarn-server-web-proxy-LICENSE-ASL.txt |  244 --
 .../hadoop-yarn-server-web-proxy-NOTICE.txt     |    2 -
 solr/licenses/jackson-jaxrs-1.9.13.jar.sha1     |    1 -
 solr/licenses/jackson-jaxrs-LICENSE-ASL.txt     |   13 -
 solr/licenses/jackson-jaxrs-NOTICE.txt          |    7 -
 solr/licenses/javax.inject-1.jar.sha1           |    1 -
 solr/licenses/javax.inject-LICENSE-ASL.txt      |  202 -
 solr/licenses/javax.inject-NOTICE.txt           |    0
 solr/licenses/jaxb-impl-2.2.3-1.jar.sha1        |    1 -
 solr/licenses/jaxb-impl-LICENSE-CDDL.txt        |  135 -
 solr/licenses/jersey-bundle-1.9.jar.sha1        |    1 -
 solr/licenses/jersey-bundle-LICENSE-CDDL.txt    |   85 -
 solr/licenses/jersey-guice-1.9.jar.sha1         |    1 -
 solr/licenses/jersey-guice-LICENSE-CDDL.txt     |   85 -
 solr/licenses/jersey-json-1.9.jar.sha1          |    1 -
 solr/licenses/jersey-json-LICENSE-CDDL.txt      |   85 -
 .../kite-morphlines-avro-1.1.0.jar.sha1         |    1 -
 .../kite-morphlines-avro-LICENSE-ASL.txt        |  202 -
 solr/licenses/kite-morphlines-avro-NOTICE.txt   |    8 -
 .../kite-morphlines-core-1.1.0-tests.jar.sha1   |    1 -
 .../kite-morphlines-core-1.1.0.jar.sha1         |    1 -
 .../kite-morphlines-core-LICENSE-ASL.txt        |  202 -
 solr/licenses/kite-morphlines-core-NOTICE.txt   |    8 -
 ...orphlines-hadoop-sequencefile-1.1.0.jar.sha1 |    1 -
 ...rphlines-hadoop-sequencefile-LICENSE-ASL.txt |  202 -
 ...te-morphlines-hadoop-sequencefile-NOTICE.txt |    8 -
 .../kite-morphlines-json-1.1.0.jar.sha1         |    1 -
 .../kite-morphlines-json-LICENSE-ASL.txt        |  202 -
 solr/licenses/kite-morphlines-json-NOTICE.txt   |    8 -
 .../kite-morphlines-saxon-1.1.0.jar.sha1        |    1 -
 .../kite-morphlines-saxon-LICENSE-ASL.txt       |  202 -
 solr/licenses/kite-morphlines-saxon-NOTICE.txt  |    8 -
 .../kite-morphlines-tika-core-1.1.0.jar.sha1    |    1 -
 .../kite-morphlines-tika-core-LICENSE-ASL.txt   |  202 -
 .../kite-morphlines-tika-core-NOTICE.txt        |    8 -
 ...te-morphlines-tika-decompress-1.1.0.jar.sha1 |    1 -
 ...e-morphlines-tika-decompress-LICENSE-ASL.txt |  202 -
 .../kite-morphlines-tika-decompress-NOTICE.txt  |    8 -
 .../kite-morphlines-twitter-1.1.0.jar.sha1      |    1 -
 .../kite-morphlines-twitter-LICENSE-ASL.txt     |  202 -
 .../licenses/kite-morphlines-twitter-NOTICE.txt |    8 -
 solr/licenses/leveldb-0.7.jar.sha1              |    1 -
 solr/licenses/leveldb-LICENSE-BSD.txt           |   27 -
 solr/licenses/leveldb-NOTICE.txt                |    0
 solr/licenses/leveldb-api-0.7.jar.sha1          |    1 -
 solr/licenses/leveldb-api-LICENSE-BSD.txt       |   27 -
 solr/licenses/leveldb-api-NOTICE.txt            |    0
 solr/licenses/leveldbjni-1.8.jar.sha1           |    1 -
 solr/licenses/leveldbjni-LICENSE-BSD.txt        |   27 -
 solr/licenses/leveldbjni-NOTICE.txt             |    0
 .../metrics-healthchecks-3.1.2.jar.sha1         |    1 -
 .../metrics-healthchecks-LICENSE-ASL.txt        |  202 -
 solr/licenses/metrics-healthchecks-NOTICE.txt   |   11 -
 solr/licenses/mrunit-1.0.0-hadoop2.jar.sha1     |    1 -
 solr/licenses/mrunit-LICENSE-ASL.txt            |  479 ---
 solr/licenses/mrunit-NOTICE.txt                 |    5 -
 solr/licenses/netty-3.2.4.Final.jar.sha1        |    1 -
 solr/licenses/netty-LICENSE-ASL.txt             |  202 -
 solr/licenses/netty-NOTICE.txt                  |   98 -
 solr/licenses/paranamer-2.3.jar.sha1            |    1 -
 solr/licenses/paranamer-LICENSE-BSD.txt         |   28 -
 solr/licenses/paranamer-NOTICE.txt              |    0
 solr/licenses/rome-1.6.1.jar.sha1               |    1 -
 solr/licenses/snappy-java-1.0.5.jar.sha1        |    1 -
 solr/licenses/snappy-java-LICENSE-ASL.txt       |  201 -
 solr/licenses/snappy-java-NOTICE.txt            |    0
 .../map-reduce/set-map-reduce-classpath.sh      |   52 -
 .../basic_configs/conf/managed-schema           |   44 +-
 .../configsets/basic_configs/conf/synonyms.txt  |    2 +-
 .../conf/managed-schema                         |   44 +-
 .../conf/synonyms.txt                           |    2 +-
 .../conf/managed-schema                         |   44 +-
 .../conf/synonyms.txt                           |    2 +-
 .../solr/client/solrj/impl/CloudSolrClient.java |   15 +-
 .../solrj/impl/ConcurrentUpdateSolrClient.java  |    2 +-
 .../apache/solr/client/solrj/io/ModelCache.java |    4 +-
 .../solrj/io/eval/ArcCosineEvaluator.java       |   60 +
 .../client/solrj/io/eval/ArcSineEvaluator.java  |   60 +
 .../solrj/io/eval/ArcTangentEvaluator.java      |   60 +
 .../client/solrj/io/eval/BooleanEvaluator.java  |    2 +-
 .../client/solrj/io/eval/CeilingEvaluator.java  |   61 +
 .../client/solrj/io/eval/CoalesceEvaluator.java |   52 +
 .../client/solrj/io/eval/ComplexEvaluator.java  |    6 +
 .../solrj/io/eval/ConditionalEvaluator.java     |    2 +-
 .../client/solrj/io/eval/CosineEvaluator.java   |   60 +
 .../solrj/io/eval/CubedRootEvaluator.java       |   60 +
 .../client/solrj/io/eval/FloorEvaluator.java    |   61 +
 .../io/eval/HyperbolicCosineEvaluator.java      |   60 +
 .../solrj/io/eval/HyperbolicSineEvaluator.java  |   60 +
 .../io/eval/HyperbolicTangentEvaluator.java     |   60 +
 .../client/solrj/io/eval/ModuloEvaluator.java   |   78 +
 .../client/solrj/io/eval/PowerEvaluator.java    |   61 +
 .../client/solrj/io/eval/RoundEvaluator.java    |   60 +
 .../client/solrj/io/eval/SimpleEvaluator.java   |    7 +
 .../client/solrj/io/eval/SineEvaluator.java     |   60 +
 .../solrj/io/eval/SquareRootEvaluator.java      |   60 +
 .../client/solrj/io/eval/StreamEvaluator.java   |    2 +
 .../client/solrj/io/eval/TangentEvaluator.java  |   60 +
 .../client/solrj/io/eval/UuidEvaluator.java     |   57 +
 .../solrj/io/graph/GatherNodesStream.java       |    2 +-
 .../solrj/io/graph/ShortestPathStream.java      |    2 +-
 .../client/solrj/io/ops/GroupOperation.java     |    2 +-
 .../solrj/io/stream/CartesianProductStream.java |    6 +-
 .../client/solrj/io/stream/FacetStream.java     |    8 +-
 .../solr/client/solrj/io/stream/RankStream.java |    2 +-
 .../client/solrj/io/stream/SelectStream.java    |    6 +
 .../solrj/io/stream/SignificantTermsStream.java |    2 +-
 .../client/solrj/io/stream/StatsStream.java     |   14 +-
 .../client/solrj/io/stream/TextLogitStream.java |    2 +-
 .../solrj/io/stream/metrics/MeanMetric.java     |   35 +-
 .../client/solrj/io/stream/metrics/Metric.java  |    1 +
 .../client/solrj/response/QueryResponse.java    |    6 +-
 .../solrj/response/SpellCheckResponse.java      |    4 +-
 .../client/solrj/response/TermsResponse.java    |   37 +-
 .../org/apache/solr/common/cloud/DocRouter.java |    4 +-
 .../solr/common/cloud/ZkMaintenanceUtils.java   |  147 +-
 .../apache/solr/common/cloud/ZkStateReader.java |    4 +-
 .../apache/solr/common/params/CommonParams.java |    4 +-
 .../solr/common/params/ConfigSetParams.java     |    1 +
 .../apache/solr/common/params/TermsParams.java  |   12 +-
 .../solr/common/util/JsonRecordReader.java      |    2 +-
 .../org/apache/solr/common/util/StrUtils.java   |    2 +-
 .../solrj/solr/collection1/conf/schema-sql.xml  |   59 +-
 .../solrj/solr/collection1/conf/schema.xml      |   59 +-
 .../solr/configsets/streaming/conf/schema.xml   |   56 +-
 .../solr/client/solrj/TestLBHttpSolrClient.java |    2 +-
 .../embedded/SolrExampleStreamingTest.java      |    4 +-
 .../impl/ConcurrentUpdateSolrClientTest.java    |    6 +-
 .../solrj/io/stream/StreamExpressionTest.java   |  132 +-
 .../stream/StreamExpressionToExpessionTest.java |    8 +-
 .../io/stream/eval/ArcCosineEvaluatorTest.java  |   91 +
 .../io/stream/eval/ArcSineEvaluatorTest.java    |   91 +
 .../io/stream/eval/ArcTangentEvaluatorTest.java |   91 +
 .../io/stream/eval/CeilingEvaluatorTest.java    |   96 +
 .../io/stream/eval/CoalesceEvaluatorTest.java   |  112 +
 .../io/stream/eval/CosineEvaluatorTest.java     |   91 +
 .../io/stream/eval/CubedRootEvaluatorTest.java  |   91 +
 .../io/stream/eval/FloorEvaluatorTest.java      |   96 +
 .../eval/HyperbolicCosineEvaluatorTest.java     |   91 +
 .../eval/HyperbolicSineEvaluatorTest.java       |   91 +
 .../eval/HyperbolicTangentEvaluatorTest.java    |   91 +
 .../io/stream/eval/ModuloEvaluatorTest.java     |  164 +
 .../io/stream/eval/PowerEvaluatorTest.java      |  119 +
 .../io/stream/eval/RoundEvaluatorTest.java      |   95 +
 .../solrj/io/stream/eval/SineEvaluatorTest.java |   91 +
 .../io/stream/eval/SquareRootEvaluatorTest.java |   91 +
 .../io/stream/eval/TangentEvaluatorTest.java    |   91 +
 .../solrj/io/stream/eval/UuidEvaluatorTest.java |   52 +
 .../solr/client/solrj/request/SchemaTest.java   |    2 +-
 .../solr/common/util/TestJavaBinCodec.java      |    4 +-
 .../java/org/apache/solr/SolrTestCaseJ4.java    |   11 +-
 .../apache/solr/cloud/MiniSolrCloudCluster.java |    6 +-
 solr/webapp/web/css/angular/cloud.css           |   24 +
 solr/webapp/web/js/angular/controllers/cloud.js |   19 +-
 solr/webapp/web/partials/cloud.html             |    1 +
 972 files changed, 8827 insertions(+), 77971 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/04a71229/solr/core/src/java/org/apache/solr/core/CoreContainer.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/04a71229/solr/core/src/java/org/apache/solr/core/SolrCore.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/04a71229/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
index 36f4254,98bf11a..062f532
--- a/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/ReplicationHandler.java
@@@ -90,8 -90,7 +90,9 @@@ import org.apache.solr.core.SolrEventLi
  import org.apache.solr.core.backup.repository.BackupRepository;
  import org.apache.solr.core.backup.repository.LocalFileSystemRepository;
  import org.apache.solr.core.snapshots.SolrSnapshotMetaDataManager;
 +import org.apache.solr.metrics.MetricsMap;
 +import org.apache.solr.metrics.SolrMetricManager;
+ import org.apache.solr.handler.IndexFetcher.IndexFetchResult;
  import org.apache.solr.request.SolrQueryRequest;
  import org.apache.solr.response.SolrQueryResponse;
  import org.apache.solr.search.SolrIndexSearcher;

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/04a71229/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
index aa13cbf,656ac71..2519a47
--- a/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
+++ b/solr/core/src/java/org/apache/solr/handler/component/ExpandComponent.java
@@@ -748,9 -777,20 +775,9 @@@ public class ExpandComponent extends Se
      return Category.QUERY;
    }
  
 -  @Override
 -  public URL[] getDocs() {
 -    try {
 -      return new URL[]{
 -          new URL("http://wiki.apache.org/solr/ExpandComponent")
 -      };
 -    } catch (MalformedURLException e) {
 -      throw new RuntimeException(e);
 -    }
 -  }
 -
    // this reader alters the content of the given reader so it should not
    // delegate the caching stuff
-   private class ReaderWrapper extends FilterLeafReader {
+   private static class ReaderWrapper extends FilterLeafReader {
  
      private String field;
  

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/04a71229/solr/core/src/java/org/apache/solr/handler/component/HttpShardHandlerFactory.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/04a71229/solr/core/src/java/org/apache/solr/handler/component/RealTimeGetComponent.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/04a71229/solr/core/src/java/org/apache/solr/highlight/DefaultSolrHighlighter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/04a71229/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
----------------------------------------------------------------------
diff --cc solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
index 04e970c,4207a9b..9b38225
--- a/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
+++ b/solr/core/src/java/org/apache/solr/search/SolrIndexSearcher.java
@@@ -18,18 -18,14 +18,14 @@@ package org.apache.solr.search
  
  import java.io.Closeable;
  import java.io.IOException;
- import java.io.Reader;
  import java.lang.invoke.MethodHandles;
- import java.nio.charset.StandardCharsets;
 -import java.net.URL;
  import java.util.ArrayList;
  import java.util.Arrays;
- import java.util.Collection;
  import java.util.Collections;
  import java.util.Comparator;
  import java.util.Date;
  import java.util.HashMap;
 +import java.util.HashSet;
- import java.util.LinkedList;
  import java.util.List;
  import java.util.Map;
  import java.util.Objects;
@@@ -38,15 -34,21 +34,22 @@@ import java.util.concurrent.TimeUnit
  import java.util.concurrent.atomic.AtomicLong;
  import java.util.concurrent.atomic.AtomicReference;
  
 +import com.codahale.metrics.MetricRegistry;
  import com.google.common.collect.Iterables;
- import org.apache.lucene.analysis.Analyzer;
- import org.apache.lucene.analysis.TokenStream;
  import org.apache.lucene.document.Document;
- import org.apache.lucene.document.DocumentStoredFieldVisitor;
- import org.apache.lucene.document.LazyDocument;
- import org.apache.lucene.index.*;
- import org.apache.lucene.index.StoredFieldVisitor.Status;
+ import org.apache.lucene.index.DirectoryReader;
+ import org.apache.lucene.index.ExitableDirectoryReader;
+ import org.apache.lucene.index.FieldInfos;
+ import org.apache.lucene.index.IndexReader;
+ import org.apache.lucene.index.LeafReader;
+ import org.apache.lucene.index.LeafReaderContext;
+ import org.apache.lucene.index.MultiPostingsEnum;
+ import org.apache.lucene.index.PostingsEnum;
+ import org.apache.lucene.index.StoredFieldVisitor;
+ import org.apache.lucene.index.Term;
+ import org.apache.lucene.index.TermContext;
+ import org.apache.lucene.index.Terms;
+ import org.apache.lucene.index.TermsEnum;
  import org.apache.lucene.search.*;
  import org.apache.lucene.search.BooleanClause.Occur;
  import org.apache.lucene.store.Directory;
@@@ -160,10 -136,10 +137,10 @@@ public class SolrIndexSearcher extends 
    private final String path;
    private boolean releaseDirectory;
  
 -  private final NamedList<Object> readerStats;
 +  private Set<String> metricNames = new HashSet<>();
  
    private static DirectoryReader getReader(SolrCore core, SolrIndexConfig config, DirectoryFactory directoryFactory,
-       String path) throws IOException {
+                                            String path) throws IOException {
      final Directory dir = directoryFactory.get(path, DirContext.DEFAULT, config.lockType);
      try {
        return core.getIndexReaderFactory().newReader(dir, core);

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/04a71229/solr/core/src/java/org/apache/solr/update/UpdateHandler.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/04a71229/solr/core/src/java/org/apache/solr/update/UpdateLog.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/04a71229/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
----------------------------------------------------------------------
diff --cc solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
index 6fc6e2d,607f091..95d3da7
--- a/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
+++ b/solr/core/src/test/org/apache/solr/search/TestSolrQueryParser.java
@@@ -34,7 -34,9 +34,9 @@@ import org.apache.lucene.search.TermInS
  import org.apache.lucene.search.TermQuery;
  import org.apache.solr.SolrTestCaseJ4;
  import org.apache.solr.common.params.MapSolrParams;
 +import org.apache.solr.metrics.MetricsMap;
+ import org.apache.solr.common.params.ModifiableSolrParams;
+ import org.apache.solr.common.params.SolrParams;
 -import org.apache.solr.core.SolrInfoMBean;
  import org.apache.solr.parser.QueryParser;
  import org.apache.solr.query.FilterQuery;
  import org.apache.solr.request.SolrQueryRequest;


Mime
View raw message