Update test coverage

Signed-off-by: Andy Kwok <andy.kwok@improving.com>
Bit-Quill · Feb 14, 2025 · 8348950 · 8348950
1 parent 4be0400
commit 8348950
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 4 deletions.
diff --git a/core/src/main/java/org/opensearch/sql/planner/physical/TrendlineOperator.java b/core/src/main/java/org/opensearch/sql/planner/physical/TrendlineOperator.java
@@ -365,9 +365,6 @@ Function<Queue<ExprValue>, ExprValue> getWmaEvaluator(ExprCoreType type) {
     @Override
     public void accumulate(ExprValue value) {
       receivedValues.add(value);
-      if (receivedValues.size() > dataPointsNeeded.valueOf().integerValue()) {
-        receivedValues.remove();
-      }
     }
 
     @Override

diff --git a/core/src/test/java/org/opensearch/sql/planner/physical/TrendlineOperatorTest.java b/core/src/test/java/org/opensearch/sql/planner/physical/TrendlineOperatorTest.java
@@ -428,6 +428,36 @@ public void calculates_weighted_moving_average_one_field_four_samples_four_rows(
             tupleValue(ImmutableMap.of("distance", 200, "time", 10, "distance_alias", 190))));
   }
 
+  @Test
+  public void calculates_weighted_moving_average_one_field_five_samples_four_rows() {
+    mockPlanWithData(
+        List.of(
+            tupleValue(ImmutableMap.of("distance", 100, "time", 10)),
+            tupleValue(ImmutableMap.of("distance", 200, "time", 10)),
+            tupleValue(ImmutableMap.of("distance", 200, "time", 10)),
+            tupleValue(ImmutableMap.of("distance", 200, "time", 10)),
+            tupleValue(ImmutableMap.of("distance", 200, "time", 10))));
+
+    var plan =
+        new TrendlineOperator(
+            inputPlan,
+            Collections.singletonList(
+                Pair.of(
+                    AstDSL.computation(4, AstDSL.field("distance"), "distance_alias", WMA),
+                    ExprCoreType.DOUBLE)));
+
+    List<ExprValue> result = execute(plan);
+    assertEquals(5, result.size());
+    assertThat(
+        result,
+        containsInAnyOrder(
+            tupleValue(ImmutableMap.of("distance", 100, "time", 10)),
+            tupleValue(ImmutableMap.of("distance", 200, "time", 10)),
+            tupleValue(ImmutableMap.of("distance", 200, "time", 10)),
+            tupleValue(ImmutableMap.of("distance", 200, "time", 10, "distance_alias", 190)),
+            tupleValue(ImmutableMap.of("distance", 200, "time", 10, "distance_alias", 200))));
+  }
+
   @Test
   public void calculates_weighted_moving_average_multiple_computations() {
     mockPlanWithData(

diff --git a/integ-test/src/test/java/org/opensearch/sql/ppl/TrendlineCommandIT.java b/integ-test/src/test/java/org/opensearch/sql/ppl/TrendlineCommandIT.java
@@ -165,5 +165,4 @@ public void testTrendlineWithSortWma() throws IOException {
         rows(19615.8),
         rows(29393.6));
   }
-
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -165,5 +165,4 @@ public void testTrendlineWithSortWma() throws IOException { @@
             rows(19615.8),
             rows(29393.6));
       }
     }