From ddbcd88aa11b17a2d3952bea1a4e2da29ea9e101 Mon Sep 17 00:00:00 2001
From: Gethin James <gethin.james@alfresco.com>
Date: Thu, 1 Jun 2017 11:13:57 +0000
Subject: [PATCH] Merged searchrep (5.2.1) to 5.2.N (5.2.1)    136998 ahind:
 SEARCH-455    Stats pivot fails on SOLR 4    - ignore legacy facets entry in
 SOLR 4 stats response

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137083 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../org/alfresco/repo/search/impl/lucene/SolrJSONResultSet.java | 2 ++
 .../repo/search/impl/solr/facet/facetsresponse/Metric.java      | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/source/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSet.java b/source/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSet.java
index 7231ae08e4..c6ab5f094c 100644
--- a/source/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSet.java
+++ b/source/java/org/alfresco/repo/search/impl/lucene/SolrJSONResultSet.java
@@ -480,6 +480,8 @@ public class SolrJSONResultSet implements ResultSet, JSONResult
                         return new ListMetric(metricType, val);
                     case percentiles:
                         return new PercentileMetric(metricType, val);
+                    case facets:
+                    	return null;
                     case mean:
                         if ("NaN".equals(String.valueOf(val))) return null; //else fall through
                     default:
diff --git a/source/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/Metric.java b/source/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/Metric.java
index 38dc0a6f68..bb24428715 100644
--- a/source/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/Metric.java
+++ b/source/java/org/alfresco/repo/search/impl/solr/facet/facetsresponse/Metric.java
@@ -32,7 +32,7 @@ import java.util.Map;
  */
 public interface Metric
 {
-    public static enum METRIC_TYPE {count, min, max, sum, missing, sumOfSquares, mean, stddev, countDistinct, cardinality, distinctValues, percentiles};
+    public static enum METRIC_TYPE {count, min, max, sum, missing, sumOfSquares, mean, stddev, countDistinct, cardinality, distinctValues, percentiles, facets};
 
     METRIC_TYPE getType();
     Map<String, Object> getValue();