Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPCC-33592 Bump vcpkg to 2025.02.14 #19592

Merged
merged 1 commit into from
Mar 11, 2025
Merged

HPCC-33592 Bump vcpkg to 2025.02.14 #19592

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 16 additions & 18 deletions plugins/mongodb/mongodbembed.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
#include <cstdint>

#include "mongocxx/options/client.hpp"
#include "mongocxx/stdx.hpp"
#include "mongocxx/cursor.hpp"
#include "bsoncxx/json.hpp"
#include "bsoncxx/builder/stream/helpers.hpp"
Expand All @@ -36,7 +35,6 @@
#include "bsoncxx/builder/stream/array.hpp"
#include "bsoncxx/document/value.hpp"
#include "bsoncxx/document/view.hpp"
#include "bsoncxx/stdx/make_unique.hpp"
#include "bsoncxx/stdx/optional.hpp"
#include "bsoncxx/stdx/string_view.hpp"
#include "bsoncxx/builder/basic/array.hpp"
Expand Down Expand Up @@ -465,7 +463,7 @@ namespace mongodbembed
size32_t utf8chars;
char *utf8;
rtlUnicodeToUtf8X(utf8chars, utf8, chars, value);
query->build()->append(kvp(std::string(field->name), bsoncxx::types::b_utf8{utf8}));
query->build()->append(kvp(std::string(field->name), bsoncxx::types::b_string{utf8}));
}

