lucene-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a.@apache.org
Subject [lucene-solr] 15/36: Merge branch 'master' into jira/solr-13579
Date Wed, 18 Dec 2019 16:38:53 GMT
This is an automated email from the ASF dual-hosted git repository.

ab pushed a commit to branch jira/solr-13579
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git

commit b576520dba6b80a6d0d49bbf76ee2dd3b3c48d5e
Merge: 0876676 d92159b
Author: Andrzej Bialecki <ab@apache.org>
AuthorDate: Tue Jul 23 13:40:40 2019 +0200

    Merge branch 'master' into jira/solr-13579

 README.md                                          |   8 +-
 lucene/CHANGES.txt                                 |   3 +
 .../analysis/shingle/FixedShingleFilterTest.java   |  17 +
 lucene/analysis/nori/build.xml                     |  14 +-
 .../ko/util/TokenInfoDictionaryBuilder.java        |  12 +-
 .../util/graph/GraphTokenStreamFiniteStrings.java  |  84 ++-
 .../graph/TestGraphTokenStreamFiniteStrings.java   |   9 +-
 solr/CHANGES.txt                                   |  36 +-
 solr/core/src/java/org/apache/solr/api/ApiBag.java |  21 +-
 .../solr/cloud/api/collections/SplitShardCmd.java  |  50 +-
 .../java/org/apache/solr/core/BlobRepository.java  |   7 +-
 .../java/org/apache/solr/core/CoreContainer.java   |  12 +
 .../src/java/org/apache/solr/core/LibListener.java | 273 ++++++++++
 .../java/org/apache/solr/core/MemClassLoader.java  |  17 +-
 .../src/java/org/apache/solr/core/PluginBag.java   | 284 ++++-------
 .../src/java/org/apache/solr/core/PluginInfo.java  |  25 +-
 .../src/java/org/apache/solr/core/RuntimeLib.java  | 220 ++++++++
 .../src/java/org/apache/solr/core/SolrConfig.java  |   2 +-
 .../src/java/org/apache/solr/core/SolrCore.java    |  18 +-
 .../org/apache/solr/handler/SolrConfigHandler.java | 511 ++++++++++---------
 .../solr/handler/admin/CollectionHandlerApi.java   | 300 +++++++++--
 .../solr/handler/admin/CollectionsHandler.java     |  35 +-
 .../org/apache/solr/handler/admin/SplitOp.java     | 248 ++++++++-
 .../java/org/apache/solr/search/FastLRUCache.java  | 162 +++++-
 .../src/java/org/apache/solr/search/LFUCache.java  | 158 +++++-
 .../src/java/org/apache/solr/search/LRUCache.java  | 169 +++---
 .../src/java/org/apache/solr/search/SolrCache.java |  19 +
 .../SearchGroupsResultTransformer.java             |  64 ++-
 .../org/apache/solr/security/BasicAuthPlugin.java  |   2 +-
 .../solr/security/PermissionNameProvider.java      |   1 +
 .../solr/servlet/cache/HttpCacheHeaderUtil.java    |  15 +-
 .../processor/UpdateRequestProcessorChain.java     |  16 +-
 .../org/apache/solr/util/ConcurrentLFUCache.java   |  65 ++-
 .../org/apache/solr/util/ConcurrentLRUCache.java   |  67 ++-
 .../src/java/org/apache/solr/util/CryptoKeys.java  |  22 +-
 .../src/java/org/apache/solr/util/SolrCLI.java     |   6 +-
 .../src/test-files/cryptokeys/priv_key2048.pem     |  27 +
 .../core/src/test-files/cryptokeys/priv_key512.pem |   9 +
 .../core/src/test-files/cryptokeys/pub_key2048.der | Bin 0 -> 294 bytes
 solr/core/src/test-files/cryptokeys/pub_key512.der | Bin 0 -> 94 bytes
 .../test-files/runtimecode/runtimelibs_v3.jar.bin  | Bin 0 -> 6526 bytes
 solr/core/src/test-files/runtimecode/sig.txt       |  48 ++
 .../configsets/cloud-managed/conf/managed-schema   |  11 +
 .../apache/solr/cloud/ClusterStateMockUtil.java    |   9 +-
 ...OverriddenZkACLAndCredentialsProvidersTest.java |  12 +-
 .../apache/solr/cloud/TestClusterProperties.java   |   6 +-
 .../test/org/apache/solr/cloud/TestCryptoKeys.java |   2 +-
 .../VMParamsZkACLAndCredentialsProvidersTest.java  |   4 +-
 .../AbstractCloudBackupRestoreTestCase.java        |   2 +-
 .../cloud/api/collections/SplitByPrefixTest.java   | 259 ++++++++++
 .../collections/TestHdfsCloudBackupRestore.java    |   3 +
 .../collections/TestLocalFSCloudBackupRestore.java |  98 +++-
 .../cloud/autoscaling/HttpTriggerListenerTest.java |   3 +-
 .../solr/core/TestBackupRepositoryFactory.java     |  21 +-
 .../apache/solr/core/TestCorePropertiesReload.java |   4 +-
 .../org/apache/solr/core/TestDynamicLoading.java   |   2 +-
 .../solr/handler/TestContainerReqHandler.java      | 566 +++++++++++++++++++++
 .../solr/handler/admin/SplitHandlerTest.java       | 218 ++++++++
 .../reporters/SolrGraphiteReporterTest.java        |   4 +-
 .../org/apache/solr/response/TestPushWriter.java   |   6 +-
 .../org/apache/solr/search/TestFastLRUCache.java   |  71 +++
 .../test/org/apache/solr/search/TestLFUCache.java  |  40 ++
 .../test/org/apache/solr/search/TestLRUCache.java  |  84 ++-
 .../DimensionalRoutedAliasUpdateProcessorTest.java |   2 +-
 .../apache/solr/update/processor/RuntimeUrp.java   |   2 +-
 solr/site/index.xsl                                |  22 +-
 .../org/apache/solr/client/solrj/SolrResponse.java |   9 +-
 .../client/solrj/io/stream/JSONTupleStream.java    |   3 +-
 .../solr/client/solrj/io/stream/SolrStream.java    |   3 +-
 .../solrj/request/CollectionAdminRequest.java      |  14 +
 .../client/solrj/request/CollectionApiMapping.java |  17 +
 .../solr/common/cloud/ClusterProperties.java       |  14 +-
 .../solr/common/cloud/CompositeIdRouter.java       |  17 +
 .../org/apache/solr/common/cloud/DocRouter.java    |   8 +
 ...eSetCredentialsDigestZkCredentialsProvider.java |   9 +-
 .../apache/solr/common/cloud/ZkStateReader.java    |  90 ++--
 .../solr/common/params/CommonAdminParams.java      |   2 +
 .../apache/solr/common/params/CoreAdminParams.java |   2 +
 .../apache/solr/common/util/CommandOperation.java  |   9 +-
 .../java/org/apache/solr/common/util/Utils.java    | 337 ++++++------
 .../src/resources/apispec/cluster.Commands.json    |  37 ++
 .../cluster.Commands.runtimelib.properties.json    |  23 +
 ...nfig.Commands.addRequestHandler.properties.json |   2 +-
 .../apispec/core.config.Commands.generic.json      |   2 +-
 solr/solrj/src/resources/apispec/node.ext.json     |  13 +
 .../client/solrj/SolrSchemalessExampleTest.java    |  10 +-
 .../solrj/embedded/SolrExampleJettyTest.java       |   4 +-
 .../client/solrj/io/graph/GraphExpressionTest.java |   3 +-
 .../solrj/io/stream/StreamDecoratorTest.java       |  28 +-
 .../java/org/apache/solr/SolrJettyTestBase.java    |   4 +-
 .../solr/cloud/AbstractFullDistribZkTestBase.java  |   4 +-
 .../org/apache/solr/cloud/SolrCloudTestCase.java   |   4 +-
 .../java/org/apache/solr/cloud/ZkTestServer.java   |   5 +-
 .../src/java/org/apache/solr/util/TestHarness.java |   3 +-
 solr/webapp/web/js/angular/controllers/query.js    |   2 +
 solr/webapp/web/partials/query.html                |  18 +-
 96 files changed, 4099 insertions(+), 1104 deletions(-)

diff --cc solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 7f27ac9,d6098fb..d350e12
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@@ -225,10 -219,8 +225,12 @@@ public class CoreContainer 
  
    protected volatile AutoscalingHistoryHandler autoscalingHistoryHandler;
  
 +  protected volatile ResourceManager resourceManager;
 +
 +  protected volatile ResourceManagerHandler resourceManagerHandler;
 +
+   private final LibListener clusterPropertiesListener = new LibListener(this);
+ 
  
    // Bits for the state variable.
    public final static long LOAD_COMPLETE = 0x1L;


Mime
View raw message