Skip to content

Commit 1dcc13d

Browse files
alexv-smirnovalexv-smirnov
committed
Merge branch 'rightlib' into merge-libs-250130-0050
2 parents 0d6b25d + fe03be7 commit 1dcc13d

File tree

137 files changed

+2863
-1487
lines changed

Some content is hidden

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

137 files changed

+2863
-1487
lines changed

‎build/conf/java.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,6 @@ macro _DO_2_RUN_JAR_PROGRAM(IN_DIRS_VAR="uniq_", IN_DIRS_INPUTS[], IN{input}[],
498498
.PEERDIR=build/platform/java/jdk $JDK_RESOURCE_PEERDIR
499499
.CMD=${hide;kv:"p RJ"} ${hide;kv:"pc blue"} ${hide:JAVA_FAKEID} ${cwd:BINDIR} $YMAKE_PYTHON ${input:"build/scripts/mkdir.py"} ${OUT_DIR} && ${cwd:CWD} $YMAKE_PYTHON ${input:"build/scripts/setup_java_tmpdir.py"} $YMAKE_PYTHON ${input:"build/scripts/stdout2stderr.py"} ${pre=--file=:STDOUT} ${hide;output:STDOUT} ${pre=--file=:STDOUT_NOAUTO} ${hide;noauto;output:STDOUT_NOAUTO} $YMAKE_PYTHON ${input:"build/scripts/fix_java_command_file_cp.py"} --build-root ${ARCADIA_BUILD_ROOT} $JDK_RESOURCE/bin/java -Dfile.encoding=utf8 -classpath ${RUN_JAR_PROG_CP_PRE}${tool:CLASSPATH}${RUN_JAR_PROG_CP_SUF} ${Args} && $_GENTAR_HELPER($CLASSPATH $IN_DIR $IN $IN_NOPARSE $TOOL $Args OUT_DIR $OUT_DIR) ${hide;input:IN} ${hide;context=TEXT;input:IN_NOPARSE} ${hide;noauto;output:OUT_NOAUTO} ${hide;output:OUT} ${hide;tool:TOOL} ${IN_DIRS_INPUTS}
500500
.SEM=$_SEM_RUN_JAVA_PROGRAM
501-
.STRUCT_SEM=yes
502501
}
503502

504503
# tag:java-specific
@@ -508,6 +507,7 @@ macro _DO_1_RUN_JAR_PROGRAM(IN_DIRS_VAR="uniq", Args...) {
508507

509508
# tag:java-specific
510509
macro RUN_JAVA_PROGRAM(Args...) {
510+
.STRUCT_SEM=yes
511511
_DO_1_RUN_JAR_PROGRAM($Args IN_DIRS_VAR uniq_${hash:Args})
512512
}
513513

‎build/conf/licenses.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"AFL-2.0",
55
"Amazon-SL",
66
"APSL-1.0",
7-
"Artistic-1.0-Perl",
87
"Artistic-2.0",
98
"ASM-BSD-3-Clause",
109
"BCL",
@@ -159,6 +158,7 @@
159158
"AGPL-3.0-only",
160159
"AGPL-3.0-or-later",
161160
"Artistic-1.0",
161+
"Artistic-1.0-Perl",
162162
"confluent-community-1.0",
163163
"Moderne-Source-Available-License"
164164
]

