flat containers prototype

components/omnibox/browser/url_index_private_data.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "components/omnibox/browser/url_index_private_data.h"
 
 #include <stdint.h>
 
 #include <functional>
 #include <iterator>
@@ skipping 235 matching lines @@
   if (pre_filter_item_count_ > post_filter_item_count_) {
     // If we trim the results set we do not want to cache the results for next
     // time as the user's ultimately desired result could easily be eliminated
     // in the early rough filter.
     search_term_cache_.clear();
   } else {
     // Remove any stale SearchTermCacheItems.
     for (SearchTermCacheMap::iterator cache_iter = search_term_cache_.begin();
          cache_iter != search_term_cache_.end(); ) {
       if (!cache_iter->second.used_)
-        search_term_cache_.erase(cache_iter++);
+        cache_iter = search_term_cache_.erase(cache_iter);

[Peter Kasting, 2016/11/29 19:17:45]

FWIW, now that C++11 provides this on std::map, we should just make this change
anyway (assuming it doesn't break one of our archaic libstdc++ implementations),
since it's more clearly safe.

[dyaroshev, 2016/11/29 20:09:14]

Some time ago there was a problem with the standard library on linux -
map::erase didn't provide modern interface.
(and vector erase too - there are work arounds against that in
flat_sorted_container_base.h and some tests here are disabled on linux).
I don't know if we updated since.

In my opinion this patch is good for illustrating purpose - maybe keep it as is,
at least for now?

[Peter Kasting, 2016/11/29 20:29:06]

I don't either.
We'd only update this patch to not have this if we were able to land this
separately :)

It'd probably be pretty easy to write a separate CL with just this line, to see
if it compiles everywhere.

       else
         ++cache_iter;
     }
   }
 
   return scored_items;
 }
 
 bool URLIndexPrivateData::UpdateURL(
     history::HistoryService* history_service,
@@ skipping 331 matching lines @@
             word_id_set, leftover_set);
         word_id_set.swap(new_word_id_set);
       }
     }
 
     // We must filter the word list because the resulting word set surely
     // contains words which do not have the search term as a proper subset.
     for (WordIDSet::iterator word_set_iter = word_id_set.begin();
          word_set_iter != word_id_set.end(); ) {
       if (word_list_[*word_set_iter].find(term) == base::string16::npos)
-        word_id_set.erase(word_set_iter++);
+        word_set_iter = word_id_set.erase(word_set_iter);
       else
         ++word_set_iter;
     }
   } else {
     word_id_set = WordIDSetForTermChars(Char16SetFromString16(term));
   }
 
   // If any words resulted then we can compose a set of history IDs by unioning
   // the sets from each word.
   HistoryIDSet history_id_set;
@@ skipping 763 matching lines @@
   // First cut: typed count, visit count, recency.
   // TODO(mrossetti): This is too simplistic. Consider an approach which ranks
   // recently visited (within the last 12/24 hours) as highly important. Get
   // input from mpearson.
   if (r1.typed_count() != r2.typed_count())
     return (r1.typed_count() > r2.typed_count());
   if (r1.visit_count() != r2.visit_count())
     return (r1.visit_count() > r2.visit_count());
   return (r1.last_visit() > r2.last_visit());
 }