aboutsummaryrefslogtreecommitdiffstats
path: root/contrib/libs
diff options
context:
space:
mode:
authorrobot-contrib <robot-contrib@yandex-team.com>2024-04-02 11:50:24 +0300
committerrobot-contrib <robot-contrib@yandex-team.com>2024-04-02 12:05:34 +0300
commit709be325f23a8a973e0e2259efd8608bc7f2b5b2 (patch)
treeb7418eea322d82f95bc51003a472f350cfa414c7 /contrib/libs
parent123f3012458530b5272907edd6e223b4e2c501c9 (diff)
downloadydb-709be325f23a8a973e0e2259efd8608bc7f2b5b2.tar.gz
Update contrib/libs/re2 to 2024-04-01
5780471eca02c5e3f3d22242fe64bc61c6bde62b
Diffstat (limited to 'contrib/libs')
-rw-r--r--contrib/libs/re2/README2
-rw-r--r--contrib/libs/re2/re2/filtered_re2.cc3
-rw-r--r--contrib/libs/re2/re2/prefilter_tree.cc6
-rw-r--r--contrib/libs/re2/ya.make4
4 files changed, 9 insertions, 6 deletions
diff --git a/contrib/libs/re2/README b/contrib/libs/re2/README
index 469d6f397f..21a4358c83 100644
--- a/contrib/libs/re2/README
+++ b/contrib/libs/re2/README
@@ -32,7 +32,7 @@ under the BSD-style license found in the LICENSE file.
RE2's native language is C++.
-The Python wrapper is at https://github.com/google/re2/tree/abseil/python
+The Python wrapper is at https://github.com/google/re2/tree/main/python
and on PyPI (https://pypi.org/project/google-re2/).
A C wrapper is at https://github.com/marcomaggi/cre2/.
diff --git a/contrib/libs/re2/re2/filtered_re2.cc b/contrib/libs/re2/re2/filtered_re2.cc
index 49cf68601b..1ce26a38e0 100644
--- a/contrib/libs/re2/re2/filtered_re2.cc
+++ b/contrib/libs/re2/re2/filtered_re2.cc
@@ -70,8 +70,9 @@ void FilteredRE2::Compile(std::vector<std::string>* atoms) {
return;
}
+ // Similarly to PrefilterTree::Compile(), make compiling
+ // a no-op if it's attempted before adding any patterns.
if (re2_vec_.empty()) {
- LOG(ERROR) << "Compile called before Add.";
return;
}
diff --git a/contrib/libs/re2/re2/prefilter_tree.cc b/contrib/libs/re2/re2/prefilter_tree.cc
index 3afb241c90..299a680fbd 100644
--- a/contrib/libs/re2/re2/prefilter_tree.cc
+++ b/contrib/libs/re2/re2/prefilter_tree.cc
@@ -57,8 +57,9 @@ void PrefilterTree::Compile(std::vector<std::string>* atom_vec) {
// Some legacy users of PrefilterTree call Compile() before
// adding any regexps and expect Compile() to have no effect.
- if (prefilter_vec_.empty())
+ if (prefilter_vec_.empty()) {
return;
+ }
compiled_ = true;
@@ -272,8 +273,9 @@ void PrefilterTree::RegexpsGivenStrings(
// Some legacy users of PrefilterTree call Compile() before
// adding any regexps and expect Compile() to have no effect.
// This kludge is a counterpart to that kludge.
- if (prefilter_vec_.empty())
+ if (prefilter_vec_.empty()) {
return;
+ }
LOG(ERROR) << "RegexpsGivenStrings called before Compile.";
for (size_t i = 0; i < prefilter_vec_.size(); i++)
diff --git a/contrib/libs/re2/ya.make b/contrib/libs/re2/ya.make
index da93062de9..586341f39a 100644
--- a/contrib/libs/re2/ya.make
+++ b/contrib/libs/re2/ya.make
@@ -9,9 +9,9 @@ LICENSE(
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
-VERSION(2024-03-01)
+VERSION(2024-04-01)
-ORIGINAL_SOURCE(https://github.com/google/re2/archive/2024-03-01.tar.gz)
+ORIGINAL_SOURCE(https://github.com/google/re2/archive/2024-04-01.tar.gz)
PEERDIR(
contrib/restricted/abseil-cpp/absl/base