Skip to content

Commit cc3c7ca

Browse files
maximyurchukmaximyurchuk
authored
Merge pull request #8060 from ydb-platform/mergelibs-240820-1626
Library import 240820-1626
2 parents 7ab6040 + c6ce285 commit cc3c7ca

File tree

95 files changed

+1686
-783
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

95 files changed

+1686
-783
lines changed

‎build/conf/ts/node_modules.conf

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,10 @@ module NPM_CONTRIBS: _BARE_UNIT {
4646
###
4747
### @see [NPM_CONTRIBS()](#module_NPM_CONTRIBS)
4848
macro FROM_NPM_LOCKFILES(LOCKFILES...) {
49-
SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS $LOCKFILES)
49+
# SET_APPEND(_MAKEFILE_INCLUDE_LIKE_DEPS $LOCKFILES)
5050
# See implementation in build/plugins/nots.py
51-
_FROM_NPM_LOCKFILES($LOCKFILES)
51+
# _FROM_NPM_LOCKFILES($LOCKFILES)
52+
MESSAGE("NPM_CONTRIBS and FROM_NPM_LOCKFILES are disabled. Please exclude them from your build process")
5253
}
5354

5455
FROM_NPM_CWD=$ARCADIA_BUILD_ROOT/$NPM_CONTRIBS_PATH

‎build/conf/ts/ts_next.conf

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
TS_NEXT_CONFIG_PATH=next.config.js
2+
TS_NEXT_COMMAND=build
23

34
### @usage: TS_NEXT_CONFIG(ConfigPath)
45
###
@@ -25,10 +26,15 @@ macro TS_NEXT_OUTPUT(DirName) {
2526
SET(TS_NEXT_OUTPUT_DIR $DirName)
2627
}
2728

29+
macro TS_NEXT_EXPERIMENTAL_COMPILE() {
30+
SET(TS_NEXT_COMMAND experimental-compile)
31+
}
32+
2833
TS_NEXT_CMD=$TOUCH_UNIT \
2934
&& $_TS_FILES_COPY_CMD \
3035
&& $ADD_VCS_INFO_FILE_CMD \
3136
&& $NOTS_TOOL $NOTS_TOOL_BASE_ARGS build-next $NOTS_TOOL_COMMON_BUILDER_ARGS \
37+
--ts-next-command ${TS_NEXT_COMMAND} \
3238
--bundler-config-path ${input:TS_NEXT_CONFIG_PATH} \
3339
--output-dirs ${TS_NEXT_OUTPUT_DIR} \
3440
$_NODE_MODULES_INOUTS ${hide:PEERS} \

‎build/external_resources/ymake/public.resources.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:6863663968"
4+
"uri": "sbr:6888066924"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:6863662364"
7+
"uri": "sbr:6888066560"
88
},
99
"linux": {
10-
"uri": "sbr:6863668576"
10+
"uri": "sbr:6888067594"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:6863660934"
13+
"uri": "sbr:6888066108"
1414
},
1515
"win32-clang-cl": {
16-
"uri": "sbr:6863665723"
16+
"uri": "sbr:6888067214"
1717
}
1818
}
1919
}

‎build/external_resources/ymake/resources.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"by_platform": {
33
"darwin": {
4-
"uri": "sbr:6863655261"
4+
"uri": "sbr:6888055464"
55
},
66
"darwin-arm64": {
7-
"uri": "sbr:6863653633"
7+
"uri": "sbr:6888054907"
88
},
99
"linux": {
10-
"uri": "sbr:6863658342"
10+
"uri": "sbr:6888056646"
1111
},
1212
"linux-aarch64": {
13-
"uri": "sbr:6863651876"
13+
"uri": "sbr:6888054266"
1414
},
1515
"win32-clang-cl": {
16-
"uri": "sbr:6863656814"
16+
"uri": "sbr:6888056076"
1717
}
1818
}
1919
}

