From commits-return-2750-archive-asf-public=cust-asf.ponee.io@metron.apache.org  Tue Mar  6 15:09:38 2018
Return-Path: <commits-return-2750-archive-asf-public=cust-asf.ponee.io@metron.apache.org>
X-Original-To: archive-asf-public@cust-asf.ponee.io
Delivered-To: archive-asf-public@cust-asf.ponee.io
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by mx-eu-01.ponee.io (Postfix) with SMTP id 14B85180652
	for <archive-asf-public@cust-asf.ponee.io>; Tue,  6 Mar 2018 15:09:37 +0100 (CET)
Received: (qmail 92389 invoked by uid 500); 6 Mar 2018 14:09:37 -0000
Mailing-List: contact commits-help@metron.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@metron.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@metron.apache.org>
List-Post: <mailto:commits@metron.apache.org>
List-Id: <commits.metron.apache.org>
Reply-To: dev@metron.apache.org
Delivered-To: mailing list commits@metron.apache.org
Received: (qmail 92380 invoked by uid 99); 6 Mar 2018 14:09:37 -0000
Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23)
    by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Mar 2018 14:09:37 +0000
Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33)
	id 0B52CF4DF8; Tue,  6 Mar 2018 14:09:37 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: rmerriman@apache.org
To: commits@metron.apache.org
Date: Tue, 06 Mar 2018 14:09:37 -0000
Message-Id: <34f56a21ad364685a405bf120122151b@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [1/3] metron git commit: METRON-1337 List of facets should not be
 hardcoded (merrimanr) closes apache/metron#853

Repository: metron
Updated Branches:
  refs/heads/master 9b4b40278 -> e22479e62


http://git-wip-us.apache.org/repos/asf/metron/blob/e22479e6/metron-platform/metron-indexing/src/test/java/org/apache/metron/indexing/dao/InMemoryDao.java
----------------------------------------------------------------------
diff --git a/metron-platform/metron-indexing/src/test/java/org/apache/metron/indexing/dao/InMemoryDao.java b/metron-platform/metron-indexing/src/test/java/org/apache/metron/indexing/dao/InMemoryDao.java
index 79c3bb3..d6e1521 100644
--- a/metron-platform/metron-indexing/src/test/java/org/apache/metron/indexing/dao/InMemoryDao.java
+++ b/metron-platform/metron-indexing/src/test/java/org/apache/metron/indexing/dao/InMemoryDao.java
@@ -53,6 +53,7 @@ public class InMemoryDao implements IndexDao {
   // Map from index to list of documents as JSON strings
   public static Map<String, List<String>> BACKING_STORE = new HashMap<>();
   public static Map<String, Map<String, FieldType>> COLUMN_METADATA = new HashMap<>();
+  public static Map<String, Map<String, Long>> FACET_COUNTS = new HashMap<>();
   private AccessConfig config;
 
   @Override
@@ -94,6 +95,14 @@ public class InMemoryDao implements IndexDao {
     }
     ret.setTotal(response.size());
     ret.setResults(finalResp);
+    Map<String, Map<String, Long>> facetCounts = new HashMap<>();
+    List<String> facetFields = searchRequest.getFacetFields();
+    if (facetFields != null) {
+      for (String facet: facetFields) {
+        facetCounts.put(facet, FACET_COUNTS.get(facet));
+      }
+      ret.setFacetCounts(facetCounts);
+    }
     return ret;
   }
 
@@ -290,6 +299,14 @@ public class InMemoryDao implements IndexDao {
     COLUMN_METADATA = columnMetadataMap;
   }
 
+  public static void setFacetCounts(Map<String, Map<String, Long>> facetCounts) {
+    Map<String, Map<String, Long>> facetCountsMap = new HashMap<>();
+    for (Map.Entry<String, Map<String, Long>> e: facetCounts.entrySet()) {
+      facetCountsMap.put(e.getKey(), Collections.unmodifiableMap(e.getValue()));
+    }
+    FACET_COUNTS = facetCountsMap;
+  }
+
   public static void load(Map<String, List<String>> backingStore) {
     BACKING_STORE = backingStore;
   }
@@ -297,5 +314,6 @@ public class InMemoryDao implements IndexDao {
   public static void clear() {
     BACKING_STORE.clear();
     COLUMN_METADATA.clear();
+    FACET_COUNTS.clear();
   }
 }