diff options
| author | Billy Donahue <billy.donahue@mongodb.com> | 2020-09-09 21:32:04 +0000 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2020-09-15 00:42:05 +0000 |
| commit | 58828b0ce9556ee9cb38c484d1226663a0dcd993 (patch) | |
| tree | dfea448799d9bd4328114199a9767dd18d045be3 /src/mongo/bson/bsonelement.cpp | |
| parent | 22a77301a5b63b9bb7ef6dd73eabb4865c63a921 (diff) | |
| download | mongo-58828b0ce9556ee9cb38c484d1226663a0dcd993.tar.gz | |
SERVER-43909 clarify and repair util/hex.h API
- hexblob namespace
- Throwy hexblob::decode (nee fromHex)
- StringData overloads of hex codec ops
- add unsignedHex<T> and zeroPaddedHex<T>
Diffstat (limited to 'src/mongo/bson/bsonelement.cpp')
| -rw-r--r-- | src/mongo/bson/bsonelement.cpp | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/src/mongo/bson/bsonelement.cpp b/src/mongo/bson/bsonelement.cpp index 1abc796f09b..1191f82ecf2 100644 --- a/src/mongo/bson/bsonelement.cpp +++ b/src/mongo/bson/bsonelement.cpp @@ -859,25 +859,21 @@ void BSONElement::toString( const char* data = binDataClean(len); // If the BinData is a correctly sized newUUID, display it as such. if (binDataType() == newUUID && len == 16) { + using namespace fmt::literals; + StringData sd(data, len); // 4 Octets - 2 Octets - 2 Octets - 2 Octets - 6 Octets - s << "UUID(\""; - s << toHexLower(&data[0], 4); - s << "-"; - s << toHexLower(&data[4], 2); - s << "-"; - s << toHexLower(&data[6], 2); - s << "-"; - s << toHexLower(&data[8], 2); - s << "-"; - s << toHexLower(&data[10], 6); - s << "\")"; + s << "UUID(\"{}-{}-{}-{}-{}\")"_format(hexblob::encodeLower(sd.substr(0, 4)), + hexblob::encodeLower(sd.substr(4, 2)), + hexblob::encodeLower(sd.substr(6, 2)), + hexblob::encodeLower(sd.substr(8, 2)), + hexblob::encodeLower(sd.substr(10, 6))); break; } s << "BinData(" << binDataType() << ", "; if (!full && len > 80) { - s << toHex(data, 70) << "...)"; + s << hexblob::encode(data, 70) << "...)"; } else { - s << toHex(data, len) << ")"; + s << hexblob::encode(data, len) << ")"; } } break; |