Calculate aggregation filtering out special float values

lib/cartodb/models/dataview/aggregation.js

@@ -35,7 +35,7 @@ var rankedCategoriesQueryTpl = dot.template([
     'categories AS(',
     '  SELECT {{=it._column}} AS category, {{=it._aggregation}} AS value,',
     '    row_number() OVER (ORDER BY {{=it._aggregation}} desc) as rank',
-    '  FROM ({{=it._query}}) _cdb_aggregation_all',
+    '  FROM filtered_source',
     '  {{?it._aggregationColumn!==null}}WHERE {{=it._aggregationColumn}} IS NOT NULL{{?}}',
     '  GROUP BY {{=it._column}}',
     '  ORDER BY 2 DESC',

test/acceptance/dataviews/aggregation.js

@@ -187,7 +187,7 @@ describe.only('aggregation-dataview: special float values', function() {
                 type: 'aggregation',
                 options: {
                     column: 'cat',
-                    aggregation: 'sum',
+                    aggregation: 'avg',
                     aggregationColumn: 'val'
                 }
             }
@@ -217,15 +217,34 @@ describe.only('aggregation-dataview: special float values', function() {
         ]
     );
 
+    // the_geom_webmercator  |    val    |    cat
+    // ----------------------+-----------+------------
+    //                       | -Infinity | category_2
+    //                       |       NaN | category_1
+    //                       |         3 | category_2
+    //                       |  Infinity | category_1
+    //                       | -Infinity | category_2
+    //                       |       NaN | category_1
+    //                       |         7 | category_2
+    //                       |  Infinity | category_1
+    //                       | -Infinity | category_2
+    //                       |       NaN | category_1
+    //                       |        11 | category_2
+    //                       |         " |          "
+
     var filters = [{ own_filter: 0 }, {}];
     filters.forEach(function (filter) {
         it('should handle special float values using filter: ' + JSON.stringify(filter), function(done) {
             this.testClient = new TestClient(mapConfig, 1234);
             this.testClient.getDataview('val_aggregation', { own_filter: 0 }, function(err, dataview) {
                 assert.ifError(err);
-                assert.equal(dataview.result, 501);
                 assert.ok(dataview.infinities === (250 + 250));
                 assert.ok(dataview.nans === 250);
+                assert.ok(dataview.categories.length === 1);
+                dataview.categories.forEach(function (category) {
+                    assert.ok(category.category === 'category_2');
+                    assert.ok(category.value === 501);
+                })
                 done();
             });
         });