You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ab...@apache.org on 2020/07/01 15:29:51 UTC
[lucene-solr] 07/11: Merge branch 'master' into jira/solr-12847-2
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-12847-2
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 2fbff5d86ec508ed8df16528faa7cf63d482ce35
Merge: 09ee721 aba7a61
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Thu Jun 25 18:28:47 2020 +0200
Merge branch 'master' into jira/solr-12847-2
.../compound/hyphenation/HyphenationTree.java | 2 +-
.../lucene/index/DocumentsWriterFlushControl.java | 2 +-
.../java/org/apache/lucene/index/IndexWriter.java | 44 +-
.../java/org/apache/lucene/index/MergePolicy.java | 10 +-
.../org/apache/lucene/index/TestMergePolicy.java | 1 -
.../lucene/facet/taxonomy/TaxonomyReader.java | 2 +-
.../queryparser/docs/xml/LuceneCoreQuery.dtd.html | 2 +-
.../docs/xml/LuceneCoreQuery.dtd.org.html | 2 +-
.../flexible/core/nodes/QueryNodeImpl.java | 2 +-
.../lucene/queryparser/xml/LuceneCoreQuery.dtd | 2 +-
lucene/site/changes/changes2html.pl | 2 +-
.../suggest/analyzing/FreeTextSuggester.java | 4 +-
solr/CHANGES.txt | 9 +
.../solr/collection1/conf/solrconfig.xml | 11 +
.../solr/collection1/conf/solrconfig.xml | 4 +
.../src/java/org/apache/solr/api/AnnotatedApi.java | 113 +++--
solr/core/src/java/org/apache/solr/api/ApiBag.java | 9 +
.../apache/solr/api/CustomContainerPlugins.java | 313 ++++++++++++
.../src/java/org/apache/solr/api/PayloadObj.java | 35 +-
.../src/java/org/apache/solr/api/V2HttpCall.java | 29 +-
.../java/org/apache/solr/core/CoreContainer.java | 41 +-
.../src/java/org/apache/solr/core/PluginInfo.java | 4 +-
.../src/java/org/apache/solr/core/SolrConfig.java | 21 +-
.../src/java/org/apache/solr/core/SolrCore.java | 16 +-
.../src/java/org/apache/solr/core/SolrPaths.java | 27 --
.../org/apache/solr/filestore/PackageStoreAPI.java | 19 +-
.../java/org/apache/solr/handler/CatStream.java | 70 ++-
.../apache/solr/handler/ReplicationHandler.java | 2 +-
.../solr/handler/admin/ContainerPluginsApi.java | 179 +++++++
.../solr/handler/component/HttpShardHandler.java | 2 +-
.../component/PivotFacetFieldValueCollection.java | 2 +-
.../solr/handler/component/SearchHandler.java | 31 +-
.../src/java/org/apache/solr/pkg/PackageAPI.java | 23 +-
.../java/org/apache/solr/pkg/PackageLoader.java | 8 +
.../org/apache/solr/search/JoinQParserPlugin.java | 531 ++-------------------
.../{JoinQParserPlugin.java => JoinQuery.java} | 149 +-----
.../java/org/apache/solr/search/QParserPlugin.java | 2 -
...Parser.java => CrossCollectionJoinQParser.java} | 26 +-
...CJFQuery.java => CrossCollectionJoinQuery.java} | 17 +-
.../solr/search/join/ScoreJoinQParserPlugin.java | 5 +-
.../apache/solr/search/join/XCJFQParserPlugin.java | 66 ---
.../apache/solr/servlet/DirectSolrConnection.java | 2 +-
.../java/org/apache/solr/servlet/HttpSolrCall.java | 2 +-
.../apache/solr/servlet/SolrDispatchFilter.java | 1 -
.../CountFieldValuesUpdateProcessorFactory.java | 2 +-
.../DocExpirationUpdateProcessorFactory.java | 4 +-
.../MaxFieldValueUpdateProcessorFactory.java | 2 +-
.../MinFieldValueUpdateProcessorFactory.java | 2 +-
.../solr/util/circuitbreaker/CircuitBreaker.java | 51 ++
.../util/circuitbreaker/CircuitBreakerManager.java | 105 ++++
.../circuitbreaker/CircuitBreakerType.java} | 23 +-
.../util/circuitbreaker/MemoryCircuitBreaker.java | 87 ++++
.../resources/EditableSolrConfigAttributes.json | 2 +
.../runtimecode/MyPlugin.java} | 28 +-
.../runtimecode/containerplugin.v.1.jar.bin | Bin 0 -> 867 bytes
.../runtimecode/containerplugin.v.2.jar.bin | Bin 0 -> 867 bytes
solr/core/src/test-files/runtimecode/sig.txt | 8 +
.../conf/solrconfig-cache-enable-disable.xml | 4 +
.../solr/collection1/conf/solrconfig-elevate.xml | 4 +
.../conf/solrconfig-implicitproperties.xml | 2 +
...le.xml => solrconfig-memory-circuitbreaker.xml} | 15 +-
.../conf/solrconfig-sortingresponse.xml | 4 +
.../solr/collection1/conf/solrconfig.xml | 10 +
.../solr/collection1/conf/solrconfig_perf.xml | 2 +
.../configsets/{xcjf => ccjoin}/conf/schema.xml | 0
.../{xcjf => ccjoin}/conf/solrconfig.xml | 22 +-
.../test/org/apache/solr/core/SolrCoreTest.java | 2 +
.../org/apache/solr/core/TestConfigOverlay.java | 2 +
.../solr/filestore/TestDistribPackageStore.java | 27 +-
.../apache/solr/handler/TestContainerPlugin.java | 304 ++++++++++++
.../solr/handler/admin/TestApiFramework.java | 34 +-
.../src/test/org/apache/solr/pkg/TestPackages.java | 2 +-
.../org/apache/solr/search/QueryEqualityTest.java | 6 -
...Test.java => CrossCollectionJoinQueryTest.java} | 88 ++--
.../org/apache/solr/util/TestCircuitBreaker.java | 190 ++++++++
.../example-DIH/solr/db/conf/solrconfig.xml | 10 +
.../example-DIH/solr/mail/conf/solrconfig.xml | 10 +
.../example-DIH/solr/solr/conf/solrconfig.xml | 10 +
solr/example/files/conf/solrconfig.xml | 10 +
.../solr/configsets/_default/conf/solrconfig.xml | 10 +
.../conf/solrconfig.xml | 10 +
solr/solr-ref-guide/src/config-api.adoc | 4 +
solr/solr-ref-guide/src/other-parsers.adoc | 184 ++++---
.../src/query-settings-in-solrconfig.adoc | 18 +
.../solrj/cloud/autoscaling/PolicyHelper.java | 310 ++++++++----
.../client/solrj/cloud/autoscaling/Suggester.java | 2 +-
.../client/solrj/request/beans/PluginMeta.java | 58 +++
.../solrj/response/AnalysisResponseBase.java | 2 +-
.../org/apache/solr/common/params/FacetParams.java | 4 +-
.../org/apache/solr/common/util/NamedList.java | 2 +-
.../java/org/apache/solr/common/util/PathTrie.java | 50 +-
.../solr/autoscaling/testAddTooManyPerPolicy.json | 129 +++++
.../client/solrj/cloud/autoscaling/TestPolicy.java | 134 +++++-
.../solrj/cloud/autoscaling/TestPolicy2.java | 12 +
.../solrj/io/stream/StreamExpressionTest.java | 42 +-
.../org/apache/solr/common/util/TestPathTrie.java | 8 +
96 files changed, 2577 insertions(+), 1318 deletions(-)