Skip to content

Commit 019028f

Browse files
vinaykpudvinaykpud
committed
Applied spotless fix
Signed-off-by: Vinay Krishna Pudyodu <vinkrish.neo@gmail.com>
1 parent c10cca4 commit 019028f

22 files changed

Lines changed: 133 additions & 160 deletions

‎sandbox/plugins/dsl-query-executor/src/internalClusterTest/java/org/opensearch/dsl/DslAggregationIT.java‎

Lines changed: 34 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -20,57 +20,60 @@ public class DslAggregationIT extends DslIntegTestBase {
2020

2121
public void testMetricOnly() {
2222
createTestIndex();
23-
assertOk(search(new SearchSourceBuilder()
24-
.size(0)
25-
.aggregation(AggregationBuilders.avg("avg_price").field("price"))
26-
));
23+
assertOk(search(new SearchSourceBuilder().size(0).aggregation(AggregationBuilders.avg("avg_price").field("price"))));
2724
}
2825

2926
public void testMultipleMetrics() {
3027
createTestIndex();
31-
assertOk(search(new SearchSourceBuilder()
32-
.size(0)
33-
.aggregation(AggregationBuilders.avg("avg_price").field("price"))
34-
.aggregation(AggregationBuilders.sum("total_price").field("price"))
35-
.aggregation(AggregationBuilders.min("min_price").field("price"))
36-
.aggregation(AggregationBuilders.max("max_price").field("price"))
37-
));
28+
assertOk(
29+
search(
30+
new SearchSourceBuilder().size(0)
31+
.aggregation(AggregationBuilders.avg("avg_price").field("price"))
32+
.aggregation(AggregationBuilders.sum("total_price").field("price"))
33+
.aggregation(AggregationBuilders.min("min_price").field("price"))
34+
.aggregation(AggregationBuilders.max("max_price").field("price"))
35+
)
36+
);
3837
}
3938

4039
public void testTermsBucket() {
4140
createTestIndex();
42-
assertOk(search(new SearchSourceBuilder()
43-
.size(0)
44-
.aggregation(new TermsAggregationBuilder("by_brand").field("brand"))
45-
));
41+
assertOk(search(new SearchSourceBuilder().size(0).aggregation(new TermsAggregationBuilder("by_brand").field("brand"))));
4642
}
4743

4844
public void testTermsBucketWithMetric() {
4945
createTestIndex();
50-
assertOk(search(new SearchSourceBuilder()
51-
.size(0)
52-
.aggregation(new TermsAggregationBuilder("by_brand").field("brand")
53-
.subAggregation(AggregationBuilders.avg("avg_price").field("price")))
54-
));
46+
assertOk(
47+
search(
48+
new SearchSourceBuilder().size(0)
49+
.aggregation(
50+
new TermsAggregationBuilder("by_brand").field("brand")
51+
.subAggregation(AggregationBuilders.avg("avg_price").field("price"))
52+
)
53+
)
54+
);
5555
}
5656

5757
public void testNestedBuckets() {
5858
createTestIndex();
59-
assertOk(search(new SearchSourceBuilder()
60-
.size(0)
61-
.aggregation(new TermsAggregationBuilder("by_brand").field("brand")
62-
.subAggregation(AggregationBuilders.sum("total").field("price"))
63-
.subAggregation(new TermsAggregationBuilder("by_name").field("name")
64-
.subAggregation(AggregationBuilders.avg("avg_price").field("price"))))
65-
));
59+
assertOk(
60+
search(
61+
new SearchSourceBuilder().size(0)
62+
.aggregation(
63+
new TermsAggregationBuilder("by_brand").field("brand")
64+
.subAggregation(AggregationBuilders.sum("total").field("price"))
65+
.subAggregation(
66+
new TermsAggregationBuilder("by_name").field("name")
67+
.subAggregation(AggregationBuilders.avg("avg_price").field("price"))
68+
)
69+
)
70+
)
71+
);
6672
}
6773

6874
public void testAggsWithHits() {
6975
createTestIndex();
7076
// size > 0 with aggs produces both HITS + AGGREGATION plans
71-
assertOk(search(new SearchSourceBuilder()
72-
.size(10)
73-
.aggregation(AggregationBuilders.avg("avg_price").field("price"))
74-
));
77+
assertOk(search(new SearchSourceBuilder().size(10).aggregation(AggregationBuilders.avg("avg_price").field("price"))));
7578
}
7679
}

