You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by sh...@apache.org on 2017/06/21 07:11:16 UTC

[50/50] [abbrv] lucene-solr:feature/autoscaling: Merge branch 'master' into feature/autoscaling

Merge branch 'master' into feature/autoscaling

# Conflicts:
#	solr/CHANGES.txt


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

Branch: refs/heads/feature/autoscaling
Commit: fb7803d9a0322ddc79e0c5f63641186ad5a3577d
Parents: b7ea703 2d26d7e
Author: Shalin Shekhar Mangar <sh...@apache.org>
Authored: Wed Jun 21 12:35:48 2017 +0530
Committer: Shalin Shekhar Mangar <sh...@apache.org>
Committed: Wed Jun 21 12:35:48 2017 +0530

----------------------------------------------------------------------
 dev-tools/doap/lucene.rdf                       |   7 +
 dev-tools/doap/solr.rdf                         |   7 +
 dev-tools/idea/solr/solrj/src/java/solrj.iml    |   3 +
 lucene/CHANGES.txt                              |  52 ++
 lucene/MIGRATE.txt                              |  41 ++
 .../DelimitedTermFrequencyTokenFilter.java      |  75 +++
 ...elimitedTermFrequencyTokenFilterFactory.java |  53 ++
 .../lucene/analysis/util/AnalysisSPILoader.java |   2 +-
 .../wikipedia/WikipediaTokenizerFactory.java    |  21 +-
 ...ache.lucene.analysis.util.TokenFilterFactory |   1 +
 .../lucene/analysis/core/TestFactories.java     |  46 +-
 .../lucene/analysis/core/TestRandomChains.java  |   3 +
 .../DelimitedTermFrequencyTokenFilterTest.java  |  77 +++
 .../TestWikipediaTokenizerFactory.java          |  84 ++-
 .../lucene/analysis/ja/TestFactories.java       |  46 +-
 .../index/TestBackwardsCompatibility.java       |   6 +-
 .../org/apache/lucene/index/index.6.6.0-cfs.zip | Bin 0 -> 15875 bytes
 .../apache/lucene/index/index.6.6.0-nocfs.zip   | Bin 0 -> 15883 bytes
 .../PackedTokenAttributeImpl.java               |  29 +-
 .../tokenattributes/TermFrequencyAttribute.java |  33 ++
 .../TermFrequencyAttributeImpl.java             |  82 +++
 .../codecs/blocktree/BlockTreeTermsReader.java  |  37 +-
 .../apache/lucene/document/RangeFieldQuery.java | 377 +++++++-----
 .../lucene/index/BufferedUpdatesStream.java     |   8 +-
 .../org/apache/lucene/index/CodecReader.java    |  11 +-
 .../lucene/index/DefaultIndexingChain.java      |   8 +-
 .../lucene/index/ExitableDirectoryReader.java   |  40 +-
 .../apache/lucene/index/FieldInvertState.java   |   3 +
 .../java/org/apache/lucene/index/Fields.java    |  10 +-
 .../apache/lucene/index/FilterLeafReader.java   |   6 +-
 .../index/FreqProxTermsWriterPerField.java      |  27 +-
 .../org/apache/lucene/index/LeafReader.java     |  15 +-
 .../apache/lucene/index/MergeReaderWrapper.java |   7 +-
 .../org/apache/lucene/index/MultiFields.java    |  69 ++-
 .../apache/lucene/index/ParallelLeafReader.java |  33 +-
 .../lucene/index/SlowCodecReaderWrapper.java    |  16 +-
 .../apache/lucene/index/SortingLeafReader.java  |   6 +-
 .../index/TermVectorsConsumerPerField.java      |  19 +-
 .../apache/lucene/index/TermsHashPerField.java  |   5 +-
 .../apache/lucene/search/AutomatonQuery.java    |   7 +
 .../lucene/search/DisjunctionMaxQuery.java      |   8 +
 .../apache/lucene/search/TermInSetQuery.java    |   4 +-
 .../org/apache/lucene/util/NamedSPILoader.java  |   2 +-
 .../org/apache/lucene/util/QueryBuilder.java    |   6 +-
 .../apache/lucene/util/SPIClassIterator.java    |  10 +-
 .../org/apache/lucene/analysis/TestToken.java   |   2 +
 .../TestPackedTokenAttributeImpl.java           |   2 +
 .../lucene50/TestBlockPostingsFormat.java       |   2 +-
 .../org/apache/lucene/index/Test2BDocs.java     |   2 +-
 .../apache/lucene/index/TestCustomTermFreq.java | 468 +++++++++++++++
 .../test/org/apache/lucene/index/TestDoc.java   |  10 +-
 .../index/TestExitableDirectoryReader.java      |  16 +-
 .../lucene/index/TestFieldInvertState.java      | 139 +++++
 .../lucene/index/TestFilterLeafReader.java      |  17 +-
 .../test/org/apache/lucene/index/TestFlex.java  |  13 +-
 .../lucene/index/TestIndexReaderClose.java      |   8 +-
 .../apache/lucene/index/TestIndexWriter.java    |   4 +-
 .../lucene/index/TestIndexWriterUnicode.java    |   2 +-
 .../lucene/index/TestParallelTermEnum.java      |  20 +-
 .../org/apache/lucene/index/TestPayloads.java   |   4 +-
 .../lucene/index/TestPerSegmentDeletes.java     |   4 +-
 .../lucene/index/TestPostingsOffsets.java       |   2 +-
 .../lucene/index/TestSegmentTermDocs.java       |   2 +-
 .../lucene/index/TestSegmentTermEnum.java       |  10 +-
 .../apache/lucene/index/TestStressAdvance.java  |  11 +-
 .../org/apache/lucene/index/TestTermsEnum.java  |  23 +-
 .../lucene/search/TermInSetQueryTest.java       |  24 +-
 .../lucene/search/TestDisjunctionMaxQuery.java  |  15 +
 .../lucene/search/TestMultiPhraseQuery.java     |   2 +-
 .../lucene/search/TestPhrasePrefixQuery.java    |   2 +-
 .../search/TestSameScoresWithThreads.java       |   2 +-
 .../org/apache/lucene/search/TestTermQuery.java |  43 +-
 .../apache/lucene/util/TestQueryBuilder.java    |  28 +-
 .../search/highlight/TermVectorLeafReader.java  |   8 +-
 .../highlight/WeightedSpanTermExtractor.java    |  25 +-
 .../uhighlight/MemoryIndexOffsetStrategy.java   |   3 +-
 .../uhighlight/MultiTermHighlighting.java       | 124 ++--
 .../lucene/search/uhighlight/PhraseHelper.java  |  29 +-
 .../TermVectorFilteredLeafReader.java           |  22 +-
 .../uhighlight/TestSplittingBreakIterator.java  |   1 -
 .../uhighlight/TestUnifiedHighlighter.java      |   3 -
 .../uhighlight/TestUnifiedHighlighterMTQ.java   |  69 ++-
 .../TestUnifiedHighlighterRanking.java          |   3 -
 .../TestUnifiedHighlighterReanalysis.java       |   2 -
 .../TestUnifiedHighlighterStrictPhrases.java    |   2 -
 .../TestUnifiedHighlighterTermVec.java          |   2 -
 .../TestUnifiedHighlighterExtensibility.java    |  26 +-
 .../apache/lucene/search/join/TestJoinUtil.java |   5 +-
 .../apache/lucene/index/memory/MemoryIndex.java |  43 +-
 .../lucene/index/memory/TestMemoryIndex.java    |  26 +-
 .../memory/TestMemoryIndexAgainstRAMDir.java    |   5 +-
 .../org/apache/lucene/misc/IndexMergeTool.java  |  11 +-
 .../apache/lucene/queries/CommonTermsQuery.java |   4 +-
 .../function/valuesource/TFValueSource.java     |   6 +-
 .../valuesource/TermFreqValueSource.java        |   6 +-
 .../classic/TestMultiFieldQueryParser.java      |   2 +-
 .../queryparser/classic/TestQueryParser.java    |  89 ++-
 .../idversion/TestIDVersionPostingsFormat.java  |   4 +-
 .../lucene/index/AssertingLeafReader.java       |   7 +-
 .../index/BaseIndexFileFormatTestCase.java      |   2 +-
 .../index/BasePostingsFormatTestCase.java       |  15 +-
 .../lucene/index/FieldFilterLeafReader.java     |   9 +-
 .../ThreadedIndexingAndSearchingTestCase.java   |  12 +-
 .../org/apache/lucene/search/QueryUtils.java    |  26 +-
 .../org/apache/lucene/util/LuceneTestCase.java  |   4 +-
 solr/CHANGES.txt                                | 130 ++++-
 solr/bin/solr                                   |  35 +-
 solr/bin/solr.cmd                               |  54 +-
 solr/bin/solr.in.cmd                            |   4 +
 solr/bin/solr.in.sh                             |   4 +
 .../collection1/conf/schema-icucollate-dv.xml   |   4 +-
 .../solr/collection1/conf/schema-icucollate.xml |   4 +-
 .../conf/schema-icucollateoptions.xml           |   4 +-
 .../solr/schema/TestICUCollationField.java      |  28 +-
 .../schema/TestICUCollationFieldDocValues.java  |  28 +-
 .../schema/TestICUCollationFieldOptions.java    |  26 +-
 .../solr/collection1/conf/solrconfig.xml        |   7 +-
 .../collection1/conf/dataimport-solrconfig.xml  |   5 +-
 .../handler/dataimport/VariableResolver.java    |   4 +-
 .../conf/contentstream-solrconfig.xml           |   7 +-
 .../conf/dataimport-nodatasource-solrconfig.xml |   5 +-
 .../collection1/conf/dataimport-solrconfig.xml  |   5 +-
 .../solr/collection1/conf/solrconfig.xml        |   3 +-
 .../conf/solrconfig-languageidentifier.xml      |   3 +-
 .../apache/solr/ltr/TestLTRScoringQuery.java    |  20 +-
 .../solr/ltr/TestSelectiveWeightCreation.java   |  14 +-
 .../apache/solr/ltr/model/TestLinearModel.java  |  10 +
 .../model/TestMultipleAdditiveTreesModel.java   |  17 +-
 .../uima/solr/collection1/conf/solrconfig.xml   |   4 +-
 .../uima/uima-tokenizers-solrconfig.xml         |   4 +-
 solr/core/src/java/org/apache/solr/api/Api.java |   3 +-
 .../src/java/org/apache/solr/api/ApiBag.java    |  32 +-
 .../java/org/apache/solr/api/SpecProvider.java  |  25 -
 .../java/org/apache/solr/api/V2HttpCall.java    |  60 +-
 .../org/apache/solr/cloud/ReplaceNodeCmd.java   |  96 ++-
 .../apache/solr/cloud/ReplicateFromLeader.java  |   6 +-
 .../solr/core/CachingDirectoryFactory.java      |  10 +
 .../org/apache/solr/core/CoreContainer.java     |   9 +-
 .../org/apache/solr/core/DirectoryFactory.java  |  24 +-
 .../java/org/apache/solr/core/PluginBag.java    |  32 +-
 .../java/org/apache/solr/core/SolrConfig.java   |   6 +-
 .../apache/solr/handler/AnalyzeEvaluator.java   |  11 +-
 .../org/apache/solr/handler/ExportWriter.java   | 105 ++--
 .../org/apache/solr/handler/IndexFetcher.java   |   2 +-
 .../solr/handler/MoreLikeThisHandler.java       |   7 +
 .../apache/solr/handler/ReplicationHandler.java |   2 +-
 .../org/apache/solr/handler/StreamHandler.java  | 479 ++++++++-------
 .../solr/handler/UpdateRequestHandlerApi.java   |   4 +-
 .../handler/admin/BaseHandlerApiSupport.java    |   3 +-
 .../apache/solr/handler/admin/InfoHandler.java  |   2 +-
 .../solr/handler/admin/LukeRequestHandler.java  |  10 +-
 .../solr/handler/admin/SecurityConfHandler.java |  12 +-
 .../handler/component/HttpShardHandler.java     |  31 +-
 .../component/QueryElevationComponent.java      |   5 +-
 .../solr/handler/component/TermsComponent.java  |  38 +-
 .../solr/highlight/DefaultSolrHighlighter.java  |   2 +-
 .../solr/highlight/UnifiedSolrHighlighter.java  |   7 +
 .../solr/index/SlowCompositeReaderWrapper.java  |   4 +-
 .../metrics/reporters/SolrGangliaReporter.java  |   4 -
 .../metrics/reporters/SolrGraphiteReporter.java |   4 -
 .../metrics/reporters/SolrSlf4jReporter.java    |   3 +-
 .../org/apache/solr/request/SimpleFacets.java   |   4 +-
 .../solr/request/SolrQueryRequestBase.java      |  21 +-
 .../solr/response/BinaryResponseWriter.java     |  12 +-
 .../java/org/apache/solr/schema/BBoxField.java  |   7 +-
 .../apache/solr/schema/DoublePointField.java    |  10 +-
 .../org/apache/solr/schema/FloatPointField.java |  10 +-
 .../org/apache/solr/schema/IndexSchema.java     |  37 +-
 .../org/apache/solr/schema/IntPointField.java   |  10 +-
 .../org/apache/solr/schema/LongPointField.java  |  10 +-
 .../apache/solr/schema/NumericFieldType.java    |  88 ++-
 .../java/org/apache/solr/schema/PointField.java |   7 +-
 .../java/org/apache/solr/schema/TrieField.java  |  60 +-
 .../java/org/apache/solr/search/CursorMark.java |  21 +-
 .../java/org/apache/solr/search/DocSetUtil.java |   4 +-
 .../solr/search/ExtendedDismaxQParser.java      |   7 +-
 .../src/java/org/apache/solr/search/Filter.java |   2 +-
 .../solr/search/FloatPayloadValueSource.java    |   4 +-
 .../solr/search/GraphTermsQParserPlugin.java    |  16 +-
 .../solr/search/IGainTermsQParserPlugin.java    |   5 +-
 .../apache/solr/search/JoinQParserPlugin.java   |  12 +-
 .../search/SignificantTermsQParserPlugin.java   |   9 +-
 .../TextLogisticRegressionQParserPlugin.java    |   5 +-
 .../apache/solr/search/facet/FacetField.java    |   6 +-
 .../solr/search/facet/FacetFieldProcessor.java  |   1 +
 .../FacetFieldProcessorByEnumTermsStream.java   |   4 +-
 .../facet/FacetFieldProcessorByHashDV.java      |  33 +-
 .../apache/solr/search/facet/FacetModule.java   |   6 +-
 .../apache/solr/search/facet/FacetRange.java    | 147 ++++-
 .../org/apache/solr/search/facet/FieldUtil.java |   6 +
 .../org/apache/solr/search/facet/HLLAgg.java    |  83 ++-
 .../org/apache/solr/search/facet/UniqueAgg.java |  76 ++-
 .../apache/solr/security/BasicAuthPlugin.java   |   2 +-
 .../security/RuleBasedAuthorizationPlugin.java  |   6 +-
 .../security/Sha256AuthenticationProvider.java  |   4 +-
 .../org/apache/solr/servlet/HttpSolrCall.java   |  13 +-
 .../apache/solr/servlet/SolrRequestParsers.java |  13 +-
 .../apache/solr/uninverting/DocTermOrds.java    |   4 +-
 .../apache/solr/update/AddUpdateCommand.java    |   8 +-
 .../solr/update/DirectUpdateHandler2.java       |   3 +-
 .../org/apache/solr/update/DocumentBuilder.java |   8 +-
 .../apache/solr/update/SolrIndexSplitter.java   |   4 +-
 .../java/org/apache/solr/update/UpdateLog.java  |  22 +-
 .../org/apache/solr/update/VersionInfo.java     |  76 ++-
 .../AddSchemaFieldsUpdateProcessorFactory.java  |  12 +-
 .../processor/AtomicUpdateProcessorFactory.java |   3 +-
 .../processor/SimpleUpdateProcessorFactory.java |  18 +-
 .../TemplateUpdateProcessorFactory.java         |  23 +-
 .../processor/UpdateRequestProcessorChain.java  |  19 +-
 .../apache/solr/util/JsonSchemaValidator.java   | 277 ---------
 .../src/java/org/apache/solr/util/PathTrie.java | 195 -------
 .../resources/apispec/autoscaling.Commands.json | 194 -------
 .../src/resources/apispec/cluster.Commands.json |  74 ---
 .../src/resources/apispec/cluster.aliases.json  |  12 -
 .../apispec/cluster.commandstatus.delete.json   |  10 -
 .../apispec/cluster.commandstatus.json          |  20 -
 .../apispec/cluster.configs.Commands.json       |  34 --
 .../apispec/cluster.configs.delete.json         |  12 -
 .../src/resources/apispec/cluster.configs.json  |  12 -
 solr/core/src/resources/apispec/cluster.json    |  14 -
 .../src/resources/apispec/cluster.nodes.json    |  12 -
 .../cluster.security.BasicAuth.Commands.json    |  23 -
 ...cluster.security.RuleBasedAuthorization.json | 129 -----
 ...luster.security.authentication.Commands.json |  12 -
 .../cluster.security.authentication.json        |  12 -
 ...cluster.security.authorization.Commands.json |  13 -
 .../apispec/cluster.security.authorization.json |  13 -
 .../resources/apispec/collections.Commands.json | 218 -------
 .../collections.collection.Commands.json        | 137 -----
 .../collections.collection.Commands.modify.json |  36 --
 .../collections.collection.Commands.reload.json |  11 -
 .../apispec/collections.collection.delete.json  |  13 -
 .../apispec/collections.collection.json         |  19 -
 .../collections.collection.shards.Commands.json | 114 ----
 ...ctions.collection.shards.shard.Commands.json |  24 -
 ...lections.collection.shards.shard.delete.json |  27 -
 ....collection.shards.shard.replica.delete.json |  39 --
 .../core/src/resources/apispec/collections.json |  13 -
 .../src/resources/apispec/core.RealtimeGet.json |  26 -
 .../apispec/core.SchemaEdit.addCopyField.json   |  27 -
 .../apispec/core.SchemaEdit.addField.json       |  98 ----
 .../core.SchemaEdit.addFieldType.analyzers.json |  51 --
 .../apispec/core.SchemaEdit.addFieldType.json   |  53 --
 .../core.SchemaEdit.deleteCopyField.json        |  19 -
 .../core.SchemaEdit.deleteDynamicField.json     |  12 -
 .../apispec/core.SchemaEdit.deleteField.json    |  12 -
 .../core.SchemaEdit.deleteFieldType.json        |  14 -
 .../src/resources/apispec/core.SchemaEdit.json  |  47 --
 .../apispec/core.SchemaRead.copyFields.json     |  26 -
 ...ore.SchemaRead.dynamicFields_fieldTypes.json |  20 -
 .../apispec/core.SchemaRead.fields.json         |  34 --
 .../src/resources/apispec/core.SchemaRead.json  |  17 -
 .../core/src/resources/apispec/core.Update.json |  17 -
 ...g.Commands.addRequestHandler.properties.json |  25 -
 .../apispec/core.config.Commands.generic.json   |  19 -
 .../resources/apispec/core.config.Commands.json | 215 -------
 .../core.config.Commands.runtimeLib.json        |  23 -
 .../apispec/core.config.Params.Commands.json    |  31 -
 .../resources/apispec/core.config.Params.json   |  13 -
 .../core/src/resources/apispec/core.config.json |  18 -
 .../src/resources/apispec/core.system.blob.json |  20 -
 .../apispec/core.system.blob.upload.json        |  12 -
 .../src/resources/apispec/cores.Commands.json   |  85 ---
 .../src/resources/apispec/cores.Status.json     |  20 -
 .../resources/apispec/cores.core.Commands.json  | 136 -----
 .../apispec/cores.core.Commands.split.json      |  34 --
 solr/core/src/resources/apispec/emptySpec.json  |  11 -
 .../src/resources/apispec/node.Commands.json    |  24 -
 solr/core/src/resources/apispec/node.Info.json  |  11 -
 .../core/src/resources/apispec/node.invoke.json |  16 -
 .../solr/analysisconfs/analysis-err-schema.xml  |   4 +-
 ...-schema-uniquekey-diff-type-dynamic-root.xml |  36 ++
 .../bad-schema-uniquekey-diff-type-root.xml     |  35 ++
 .../conf/bad-schema-uniquekey-uses-points.xml   |  28 +
 ...chema-add-schema-fields-update-processor.xml |  22 +
 .../collection1/conf/schema-binaryfield.xml     |   2 +-
 .../conf/schema-blockjoinfacetcomponent.xml     |   4 +-
 .../solr/collection1/conf/schema-bm25.xml       |   4 +-
 .../collection1/conf/schema-charfilters.xml     |   4 +-
 .../solr/collection1/conf/schema-collate-dv.xml |   4 +-
 .../solr/collection1/conf/schema-collate.xml    |   4 +-
 .../collection1/conf/schema-copyfield-test.xml  |   2 +-
 .../collection1/conf/schema-custom-field.xml    |   6 +-
 .../collection1/conf/schema-customfield.xml     |   3 +-
 .../solr/collection1/conf/schema-dfi.xml        |   4 +-
 .../solr/collection1/conf/schema-dfr.xml        |   4 +-
 .../conf/schema-distributed-missing-sort.xml    |   6 +-
 .../solr/collection1/conf/schema-docValues.xml  |   5 +-
 .../conf/schema-field-sort-values.xml           |   2 +-
 .../solr/collection1/conf/schema-hash.xml       |   2 +-
 .../solr/collection1/conf/schema-ib.xml         |   4 +-
 .../collection1/conf/schema-lmdirichlet.xml     |   4 +-
 .../collection1/conf/schema-lmjelinekmercer.xml |   4 +-
 .../conf/schema-not-required-unique-key.xml     |   2 +-
 .../collection1/conf/schema-phrasesuggest.xml   |   4 +-
 .../solr/collection1/conf/schema-point.xml      |  64 +-
 .../conf/schema-postingshighlight.xml           |   4 +-
 .../collection1/conf/schema-replication1.xml    |   2 +-
 .../collection1/conf/schema-replication2.xml    |   2 +-
 .../collection1/conf/schema-required-fields.xml |   2 +-
 .../solr/collection1/conf/schema-rest.xml       |  33 +-
 .../solr/collection1/conf/schema-reversed.xml   |   2 +-
 .../conf/schema-sim-default-override.xml        |   4 +-
 .../solr/collection1/conf/schema-sim.xml        |   4 +-
 .../collection1/conf/schema-simpleqpplugin.xml  |   4 +-
 .../collection1/conf/schema-sortingresponse.xml |  71 ++-
 .../solr/collection1/conf/schema-sorts.xml      |   2 +-
 .../solr/collection1/conf/schema-spatial.xml    |  10 +
 .../solr/collection1/conf/schema-sql.xml        |   2 +-
 .../solr/collection1/conf/schema-sweetspot.xml  |   4 +-
 .../conf/schema-synonym-tokenizer.xml           |   6 +-
 .../solr/collection1/conf/schema-tfidf.xml      |   4 +-
 .../collection1/conf/schema-tokenizer-test.xml  |   5 +-
 .../solr/collection1/conf/schema-trie.xml       |   2 +-
 .../conf/schema-unifiedhighlight.xml            |   4 +-
 .../solr/collection1/conf/schema-version-dv.xml |   3 +-
 .../collection1/conf/schema-version-indexed.xml |   3 +-
 .../test-files/solr/collection1/conf/schema.xml |  21 +-
 .../solr/collection1/conf/schema11.xml          |  15 +-
 .../solr/collection1/conf/schema12.xml          |  23 +-
 ...dd-schema-fields-update-processor-chains.xml |  30 +-
 .../conf/solrconfig-analytics-query.xml         |   3 +-
 .../conf/solrconfig-collapseqparser.xml         |   3 +-
 .../conf/solrconfig-components-name.xml         |   3 +-
 .../conf/solrconfig-delaying-component.xml      |   2 +-
 .../conf/solrconfig-doctransformers.xml         |   2 +-
 .../collection1/conf/solrconfig-elevate.xml     |   3 +-
 .../solr/collection1/conf/solrconfig-hash.xml   |   2 +-
 .../conf/solrconfig-master-throttled.xml        |   3 +-
 .../solr/collection1/conf/solrconfig-master.xml |   3 +-
 .../conf/solrconfig-master1-keepOneBackup.xml   |   3 +-
 .../collection1/conf/solrconfig-master1.xml     |   3 +-
 .../collection1/conf/solrconfig-master2.xml     |   3 +-
 .../collection1/conf/solrconfig-master3.xml     |   3 +-
 .../collection1/conf/solrconfig-nocache.xml     |   2 +-
 .../conf/solrconfig-plugcollector.xml           |   3 +-
 .../collection1/conf/solrconfig-repeater.xml    |   3 +-
 .../collection1/conf/solrconfig-schemaless.xml  |   6 +-
 .../solr/collection1/conf/solrconfig-slave.xml  |   3 +-
 .../solr/collection1/conf/solrconfig-slave1.xml |   3 +-
 .../solr/collection1/conf/solrconfig-sql.xml    |   2 +-
 .../solr/collection1/conf/solrconfig.xml        |   3 +-
 .../solr/collection1/conf/solrconfig_perf.xml   |   2 +-
 .../solr/configsets/cloud-hdfs/conf/schema.xml  |   2 +-
 .../conf/managed-schema                         |   2 +-
 .../cloud-managed-upgrade/conf/schema.xml       |   2 +-
 .../cloud-managed/conf/managed-schema           |   2 +-
 .../cloud-minimal-jmx/conf/schema.xml           |   2 +-
 .../configsets/cloud-minimal/conf/schema.xml    |   3 +-
 .../configsets/cloud-subdirs/conf/schema.xml    |   2 +-
 .../solr/configsets/configset-2/conf/schema.xml |   4 +-
 .../exitable-directory/conf/schema.xml          |   2 +-
 .../test-files/solr/crazy-path-to-schema.xml    |   4 +-
 .../org/apache/solr/BasicFunctionalityTest.java | 113 +++-
 .../test/org/apache/solr/CursorPagingTest.java  |  58 +-
 .../apache/solr/DisMaxRequestHandlerTest.java   |  22 +-
 .../src/test/org/apache/solr/SampleTest.java    |   4 +-
 .../apache/solr/TestDistributedGrouping.java    |  18 +-
 .../apache/solr/TestDistributedMissingSort.java |  60 +-
 .../org/apache/solr/TestDistributedSearch.java  |  20 +-
 .../org/apache/solr/TestTolerantSearch.java     |   4 +-
 .../PathHierarchyTokenizerFactoryTest.java      |  32 +-
 .../apache/solr/analysis/TestCharFilters.java   |   8 +-
 .../test/org/apache/solr/api/TestPathTrie.java  |  61 --
 .../solr/cloud/BasicDistributedZk2Test.java     |   8 +-
 .../solr/cloud/BasicDistributedZkTest.java      |  10 +-
 .../test/org/apache/solr/cloud/BasicZkTest.java |   4 +-
 ...MonkeyNothingIsSafeWithPullReplicasTest.java |   2 +
 ...aosMonkeySafeLeaderWithPullReplicasTest.java |   2 +
 .../solr/cloud/DistribCursorPagingTest.java     |  10 +-
 .../cloud/DistribJoinFromCollectionTest.java    |   8 +-
 .../FullThrottleStoppableIndexingThread.java    |   2 +-
 .../apache/solr/cloud/HttpPartitionTest.java    |   2 +-
 .../org/apache/solr/cloud/ReplaceNodeTest.java  |   9 +-
 .../cloud/SegmentTerminateEarlyTestState.java   |  30 +-
 .../apache/solr/cloud/TestCollectionAPI.java    |  29 +-
 .../autoscaling/AutoScalingHandlerTest.java     |   5 +-
 .../apache/solr/core/DirectoryFactoryTest.java  |  61 ++
 .../test/org/apache/solr/core/HelloStream.java  |   2 +-
 .../test/org/apache/solr/core/MockInfoBean.java |   2 +-
 .../test/org/apache/solr/core/SOLR749Test.java  |  12 +-
 .../apache/solr/core/TestJmxIntegration.java    |   2 +-
 .../core/snapshots/TestSolrCloudSnapshots.java  |   2 +-
 .../core/snapshots/TestSolrCoreSnapshots.java   |   2 +-
 .../solr/handler/MoreLikeThisHandlerTest.java   |  20 +-
 .../handler/StandardRequestHandlerTest.java     |  24 +-
 .../apache/solr/handler/TestReqParamsAPI.java   |   2 +-
 .../org/apache/solr/handler/TestSQLHandler.java |  32 +-
 .../solr/handler/V2ApiIntegrationTest.java      |  57 +-
 .../apache/solr/handler/V2StandaloneTest.java   |  53 ++
 .../handler/XsltUpdateRequestHandlerTest.java   |   2 +-
 .../handler/admin/CoreAdminHandlerTest.java     |  50 ++
 .../solr/handler/admin/MBeansHandlerTest.java   |   2 +-
 .../admin/PropertiesRequestHandlerTest.java     |   2 +-
 .../solr/handler/admin/TestApiFramework.java    |   2 +-
 .../solr/handler/admin/TestCollectionAPIs.java  |  10 +-
 .../DistributedExpandComponentTest.java         |  40 +-
 .../component/DistributedMLTComponentTest.java  |  12 +-
 ...DistributedQueryComponentCustomSortTest.java |  38 +-
 .../DistributedQueryElevationComponentTest.java |   4 +-
 .../component/QueryElevationComponentTest.java  |  90 +--
 .../handler/component/StatsComponentTest.java   |  20 +-
 ...estDistributedStatsComponentCardinality.java |   4 +-
 .../handler/component/TestExpandComponent.java  | 100 ++--
 .../apache/solr/request/SimpleFacetsTest.java   | 144 ++---
 .../org/apache/solr/request/TestFaceting.java   |  14 +-
 .../solr/response/TestBinaryResponseWriter.java |   5 +-
 .../apache/solr/response/TestExportWriter.java  | 199 ++++++-
 .../response/TestJavabinTupleStreamParser.java  |  20 +-
 .../apache/solr/response/TestPushWriter.java    |   8 +-
 .../transform/TestChildDocTransformer.java      | 120 ++--
 .../transform/TestSubQueryTransformer.java      |  28 +-
 .../org/apache/solr/rest/TestRestManager.java   |   2 +-
 .../schema/TestFieldCollectionResource.java     |  10 +-
 .../solr/schema/AbstractCurrencyFieldTest.java  |  82 +--
 .../apache/solr/schema/BadIndexSchemaTest.java  |  17 +
 .../org/apache/solr/schema/CopyFieldTest.java   |  12 +-
 .../solr/schema/CurrencyFieldXmlFileTest.java   |   4 +-
 .../apache/solr/schema/DateRangeFieldTest.java  |   2 +-
 .../org/apache/solr/schema/DocValuesTest.java   | 256 ++++----
 .../schema/IndexSchemaRuntimeFieldTest.java     |   4 +-
 .../org/apache/solr/schema/IndexSchemaTest.java |   6 +-
 .../org/apache/solr/schema/TestBinaryField.java |   6 +-
 .../apache/solr/schema/TestCollationField.java  |  32 +-
 .../schema/TestCollationFieldDocValues.java     |  32 +-
 .../solr/schema/TestHalfAndHalfDocValues.java   |   6 +-
 .../apache/solr/schema/TestOmitPositions.java   |   4 +-
 .../org/apache/solr/schema/TestPointFields.java | 578 ++++++++++---------
 .../apache/solr/search/SpatialFilterTest.java   |   2 +-
 .../solr/search/TestCollapseQParserPlugin.java  | 280 ++++-----
 .../TestComplexPhraseLeadingWildcard.java       |   2 +-
 .../org/apache/solr/search/TestCustomSort.java  |  20 +-
 .../test/org/apache/solr/search/TestDocSet.java |   5 +-
 .../solr/search/TestExtendedDismaxParser.java   |  22 +-
 .../apache/solr/search/TestFieldSortValues.java |  10 +-
 .../solr/search/TestFoldingMultitermQuery.java  |   2 +-
 .../search/TestGraphTermsQParserPlugin.java     |  34 +-
 .../solr/search/TestHashQParserPlugin.java      |  14 +-
 .../org/apache/solr/search/TestQueryTypes.java  |  68 ++-
 .../org/apache/solr/search/TestRangeQuery.java  |   4 +-
 .../solr/search/TestReRankQParserPlugin.java    | 208 +++----
 .../test/org/apache/solr/search/TestReload.java |   2 +-
 .../org/apache/solr/search/TestSearchPerf.java  |   2 +-
 .../apache/solr/search/TestSolr4Spatial.java    |  16 +-
 .../apache/solr/search/TestSolrQueryParser.java |  42 +-
 .../org/apache/solr/search/facet/DebugAgg.java  |   5 +-
 .../search/facet/TestJsonFacetRefinement.java   |  65 ++-
 .../solr/search/facet/TestJsonFacets.java       |  12 +-
 .../search/function/SortByFunctionTest.java     |  68 +--
 .../solr/search/function/TestFunctionQuery.java |  43 +-
 .../function/TestMinMaxOnMultiValuedField.java  | 153 +++--
 .../solr/search/mlt/SimpleMLTQParserTest.java   |  86 +--
 .../solr/search/stats/TestDistribIDF.java       |  14 +-
 .../solr/security/MockAuthorizationPlugin.java  |   2 +-
 .../apache/solr/servlet/NoCacheHeaderTest.java  |   2 +-
 .../solr/spelling/suggest/SuggesterTest.java    |  19 +-
 .../suggest/TestAnalyzeInfixSuggestions.java    |   2 +-
 .../suggest/TestFreeTextSuggestions.java        |   2 +-
 .../apache/solr/update/AddBlockUpdateTest.java  |  10 +-
 .../org/apache/solr/update/VersionInfoTest.java | 126 ++--
 ...dSchemaFieldsUpdateProcessorFactoryTest.java |  16 +-
 .../AtomicUpdateProcessorFactoryTest.java       |  36 +-
 .../update/processor/AtomicUpdatesTest.java     |  36 +-
 .../ClassificationUpdateProcessorTest.java      |   2 +-
 .../processor/TemplateUpdateProcessorTest.java  |  67 ++-
 .../UpdateRequestProcessorFactoryTest.java      |   8 +-
 .../org/apache/solr/util/JsonValidatorTest.java | 196 -------
 .../org/apache/solr/util/PrimUtilsTest.java     |   2 +-
 .../test/org/apache/solr/util/TestUtils.java    |  27 +-
 .../org/apache/solr/util/UtilsToolTest.java     |   2 +-
 .../org/apache/solr/util/hll/BitVectorTest.java |   2 +-
 .../apache/solr/util/hll/ExplicitHLLTest.java   |   2 +-
 .../org/apache/solr/util/hll/FullHLLTest.java   |   2 +-
 .../example-DIH/solr/db/conf/solrconfig.xml     |  15 +-
 .../example-DIH/solr/mail/conf/solrconfig.xml   |  15 +-
 .../example-DIH/solr/solr/conf/solrconfig.xml   |  15 +-
 solr/example/files/conf/managed-schema          |  20 +
 solr/example/files/conf/solrconfig.xml          |  19 +-
 .../basic_configs/conf/solrconfig.xml           |  19 +-
 .../conf/solrconfig.xml                         |  19 +-
 .../conf/solrconfig.xml                         |  15 +-
 solr/solr-ref-guide/build.xml                   |  31 +-
 solr/solr-ref-guide/meta-docs/publish.adoc      |   1 -
 solr/solr-ref-guide/src/_config.yml.template    |   9 +-
 solr/solr-ref-guide/src/_includes/head.html     |   2 -
 ...adding-custom-plugins-in-solrcloud-mode.adoc |   2 +-
 .../src/basic-authentication-plugin.adoc        |  22 +-
 solr/solr-ref-guide/src/blockjoin-faceting.adoc |  19 +-
 .../solr-ref-guide/src/charfilterfactories.adoc |   2 +-
 solr/solr-ref-guide/src/cloud-screens.adoc      |   2 +-
 solr/solr-ref-guide/src/codec-factory.adoc      |   2 +-
 .../src/collapse-and-expand-results.adoc        |  84 +--
 solr/solr-ref-guide/src/collections-api.adoc    |  28 +-
 .../src/common-query-parameters.adoc            |  30 +-
 solr/solr-ref-guide/src/config-api.adoc         |   2 +-
 solr/solr-ref-guide/src/configsets-api.adoc     |  30 +-
 .../src/configuring-solrconfig-xml.adoc         |   3 +-
 solr/solr-ref-guide/src/content-streams.adoc    |  28 +-
 solr/solr-ref-guide/src/coreadmin-api.adoc      |   8 +-
 .../src/cross-data-center-replication-cdcr.adoc |  49 +-
 solr/solr-ref-guide/src/css/ref-guide.css       |   2 +-
 ...adir-and-directoryfactory-in-solrconfig.adoc |   4 +-
 solr/solr-ref-guide/src/de-duplication.adoc     |  45 +-
 .../src/defining-core-properties.adoc           |  52 +-
 solr/solr-ref-guide/src/defining-fields.adoc    |  18 +-
 .../detecting-languages-during-indexing.adoc    |  99 +++-
 .../src/distributed-requests.adoc               |  41 +-
 .../distributed-search-with-index-sharding.adoc |   2 +-
 solr/solr-ref-guide/src/enabling-ssl.adoc       |  12 +-
 .../src/exporting-result-sets.adoc              |   2 +-
 solr/solr-ref-guide/src/faceting.adoc           |  58 +-
 solr/solr-ref-guide/src/feed.xml                |  28 -
 .../field-type-definitions-and-properties.adoc  |  40 +-
 .../solr-ref-guide/src/filter-descriptions.adoc |   4 +-
 solr/solr-ref-guide/src/format-of-solr-xml.adoc |   2 +-
 solr/solr-ref-guide/src/function-queries.adoc   | 134 ++++-
 .../src/hadoop-authentication-plugin.adoc       |  44 +-
 solr/solr-ref-guide/src/highlighting.adoc       |   4 +-
 .../src/images/Solr_Logo_on_white.png           | Bin 0 -> 47661 bytes
 .../src/implicit-requesthandlers.adoc           |   2 +-
 solr/solr-ref-guide/src/index-replication.adoc  | 194 ++++---
 .../src/indexconfig-in-solrconfig.adoc          |  29 +-
 .../src/initparams-in-solrconfig.adoc           |  16 +-
 .../src/introduction-to-solr-indexing.adoc      |   2 +-
 solr/solr-ref-guide/src/jvm-settings.adoc       |   2 +-
 .../src/kerberos-authentication-plugin.adoc     |  72 ++-
 solr/solr-ref-guide/src/language-analysis.adoc  |   6 +-
 solr/solr-ref-guide/src/learning-to-rank.adoc   |   2 +-
 .../src/local-parameters-in-queries.adoc        |   2 +-
 .../major-changes-from-solr-5-to-solr-6.adoc    |   6 +-
 .../src/making-and-restoring-backups.adoc       | 102 ++--
 .../src/mbean-request-handler.adoc              |  21 +-
 solr/solr-ref-guide/src/merging-indexes.adoc    |   2 +-
 solr/solr-ref-guide/src/morelikethis.adoc       |  76 ++-
 .../src/near-real-time-searching.adoc           |  44 +-
 solr/solr-ref-guide/src/other-parsers.adoc      |  23 +-
 .../src/parallel-sql-interface.adoc             |  18 +-
 .../solr-ref-guide/src/parameter-reference.adoc |  45 +-
 .../src/pdf/SolrRefGuide-all.adoc               |   6 +-
 .../src/pdf/themes/refguide-theme.yml           |  17 +-
 .../src/performance-statistics-reference.adoc   |   2 +-
 solr/solr-ref-guide/src/query-screen.adoc       |  68 ++-
 .../src/query-settings-in-solrconfig.adoc       |  22 +-
 .../read-and-write-side-fault-tolerance.adoc    |   4 +-
 solr/solr-ref-guide/src/replication-screen.adoc |   4 +-
 .../src/request-parameters-api.adoc             |   2 +-
 .../src/requestdispatcher-in-solrconfig.adoc    |  35 +-
 ...lers-and-searchcomponents-in-solrconfig.adoc |  14 +-
 solr/solr-ref-guide/src/response-writers.adoc   | 101 ++--
 solr/solr-ref-guide/src/result-clustering.adoc  |  82 ++-
 solr/solr-ref-guide/src/result-grouping.adoc    |  77 ++-
 .../src/rule-based-authorization-plugin.adoc    |  42 +-
 .../src/running-solr-on-hdfs.adoc               |  95 ++-
 solr/solr-ref-guide/src/schema-api.adoc         |   2 +-
 ...schema-factory-definition-in-solrconfig.adoc |   6 +-
 solr/solr-ref-guide/src/schemaless-mode.adoc    |   8 +-
 ...tting-up-an-external-zookeeper-ensemble.adoc |   8 +-
 .../shards-and-indexing-data-in-solrcloud.adoc  |   2 +-
 solr/solr-ref-guide/src/sitemap.xml             |   2 +-
 .../src/solr-control-script-reference.adoc      |  10 +-
 .../src/solr-cores-and-solr-xml.adoc            |   2 +-
 solr/solr-ref-guide/src/spatial-search.adoc     | 150 +++--
 solr/solr-ref-guide/src/spell-checking.adoc     |  40 +-
 solr/solr-ref-guide/src/stream-decorators.adoc  | 392 ++++++++++++-
 solr/solr-ref-guide/src/stream-evaluators.adoc  | 137 +++--
 solr/solr-ref-guide/src/stream-sources.adoc     |  39 +-
 .../src/taking-solr-to-production.adoc          |  20 +-
 .../src/the-dismax-query-parser.adoc            |  22 +-
 .../src/the-extended-dismax-query-parser.adoc   |  29 +-
 .../src/the-query-elevation-component.adoc      |  31 +-
 .../src/the-standard-query-parser.adoc          |  14 +-
 .../solr-ref-guide/src/the-stats-component.adoc |  75 ++-
 .../src/the-term-vector-component.adoc          |  55 +-
 .../solr-ref-guide/src/the-terms-component.adoc | 115 ++--
 .../src/transforming-result-documents.adoc      |  31 +-
 ...anding-analyzers-tokenizers-and-filters.adoc |   8 +-
 .../src/update-request-processors.adoc          |  24 +-
 .../src/updatehandlers-in-solrconfig.adoc       |  62 +-
 .../src/updating-parts-of-documents.adoc        |  54 +-
 solr/solr-ref-guide/src/upgrading-solr.adoc     |   2 +-
 .../src/uploading-data-with-index-handlers.adoc | 130 +++--
 ...g-data-with-solr-cell-using-apache-tika.adoc | 125 ++--
 ...store-data-with-the-data-import-handler.adoc |   2 +-
 solr/solr-ref-guide/src/using-solrj.adoc        |  10 +-
 ...zookeeper-to-manage-configuration-files.adoc |   2 +-
 solr/solr-ref-guide/src/v2-api.adoc             |  24 +-
 .../src/velocity-response-writer.adoc           |  99 ++--
 solr/solr-ref-guide/src/working-with-dates.adoc |  11 +-
 .../src/working-with-enum-fields.adoc           |   6 +-
 ...rking-with-external-files-and-processes.adoc |  30 +-
 .../src/zookeeper-access-control.adoc           |  21 +-
 .../apache/solr/client/solrj/SolrRequest.java   |  18 +
 .../solr/client/solrj/V2RequestSupport.java     |  30 +
 .../solr/client/solrj/impl/CloudSolrClient.java |  15 +-
 .../solrj/impl/ConcurrentUpdateSolrClient.java  |  18 +-
 .../solr/client/solrj/impl/HttpSolrClient.java  |  99 +++-
 .../client/solrj/impl/LBHttpSolrClient.java     |  38 +-
 .../impl/StreamingBinaryResponseParser.java     |   5 +-
 .../client/solrj/io/eval/AnovaEvaluator.java    |   9 +-
 .../client/solrj/io/eval/ArrayEvaluator.java    |  53 +-
 .../solrj/io/eval/ArraySortEvaluator.java       |  77 ---
 .../client/solrj/io/eval/ComplexEvaluator.java  |  18 +-
 .../solrj/io/eval/ConvolutionEvaluator.java     |  10 +-
 .../solrj/io/eval/CorrelationEvaluator.java     |   9 +-
 .../solrj/io/eval/CovarianceEvaluator.java      |   9 +-
 .../io/eval/CumulativeProbabilityEvaluator.java |   9 +-
 .../client/solrj/io/eval/DescribeEvaluator.java |  10 +-
 .../client/solrj/io/eval/DistanceEvaluator.java |  10 +-
 .../io/eval/EmpiricalDistributionEvaluator.java |   9 +-
 .../solrj/io/eval/FindDelayEvaluator.java       |   9 +-
 .../solrj/io/eval/HistogramEvaluator.java       |   9 +-
 .../client/solrj/io/eval/LengthEvaluator.java   |  23 +-
 .../solrj/io/eval/MovingAverageEvaluator.java   |   9 +-
 .../solrj/io/eval/PercentileEvaluator.java      |   9 +-
 .../client/solrj/io/eval/PredictEvaluator.java  |  10 +-
 .../client/solrj/io/eval/RankEvaluator.java     |  10 +-
 .../solrj/io/eval/RegressionEvaluator.java      |  10 +-
 .../client/solrj/io/eval/ReverseEvaluator.java  |  10 +-
 .../client/solrj/io/eval/ScaleEvaluator.java    |  10 +-
 .../client/solrj/io/eval/SequenceEvaluator.java |  10 +-
 .../solrj/io/stream/CartesianProductStream.java |  12 +-
 .../client/solrj/io/stream/FacetStream.java     |   3 +
 .../solr/client/solrj/io/stream/TupStream.java  |   3 +-
 .../solrj/request/CollectionAdminRequest.java   |  10 +-
 .../solrj/request/CollectionApiMapping.java     |  14 +
 .../request/JavaBinUpdateRequestCodec.java      |  12 +-
 .../client/solrj/request/V1toV2ApiMapper.java   | 144 +++++
 .../solr/client/solrj/request/V2Request.java    |  55 +-
 .../solr/client/solrj/response/V2Response.java  |  22 +
 .../org/apache/solr/common/SpecProvider.java    |  25 +
 .../apache/solr/common/params/CommonParams.java |   7 +-
 .../solr/common/params/MoreLikeThisParams.java  |   1 +
 .../solr/common/util/CommandOperation.java      |  48 +-
 .../solr/common/util/ContentStreamBase.java     |   7 +-
 .../apache/solr/common/util/JavaBinCodec.java   |  29 +-
 .../solr/common/util/JsonSchemaValidator.java   | 298 ++++++++++
 .../org/apache/solr/common/util/PathTrie.java   | 195 +++++++
 .../org/apache/solr/common/util/Template.java   |  66 +++
 .../java/org/apache/solr/common/util/Utils.java |  17 +
 .../resources/apispec/autoscaling.Commands.json | 194 +++++++
 .../src/resources/apispec/cluster.Commands.json |  74 +++
 .../src/resources/apispec/cluster.aliases.json  |  12 +
 .../apispec/cluster.commandstatus.delete.json   |  10 +
 .../apispec/cluster.commandstatus.json          |  20 +
 .../apispec/cluster.configs.Commands.json       |  34 ++
 .../apispec/cluster.configs.delete.json         |  12 +
 .../src/resources/apispec/cluster.configs.json  |  12 +
 solr/solrj/src/resources/apispec/cluster.json   |  14 +
 .../src/resources/apispec/cluster.nodes.json    |  12 +
 .../cluster.security.BasicAuth.Commands.json    |  23 +
 ...cluster.security.RuleBasedAuthorization.json | 129 +++++
 ...luster.security.authentication.Commands.json |  12 +
 .../cluster.security.authentication.json        |  12 +
 ...cluster.security.authorization.Commands.json |  13 +
 .../apispec/cluster.security.authorization.json |  13 +
 .../resources/apispec/collections.Commands.json | 218 +++++++
 .../collections.collection.Commands.json        | 137 +++++
 .../collections.collection.Commands.modify.json |  36 ++
 .../collections.collection.Commands.reload.json |  11 +
 .../apispec/collections.collection.delete.json  |  13 +
 .../apispec/collections.collection.json         |  19 +
 .../collections.collection.shards.Commands.json | 114 ++++
 ...ctions.collection.shards.shard.Commands.json |  24 +
 ...lections.collection.shards.shard.delete.json |  27 +
 ....collection.shards.shard.replica.delete.json |  39 ++
 .../src/resources/apispec/collections.json      |  13 +
 .../src/resources/apispec/core.RealtimeGet.json |  26 +
 .../apispec/core.SchemaEdit.addCopyField.json   |  27 +
 .../apispec/core.SchemaEdit.addField.json       |  98 ++++
 .../core.SchemaEdit.addFieldType.analyzers.json |  51 ++
 .../apispec/core.SchemaEdit.addFieldType.json   |  53 ++
 .../core.SchemaEdit.deleteCopyField.json        |  19 +
 .../core.SchemaEdit.deleteDynamicField.json     |  12 +
 .../apispec/core.SchemaEdit.deleteField.json    |  12 +
 .../core.SchemaEdit.deleteFieldType.json        |  14 +
 .../src/resources/apispec/core.SchemaEdit.json  |  47 ++
 .../apispec/core.SchemaRead.copyFields.json     |  26 +
 ...ore.SchemaRead.dynamicFields_fieldTypes.json |  20 +
 .../apispec/core.SchemaRead.fields.json         |  34 ++
 .../src/resources/apispec/core.SchemaRead.json  |  17 +
 .../src/resources/apispec/core.Update.json      |  17 +
 ...g.Commands.addRequestHandler.properties.json |  25 +
 .../apispec/core.config.Commands.generic.json   |  19 +
 .../resources/apispec/core.config.Commands.json | 215 +++++++
 .../core.config.Commands.runtimeLib.json        |  23 +
 .../apispec/core.config.Params.Commands.json    |  31 +
 .../resources/apispec/core.config.Params.json   |  13 +
 .../src/resources/apispec/core.config.json      |  18 +
 .../src/resources/apispec/core.system.blob.json |  20 +
 .../apispec/core.system.blob.upload.json        |  12 +
 .../src/resources/apispec/cores.Commands.json   |  85 +++
 .../src/resources/apispec/cores.Status.json     |  20 +
 .../resources/apispec/cores.core.Commands.json  | 136 +++++
 .../apispec/cores.core.Commands.split.json      |  34 ++
 solr/solrj/src/resources/apispec/emptySpec.json |  11 +
 .../src/resources/apispec/node.Commands.json    |  24 +
 solr/solrj/src/resources/apispec/node.Info.json |  11 +
 .../src/resources/apispec/node.invoke.json      |  16 +
 .../collection1/conf/schema-replication1.xml    |   2 +-
 .../solrj/solr/collection1/conf/schema-sql.xml  |   2 +-
 .../solrj/solr/collection1/conf/schema.xml      |   2 +-
 .../solr/collection1/conf/solrconfig-slave1.xml |   3 +-
 .../solr/collection1/conf/solrconfig-sql.xml    |   2 +-
 .../solrj/solr/collection1/conf/solrconfig.xml  |   2 +-
 .../solr/configsets/ml/conf/solrconfig.xml      |   2 +-
 .../solr/configsets/shared/conf/solrconfig.xml  |   2 +-
 .../configsets/streaming/conf/solrconfig.xml    |   2 +-
 .../solrj/solr/crazy-path-to-schema.xml         |   4 +-
 .../solr/multicore/core0/conf/solrconfig.xml    |   2 +-
 .../solr/multicore/core1/conf/solrconfig.xml    |   2 +-
 .../solrj/io/stream/StreamExpressionTest.java   |  17 +
 .../io/stream/eval/ArrayEvaluatorTest.java      | 155 +++++
 .../io/stream/eval/LengthEvaluatorTest.java     | 119 ++++
 .../solrj/request/TestV1toV2ApiMapper.java      |  55 ++
 .../solr/common/util/JsonValidatorTest.java     | 192 ++++++
 .../solr/common/util/TestJavaBinCodec.java      |  95 +--
 .../solr/common/util/TestNamedListCodec.java    |  57 +-
 .../apache/solr/common/util/TestPathTrie.java   |  61 ++
 .../cloud/AbstractFullDistribZkTestBase.java    |  10 +-
 .../solr/cloud/StoppableCommitThread.java       |   2 +-
 solr/webapp/web/js/angular/controllers/query.js |   2 +-
 721 files changed, 13654 insertions(+), 8540 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fb7803d9/solr/CHANGES.txt
