From 184307816f7071a83fea36c7197d848869965a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Fri, 23 Oct 2015 11:32:51 +0200 Subject: [PATCH 1/2] "No limit" was not effective for ES terms aggregation This may belong to #2827 --- public/app/plugins/datasource/elasticsearch/query_builder.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/public/app/plugins/datasource/elasticsearch/query_builder.js b/public/app/plugins/datasource/elasticsearch/query_builder.js index ac61fe13a1e..43d8f96bc03 100644 --- a/public/app/plugins/datasource/elasticsearch/query_builder.js +++ b/public/app/plugins/datasource/elasticsearch/query_builder.js @@ -22,8 +22,7 @@ function (angular) { return queryNode; } - size = parseInt(aggDef.settings.size, 10); - if (size > 0) { queryNode.terms.size = size; } + queryNode.terms.size = parseInt(aggDef.settings.size, 10); if (aggDef.settings.orderBy !== void 0) { queryNode.terms.order = {}; queryNode.terms.order[aggDef.settings.orderBy] = aggDef.settings.order; From 6b9b08da3056555097a9ae32cd91328a4b32c57e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Volker=20Fr=C3=B6hlich?= Date: Fri, 23 Oct 2015 12:00:20 +0200 Subject: [PATCH 2/2] Remove declaration of unused variable size --- public/app/plugins/datasource/elasticsearch/query_builder.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/public/app/plugins/datasource/elasticsearch/query_builder.js b/public/app/plugins/datasource/elasticsearch/query_builder.js index 43d8f96bc03..d0fbb6a603a 100644 --- a/public/app/plugins/datasource/elasticsearch/query_builder.js +++ b/public/app/plugins/datasource/elasticsearch/query_builder.js @@ -15,7 +15,7 @@ function (angular) { }; ElasticQueryBuilder.prototype.buildTermsAgg = function(aggDef, queryNode, target) { - var metricRef, metric, size, y; + var metricRef, metric, y; queryNode.terms = { "field": aggDef.field }; if (!aggDef.settings) {