Revert "Fixes bug 1177605 - Added sub aggregations for signature face…

…ts. r=peterbe"

This reverts commit 1c06eab.

socorro/external/es/supersearch.py

@@ -4,7 +4,7 @@
 
 import datetime
 import re
-from elasticsearch_dsl import Search, A, F, Q
+from elasticsearch_dsl import Search, F, Q
 from elasticsearch.exceptions import NotFoundError
 
 from socorro.external import (
@@ -120,34 +120,6 @@ def format_fields(self, hit):
 
         return hit
 
-    def get_field_name(self, value, full=True):
-        try:
-            field_ = self.all_fields[value]
-        except KeyError:
-            raise BadArgumentError(
-                value,
-                msg='Unknown field "%s"' % value
-            )
-
-        if not field_['is_returned']:
-            # Returning this field is not allowed.
-            raise BadArgumentError(
-                value,
-                msg='Field "%s" is not allowed to be returned' % value
-            )
-
-        field_name = '%s.%s' % (
-            field_['namespace'],
-            field_['in_database_name']
-        )
-
-        if full and field_['has_full_version']:
-            # If the param has a full version, that means what matters
-            # is the full string, and not its individual terms.
-            field_name += '.full'
-
-        return field_name
-
     def format_aggregations(self, aggregations):
         """Return aggregations in a form that looks like facets.
 
@@ -156,27 +128,11 @@ def format_aggregations(self, aggregations):
         """
         aggs = aggregations.to_dict()
         for agg in aggs:
-            for i, bucket in enumerate(aggs[agg]['buckets']):
-                sub_aggs = {}
-                for key in bucket:
-                    # Go through all sub aggregations. Those are contained in
-                    # all the keys that are not 'key' or 'count'.
-                    if key in ('key', 'doc_count'):
-                        continue
-
-                    sub_aggs[key] = [
-                        {'term': x['key'], 'count': x['doc_count']}
-                        for x in bucket[key]['buckets']
-                    ]
-
+            for i, row in enumerate(aggs[agg]['buckets']):
                 aggs[agg]['buckets'][i] = {
-                    'term': bucket['key'],
-                    'count': bucket['doc_count'],
+                    'term': row['key'],
+                    'count': row['doc_count'],
                 }
-
-                if sub_aggs:
-                    aggs[agg]['buckets'][i]['facets'] = sub_aggs
-
             aggs[agg] = aggs[agg]['buckets']
 
         return aggs
@@ -212,8 +168,6 @@ def get(self, **kwargs):
                         results_from = param.value[0]
                     elif param.name == '_results_number':
                         results_number = param.value[0]
-                    elif param.name == '_facets_size':
-                        facets_size = param.value[0]
                     # Don't use meta parameters in the query.
                     continue
 
@@ -349,7 +303,27 @@ def get(self, **kwargs):
                 if not value:
                     continue
 
-                field_name = self.get_field_name(value, full=False)
+                try:
+                    field_ = self.all_fields[value]
+                except KeyError:
+                    # That is not a known field, we can't restrict on it.
+                    raise BadArgumentError(
+                        value,
+                        msg='Unknown field "%s", cannot return it' % value
+                    )
+
+                if not field_['is_returned']:
+                    # Returning this field is not allowed.
+                    raise BadArgumentError(
+                        value,
+                        msg='Field "%s" is not allowed to be returned' % value
+                    )
+
+                field_name = '%s.%s' % (
+                    field_['namespace'],
+                    field_['in_database_name']
+                )
+
                 fields.append(field_name)
 
         search = search.fields(fields)
@@ -371,7 +345,19 @@ def get(self, **kwargs):
                     desc = True
                     value = value[1:]
 
-                field_name = self.get_field_name(value, full=False)
+                try:
+                    field_ = self.all_fields[value]
+                except KeyError:
+                    # That is not a known field, we can't sort on it.
+                    raise BadArgumentError(
+                        value,
+                        msg='Unknown field "%s", cannot sort on it' % value
+                    )
+
+                field_name = '%s.%s' % (
+                    field_['namespace'],
+                    field_['in_database_name']
+                )
 
                 if desc:
                     # The underlying library understands that '-' means
@@ -389,39 +375,32 @@ def get(self, **kwargs):
         # Create facets.
         for param in params['_facets']:
             for value in param.value:
-                if not value:
-                    continue
+                try:
+                    field_ = self.all_fields[value]
+                except KeyError:
+                    # That is not a known field, we can't facet on it.
+                    raise BadArgumentError(
+                        value,
+                        msg='Unknown field "%s", cannot facet on it' % value
+                    )
+
+                field_name = '%s.%s' % (
+                    field_['namespace'],
+                    field_['in_database_name']
+                )
+
+                if field_['has_full_version']:
+                    # If the param has a full version, that means what matters
+                    # is the full string, and not its individual terms.
+                    field_name += '.full'
 
-                field_name = self.get_field_name(value)
                 search.aggs.bucket(
                     value,
                     'terms',
                     field=field_name,
-                    size=facets_size,
+                    size=self.config.facets_max_number
                 )
 
-        # Create signature aggregations.
-        if params['_aggs.signature']:
-            sig_bucket = A(
-                'terms',
-                field=self.get_field_name('signature'),
-                size=facets_size,
-            )
-            for param in params['_aggs.signature']:
-                for value in param.value:
-                    if not value:
-                        continue
-
-                    field_name = self.get_field_name(value)
-                    sig_bucket.bucket(
-                        value,
-                        'terms',
-                        field=field_name,
-                        size=facets_size,
-                    )
-
-            search.aggs.bucket('signature', sig_bucket)
-
         # Query and compute results.
         hits = []
 

socorro/lib/search_common.py

@@ -71,12 +71,10 @@ def __init__(self, name, default=None, data_type='enum', mandatory=False):
 
 class SearchBase(object):
     meta_filters = [
-        SearchFilter('_aggs.signature', default=''),
         SearchFilter('_columns', default=[
             'uuid', 'date', 'signature', 'product', 'version'
         ]),
         SearchFilter('_facets', default='signature'),
-        SearchFilter('_facets_size', data_type='int', default=50),
         SearchFilter('_results_number', data_type='int', default=100),
         SearchFilter('_results_offset', data_type='int', default=0),
         SearchFilter('_return_query', data_type='bool', default=False),