Override limit only for Raw agg queries.

raintank · Apr 3, 2017 · a685ae6 · a685ae6
1 parent 1dd2330
commit a685ae6
Show file tree

Hide file tree

Showing 8 changed files with 22 additions and 19 deletions.
diff --git a/dist/datasource.js b/dist/datasource.js
diff --git a/dist/datasource.js.map b/dist/datasource.js.map
diff --git a/dist/datasource.ts b/dist/datasource.ts
@@ -87,7 +87,7 @@ export class CrateDatasource {
         }
 
         // Split target into two queries (with aggs and raw data)
-        query = this.queryBuilder.buildAggQuery(target, interval, adhocFilters, maxLimit);
+        query = this.queryBuilder.buildAggQuery(target, interval, adhocFilters);
         queryTarget = _.cloneDeep(target);
         queryTarget.metricAggs = getNotRawAggs(queryTarget.metricAggs);
 

diff --git a/dist/query_builder.js b/dist/query_builder.js
diff --git a/dist/query_builder.js.map b/dist/query_builder.js.map
diff --git a/dist/query_builder.ts b/dist/query_builder.ts
@@ -3,7 +3,8 @@
 import _ from 'lodash';
 
 // Maximum LIMIT value
-let MAX_LIMIT = 500000000;
+let MAX_LIMIT = 100000;
+let DEFAULT_LIMIT = 10000;
 
 export class CrateQueryBuilder {
   schema: string;
@@ -30,7 +31,7 @@ export class CrateQueryBuilder {
    * @param  {string}  defaultAgg     Default aggregation for values.
    * @return {string}                 SQL query.
    */
-  build(target: any, groupInterval=0, adhocFilters=[], limit=10000, defaultAgg='avg') {
+  build(target: any, groupInterval = 0, adhocFilters = [], limit = DEFAULT_LIMIT, defaultAgg='avg') {
     let query: string;
     let timeExp: string;
 
@@ -89,7 +90,7 @@ export class CrateQueryBuilder {
     return query;
   }
 
-  buildAggQuery(target: any, groupInterval=0, adhocFilters=[], limit?: number) {
+  buildAggQuery(target: any, groupInterval = 0, adhocFilters = [], limit?: number) {
     let query: string;
     let timeExp: string;
 
@@ -148,15 +149,15 @@ export class CrateQueryBuilder {
     }
     query += " ASC";
 
-    if (limit) {
+    if (limit && limit > DEFAULT_LIMIT) {
       limit = Math.min(limit, MAX_LIMIT);
       query += ` LIMIT ${limit}`;
     }
 
     return query;
   }
 
-  buildRawAggQuery(target: any, groupInterval=0, adhocFilters=[], limit?: number) {
+  buildRawAggQuery(target: any, groupInterval = 0, adhocFilters = [], limit?: number) {
     let query: string;
     let timeExp: string;
 

diff --git a/src/datasource.ts b/src/datasource.ts
@@ -87,7 +87,7 @@ export class CrateDatasource {
         }
 
         // Split target into two queries (with aggs and raw data)
-        query = this.queryBuilder.buildAggQuery(target, interval, adhocFilters, maxLimit);
+        query = this.queryBuilder.buildAggQuery(target, interval, adhocFilters);
         queryTarget = _.cloneDeep(target);
         queryTarget.metricAggs = getNotRawAggs(queryTarget.metricAggs);
 

diff --git a/src/query_builder.ts b/src/query_builder.ts
@@ -3,7 +3,8 @@
 import _ from 'lodash';
 
 // Maximum LIMIT value
-let MAX_LIMIT = 500000000;
+let MAX_LIMIT = 100000;
+let DEFAULT_LIMIT = 10000;
 
 export class CrateQueryBuilder {
   schema: string;
@@ -30,7 +31,7 @@ export class CrateQueryBuilder {
    * @param  {string}  defaultAgg     Default aggregation for values.
    * @return {string}                 SQL query.
    */
-  build(target: any, groupInterval=0, adhocFilters=[], limit=10000, defaultAgg='avg') {
+  build(target: any, groupInterval = 0, adhocFilters = [], limit = DEFAULT_LIMIT, defaultAgg='avg') {
     let query: string;
     let timeExp: string;
 
@@ -89,7 +90,7 @@ export class CrateQueryBuilder {
     return query;
   }
 
-  buildAggQuery(target: any, groupInterval=0, adhocFilters=[], limit?: number) {
+  buildAggQuery(target: any, groupInterval = 0, adhocFilters = [], limit?: number) {
     let query: string;
     let timeExp: string;
 
@@ -148,15 +149,15 @@ export class CrateQueryBuilder {
     }
     query += " ASC";
 
-    if (limit) {
+    if (limit && limit > DEFAULT_LIMIT) {
       limit = Math.min(limit, MAX_LIMIT);
       query += ` LIMIT ${limit}`;
     }
 
     return query;
   }
 
-  buildRawAggQuery(target: any, groupInterval=0, adhocFilters=[], limit?: number) {
+  buildRawAggQuery(target: any, groupInterval = 0, adhocFilters = [], limit?: number) {
     let query: string;
     let timeExp: string;