Skip to content

Commit 708cc79

Browse files
alexv-smirnovalexv-smirnov
committed
Merge pull request #15750 from ydb-platform/merge-libs-250314-1301
2 parents e837989 + c867d91 commit 708cc79

File tree

6 files changed

+80
-14
lines changed

6 files changed

+80
-14
lines changed

‎build/conf/python.conf

+11-1
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,27 @@ PYTHON_TYPE_FOR_CYTHON=PY2
66

77

88
CYTHON_EMBEDED_FILES=\
9+
contrib/tools/cython/Cython/Utility/arrayarray.h \
10+
contrib/tools/cython/Cython/Utility/AsyncGen.c \
911
contrib/tools/cython/Cython/Utility/Buffer.c \
1012
contrib/tools/cython/Cython/Utility/Builtins.c \
11-
contrib/tools/cython/Cython/Utility/CMath.c \
1213
contrib/tools/cython/Cython/Utility/Capsule.c \
14+
contrib/tools/cython/Cython/Utility/CConvert.pyx \
15+
contrib/tools/cython/Cython/Utility/CMath.c \
16+
contrib/tools/cython/Cython/Utility/CommonStructures.c \
1317
contrib/tools/cython/Cython/Utility/CommonTypes.c \
1418
contrib/tools/cython/Cython/Utility/Complex.c \
1519
contrib/tools/cython/Cython/Utility/Coroutine.c \
20+
contrib/tools/cython/Cython/Utility/CpdefEnums.pyx \
21+
contrib/tools/cython/Cython/Utility/CppConvert.pyx \
22+
contrib/tools/cython/Cython/Utility/CppSupport.cpp \
1623
contrib/tools/cython/Cython/Utility/CythonFunction.c \
1724
contrib/tools/cython/Cython/Utility/Embed.c \
1825
contrib/tools/cython/Cython/Utility/Exceptions.c \
1926
contrib/tools/cython/Cython/Utility/ExtensionTypes.c \
2027
contrib/tools/cython/Cython/Utility/FunctionArguments.c \
2128
contrib/tools/cython/Cython/Utility/ImportExport.c \
29+
contrib/tools/cython/Cython/Utility/MemoryView.pyx \
2230
contrib/tools/cython/Cython/Utility/MemoryView_C.c \
2331
contrib/tools/cython/Cython/Utility/ModuleSetupCode.c \
2432
contrib/tools/cython/Cython/Utility/ObjectHandling.c \
@@ -27,6 +35,8 @@ contrib/tools/cython/Cython/Utility/Overflow.c \
2735
contrib/tools/cython/Cython/Utility/Printing.c \
2836
contrib/tools/cython/Cython/Utility/Profile.c \
2937
contrib/tools/cython/Cython/Utility/StringTools.c \
38+
contrib/tools/cython/Cython/Utility/TestCythonScope.pyx \
39+
contrib/tools/cython/Cython/Utility/TestCyUtilityLoader.pyx \
3040
contrib/tools/cython/Cython/Utility/TestUtilityLoader.c \
3141
contrib/tools/cython/Cython/Utility/TypeConversion.c
3242

‎build/export_generators/gradle/generator.toml

+2-1
Original file line numberDiff line numberDiff line change
@@ -95,5 +95,6 @@ test=[
9595
"/ut",
9696
"/src/test",
9797
"/src/test/java",
98-
"/src/test-integration"
98+
"/src/test-integration",
99+
"/src/test-multicell"
99100
]

‎contrib/libs/openssl/crypto/cryptlib.c

+1
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,7 @@ static variant_char *ossl_strchr(const variant_char *str, char srch)
9494
# define OPENSSL_CPUID_SETUP
9595
typedef uint64_t IA32CAP;
9696

