typos and renaming

Author: not-napoleon

x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/ExponentialHistogramParser.java

@@ -113,7 +113,7 @@ private record ParsedZeroBucket(long count, double threshold) {
 
     /**
      * Parses an XContent object into an exponential histogram.
-     * The parse is expected to point at the next token after {@link XContentParser.Token#START_OBJECT}.
+     * The parser is expected to point at the next token after {@link XContentParser.Token#START_OBJECT}.
      *
      * @param mappedFieldName the name of the field being parsed, used for error messages
      * @param parser the parser to use

x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/HistogramParser.java

@@ -31,7 +31,7 @@ public record ParsedHistogram(List<Double> values, List<Long> counts) {}
 
     /**
      * Parses an XContent object into a histogram.
-     * The parse is expected to point at the next token after {@link XContentParser.Token#START_OBJECT}.
+     * The parser is expected to point at the next token after {@link XContentParser.Token#START_OBJECT}.
      *
      * @param mappedFieldName the name of the field being parsed, used for error messages
      * @param parser the parser to use

x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/TDigestFieldMapper.java

@@ -65,6 +65,8 @@
 public class TDigestFieldMapper extends FieldMapper {
     public static final FeatureFlag TDIGEST_FIELD_MAPPER = new FeatureFlag("tdigest_field_mapper");
 
+    public static final String CENTROIDS_NAME = "centroids";
+    public static final String COUNTS_NAME = "counts";
     public static final String CONTENT_TYPE = "tdigest";
 
     private static TDigestFieldMapper toType(FieldMapper in) {
@@ -338,13 +340,13 @@ public void parse(DocumentParserContext context) throws IOException {
             TDigestParser.ParsedHistogram parsedHistogram = TDigestParser.parse(fullPath(), subParser);
 
             BytesStreamOutput streamOutput = new BytesStreamOutput();
-            for (int i = 0; i < parsedHistogram.values().size(); i++) {
+            for (int i = 0; i < parsedHistogram.centroids().size(); i++) {
                 long count = parsedHistogram.counts().get(i);
                 assert count >= 0;
                 // we do not add elements with count == 0
                 if (count > 0) {
                     streamOutput.writeVLong(count);
-                    streamOutput.writeLong(Double.doubleToRawLongBits(parsedHistogram.values().get(i)));
+                    streamOutput.writeLong(Double.doubleToRawLongBits(parsedHistogram.centroids().get(i)));
                 }
             }
             BytesRef docValue = streamOutput.bytes().toBytesRef();
@@ -486,14 +488,14 @@ public void write(XContentBuilder b) throws IOException {
             b.startObject();
 
             value.reset(binaryValue);
-            b.startArray("centroids");
+            b.startArray(CENTROIDS_NAME);
             while (value.next()) {
                 b.value(value.value());
             }
             b.endArray();
 
             value.reset(binaryValue);
-            b.startArray("counts");
+            b.startArray(COUNTS_NAME);
             while (value.next()) {
                 b.value(value.count());
             }

x-pack/plugin/analytics/src/main/java/org/elasticsearch/xpack/analytics/mapper/TDigestParser.java

@@ -16,62 +16,64 @@
 import java.util.List;
 
 import static org.elasticsearch.common.xcontent.XContentParserUtils.ensureExpectedToken;
+import static org.elasticsearch.xpack.analytics.mapper.TDigestFieldMapper.CENTROIDS_NAME;
+import static org.elasticsearch.xpack.analytics.mapper.TDigestFieldMapper.COUNTS_NAME;
 
 public class TDigestParser {
 
-    private static final ParseField COUNTS_FIELD = new ParseField("counts");
-    private static final ParseField VALUES_FIELD = new ParseField("centroids");
+    private static final ParseField COUNTS_FIELD = new ParseField(COUNTS_NAME);
+    private static final ParseField CENTROIDS_FIELD = new ParseField(CENTROIDS_NAME);
 
     /**
-     * A parsed histogram field, can represent either a T-Digest or a HDR histogram.
-     * @param values the centroids, guaranteed to be distinct and in increasing order
-     * @param counts the counts, guaranteed to be non-negative and of the same length as values
+     * A parsed histogram field, can represent either a T-Digest
+     * @param centroids the centroids, guaranteed to be distinct and in increasing order
+     * @param counts the counts, guaranteed to be non-negative and of the same length as the centroids array
      */
-    public record ParsedHistogram(List<Double> values, List<Long> counts) {}
+    public record ParsedHistogram(List<Double> centroids, List<Long> counts) {}
 
     /**
      * Parses an XContent object into a histogram.
-     * The parse is expected to point at the next token after {@link XContentParser.Token#START_OBJECT}.
+     * The parser is expected to point at the next token after {@link XContentParser.Token#START_OBJECT}.
      *
      * @param mappedFieldName the name of the field being parsed, used for error messages
      * @param parser the parser to use
      * @return the parsed histogram
      */
     public static ParsedHistogram parse(String mappedFieldName, XContentParser parser) throws IOException {
-        ArrayList<Double> values = null;
+        ArrayList<Double> centroids = null;
         ArrayList<Long> counts = null;
         XContentParser.Token token = parser.currentToken();
         while (token != XContentParser.Token.END_OBJECT) {
             // should be a field
             ensureExpectedToken(XContentParser.Token.FIELD_NAME, token, parser);
             String fieldName = parser.currentName();
-            if (fieldName.equals(VALUES_FIELD.getPreferredName())) {
+            if (fieldName.equals(CENTROIDS_FIELD.getPreferredName())) {
                 token = parser.nextToken();
                 // should be an array
                 ensureExpectedToken(XContentParser.Token.START_ARRAY, token, parser);
-                values = new ArrayList<>();
+                centroids = new ArrayList<>();
                 token = parser.nextToken();
                 double previousVal = -Double.MAX_VALUE;
                 while (token != XContentParser.Token.END_ARRAY) {
                     // should be a number
                     ensureExpectedToken(XContentParser.Token.VALUE_NUMBER, token, parser);
                     double val = parser.doubleValue();
                     if (val < previousVal) {
-                        // values must be in increasing order
+                        // centroids must be in increasing order
                         throw new DocumentParsingException(
                             parser.getTokenLocation(),
                             "error parsing field ["
                                 + mappedFieldName
                                 + "], ["
-                                + VALUES_FIELD
-                                + "] values must be in increasing order, got ["
+                                + CENTROIDS_FIELD
+                                + "] centroids must be in increasing order, got ["
                                 + val
                                 + "] but previous value was ["
                                 + previousVal
                                 + "]"
                         );
                     }
-                    values.add(val);
+                    centroids.add(val);
                     previousVal = val;
                     token = parser.nextToken();
                 }
@@ -102,10 +104,10 @@ public static ParsedHistogram parse(String mappedFieldName, XContentParser parse
             }
             token = parser.nextToken();
         }
-        if (values == null) {
+        if (centroids == null) {
             throw new DocumentParsingException(
                 parser.getTokenLocation(),
-                "error parsing field [" + mappedFieldName + "], expected field called [" + VALUES_FIELD.getPreferredName() + "]"
+                "error parsing field [" + mappedFieldName + "], expected field called [" + CENTROIDS_FIELD.getPreferredName() + "]"
             );
         }
         if (counts == null) {
@@ -114,24 +116,24 @@ public static ParsedHistogram parse(String mappedFieldName, XContentParser parse
                 "error parsing field [" + mappedFieldName + "], expected field called [" + COUNTS_FIELD.getPreferredName() + "]"
             );
         }
-        if (values.size() != counts.size()) {
+        if (centroids.size() != counts.size()) {
             throw new DocumentParsingException(
                 parser.getTokenLocation(),
                 "error parsing field ["
                     + mappedFieldName
                     + "], expected same length from ["
-                    + VALUES_FIELD.getPreferredName()
+                    + CENTROIDS_FIELD.getPreferredName()
                     + "] and "
                     + "["
                     + COUNTS_FIELD.getPreferredName()
                     + "] but got ["
-                    + values.size()
+                    + centroids.size()
                     + " != "
                     + counts.size()
                     + "]"
             );
         }
-        return new ParsedHistogram(values, counts);
+        return new ParsedHistogram(centroids, counts);
     }
 
 }