You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by ho...@apache.org on 2017/05/08 19:04:38 UTC
[1/4] lucene-solr:jira/solr-10290: Fix some duplicate anchors that
were breaking check-links-and-anchors
Repository: lucene-solr
Updated Branches:
refs/heads/jira/solr-10290 3de6709c9 -> 2953940d2
Fix some duplicate anchors that were breaking check-links-and-anchors
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/58c717cf
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/58c717cf
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/58c717cf
Branch: refs/heads/jira/solr-10290
Commit: 58c717cfe40e9f8b575d782210d624a5726f112a
Parents: 3de6709
Author: Chris Hostetter <ho...@apache.org>
Authored: Mon May 8 11:34:12 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Mon May 8 11:34:12 2017 -0700
----------------------------------------------------------------------
solr/solr-ref-guide/src/cross-data-center-replication-cdcr-.adoc | 2 +-
solr/solr-ref-guide/src/making-and-restoring-backups.adoc | 2 +-
solr/solr-ref-guide/src/metrics-reporting.adoc | 2 +-
solr/solr-ref-guide/src/post-tool.adoc | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/58c717cf/solr/solr-ref-guide/src/cross-data-center-replication-cdcr-.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/cross-data-center-replication-cdcr-.adoc b/solr/solr-ref-guide/src/cross-data-center-replication-cdcr-.adoc
index 72af0ad..77eff1d 100644
--- a/solr/solr-ref-guide/src/cross-data-center-replication-cdcr-.adoc
+++ b/solr/solr-ref-guide/src/cross-data-center-replication-cdcr-.adoc
@@ -324,7 +324,7 @@ Currently, none of the CDCR API calls have parameters.
The current state of the CDCR, which includes the state of the replication process and the state of the buffer.
-===== Examples
+===== [[cdcr_examples]]Examples
*Input*
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/58c717cf/solr/solr-ref-guide/src/making-and-restoring-backups.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/making-and-restoring-backups.adoc b/solr/solr-ref-guide/src/making-and-restoring-backups.adoc
index 9fea23d..75446ee 100644
--- a/solr/solr-ref-guide/src/making-and-restoring-backups.adoc
+++ b/solr/solr-ref-guide/src/making-and-restoring-backups.adoc
@@ -6,7 +6,7 @@ If you are worried about data loss, and of course you _should_ be, you need a wa
Solr provides two approaches to backing up and restoring Solr cores or collections, depending on how you are running Solr. If you run in SolrCloud mode, you will use the Collections API. If you run Solr in standalone mode, you will use the replication handler.
-== SolrCloud
+== [[cloud-backups]]SolrCloud
Support for backups when running SolrCloud is provided with the <<collections-api.adoc#collections-api,Collections API>>. This allows the backups to be generated across multiple shards, and restored to the same number of shards and replicas as the original collection.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/58c717cf/solr/solr-ref-guide/src/metrics-reporting.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/metrics-reporting.adoc b/solr/solr-ref-guide/src/metrics-reporting.adoc
index a5c0034..f4299d2 100644
--- a/solr/solr-ref-guide/src/metrics-reporting.adoc
+++ b/solr/solr-ref-guide/src/metrics-reporting.adoc
@@ -252,7 +252,7 @@ A few query parameters are available to limit the request:
Like other request handlers, the Metrics API can also take the `wt` parameter to define the output format.
-=== Examples
+=== [[metrics_examples]]Examples
Request only "counter" type metrics in the "core" group, returned in JSON:
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/58c717cf/solr/solr-ref-guide/src/post-tool.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/post-tool.adoc b/solr/solr-ref-guide/src/post-tool.adoc
index d026eec..9e6785b 100644
--- a/solr/solr-ref-guide/src/post-tool.adoc
+++ b/solr/solr-ref-guide/src/post-tool.adoc
@@ -58,7 +58,7 @@ OPTIONS
...
----
-== Examples
+== [[bin_post_examples]]Examples
There are several ways to use `bin/post`. This section presents several examples.
[4/4] lucene-solr:jira/solr-10290: auto check links anytime html site
is built
Posted by ho...@apache.org.
auto check links anytime html site is built
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/2953940d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/2953940d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/2953940d
Branch: refs/heads/jira/solr-10290
Commit: 2953940d2670fc4fad37d1c91ce30fcc2ec12b36
Parents: de663b5
Author: Chris Hostetter <ho...@apache.org>
Authored: Mon May 8 12:04:29 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Mon May 8 12:04:29 2017 -0700
----------------------------------------------------------------------
solr/solr-ref-guide/build.xml | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/2953940d/solr/solr-ref-guide/build.xml
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/build.xml b/solr/solr-ref-guide/build.xml
index 98a69bc..a23bac85 100644
--- a/solr/solr-ref-guide/build.xml
+++ b/solr/solr-ref-guide/build.xml
@@ -181,13 +181,17 @@
Builds site with Jekyll.
This (for now) assumes that Jekyll (http://jekyllrb.com) is installed locally. -->
<target name="build-site"
+ depends="-build-site,check-links-and-anchors"
+ description="Builds an HTML Site w/Jekyll and verifies the anchors+links are valid" >
+ <echo>Ready to browse site: ${build.dir}/html-site/${main-page}.html</echo>
+ </target>
+ <target name="-build-site"
depends="build-init,build-nav-data-files"
description="Builds an HTML Site w/Jekyll">
<echo>Running Jekyll...</echo>
<exec executable="jekyll" dir="${build.content.dir}">
<arg value="build"/>
</exec>
- <echo>Ready to browse site: ${build.dir}/html-site/${main-page}.html</echo>
</target>
<target name="default"
[2/4] lucene-solr:jira/solr-10290: Fix link checker to accept some
absolute URLs that aren't valid URIs
Posted by ho...@apache.org.
Fix link checker to accept some absolute URLs that aren't valid URIs
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/0bfa433d
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/0bfa433d
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/0bfa433d
Branch: refs/heads/jira/solr-10290
Commit: 0bfa433d7ac1b0166069986e971588b2095b9d2d
Parents: 58c717c
Author: Chris Hostetter <ho...@apache.org>
Authored: Mon May 8 11:54:24 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Mon May 8 11:54:24 2017 -0700
----------------------------------------------------------------------
.../tools/CheckLinksAndAnchors.java | 21 ++++++++++++++++----
1 file changed, 17 insertions(+), 4 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/0bfa433d/solr/solr-ref-guide/tools/CheckLinksAndAnchors.java
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/tools/CheckLinksAndAnchors.java b/solr/solr-ref-guide/tools/CheckLinksAndAnchors.java
index 08119fa..6ed7aa4 100644
--- a/solr/solr-ref-guide/tools/CheckLinksAndAnchors.java
+++ b/solr/solr-ref-guide/tools/CheckLinksAndAnchors.java
@@ -2,6 +2,8 @@
import java.io.*;
import java.net.URI;
import java.net.URISyntaxException;
+import java.net.URL;
+import java.net.MalformedURLException;
import java.nio.file.Files;
import java.util.Arrays;
import java.util.ArrayList;
@@ -118,10 +120,21 @@ public class CheckLinksAndAnchors {
System.err.println(file.toURI().toString() + " contains relative link w/o an '#anchor': " + href);
}
}
- } catch (URISyntaxException ex) {
- problems++;
- System.err.println(file.toURI().toString() + " contains link w/ invalid syntax: " + href);
- System.err.println(" ... " + ex.toString());
+ } catch (URISyntaxException uri_ex) {
+ // before reporting a problem, see if it can be parsed as a valid (absolute) URL
+ // some solr examples URLs have characters that aren't legal URI characters
+ // Example: "ipod^3.0", "foo:[*+TO+*]", etc...
+ boolean href_is_valid_absolute_url = false;
+ try {
+ // if this isn't absolute, it will fail
+ final URL ignored = new URL(href);
+ href_is_valid_absolute_url = true;
+ } catch (MalformedURLException url_ex) {
+ problems++;
+ System.err.println(file.toURI().toString() + " contains link w/ invalid syntax: " + href);
+ System.err.println(" ... as URI: " + uri_ex.toString());
+ System.err.println(" ... as URL: " + url_ex.toString());
+ }
}
}
}
[3/4] lucene-solr:jira/solr-10290: fix anchor/link combo
Posted by ho...@apache.org.
fix anchor/link combo
Project: http://git-wip-us.apache.org/repos/asf/lucene-solr/repo
Commit: http://git-wip-us.apache.org/repos/asf/lucene-solr/commit/de663b5f
Tree: http://git-wip-us.apache.org/repos/asf/lucene-solr/tree/de663b5f
Diff: http://git-wip-us.apache.org/repos/asf/lucene-solr/diff/de663b5f
Branch: refs/heads/jira/solr-10290
Commit: de663b5f98c8c7a37ef0ab4c570e46f990cd1938
Parents: 0bfa433
Author: Chris Hostetter <ho...@apache.org>
Authored: Mon May 8 12:01:44 2017 -0700
Committer: Chris Hostetter <ho...@apache.org>
Committed: Mon May 8 12:01:44 2017 -0700
----------------------------------------------------------------------
solr/solr-ref-guide/src/filter-descriptions.adoc | 1 -
solr/solr-ref-guide/src/other-parsers.adoc | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/de663b5f/solr/solr-ref-guide/src/filter-descriptions.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/filter-descriptions.adoc b/solr/solr-ref-guide/src/filter-descriptions.adoc
index c78e1c0..fa28f93 100644
--- a/solr/solr-ref-guide/src/filter-descriptions.adoc
+++ b/solr/solr-ref-guide/src/filter-descriptions.adoc
@@ -1150,7 +1150,6 @@ When used in the following configuration:
*Out:* "Watch"(1) "Television"(2) "TV"(2)
-[[FilterDescriptions-ReversedWildcardFilter]]
== Reversed Wildcard Filter
This filter reverses tokens to provide faster leading wildcard and prefix queries. Tokens without wildcards are not reversed.
http://git-wip-us.apache.org/repos/asf/lucene-solr/blob/de663b5f/solr/solr-ref-guide/src/other-parsers.adoc
----------------------------------------------------------------------
diff --git a/solr/solr-ref-guide/src/other-parsers.adoc b/solr/solr-ref-guide/src/other-parsers.adoc
index 98b712d..b7be640 100644
--- a/solr/solr-ref-guide/src/other-parsers.adoc
+++ b/solr/solr-ref-guide/src/other-parsers.adoc
@@ -193,7 +193,7 @@ A mix of ordered and unordered complex phrase queries:
Performance is sensitive to the number of unique terms that are associated with a pattern. For instance, searching for "a*" will form a large OR clause (technically a SpanOr with many terms) for all of the terms in your index for the indicated field that start with the single letter 'a'. It may be prudent to restrict wildcards to at least two or preferably three letters as a prefix. Allowing very short prefixes may result in to many low-quality documents being returned.
-Notice that it also supports leading wildcards "*a" as well with consequent performance implications. Applying <<filter-descriptions.adoc#Reversed Wildcard Filter,ReversedWildcardFilterFactory>> in index-time analysis is usually a good idea.
+Notice that it also supports leading wildcards "*a" as well with consequent performance implications. Applying <<filter-descriptions.adoc#reversed-wildcard-filter,ReversedWildcardFilterFactory>> in index-time analysis is usually a good idea.
[[OtherParsers-MaxBooleanClauses]]
==== MaxBooleanClauses