‎sandbox/plugins/dsl-query-executor/src/internalClusterTest/java/org/opensearch/dsl/DslProjectIT.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
package org.opensearch.dsl;
1010

1111
import org.opensearch.search.builder.SearchSourceBuilder;
12-
import org.opensearch.search.fetch.subphase.FetchSourceContext;
1312

1413
/**
1514
* Integration tests for DSL _source filtering (projection) conversion.
@@ -24,12 +23,12 @@ public void testNoSourceFiltering() {
2423

2524
public void testIncludeSpecificFields() {
2625
createTestIndex();
27-
assertOk(search(new SearchSourceBuilder().fetchSource(new String[]{"name", "price"}, null)));
26+
assertOk(search(new SearchSourceBuilder().fetchSource(new String[] { "name", "price" }, null)));
2827
}
2928

3029
public void testExcludeFields() {
3130
createTestIndex();
32-
assertOk(search(new SearchSourceBuilder().fetchSource(new String[]{}, new String[]{"rating"})));
31+
assertOk(search(new SearchSourceBuilder().fetchSource(new String[] {}, new String[] { "rating" })));
3332
}
3433

3534
public void testSourceDisabled() {
@@ -39,11 +38,11 @@ public void testSourceDisabled() {
3938

4039
public void testWildcardIncludes() {
4140
createTestIndex();
42-
assertOk(search(new SearchSourceBuilder().fetchSource(new String[]{"na*"}, null)));
41+
assertOk(search(new SearchSourceBuilder().fetchSource(new String[] { "na*" }, null)));
4342
}
4443

4544
public void testWildcardExcludes() {
4645
createTestIndex();
47-
assertOk(search(new SearchSourceBuilder().fetchSource(new String[]{}, new String[]{"ra*"})));
46+
assertOk(search(new SearchSourceBuilder().fetchSource(new String[] {}, new String[] { "ra*" })));
4847
}
4948
}

‎sandbox/plugins/dsl-query-executor/src/internalClusterTest/java/org/opensearch/dsl/DslQueryIT.java‎

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ public void testWildcardQueryWithUnresolvedNode() {
4040
}
4141

4242
public void testFailsForNonexistentIndex() {
43-
expectThrows(Exception.class, () ->
44-
client().search(new SearchRequest("nonexistent-index").source(new SearchSourceBuilder())).actionGet()
43+
expectThrows(
44+
Exception.class,
45+
() -> client().search(new SearchRequest("nonexistent-index").source(new SearchSourceBuilder())).actionGet()
4546
);
4647
}
4748

@@ -50,8 +51,9 @@ public void testFailsForMultipleIndices() {
5051
createIndex("test-index-2");
5152
ensureGreen();
5253

53-
expectThrows(Exception.class, () ->
54-
client().search(new SearchRequest(INDEX, "test-index-2").source(new SearchSourceBuilder())).actionGet()
54+
expectThrows(
55+
Exception.class,
56+
() -> client().search(new SearchRequest(INDEX, "test-index-2").source(new SearchSourceBuilder())).actionGet()
5557
);
5658
}
5759
}

‎sandbox/plugins/dsl-query-executor/src/internalClusterTest/java/org/opensearch/dsl/DslSortIT.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -34,11 +34,7 @@ public void testSortDescending() {
3434

3535
public void testMultipleSortFields() {
3636
createTestIndex();
37-
assertOk(search(
38-
new SearchSourceBuilder()
39-
.sort("brand", SortOrder.ASC)
40-
.sort("price", SortOrder.DESC)
41-
));
37+
assertOk(search(new SearchSourceBuilder().sort("brand", SortOrder.ASC).sort("price", SortOrder.DESC)));
4238
}
4339

4440
public void testCustomSize() {

‎sandbox/plugins/dsl-query-executor/src/main/java/org/opensearch/dsl/aggregation/AggregationMetadataBuilder.java‎

Lines changed: 27 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -96,37 +96,42 @@ public AggregationMetadata build(RelDataType inputRowType, RelDataTypeFactory ty
9696
for (AggregateCall call : aggregateCalls) {
9797
if (noGroupBy) {
9898
RelDataType nullableType = typeFactory.createTypeWithNullability(call.getType(), true);
99-
allCalls.add(AggregateCall.create(
100-
call.getAggregation(), call.isDistinct(), call.isApproximate(),
101-
call.ignoreNulls(), call.getArgList(), call.filterArg,
102-
call.getCollation(), nullableType, call.getName()
103-
));
99+
allCalls.add(
100+
AggregateCall.create(
101+
call.getAggregation(),
102+
call.isDistinct(),
103+
call.isApproximate(),
104+
call.ignoreNulls(),
105+
call.getArgList(),
106+
call.filterArg,
107+
call.getCollation(),
108+
nullableType,
109+
call.getName()
110+
)
111+
);
104112
} else {
105113
allCalls.add(call);
106114
}
107115
}
108116
List<String> allFieldNames = new ArrayList<>(aggregateFieldNames);
109117

110118
if (implicitCountRequested) {
111-
allCalls.add(AggregateCall.create(
112-
SqlStdOperatorTable.COUNT,
113-
false,
114-
false,
115-
false,
116-
List.of(),
117-
-1,
118-
RelCollations.EMPTY,
119-
typeFactory.createSqlType(SqlTypeName.BIGINT),
120-
IMPLICIT_COUNT_NAME
121-
));
119+
allCalls.add(
120+
AggregateCall.create(
121+
SqlStdOperatorTable.COUNT,
122+
false,
123+
false,
124+
false,
125+
List.of(),
126+
-1,
127+
RelCollations.EMPTY,
128+
typeFactory.createSqlType(SqlTypeName.BIGINT),
129+
IMPLICIT_COUNT_NAME
130+
)
131+
);
122132
allFieldNames.add(IMPLICIT_COUNT_NAME);
123133
}
124134

125-
return new AggregationMetadata(
126-
ImmutableBitSet.of(allGroupIndices),
127-
allGroupFieldNames,
128-
allCalls,
129-
allFieldNames
130-
);
135+
return new AggregationMetadata(ImmutableBitSet.of(allGroupIndices), allGroupFieldNames, allCalls, allFieldNames);
131136
}
132137
}

‎sandbox/plugins/dsl-query-executor/src/main/java/org/opensearch/dsl/aggregation/AggregationTreeWalker.java‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -52,11 +52,8 @@ public AggregationTreeWalker(AggregationRegistry registry) {
5252
* @return metadata list, one per granularity (only levels with metrics or implicit count)
5353
* @throws ConversionException if any aggregation fails to convert
5454
*/
55-
public List<AggregationMetadata> walk(
56-
Collection<AggregationBuilder> aggs,
57-
RelDataType rowType,
58-
RelDataTypeFactory typeFactory
59-
) throws ConversionException {
55+
public List<AggregationMetadata> walk(Collection<AggregationBuilder> aggs, RelDataType rowType, RelDataTypeFactory typeFactory)
56+
throws ConversionException {
6057
Map<String, AggregationMetadataBuilder> granularities = new LinkedHashMap<>();
6158
walkRecursive(aggs, new ArrayList<>(), granularities, rowType);
6259

@@ -119,10 +116,7 @@ private void handleMetric(
119116
RelDataType rowType
120117
) throws ConversionException {
121118
AggregationMetadataBuilder builder = getOrCreateBuilder(currentGroupings, granularities);
122-
builder.addAggregateCall(
123-
translator.toAggregateCall(aggBuilder, rowType),
124-
translator.getAggregateFieldName(aggBuilder)
125-
);
119+
builder.addAggregateCall(translator.toAggregateCall(aggBuilder, rowType), translator.getAggregateFieldName(aggBuilder));
126120
}
127121

128122
private AggregationMetadataBuilder getOrCreateBuilder(
@@ -150,8 +144,6 @@ private static String granularityKey(List<GroupingInfo> groupings) {
150144
if (groupings.isEmpty()) {
151145
return "";
152146
}
153-
return groupings.stream()
154-
.flatMap(g -> g.getFieldNames().stream())
155-
.collect(Collectors.joining(","));
147+
return groupings.stream().flatMap(g -> g.getFieldNames().stream()).collect(Collectors.joining(","));
156148
}
157149
}

‎sandbox/plugins/dsl-query-executor/src/main/java/org/opensearch/dsl/converter/AggregateConverter.java‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,6 @@ public AggregateConverter() {}
2929
* @return the LogicalAggregate node
3030
*/
3131
public RelNode convert(RelNode input, AggregationMetadata metadata) {
32-
return LogicalAggregate.create(
33-
input,
34-
metadata.getGroupByBitSet(),
35-
null,
36-
metadata.getAggregateCalls()
37-
);
32+
return LogicalAggregate.create(input, metadata.getGroupByBitSet(), null, metadata.getAggregateCalls());
3833
}
3934
}

‎sandbox/plugins/dsl-query-executor/src/main/java/org/opensearch/dsl/converter/FilterConverter.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,7 @@ public FilterConverter(QueryRegistry queryRegistry) {
3535

3636
@Override
3737
protected boolean isApplicable(ConversionContext ctx) {
38-
return ctx.getSearchSource().query() != null
39-
&& !(ctx.getSearchSource().query() instanceof MatchAllQueryBuilder);
38+
return ctx.getSearchSource().query() != null && !(ctx.getSearchSource().query() instanceof MatchAllQueryBuilder);
4039
}
4140

4241
@Override

‎sandbox/plugins/dsl-query-executor/src/main/java/org/opensearch/dsl/converter/ProjectConverter.java‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ protected RelNode doConvert(RelNode input, ConversionContext ctx) throws Convers
5757
}
5858

5959
private RelNode createProjection(RelNode input, String[] includes, String[] excludes, RexBuilder rexBuilder)
60-
throws ConversionException {
60+
throws ConversionException {
6161
RelDataType rowType = input.getRowType();
6262
List<RexNode> projects = new ArrayList<>();
6363
List<String> fieldNames = new ArrayList<>();
@@ -102,8 +102,13 @@ private Set<String> buildExcludeSet(String[] excludes, RelDataType rowType) {
102102
return excludeSet;
103103
}
104104

105-
private void resolveWildcard(String pattern, RelDataType rowType, RexBuilder rexBuilder,
106-
List<RexNode> projects, List<String> fieldNames) {
105+
private void resolveWildcard(
106+
String pattern,
107+
RelDataType rowType,
108+
RexBuilder rexBuilder,
109+
List<RexNode> projects,
110+
List<String> fieldNames
111+
) {
107112
Pattern compiled = Pattern.compile(pattern.replace(".", "\\.").replace("*", ".*"));
108113
for (RelDataTypeField field : rowType.getFieldList()) {
109114
if (compiled.matcher(field.getName()).matches()) {
@@ -114,8 +119,8 @@ private void resolveWildcard(String pattern, RelDataType rowType, RexBuilder rex
114119
// No error if nothing matches — consistent with OpenSearch core, which returns empty _source
115120
}
116121

117-
private void resolveField(String fieldName, RelDataType rowType, RexBuilder rexBuilder,
118-
List<RexNode> projects, List<String> fieldNames) throws ConversionException {
122+
private void resolveField(String fieldName, RelDataType rowType, RexBuilder rexBuilder, List<RexNode> projects, List<String> fieldNames)
123+
throws ConversionException {
119124
RelDataTypeField field = rowType.getField(fieldName, false, false);
120125
if (field == null) {
121126
throw new ConversionException("Field '" + fieldName + "' not found in schema");

‎sandbox/plugins/dsl-query-executor/src/main/java/org/opensearch/dsl/converter/SortConverter.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ private RexNode buildOffset(ConversionContext ctx) {
9191
if (from <= 0) {
9292
return null;
9393
}
94-
return ctx.getRexBuilder().makeLiteral(from,
95-
ctx.getCluster().getTypeFactory().createSqlType(SqlTypeName.INTEGER), false);
94+
return ctx.getRexBuilder().makeLiteral(from, ctx.getCluster().getTypeFactory().createSqlType(SqlTypeName.INTEGER), false);
9695
}
9796

9897
private RexNode buildFetch(ConversionContext ctx) {
@@ -101,8 +100,7 @@ private RexNode buildFetch(ConversionContext ctx) {
101100
}
102101
SearchSourceBuilder ss = ctx.getSearchSource();
103102
int size = ss.size() != -1 ? ss.size() : SearchService.DEFAULT_SIZE;
104-
return ctx.getRexBuilder().makeLiteral(size,
105-
ctx.getCluster().getTypeFactory().createSqlType(SqlTypeName.INTEGER), false);
103+
return ctx.getRexBuilder().makeLiteral(size, ctx.getCluster().getTypeFactory().createSqlType(SqlTypeName.INTEGER), false);
106104
}
107105

108106
private static boolean hasSort(ConversionContext ctx) {

0 commit comments

Comments
 (0)