#1 Face lifting

Author: mbok

src/main/java/org/scaleborn/elasticsearch/linreg/LinearRegressionPlugin.java

@@ -27,6 +27,9 @@
 import org.scaleborn.elasticsearch.linreg.aggregation.stats.StatsAggregationBuilder;
 import org.scaleborn.elasticsearch.linreg.aggregation.stats.StatsAggregationParser;
 
+/**
+ * Plugin definition for linear regression aggregations.
+ */
 public class LinearRegressionPlugin extends Plugin implements SearchPlugin {
 
   @Override

src/main/java/org/scaleborn/elasticsearch/linreg/aggregation/predict/InternalPrediction.java

@@ -17,7 +17,6 @@
 package org.scaleborn.elasticsearch.linreg.aggregation.predict;
 
 import java.io.IOException;
-import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import org.apache.logging.log4j.Logger;
@@ -93,7 +92,7 @@ protected InternalPrediction buildInternalAggregation(final String name, final i
   protected PredictionResults buildResults(final PredictionSampling composedSampling,
       final SlopeCoefficients slopeCoefficients, final double intercept) {
     double predictedValue = intercept;
-    LOGGER.info("Predicting values for inputs: {}", Arrays.toString(this.inputs));
+    LOGGER.debug("Predicting values for inputs: {}", this.inputs);
     for (int i = 0; i < this.featuresCount; i++) {
       predictedValue += slopeCoefficients.getCoefficients()[i] * this.inputs[i];
     }

src/main/java/org/scaleborn/elasticsearch/linreg/aggregation/predict/PredictionAggregationParser.java

@@ -20,10 +20,8 @@
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
-import org.apache.logging.log4j.Logger;
 import org.elasticsearch.common.ParseField;
 import org.elasticsearch.common.ParsingException;
-import org.elasticsearch.common.logging.Loggers;
 import org.elasticsearch.common.xcontent.XContentParser;
 import org.elasticsearch.common.xcontent.XContentParser.Token;
 import org.scaleborn.elasticsearch.linreg.aggregation.support.BaseParser;
@@ -33,7 +31,6 @@
  */
 public class PredictionAggregationParser extends BaseParser<PredictionAggregationBuilder> {
 
-  private static final Logger LOGGER = Loggers.getLogger(PredictionAggregationParser.class);
   private static final ParseField INPUTS = new ParseField("inputs");
 
 
@@ -73,7 +70,6 @@ protected boolean token(final String aggregationName, final String currentFieldN
         }
       }
       otherOptions.put(INPUTS, inputFields);
-      LOGGER.info("Parsed input fields: {}", inputFields);
       return true;
     }
     return false;

src/main/java/org/scaleborn/elasticsearch/linreg/aggregation/support/BaseInternalAggregation.java

@@ -149,14 +149,14 @@ public InternalAggregation doReduce(final List<InternalAggregation> aggregations
 
     final S composedSampling = buildSampling(this.featuresCount);
     for (int i = 0; i < aggs.size(); ++i) {
-      LOGGER.info("Merging sampling={}: {}", i, ((BaseInternalAggregation) aggs.get(i)).sampling);
+      LOGGER.debug("Merging sampling={}: {}", i, ((BaseInternalAggregation) aggs.get(i)).sampling);
       //noinspection unchecked
       composedSampling.merge((S) ((BaseInternalAggregation) aggs.get(i)).sampling);
     }
 
     final M evaluatedResults = evaluateResults(composedSampling);
 
-    LOGGER.info("Evaluated results: {}", evaluatedResults);
+    LOGGER.debug("Evaluated results: {}", evaluatedResults);
     return buildInternalAggregation(this.name, this.featuresCount, composedSampling,
         evaluatedResults,
         pipelineAggregators(), getMetaData());

src/main/java/org/scaleborn/elasticsearch/linreg/aggregation/support/BaseSamplingAggregator.java

@@ -51,6 +51,8 @@ public abstract class BaseSamplingAggregator<S extends BaseSampling<S>> extends
 
   protected ObjectArray<S> samplings;
 
+  private int fieldsCount;
+
   public BaseSamplingAggregator(final String name,
       final List<NamedValuesSourceSpec<Numeric>> valuesSources,
       final SearchContext context,
@@ -61,6 +63,7 @@ public BaseSamplingAggregator(final String name,
     if (valuesSources != null && !valuesSources.isEmpty()) {
       this.valuesSources = new NumericMultiValuesSource(valuesSources, multiValueMode);
       this.samplings = context.bigArrays().newObjectArray(1);
+      this.fieldsCount = this.valuesSources.fieldNames().length;
     } else {
       this.valuesSources = null;
     }
@@ -78,15 +81,13 @@ public LeafBucketCollector getLeafCollector(final LeafReaderContext ctx,
       return LeafBucketCollector.NO_OP_COLLECTOR;
     }
     final BigArrays bigArrays = this.context.bigArrays();
-    final NumericDoubleValues[] values = new NumericDoubleValues[this.valuesSources
-        .fieldNames().length];
-    for (int i = 0; i < values.length; ++i) {
+    final NumericDoubleValues[] values = new NumericDoubleValues[this.fieldsCount];
+    for (int i = 0; i < this.fieldsCount; ++i) {
       values[i] = this.valuesSources.getField(i, ctx);
     }
 
     return new LeafBucketCollectorBase(sub, values) {
-      final String[] fieldNames = BaseSamplingAggregator.this.valuesSources.fieldNames();
-      final double[] fieldVals = new double[this.fieldNames.length];
+      final double[] fieldVals = new double[BaseSamplingAggregator.this.fieldsCount];
 
       @Override
       public void collect(final int doc, final long bucket) throws IOException {
@@ -97,13 +98,14 @@ public void collect(final int doc, final long bucket) throws IOException {
           S sampling = BaseSamplingAggregator.this.samplings.get(bucket);
           // add document fields to correlation stats
           if (sampling == null) {
-            sampling = buildSampling(this.fieldNames.length - 1);
+            sampling = buildSampling(BaseSamplingAggregator.this.fieldsCount - 1);
             BaseSamplingAggregator.this.samplings.set(bucket, sampling);
           }
-          LOGGER.info("Sampling for bucket={}, fields={}", bucket, this.fieldVals);
-          sampling.sample(this.fieldVals, this.fieldVals[this.fieldVals.length - 1]);
+          // LOGGER.info("Sampling for bucket={}, fields={}", bucket, this.fieldVals);
+          sampling
+              .sample(this.fieldVals, this.fieldVals[BaseSamplingAggregator.this.fieldsCount - 1]);
         } else {
-          LOGGER.warn("Skipped bucket={}, fields={}", bucket, this.fieldVals);
+          // LOGGER.warn("Skipped bucket={}, fields={}", bucket, this.fieldVals);
         }
       }
 
@@ -112,7 +114,7 @@ public void collect(final int doc, final long bucket) throws IOException {
        */
       private boolean includeDocument(final int doc) {
         // loop over fields
-        for (int i = 0; i < this.fieldVals.length; ++i) {
+        for (int i = 0; i < BaseSamplingAggregator.this.fieldsCount; ++i) {
           final NumericDoubleValues doubleValues = values[i];
           final double value = doubleValues.get(doc);
           // skip if value is missing