Skip to content

Commit b2df5be

Browse files
author
Julien Ruaux
committed
fix: Fixed JSON propery names
1 parent df86e83 commit b2df5be

File tree

3 files changed

+11
-11
lines changed

3 files changed

+11
-11
lines changed

src/main/java/com/redis/trino/RediSearchMetadata.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ public Optional<LimitApplicationResult<ConnectorTableHandle>> applyLimit(Connect
266266

267267
return Optional.of(new LimitApplicationResult<>(new RediSearchTableHandle(handle.getType(),
268268
handle.getSchemaTableName(), handle.getConstraint(), OptionalLong.of(limit),
269-
handle.getAggregationTerms(), handle.getAggregations(), handle.getWildcards()), true, false));
269+
handle.getTermAggregations(), handle.getMetricAggregations(), handle.getWildcards()), true, false));
270270
}
271271

272272
@Override
@@ -329,7 +329,7 @@ public Optional<ConstraintApplicationResult<ConnectorTableHandle>> applyFilter(C
329329
}
330330

331331
handle = new RediSearchTableHandle(handle.getType(), handle.getSchemaTableName(), newDomain, handle.getLimit(),
332-
handle.getAggregationTerms(), handle.getAggregations(), newWildcards);
332+
handle.getTermAggregations(), handle.getMetricAggregations(), newWildcards);
333333

334334
return Optional.of(new ConstraintApplicationResult<>(handle, TupleDomain.withColumnDomains(unsupported),
335335
newExpression, false));
@@ -420,7 +420,7 @@ public Optional<AggregationApplicationResult<ConnectorTableHandle>> applyAggrega
420420
RediSearchTableHandle table = (RediSearchTableHandle) handle;
421421
// Global aggregation is represented by [[]]
422422
verify(!groupingSets.isEmpty(), "No grouping sets provided");
423-
if (!table.getAggregationTerms().isEmpty()) {
423+
if (!table.getTermAggregations().isEmpty()) {
424424
return Optional.empty();
425425
}
426426
ImmutableList.Builder<ConnectorExpression> projections = ImmutableList.builder();

src/main/java/com/redis/trino/RediSearchQueryBuilder.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -238,8 +238,8 @@ private Reducer reducer(RediSearchAggregation aggregation) {
238238
}
239239

240240
public Optional<Group> group(RediSearchTableHandle table) {
241-
List<RediSearchAggregationTerm> terms = table.getAggregationTerms();
242-
List<RediSearchAggregation> aggregates = table.getAggregations();
241+
List<RediSearchAggregationTerm> terms = table.getTermAggregations();
242+
List<RediSearchAggregation> aggregates = table.getMetricAggregations();
243243
List<String> groupFields = new ArrayList<>();
244244
if (terms != null && !terms.isEmpty()) {
245245
groupFields = terms.stream().map(RediSearchAggregationTerm::getTerm).collect(Collectors.toList());

src/main/java/com/redis/trino/RediSearchTableHandle.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -63,15 +63,15 @@ public RediSearchTableHandle(Type type, SchemaTableName schemaTableName) {
6363
public RediSearchTableHandle(@JsonProperty("type") Type type,
6464
@JsonProperty("schemaTableName") SchemaTableName schemaTableName,
6565
@JsonProperty("constraint") TupleDomain<ColumnHandle> constraint, @JsonProperty("limit") OptionalLong limit,
66-
@JsonProperty("aggTerms") List<RediSearchAggregationTerm> aggregationTerms,
67-
@JsonProperty("aggregates") List<RediSearchAggregation> aggregates,
66+
@JsonProperty("aggTerms") List<RediSearchAggregationTerm> termAggregations,
67+
@JsonProperty("aggregates") List<RediSearchAggregation> metricAggregations,
6868
@JsonProperty("wildcards") Map<String, String> wildcards) {
6969
this.type = requireNonNull(type, "type is null");
7070
this.schemaTableName = requireNonNull(schemaTableName, "schemaTableName is null");
7171
this.constraint = requireNonNull(constraint, "constraint is null");
7272
this.limit = requireNonNull(limit, "limit is null");
73-
this.aggregationTerms = requireNonNull(aggregationTerms, "aggTerms is null");
74-
this.aggregations = requireNonNull(aggregates, "aggregates is null");
73+
this.aggregationTerms = requireNonNull(termAggregations, "aggTerms is null");
74+
this.aggregations = requireNonNull(metricAggregations, "aggregates is null");
7575
this.wildcards = requireNonNull(wildcards, "wildcards is null");
7676
}
7777

@@ -96,12 +96,12 @@ public OptionalLong getLimit() {
9696
}
9797

9898
@JsonProperty
99-
public List<RediSearchAggregationTerm> getAggregationTerms() {
99+
public List<RediSearchAggregationTerm> getTermAggregations() {
100100
return aggregationTerms;
101101
}
102102

103103
@JsonProperty
104-
public List<RediSearchAggregation> getAggregations() {
104+
public List<RediSearchAggregation> getMetricAggregations() {
105105
return aggregations;
106106
}
107107

0 commit comments

Comments
 (0)