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

[lucene-solr] branch master updated (c7d234c -> 5bc7fb2)

This is an automated email from the ASF dual-hosted git repository.

noble pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.


    from c7d234c  SOLR-14613: Autoscaling replacement using placement plugins
     add 27a14fe  Revert "SOLR-14151: Bug fixes (#1815)"
     add a8099d6  Merge branch 'master' of github.com:apache/lucene-solr
     new 6b87cfb  Merge branch 'master' of github.com:apache/lucene-solr
     new e5d3e4d  Merge branch 'master' of github.com:apache/lucene-solr
     new 5bc7fb2  SOLR-14871: remove unused test

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 .../apache/solr/cloud/ZkSolrResourceLoader.java    |  6 ---
 .../org/apache/solr/core/ConfigSetService.java     |  3 +-
 .../java/org/apache/solr/core/CoreContainer.java   | 21 ++++------
 .../src/java/org/apache/solr/core/SolrCore.java    | 21 ++++++----
 .../src/java/org/apache/solr/core/SolrCores.java   |  7 +---
 .../org/apache/solr/core/SolrResourceLoader.java   | 48 +---------------------
 .../java/org/apache/solr/handler/IndexFetcher.java |  2 +-
 .../org/apache/solr/handler/SchemaHandler.java     |  6 +--
 .../org/apache/solr/handler/SolrConfigHandler.java |  2 +-
 .../java/org/apache/solr/schema/IndexSchema.java   |  2 +-
 .../java/org/apache/solr/schema/SchemaManager.java |  4 +-
 .../src/test/org/apache/solr/pkg/TestPackages.java |  2 +
 .../apache/solr/common/util/JsonValidatorTest.java |  8 ----
 13 files changed, 32 insertions(+), 100 deletions(-)


[lucene-solr] 02/03: Merge branch 'master' of github.com:apache/lucene-solr

Posted by no...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit e5d3e4d56744521ca0b9d2f2cd7c6161483fde31
Merge: 6b87cfb c7d234c
Author: noblepaul <no...@gmail.com>
AuthorDate: Thu Sep 17 09:06:48 2020 +1000

    Merge branch 'master' of github.com:apache/lucene-solr

 lucene/CHANGES.txt                                 |   3 +
 .../codecs/lucene87/BugfixDeflater_JDK8252739.java |  13 +-
 .../DeflateWithPresetDictCompressionMode.java      |  22 +-
 .../lucene87/LZ4WithPresetDictCompressionMode.java |  26 +-
 .../lucene87/Lucene87StoredFieldsFormat.java       |  31 +-
 .../lucene/index/SortingStoredFieldsConsumer.java  |  59 ++-
 .../lucene/index/SortingTermVectorsConsumer.java   |  22 +-
 .../DeflateWithPresetCompressingCodec.java         |   2 +-
 .../compressing/LZ4WithPresetCompressingCodec.java |   2 +-
 solr/CHANGES.txt                                   |   2 +
 .../apache/solr/cloud/api/collections/Assign.java  |  64 ++-
 .../cloud/api/collections/CreateCollectionCmd.java |   3 +-
 .../solr/cloud/api/collections/ReplaceNodeCmd.java |   3 +-
 .../solr/cloud/api/collections/RestoreCmd.java     |   3 +-
 .../solr/cloud/api/collections/SplitShardCmd.java  |   3 +-
 .../src/java/org/apache/solr/cluster/Cluster.java  |  50 ++
 .../src/java/org/apache/solr/cluster/Node.java     |  25 +
 .../src/java/org/apache/solr/cluster/Replica.java  |  41 +-
 .../src/java/org/apache/solr/cluster/Shard.java    |  60 +++
 .../org/apache/solr/cluster/SolrCollection.java    |  78 ++++
 .../java/org/apache/solr/cluster/package-info.java |  28 ++
 .../solr/cluster/placement/AttributeFetcher.java   |  85 ++++
 .../solr/cluster/placement/AttributeValues.java    |  55 +++
 .../solr/cluster/placement/PlacementException.java |  48 ++
 .../solr/cluster/placement/PlacementPlan.java      |  43 ++
 .../cluster/placement/PlacementPlanFactory.java    |  51 +++
 .../solr/cluster/placement/PlacementPlugin.java    |  51 +++
 .../cluster/placement/PlacementPluginConfig.java   | 115 +++++
 .../cluster/placement/PlacementPluginFactory.java  |  31 ++
 .../solr/cluster/placement/PlacementRequest.java   |  64 +++
 .../solr/cluster/placement/ReplicaPlacement.java   |  56 +++
 .../placement/impl/AttributeFetcherImpl.java       | 228 +++++++++
 .../placement/impl/AttributeValuesImpl.java        | 114 +++++
 .../placement/impl/PlacementPlanFactoryImpl.java   |  37 ++
 .../cluster/placement/impl/PlacementPlanImpl.java  |  33 +-
 .../impl/PlacementPluginAssignStrategy.java        |  68 +++
 .../placement/impl/PlacementPluginConfigImpl.java  | 204 +++++++++
 .../placement/impl/PlacementRequestImpl.java       | 100 ++++
 .../placement/impl/ReplicaPlacementImpl.java       |  83 ++++
 .../impl/SimpleClusterAbstractionsImpl.java        | 392 ++++++++++++++++
 .../solr/cluster/placement/impl/package-info.java  |  22 +
 .../solr/cluster/placement/package-info.java       |  40 ++
 .../SamplePluginAffinityReplicaPlacement.java      | 509 +++++++++++++++++++++
 .../plugins/SamplePluginMinimizeCores.java         | 138 ++++++
 .../plugins/SamplePluginRandomPlacement.java       |  88 ++++
 .../cluster/placement/plugins/package-info.java    |  21 +
 .../java/org/apache/solr/handler/ClusterAPI.java   |  43 +-
 .../org/apache/solr/security/JWTAuthPlugin.java    |   8 +-
 .../apache/solr/security/JWTAuthPluginTest.java    |  18 +-
 49 files changed, 3116 insertions(+), 169 deletions(-)