‎contrib/libs/libfuzzer/.yandex_meta/override.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
pkgs: attrs: with pkgs; with attrs; rec {
2-
version = "19.1.6";
2+
version = "19.1.7";
33

44
src = fetchFromGitHub {
55
owner = "llvm";
66
repo = "llvm-project";
77
rev = "llvmorg-${version}";
8-
hash = "sha256-LD4nIjZTSZJtbgW6tZopbTF5Mq0Tenj2gbuPXhtOeUI=";
8+
hash = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
99
};
1010

1111
sourceRoot = "source/compiler-rt";

‎contrib/libs/libfuzzer/lib/fuzzer/afl/ya.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
88

99
SUBSCRIBER(g:cpp-contrib)
1010

11-
VERSION(19.1.6)
11+
VERSION(19.1.7)
1212

1313
PEERDIR(
1414
contrib/libs/afl/llvm_mode

‎contrib/libs/libfuzzer/ya.make

+2-2
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ LICENSE(
1212

1313
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
1414

15-
VERSION(19.1.6)
15+
VERSION(19.1.7)
1616

17-
ORIGINAL_SOURCE(https://github.com/llvm/llvm-project/archive/llvmorg-19.1.6.tar.gz)
17+
ORIGINAL_SOURCE(https://github.com/llvm/llvm-project/archive/llvmorg-19.1.7.tar.gz)
1818

1919
SET(SANITIZER_CFLAGS)
2020

‎contrib/libs/libtiff/.yandex_meta/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ def post_install(self):
1616

1717

1818
libtiff = CMakeNinjaNixProject(
19-
owners=["g:images", "fedorenko"],
19+
owners=["g:images"],
2020
arcdir="contrib/libs/libtiff",
2121
nixattr="libtiff",
2222
build_targets=["tiff", "tiffxx"],

‎contrib/libs/libunwind/.yandex_meta/override.nix

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
pkgs: attrs: with pkgs; with attrs; rec {
2-
version = "19.1.6";
2+
version = "19.1.7";
33

44
src = fetchFromGitHub {
55
owner = "llvm";
66
repo = "llvm-project";
77
rev = "llvmorg-${version}";
8-
hash = "sha256-LD4nIjZTSZJtbgW6tZopbTF5Mq0Tenj2gbuPXhtOeUI=";
8+
hash = "sha256-cZAB5vZjeTsXt9QHbP5xluWNQnAHByHtHnAhVDV0E6I=";
99
};
1010

1111
patches = [];

‎contrib/libs/libunwind/ya.make

+2-2
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@ LICENSE(
1111

1212
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
1313

14-
VERSION(19.1.6)
14+
VERSION(19.1.7)
1515

16-
ORIGINAL_SOURCE(https://github.com/llvm/llvm-project/archive/llvmorg-19.1.6.tar.gz)
16+
ORIGINAL_SOURCE(https://github.com/llvm/llvm-project/archive/llvmorg-19.1.7.tar.gz)
1717

1818
PEERDIR(
1919
library/cpp/sanitizer/include

‎contrib/python/responses/py3/.dist-info/METADATA

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Metadata-Version: 2.1
22
Name: responses
3-
Version: 0.25.5
3+
Version: 0.25.6
44
Summary: A utility library for mocking out the `requests` Python library.
55
Home-page: https://github.com/getsentry/responses
66
Author: David Cramer

‎contrib/python/responses/py3/responses/py.typed

+2
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
# Marker file for PEP 561. The mypy package uses inline types.
2+
# file must be here according to https://peps.python.org/pep-0561/#packaging-type-information

‎contrib/python/responses/py3/ya.make

+2-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
PY3_LIBRARY()
44

5-
VERSION(0.25.5)
5+
VERSION(0.25.6)
66

77
LICENSE(Apache-2.0)
88

@@ -26,6 +26,7 @@ RESOURCE_FILES(
2626
PREFIX contrib/python/responses/py3/
2727
.dist-info/METADATA
2828
.dist-info/top_level.txt
29+
responses/py.typed
2930
)
3031

3132
END()

‎library/cpp/monlib/encode/unistat/unistat.h

+13-3
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,18 @@
66
namespace NMonitoring {
77
/// Decodes unistat-style metrics
88
/// https://wiki.yandex-team.ru/golovan/stat-handle
9-
void DecodeUnistat(TStringBuf data, class IMetricConsumer* c, TStringBuf metricNameLabel = "sensor", TInstant ts = TInstant::Zero());
9+
void DecodeUnistat(
10+
TStringBuf data,
11+
class IMetricConsumer* c,
12+
TStringBuf metricNameLabel = "sensor",
13+
TStringBuf metricNamePrefix = "",
14+
TInstant ts = TInstant::Zero());
1015

1116
/// Assumes consumer's stream is open by the caller
12-
void DecodeUnistatToStream(TStringBuf data, class IMetricConsumer* c, TStringBuf metricNameLabel = "sensor", TInstant ts = TInstant::Zero());
13-
}
17+
void DecodeUnistatToStream(
18+
TStringBuf data,
19+
class IMetricConsumer* c,
20+
TStringBuf metricNameLabel = "sensor",
21+
TStringBuf metricNamePrefix = "",
22+
TInstant ts = TInstant::Zero());
23+
} // namespace NMonitoring

‎library/cpp/monlib/encode/unistat/unistat_decoder.cpp

+31-12
Original file line numberDiff line numberDiff line change
@@ -116,9 +116,15 @@ namespace NMonitoring {
116116
class TDecoderUnistat {
117117
private:
118118
public:
119-
explicit TDecoderUnistat(IMetricConsumer* consumer, IInputStream* is, TStringBuf metricNameLabel, TInstant ts)
119+
explicit TDecoderUnistat(
120+
IMetricConsumer* consumer,
121+
IInputStream* is,
122+
TStringBuf metricNameLabel,
123+
TStringBuf metricNamePrefix,
124+
TInstant ts)
120125
: Consumer_{consumer},
121-
MetricNameLabel(metricNameLabel),
126+
MetricNameLabel_(metricNameLabel),
127+
MetricNamePrefix_(metricNamePrefix),
122128
Timestamp_{ts} {
123129
ReadJsonTree(is, &Json_, /* throw */ true);
124130
}
@@ -252,7 +258,7 @@ namespace NMonitoring {
252258
Consumer_->OnMetricBegin(MetricContext_.Type);
253259

254260
Consumer_->OnLabelsBegin();
255-
Consumer_->OnLabel(MetricNameLabel, TString{MetricContext_.Name});
261+
Consumer_->OnLabel(MetricNameLabel_, TStringBuilder{} << MetricNamePrefix_ << MetricContext_.Name);
256262
for (auto&& l : MetricContext_.Labels) {
257263
Consumer_->OnLabel(l.Name(), l.Value());
258264
}
@@ -284,7 +290,8 @@ namespace NMonitoring {
284290
private:
285291
IMetricConsumer* Consumer_;
286292
NJson::TJsonValue Json_;
287-
TStringBuf MetricNameLabel;
293+
TStringBuf MetricNameLabel_;
294+
TStringBuf MetricNamePrefix_;
288295
TInstant Timestamp_;
289296

290297
struct {
@@ -299,15 +306,27 @@ namespace NMonitoring {
299306

300307
}
301308

302-
void DecodeUnistat(TStringBuf data, IMetricConsumer* c, TStringBuf metricNameLabel, TInstant ts) {
303-
c->OnStreamBegin();
304-
DecodeUnistatToStream(data, c, metricNameLabel, ts);
305-
c->OnStreamEnd();
309+
void DecodeUnistat(
310+
TStringBuf data,
311+
IMetricConsumer* c,
312+
TStringBuf metricNameLabel,
313+
TStringBuf metricNamePrefix,
314+
TInstant ts)
315+
{
316+
c->OnStreamBegin();
317+
DecodeUnistatToStream(data, c, metricNameLabel, metricNamePrefix, ts);
318+
c->OnStreamEnd();
306319
}
307320

308-
void DecodeUnistatToStream(TStringBuf data, IMetricConsumer* c, TStringBuf metricNameLabel, TInstant ts) {
309-
TMemoryInput in{data.data(), data.size()};
310-
TDecoderUnistat decoder(c, &in, metricNameLabel, ts);
311-
decoder.Decode();
321+
void DecodeUnistatToStream(
322+
TStringBuf data,
323+
IMetricConsumer* c,
324+
TStringBuf metricNameLabel,
325+
TStringBuf metricNamePrefix,
326+
TInstant ts)
327+
{
328+
TMemoryInput in{data.data(), data.size()};
329+
TDecoderUnistat decoder(c, &in, metricNameLabel, metricNamePrefix, ts);
330+
decoder.Decode();
312331
}
313332
}

‎library/cpp/monlib/encode/unistat/unistat_ut.cpp

+16
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,22 @@ Y_UNIT_TEST_SUITE(TUnistatDecoderTest) {
2323
UNIT_ASSERT_VALUES_EQUAL(label.GetName(), "metric_name_label");
2424
}
2525

26+
Y_UNIT_TEST(MetricNamePrefix) {
27+
constexpr auto input = TStringBuf(R"([["something_axxx", 42]])");
28+
29+
NProto::TMultiSamplesList samples;
30+
auto encoder = EncoderProtobuf(&samples);
31+
32+
DecodeUnistat(input, encoder.Get(), "metric_name_label", "prefix.");
33+
34+
UNIT_ASSERT_VALUES_EQUAL(samples.SamplesSize(), 1);
35+
auto sample = samples.GetSamples(0);
36+
37+
auto label = sample.GetLabels(0);
38+
UNIT_ASSERT_VALUES_EQUAL(label.GetName(), "metric_name_label");
39+
UNIT_ASSERT_VALUES_EQUAL(label.GetValue(), "prefix.something_axxx");
40+
}
41+
2642
Y_UNIT_TEST(ScalarMetric) {
2743
constexpr auto input = TStringBuf(R"([["something_axxx", 42]])");
2844

‎yql/essentials/core/arrow_kernels/registry/ut/ya.make

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ PEERDIR(
1414
yql/essentials/public/udf
1515
yql/essentials/public/udf/service/exception_policy
1616
yql/essentials/sql/pg_dummy
17-
yql/essentials/minikql/comp_nodes/llvm14
17+
yql/essentials/minikql/comp_nodes/llvm16
1818
yql/essentials/udfs/common/url_base
1919
yql/essentials/udfs/common/json2
2020
)

‎yql/essentials/core/extract_predicate/ut/ya.make

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ PEERDIR(
1717
yql/essentials/providers/common/provider
1818
yql/essentials/providers/result/provider
1919
yql/essentials/core/cbo/simple
20-
yql/essentials/minikql/comp_nodes/llvm14
21-
yql/essentials/minikql/invoke_builtins/llvm14
20+
yql/essentials/minikql/comp_nodes/llvm16
21+
yql/essentials/minikql/invoke_builtins/llvm16
2222
yql/essentials/sql/pg
2323
yql/essentials/parser/pg_wrapper
2424
)

‎yql/essentials/core/facade/yql_facade.cpp

+4-2
Original file line numberDiff line numberDiff line change
@@ -644,7 +644,7 @@ void UpdateSqlFlagsFromQContext(const TQContext& qContext, THashSet<TString>& fl
644644
}
645645

646646
void TProgram::HandleTranslationSettings(NSQLTranslation::TTranslationSettings& loadedSettings,
647-
const NSQLTranslation::TTranslationSettings*& currentSettings)
647+
NSQLTranslation::TTranslationSettings*& currentSettings)
648648
{
649649
if (QContext_.CanWrite()) {
650650
auto clusterMappingsNode = NYT::TNode::CreateMap();
@@ -719,13 +719,15 @@ bool TProgram::ParseSql(const NSQLTranslation::TTranslationSettings& settings)
719719
NYql::TWarningRules warningRules;
720720
auto sourceCode = SourceCode_;
721721
HandleSourceCode(sourceCode);
722-
const NSQLTranslation::TTranslationSettings* currentSettings = &settings;
722+
NSQLTranslation::TTranslationSettings outerSettings = settings;
723+
NSQLTranslation::TTranslationSettings* currentSettings = &outerSettings;
723724
NSQLTranslation::TTranslationSettings loadedSettings;
724725
loadedSettings.PgParser = settings.PgParser;
725726
if (QContext_) {
726727
HandleTranslationSettings(loadedSettings, currentSettings);
727728
}
728729

730+
currentSettings->EmitReadsForExists = true;
729731
return FillParseResult(SqlToYql(sourceCode, *currentSettings, &warningRules), &warningRules);
730732
}
731733

‎yql/essentials/core/facade/yql_facade.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -380,7 +380,7 @@ class TProgram: public TThrRefBase, private TNonCopyable
380380
std::optional<bool> CheckFallbackIssues(const TIssues& issues);
381381
void HandleSourceCode(TString& sourceCode);
382382
void HandleTranslationSettings(NSQLTranslation::TTranslationSettings& loadedSettings,
383-
const NSQLTranslation::TTranslationSettings*& currentSettings);
383+
NSQLTranslation::TTranslationSettings*& currentSettings);
384384

385385
const NKikimr::NMiniKQL::IFunctionRegistry* FunctionRegistry_;
386386
const TIntrusivePtr<IRandomProvider> RandomProvider_;

‎yql/essentials/core/peephole_opt/yql_opt_peephole_physical.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -6664,7 +6664,7 @@ TExprNode::TPtr OptimizeWideMaps(const TExprNode::TPtr& node, TExprContext& ctx)
66646664
.Add(1, DropUnusedArgs(node->Tail(), unused, ctx))
66656665
.Seal()
66666666
.Build();
6667-
} else if (input.IsCallable({"WideTakeBlocks", "WideSkipBlocks", "BlockExpandChunked"})) {
6667+
} else if (input.IsCallable({"WideTakeBlocks", "WideSkipBlocks"})) {
66686668
YQL_CLOG(DEBUG, CorePeepHole) << node->Content() << " over " << input.Content() << " with " << unused.size() << " unused fields.";
66696669
return ctx.Builder(node->Pos())
66706670
.Callable(node->Content())

‎yql/essentials/core/sql_types/match_recognize.h

-3
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,6 @@ enum class EOutputColumnSource {
3333
Other,
3434
};
3535

36-
constexpr size_t MaxPatternNesting = 20; //Limit recursion for patterns
37-
constexpr size_t MaxPermutedItems = 6;
38-
3936
//Mixin columns for calculating measures
4037
enum class EMeasureInputDataSpecialColumns {
4138
Classifier = 0,

0 commit comments

Comments
 (0)