This is an automated email from the ASF dual-hosted git repository. dweiss pushed a commit to branch jira/solr-13105-toMerge in repository https://gitbox.apache.org/repos/asf/solr.git
commit 6af985f75ad89d0bb93103c4156a90713c43656e Author: Cassandra Targett <[email protected]> AuthorDate: Thu Jan 7 15:34:41 2021 -0600 Fix a some typos, parameter/field name formatting --- solr/solr-ref-guide/src/loading.adoc | 17 +++++++++++++ solr/solr-ref-guide/src/math-expressions.adoc | 4 +++ .../src/probability-distributions.adoc | 6 +++++ solr/solr-ref-guide/src/search-sample.adoc | 16 ++++++++++++ solr/solr-ref-guide/src/streaming-expressions.adoc | 29 ---------------------- 5 files changed, 43 insertions(+), 29 deletions(-) diff --git a/solr/solr-ref-guide/src/loading.adoc b/solr/solr-ref-guide/src/loading.adoc index 5c2db31..c2346a7 100644 --- a/solr/solr-ref-guide/src/loading.adoc +++ b/solr/solr-ref-guide/src/loading.adoc @@ -16,13 +16,24 @@ // specific language governing permissions and limitations // under the License. +<<<<<<< HEAD Streaming expressions has support for reading, parsing, transforming, visualizing and loading CSV and TSV formatted data. These functions are designed to cut down the time spent on data preparation and allow users to begin data exploration before the data is loaded into Solr. +======= +Streaming Expressions has support for reading, parsing, transforming, visualizing +and loading CSV and TSV formatted data. These functions are designed to cut down the +time spent on data preparation and allow users to begin data exploration before the data is +loaded into Solr. +>>>>>>> Fix a some typos, parameter/field name formatting == Reading Files The `cat` function can be used to read files under the *userfiles* directory in +<<<<<<< HEAD `$SOLR_HOME`. The `cat` function takes two parameters. +======= +$SOLR_HOME. The `cat` function takes two parameters. +>>>>>>> Fix a some typos, parameter/field name formatting The first parameter is a comma-delimited list of paths. If the path list contains directories, `cat` will crawl all the files in the directory and sub-directories. @@ -185,9 +196,15 @@ image::images/math-expressions/update.png[] == Transforming Data +<<<<<<< HEAD Streaming expressions and math expressions provide a powerful set of functions for transforming data. The section below shows some useful transformations that can be applied while analyzing, visualizing, and loading CSV and TSV files. +======= +Streaming Expressions and Math Expression provide a powerful set of functions +for transforming data. The section below shows some useful transformations that +can be applied while analyzing, visualizing, and loading CSV and TSV files. +>>>>>>> Fix a some typos, parameter/field name formatting === Unique IDs diff --git a/solr/solr-ref-guide/src/math-expressions.adoc b/solr/solr-ref-guide/src/math-expressions.adoc index 987c627..047998b 100644 --- a/solr/solr-ref-guide/src/math-expressions.adoc +++ b/solr/solr-ref-guide/src/math-expressions.adoc @@ -1,5 +1,9 @@ = Streaming Expressions and Math Expressions +<<<<<<< HEAD :page-children: visualization, math-start, loading, search-sample, transform, scalar-math, vector-math, variables, matrix-math, term-vectors, probability-distributions, statistics, regression, curve-fitting, time-series, numerical-analysis, dsp, simulations, machine-learning, computational-geometry, logs +======= +:page-children: visualization, math-start, loading, search-sample, transform, scalar-math, vector-math, variables, matrix-math, term-vectors, statistics, probability-distributions, simulations, time-series, regression, numerical-analysis, curve-fitting, dsp, machine-learning, computational-geometry, logs +>>>>>>> Fix a some typos, parameter/field name formatting :page-show-toc: false // Licensed to the Apache Software Foundation (ASF) under one diff --git a/solr/solr-ref-guide/src/probability-distributions.adoc b/solr/solr-ref-guide/src/probability-distributions.adoc index 85e4247..2fcfd44 100644 --- a/solr/solr-ref-guide/src/probability-distributions.adoc +++ b/solr/solr-ref-guide/src/probability-distributions.adoc @@ -37,8 +37,14 @@ are the supported continuous probability distributions. The `empiricalDistribution` function creates a continuous probability distribution from actual data. +<<<<<<< HEAD Empirical distributions can be used to conveniently visualize the probability density function of a random sample from a SolrCloud collection. The example below shows the `zplot` function visualizing the probability +======= +Empirical distributions can be used to conveniently visualize the probability density +function of a random sample from a SolrCloud +collection. The example below shows the zplot function visualizing the probability +>>>>>>> Fix a some typos, parameter/field name formatting density of a random sample with a 32 bin histogram. image::images/math-expressions/empirical.png[] diff --git a/solr/solr-ref-guide/src/search-sample.adoc b/solr/solr-ref-guide/src/search-sample.adoc index 2fd97bd..f0b3e7b 100644 --- a/solr/solr-ref-guide/src/search-sample.adoc +++ b/solr/solr-ref-guide/src/search-sample.adoc @@ -50,7 +50,11 @@ We have also limited the result set to three specific fields. image::images/math-expressions/search-sort.png[] Once the data is loaded into the table we can switch to a scatter plot and plot the `filesize_d` column +<<<<<<< HEAD on the *x-axis* and the `response_d` column on the *y-axis*. +======= +on the *x axis* and the `response_d` column on the *y axis*. +>>>>>>> Fix a some typos, parameter/field name formatting image::images/math-expressions/search-sort-plot.png[] @@ -84,11 +88,19 @@ and <<machine-learning.adoc,Machine Learning>> sections. In the example below the `random` function is called in its simplest form with just a collection name as the parameter. When called with no other parameters the `random` function returns a random sample of 500 records with all fields from the collection. +<<<<<<< HEAD When called without the field list parameter (`fl`) the `random` function also generates a sequence, 0-499 in this case, which can be used for plotting the x-axis. This sequence is returned in a field called `x`. The visualization below shows a scatter plot with the `filesize_d` field plotted on the y-axis and the `x` sequence plotted on the x-axis. +======= +When called without the field list parameter (`fl`) the `random` function also generates a sequence, 0-499 in this case, which can be used for plotting the `x` axis. +This sequence is returned in a field called `x`. + +The visualization below shows a scatter plot with the `filesize_d` field +plotted on the `y` axis and the `x` sequence plotted on the `x` axis. +>>>>>>> Fix a some typos, parameter/field name formatting The effect of this is to spread the `filesize_d` samples across the length of the plot so they can be more easily studied. @@ -114,7 +126,11 @@ The field list (`fl`) now specifies two fields to be returned with each sample: `filesize_d` and `response_d`. The `q` and `rows` parameters are the same as the defaults but are included as an example of how to set these parameters. +<<<<<<< HEAD By plotting `filesize_d` on the x-axis and `response_d` on the y-axis we can begin to study the relationship between the two variables. +======= +By plotting `filesize_d` on the *x* axis and `response_d` on the *y* axis we can begin to study the relationship between the two variables. +>>>>>>> Fix a some typos, parameter/field name formatting By studying the scatter plot we can learn the following: diff --git a/solr/solr-ref-guide/src/streaming-expressions.adoc b/solr/solr-ref-guide/src/streaming-expressions.adoc index 20c29f9..1ce3638 100644 --- a/solr/solr-ref-guide/src/streaming-expressions.adoc +++ b/solr/solr-ref-guide/src/streaming-expressions.adoc @@ -30,7 +30,6 @@ At a high level there a four main capabilities that will be explored in the docu * *Visualizing* result sets, aggregations and statistical models of the data. ->>>>>>> SOLR-13105: The Visual Guide to Streaming Expressions and Math Expressions == Stream Language Basics @@ -92,38 +91,10 @@ Stream sources originate streams. There are rich set of searching, sampling and A full reference to all available source expressions is available in <<stream-source-reference.adoc#stream-source-reference,Stream Source Reference>>. -== Elements of the Lanaguage - -=== Stream Sources - -Stream sources originate streams. There are rich set of searching, sampling and aggregation stream sources to choose from. - -A full reference to all available source expressions is available in <<stream-source-reference.adoc#stream-source-reference,Stream Source Reference>>. - - -=== Stream Decorators - -=== Request Routing - -Streaming Expressions respect the <<distributed-requests.adoc#shards-preference-parameter,shards.preference parameter>> for any call to Solr. - -The value of `shards.preference` that is used to route requests is determined in the following order. The first option available is used. -- Provided as a parameter in the streaming expression (e.g., `search(...., shards.preference="replica.type:PULL")`) -- Provided in the URL Params of the streaming expression (e.g., `http://solr_url:8983/solr/stream?expr=....&shards.preference=replica.type:PULL`) -- Set as a default in the Cluster properties. - -=== Adding Custom Expressions - -Creating your own custom expressions can be easily done by implementing the {solr-javadocs}/solrj/org/apache/solr/client/solrj/io/stream/expr/Expressible.html[Expressible] interface. To add a custom expression to the -list of known mappings for the `/stream` and `/graph` handlers, you just need to declare it as a plugin in `solrconfig.xml` via: ->>>>>>> SOLR-13105: The Visual Guide to Streaming Expressions and Math Expressions - === Stream Decorators -<<<<<<< HEAD Stream decorators wrap stream sources and other stream decorators to transform a stream. ->>>>>>> SOLR-13105: The Visual Guide to Streaming Expressions and Math Expressions A full reference to all available decorator expressions is available in <<stream-decorator-reference.adoc#stream-decorator-reference,Stream Decorator Reference>>.