[lucene-solr] 01/03: Merge branch 'master' of github.com:apache/lucene-solr

Posted by no...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 6b87cfb88c1ad428f3b6affb53aef1ed49949ab8
Merge: a8099d6 7b8e72e
Author: noblepaul <no...@gmail.com>
AuthorDate: Wed Sep 16 19:19:45 2020 +1000

    Merge branch 'master' of github.com:apache/lucene-solr

 dev-tools/scripts/buildAndPushRelease.py           |  33 ++--
 dev-tools/scripts/releaseWizard.py                 |  23 +--
 dev-tools/scripts/releaseWizard.yaml               |  73 +++++----
 dev-tools/scripts/scriptutil.py                    |  11 --
 lucene/CHANGES.txt                                 |  12 +-
 .../simpletext/SimpleTextTermVectorsWriter.java    |   9 +-
 .../apache/lucene/codecs/TermVectorsWriter.java    |   3 +-
 .../compressing/CompressingTermVectorsWriter.java  |  16 +-
 .../java/org/apache/lucene/index/DocConsumer.java  |  36 -----
 .../lucene/index/DocumentsWriterPerThread.java     |  38 +----
 ...efaultIndexingChain.java => IndexingChain.java} |  30 ++--
 .../apache/lucene/index/LiveIndexWriterConfig.java |  13 --
 .../lucene/index/SortingStoredFieldsConsumer.java  |   5 +-
 .../lucene/index/SortingTermVectorsConsumer.java   |   2 +
 .../apache/lucene/index/StoredFieldsConsumer.java  |  15 +-
 .../apache/lucene/index/TermVectorsConsumer.java   |  12 +-
 .../java/org/apache/lucene/util/Accountable.java   |   4 +
 .../org/apache/lucene/index/TestIndexWriter.java   |   2 +-
 .../apache/lucene/index/TestIndexWriterConfig.java |  17 --
 .../lucene/index/TestIndexWriterWithThreads.java   |   2 +-
 .../org/apache/lucene/facet/TestDrillSideways.java |  18 ++-
 .../lucene/facet/range/TestRangeFacetCounts.java   |   5 +-
 .../search/matchhighlight/PassageFormatter.java    |  17 +-
 .../search/matchhighlight/TestPassageSelector.java |  22 ++-
 .../flexible/standard/TestQPHelper.java            |   8 +-
 .../asserting/AssertingTermVectorsFormat.java      |  10 ++
 .../codecs/cranky/CrankyTermVectorsFormat.java     |  13 ++
 .../org/apache/lucene/search/AssertingWeight.java  |  13 +-
 .../lucene/util/RunListenerPrintReproduceInfo.java |  14 +-
 .../apache/lucene/util/TestReproduceMessage.java   |  70 +++------
 .../util/TestReproduceMessageWithRepeated.java     |   9 +-
 lucene/version.properties                          |  10 ++
 solr/CHANGES.txt                                   |   5 +-
 solr/bin/solr                                      |   2 +-
 solr/bin/solr.cmd                                  |   2 +-
 solr/bin/solr.in.cmd                               |   2 +-
 solr/bin/solr.in.sh                                |   2 +-
 .../src/java/org/apache/solr/api/AnnotatedApi.java |  12 +-
 .../src/java/org/apache/solr/api/PayloadObj.java   |   4 +-
 .../java/org/apache/solr/core/CoreContainer.java   |   4 +
 .../java/org/apache/solr/handler/ClusterAPI.java   | 175 +++++++++++++++++++++
 .../org/apache/solr/handler/SolrConfigHandler.java |   2 +-
 .../solr/handler/admin/CollectionHandlerApi.java   |  53 -------
 .../solr/handler/admin/CollectionsHandler.java     |  63 ++++----
 .../java/org/apache/solr/schema/IndexSchema.java   |   2 +-
 .../solr/handler/admin/TestCollectionAPIs.java     |  10 ++
 solr/docker/build.gradle                           |   2 +-
 .../src/field-types-included-with-solr.adoc        |  62 +++++---
 solr/solr-ref-guide/src/other-parsers.adoc         |  11 ++
 .../src/stream-decorator-reference.adoc            |   6 +-
 .../client/solrj/request/CollectionApiMapping.java |  31 +---
 .../solrj/request/beans/ClusterPropInfo.java       |  72 +++++++++
 .../solr/common/params/DefaultSolrParams.java      |   2 +-
 .../apache/solr/common/util/JsonSchemaCreator.java |  14 +-
 .../java/org/apache/solr/common/util/Utils.java    |   2 +-
 .../src/resources/apispec/cluster.Commands.json    | 146 -----------------
 .../apispec/cluster.commandstatus.delete.json      |  10 --
 .../resources/apispec/cluster.commandstatus.json   |  20 ---
 solr/solrj/src/resources/apispec/cluster.json      |  14 --
 .../apache/solr/common/util/JsonValidatorTest.java |   2 +-
 60 files changed, 655 insertions(+), 642 deletions(-)



