Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

EN-51893 | CHORE : Adding Last aggregation operator #215

Merged
merged 4 commits into from
Oct 18, 2024
Merged

EN-51893 | CHORE : Adding Last aggregation operator #215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
50162fa
Adding ast aggregation operator
singh-viikram Oct 17, 2024
54983c2
added integration tests
singh-viikram Oct 17, 2024
6e0d7b3
resolved comments
singh-viikram Oct 18, 2024
bff2d9c
minor fix
singh-viikram Oct 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 19 additions & 0 deletions ...store/src/integrationTest/java/org/hypertrace/core/documentstore/DocStoreQueryV1Test.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import static org.hypertrace.core.documentstore.expression.operators.AggregationOperator.COUNT;
import static org.hypertrace.core.documentstore.expression.operators.AggregationOperator.DISTINCT_ARRAY;
import static org.hypertrace.core.documentstore.expression.operators.AggregationOperator.DISTINCT_COUNT;
import static org.hypertrace.core.documentstore.expression.operators.AggregationOperator.LAST;
import static org.hypertrace.core.documentstore.expression.operators.AggregationOperator.MAX;
import static org.hypertrace.core.documentstore.expression.operators.AggregationOperator.MIN;
import static org.hypertrace.core.documentstore.expression.operators.AggregationOperator.SUM;
Expand Down Expand Up @@ -1334,6 +1335,24 @@ public void testQueryV1AggregationFilterWithWhereClause(String dataStoreName) th
dataStoreName, resultDocs, "query/test_aggr_filter_and_where_filter_result.json", 2);
}

@ParameterizedTest
@ArgumentsSource(MongoProvider.class)
public void testQueryV1LastAggregationOperator(String dataStoreName) throws IOException {
Collection collection = getCollection(dataStoreName);

org.hypertrace.core.documentstore.query.Query query =
org.hypertrace.core.documentstore.query.Query.builder()
.addSelection(IdentifierExpression.of("item"))
.addAggregation(IdentifierExpression.of("item"))
.addSelection(
AggregateExpression.of(LAST, IdentifierExpression.of("price")), "last_price")
.build();

Iterator<Document> resultDocs = collection.aggregate(query);
assertDocsAndSizeEqualWithoutOrder(
dataStoreName, resultDocs, "query/test_last_aggregation_operator.json", 4);
}

@Nested
class StartsWithOperatorTest {

Expand Down
16 changes: 12 additions & 4 deletions document-store/src/integrationTest/resources/query/collection_data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,10 @@
"quantity": 2,
"date": "2014-03-01T08:00:00Z",
"props": {
"colors": ["Blue", "Green"],
"colors": [
"Blue",
"Green"
],
"brand": "Dettol",
"size": "M",
"seller": {
Expand Down Expand Up @@ -70,7 +73,9 @@
"quantity": 10,
"date": "2014-03-15T09:00:00Z",
"props": {
"colors": ["Black"],
"colors": [
"Black"
],
"brand": "Sunsilk",
"size": "L",
"seller": {
Expand Down Expand Up @@ -133,7 +138,10 @@
"quantity": 5,
"date": "2014-04-04T21:23:13.331Z",
"props": {
"colors": ["Orange", "Blue"],
"colors": [
"Orange",
"Blue"
],
"brand": "Lifebuoy",
"size": "S",
"seller": {
Expand Down Expand Up @@ -176,4 +184,4 @@
"quantity": 5,
"date": "2016-02-06T20:20:13Z"
}
]
]
18 changes: 18 additions & 0 deletions document-store/src/integrationTest/resources/query/test_last_aggregation_operator.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
[
{
"item":"Shampoo",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nit: Could you please prettify the JSON (specifically spaces before the values)?

Suggested change
"item":"Shampoo",
"item": "Shampoo",

"last_price":5
},
{
"item":"Comb",
"last_price":7.5
},
{
"item":"Mirror",
"last_price":20
},
{
"item":"Soap",
"last_price":20
}
]
singh-viikram marked this conversation as resolved.
Show resolved Hide resolved
1 change: 1 addition & 0 deletions ...main/java/org/hypertrace/core/documentstore/expression/operators/AggregationOperator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,4 +11,5 @@ public enum AggregationOperator {
SUM,
MIN,
MAX,
LAST,
}
2 changes: 2 additions & 0 deletions .../org/hypertrace/core/documentstore/mongo/query/parser/MongoAggregateExpressionParser.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import static org.hypertrace.core.documentstore.expression.operators.AggregationOperator.COUNT;
import static org.hypertrace.core.documentstore.expression.operators.AggregationOperator.DISTINCT;
import static org.hypertrace.core.documentstore.expression.operators.AggregationOperator.DISTINCT_ARRAY;
import static org.hypertrace.core.documentstore.expression.operators.AggregationOperator.LAST;
import static org.hypertrace.core.documentstore.expression.operators.AggregationOperator.MAX;
import static org.hypertrace.core.documentstore.expression.operators.AggregationOperator.MIN;
import static org.hypertrace.core.documentstore.expression.operators.AggregationOperator.SUM;
Expand All @@ -30,6 +31,7 @@ final class MongoAggregateExpressionParser extends MongoSelectTypeExpressionPars
put(MIN, "$min");
put(MAX, "$max");
put(COUNT, "$push");
put(LAST, "$last");
}
});

Expand Down
Loading