Skip to content

Commit 71e0ee8

Browse files
GordonSmithGordonSmith
committed
Merge branch 'HPCC-33592-BUMP_VCPKG' into future_master
2 parents 0b1db29 + 25057f1 commit 71e0ee8

20 files changed

+1494
-20
lines changed

‎plugins/mongodb/mongodbembed.cpp

Lines changed: 16 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
#include <cstdint>
2828

2929
#include "mongocxx/options/client.hpp"
30-
#include "mongocxx/stdx.hpp"
3130
#include "mongocxx/cursor.hpp"
3231
#include "bsoncxx/json.hpp"
3332
#include "bsoncxx/builder/stream/helpers.hpp"
@@ -36,7 +35,6 @@
3635
#include "bsoncxx/builder/stream/array.hpp"
3736
#include "bsoncxx/document/value.hpp"
3837
#include "bsoncxx/document/view.hpp"
39-
#include "bsoncxx/stdx/make_unique.hpp"
4038
#include "bsoncxx/stdx/optional.hpp"
4139
#include "bsoncxx/stdx/string_view.hpp"
4240
#include "bsoncxx/builder/basic/array.hpp"
@@ -465,7 +463,7 @@ namespace mongodbembed
465463
size32_t utf8chars;
466464
char *utf8;
467465
rtlUnicodeToUtf8X(utf8chars, utf8, chars, value);
468-
query->build()->append(kvp(std::string(field->name), bsoncxx::types::b_utf8{utf8}));
466+
query->build()->append(kvp(std::string(field->name), bsoncxx::types::b_string{utf8}));
469467
}
470468