‎build/mapping.conf.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -514,6 +514,7 @@
514514
"6810222813": "https://devtools-registry.s3.yandex.net/6810222813",
515515
"6845622598": "https://devtools-registry.s3.yandex.net/6845622598",
516516
"6863663968": "https://devtools-registry.s3.yandex.net/6863663968",
517+
"6888066924": "https://devtools-registry.s3.yandex.net/6888066924",
517518
"5766171800": "https://devtools-registry.s3.yandex.net/5766171800",
518519
"5805430761": "https://devtools-registry.s3.yandex.net/5805430761",
519520
"5829025456": "https://devtools-registry.s3.yandex.net/5829025456",
@@ -545,6 +546,7 @@
545546
"6810222474": "https://devtools-registry.s3.yandex.net/6810222474",
546547
"6845622251": "https://devtools-registry.s3.yandex.net/6845622251",
547548
"6863662364": "https://devtools-registry.s3.yandex.net/6863662364",
549+
"6888066560": "https://devtools-registry.s3.yandex.net/6888066560",
548550
"5766173070": "https://devtools-registry.s3.yandex.net/5766173070",
549551
"5805432830": "https://devtools-registry.s3.yandex.net/5805432830",
550552
"5829031598": "https://devtools-registry.s3.yandex.net/5829031598",
@@ -576,6 +578,7 @@
576578
"6810223737": "https://devtools-registry.s3.yandex.net/6810223737",
577579
"6845623354": "https://devtools-registry.s3.yandex.net/6845623354",
578580
"6863668576": "https://devtools-registry.s3.yandex.net/6863668576",
581+
"6888067594": "https://devtools-registry.s3.yandex.net/6888067594",
579582
"5766171341": "https://devtools-registry.s3.yandex.net/5766171341",
580583
"5805430188": "https://devtools-registry.s3.yandex.net/5805430188",
581584
"5829023352": "https://devtools-registry.s3.yandex.net/5829023352",
@@ -607,6 +610,7 @@
607610
"6810222156": "https://devtools-registry.s3.yandex.net/6810222156",
608611
"6845621721": "https://devtools-registry.s3.yandex.net/6845621721",
609612
"6863660934": "https://devtools-registry.s3.yandex.net/6863660934",
613+
"6888066108": "https://devtools-registry.s3.yandex.net/6888066108",
610614
"5766172695": "https://devtools-registry.s3.yandex.net/5766172695",
611615
"5805432230": "https://devtools-registry.s3.yandex.net/5805432230",
612616
"5829029743": "https://devtools-registry.s3.yandex.net/5829029743",
@@ -638,6 +642,7 @@
638642
"6810223259": "https://devtools-registry.s3.yandex.net/6810223259",
639643
"6845622957": "https://devtools-registry.s3.yandex.net/6845622957",
640644
"6863665723": "https://devtools-registry.s3.yandex.net/6863665723",
645+
"6888067214": "https://devtools-registry.s3.yandex.net/6888067214",
641646
"4307890075": "https://devtools-registry.s3.yandex.net/4307890075",
642647
"5517245192": "https://devtools-registry.s3.yandex.net/5517245192",
643648
"4307901240": "https://devtools-registry.s3.yandex.net/4307901240",
@@ -1289,6 +1294,7 @@
12891294
"6810222813": "devtools/ymake/bin/ymake for darwin",
12901295
"6845622598": "devtools/ymake/bin/ymake for darwin",
12911296
"6863663968": "devtools/ymake/bin/ymake for darwin",
1297+
"6888066924": "devtools/ymake/bin/ymake for darwin",
12921298
"5766171800": "devtools/ymake/bin/ymake for darwin-arm64",
12931299
"5805430761": "devtools/ymake/bin/ymake for darwin-arm64",
12941300
"5829025456": "devtools/ymake/bin/ymake for darwin-arm64",
@@ -1320,6 +1326,7 @@
13201326
"6810222474": "devtools/ymake/bin/ymake for darwin-arm64",
13211327
"6845622251": "devtools/ymake/bin/ymake for darwin-arm64",
13221328
"6863662364": "devtools/ymake/bin/ymake for darwin-arm64",
1329+
"6888066560": "devtools/ymake/bin/ymake for darwin-arm64",
13231330
"5766173070": "devtools/ymake/bin/ymake for linux",
13241331
"5805432830": "devtools/ymake/bin/ymake for linux",
13251332
"5829031598": "devtools/ymake/bin/ymake for linux",
@@ -1351,6 +1358,7 @@
13511358
"6810223737": "devtools/ymake/bin/ymake for linux",
13521359
"6845623354": "devtools/ymake/bin/ymake for linux",
13531360
"6863668576": "devtools/ymake/bin/ymake for linux",
1361+
"6888067594": "devtools/ymake/bin/ymake for linux",
13541362
"5766171341": "devtools/ymake/bin/ymake for linux-aarch64",
13551363
"5805430188": "devtools/ymake/bin/ymake for linux-aarch64",
13561364
"5829023352": "devtools/ymake/bin/ymake for linux-aarch64",
@@ -1382,6 +1390,7 @@
13821390
"6810222156": "devtools/ymake/bin/ymake for linux-aarch64",
13831391
"6845621721": "devtools/ymake/bin/ymake for linux-aarch64",
13841392
"6863660934": "devtools/ymake/bin/ymake for linux-aarch64",
1393+
"6888066108": "devtools/ymake/bin/ymake for linux-aarch64",
13851394
"5766172695": "devtools/ymake/bin/ymake for win32-clang-cl",
13861395
"5805432230": "devtools/ymake/bin/ymake for win32-clang-cl",
13871396
"5829029743": "devtools/ymake/bin/ymake for win32-clang-cl",
@@ -1413,6 +1422,7 @@
14131422
"6810223259": "devtools/ymake/bin/ymake for win32-clang-cl",
14141423
"6845622957": "devtools/ymake/bin/ymake for win32-clang-cl",
14151424
"6863665723": "devtools/ymake/bin/ymake for win32-clang-cl",
1425+
"6888067214": "devtools/ymake/bin/ymake for win32-clang-cl",
14161426
"4307890075": "flake8_linter for linux",
14171427
"5517245192": "flake8_linter for linux",
14181428
"4307901240": "flake8_linter for linux-aarch64",