97+
__attribute__((no_sanitize("memory", "address")))
9798
void OPENSSL_cpuid_setup(void)
9899
{
99100
static int trigger = 0;

‎ydb/ci/rightlib.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
422642b601155a296cb0a69eb9b1f7ba146ffa49
1+
519ccaf38bd51dae8ff28d3d25cc8399798f00b4

‎yql/essentials/udfs/common/datetime2/datetime_udf.cpp

+63-9
Original file line numberDiff line numberDiff line change
@@ -396,7 +396,13 @@ struct TGetTimeComponent {
396396
}
397397

398398
if (!userType) {
399-
builder.SetError("User type is missing");
399+
// XXX: Function became polymorphic when overload for
400+
// wide resources was implemented. Hence, to make it
401+
// backward compatible with previous versions, the
402+
// absence of the userType is considered as using the
403+
// old version (i.e. without type awareness) that
404+
// provides implementation only for narrow dates.
405+
BuildSignature<TFieldStorage, TMResourceName, Accessor>(builder, typesOnly);
400406
return true;
401407
}
402408

@@ -1314,7 +1320,13 @@ class TGetDateComponent: public ::NYql::NUdf::TBoxedValue {
13141320
}
13151321

13161322
if (!userType) {
1317-
builder.SetError("User type is missing");
1323+
// XXX: Function became polymorphic when overload for
1324+
// wide resources was implemented. Hence, to make it
1325+
// backward compatible with previous versions, the
1326+
// absence of the userType is considered as using the
1327+
// old version (i.e. without type awareness) that
1328+
// provides implementation only for narrow dates.
1329+
BuildSignature<TResultType, TMResourceName, Accessor>(builder, typesOnly);
13181330
return true;
13191331
}
13201332

@@ -1417,7 +1429,13 @@ class TGetDateComponentName: public ::NYql::NUdf::TBoxedValue {
14171429
}
14181430

14191431
if (!userType) {
1420-
builder.SetError("User type is missing");
1432+
// XXX: Function became polymorphic when overload for
1433+
// wide resources was implemented. Hence, to make it
1434+
// backward compatible with previous versions, the
1435+
// absence of the userType is considered as using the
1436+
// old version (i.e. without type awareness) that
1437+
// provides implementation only for narrow dates.
1438+
BuildSignature<TMResourceName, Accessor>(builder, typesOnly);
14211439
return true;
14221440
}
14231441

@@ -1637,7 +1655,13 @@ TUnboxedValue GetTimezoneName(const IValueBuilder* valueBuilder, const TUnboxedV
16371655
}
16381656

16391657
if (!userType) {
1640-
builder.SetError("User type is missing");
1658+
// XXX: Function became polymorphic when overload for
1659+
// wide resources was implemented. Hence, to make it
1660+
// backward compatible with previous versions, the
1661+
// absence of the userType is considered as using the
1662+
// old version (i.e. without type awareness) that
1663+
// provides implementation only for narrow dates.
1664+
BuildSignature<TMResourceName>(builder, typesOnly);
16411665
return true;
16421666
}
16431667

@@ -1869,7 +1893,13 @@ class TToConverter : public TBoxedValue {
18691893
}
18701894

18711895
if (!userType) {
1872-
builder.SetError("User type is missing");
1896+
// XXX: Function became polymorphic when overload for
1897+
// wide resources was implemented. Hence, to make it
1898+
// backward compatible with previous versions, the
1899+
// absence of the userType is considered as using the
1900+
// old version (i.e. without type awareness) that
1901+
// provides implementation only for narrow dates.
1902+
BuildSignature<TInterval, TResult>(builder, typesOnly);
18731903
return true;
18741904
}
18751905

@@ -1987,7 +2017,13 @@ class TBoundaryOf: public ::NYql::NUdf::TBoxedValue {
19872017
}
19882018

19892019
if (!userType) {
1990-
builder.SetError("User type is missing");
2020+
// XXX: Function became polymorphic when overload for
2021+
// wide resources was implemented. Hence, to make it
2022+
// backward compatible with previous versions, the
2023+
// absence of the userType is considered as using the
2024+
// old version (i.e. without type awareness) that
2025+
// provides implementation only for narrow dates.
2026+
BuildSignature<TMResourceName, Boundary>(builder, typesOnly);
19912027
return true;
19922028
}
19932029

@@ -2309,7 +2345,13 @@ class TBoundaryOfInterval: public ::NYql::NUdf::TBoxedValue {
23092345
}
23102346

23112347
if (!userType) {
2312-
builder.SetError("User type is missing");
2348+
// XXX: Function became polymorphic when overload for
2349+
// wide resources was implemented. Hence, to make it
2350+
// backward compatible with previous versions, the
2351+
// absence of the userType is considered as using the
2352+
// old version (i.e. without type awareness) that
2353+
// provides implementation only for narrow dates.
2354+
BuildSignature<TMResourceName, Boundary>(builder, typesOnly);
23132355
return true;
23142356
}
23152357

@@ -2425,7 +2467,13 @@ class TTimeOfDay: public ::NYql::NUdf::TBoxedValue {
24252467
}
24262468

24272469
if (!userType) {
2428-
builder.SetError("User type is missing");
2470+
// XXX: Function became polymorphic when overload for
2471+
// wide resources was implemented. Hence, to make it
2472+
// backward compatible with previous versions, the
2473+
// absence of the userType is considered as using the
2474+
// old version (i.e. without type awareness) that
2475+
// provides implementation only for narrow dates.
2476+
BuildSignature<TMResourceName>(builder, typesOnly);
24292477
return true;
24302478
}
24312479

@@ -2546,7 +2594,13 @@ class TShift : public TBoxedValue {
25462594
}
25472595

25482596
if (!userType) {
2549-
builder.SetError("User type is missing");
2597+
// XXX: Function became polymorphic when overload for
2598+
// wide resources was implemented. Hence, to make it
2599+
// backward compatible with previous versions, the
2600+
// absence of the userType is considered as using the
2601+
// old version (i.e. without type awareness) that
2602+
// provides implementation only for narrow dates.
2603+
BuildSignature<TMResourceName, Shifter>(builder, typesOnly);
25502604
return true;
25512605
}
25522606

‎yt/yt/client/api/distributed_table_session.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@ TFuture<void> PingDistributedWriteSession(
128128
auto concreteSession = ConvertTo<TDistributedWriteSession>(TYsonStringBuf(session.Underlying()->Payload()));
129129

130130
// NB(arkady-e1ppa): AutoAbort = false by default.
131-
auto mainTx = client->AttachTransaction(concreteSession.MainTransactionId);
131+
auto mainTransaction = client->AttachTransaction(concreteSession.MainTransactionId);
132132

133-
return mainTx->Ping();
133+
return mainTransaction->Ping();
134134
}
135135

136136
////////////////////////////////////////////////////////////////////////////////

0 commit comments

Comments
 (0)