----------------------------------------------------------------------
diff --cc solr/CHANGES.txt
index ed2feac,f15fa45..0d589bb
--- a/solr/CHANGES.txt
+++ b/solr/CHANGES.txt
@@@ -166,13 -176,13 +186,20 @@@ Bug Fixe
  
  * SOLR-10223: Allow running examples as root on Linux with -force option (janhoy)
  
+ * SOLR-10830: Solr now correctly enforces that the '_root_' field has the same fieldType as the
+   uniqueKey field.  With out this enforcement, child document updating was unreliable. (hossman)
+ 
+ * SOLR-10876: Regression in loading runtime UpdateRequestProcessors like TemplateUpdateProcessorFactory (noble)
+ 
+ * SOLR-10886: Using V2Request.process(solrClient) method throws NPE if the API returns an error (Cao Manh Dat)
+ 
 +* SOLR-10602: Triggers should be able to restore state from old instances when taking over. (shalin)
 +
 +* SOLR-10714: OverseerTriggerThread does not start triggers on overseer start until autoscaling
 +  config watcher is fired. (shalin)
 +
 +* SOLR-10738: TriggerAction is initialised even if the trigger is never scheduled. (shalin)
 +
  Optimizations
  ----------------------
  
@@@ -300,6 -318,9 +337,9 @@@ Upgrade Note
  New Features
  ----------------------
  
 -* SOLR-10849: MoreLikeThisComponent should expose setMaxDocFreqPct (maxDoc 
++* SOLR-10849: MoreLikeThisComponent should expose setMaxDocFreqPct (maxDoc
+   frequency percentage). (Dawid Weiss)
+ 
  * SOLR-10307: Allow Passing SSL passwords through environment variables. (Mano Kovacs via Mark Miller)
  
  * SOLR-10721: Provide a way to know when Core Discovery is finished and when all async cores are done loading
@@@ -399,6 -444,25 +463,25 @@@ Other Change
  
  * SOLR-8762: return child docs in DIH debug (Gopikannan Venugopalsamy via Mikhail Khludnev)
  
+ * SOLR-10501: Test sortMissing{First,Last} with points fields.  (Steve Rowe)
+ 
+ * SOLR-10761: Switch trie numeric/date fields to points in data-driven-enabled example and test schemas.
+   (Steve Rowe)
+ 
 -* SOLR-10851: SolrClients should clarify expectations for solrServerUrl parameter (Jason Gerlowski 
++* SOLR-10851: SolrClients should clarify expectations for solrServerUrl parameter (Jason Gerlowski
+   via Tomás Fernández Löbbe)
 -  
++
+ * SOLR-10891: BBoxField should support point-based number sub-fields. (Steve Rowe)
+ 
+ * SOLR-10834: Fixed tests and test configs to stop using numeric uniqueKey fields (hossman)
+ 
+ ==================  6.6.1 ==================
+ 
+ Bug Fixes
+ ----------------------
+ 
+ * SOLR-10857: standalone Solr loads UNLOADed core on request (Erick Erickson, Mikhail Khludnev)
+ 
  ==================  6.6.0 ==================
  
  Consult the LUCENE_CHANGES.txt file for additional, low level, changes in this release.

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fb7803d9/solr/core/src/java/org/apache/solr/metrics/reporters/SolrGangliaReporter.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fb7803d9/solr/core/src/test/org/apache/solr/cloud/autoscaling/AutoScalingHandlerTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fb7803d9/solr/core/src/test/org/apache/solr/schema/DocValuesTest.java
----------------------------------------------------------------------

http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/fb7803d9/solr/solrj/src/resources/apispec/autoscaling.Commands.json
----------------------------------------------------------------------
diff --cc solr/solrj/src/resources/apispec/autoscaling.Commands.json
index 0000000,5ff89ef..6c4b39b
mode 000000,100644..100644
--- a/solr/solrj/src/resources/apispec/autoscaling.Commands.json
+++ b/solr/solrj/src/resources/apispec/autoscaling.Commands.json
@@@ -1,0 -1,47 +1,194 @@@
+ {
+   "documentation": "TODO NOCOMMIT",
+   "description": "The Scaling API provides API for adding cluster level scaling rules, triggers and event listeners",
+   "methods": [
+     "GET",
+     "POST"
+   ],
+   "url": {
+     "paths": [
+       "/cluster/autoscaling",
+       "/cluster/autoscaling/diagnostics"
+     ]
+   },
+   "commands": {
++    "set-trigger": {
++      "type":"object",
++      "description": "The set-trigger command allows you to add and update triggers on various system metrics",
++      "properties": {
++        "name": {
++          "type": "string",
++          "description": "The name of the trigger"
++        },
++        "event": {
++          "type": "string",
++          "description": "The event type on which to set a trigger"
++        },
++        "waitFor": {
++          "type": "string",
++          "description": "The amount of time to wait after the trigger condition is satisfied before trigger is activated"
++        },
++        "lowerBound": {
++          "type": "number",
++          "description": "The lower bound of the condition below which the trigger is activated"
++        },
++        "upperBound": {
++          "type": "number",
++          "description": "The upper bound of the condition below which the trigger is activated"
++        },
++        "enabled": {
++          "type": "boolean",
++          "description": "The state of the trigger"
++        },
++        "actions": {
++          "type": "array",
++          "description": "The actions to be performed in sequence when the trigger is activated",
++          "items": {
++            "type": "object"
++          }
++        }
++      },
++        "required": [
++          "name",
++          "event"
++        ]
++      }
++    },
++    "remove-trigger": {
++      "description": "Remove a trigger",
++      "type": "object",
++      "properties": {
++        "name": {
++          "type": "string",
++          "description": "The name of the trigger to be removed"
++        },
++        "removeListeners": {
++          "type": "boolean",
++          "description": "If true, all listeners of this triggers are deleted together with the trigger"
++        }
++      },
++      "required": [
++        "name"
++      ]
++    },
++    "set-listener": {
++      "description": "The set-listener command lets you add a listener to a trigger",
++      "type": "object",
++      "properties": {
++        "name": {
++          "type": "string",
++          "description": "The name of the listener"
++        },
++        "trigger": {
++          "type": "string",
++          "description": "The name of the trigger to listen to"
++        },
++        "stage": {
++          "type": "array",
++          "description": "The stage of the trigger for which to listen",
++          "items": {
++            "type" : "string"
++          }
++        },
++        "beforeAction": {
++          "type": "array",
++          "description": "The name of the action before which the listener should be notified",
++          "items": {
++            "type" : "string"
++          }
++        },
++        "afterAction": {
++          "type": "array",
++          "description": "The name of the action after which the listener should be notified",
++          "items": {
++            "type" : "string"
++          }
++        },
++        "class": {
++          "type": "string",
++          "description": "The listener class to be notified once the given stage of the given trigger is activated"
++        }
++      },
++      "required": [
++        "name",
++        "trigger",
++        "class"
++      ],
++      "additionalProperties": true
++    },
++    "remove-listener": {
++      "description": "Remove a listener",
++      "type": "object",
++      "properties": {
++        "name": {
++          "type": "string",
++          "description": "The name of the listener to be removed"
++        }
++      },
++      "required": [
++        "name"
++      ]
++    },
++    "suspend-trigger": {
++      "description": "Pauses a trigger until an explicit resume is invoked or if the optional timeout expires",
++      "type": "object",
++      "properties": {
++        "name": {
++          "type": "string",
++          "description": "The name of the trigger to be suspended or '#EACH' to suspend all triggers"
++        },
++        "timeout": {
++          "type": "string",
++          "description": "Optional timeout after which all triggers are resumed automatically"
++        }
++      },
++      "required": [
++        "name"
++      ]
++    },
++    "resume-trigger": {
++      "description": "Resumes a suspended trigger",
++      "type": "object",
++      "properties": {
++        "name": {
++          "type": "string",
++          "description": "The name of the trigger to be resumed or '#EACH' to resume all triggers"
++        }
++      },
++      "required": [
++        "name"
++      ]
++    },
+     "set-policy" : {
+       "type":"object",
+       "description": "The set-policy command allows you to add and update policies that apply to collections",
+     /*  "patternProperties": {
+         "^.+$": {
+           "type": "array"
+         }
+       },*/
+       "additionalProperties": true
+     },
+     "set-cluster-policy" : {
+       "type" : "array",
+       "description" : "The set-cluster-policy command allows you to add and update cluster-level policy that acts as the base for all collection level policies, if any"
+     },
+     "set-cluster-preferences" : {
+       "type" : "array",
+       "description" : "The set-cluster-preferences command allows you to add and update cluster-level preferences that are used to sort nodes for selection in cluster operations"
+     },
+     "remove-policy": {
+       "description": "Remove a policy",
+       "type": "object",
+       "properties": {
+         "name": {
+           "type": "string",
+           "description": "The name of the policy to be removed"
+         }
+       },
+       "required": [
+         "name"
+       ]
+     }
+   }
+ }