‎contrib/restricted/boost/assert/include/boost/assert/source_location.hpp

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,9 +174,12 @@ template<class E, class T> std::basic_ostream<E, T> & operator<<( std::basic_ost
174174

175175
# define BOOST_CURRENT_LOCATION ::boost::source_location(__builtin_FILE(), __builtin_LINE(), __builtin_FUNCTION(), __builtin_COLUMN())
176176

177-
#elif defined(BOOST_GCC) && BOOST_GCC >= 70000
177+
#elif defined(BOOST_GCC) && BOOST_GCC >= 80000
178178

179179
// The built-ins are available in 4.8+, but are not constant expressions until 7
180+
// In addition, reproducible builds require -ffile-prefix-map, which is GCC 8
181+
// https://github.com/boostorg/assert/issues/38
182+
180183
# define BOOST_CURRENT_LOCATION ::boost::source_location(__builtin_FILE(), __builtin_LINE(), __builtin_FUNCTION())
181184

182185
#elif defined(BOOST_GCC) && BOOST_GCC >= 50000

‎contrib/restricted/boost/assert/ya.make

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@ LICENSE(BSL-1.0)
66

77
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
88

9-
VERSION(1.85.0)
9+
VERSION(1.86.0)
1010

11-
ORIGINAL_SOURCE(https://github.com/boostorg/assert/archive/boost-1.85.0.tar.gz)
11+
ORIGINAL_SOURCE(https://github.com/boostorg/assert/archive/boost-1.86.0.tar.gz)
1212

1313
PEERDIR(
1414
contrib/restricted/boost/config

‎contrib/restricted/boost/graph/include/boost/graph/detail/adjacency_list.hpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2189,8 +2189,12 @@ class vec_adj_list_impl : public adj_list_helper< Config, Base >
21892189
}
21902190
// Copy the edges by adding each edge and copying its
21912191
// property object.
2192+
#ifdef BOOST_NO_CXX17_STRUCTURED_BINDINGS
21922193
edge_iterator ei, ei_end;
21932194
for (boost::tie(ei, ei_end) = edges(x); ei != ei_end; ++ei)
2195+
#else // Silences -Wmaybe-uninitialized in adj_list_edge_iterator::operator++().
2196+
for (auto [ei, ei_end] = edges(x); ei != ei_end; ++ei)
2197+
#endif
21942198
{
21952199
edge_descriptor e;
21962200
bool inserted;

‎contrib/restricted/boost/graph/include/boost/graph/detail/read_graphviz_spirit.hpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ namespace detail
171171
= construct_< std::string >(arg1, arg2)];
172172

173173
a_list = list_p(
174-
ID[(a_list.key = arg1), (a_list.value = "true")] >> !(
174+
ID[((a_list.key = arg1), (a_list.value = "true"))] >> !(
175175
ch_p('=') >> ID[a_list.value = arg1])[phoenix::bind(
176176
&definition::call_prop_actor)(
177177
var(*this), a_list.key, a_list.value)],
@@ -213,8 +213,8 @@ namespace detail
213213
// (directed/undirected)
214214
edgeop = ch_p('-') >> ch_p(boost::ref(edge_head));
215215

216-
edgeRHS = +(edgeop[(data_stmt.sources = data_stmt.dests),
217-
(data_stmt.dests = construct_< nodes_t >())]
216+
edgeRHS = +(edgeop[((data_stmt.sources = data_stmt.dests),
217+
(data_stmt.dests = construct_< nodes_t >()))]
218218
>> (subgraph[data_stmt.dests = arg1]
219219
| node_id[phoenix::bind(&definition::insert_node)(
220220
var(*this), data_stmt.dests, arg1)])
@@ -225,18 +225,18 @@ namespace detail
225225
// To avoid backtracking, edge, node, and subgraph
226226
// statements are processed as one nonterminal.
227227
data_stmt
228-
= (subgraph[(data_stmt.dests
228+
= (subgraph[((data_stmt.dests
229229
= arg1), // will get moved in rhs
230-
(data_stmt.saw_node = false)]
231-
| node_id[(phoenix::bind(
230+
(data_stmt.saw_node = false))]
231+
| node_id[((phoenix::bind(
232232
&definition::insert_node)(
233233
var(*this), data_stmt.dests, arg1)),
234234
(data_stmt.saw_node = true),
235235
#ifdef BOOST_GRAPH_DEBUG
236236
(std::cout << val("AcTive Node: ") << arg1
237237
<< "\n"),
238238
#endif // BOOST_GRAPH_DEBUG
239-
(data_stmt.active_node = arg1)])
239+
(data_stmt.active_node = arg1))])
240240
>> if_p(edgeRHS)[!attr_list(actor_t(phoenix::bind(
241241
&definition::edge_prop)(
242242
var(*this), arg1, arg2)))]
@@ -252,11 +252,11 @@ namespace detail
252252
stmt_list = *(stmt >> !ch_p(';'));
253253

254254
subgraph = !(as_lower_d[keyword_p("subgraph")]
255-
>> (!ID[(subgraph.name = arg1),
255+
>> (!ID[((subgraph.name = arg1),
256256
(subgraph.nodes
257257
= (var(subgraph_nodes))[arg1]),
258258
(subgraph.edges
259-
= (var(subgraph_edges))[arg1])]))
259+
= (var(subgraph_edges))[arg1]))]))
260260
>> ch_p('{')[++var(subgraph_depth)] >> stmt_list
261261
>> ch_p('}')[--var(subgraph_depth)]
262262
[(var(subgraph_nodes))[subgraph.name]
@@ -265,19 +265,19 @@ namespace detail
265265
= subgraph.edges]
266266

267267
| as_lower_d[keyword_p("subgraph")]
268-
>> ID[(subgraph.nodes
268+
>> ID[((subgraph.nodes
269269
= (var(subgraph_nodes))[arg1]),
270-
(subgraph.edges = (var(subgraph_edges))[arg1])];
270+
(subgraph.edges = (var(subgraph_edges))[arg1]))];
271271

272272
the_grammar = (!as_lower_d[keyword_p("strict")])
273273
>> (as_lower_d[keyword_p(
274-
"graph")][(var(edge_head) = '-'),
274+
"graph")][((var(edge_head) = '-'),
275275
(phoenix::bind(&definition::check_undirected)(
276-
var(*this)))]
276+
var(*this))))]
277277
| as_lower_d[keyword_p(
278-
"digraph")][(var(edge_head) = '>'),
278+
"digraph")][((var(edge_head) = '>'),
279279
(phoenix::bind(&definition::check_directed)(
280-
var(*this)))])
280+
var(*this))))])
281281
>> (!ID) >> ch_p('{') >> stmt_list >> ch_p('}');
282282

