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/10/26 11:50:08 UTC
[lucene-solr] branch jira/solr-14749-api updated (738b302 ->
4e89ad2)
This is an automated email from the ASF dual-hosted git repository.
ab pushed a change to branch jira/solr-14749-api
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from 738b302 SOLR-14749: Default implementation of ClusterEventProducer.
add 8c41418 SOLR-14576 : Do not use SolrCore as keys in a WeakHashMap (#1586)
add a2167ae DOAP changes for release 8.6.3
add 08e38d3 LUCENE-9488 Create Release Artifacts with Gradle (#1905)
add 2329423 LUCENE-9577: Move Lucene/Solr Documentation assembly to subproject (#1967)
add f97208a LUCENE-9577: fix changed task name
add 6acb7b4 LUCENE-9577: move the checkBrokenLinks task to the documentation subprojects
add 178d83d Update addVersion.py test running to gradle
add 76a8cc3 Add bugfix version 8.6.3
add 47a3f59 Merge branch 'master' of https://gitbox.apache.org/repos/asf/lucene-solr
add 4e0aa0d LUCENE-9567: JPOSSFF loads built-in stop tags by default (#1961)
add 5504f37 Sync CHANGES for 8.6.3
add 2a9d704 Update addBackcompatIndexes.py test running to gradle
add 9e13d99 Add back-compat indices for 8.6.3
add 7b1663e Ref Guide: update for 8.7 release notes; bring notes from 8.6.1 forward to keep branch_8x and master at least sort of in sync
add 7d37150 Ref Guide: fix typos, formatting issues, etc.
add 80df6a3 LUCENE-9434: Remove wiki-update step from release
add ab83b3b SOLR-14917: Move DOMUtil and PropertiesUtil to SolrJ (#1953)
add 7362c4c LUCENE-6831: start removing LinkedList in favor of ArrayList or De/Queues (#1969)
add c5cf132 LUCENE-9562: All binary analysis packages (and corresponding Maven artifacts) with names containing '-analyzers-' have been renamed to '-analysis-'. (#1968)
add e444df1 SOLR-14922: Include solr-ref-guide tasks in sourceSets for IntelliJ (#1973)
add b4f0442 SOLR-14870: refactor ref-guide build.gradle logic to re-enable guide->javadoc link checking
add 9594ab3 SOLR-14776: Precompute the fingerprint during PeerSync (#1814)
add bcd9cbe SOLR-14907: Support single file upload/overwrite in configSet API (#1977)
add cf6e831 SOLR-14887 Upgrade JQuery to 3.5.1 (#1947)
add 03fe8e5 SOLR-14654: remove ref guide refernces
add 2f651b1 SOLR-14654: remove all references of runtime lib
add fa3e1ad SOLR-14869: ChildDocTransformer should have omitted deleted child documents. Closes #1970
add a7a6757 SOLR-14654: ref guide error
add b43c389 Include missing commands in package tool help section (#1975)
add ab5671d LUCENE-9574 Add DropIfFlaggedFilterFactory (#1979)
add 9805b12 LUCENE-9579 Update to JUnit 4.13.1 (#1981)
add 2a3da99 SOLR-14914: Add option to disable metrics collection.
add 321b4fa SOLR-14930: Deprecate rulebased replica placement strategy (remove in 9.0) (#1980)
add 737cf98 SOLR-14924: Some ReplicationHandler metrics are reported using incorrect types.
add 0bd2f31 SOLR-14930: fix precommit
add d7e58ed SOLR-14483 (#1988)
add 9877085 LUCENE-9572 - TypeAsSynonymFilter gains selective flag transfer and an ignore list. (#1965)
add 6a330e6 SOLR-14651: improve metrics history docs When the MHH is disabled, it is *not* possible to retrieve history.
add 744934c SOLR-14933: Ability to add T and P type replica from admin UI (#1991)
add 6990109 LUCENE-9524: Fix NPE in SpanWeight#explain when no scoring is require… (#1978)
add 48348ae LUCENE-9578: TermRangeQuery empty string lower bound edge case (#1976)
add 72a5541 Update CHANGES.txt to align with release versions
add c3a7a58 LUCENE-9578: Add CHANGES entry.
add f7be9e8 LUCENE-9524: Fix CHANGES entry version.
add 85b58c2 LUCENE-9576: nuke SSD detection, modernize CMS defaults
add c02f07f LUCENE-9322: Add Lucene90 codec, including VectorFormat
add dbcbcd0 Add CHANGES entry for LUCENE-9322
add e9ff918 fix javadoc
add 4c42cbc LUCENE-9576: give solr back its getFileStoreAttributes permission
add 9ab9d20 SOLR-14944: Remove the "spins" metrics.
add 6e25728 Fix 'an[d]' typo in three solrconfig.xml comments.
add b47ccbc Fix a highlight in query-settings-in-solrconfig.adoc file.
add 43edf37 SOLR-14943 Rework Monitoring Solr with Prometheus and Grafana ref guide page to be clearer (#1999)
add 44c1bd4 LUCENE-9318: Clean up package name conflicts for backward-codecs (#2000)
add 3bc873e SOLR-14936: Fixed Grafana dashboard filters for collection, shard, replica and core (#1986)
add 6ac5747 SOLR-14549: Fix listing of Files in a Directory on Solr Admin UI
add 6177be7 Harden TestVectorValues.testAddIndexesDirectory01
add 0746d30 SOLR-14877: Add github action for running SolrJ tests. (#1891)
add 0bc494e LUCENE-9524: Fix test failure.
add c587bf8 Reduce chances of _very_ slow tests in nightly builds.
add 67ecd8f SOLR-14749: Improve support for arbitrary container-level plugins. Add ClusterSingleton support for plugins that require only one active instance in the cluster.
add e826b1f refactor method names
add 052efd6 Revert "refactor method names"
add 62de8f9 Add example for ConfigSet create with properties map. (#2005)
add 43c087f SOLR-14956: correct (socket|conn)Timeout casing in 'Configuring the ShardHandlerFactory' example (Yevhen Tienkaiev via Christine Poerschke)
add c680a6e Move upgrade notes from CHANGES.txt to the Ref Guide.
add 3bfe9d8 SOLR-14947: Print out image info after gradle docker task. (#2007)
add 840a353 LUCENE-9582: rename VectorValues.ScoreFunction to SearchStrategy (#2018)
add 706f284 SOLR-14942: Reduce leader election time on node shutdown (#2004)
add 56eac7c Fix random TestVectorValues failures by use of forceMerge (and getOnlyLeafReader)
add 2d3a221 .gitignore clean up (#1993)
add 98594b5 LUCENE-9455: ExitableTermsEnum should sample timeout and interruption check before calling next()
add 7a09cc1 SOLR-14937: Correct client.queryDefaults().set(...) calls in some JSON facet tests. (#1987)
add 4bf2541 Rename ConfigSetsAPITest to TestConfigSetsAPIShareSchema (#1890)
new 1bb91ff Merge branch 'master' into jira/solr-14749-api
new 4e89ad2 SOLR-14749: Fix some merge snafus.
The 2 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:
.gitignore | 64 ++++-----
lucene/CHANGES.txt | 3 +
.../simpletext/SimpleTextFieldInfosFormat.java | 16 +--
.../codecs/simpletext/SimpleTextVectorReader.java | 14 +-
.../codecs/simpletext/SimpleTextVectorWriter.java | 2 +-
.../codecs/uniformsplit/TestBlockWriter.java | 2 +-
.../sharedterms/TestSTBlockReader.java | 2 +-
.../org/apache/lucene/codecs/VectorWriter.java | 20 +--
.../codecs/lucene50/Lucene50FieldInfosFormat.java | 2 +-
.../codecs/lucene60/Lucene60FieldInfosFormat.java | 2 +-
.../codecs/lucene90/Lucene90FieldInfosFormat.java | 15 +-
.../codecs/lucene90/Lucene90VectorReader.java | 24 ++--
.../codecs/lucene90/Lucene90VectorWriter.java | 2 +-
.../java/org/apache/lucene/document/FieldType.java | 12 +-
.../org/apache/lucene/document/VectorField.java | 26 ++--
.../lucene/index/ExitableDirectoryReader.java | 26 ++--
.../java/org/apache/lucene/index/FieldInfo.java | 28 ++--
.../java/org/apache/lucene/index/FieldInfos.java | 38 ++---
.../java/org/apache/lucene/index/IndexWriter.java | 6 +-
.../apache/lucene/index/IndexableFieldType.java | 4 +-
.../org/apache/lucene/index/IndexingChain.java | 6 +-
.../org/apache/lucene/index/ReadersAndUpdates.java | 2 +-
.../java/org/apache/lucene/index/VectorValues.java | 109 +++------------
.../apache/lucene/index/VectorValuesWriter.java | 20 +--
.../java/org/apache/lucene/util/VectorUtil.java | 74 ++++++++++
.../lucene/index/TestExitableDirectoryReader.java | 75 ++++++++--
.../apache/lucene/index/TestIndexableField.java | 4 +-
.../lucene/index/TestPendingSoftDeletes.java | 2 +-
.../org/apache/lucene/index/TestVectorValues.java | 154 +++++++++++----------
.../org/apache/lucene/util/TestVectorUtil.java | 83 +++++++++++
.../search/highlight/TermVectorLeafReader.java | 2 +-
.../apache/lucene/index/memory/MemoryIndex.java | 4 +-
.../lucene/index/BaseIndexFileFormatTestCase.java | 2 +-
.../apache/lucene/index/MismatchedLeafReader.java | 2 +-
.../apache/lucene/index/RandomPostingsTester.java | 4 +-
solr/.gitignore | 5 +-
solr/CHANGES.txt | 25 ++++
.../java/org/apache/solr/cloud/ZkController.java | 37 ++++-
.../solr/cluster/events/impl/package-info.java | 4 +-
.../java/org/apache/solr/core/CoreContainer.java | 22 +++
.../java/org/apache/solr/schema/SchemaField.java | 4 +-
.../solr/search/CollapsingQParserPlugin.java | 2 +-
.../src/java/org/apache/solr/search/Insanity.java | 2 +-
.../java/org/apache/solr/servlet/HttpSolrCall.java | 67 +++++----
.../apache/solr/uninverting/UninvertingReader.java | 2 +-
.../java/org/apache/solr/update/SolrCoreState.java | 75 +++++++++-
...Test.java => TestConfigSetsAPIShareSchema.java} | 2 +-
.../solr/search/facet/TestJsonFacetRefinement.java | 12 +-
.../apache/solr/search/facet/TestJsonFacets.java | 6 +-
.../solr/search/facet/TestJsonRangeFacets.java | 10 +-
solr/docker/build.gradle | 20 ++-
solr/solr-ref-guide/src/configsets-api.adoc | 14 ++
solr/solr-ref-guide/src/distributed-requests.adoc | 4 +-
solr/solr-ref-guide/src/solr-upgrade-notes.adoc | 8 +-
54 files changed, 746 insertions(+), 426 deletions(-)
create mode 100644 lucene/core/src/java/org/apache/lucene/util/VectorUtil.java
create mode 100644 lucene/core/src/test/org/apache/lucene/util/TestVectorUtil.java
rename solr/core/src/test/org/apache/solr/cloud/{ConfigSetsAPITest.java => TestConfigSetsAPIShareSchema.java} (98%)
[lucene-solr] 01/02: Merge branch 'master' into jira/solr-14749-api
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-14749-api
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 1bb91ff3d32565b93faf3c6e209aafd84a262be2
Merge: 738b302 4bf2541
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Mon Oct 26 12:32:35 2020 +0100
Merge branch 'master' into jira/solr-14749-api
.gitignore | 64 ++++-----
lucene/CHANGES.txt | 3 +
.../simpletext/SimpleTextFieldInfosFormat.java | 16 +--
.../codecs/simpletext/SimpleTextVectorReader.java | 14 +-
.../codecs/simpletext/SimpleTextVectorWriter.java | 2 +-
.../codecs/uniformsplit/TestBlockWriter.java | 2 +-
.../sharedterms/TestSTBlockReader.java | 2 +-
.../org/apache/lucene/codecs/VectorWriter.java | 20 +--
.../codecs/lucene50/Lucene50FieldInfosFormat.java | 2 +-
.../codecs/lucene60/Lucene60FieldInfosFormat.java | 2 +-
.../codecs/lucene90/Lucene90FieldInfosFormat.java | 15 +-
.../codecs/lucene90/Lucene90VectorReader.java | 24 ++--
.../codecs/lucene90/Lucene90VectorWriter.java | 2 +-
.../java/org/apache/lucene/document/FieldType.java | 12 +-
.../org/apache/lucene/document/VectorField.java | 26 ++--
.../lucene/index/ExitableDirectoryReader.java | 26 ++--
.../java/org/apache/lucene/index/FieldInfo.java | 28 ++--
.../java/org/apache/lucene/index/FieldInfos.java | 38 ++---
.../java/org/apache/lucene/index/IndexWriter.java | 6 +-
.../apache/lucene/index/IndexableFieldType.java | 4 +-
.../org/apache/lucene/index/IndexingChain.java | 6 +-
.../org/apache/lucene/index/ReadersAndUpdates.java | 2 +-
.../java/org/apache/lucene/index/VectorValues.java | 109 +++------------
.../apache/lucene/index/VectorValuesWriter.java | 20 +--
.../java/org/apache/lucene/util/VectorUtil.java | 74 ++++++++++
.../lucene/index/TestExitableDirectoryReader.java | 75 ++++++++--
.../apache/lucene/index/TestIndexableField.java | 4 +-
.../lucene/index/TestPendingSoftDeletes.java | 2 +-
.../org/apache/lucene/index/TestVectorValues.java | 154 +++++++++++----------
.../org/apache/lucene/util/TestVectorUtil.java | 83 +++++++++++
.../search/highlight/TermVectorLeafReader.java | 2 +-
.../apache/lucene/index/memory/MemoryIndex.java | 4 +-
.../lucene/index/BaseIndexFileFormatTestCase.java | 2 +-
.../apache/lucene/index/MismatchedLeafReader.java | 2 +-
.../apache/lucene/index/RandomPostingsTester.java | 4 +-
solr/.gitignore | 5 +-
solr/CHANGES.txt | 25 ++++
.../java/org/apache/solr/cloud/ZkController.java | 37 ++++-
.../solr/cluster/events/impl/package-info.java | 7 +-
.../org/apache/solr/core/ClusterSingletons.java | 6 +-
.../java/org/apache/solr/core/CoreContainer.java | 35 +++--
.../java/org/apache/solr/schema/SchemaField.java | 4 +-
.../solr/search/CollapsingQParserPlugin.java | 2 +-
.../src/java/org/apache/solr/search/Insanity.java | 2 +-
.../java/org/apache/solr/servlet/HttpSolrCall.java | 67 +++++----
.../apache/solr/uninverting/UninvertingReader.java | 2 +-
.../java/org/apache/solr/update/SolrCoreState.java | 75 +++++++++-
...Test.java => TestConfigSetsAPIShareSchema.java} | 2 +-
.../solr/search/facet/TestJsonFacetRefinement.java | 12 +-
.../apache/solr/search/facet/TestJsonFacets.java | 6 +-
.../solr/search/facet/TestJsonRangeFacets.java | 10 +-
solr/docker/build.gradle | 20 ++-
solr/solr-ref-guide/src/configsets-api.adoc | 14 ++
solr/solr-ref-guide/src/distributed-requests.adoc | 4 +-
solr/solr-ref-guide/src/solr-upgrade-notes.adoc | 8 +-
55 files changed, 748 insertions(+), 446 deletions(-)
diff --cc solr/core/src/java/org/apache/solr/cluster/events/impl/package-info.java
index 2c115b6,0000000..4eb6bf6
mode 100644,000000..100644
--- a/solr/core/src/java/org/apache/solr/cluster/events/impl/package-info.java
+++ b/solr/core/src/java/org/apache/solr/cluster/events/impl/package-info.java
@@@ -1,23 -1,0 +1,18 @@@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
-
- /**
- * Default implementation of {@link org.apache.solr.cluster.events.ClusterEventProducer}.
- */
- package org.apache.solr.cluster.events.impl;
-
+
++description = 'Lucene HTML documentation'
[lucene-solr] 02/02: SOLR-14749: Fix some merge snafus.
Posted by ab...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
ab pushed a commit to branch jira/solr-14749-api
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 4e89ad26e6412b3943b683f25d07bc7fa56ad4e5
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Mon Oct 26 12:49:19 2020 +0100
SOLR-14749: Fix some merge snafus.
---
.../org/apache/solr/cluster/events/impl/package-info.java | 7 ++++++-
.../src/java/org/apache/solr/core/ClusterSingletons.java | 6 +++---
solr/core/src/java/org/apache/solr/core/CoreContainer.java | 13 +++++++++++++
3 files changed, 22 insertions(+), 4 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/cluster/events/impl/package-info.java b/solr/core/src/java/org/apache/solr/cluster/events/impl/package-info.java
index 4eb6bf6..fc00246 100644
--- a/solr/core/src/java/org/apache/solr/cluster/events/impl/package-info.java
+++ b/solr/core/src/java/org/apache/solr/cluster/events/impl/package-info.java
@@ -15,4 +15,9 @@
* limitations under the License.
*/
-description = 'Lucene HTML documentation'
+/**
+ * Default implementation of {@link org.apache.solr.cluster.events.ClusterEventProducer}.
+ */
+package org.apache.solr.cluster.events.impl;
+
+
diff --git a/solr/core/src/java/org/apache/solr/core/ClusterSingletons.java b/solr/core/src/java/org/apache/solr/core/ClusterSingletons.java
index 84acb4f..0487540 100644
--- a/solr/core/src/java/org/apache/solr/core/ClusterSingletons.java
+++ b/solr/core/src/java/org/apache/solr/core/ClusterSingletons.java
@@ -151,9 +151,6 @@ public class ClusterSingletons {
*/
public void startClusterSingletons() {
final Runnable initializer = () -> {
- if (!runSingletons.get()) {
- return;
- }
try {
waitUntilReady(DEFAULT_WAIT_TIMEOUT_SEC, TimeUnit.SECONDS);
} catch (InterruptedException e) {
@@ -163,6 +160,9 @@ public class ClusterSingletons {
log.warn("Timed out during initialization of ClusterSingleton-s (waited {} sec)", DEFAULT_WAIT_TIMEOUT_SEC);
return;
}
+ if (!runSingletons.get()) {
+ return;
+ }
singletonMap.forEach((name, singleton) -> {
if (!runSingletons.get()) {
return;
diff --git a/solr/core/src/java/org/apache/solr/core/CoreContainer.java b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
index 0a92a4e..40d6ab3 100644
--- a/solr/core/src/java/org/apache/solr/core/CoreContainer.java
+++ b/solr/core/src/java/org/apache/solr/core/CoreContainer.java
@@ -253,6 +253,11 @@ public class CoreContainer {
getZkController().getOverseer() != null &&
!getZkController().getOverseer().isClosed(),
(r) -> this.runAsync(r));
+
+ private final ClusterEventProducerFactory clusterEventProducerFactory = new ClusterEventProducerFactory(this);
+ // initially these are the same to collect the plugin-based listeners during init
+ private ClusterEventProducer clusterEventProducer = clusterEventProducerFactory;
+
private PackageStoreAPI packageStoreAPI;
private PackageLoader packageLoader;
@@ -672,6 +677,7 @@ public class CoreContainer {
}
customContainerPlugins.registerListener(clusterSingletons.getPluginRegistryListener());
+ customContainerPlugins.registerListener(clusterEventProducerFactory.getPluginRegistryListener());
packageStoreAPI = new PackageStoreAPI(this);
containerHandlers.getApiBag().registerObject(packageStoreAPI.readAPI);
@@ -887,6 +893,9 @@ public class CoreContainer {
containerHandlers.getApiBag().registerObject(containerPluginsApi.readAPI);
containerHandlers.getApiBag().registerObject(containerPluginsApi.editAPI);
+ // create target ClusterEventProducer (possibly from plugins)
+ clusterEventProducer = clusterEventProducerFactory.create(customContainerPlugins);
+
// init ClusterSingleton-s
// register the handlers that are also ClusterSingleton
@@ -2127,6 +2136,10 @@ public class CoreContainer {
return clusterSingletons;
}
+ public ClusterEventProducer getClusterEventProducer() {
+ return clusterEventProducer;
+ }
+
static {
ExecutorUtil.addThreadLocalProvider(SolrRequestInfo.getInheritableThreadLocalProvider());
}