/**
Expand Down Expand Up @@ -678,7 +676,7 @@ namespace mongodbembed
}

/**
* @brief Binds an ECL Data param to a bsoncxx::types::b_utf8
* @brief Binds an ECL Data param to a bsoncxx::types::b_string
*
* @param name Name of the parameter.
* @param len Length of the value.
Expand Down Expand Up @@ -786,7 +784,7 @@ namespace mongodbembed
}

/**
* @brief Binds an ECL String param to a bsoncxx::types::b_utf8.
* @brief Binds an ECL String param to a bsoncxx::types::b_string.
*
* @param name Name of the parameter.
* @param len Number of chars in string.
Expand All @@ -799,11 +797,11 @@ namespace mongodbembed
rtlDataAttr utf8;
rtlStrToUtf8X(utf8Chars, utf8.refstr(), len, val);

query->build()->append(kvp(std::string(name), bsoncxx::types::b_utf8{std::string(utf8.getstr(), rtlUtf8Size(utf8Chars, utf8.getdata()))}));
query->build()->append(kvp(std::string(name), bsoncxx::types::b_string{std::string(utf8.getstr(), rtlUtf8Size(utf8Chars, utf8.getdata()))}));
}

/**
* @brief Binds an ECL VString param to a bsoncxx::types::b_utf8.
* @brief Binds an ECL VString param to a bsoncxx::types::b_string.
*
* @param name Name of the parameter.
* @param val VString value.
Expand All @@ -815,11 +813,11 @@ namespace mongodbembed
rtlDataAttr utf8;
rtlStrToUtf8X(utf8Chars, utf8.refstr(), strlen(val), val);

query->build()->append(kvp(std::string(name), bsoncxx::types::b_utf8{std::string(utf8.getstr(), rtlUtf8Size(utf8Chars, utf8.getdata()))}));
query->build()->append(kvp(std::string(name), bsoncxx::types::b_string{std::string(utf8.getstr(), rtlUtf8Size(utf8Chars, utf8.getdata()))}));
}

/**
* @brief Binds an ECL UTF8 param to a bsoncxx::types::b_utf8.
* @brief Binds an ECL UTF8 param to a bsoncxx::types::b_string.
*
* @param name Name of the parameter.
* @param chars Number of chars in string.
Expand All @@ -829,11 +827,11 @@ namespace mongodbembed
{
checkNextParam(name);

query->build()->append(kvp(std::string(name), bsoncxx::types::b_utf8{std::string(val, rtlUtf8Size(chars, val))}));
query->build()->append(kvp(std::string(name), bsoncxx::types::b_string{std::string(val, rtlUtf8Size(chars, val))}));
}

/**
* @brief Binds an ECL Unicode param to a bsoncxx::types::b_utf8.
* @brief Binds an ECL Unicode param to a bsoncxx::types::b_string.
*
* @param name Name of the parameter.
* @param chars Number of chars in string.
Expand All @@ -846,7 +844,7 @@ namespace mongodbembed
rtlDataAttr utf8;
rtlUnicodeToUtf8X(utf8chars, utf8.refstr(), chars, val);

query->build()->append(kvp(std::string(name), bsoncxx::types::b_utf8{std::string(utf8.getstr(), rtlUtf8Size(utf8chars, utf8.getdata()))}));
query->build()->append(kvp(std::string(name), bsoncxx::types::b_string{std::string(utf8.getstr(), rtlUtf8Size(utf8chars, utf8.getdata()))}));
}

/**
Expand All @@ -863,7 +861,7 @@ namespace mongodbembed
bsoncxx::stdx::string_view) noexcept {}
};

auto instance = bsoncxx::stdx::make_unique<mongocxx::instance>(bsoncxx::stdx::make_unique<noop_logger>());
auto instance = std::make_unique<mongocxx::instance>(std::make_unique<noop_logger>());

MongoDBConnection::createInstance().configure(std::move(instance));
}
Expand Down Expand Up @@ -1111,7 +1109,7 @@ namespace mongodbembed
{
builder << param << ele.get_double().value;
}
else if (ele.type() == bsoncxx::type::k_utf8)
else if (ele.type() == bsoncxx::type::k_string)
{
builder << param << ele.get_string().value;
}
Expand Down Expand Up @@ -1147,7 +1145,7 @@ namespace mongodbembed
{
ctx << ele.get_double().value;
}
else if (ele.type() == bsoncxx::type::k_utf8)
else if (ele.type() == bsoncxx::type::k_string)
{
ctx << ele.get_string().value;
}
Expand Down Expand Up @@ -1196,7 +1194,7 @@ namespace mongodbembed
}
else
{
if (view[key].type() == bsoncxx::type::k_utf8)
if (view[key].type() == bsoncxx::type::k_string)
{
insertValue(builder, std::string(view[key].get_string().value), view[value.substr(1)]);
}
Expand Down Expand Up @@ -1323,7 +1321,7 @@ namespace mongodbembed
}
else
{
if (view[key].type() == bsoncxx::type::k_utf8)
if (view[key].type() == bsoncxx::type::k_string)
{
builder << key << open_document << [&](key_context<> ctx) {
buildDocument(ctx, view, ++start);
Expand All @@ -1338,7 +1336,7 @@ namespace mongodbembed
{
if (!isRsvd)
{
if (view[key].type() == bsoncxx::type::k_utf8)
if (view[key].type() == bsoncxx::type::k_string)
key = std::string{view[key].get_string().value};
else
failx("Key must be type String.");
Expand Down
24 changes: 24 additions & 0 deletions system/jlib/jtrace.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,18 @@ class NoopSpanExporter final : public opentelemetry::sdk::trace::SpanExporter
return opentelemetry::sdk::common::ExportResult::kSuccess;
}

/**
* Export all spans that have been exported.
* @param timeout an optional timeout, the default timeout means that no
* timeout is applied.
* @return return true when all data are exported, and false when timeout
*/
virtual bool ForceFlush(
std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override
{
return true;
}

/**
* Shut down the exporter. NoopSpanExporter does not need to do anything here.
* @param timeout an optional timeout.
Expand Down Expand Up @@ -309,6 +321,18 @@ class JLogSpanExporter final : public opentelemetry::sdk::trace::SpanExporter
}
}

/**
* Export all spans that have been exported.
* @param timeout an optional timeout, the default timeout means that no
* timeout is applied.
* @return return true when all data are exported, and false when timeout
*/
virtual bool ForceFlush(
std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override
{
return true;
}

/**
* Shut down the exporter.
* @param timeout an optional timeout.
Expand Down
2 changes: 1 addition & 1 deletion vcpkg
Open in desktop
Submodule vcpkg updated 2712 files
2 changes: 1 addition & 1 deletion vcpkg-configuration.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"default-registry": {
"kind": "git",
"repository": "https://github.com/microsoft/vcpkg",
"baseline": "b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c"
"baseline": "d5ec528843d29e3a52d745a64b469f810b2cedbf"
},
"registries": [],
"overlay-ports": [
Expand Down
Loading
Loading