[lucene-solr] 03/03: SOLR-14871: remove unused test

Posted by no...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

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

commit 5bc7fb286182eeca4e4d2c9ff9dfb98f6a399125
Author: noblepaul <no...@gmail.com>
AuthorDate: Thu Sep 17 09:10:40 2020 +1000

    SOLR-14871: remove unused test
---
 .../src/test/org/apache/solr/common/util/JsonValidatorTest.java   | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/solr/solrj/src/test/org/apache/solr/common/util/JsonValidatorTest.java b/solr/solrj/src/test/org/apache/solr/common/util/JsonValidatorTest.java
index 5b50841..b4807e3 100644
--- a/solr/solrj/src/test/org/apache/solr/common/util/JsonValidatorTest.java
+++ b/solr/solrj/src/test/org/apache/solr/common/util/JsonValidatorTest.java
@@ -40,7 +40,6 @@ public class JsonValidatorTest extends SolrTestCaseJ4  {
     checkSchema("core.config.Commands");
     checkSchema("core.SchemaEdit");
     checkSchema("cluster.configs.Commands");
-//    checkSchema("cluster.Commands");
   }
 
 
@@ -173,13 +172,6 @@ public class JsonValidatorTest extends SolrTestCaseJ4  {
 
   }
 
-  public void testNullObjectValue() {
-    ValidatingJsonMap spec = Utils.getSpec("cluster.Commands").getSpec();
-    JsonSchemaValidator validator = new JsonSchemaValidator((Map) Utils.getObjectByPath(spec, false, "/commands/set-obj-property"));
-    List<String> object = validator.validateJson(Utils.fromJSONString("{collectionDefaults: null}"));
-    assertNull(object);
-  }
-
   private void checkSchema(String name) {
     ValidatingJsonMap spec = Utils.getSpec(name).getSpec();
     @SuppressWarnings({"rawtypes"})