You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@solr.apache.org by ep...@apache.org on 2024/08/29 11:47:44 UTC
(solr) branch branch_9x updated: Review Solr Streaming code for typos (#2657)
This is an automated email from the ASF dual-hosted git repository.
epugh pushed a commit to branch branch_9x
in repository https://gitbox.apache.org/repos/asf/solr.git
The following commit(s) were added to refs/heads/branch_9x by this push:
new 4e333cd9fa3 Review Solr Streaming code for typos (#2657)
4e333cd9fa3 is described below
commit 4e333cd9fa3b8d76b5864e3c45c6682c16cb8486
Author: Eric Pugh <ep...@opensourceconnections.com>
AuthorDate: Thu Aug 29 07:36:55 2024 -0400
Review Solr Streaming code for typos (#2657)
Co-authored-by: Christine Poerschke <cp...@apache.org>
(cherry picked from commit e523a83ebd02269e578a73359539d3b9620b662a)
---
.../org/apache/solr/client/solrj/io/SolrClientCache.java | 6 +++---
.../apache/solr/client/solrj/io/comp/FieldComparator.java | 4 ++--
.../solr/client/solrj/io/eval/BicubicSplineEvaluator.java | 2 +-
.../apache/solr/client/solrj/io/eval/IsNullEvaluator.java | 2 +-
.../solr/client/solrj/io/eval/KnnRegressionEvaluator.java | 2 +-
.../java/org/apache/solr/client/solrj/io/eval/Matrix.java | 4 ++--
.../apache/solr/client/solrj/io/eval/NotNullEvaluator.java | 2 +-
.../apache/solr/client/solrj/io/eval/PredictEvaluator.java | 2 +-
.../solr/client/solrj/io/eval/ProbabilityEvaluator.java | 2 +-
.../apache/solr/client/solrj/io/eval/RecursiveEvaluator.java | 2 +-
.../java/org/apache/solr/client/solrj/io/sql/DriverImpl.java | 2 +-
.../org/apache/solr/client/solrj/io/stream/BiJoinStream.java | 4 ++--
.../solr/client/solrj/io/stream/CartesianProductStream.java | 4 ++--
.../apache/solr/client/solrj/io/stream/CloudSolrStream.java | 7 ++++---
.../org/apache/solr/client/solrj/io/stream/CommitStream.java | 2 +-
.../apache/solr/client/solrj/io/stream/ComplementStream.java | 2 +-
.../org/apache/solr/client/solrj/io/stream/DaemonStream.java | 2 +-
.../apache/solr/client/solrj/io/stream/DeepRandomStream.java | 4 ++--
.../org/apache/solr/client/solrj/io/stream/FacetStream.java | 8 ++++----
.../solr/client/solrj/io/stream/FeaturesSelectionStream.java | 4 ++--
.../apache/solr/client/solrj/io/stream/HashJoinStream.java | 12 ++++++------
.../apache/solr/client/solrj/io/stream/InnerJoinStream.java | 4 ++--
.../apache/solr/client/solrj/io/stream/IntersectStream.java | 2 +-
.../org/apache/solr/client/solrj/io/stream/JDBCStream.java | 8 ++++----
.../apache/solr/client/solrj/io/stream/JSONTupleStream.java | 2 +-
.../org/apache/solr/client/solrj/io/stream/KnnStream.java | 2 +-
.../solr/client/solrj/io/stream/LeftOuterJoinStream.java | 4 ++--
.../org/apache/solr/client/solrj/io/stream/ListStream.java | 3 ++-
.../org/apache/solr/client/solrj/io/stream/MergeStream.java | 1 -
.../org/apache/solr/client/solrj/io/stream/ModelStream.java | 2 +-
.../org/apache/solr/client/solrj/io/stream/NoOpStream.java | 2 +-
.../org/apache/solr/client/solrj/io/stream/NullStream.java | 2 +-
.../solr/client/solrj/io/stream/OuterHashJoinStream.java | 10 +++++-----
.../org/apache/solr/client/solrj/io/stream/PlotStream.java | 4 ++--
.../org/apache/solr/client/solrj/io/stream/SearchStream.java | 2 +-
.../apache/solr/client/solrj/io/stream/ShuffleStream.java | 4 ++--
.../solr/client/solrj/io/stream/SignificantTermsStream.java | 4 ++--
.../org/apache/solr/client/solrj/io/stream/SqlStream.java | 2 +-
.../apache/solr/client/solrj/io/stream/TextLogitStream.java | 4 ++--
.../apache/solr/client/solrj/io/stream/TimeSeriesStream.java | 2 +-
.../org/apache/solr/client/solrj/io/stream/TopicStream.java | 2 +-
.../org/apache/solr/client/solrj/io/stream/TupStream.java | 2 +-
.../org/apache/solr/client/solrj/io/stream/UpdateStream.java | 2 +-
.../org/apache/solr/client/solrj/io/stream/ZplotStream.java | 2 +-
.../client/solrj/io/stream/expr/StreamExpressionParser.java | 2 +-
.../solr/client/solrj/io/stream/expr/StreamFactory.java | 2 +-
.../test/org/apache/solr/client/solrj/io/sql/JdbcTest.java | 4 ++--
.../solr/client/solrj/io/stream/MathExpressionTest.java | 4 ++--
.../apache/solr/client/solrj/io/stream/StreamingTest.java | 10 +++++-----
.../solr/client/solrj/io/stream/ops/OperationsTest.java | 2 +-
50 files changed, 88 insertions(+), 87 deletions(-)
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java
index b9276f087b6..d6ee3847ca0 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/SolrClientCache.java
@@ -40,13 +40,13 @@ import org.apache.solr.common.util.IOUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-/** The SolrClientCache caches SolrClients so they can be reused by different TupleStreams. */
+/** The SolrClientCache caches SolrClients, so they can be reused by different TupleStreams. */
public class SolrClientCache implements Closeable {
private static final Logger log = LoggerFactory.getLogger(MethodHandles.lookup().lookupClass());
// Set the floor for timeouts to 60 seconds.
- // Timeouts cans be increased by setting the system properties defined below.
+ // Timeouts can be increased by setting the system properties defined below.
private static final int MIN_TIMEOUT = 60000;
private static final int minConnTimeout =
Math.max(
@@ -147,7 +147,7 @@ public class SolrClientCache implements Closeable {
/**
* Create (and cache) a SolrClient based around the provided URL
*
- * @param baseUrl a Solr URL. May be either a "base" URL (i.e. ending in "/solr"), or point to a
+ * @param baseUrl a Solr URL. May either be a "base" URL (i.e. ending in "/solr"), or point to a
* particular collection or core.
* @return a SolrClient configured to use the provided URL. The cache retains a reference to the
* returned client, and will close it when callers invoke {@link SolrClientCache#close()}
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/comp/FieldComparator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/comp/FieldComparator.java
index 37049baaad4..5a67c581962 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/comp/FieldComparator.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/comp/FieldComparator.java
@@ -98,13 +98,13 @@ public class FieldComparator implements StreamComparator {
/*
* What are we doing here messing around with lambdas for the comparator logic?
- * We want the compare(...) function to run as fast as possible because it will be called many many
+ * We want the compare(...) function to run as fast as possible because it will be called many
* times over the lifetime of this object. For that reason we want to limit the number of comparisons
* taking place in the compare(...) function. Because this class supports both ascending and
* descending comparisons and the logic for each is slightly different, we want to do the
* if(ascending){ compare like this } else { compare like this }
* check only once - we can do that in the constructor of this class, create a lambda, and then execute
- * that lambda in the compare function. A little bit of branch prediction savings right here.
+ * that lambda in the compare function. A bit of branch prediction savings right here.
*/
@SuppressWarnings({"unchecked"})
private void assignComparator() {
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/BicubicSplineEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/BicubicSplineEvaluator.java
index 0535aca5478..37ee06dc474 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/BicubicSplineEvaluator.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/BicubicSplineEvaluator.java
@@ -36,7 +36,7 @@ public class BicubicSplineEvaluator extends RecursiveObjectEvaluator implements
if (objects.length != 3) {
throw new IOException(
- "The bicubicSpline function requires three paremeters," + objects.length + " found.");
+ "The bicubicSpline function requires three parameters," + objects.length + " found.");
}
Object first = objects[0];
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/IsNullEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/IsNullEvaluator.java
index 0d079f538e3..897c7ad8936 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/IsNullEvaluator.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/IsNullEvaluator.java
@@ -45,7 +45,7 @@ public class IsNullEvaluator extends RecursiveBooleanEvaluator implements ManyVa
}
if (values[0] instanceof String) {
- // Check to see if the this tuple had a null value for that string.
+ // Check to see if this tuple had a null value for that string.
String nullField = getStreamContext().getTupleContext().get("null");
if (nullField != null && nullField.equals(values[0])) {
return true;
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/KnnRegressionEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/KnnRegressionEvaluator.java
index 6280436270a..024ec64ac4a 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/KnnRegressionEvaluator.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/KnnRegressionEvaluator.java
@@ -58,7 +58,7 @@ public class KnnRegressionEvaluator extends RecursiveObjectEvaluator implements
if (values.length < 3) {
throw new IOException(
- "knnRegress expects atleast three parameters: an observation matrix, an outcomes vector and k.");
+ "knnRegress expects at least three parameters: an observation matrix, an outcomes vector and k.");
}
Matrix observations = null;
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/Matrix.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/Matrix.java
index 9378661977d..44058b1d04b 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/Matrix.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/Matrix.java
@@ -61,8 +61,8 @@ public class Matrix implements Iterable<List<Double>>, Attributes {
return rowLabels;
}
- public void setRowLabels(List<String> rowLables) {
- this.rowLabels = rowLables;
+ public void setRowLabels(List<String> rowLabels) {
+ this.rowLabels = rowLabels;
}
public double[][] getData() {
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/NotNullEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/NotNullEvaluator.java
index ab927a7fd84..57d69e6619a 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/NotNullEvaluator.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/NotNullEvaluator.java
@@ -45,7 +45,7 @@ public class NotNullEvaluator extends RecursiveBooleanEvaluator implements ManyV
}
if (values[0] instanceof String) {
- // Check to see if the this tuple had a null value for that string.
+ // Check to see if this tuple had a null value for that string.
String nullField = getStreamContext().getTupleContext().get("null");
if (nullField != null && nullField.equals(values[0])) {
return false;
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PredictEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PredictEvaluator.java
index 8c04efa7702..83491cf38dc 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PredictEvaluator.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/PredictEvaluator.java
@@ -178,7 +178,7 @@ public class PredictEvaluator extends RecursiveObjectEvaluator implements ManyVa
y = ((Number) third).doubleValue();
return bivariateFunction.value(x, y);
} else {
- throw new IOException("BivariateFunction requires two numberic parameters.");
+ throw new IOException("BivariateFunction requires two numeric parameters.");
}
} else if (objects.length == 2) {
if (second instanceof Matrix) {
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ProbabilityEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ProbabilityEvaluator.java
index 2ed4ae30140..31ec03be479 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ProbabilityEvaluator.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/ProbabilityEvaluator.java
@@ -60,7 +60,7 @@ public class ProbabilityEvaluator extends RecursiveObjectEvaluator implements Ma
throw new IOException(
String.format(
Locale.ROOT,
- "Invalid expression %s - found type %s for the first value, expecting a IntegerDistributionm for probability at a specific value.",
+ "Invalid expression %s - found type %s for the first value, expecting a IntegerDistribution for probability at a specific value.",
toExpression(constructingFactory),
first.getClass().getSimpleName()));
}
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RecursiveEvaluator.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RecursiveEvaluator.java
index baa8bd592ca..a30d633b8df 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RecursiveEvaluator.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/eval/RecursiveEvaluator.java
@@ -126,7 +126,7 @@ public abstract class RecursiveEvaluator implements StreamEvaluator, ValueWorker
return ((List<?>) value)
.stream().map(innerValue -> normalizeOutputType(innerValue)).collect(Collectors.toList());
} else if (value instanceof Tuple && value.getClass().getEnclosingClass() == null) {
- // If its a tuple and not a inner class that has extended tuple, which is done in a number of
+ // If it's a tuple and not an inner class that has extended tuple, which occurs in a number of
// cases so that mathematical models can be contained within a tuple.
Tuple tuple = (Tuple) value;
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.java
index 3509b54abd1..cb4668838e2 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/sql/DriverImpl.java
@@ -32,7 +32,7 @@ import org.apache.http.client.utils.URLEncodedUtils;
import org.apache.solr.common.util.SuppressForbidden;
/**
- * Get a Connection with with a url and properties.
+ * Get a Connection with an url and properties.
*
* <p>jdbc:solr://zkhost:port?collection=collection&aggregationMode=map_reduce
*/
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/BiJoinStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/BiJoinStream.java
index 5c8ecc3d8d9..ac8ec398233 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/BiJoinStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/BiJoinStream.java
@@ -28,8 +28,8 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
/**
- * Joins leftStream with rightStream based on a Equalitor. Both streams must be sorted by the fields
- * being joined on. Resulting stream is sorted by the equalitor.
+ * Joins leftStream with rightStream based on an {@link StreamEqualitor}. Both streams must be
+ * sorted by the fields being joined on. Resulting stream is sorted by the equalitor.
*
* @since 6.0.0
*/
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CartesianProductStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CartesianProductStream.java
index c9973c5496e..8cbbea7d16b 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CartesianProductStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CartesianProductStream.java
@@ -277,8 +277,8 @@ public class CartesianProductStream extends TupleStream implements Expressible {
private boolean iterate(
List<NamedEvaluator> evaluators, int[] indexes, Map<String, Object> evaluatedValues) {
- // this assumes evaluators and indexes are the same length, which is ok cause we created it so
- // we know it is
+ // this assumes evaluators and indexes are the same length, which is ok because we created it,
+ // so we know it is
// go right to left and increment, returning true if we're not at the end
for (int offset = indexes.length - 1; offset >= 0; --offset) {
Object evaluatedValue = evaluatedValues.get(evaluators.get(offset).getName());
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java
index 0f87df7bcf3..84d34f99839 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CloudSolrStream.java
@@ -107,14 +107,14 @@ public class CloudSolrStream extends TupleStream implements Expressible {
expression));
}
- // Validate there are no unknown parameters - zkHost and alias are namedParameter so we don't
+ // Validate there are no unknown parameters - zkHost and alias are namedParameter, so we don't
// need to count it twice
if (expression.getParameters().size() != 1 + namedParams.size()) {
throw new IOException(
String.format(Locale.ROOT, "invalid expression %s - unknown operands found", expression));
}
- // Named parameters - passed directly to solr as solrparams
+ // Named parameters - passed directly to solr as SolrParams
if (0 == namedParams.size()) {
throw new IOException(
String.format(
@@ -246,7 +246,8 @@ public class CloudSolrStream extends TupleStream implements Expressible {
this.collection = collectionName;
this.params = new ModifiableSolrParams(params);
- // If the comparator is null then it was not explicitly set so we will create one using the sort
+ // If the comparator is null then it was not explicitly set, so we will create one using the
+ // sort
// parameter of the query. While doing this we will also take into account any aliases such that
// if we are sorting on fieldA but fieldA is aliased to alias.fieldA then the comparator will be
// against alias.fieldA.
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CommitStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CommitStream.java
index 79f8abfab23..6ed5d3a06c7 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CommitStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/CommitStream.java
@@ -170,7 +170,7 @@ public class CommitStream extends TupleStream implements Expressible {
}
} else {
// if the read document contains field 'batchIndexed' then it's a summary
- // document and we can update our count based on it's value. If not then
+ // document, and we can update our count based on its value. If not then
// just increment by 1
if (tuple.getFields().containsKey(UpdateStream.BATCH_INDEXED_FIELD_NAME)
&& isInteger(tuple.getString(UpdateStream.BATCH_INDEXED_FIELD_NAME))) {
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ComplementStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ComplementStream.java
index 1d589315a15..8698099d71b 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ComplementStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ComplementStream.java
@@ -207,7 +207,7 @@ public class ComplementStream extends TupleStream implements Expressible {
}
// if a == b then ignore a cause it exists in b
- // else we know that b < a so we can ignore b
+ // else we know that b < a, so we can ignore b
if (eq.test(a, b)) {
streamB.pushBack(b);
} else {
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DaemonStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DaemonStream.java
index 414d2466a38..efc602e43a6 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DaemonStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DaemonStream.java
@@ -398,7 +398,7 @@ public class DaemonStream extends TupleStream implements Expressible {
}
} catch (Throwable t) {
log.error("Fatal Error in DaemonStream: {}", id, t);
- // For anything other then IOException break out of the loop and shutdown the thread.
+ // For anything other than IOException break out of the loop and shutdown the thread.
break OUTER;
} finally {
try {
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.java
index 8598cdb1604..0be344a0921 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/DeepRandomStream.java
@@ -102,14 +102,14 @@ public class DeepRandomStream extends TupleStream implements Expressible {
expression));
}
- // Validate there are no unknown parameters - zkHost and alias are namedParameter so we don't
+ // Validate there are no unknown parameters - zkHost and alias are namedParameter, so we don't
// need to count it twice
if (expression.getParameters().size() != 1 + namedParams.size()) {
throw new IOException(
String.format(Locale.ROOT, "invalid expression %s - unknown operands found", expression));
}
- // Named parameters - passed directly to solr as solrparams
+ // Named parameters - passed directly to solr as SolrParams
if (0 == namedParams.size()) {
throw new IOException(
String.format(
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FacetStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FacetStream.java
index 9e39198c287..68343b5f0e1 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FacetStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FacetStream.java
@@ -159,7 +159,7 @@ public class FacetStream extends TupleStream implements Expressible, ParallelMet
expression));
}
- // Named parameters - passed directly to solr as solrparams
+ // Named parameters - passed directly to solr as SolrParams
if (0 == namedParams.size()) {
throw new IOException(
String.format(
@@ -512,7 +512,7 @@ public class FacetStream extends TupleStream implements Expressible, ParallelMet
this.serializeBucketSizeLimit = serializeBucketSizeLimit;
this.overfetch = overfetch;
- // In a facet world it only makes sense to have the same field name in all of the sorters
+ // In a facet world it only makes sense to have the same field name in all the sorters
// Because FieldComparator allows for left and right field names we will need to validate
// that they are the same
for (FieldComparator sort : bucketSorts) {
@@ -800,12 +800,12 @@ public class FacetStream extends TupleStream implements Expressible, ParallelMet
} else if (_sorts.length == 1) {
FieldComparator[] adjustedSorts = new FieldComparator[_buckets.length];
if (_sorts[0].getLeftFieldName().contains("(")) {
- // Its a metric sort so apply the same sort criteria at each level.
+ // It's a metric sort so apply the same sort criteria at each level.
for (int i = 0; i < adjustedSorts.length; i++) {
adjustedSorts[i] = _sorts[0];
}
} else {
- // Its an index sort so apply an index sort at each level.
+ // It's an index sort so apply an index sort at each level.
for (int i = 0; i < adjustedSorts.length; i++) {
adjustedSorts[i] = new FieldComparator(_buckets[i].toString(), _sorts[0].getOrder());
}
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java
index 9c7478a4623..1f7d7d65e0f 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/FeaturesSelectionStream.java
@@ -97,7 +97,7 @@ public class FeaturesSelectionStream extends TupleStream implements Expressible
List<StreamExpressionNamedParameter> namedParams = factory.getNamedOperands(expression);
StreamExpressionNamedParameter zkHostExpression = factory.getNamedOperand(expression, "zkHost");
- // Validate there are no unknown parameters - zkHost and alias are namedParameter so we don't
+ // Validate there are no unknown parameters - zkHost and alias are namedParameter, so we don't
// need to count it twice
if (expression.getParameters().size() != 1 + namedParams.size()) {
throw new IOException(
@@ -113,7 +113,7 @@ public class FeaturesSelectionStream extends TupleStream implements Expressible
expression));
}
- // Named parameters - passed directly to solr as solrparams
+ // Named parameters - passed directly to solr as SolrParams
if (0 == namedParams.size()) {
throw new IOException(
String.format(
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/HashJoinStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/HashJoinStream.java
index 53cc4678010..e0d6dfefbd8 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/HashJoinStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/HashJoinStream.java
@@ -55,7 +55,7 @@ public class HashJoinStream extends TupleStream implements Expressible {
protected Tuple workingFullTuple = null;
protected String workingFullHash = null;
- protected int workngHashSetIdx = 0;
+ protected int workingHashSetIdx = 0;
public HashJoinStream(TupleStream fullStream, TupleStream hashStream, List<String> hashOn)
throws IOException {
@@ -283,23 +283,23 @@ public class HashJoinStream extends TupleStream implements Expressible {
workingFullTuple = fullTuple;
workingFullHash = fullHash;
- workngHashSetIdx = 0;
+ workingHashSetIdx = 0;
}
// At this point we know we have at least one doc to match on due to the check at the end,
// before returning, we know we have at least one to match with left
List<Tuple> matches = hashedTuples.get(workingFullHash);
Tuple returnTuple = workingFullTuple.clone();
- returnTuple.merge(matches.get(workngHashSetIdx));
+ returnTuple.merge(matches.get(workingHashSetIdx));
// Increment this so the next time we hit the next matching tuple
- workngHashSetIdx++;
+ workingHashSetIdx++;
- if (workngHashSetIdx >= matches.size()) {
+ if (workingHashSetIdx >= matches.size()) {
// well, now we've reached all the matches, clear it all out
workingFullTuple = null;
workingFullHash = null;
- workngHashSetIdx = 0;
+ workingHashSetIdx = 0;
}
return returnTuple;
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/InnerJoinStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/InnerJoinStream.java
index 4bcf0aeef1d..4ecbbab581b 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/InnerJoinStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/InnerJoinStream.java
@@ -26,8 +26,8 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
/**
- * Joins leftStream with rightStream based on a Equalitor. Both streams must be sorted by the fields
- * being joined on. Resulting stream is sorted by the equalitor.
+ * Joins leftStream with rightStream based on an Equalitor. Both streams must be sorted by the
+ * fields being joined on. Resulting stream is sorted by the equalitor.
*
* @since 6.0.0
*/
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/IntersectStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/IntersectStream.java
index 04f32dcf72b..e0fed5a49f9 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/IntersectStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/IntersectStream.java
@@ -202,7 +202,7 @@ public class IntersectStream extends TupleStream implements Expressible {
return a;
}
- // We're not at the end and they're not equal. We now need to decide which we can
+ // We're not at the end, and they're not equal. We now need to decide which we can
// throw away. This is accomplished by checking which is less than the other. The
// one that is less (determined by the sort) can be tossed. The other should
// be pushed back and the loop continued. We don't have to worry about an == 0
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JDBCStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JDBCStream.java
index bd9ed7e44c0..920aa819d75 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JDBCStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JDBCStream.java
@@ -180,7 +180,7 @@ public class JDBCStream extends TupleStream implements Expressible {
StreamExpressionNamedParameter fetchSizeExpression =
factory.getNamedOperand(expression, "fetchSize");
- // Validate there are no unknown parameters - zkHost and alias are namedParameter so we don't
+ // Validate there are no unknown parameters - zkHost and alias are namedParameter, so we don't
// need to count it twice
if (expression.getParameters().size() != namedParams.size()) {
throw new IOException(
@@ -283,7 +283,7 @@ public class JDBCStream extends TupleStream implements Expressible {
// than java was started with, it will likely not work. Instead, create a class that inherits
// this class and override this getDriver() method.
// Unfortunately it is impossible to use a custom ClassLoader with DriverManager, so we would
- // need to remove our use of this class in order to support JDBC drivers loaded in via solr's
+ // need to remove our use of this class in order to support JDBC drivers loaded in via Solr's
// additional library methods. This comment is relevant for JDBC drivers loaded in via custom
// plugins and even Solr Modules.
try {
@@ -389,7 +389,7 @@ public class JDBCStream extends TupleStream implements Expressible {
protected ResultSetValueSelector determineValueSelector(int columnIdx, ResultSetMetaData metadata)
throws SQLException {
final int columnNumber = columnIdx + 1; // cause it starts at 1
- // Use getColumnLabel instead of getColumnName to make sure fields renamed with AS as picked up
+ // Use getColumnLabel instead of getColumnName to make sure fields renamed with AS are picked up
// properly
final String columnName = metadata.getColumnLabel(columnNumber);
final int jdbcType = metadata.getColumnType(columnNumber);
@@ -425,7 +425,7 @@ public class JDBCStream extends TupleStream implements Expressible {
}
// We're checking the Java class names because there are lots of SQL types across
// lots of database drivers that can be mapped to standard Java types. Basically,
- // this makes it easier and we don't have to worry about esoteric type names in the
+ // this makes it easier, and we don't have to worry about esoteric type names in the
// JDBC family of types
else if (Short.class.getName().equals(className)) {
valueSelector =
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JSONTupleStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JSONTupleStream.java
index 781fcc3d10c..35a7b021d64 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JSONTupleStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/JSONTupleStream.java
@@ -78,7 +78,7 @@ public class JSONTupleStream implements TupleStreamParser {
atDocs = true;
if (!found) return null;
}
- // advance past ARRAY_START (in the case that we just advanced to docs, or OBJECT_END left over
+ // advance past ARRAY_START, in the case that we just advanced to docs, or OBJECT_END left over
// from the last call.
int event = parser.nextEvent();
if (event == JSONParser.ARRAY_END) return null;
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/KnnStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/KnnStream.java
index 41cd08d18bf..7f514a71b04 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/KnnStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/KnnStream.java
@@ -86,7 +86,7 @@ public class KnnStream extends TupleStream implements Expressible {
expression));
}
- // Named parameters - passed directly to solr as solrparams
+ // Named parameters - passed directly to solr as SolrParams
if (namedParams.size() < 2) {
throw new IOException(
String.format(
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/LeftOuterJoinStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/LeftOuterJoinStream.java
index 8d61828c2f1..c6efab74840 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/LeftOuterJoinStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/LeftOuterJoinStream.java
@@ -26,8 +26,8 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
/**
- * Joins leftStream with rightStream based on a Equalitor. Both streams must be sorted by the fields
- * being joined on. Resulting stream is sorted by the equalitor.
+ * Joins leftStream with rightStream based on an Equalitor. Both streams must be sorted by the
+ * fields being joined on. Resulting stream is sorted by the equalitor.
*
* @since 6.0.0
*/
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ListStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ListStream.java
index 7d0f16a9a6c..b2e64bef03b 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ListStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ListStream.java
@@ -112,7 +112,8 @@ public class ListStream extends TupleStream implements Expressible {
if (currentStream == null) {
if (streamIndex < streams.length) {
currentStream = streams[streamIndex];
- // Set the stream to null in the array of streams once its been set to the current stream.
+ // Set the stream to null in the array of streams once it's been set to the current
+ // stream.
// This will remove the reference to the stream
// and should allow it to be garbage collected once it's no longer the current stream.
streams[streamIndex] = null;
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/MergeStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/MergeStream.java
index cb915119543..4b368eadf71 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/MergeStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/MergeStream.java
@@ -224,7 +224,6 @@ public class MergeStream extends TupleStream implements Expressible {
// If all EOF then min will be null, else min is the current minimum
if (null == minimum) {
- // return EOF, doesn't matter which cause we're done
return streams[0].read();
}
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ModelStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ModelStream.java
index 096f4a55e9c..ce3e37fdbab 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ModelStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ModelStream.java
@@ -76,7 +76,7 @@ public class ModelStream extends TupleStream implements Expressible {
expression));
}
- // Named parameters - passed directly to solr as solrparams
+ // Named parameters - passed directly to solr as SolrParams
if (0 == namedParams.size()) {
throw new IOException(
String.format(
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/NoOpStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/NoOpStream.java
index bf83ed40340..f680c5fe0e2 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/NoOpStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/NoOpStream.java
@@ -29,7 +29,7 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamExpression;
import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
/**
- * A simple no-operation stream. Immediately returns eof. Mostly intended for use as a place holder
+ * A simple no-operation stream. Immediately returns eof. Mostly intended for use as a placeholder
* in {@link org.apache.solr.client.solrj.io.stream.expr.InjectionDefense}.
*
* @since 8.0.0
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/NullStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/NullStream.java
index ba3fc0b9126..142b7b960cd 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/NullStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/NullStream.java
@@ -31,7 +31,7 @@ import org.apache.solr.client.solrj.io.stream.expr.StreamFactory;
/**
* The NullStream Iterates over a TupleStream and eats the tuples. It returns the tuple count in the
- * EOF tuple. Because the NullStreaam eats all the Tuples it see's it can be used as a simple tool
+ * EOF tuple. Because the NullStream eats all the Tuples it sees, it can be used as a simple tool
* for performance analysis of underlying streams.
*
* @since 6.4.0
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/OuterHashJoinStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/OuterHashJoinStream.java
index 417bf464271..cf064014c1d 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/OuterHashJoinStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/OuterHashJoinStream.java
@@ -113,23 +113,23 @@ public class OuterHashJoinStream extends HashJoinStream implements Expressible {
workingFullTuple = fullTuple;
workingFullHash = fullHash;
- workngHashSetIdx = 0;
+ workingHashSetIdx = 0;
}
// At this point we know we have at least one doc to match on due to the check at the end,
// before returning, we know we have at least one to match with left
List<Tuple> matches = hashedTuples.get(workingFullHash);
Tuple returnTuple = workingFullTuple.clone();
- returnTuple.merge(matches.get(workngHashSetIdx));
+ returnTuple.merge(matches.get(workingHashSetIdx));
// Increment this so the next time we hit the next matching tuple
- workngHashSetIdx++;
+ workingHashSetIdx++;
- if (workngHashSetIdx >= matches.size()) {
+ if (workingHashSetIdx >= matches.size()) {
// well, now we've reached all the matches, clear it all out
workingFullTuple = null;
workingFullHash = null;
- workngHashSetIdx = 0;
+ workingHashSetIdx = 0;
}
return returnTuple;
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/PlotStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/PlotStream.java
index a1ae5326bce..1199f2c1059 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/PlotStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/PlotStream.java
@@ -68,7 +68,7 @@ public class PlotStream extends TupleStream implements Expressible {
// fieldLabels.put(name, name);
StreamExpressionParameter param = np.getParameter();
- // we're going to split these up here so we only make the choice once
+ // we're going to split these up here, so we only make the choice once
// order of these in read() doesn't matter
if (param instanceof StreamExpressionValue) {
stringParams.put(name, ((StreamExpressionValue) param).getValue());
@@ -141,7 +141,7 @@ public class PlotStream extends TupleStream implements Expressible {
public void setStreamContext(StreamContext context) {
this.streamContext = context;
- // also set in evalators and streams
+ // also set in evaluators and streams
for (StreamEvaluator evaluator : evaluatorParams.values()) {
evaluator.setStreamContext(context);
}
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SearchStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SearchStream.java
index f1e6c33c2fb..a00e5fb8bd5 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SearchStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SearchStream.java
@@ -75,7 +75,7 @@ public class SearchStream extends TupleStream implements Expressible {
expression));
}
- // Named parameters - passed directly to solr as solrparams
+ // Named parameters - passed directly to solr as SolrParams
if (0 == namedParams.size()) {
throw new IOException(
String.format(
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ShuffleStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ShuffleStream.java
index f315b4af1eb..8e62902c98c 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ShuffleStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ShuffleStream.java
@@ -54,14 +54,14 @@ public class ShuffleStream extends CloudSolrStream implements Expressible {
expression));
}
- // Validate there are no unknown parameters - zkHost and alias are namedParameter so we don't
+ // Validate there are no unknown parameters - zkHost and alias are namedParameter, so we don't
// need to count it twice
if (expression.getParameters().size() != 1 + namedParams.size()) {
throw new IOException(
String.format(Locale.ROOT, "invalid expression %s - unknown operands found", expression));
}
- // Named parameters - passed directly to solr as solrparams
+ // Named parameters - passed directly to solr as SolrParams
if (0 == namedParams.size()) {
throw new IOException(
String.format(
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
index 3b79a3c1fa4..e362d34c73b 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SignificantTermsStream.java
@@ -91,7 +91,7 @@ public class SignificantTermsStream extends TupleStream implements Expressible {
List<StreamExpressionNamedParameter> namedParams = factory.getNamedOperands(expression);
StreamExpressionNamedParameter zkHostExpression = factory.getNamedOperand(expression, "zkHost");
- // Validate there are no unknown parameters - zkHost and alias are namedParameter so we don't
+ // Validate there are no unknown parameters - zkHost and alias are namedParameter, so we don't
// need to count it twice
if (expression.getParameters().size() != 1 + namedParams.size()) {
throw new IOException(
@@ -107,7 +107,7 @@ public class SignificantTermsStream extends TupleStream implements Expressible {
expression));
}
- // Named parameters - passed directly to solr as solrparams
+ // Named parameters - passed directly to solr as SolrParams
if (0 == namedParams.size()) {
throw new IOException(
String.format(
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SqlStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SqlStream.java
index b39ab1dbdc1..24560cb61ae 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SqlStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/SqlStream.java
@@ -76,7 +76,7 @@ public class SqlStream extends TupleStream implements Expressible {
collectionName = factory.getDefaultCollection();
}
- // Named parameters - passed directly to solr as solrparams
+ // Named parameters - passed directly to solr as SolrParams
if (0 == namedParams.size()) {
throw new IOException(
String.format(
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java
index 1461a3af70d..6f79ef04876 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TextLogitStream.java
@@ -127,7 +127,7 @@ public class TextLogitStream extends TupleStream implements Expressible {
factory.getExpressionOperandsRepresentingTypes(
expression, Expressible.class, TupleStream.class);
- // Validate there are no unknown parameters - zkHost and alias are namedParameter so we don't
+ // Validate there are no unknown parameters - zkHost and alias are namedParameter, so we don't
// need to count it twice
if (expression.getParameters().size() != 1 + namedParams.size() + streamExpressions.size()) {
throw new IOException(
@@ -143,7 +143,7 @@ public class TextLogitStream extends TupleStream implements Expressible {
expression));
}
- // Named parameters - passed directly to solr as solrparams
+ // Named parameters - passed directly to solr as SolrParams
if (0 == namedParams.size()) {
throw new IOException(
String.format(
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.java
index 383389d2551..ccfeb68e3c0 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TimeSeriesStream.java
@@ -172,7 +172,7 @@ public class TimeSeriesStream extends TupleStream implements Expressible {
expression));
}
- // Named parameters - passed directly to solr as solrparams
+ // Named parameters - passed directly to solr as SolrParams
if (0 == namedParams.size()) {
throw new IOException(
String.format(
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TopicStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TopicStream.java
index 8e3844c152a..dbc295e79e3 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TopicStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TopicStream.java
@@ -170,7 +170,7 @@ public class TopicStream extends CloudSolrStream implements Expressible {
expression));
}
- // Named parameters - passed directly to solr as solrparams
+ // Named parameters - passed directly to solr as SolrParams
if (0 == namedParams.size()) {
throw new IOException(
String.format(
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TupStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TupStream.java
index bf982011f6a..9b07be811e3 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TupStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/TupStream.java
@@ -67,7 +67,7 @@ public class TupStream extends TupleStream implements Expressible {
fieldLabels.put(name, name);
StreamExpressionParameter param = np.getParameter();
- // we're going to split these up here so we only make the choice once
+ // we're going to split these up here, so we only make the choice once
// order of these in read() doesn't matter
if (param instanceof StreamExpressionValue) {
stringParams.put(name, ((StreamExpressionValue) param).getValue());
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/UpdateStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/UpdateStream.java
index 8c3ba20fc8b..7d10407ee68 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/UpdateStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/UpdateStream.java
@@ -343,7 +343,7 @@ public class UpdateStream extends TupleStream implements Expressible {
}
/**
- * This method will be called on every batch of tuples comsumed, after converting each tuple in
+ * This method will be called on every batch of tuples consumed, after converting each tuple in
* that batch to a Solr Input Document.
*/
protected void uploadBatchToCollection(List<SolrInputDocument> documentBatch) throws IOException {
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ZplotStream.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ZplotStream.java
index d79534849ab..a994c55e646 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ZplotStream.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/ZplotStream.java
@@ -213,7 +213,7 @@ public class ZplotStream extends TupleStream implements Expressible {
outTuples.add(tuple);
}
- // Generate the x axis if the tuples contain y and not x
+ // Generate the x-axis if the tuples contain y and not x
if (outTuples.get(0).getFields().containsKey("y")
&& !outTuples.get(0).getFields().containsKey("x")) {
int x = 0;
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParser.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParser.java
index 7d9a1fe09a7..2d0621ed25f 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParser.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamExpressionParser.java
@@ -171,7 +171,7 @@ public class StreamExpressionParser {
return false;
}
- // Must end with )
+ // Must end with ')' character
return clause.endsWith(")");
}
diff --git a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamFactory.java b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamFactory.java
index dc3e0d67eed..dfc2a391d82 100644
--- a/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamFactory.java
+++ b/solr/solrj-streaming/src/java/org/apache/solr/client/solrj/io/stream/expr/StreamFactory.java
@@ -136,7 +136,7 @@ public class StreamFactory implements Serializable {
}
/**
- * Given an expression, will return the value parameter at the given index, or null if doesn't
+ * Given an expression, will return the value parameter at the given index, or null if it doesn't
* exist
*/
public String getValueOperand(StreamExpression expression, int parameterIndex) {
diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
index a64cba4caf8..822f7d38350 100644
--- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
+++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/sql/JdbcTest.java
@@ -383,7 +383,7 @@ public class JdbcTest extends SolrCloudTestCase {
@Test
public void testJDBCUrlParameters() throws Exception {
- // Test JDBC paramters in URL
+ // Test JDBC parameters in URL
try (Connection con =
DriverManager.getConnection(
"jdbc:solr://"
@@ -436,7 +436,7 @@ public class JdbcTest extends SolrCloudTestCase {
@Test
public void testJDBCPropertiesParameters() throws Exception {
- // Test JDBC paramters in properties
+ // Test JDBC parameters in properties
Properties providedProperties = new Properties();
providedProperties.put("collection", COLLECTIONORALIAS);
providedProperties.put("username", "");
diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
index 4cfd0269248..7e5d5022e78 100644
--- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
+++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/MathExpressionTest.java
@@ -1814,8 +1814,8 @@ public class MathExpressionTest extends SolrCloudTestCase {
// there are times when tuples are discarded because
// they contain values with NaN values. This will occur
// only on the very end of the tails of the normal distribution or other
- // real distributions and doesn't effect the visual quality of the curve very much.
- // But it does effect the reliability of tests.
+ // real distributions and doesn't affect the visual quality of the curve very much.
+ // But it does affect the reliability of tests.
// For this reason the loop below is in place to run the test N times looking
// for the correct number of tuples before asserting the mean.
diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
index 42252add70c..5eadc7ed727 100644
--- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
+++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/StreamingTest.java
@@ -1348,7 +1348,7 @@ public class StreamingTest extends SolrCloudTestCase {
}
}
- // Goes away after after LUCENE-7548
+ // Goes away after LUCENE-7548
static final String[] ascOrder =
new String[] {
"aaa1", "aaa2", "aaa3", "eee1",
@@ -1361,7 +1361,7 @@ public class StreamingTest extends SolrCloudTestCase {
"aaa8", "eee8", "iii8", "ooo8"
};
- // Goes away after after LUCENE-7548
+ // Goes away after LUCENE-7548
static final String[] descOrder =
new String[] {
"aaa8", "eee8", "iii8", "ooo8",
@@ -1374,7 +1374,7 @@ public class StreamingTest extends SolrCloudTestCase {
"iii3", "ooo1", "ooo2", "ooo3"
};
- // Goes away after after LUCENE-7548
+ // Goes away after LUCENE-7548
static final String[] ascOrderBool =
new String[] {
"aaa1", "aaa2", "aaa3", "eee1",
@@ -1387,7 +1387,7 @@ public class StreamingTest extends SolrCloudTestCase {
"iii8", "ooo4", "ooo6", "ooo8"
};
- // Goes away after after LUCENE-7548
+ // Goes away after LUCENE-7548
static final String[] descOrderBool =
new String[] {
"aaa4", "aaa6", "aaa8", "eee4",
@@ -1418,7 +1418,7 @@ public class StreamingTest extends SolrCloudTestCase {
.add(id, "aaa3")
.add(id, "ooo3")
- // Docs with values in for all of the types we want to sort on.
+ // Docs with values for all the types we want to sort on.
.add(docPairs(4, "iii"))
.add(docPairs(4, "eee"))
diff --git a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/ops/OperationsTest.java b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/ops/OperationsTest.java
index fc854cf8baa..4ec6b65ddf4 100644
--- a/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/ops/OperationsTest.java
+++ b/solr/solrj-streaming/src/test/org/apache/solr/client/solrj/io/stream/ops/OperationsTest.java
@@ -228,7 +228,7 @@ public class OperationsTest extends SolrTestCase {
}
@Test
- public void replaceFieldNullWithNonExistantField() throws Exception {
+ public void replaceFieldNullWithNonExistentField() throws Exception {
Tuple tuple;
StreamOperation operation;