Revert windowed functions changes.

JAVA-3860

Author: vbabanin

driver-core/src/main/com/mongodb/client/model/WindowOutputFields.java

@@ -111,60 +111,6 @@ public static <TExpression> WindowOutputField avg(final String path, final TExpr
         return simpleParameterWindowFunction(path, "$avg", expression, window);
     }
 
-    /**
-     * Builds a window output field of percentiles of the evaluation results of the {@code inExpression}
-     * over documents in the specified {@code window}. The {@code pExpression} parameter represents an array of
-     * percentiles of interest, with each element being a numeric value between 0.0 and 1.0 (inclusive).
-     *
-     * @param path The output field path.
-     * @param inExpression The input expression.
-     * @param pExpression The expression representing a percentiles of interest.
-     * @param method The method to be used for computing the percentiles.
-     * @param window The window.
-     * @param <InExpression> The type of the input expression.
-     * @param <PExpression> The type of the percentile expression.
-     * @return The constructed windowed output field.
-     * @mongodb.driver.manual reference/operator/aggregation/percentile/ $percentile
-     * @mongodb.server.release 7.0
-     */
-    public static <InExpression, PExpression> WindowOutputField percentile(final String path, final InExpression inExpression,
-                                                                           final PExpression pExpression, final String method,
-                                                                           @Nullable final Window window) {
-        notNull("path", path);
-        notNull("inExpression", inExpression);
-        notNull("pExpression", pExpression);
-        notNull("method", method);
-        Map<ParamName, Object> args = new LinkedHashMap<>(3);
-        args.put(ParamName.INPUT, inExpression);
-        args.put(ParamName.P_LOWERCASE, pExpression);
-        args.put(ParamName.METHOD, method);
-        return compoundParameterWindowFunction(path, "$percentile", args, window);
-    }
-
-    /**
-     * Builds a window output field representing the median value of the evaluation results of the {@code inExpression}
-     * over documents in the specified {@code window}.
-     *
-     * @param inExpression The input expression.
-     * @param method The method to be used for computing the median.
-     * @param window The window.
-     * @param <InExpression> The type of the input expression.
-     * @return The constructed windowed output field.
-     * @mongodb.driver.manual reference/operator/aggregation/median/ $median
-     * @mongodb.server.release 7.0
-     */
-    public static <InExpression> WindowOutputField median(final String path, final InExpression inExpression,
-                                                                           final String method,
-                                                                           @Nullable final Window window) {
-        notNull("path", path);
-        notNull("inExpression", inExpression);
-        notNull("method", method);
-        Map<ParamName, Object> args = new LinkedHashMap<>(2);
-        args.put(ParamName.INPUT, inExpression);
-        args.put(ParamName.METHOD, method);
-        return compoundParameterWindowFunction(path, "$median", args, window);
-    }
-
     /**
      * Builds a window output field of the sample standard deviation of the evaluation results of the {@code expression} over the
      * {@code window}.
@@ -1067,13 +1013,11 @@ private enum ParamName {
         UNIT("unit"),
         N_UPPERCASE("N"),
         N_LOWERCASE("n"),
-        P_LOWERCASE("p"),
         ALPHA("alpha"),
         OUTPUT("output"),
         BY("by"),
         DEFAULT("default"),
-        SORT_BY("sortBy"),
-        METHOD("method");
+        SORT_BY("sortBy");
 
         private final String value;
 

driver-core/src/test/functional/com/mongodb/client/model/AggregatesFunctionalSpecification.groovy

@@ -1174,14 +1174,47 @@ class AggregatesFunctionalSpecification extends OperationFunctionalSpecification
     @IgnoreIf({ serverVersionLessThan(5, 2) })
     def '$setWindowFields'(Bson preSortBy, Object partitionBy, Bson sortBy, WindowOutputField output, List<Object> expectedFieldValues) {
         given:
-        populateDatabaseWithInitialData()
-
-        when:
-        List<Object> actualFieldValues = aggregateWithWindowFields(partitionBy, sortBy, output, preSortBy)
+        ZoneId utc = ZoneId.of(ZoneOffset.UTC.getId())
+        getCollectionHelper().drop()
+        Document[] original = [
+                new Document('partitionId', 1)
+                        .append('num1', 1)
+                        .append('num2', -1)
+                        .append('numMissing', 1)
+                        .append('date', LocalDateTime.ofInstant(Instant.ofEpochSecond(1), utc)),
+                new Document('partitionId', 1)
+                        .append('num1', 2)
+                        .append('num2', -2)
+                        .append('date', LocalDateTime.ofInstant(Instant.ofEpochSecond(2), utc)),
+                new Document('partitionId', 2)
+                        .append('num1', 3)
+                        .append('num2', -3)
+                        .append('numMissing', 3)
+                        .append('date', LocalDateTime.ofInstant(Instant.ofEpochSecond(3), utc))]
+        getCollectionHelper().insertDocuments(original)
+        List<Bson> stages = [
+                setWindowFields(partitionBy, sortBy, output),
+                sort(ascending('num1'))
+        ]
+        if (preSortBy != null) {
+            stages.add(0, sort(preSortBy))
+        }
+        List<Document> actual = aggregate(stages)
+        List<Object> actualFieldValues = actual.stream()
+                .map { doc -> doc.get('result') }
+                .collect(toList())
 
-        then:
+        expect:
         actualFieldValues.size() == expectedFieldValues.size()
-        assertEquals(actualFieldValues, expectedFieldValues)
+        for (int i = 0; i < actualFieldValues.size(); i++) {
+            Object actualV = actualFieldValues.get(i)
+            Object expectedV = expectedFieldValues.get(i)
+            if (actualV instanceof Collection && expectedV instanceof Set) {
+                assert ((Collection) actualV).toSet() == expectedV
+            } else {
+                assert actualV == expectedV
+            }
+        }
 
         where:
         preSortBy | partitionBy | sortBy | output | expectedFieldValues
@@ -1269,36 +1302,6 @@ class AggregatesFunctionalSpecification extends OperationFunctionalSpecification
                 .linearFill('result', '$numMissing') | [ 1, 2, 3 ]
     }
 
-    @IgnoreIf({ serverVersionLessThan(7, 0) })
-    def '$setWindowFields with quantiles'(Bson preSortBy, Object partitionBy, Bson sortBy,
-                                          WindowOutputField output, List<Object> expectedFieldValues) {
-        given:
-        populateDatabaseWithInitialData()
-
-        when:
-        List<Object> actualFieldValues = aggregateWithWindowFields(partitionBy, sortBy, output, preSortBy)
-
-        then:
-        actualFieldValues.size() == expectedFieldValues.size()
-        assertEquals(actualFieldValues, expectedFieldValues)
-
-        where:
-        preSortBy | partitionBy | sortBy | output | expectedFieldValues
-        null | null | null | WindowOutputFields
-                .percentile('result', '$num1', [0.1, 0.9], 'approximate', documents(UNBOUNDED, UNBOUNDED)) |
-                [[1.0, 3.0], [1.0, 3.0], [1.0, 3.0]]
-        null | null | null | WindowOutputFields
-                .percentile('result', '$num1', [0.1, 0.9], 'approximate', null) |
-                [[1.0, 3.0], [1.0, 3.0], [1.0, 3.0]]
-        null | '$partitionId' | null | WindowOutputFields
-                .percentile('result', '$num1', [0.1, 0.9], 'approximate', documents(UNBOUNDED, UNBOUNDED)) |
-                [[1.0, 2.0], [1.0, 2.0], [3.0, 3.0]]
-        null | null | null | WindowOutputFields
-                .median('result', '$num1', 'approximate', documents(UNBOUNDED, UNBOUNDED)) | [2.0, 2.0, 2.0]
-        null | '$partitionId' | null | WindowOutputFields
-                .median('result', '$num1', 'approximate', documents(UNBOUNDED, UNBOUNDED)) | [1.0, 1.0, 3.0]
-    }
-
     @IgnoreIf({ serverVersionLessThan(5, 0) })
     def '$setWindowFields with multiple output'() {
         given:
@@ -1436,53 +1439,4 @@ class AggregatesFunctionalSpecification extends OperationFunctionalSpecification
                 FillOutputField.locf('field1'))                                  |
                 [1, 3, 3]
     }
-
-    private void assertEquals(List<Object> actualFieldValues, List<Object> expectedFieldValues) {
-        for (int i = 0; i < actualFieldValues.size(); i++) {
-            Object actualV = actualFieldValues.get(i)
-            Object expectedV = expectedFieldValues.get(i)
-            if (actualV instanceof Collection && expectedV instanceof Set) {
-                assert ((Collection) actualV).toSet() == expectedV
-            } else {
-                assert actualV == expectedV
-            }
-        }
-    }
-
-    private populateDatabaseWithInitialData(){
-        ZoneId utc = ZoneId.of(ZoneOffset.UTC.getId())
-        getCollectionHelper().drop()
-        Document[] original = [
-                new Document('partitionId', 1)
-                        .append('num1', 1)
-                        .append('num2', -1)
-                        .append('numMissing', 1)
-                        .append('date', LocalDateTime.ofInstant(Instant.ofEpochSecond(1), utc)),
-                new Document('partitionId', 1)
-                        .append('num1', 2)
-                        .append('num2', -2)
-                        .append('date', LocalDateTime.ofInstant(Instant.ofEpochSecond(2), utc)),
-                new Document('partitionId', 2)
-                        .append('num1', 3)
-                        .append('num2', -3)
-                        .append('numMissing', 3)
-                        .append('date', LocalDateTime.ofInstant(Instant.ofEpochSecond(3), utc))]
-        getCollectionHelper().insertDocuments(original)
-    }
-
-    private List<Object> aggregateWithWindowFields(partitionBy, Bson sortBy, WindowOutputField output, Bson preSortBy) {
-        def actualFieldValues
-        def stages = [
-                setWindowFields(partitionBy, sortBy, output),
-                sort(ascending('num1'))
-        ]
-        if (preSortBy != null) {
-            stages.add(0, sort(preSortBy))
-        }
-        List<Document> actual = aggregate(stages)
-        actualFieldValues = actual.stream()
-                .map { doc -> doc.get('result') }
-                .collect(toList())
-        actualFieldValues
-    }
 }

driver-core/src/test/unit/com/mongodb/client/model/TestWindowOutputFields.java

@@ -26,22 +26,15 @@
 import org.bson.Document;
 import org.bson.conversions.Bson;
 import org.junit.jupiter.api.Test;
-import org.junit.jupiter.params.ParameterizedTest;
-import org.junit.jupiter.params.provider.Arguments;
-import org.junit.jupiter.params.provider.MethodSource;
 
 import java.util.AbstractMap;
-import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Map;
 import java.util.function.BiFunction;
 import java.util.function.Function;
 import java.util.function.Supplier;
-import java.util.stream.Stream;
 
 import static com.mongodb.assertions.Assertions.assertNotNull;
 import static com.mongodb.client.model.Sorts.ascending;
@@ -58,9 +51,6 @@ final class TestWindowOutputFields {
     private static final String PATH = "newField";
     private static final Bson SORT_BY = ascending("sortByField");
     private static final Map.Entry<Integer, BsonValue> INT_EXPR = new AbstractMap.SimpleImmutableEntry<>(1, new BsonInt32(1));
-    private static final Map.Entry<Object, BsonArray> ARRAY_EXPR =
-            new AbstractMap.SimpleImmutableEntry<>(Arrays.asList(0.5, 0.9, "$$letValueX"),
-                    new BsonArray(Arrays.asList(new BsonDouble(0.5), new BsonDouble(0.9), new BsonString("$$letValueX"))));
     private static final Map.Entry<String, BsonValue> STR_EXPR =
             new AbstractMap.SimpleImmutableEntry<>("$fieldToRead", new BsonString("$fieldToRead"));
     private static final Map.Entry<Document, BsonDocument> DOC_EXPR = new AbstractMap.SimpleImmutableEntry<>(
@@ -222,111 +212,6 @@ void pick() {
         );
     }
 
-    @ParameterizedTest
-    @MethodSource("percentileWindowFunctionsSource")
-    void percentile(final Object inExpressionParameter,
-                    final BsonValue expectedInExpression,
-                    final Object pExpressionParameter,
-                    final BsonValue expectedPExpression,
-                    final Window window) {
-        String expectedFunctionName = "$percentile";
-        String method = "approximate";
-        BsonField expectedWindowOutputField = getExpectedBsonField(expectedFunctionName, expectedInExpression, expectedPExpression,
-                method, window);
-
-        Supplier<String> msg = () -> "expectedFunctionName=" + expectedFunctionName
-                + ", path=" + PATH
-                + ", InExpression=" + inExpressionParameter
-                + ", pExpression=" + pExpressionParameter
-                + ", method=" + method
-                + ", window=" + window;
-
-        assertWindowOutputField(expectedWindowOutputField, WindowOutputFields.percentile(PATH, inExpressionParameter, pExpressionParameter, method, window),
-                msg);
-        assertThrows(IllegalArgumentException.class, () -> WindowOutputFields.percentile(null, inExpressionParameter, pExpressionParameter, method, window), msg);
-        assertThrows(IllegalArgumentException.class, () -> WindowOutputFields.percentile(PATH, null, pExpressionParameter, method, window), msg);
-        assertThrows(IllegalArgumentException.class, () -> WindowOutputFields.percentile(PATH, inExpressionParameter, null, method, window), msg);
-        assertThrows(IllegalArgumentException.class, () -> WindowOutputFields.percentile(PATH, inExpressionParameter, pExpressionParameter, null, window), msg);
-    }
-
-    @ParameterizedTest
-    @MethodSource("medianWindowFunctionsSource")
-    void median(final Object inExpressionParameter,
-                final BsonValue expectedInExpression,
-                final Window window) {
-        String expectedFunctionName = "$median";
-        String method = "approximate";
-        BsonField expectedWindowOutputField = getExpectedBsonField(expectedFunctionName, expectedInExpression,
-                null, method, window);
-
-        Supplier<String> msg = () -> "expectedFunctionName=" + expectedFunctionName
-                + ", path=" + PATH
-                + ", InExpression=" + inExpressionParameter
-                + ", method=" + method
-                + ", window=" + window;
-
-        assertWindowOutputField(expectedWindowOutputField, WindowOutputFields.median(PATH, inExpressionParameter, method, window),
-                msg);
-        assertThrows(IllegalArgumentException.class, () -> WindowOutputFields.median(null, inExpressionParameter, method, window),
-                msg);
-        assertThrows(IllegalArgumentException.class, () -> WindowOutputFields.median(PATH, null, method, window), msg);
-        assertThrows(IllegalArgumentException.class, () -> WindowOutputFields.median(PATH, inExpressionParameter, null, window), msg);
-    }
-
-    private static Stream<Arguments> percentileWindowFunctionsSource() {
-        Map<Object, BsonValue> inExpressions = new HashMap<>();
-        inExpressions.put(INT_EXPR.getKey(), INT_EXPR.getValue());
-        inExpressions.put(STR_EXPR.getKey(), STR_EXPR.getValue());
-        inExpressions.put(DOC_EXPR.getKey(), DOC_EXPR.getValue());
-
-        Map<Object, BsonValue> pExpressions = new HashMap<>();
-        pExpressions.put(ARRAY_EXPR.getKey(), ARRAY_EXPR.getValue());
-        pExpressions.put(STR_EXPR.getKey(), STR_EXPR.getValue());
-
-        Collection<Window> windows = asList(null, POSITION_BASED_WINDOW, RANGE_BASED_WINDOW);
-
-        // Generate different combinations of test arguments using Cartesian product of inExpressions, pExpressions, and windows.
-        List<Arguments> argumentsList = new ArrayList<>();
-        inExpressions.forEach((incomingInParameter, inBsonValue) ->
-                pExpressions.forEach((incomingPParameter, pBsonValue) ->
-                        windows.forEach(window ->
-                                argumentsList.add(
-                                        Arguments.of(incomingInParameter, inBsonValue, incomingPParameter, pBsonValue, window)))));
-        return Stream.of(argumentsList.toArray(new Arguments[]{}));
-    }
-
-    private static Stream<Arguments> medianWindowFunctionsSource() {
-        Map<Object, BsonValue> inExpressions = new HashMap<>();
-        inExpressions.put(INT_EXPR.getKey(), INT_EXPR.getValue());
-        inExpressions.put(STR_EXPR.getKey(), STR_EXPR.getValue());
-        inExpressions.put(DOC_EXPR.getKey(), DOC_EXPR.getValue());
-
-        Collection<Window> windows = asList(null, POSITION_BASED_WINDOW, RANGE_BASED_WINDOW);
-
-        // Generate different combinations of test arguments using Cartesian product of inExpressions and windows.
-        List<Arguments> argumentsList = new ArrayList<>();
-        inExpressions.forEach((incomingInParameter, inBsonValue) ->
-                windows.forEach(window ->
-                        argumentsList.add(
-                                Arguments.of(incomingInParameter, inBsonValue,  window))));
-        return Stream.of(argumentsList.toArray(new Arguments[]{}));
-    }
-
-    private static BsonField getExpectedBsonField(final String expectedFunctionName, final BsonValue expectedInExpression,
-                                                  final @Nullable BsonValue expectedPExpression,
-                                                  final String method, final @Nullable Window window) {
-        BsonDocument expectedFunctionDoc = new BsonDocument("input", expectedInExpression);
-        if (expectedPExpression != null) {
-            expectedFunctionDoc.append("p", expectedPExpression);
-        }
-        expectedFunctionDoc.append("method", new BsonString(method));
-        BsonDocument expectedFunctionAndWindow = new BsonDocument(expectedFunctionName, expectedFunctionDoc);
-        if (window != null) {
-            expectedFunctionAndWindow.append("window", window.toBsonDocument());
-        }
-        return new BsonField(PATH, expectedFunctionAndWindow);
-    }
-
     private static void assertPickNoSortWindowFunction(
             final String expectedFunctionName,
             final QuadriFunction<String, Object, Object, Window, WindowOutputField> windowOutputFieldBuilder,