283283
} // definition()

‎contrib/restricted/boost/graph/include/boost/graph/exception.hpp

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,8 @@
1313
#include <stdexcept>
1414
#include <string>
1515

16+
#include <boost/config.hpp>
17+
1618
namespace boost
1719
{
1820

@@ -51,6 +53,53 @@ struct BOOST_SYMBOL_VISIBLE not_complete : public bad_graph
5153
not_complete() : bad_graph("The graph must be complete.") {}
5254
};
5355

56+
struct BOOST_SYMBOL_VISIBLE graph_exception : public std::exception
57+
{
58+
~graph_exception() throw() BOOST_OVERRIDE {}
59+
const char* what() const throw() BOOST_OVERRIDE = 0;
60+
};
61+
62+
struct BOOST_SYMBOL_VISIBLE bad_parallel_edge : public graph_exception
63+
{
64+
std::string from;
65+
std::string to;
66+
mutable std::string statement;
67+
bad_parallel_edge(const std::string& i, const std::string& j)
68+
: from(i), to(j)
69+
{
70+
}
71+
72+
~bad_parallel_edge() throw() BOOST_OVERRIDE {}
73+
const char* what() const throw() BOOST_OVERRIDE
74+
{
75+
if (statement.empty())
76+
statement = std::string("Failed to add parallel edge: (") + from
77+
+ "," + to + ")\n";
78+
79+
return statement.c_str();
80+
}
81+
};
82+
83+
struct BOOST_SYMBOL_VISIBLE directed_graph_error : public graph_exception
84+
{
85+
~directed_graph_error() throw() BOOST_OVERRIDE {}
86+
const char* what() const throw() BOOST_OVERRIDE
87+
{
88+
return "read_graphviz: "
89+
"Tried to read a directed graph into an undirected graph.";
90+
}
91+
};
92+
93+
struct BOOST_SYMBOL_VISIBLE undirected_graph_error : public graph_exception
94+
{
95+
~undirected_graph_error() throw() BOOST_OVERRIDE {}
96+
const char* what() const throw() BOOST_OVERRIDE
97+
{
98+
return "read_graphviz: "
99+
"Tried to read an undirected graph into a directed graph.";
100+
}
101+
};
102+
54103
} // namespace boost
55104

56105
#endif // BOOST_GRAPH_EXCEPTION_HPP

0 commit comments

Comments
 (0)