From a25469eba66bcbd638600b609e06423adfe799d8 Mon Sep 17 00:00:00 2001 From: cheddar Date: Mon, 6 May 2013 15:43:28 -0500 Subject: [PATCH] 1) Rename "orderBy" on DefaultLimitSpec to "columns" --- .../druid/query/group/limit/DefaultLimitSpec.java | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/client/src/main/java/com/metamx/druid/query/group/limit/DefaultLimitSpec.java b/client/src/main/java/com/metamx/druid/query/group/limit/DefaultLimitSpec.java index b2cf18bd9ea..545c3798785 100644 --- a/client/src/main/java/com/metamx/druid/query/group/limit/DefaultLimitSpec.java +++ b/client/src/main/java/com/metamx/druid/query/group/limit/DefaultLimitSpec.java @@ -43,25 +43,25 @@ import java.util.Map; */ public class DefaultLimitSpec implements LimitSpec { - private final List orderBy; + private final List columns; private final int limit; @JsonCreator public DefaultLimitSpec( - @JsonProperty("orderBy") List orderBy, + @JsonProperty("columns") List columns, @JsonProperty("limit") Integer limit ) { - this.orderBy = (orderBy == null) ? ImmutableList.of() : orderBy; + this.columns = (columns == null) ? ImmutableList.of() : columns; this.limit = (limit == null) ? Integer.MAX_VALUE : limit; Preconditions.checkState(limit > 0, "limit[%s] must be >0", limit); } @JsonProperty - public List getOrderBy() + public List getColumns() { - return orderBy; + return columns; } @JsonProperty @@ -117,7 +117,7 @@ public class DefaultLimitSpec implements LimitSpec possibleOrderings.put(column, metricOrdering(column, postAgg.getComparator())); } - for (OrderByColumnSpec columnSpec : orderBy) { + for (OrderByColumnSpec columnSpec : columns) { Ordering nextOrdering = possibleOrderings.get(columnSpec.getDimension()); if (nextOrdering == null) { @@ -170,7 +170,7 @@ public class DefaultLimitSpec implements LimitSpec public String toString() { return "DefaultLimitSpec{" + - "orderBy='" + orderBy + '\'' + + "columns='" + columns + '\'' + ", limit=" + limit + '}'; }