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/13 13:00:19 UTC
[lucene-solr] branch jira/solr-14914 updated (aa69d71 -> 77ac8fb)
This is an automated email from the ASF dual-hosted git repository.
ab pushed a change to branch jira/solr-14914
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git.
from aa69d71 Merge branch 'master' into jira/solr-14914
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)
new 0d1327b Merge branch 'master' into jira/solr-14914
new 77ac8fb SOLR-14914: Add RefGuide docs for this option. Turn off metrics for most tests.
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 | 3 +
build.gradle | 4 +-
dev-tools/doap/lucene.rdf | 7 +
dev-tools/doap/solr.rdf | 7 +
dev-tools/scripts/README.md | 2 +-
dev-tools/scripts/addBackcompatIndexes.py | 5 +-
dev-tools/scripts/addVersion.py | 23 +-
dev-tools/scripts/buildAndPushRelease.py | 25 +-
dev-tools/scripts/releaseWizard.py | 5 +-
dev-tools/scripts/releaseWizard.yaml | 15 +-
dev-tools/scripts/scriptutil.py | 6 +-
dev-tools/scripts/smokeTestRelease.py | 27 +-
gradle/ant-compat/artifact-naming.gradle | 6 -
gradle/documentation/changes-to-html.gradle | 31 ++-
.../changes-to-html}/ChangesFancyStyle.css | 0
.../changes-to-html}/ChangesFixedWidthStyle.css | 0
.../changes-to-html}/ChangesSimpleStyle.css | 0
.../documentation/changes-to-html}/changes2html.pl | 0
gradle/documentation/documentation.gradle | 89 +++++--
gradle/documentation/markdown.gradle | 31 +--
gradle/ide/intellij-idea.gradle | 16 --
gradle/releasing.gradle | 55 ++++
gradle/validation/check-broken-links.gradle | 6 +-
gradle/validation/jar-checks.gradle | 5 +-
lucene/CHANGES.txt | 10 +
lucene/MIGRATE.md | 19 +-
lucene/analysis/README.txt | 18 +-
.../ja/JapanesePartOfSpeechStopFilterFactory.java | 19 +-
.../TestJapanesePartOfSpeechStopFilterFactory.java | 17 ++
lucene/analysis/phonetic/src/java/overview.html | 2 +-
.../lucene/index/TestBackwardsCompatibility.java | 7 +-
.../org/apache/lucene/index/index.8.6.3-cfs.zip | Bin 0 -> 16419 bytes
.../org/apache/lucene/index/index.8.6.3-nocfs.zip | Bin 0 -> 16428 bytes
.../test/org/apache/lucene/index/sorted.8.6.3.zip | Bin 0 -> 141031 bytes
.../org/apache/lucene/benchmark/package-info.java | 2 +-
lucene/build.gradle | 2 +-
.../org/apache/lucene/analysis/package-info.java | 4 +-
.../lucene/index/DocumentsWriterFlushQueue.java | 4 +-
.../java/org/apache/lucene/index/IndexWriter.java | 5 +-
.../src/java/org/apache/lucene/util/Version.java | 7 +
lucene/core/src/java/overview.html | 6 +-
lucene/demo/src/java/overview.html | 2 +-
.../documentation/build.gradle | 1 +
.../src/assets}/lucene_green_300.gif | Bin
.../src/markdown}/index.template.md | 0
.../search/highlight/LimitTokenOffsetFilter.java | 2 +-
lucene/luke/build.gradle | 33 +--
lucene/packaging/build.gradle | 168 +++++++++++++
lucene/queryparser/build.gradle | 2 -
lucene/site/xsl/index.xsl | 117 ---------
lucene/version.properties | 10 -
settings.gradle | 3 +
solr/CHANGES.txt | 42 ++--
.../solr/prometheus/exporter/MetricsQuery.java | 2 +-
.../exporter/PrometheusExporterSettings.java | 2 +-
.../org/apache/solr/cloud/CloudDescriptor.java | 2 +-
.../java/org/apache/solr/core/CoreDescriptor.java | 2 +-
.../src/java/org/apache/solr/core/PluginInfo.java | 2 +-
.../src/java/org/apache/solr/core/SolrConfig.java | 2 +-
.../java/org/apache/solr/core/SolrXmlConfig.java | 4 +-
.../java/org/apache/solr/core/XmlConfigFile.java | 2 +-
.../solr/handler/admin/CoreAdminOperation.java | 2 +-
.../apache/solr/handler/admin/MetricsHandler.java | 16 +-
.../solr/handler/admin/MetricsHistoryHandler.java | 8 +-
.../handler/component/QueryElevationComponent.java | 4 +-
.../apache/solr/schema/FieldTypePluginLoader.java | 4 +-
.../java/org/apache/solr/schema/IndexSchema.java | 2 +-
.../java/org/apache/solr/search/CacheConfig.java | 4 +-
.../solr/servlet/cache/HttpCacheHeaderUtil.java | 7 +-
.../src/java/org/apache/solr/update/PeerSync.java | 30 ++-
.../solr/util/plugin/AbstractPluginLoader.java | 2 +-
.../apache/solr/util/plugin/MapPluginLoader.java | 2 +-
.../solr/util/plugin/NamedListPluginLoader.java | 2 +-
.../solr/cloud/MetricsHistoryIntegrationTest.java | 1 +
.../handler/admin/MetricsHistoryHandlerTest.java | 1 +
.../solr/schema/TestUseDocValuesAsStored.java | 2 +-
.../documentation/build.gradle | 1 +
.../images => documentation/src/assets}/solr.svg | 0
.../src/markdown}/SYSTEM_REQUIREMENTS.md | 0
.../src/markdown}/index.template.md | 2 +-
.../src/markdown}/online-link.template.md | 4 +-
solr/packaging/build.gradle | 20 +-
solr/site/assets/images/favicon.ico | Bin 3262 -> 0 bytes
.../images/quickstart-admin-ui-facet-options.png | Bin 10646 -> 0 bytes
.../site/assets/images/quickstart-query-screen.png | Bin 278938 -> 0 bytes
solr/site/assets/images/quickstart-range-facet.png | Bin 21592 -> 0 bytes
solr/site/assets/images/quickstart-solrcloud.png | Bin 50418 -> 0 bytes
solr/site/assets/images/quickstart-spatial.png | Bin 229121 -> 0 bytes
solr/site/index.xsl | 112 ---------
solr/site/online-link.xsl | 69 -----
solr/solr-ref-guide/build.gradle | 280 ++++++++++++---------
solr/solr-ref-guide/src/_config.yml.template | 2 +-
.../authentication-and-authorization-plugins.adoc | 2 +-
.../src/basic-authentication-plugin.adoc | 2 +-
solr/solr-ref-guide/src/codec-factory.adoc | 4 +-
.../src/common-query-parameters.adoc | 2 +-
...datadir-and-directoryfactory-in-solrconfig.adoc | 6 +-
.../src/documents-fields-and-schema-design.adoc | 2 +
solr/solr-ref-guide/src/exporting-result-sets.adoc | 2 +-
solr/solr-ref-guide/src/faceting.adoc | 2 +-
.../src/field-types-included-with-solr.adoc | 6 +-
solr/solr-ref-guide/src/filter-descriptions.adoc | 4 +-
.../src/hadoop-authentication-plugin.adoc | 2 +-
solr/solr-ref-guide/src/highlighting.adoc | 2 +-
.../src/implicit-requesthandlers.adoc | 58 ++---
solr/solr-ref-guide/src/index-replication.adoc | 2 +-
.../src/indexconfig-in-solrconfig.adoc | 17 +-
.../src/indexing-nested-documents.adoc | 10 +-
solr/solr-ref-guide/src/language-analysis.adoc | 2 +-
solr/solr-ref-guide/src/learning-to-rank.adoc | 50 ++--
solr/solr-ref-guide/src/luke-request-handler.adoc | 2 +-
.../src/major-changes-from-solr-5-to-solr-6.adoc | 2 +-
.../src/major-changes-in-solr-7.adoc | 2 +-
.../src/major-changes-in-solr-8.adoc | 8 +-
.../src/major-changes-in-solr-9.adoc | 2 +-
solr/solr-ref-guide/src/math-expressions.adoc | 3 +-
solr/solr-ref-guide/src/metrics-history.adoc | 3 +
solr/solr-ref-guide/src/metrics-reporting.adoc | 15 ++
solr/solr-ref-guide/src/other-parsers.adoc | 26 +-
solr/solr-ref-guide/src/other-schema-elements.adoc | 6 +-
solr/solr-ref-guide/src/query-re-ranking.adoc | 8 +-
.../src/query-syntax-and-parsing.adoc | 2 +-
...andlers-and-searchcomponents-in-solrconfig.adoc | 4 +-
solr/solr-ref-guide/src/schemaless-mode.adoc | 16 +-
.../src/searching-nested-documents.adoc | 42 ++--
.../src/shards-and-indexing-data-in-solrcloud.adoc | 6 +-
solr/solr-ref-guide/src/solr-field-types.adoc | 2 +-
solr/solr-ref-guide/src/solr-upgrade-notes.adoc | 94 ++++++-
...solrcloud-query-routing-and-read-tolerance.adoc | 2 +-
solr/solr-ref-guide/src/statistics.adoc | 4 +-
.../src/stream-decorator-reference.adoc | 4 +-
.../src/stream-source-reference.adoc | 2 +-
solr/solr-ref-guide/src/streaming-expressions.adoc | 8 +-
.../src/the-query-elevation-component.adoc | 9 +-
solr/solr-ref-guide/src/the-terms-component.adoc | 2 +-
.../src/update-request-processors.adoc | 106 ++++----
.../src/updating-parts-of-documents.adoc | 12 +-
solr/solr-ref-guide/src/using-solrj.adoc | 22 +-
solr/solr-ref-guide/src/vectorization.adoc | 8 +-
.../src/zookeeper-access-control.adoc | 6 +-
solr/solr-ref-guide/tools/BuildNavDataFiles.java | 1 -
.../solr-ref-guide/tools/CheckLinksAndAnchors.java | 11 -
.../java/org/apache/solr/common}/util/DOMUtil.java | 4 +-
.../apache/solr/common}/util/PropertiesUtil.java | 2 +-
.../org/apache/solr/common}/util/DOMUtilTest.java | 5 +-
.../apache/solr/cloud/MiniSolrCloudCluster.java | 2 +-
146 files changed, 1133 insertions(+), 960 deletions(-)
rename {lucene/site/changes => gradle/documentation/changes-to-html}/ChangesFancyStyle.css (100%)
rename {lucene/site/changes => gradle/documentation/changes-to-html}/ChangesFixedWidthStyle.css (100%)
rename {lucene/site/changes => gradle/documentation/changes-to-html}/ChangesSimpleStyle.css (100%)
rename {lucene/site/changes => gradle/documentation/changes-to-html}/changes2html.pl (100%)
mode change 100755 => 100644
create mode 100644 gradle/releasing.gradle
create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/index.8.6.3-cfs.zip
create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/index.8.6.3-nocfs.zip
create mode 100644 lucene/backward-codecs/src/test/org/apache/lucene/index/sorted.8.6.3.zip
copy dev-tools/missing-doclet/settings.gradle => lucene/documentation/build.gradle (95%)
rename lucene/{site/html => documentation/src/assets}/lucene_green_300.gif (100%)
rename lucene/{site/xsl => documentation/src/markdown}/index.template.md (100%)
create mode 100644 lucene/packaging/build.gradle
delete mode 100644 lucene/site/xsl/index.xsl
delete mode 100644 lucene/version.properties
copy dev-tools/missing-doclet/settings.gradle => solr/documentation/build.gradle (95%)
rename solr/{site/assets/images => documentation/src/assets}/solr.svg (100%)
rename solr/{site => documentation/src/markdown}/SYSTEM_REQUIREMENTS.md (100%)
rename solr/{site => documentation/src/markdown}/index.template.md (93%)
rename solr/{site => documentation/src/markdown}/online-link.template.md (76%)
delete mode 100644 solr/site/assets/images/favicon.ico
delete mode 100644 solr/site/assets/images/quickstart-admin-ui-facet-options.png
delete mode 100644 solr/site/assets/images/quickstart-query-screen.png
delete mode 100644 solr/site/assets/images/quickstart-range-facet.png
delete mode 100644 solr/site/assets/images/quickstart-solrcloud.png
delete mode 100644 solr/site/assets/images/quickstart-spatial.png
delete mode 100644 solr/site/index.xsl
delete mode 100644 solr/site/online-link.xsl
rename solr/{core/src/java/org/apache/solr => solrj/src/java/org/apache/solr/common}/util/DOMUtil.java (99%)
rename solr/{core/src/java/org/apache/solr => solrj/src/java/org/apache/solr/common}/util/PropertiesUtil.java (99%)
rename solr/{core/src/test/org/apache/solr => solrj/src/test/org/apache/solr/common}/util/DOMUtilTest.java (95%)
[lucene-solr] 02/02: SOLR-14914: Add RefGuide docs for this option.
Turn off metrics for most tests.
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-14914
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 77ac8fb87d272c3ea325910ddeed38612f554dfe
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Tue Oct 13 14:59:29 2020 +0200
SOLR-14914: Add RefGuide docs for this option. Turn off metrics for most tests.
---
.../org/apache/solr/handler/admin/MetricsHandler.java | 16 ++++++++++------
.../apache/solr/handler/admin/MetricsHistoryHandler.java | 8 +++++++-
.../apache/solr/cloud/MetricsHistoryIntegrationTest.java | 1 +
.../solr/handler/admin/MetricsHistoryHandlerTest.java | 1 +
solr/solr-ref-guide/src/metrics-history.adoc | 3 +++
solr/solr-ref-guide/src/metrics-reporting.adoc | 15 +++++++++++++++
.../java/org/apache/solr/cloud/MiniSolrCloudCluster.java | 2 +-
7 files changed, 38 insertions(+), 8 deletions(-)
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java
index b63a752..d3b5cb9 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/MetricsHandler.java
@@ -71,20 +71,24 @@ public class MetricsHandler extends RequestHandlerBase implements PermissionName
public static final String ALL = "all";
private static final Pattern KEY_REGEX = Pattern.compile("(?<!" + Pattern.quote("\\") + ")" + Pattern.quote(":"));
- private CoreContainer cc;
+ private final CoreContainer cc;
private final Map<String, String> injectedSysProps = CommonTestInjection.injectAdditionalProps();
-
- public MetricsHandler() {
- this.metricManager = null;
- }
+ private final boolean enabled;
public MetricsHandler(CoreContainer coreContainer) {
this.metricManager = coreContainer.getMetricManager();
this.cc = coreContainer;
+ this.enabled = coreContainer.getConfig().getMetricsConfig().isEnabled();
}
public MetricsHandler(SolrMetricManager metricManager) {
this.metricManager = metricManager;
+ this.cc = null;
+ this.enabled = true;
+ }
+
+ public boolean isEnabled() {
+ return enabled;
}
@Override
@@ -107,7 +111,7 @@ public class MetricsHandler extends RequestHandlerBase implements PermissionName
@SuppressWarnings({"unchecked"})
public void handleRequest(SolrParams params, BiConsumer<String, Object> consumer) throws Exception {
- if (!cc.getNodeConfig().getMetricsConfig().isEnabled()) {
+ if (!enabled) {
consumer.accept("error", "metrics collection is disabled");
return;
}
diff --git a/solr/core/src/java/org/apache/solr/handler/admin/MetricsHistoryHandler.java b/solr/core/src/java/org/apache/solr/handler/admin/MetricsHistoryHandler.java
index 56c4003..35c89b1 100644
--- a/solr/core/src/java/org/apache/solr/handler/admin/MetricsHistoryHandler.java
+++ b/solr/core/src/java/org/apache/solr/handler/admin/MetricsHistoryHandler.java
@@ -196,7 +196,9 @@ public class MetricsHistoryHandler extends RequestHandlerBase implements Permiss
}
this.nodeName = nodeName;
- this.enable = Boolean.parseBoolean(String.valueOf(args.getOrDefault(ENABLE_PROP, "true")));
+ // disable when metrics reporting is disabled
+ this.enable = Boolean.parseBoolean(String.valueOf(args.getOrDefault(ENABLE_PROP, "true")))
+ && metricsHandler.isEnabled();
// default to false - don't collect local per-replica metrics
this.enableReplicas = Boolean.parseBoolean(String.valueOf(args.getOrDefault(ENABLE_REPLICAS_PROP, "false")));
this.enableNodes = Boolean.parseBoolean(String.valueOf(args.getOrDefault(ENABLE_NODES_PROP, "false")));
@@ -699,6 +701,10 @@ public class MetricsHistoryHandler extends RequestHandlerBase implements Permiss
@Override
public void handleRequestBody(SolrQueryRequest req, SolrQueryResponse rsp) throws Exception {
+ if (!enable) {
+ rsp.add("error", "metrics collection is disabled");
+ return;
+ }
String actionStr = req.getParams().get(CommonParams.ACTION);
if (actionStr == null) {
throw new SolrException(SolrException.ErrorCode.BAD_REQUEST, "'action' is a required param");
diff --git a/solr/core/src/test/org/apache/solr/cloud/MetricsHistoryIntegrationTest.java b/solr/core/src/test/org/apache/solr/cloud/MetricsHistoryIntegrationTest.java
index 897f060..1a685d6 100644
--- a/solr/core/src/test/org/apache/solr/cloud/MetricsHistoryIntegrationTest.java
+++ b/solr/core/src/test/org/apache/solr/cloud/MetricsHistoryIntegrationTest.java
@@ -59,6 +59,7 @@ public class MetricsHistoryIntegrationTest extends SolrCloudTestCase {
@BeforeClass
public static void setupCluster() throws Exception {
+ System.setProperty("metricsEnabled", "true");
configureCluster(1)
.addConfig("conf", configset("cloud-minimal"))
.configure();
diff --git a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHistoryHandlerTest.java b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHistoryHandlerTest.java
index 2c2ce88..ea536be 100644
--- a/solr/core/src/test/org/apache/solr/handler/admin/MetricsHistoryHandlerTest.java
+++ b/solr/core/src/test/org/apache/solr/handler/admin/MetricsHistoryHandlerTest.java
@@ -58,6 +58,7 @@ public class MetricsHistoryHandlerTest extends SolrCloudTestCase {
@BeforeClass
public static void beforeClass() throws Exception {
+ System.setProperty("metricsEnabled", "true");
Map<String, Object> args = new HashMap<>();
args.put(MetricsHistoryHandler.SYNC_PERIOD_PROP, 1);
args.put(MetricsHistoryHandler.COLLECT_PERIOD_PROP, 1);
diff --git a/solr/solr-ref-guide/src/metrics-history.adoc b/solr/solr-ref-guide/src/metrics-history.adoc
index 992a36f..640736c 100644
--- a/solr/solr-ref-guide/src/metrics-history.adoc
+++ b/solr/solr-ref-guide/src/metrics-history.adoc
@@ -121,6 +121,9 @@ The handler assumes that a simple aggregation (sum of partial metric values from
sufficient. This happens to make sense for the default built-in sets of metrics. Future extensions will
provide other aggregation strategies (such as, average, max, min, etc.).
+This handler is automatically disabled when metrics collection is disabled using the
+`<metrics enabled="false">` element in `solr.xml`.
+
== Metrics History Configuration
There are two ways to configure this subsystem:
diff --git a/solr/solr-ref-guide/src/metrics-reporting.adoc b/solr/solr-ref-guide/src/metrics-reporting.adoc
index b319bb2..0688255 100644
--- a/solr/solr-ref-guide/src/metrics-reporting.adoc
+++ b/solr/solr-ref-guide/src/metrics-reporting.adoc
@@ -87,6 +87,21 @@ The metrics available in your system can be customized by modifying the `<metric
TIP: See also the section <<format-of-solr-xml.adoc#format-of-solr-xml,Format of Solr.xml>> for more information about the `solr.xml` file, where to find it, and how to edit it.
+=== Disabling the metrics collection ===
+The `<metrics>` element in `solr.xml` supports one attribute `enabled`, which takes a boolean value,
+for example `<metrics enabled="true">`.
+
+The default value of this attribute is `true`, meaning that metrics are being collected, processed and
+reported by Solr according to the configured metric reporters. They are also available from the
+metrics and metrics history APIs.
+
+The `false` value of this attribute (`<metrics enabled="false">`) turns off metrics collection, processing,
+and the collection of metrics history. Internally, all metrics suppliers are replaced by singleton no-op
+implementations, which effectively removes nearly all overheads related to metrics collection.
+All reporter configurations are skipped, and the metrics
+and metrics history APIs stop reporting any metrics and only return an `<error>`
+element in their responses.
+
=== The <metrics> <hiddenSysProps> Element
This section of `solr.xml` allows you to define the system properties which are considered system-sensitive and should not be exposed via the Metrics API.
diff --git a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
index 9870a50..4af902b 100644
--- a/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
+++ b/solr/test-framework/src/java/org/apache/solr/cloud/MiniSolrCloudCluster.java
@@ -118,7 +118,7 @@ public class MiniSolrCloudCluster {
" <str name=\"pkiHandlerPrivateKeyPath\">${pkiHandlerPrivateKeyPath:cryptokeys/priv_key512_pkcs8.pem}</str> \n" +
" <str name=\"pkiHandlerPublicKeyPath\">${pkiHandlerPublicKeyPath:cryptokeys/pub_key512.der}</str> \n" +
" </solrcloud>\n" +
- " <metrics enabled=\"${metricsEnabled:true}\">\n" +
+ " <metrics enabled=\"${metricsEnabled:false}\">\n" +
" <reporter name=\"default\" class=\"org.apache.solr.metrics.reporters.SolrJmxReporter\">\n" +
" <str name=\"rootName\">solr_${hostPort:8983}</str>\n" +
" </reporter>\n" +
[lucene-solr] 01/02: Merge branch 'master' into jira/solr-14914
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-14914
in repository https://gitbox.apache.org/repos/asf/lucene-solr.git
commit 0d1327b8dfcbde8fa18234beb5513111f859b0c3
Merge: aa69d71 9594ab3
Author: Andrzej Bialecki <ab...@apache.org>
AuthorDate: Tue Oct 13 13:49:18 2020 +0200
Merge branch 'master' into jira/solr-14914
.gitignore | 3 +
build.gradle | 4 +-
dev-tools/doap/lucene.rdf | 7 +
dev-tools/doap/solr.rdf | 7 +
dev-tools/scripts/README.md | 2 +-
dev-tools/scripts/addBackcompatIndexes.py | 5 +-
dev-tools/scripts/addVersion.py | 23 +-
dev-tools/scripts/buildAndPushRelease.py | 25 +-
dev-tools/scripts/releaseWizard.py | 5 +-
dev-tools/scripts/releaseWizard.yaml | 15 +-
dev-tools/scripts/scriptutil.py | 6 +-
dev-tools/scripts/smokeTestRelease.py | 27 +-
gradle/ant-compat/artifact-naming.gradle | 6 -
gradle/documentation/changes-to-html.gradle | 31 ++-
.../changes-to-html}/ChangesFancyStyle.css | 0
.../changes-to-html}/ChangesFixedWidthStyle.css | 0
.../changes-to-html}/ChangesSimpleStyle.css | 0
.../documentation/changes-to-html}/changes2html.pl | 0
gradle/documentation/documentation.gradle | 89 +++++--
gradle/documentation/markdown.gradle | 31 +--
gradle/ide/intellij-idea.gradle | 16 --
gradle/releasing.gradle | 55 ++++
gradle/validation/check-broken-links.gradle | 6 +-
gradle/validation/jar-checks.gradle | 5 +-
lucene/CHANGES.txt | 10 +
lucene/MIGRATE.md | 19 +-
lucene/analysis/README.txt | 18 +-
.../ja/JapanesePartOfSpeechStopFilterFactory.java | 19 +-
.../TestJapanesePartOfSpeechStopFilterFactory.java | 17 ++
lucene/analysis/phonetic/src/java/overview.html | 2 +-
.../lucene/index/TestBackwardsCompatibility.java | 7 +-
.../org/apache/lucene/index/index.8.6.3-cfs.zip | Bin 0 -> 16419 bytes
.../org/apache/lucene/index/index.8.6.3-nocfs.zip | Bin 0 -> 16428 bytes
.../test/org/apache/lucene/index/sorted.8.6.3.zip | Bin 0 -> 141031 bytes
.../org/apache/lucene/benchmark/package-info.java | 2 +-
lucene/build.gradle | 2 +-
.../org/apache/lucene/analysis/package-info.java | 4 +-
.../lucene/index/DocumentsWriterFlushQueue.java | 4 +-
.../java/org/apache/lucene/index/IndexWriter.java | 5 +-
.../src/java/org/apache/lucene/util/Version.java | 7 +
lucene/core/src/java/overview.html | 6 +-
lucene/demo/src/java/overview.html | 2 +-
lucene/{ => documentation}/build.gradle | 6 +-
.../src/assets}/lucene_green_300.gif | Bin
.../src/markdown}/index.template.md | 0
.../search/highlight/LimitTokenOffsetFilter.java | 2 +-
lucene/luke/build.gradle | 33 +--
lucene/packaging/build.gradle | 168 +++++++++++++
lucene/queryparser/build.gradle | 2 -
lucene/site/xsl/index.xsl | 117 ---------
lucene/version.properties | 10 -
settings.gradle | 3 +
solr/CHANGES.txt | 42 ++--
.../solr/prometheus/exporter/MetricsQuery.java | 2 +-
.../exporter/PrometheusExporterSettings.java | 2 +-
.../org/apache/solr/cloud/CloudDescriptor.java | 2 +-
.../java/org/apache/solr/core/CoreDescriptor.java | 2 +-
.../src/java/org/apache/solr/core/PluginInfo.java | 2 +-
.../src/java/org/apache/solr/core/SolrConfig.java | 2 +-
.../java/org/apache/solr/core/SolrXmlConfig.java | 4 +-
.../java/org/apache/solr/core/XmlConfigFile.java | 2 +-
.../solr/handler/admin/CoreAdminOperation.java | 2 +-
.../handler/component/QueryElevationComponent.java | 4 +-
.../apache/solr/schema/FieldTypePluginLoader.java | 4 +-
.../java/org/apache/solr/schema/IndexSchema.java | 2 +-
.../java/org/apache/solr/search/CacheConfig.java | 4 +-
.../solr/servlet/cache/HttpCacheHeaderUtil.java | 7 +-
.../src/java/org/apache/solr/update/PeerSync.java | 30 ++-
.../solr/util/plugin/AbstractPluginLoader.java | 2 +-
.../apache/solr/util/plugin/MapPluginLoader.java | 2 +-
.../solr/util/plugin/NamedListPluginLoader.java | 2 +-
.../solr/schema/TestUseDocValuesAsStored.java | 2 +-
{lucene => solr/documentation}/build.gradle | 6 +-
.../images => documentation/src/assets}/solr.svg | 0
.../src/markdown}/SYSTEM_REQUIREMENTS.md | 0
.../src/markdown}/index.template.md | 2 +-
.../src/markdown}/online-link.template.md | 4 +-
solr/packaging/build.gradle | 20 +-
solr/site/assets/images/favicon.ico | Bin 3262 -> 0 bytes
.../images/quickstart-admin-ui-facet-options.png | Bin 10646 -> 0 bytes
.../site/assets/images/quickstart-query-screen.png | Bin 278938 -> 0 bytes
solr/site/assets/images/quickstart-range-facet.png | Bin 21592 -> 0 bytes
solr/site/assets/images/quickstart-solrcloud.png | Bin 50418 -> 0 bytes
solr/site/assets/images/quickstart-spatial.png | Bin 229121 -> 0 bytes
solr/site/index.xsl | 112 ---------
solr/site/online-link.xsl | 69 -----
solr/solr-ref-guide/build.gradle | 280 ++++++++++++---------
solr/solr-ref-guide/src/_config.yml.template | 2 +-
.../authentication-and-authorization-plugins.adoc | 2 +-
.../src/basic-authentication-plugin.adoc | 2 +-
solr/solr-ref-guide/src/codec-factory.adoc | 4 +-
.../src/common-query-parameters.adoc | 2 +-
...datadir-and-directoryfactory-in-solrconfig.adoc | 6 +-
.../src/documents-fields-and-schema-design.adoc | 2 +
solr/solr-ref-guide/src/exporting-result-sets.adoc | 2 +-
solr/solr-ref-guide/src/faceting.adoc | 2 +-
.../src/field-types-included-with-solr.adoc | 6 +-
solr/solr-ref-guide/src/filter-descriptions.adoc | 4 +-
.../src/hadoop-authentication-plugin.adoc | 2 +-
solr/solr-ref-guide/src/highlighting.adoc | 2 +-
.../src/implicit-requesthandlers.adoc | 58 ++---
solr/solr-ref-guide/src/index-replication.adoc | 2 +-
.../src/indexconfig-in-solrconfig.adoc | 17 +-
.../src/indexing-nested-documents.adoc | 10 +-
solr/solr-ref-guide/src/language-analysis.adoc | 2 +-
solr/solr-ref-guide/src/learning-to-rank.adoc | 50 ++--
solr/solr-ref-guide/src/luke-request-handler.adoc | 2 +-
.../src/major-changes-from-solr-5-to-solr-6.adoc | 2 +-
.../src/major-changes-in-solr-7.adoc | 2 +-
.../src/major-changes-in-solr-8.adoc | 8 +-
.../src/major-changes-in-solr-9.adoc | 2 +-
solr/solr-ref-guide/src/math-expressions.adoc | 3 +-
solr/solr-ref-guide/src/other-parsers.adoc | 26 +-
solr/solr-ref-guide/src/other-schema-elements.adoc | 6 +-
solr/solr-ref-guide/src/query-re-ranking.adoc | 8 +-
.../src/query-syntax-and-parsing.adoc | 2 +-
...andlers-and-searchcomponents-in-solrconfig.adoc | 4 +-
solr/solr-ref-guide/src/schemaless-mode.adoc | 16 +-
.../src/searching-nested-documents.adoc | 42 ++--
.../src/shards-and-indexing-data-in-solrcloud.adoc | 6 +-
solr/solr-ref-guide/src/solr-field-types.adoc | 2 +-
solr/solr-ref-guide/src/solr-upgrade-notes.adoc | 94 ++++++-
...solrcloud-query-routing-and-read-tolerance.adoc | 2 +-
solr/solr-ref-guide/src/statistics.adoc | 4 +-
.../src/stream-decorator-reference.adoc | 4 +-
.../src/stream-source-reference.adoc | 2 +-
solr/solr-ref-guide/src/streaming-expressions.adoc | 8 +-
.../src/the-query-elevation-component.adoc | 9 +-
solr/solr-ref-guide/src/the-terms-component.adoc | 2 +-
.../src/update-request-processors.adoc | 106 ++++----
.../src/updating-parts-of-documents.adoc | 12 +-
solr/solr-ref-guide/src/using-solrj.adoc | 22 +-
solr/solr-ref-guide/src/vectorization.adoc | 8 +-
.../src/zookeeper-access-control.adoc | 6 +-
solr/solr-ref-guide/tools/BuildNavDataFiles.java | 1 -
.../solr-ref-guide/tools/CheckLinksAndAnchors.java | 11 -
.../java/org/apache/solr/common}/util/DOMUtil.java | 4 +-
.../apache/solr/common}/util/PropertiesUtil.java | 2 +-
.../org/apache/solr/common}/util/DOMUtilTest.java | 5 +-
139 files changed, 1095 insertions(+), 962 deletions(-)