From 4cc1b5a97a12ff46b9efe8981b6218d26f48c95c Mon Sep 17 00:00:00 2001
From: tatiana-yan <tatiana.kondakova@gmail.com>
Date: Wed, 25 Dec 2019 13:15:23 +0300
Subject: [PATCH] [search] Add SkipAlways to TypesSkipper.

---
 data/mixed_nodes.txt               |  2 ++
 generator/search_index_builder.cpp |  6 ++++--
 search/types_skipper.cpp           | 17 +++++++++++++++++
 search/types_skipper.hpp           |  5 +++++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/data/mixed_nodes.txt b/data/mixed_nodes.txt
index ea7830b975..65fc9ae779 100644
--- a/data/mixed_nodes.txt
+++ b/data/mixed_nodes.txt
@@ -1,3 +1,5 @@
+# Add types which should be skipped when building search index to search::TypesSkipper:m_skipAlways
+
 # Megafon
 
 sponsored=partner18
diff --git a/generator/search_index_builder.cpp b/generator/search_index_builder.cpp
index eb58ee7431..c87c28f6bb 100644
--- a/generator/search_index_builder.cpp
+++ b/generator/search_index_builder.cpp
@@ -291,6 +291,10 @@ public:
     using namespace search;
 
     static TypesSkipper skipIndex;
+    feature::TypesHolder types(f);
+
+    if (skipIndex.SkipAlways(types))
+      return;
 
     auto const isCountryOrState = [](auto types) {
       auto const & isLocalityChecker = ftypes::IsLocalityChecker::Instance();
@@ -299,8 +303,6 @@ public:
              localityType == ftypes::LocalityType::State;
     };
 
-    feature::TypesHolder types(f);
-
     auto const & streetChecker = ftypes::IsStreetOrSquareChecker::Instance();
     bool const hasStreetType = streetChecker(types);
 
diff --git a/search/types_skipper.cpp b/search/types_skipper.cpp
index dfb7530a7a..3bba58d8af 100644
--- a/search/types_skipper.cpp
+++ b/search/types_skipper.cpp
@@ -35,6 +35,8 @@ TypesSkipper::TypesSkipper()
   {
     m_skipIfEmptyName[1].push_back(c.GetTypeByPath(e));
   }
+  m_skipAlways[1].push_back(c.GetTypeByPath({"sponsored", "partner18"}));
+  m_skipAlways[1].push_back(c.GetTypeByPath({"sponsored", "partner19"}));
 }
 
 void TypesSkipper::SkipEmptyNameTypes(feature::TypesHolder & types) const
@@ -59,6 +61,21 @@ void TypesSkipper::SkipEmptyNameTypes(feature::TypesHolder & types) const
   types.RemoveIf(shouldBeRemoved);
 }
 
+bool TypesSkipper::SkipAlways(feature::TypesHolder const & types) const
+{
+  for (auto type : types)
+  {
+    ftype::TruncValue(type, 2);
+    if (HasType(m_skipAlways[1], type))
+      return true;
+
+    ftype::TruncValue(type, 1);
+    if (HasType(m_skipAlways[0], type))
+      return true;
+  }
+  return false;
+}
+
 // static
 bool TypesSkipper::HasType(Cont const & v, uint32_t t)
 {
diff --git a/search/types_skipper.hpp b/search/types_skipper.hpp
index 960a14363b..34b1f791d0 100644
--- a/search/types_skipper.hpp
+++ b/search/types_skipper.hpp
@@ -16,6 +16,10 @@ public:
 
   void SkipEmptyNameTypes(feature::TypesHolder & types) const;
 
+  // Always skip feature for search index even it has name and other useful types.
+  // Useful for mixed features, sponsored objects.
+  bool SkipAlways(feature::TypesHolder const & types) const;
+
 private:
   using Cont = buffer_vector<uint32_t, 16>;
 
@@ -23,5 +27,6 @@ private:
 
   // Array index (0, 1) means type level for checking (1, 2).
   Cont m_skipIfEmptyName[2];
+  Cont m_skipAlways[2];
 };
 }  // namespace search