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/09/24 11:29:27 UTC
[lucene-solr] 02/02: Merge branch 'master' into jira/solr-14749
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-14749
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit d5198c0b6f02f3ac74624cba7d35295665dbc8be
Merge: a772b0e c258905
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Thu Sep 24 13:19:35 2020 +0200
Merge branch 'master' into jira/solr-14749
.github/workflows/docker-test.yml | 8 +
.github/workflows/gradle-precommit.yml | 13 ++
.muse/config.toml | 5 +
build.gradle | 2 +-
lucene/CHANGES.txt | 14 ++
.../lucene87/LZ4WithPresetDictCompressionMode.java | 4 +-
.../lucene87/Lucene87StoredFieldsFormat.java | 6 +-
.../apache/lucene/index/BinaryDocValuesWriter.java | 70 ++++----
.../lucene/index/DocumentsWriterFlushControl.java | 63 +++----
.../lucene/index/DocumentsWriterPerThread.java | 13 +-
.../org/apache/lucene/index/NormValuesWriter.java | 2 +-
.../lucene/index/NumericDocValuesWriter.java | 14 +-
.../lucene/index/SortedNumericDocValuesWriter.java | 82 +++++----
.../lucene/index/SortedSetDocValuesWriter.java | 98 +++++------
.../apache/lucene/index/SortingCodecReader.java | 168 +++++++++---------
.../src/java/org/apache/lucene/search/Weight.java | 6 +-
.../lucene/search/comparators/DocComparator.java | 10 +-
.../search/comparators/NumericComparator.java | 8 +-
.../apache/lucene/store/ByteBuffersDataOutput.java | 9 +-
.../lucene/index/TestSortingCodecReader.java | 8 +-
.../search/TestFieldSortOptimizationSkipping.java | 90 +++++++---
solr/CHANGES.txt | 13 +-
.../cloud/OverseerConfigSetMessageHandler.java | 24 +--
.../java/org/apache/solr/cloud/ZkController.java | 28 +--
.../cloud/api/collections/CreateCollectionCmd.java | 19 +-
.../cloud/api/collections/DeleteCollectionCmd.java | 4 +-
.../java/org/apache/solr/core/CoreContainer.java | 7 +-
.../java/org/apache/solr/handler/ClusterAPI.java | 99 ++++++++---
.../org/apache/solr/handler/CollectionsAPI.java | 63 +++++++
.../solr/handler/admin/ConfigSetsHandler.java | 151 ++++++++++++----
.../solr/handler/admin/ConfigSetsHandlerApi.java | 93 ----------
.../apache/solr/request/macro/MacroExpander.java | 35 ++--
.../apache/solr/servlet/SolrRequestParsers.java | 18 +-
.../src/java/org/apache/solr/util/SolrCLI.java | 12 +-
.../org/apache/solr/cloud/TestConfigSetsAPI.java | 191 ++++++++++++++++++---
.../solr/handler/admin/TestApiFramework.java | 41 ++++-
.../solr/handler/admin/TestCollectionAPIs.java | 4 +-
.../apache/solr/handler/admin/TestConfigsApi.java | 19 +-
.../solr/request/macro/TestMacroExpander.java | 56 ++++--
.../src/cluster-node-management.adoc | 2 +-
solr/solr-ref-guide/src/configsets-api.adoc | 8 +-
.../client/solrj/request/CollectionApiMapping.java | 85 ---------
.../solrj/request/beans/CreateConfigInfo.java} | 42 ++---
.../java/org/apache/solr/common/MapWriterMap.java | 4 +-
.../solr/common/cloud/ClusterProperties.java | 17 ++
.../apache/solr/common/params/ConfigSetParams.java | 2 +
.../apispec/cluster.configs.Commands.json | 34 ----
.../resources/apispec/cluster.configs.delete.json | 12 --
.../src/resources/apispec/cluster.configs.json | 12 --
.../solrj/src/resources/apispec/cluster.nodes.json | 12 --
.../apispec/collections.collection.delete.json | 13 --
solr/solrj/src/resources/apispec/collections.json | 13 --
.../apache/solr/common/util/JsonValidatorTest.java | 1 -
.../solr/common/util/TestZkMaintenanceUtils.java | 60 +++++++
54 files changed, 1079 insertions(+), 808 deletions(-)