Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3524)

Unified Diff: base/i18n/string_search.cc

Issue 18031015: base/i18n: Class for efficiently searching the same query over many texts. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address review comments (#5) Created 7 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « base/i18n/string_search.h ('k') | base/i18n/string_search_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: base/i18n/string_search.cc
diff --git a/base/i18n/string_search.cc b/base/i18n/string_search.cc
index f4e53cb4b7c8b4f8bfb22bb896bae3cd2e85e862..17304b31cc708183578bb131fde623a3a5eb4982 100644
--- a/base/i18n/string_search.cc
+++ b/base/i18n/string_search.cc
@@ -7,71 +7,73 @@
#include "third_party/icu/public/i18n/unicode/usearch.h"
-namespace {
+namespace base {
+namespace i18n {
+
+FixedPatternStringSearchIgnoringCaseAndAccents::
+FixedPatternStringSearchIgnoringCaseAndAccents(const string16& find_this)
+ : find_this_(find_this) {
+ // usearch_open requires a valid string argument to be searched, even if we
+ // want to set it by usearch_setText afterwards. So, supplying a dummy text.
+ const string16& dummy = find_this_;
-bool CollationSensitiveStringSearch(const string16& find_this,
- const string16& in_this,
- UCollationStrength strength,
- size_t* match_index,
- size_t* match_length) {
UErrorCode status = U_ZERO_ERROR;
+ search_ = usearch_open(find_this_.data(), find_this_.size(),
+ dummy.data(), dummy.size(),
+ uloc_getDefault(),
+ NULL, // breakiter
+ &status);
+ if (U_SUCCESS(status)) {
+ UCollator* collator = usearch_getCollator(search_);
+ ucol_setStrength(collator, UCOL_PRIMARY);
+ usearch_reset(search_);
+ }
+}
+
+FixedPatternStringSearchIgnoringCaseAndAccents::
+~FixedPatternStringSearchIgnoringCaseAndAccents() {
+ if (search_)
+ usearch_close(search_);
+}
- UStringSearch* search = usearch_open(find_this.data(), -1,
- in_this.data(), -1,
- uloc_getDefault(),
- NULL, // breakiter
- &status);
+bool FixedPatternStringSearchIgnoringCaseAndAccents::Search(
+ const string16& in_this, size_t* match_index, size_t* match_length) {
+ UErrorCode status = U_ZERO_ERROR;
+ usearch_setText(search_, in_this.data(), in_this.size(), &status);
// Default to basic substring search if usearch fails. According to
// http://icu-project.org/apiref/icu4c/usearch_8h.html, usearch_open will fail
// if either |find_this| or |in_this| are empty. In either case basic
// substring search will give the correct return value.
if (!U_SUCCESS(status)) {
- size_t index = in_this.find(find_this);
+ size_t index = in_this.find(find_this_);
if (index == string16::npos) {
return false;
} else {
if (match_index)
*match_index = index;
if (match_length)
- *match_length = find_this.size();
+ *match_length = find_this_.size();
return true;
}
}
- UCollator* collator = usearch_getCollator(search);
- ucol_setStrength(collator, strength);
- usearch_reset(search);
-
- int32_t index = usearch_first(search, &status);
- if (!U_SUCCESS(status) || index == USEARCH_DONE) {
- usearch_close(search);
+ int32_t index = usearch_first(search_, &status);
+ if (!U_SUCCESS(status) || index == USEARCH_DONE)
return false;
- }
-
if (match_index)
*match_index = static_cast<size_t>(index);
if (match_length)
- *match_length = static_cast<size_t>(usearch_getMatchedLength(search));
-
- usearch_close(search);
+ *match_length = static_cast<size_t>(usearch_getMatchedLength(search_));
return true;
}
-} // namespace
-
-namespace base {
-namespace i18n {
-
bool StringSearchIgnoringCaseAndAccents(const string16& find_this,
const string16& in_this,
size_t* match_index,
size_t* match_length) {
- return CollationSensitiveStringSearch(find_this,
- in_this,
- UCOL_PRIMARY,
- match_index,
- match_length);
+ return FixedPatternStringSearchIgnoringCaseAndAccents(find_this).Search(
+ in_this, match_index, match_length);
}
} // namespace i18n
« no previous file with comments | « base/i18n/string_search.h ('k') | base/i18n/string_search_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698