diff options
author | Arun Banala <arun.banala@mongodb.com> | 2019-04-23 12:31:41 +0100 |
---|---|---|
committer | Arun Banala <arun.banala@mongodb.com> | 2019-04-30 11:13:19 +0100 |
commit | 7ea3f16dc509b9b0cf03775fd7fcd153a3de7d7f (patch) | |
tree | 5a35007eb9a2b2ffc376a2e97cbbded14acfc44a /src/mongo/util/regex_util.cpp | |
parent | 3d2cb8571b68999c10a5fab5bd0e8b9e5e498337 (diff) | |
download | mongo-7ea3f16dc509b9b0cf03775fd7fcd153a3de7d7f.tar.gz |
SERVER-40584 Regex agg expressions should not inherit from ExpressionFixedArity
Diffstat (limited to 'src/mongo/util/regex_util.cpp')
-rw-r--r-- | src/mongo/util/regex_util.cpp | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mongo/util/regex_util.cpp b/src/mongo/util/regex_util.cpp index e22cb2b1a97..1a596f5375c 100644 --- a/src/mongo/util/regex_util.cpp +++ b/src/mongo/util/regex_util.cpp @@ -35,7 +35,9 @@ namespace mongo { namespace regex_util { -pcrecpp::RE_Options flags2PcreOptions(StringData optionFlags, bool ignoreInvalidFlags) { +pcrecpp::RE_Options flagsToPcreOptions(StringData optionFlags, + bool ignoreInvalidFlags, + StringData opName) { pcrecpp::RE_Options opt; opt.set_utf8(true); for (auto flag : optionFlags) { @@ -54,7 +56,9 @@ pcrecpp::RE_Options flags2PcreOptions(StringData optionFlags, bool ignoreInvalid continue; default: if (!ignoreInvalidFlags) { - uasserted(51108, str::stream() << "Invalid flag: " << flag); + uasserted( + 51108, + str::stream() << opName << " invalid flag in regex options: " << flag); } } } |