471469
/**
@@ -678,7 +676,7 @@ namespace mongodbembed
678676
}
679677

680678
/**
681-
* @brief Binds an ECL Data param to a bsoncxx::types::b_utf8
679+
* @brief Binds an ECL Data param to a bsoncxx::types::b_string
682680
*
683681
* @param name Name of the parameter.
684682
* @param len Length of the value.
@@ -786,7 +784,7 @@ namespace mongodbembed
786784
}
787785

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

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

805803
/**
806-
* @brief Binds an ECL VString param to a bsoncxx::types::b_utf8.
804+
* @brief Binds an ECL VString param to a bsoncxx::types::b_string.
807805
*
808806
* @param name Name of the parameter.
809807
* @param val VString value.
@@ -815,11 +813,11 @@ namespace mongodbembed
815813
rtlDataAttr utf8;
816814
rtlStrToUtf8X(utf8Chars, utf8.refstr(), strlen(val), val);
817815

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

821819
/**
822-
* @brief Binds an ECL UTF8 param to a bsoncxx::types::b_utf8.
820+
* @brief Binds an ECL UTF8 param to a bsoncxx::types::b_string.
823821
*
824822
* @param name Name of the parameter.
825823
* @param chars Number of chars in string.
@@ -829,11 +827,11 @@ namespace mongodbembed
829827
{
830828
checkNextParam(name);
831829

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

835833
/**
836-
* @brief Binds an ECL Unicode param to a bsoncxx::types::b_utf8.
834+
* @brief Binds an ECL Unicode param to a bsoncxx::types::b_string.
837835
*
838836
* @param name Name of the parameter.
839837
* @param chars Number of chars in string.
@@ -846,7 +844,7 @@ namespace mongodbembed
846844
rtlDataAttr utf8;
847845
rtlUnicodeToUtf8X(utf8chars, utf8.refstr(), chars, val);
848846

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

852850
/**
@@ -863,7 +861,7 @@ namespace mongodbembed
863861
bsoncxx::stdx::string_view) noexcept {}
864862
};
865863

866-
auto instance = bsoncxx::stdx::make_unique<mongocxx::instance>(bsoncxx::stdx::make_unique<noop_logger>());
864+
auto instance = std::make_unique<mongocxx::instance>(std::make_unique<noop_logger>());
867865

868866
MongoDBConnection::createInstance().configure(std::move(instance));
869867
}
@@ -1111,7 +1109,7 @@ namespace mongodbembed
11111109
{
11121110
builder << param << ele.get_double().value;
11131111
}
1114-
else if (ele.type() == bsoncxx::type::k_utf8)
1112+
else if (ele.type() == bsoncxx::type::k_string)
11151113
{
11161114
builder << param << ele.get_string().value;
11171115
}
@@ -1147,7 +1145,7 @@ namespace mongodbembed
11471145
{
11481146
ctx << ele.get_double().value;
11491147
}
1150-
else if (ele.type() == bsoncxx::type::k_utf8)
1148+
else if (ele.type() == bsoncxx::type::k_string)
11511149
{
11521150
ctx << ele.get_string().value;
11531151
}
@@ -1196,7 +1194,7 @@ namespace mongodbembed
11961194
}
11971195
else
11981196
{
1199-
if (view[key].type() == bsoncxx::type::k_utf8)
1197+
if (view[key].type() == bsoncxx::type::k_string)
12001198
{
12011199
insertValue(builder, std::string(view[key].get_string().value), view[value.substr(1)]);
12021200
}
@@ -1323,7 +1321,7 @@ namespace mongodbembed
13231321
}
13241322
else
13251323
{
1326-
if (view[key].type() == bsoncxx::type::k_utf8)
1324+
if (view[key].type() == bsoncxx::type::k_string)
13271325
{
13281326
builder << key << open_document << [&](key_context<> ctx) {
13291327
buildDocument(ctx, view, ++start);
@@ -1338,7 +1336,7 @@ namespace mongodbembed
13381336
{
13391337
if (!isRsvd)
13401338
{
1341-
if (view[key].type() == bsoncxx::type::k_utf8)
1339+
if (view[key].type() == bsoncxx::type::k_string)
13421340
key = std::string{view[key].get_string().value};
13431341
else
13441342
failx("Key must be type String.");

‎system/jlib/jtrace.cpp

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,18 @@ class NoopSpanExporter final : public opentelemetry::sdk::trace::SpanExporter
120120
return opentelemetry::sdk::common::ExportResult::kSuccess;
121121
}
122122

123+
/**
124+
* Export all spans that have been exported.
125+
* @param timeout an optional timeout, the default timeout means that no
126+
* timeout is applied.
127+
* @return return true when all data are exported, and false when timeout
128+
*/
129+
virtual bool ForceFlush(
130+
std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override
131+
{
132+
return true;
133+
}
134+
123135
/**
124136
* Shut down the exporter. NoopSpanExporter does not need to do anything here.
125137
* @param timeout an optional timeout.
@@ -309,6 +321,18 @@ class JLogSpanExporter final : public opentelemetry::sdk::trace::SpanExporter
309321
}
310322
}
311323

324+
/**
325+
* Export all spans that have been exported.
326+
* @param timeout an optional timeout, the default timeout means that no
327+
* timeout is applied.
328+
* @return return true when all data are exported, and false when timeout
329+
*/
330+
virtual bool ForceFlush(
331+
std::chrono::microseconds timeout = (std::chrono::microseconds::max)()) noexcept override
332+
{
333+
return true;
334+
}
335+
312336
/**
313337
* Shut down the exporter.
314338
* @param timeout an optional timeout.

‎vcpkg

Submodule vcpkg updated 2712 files

‎vcpkg-configuration.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"default-registry": {
33
"kind": "git",
44
"repository": "https://github.com/microsoft/vcpkg",
5-
"baseline": "b2cb0da531c2f1f740045bfe7c4dac59f0b2b69c"
5+
"baseline": "d5ec528843d29e3a52d745a64b469f810b2cedbf"
66
},
77
"registries": [],
88
"overlay-ports": [

0 commit comments

Comments
 (0)