aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrobot-piglet <robot-piglet@yandex-team.com>2024-11-04 17:38:43 +0300
committerrobot-piglet <robot-piglet@yandex-team.com>2024-11-04 17:48:23 +0300
commit277ba0ca11143f8dde61dbf1778360eea6222ca1 (patch)
treeda1912fd46ed8505c19be7df1a4b894a17244d9c
parent03a7163a5505d8197c05d3601b4fd4f654ed3ff0 (diff)
downloadydb-277ba0ca11143f8dde61dbf1778360eea6222ca1.tar.gz
Intermediate changes
commit_hash:930e763f0eed288461ef988c2ae9cc7d6cd6ab0c
-rw-r--r--contrib/libs/backtrace/.yandex_meta/override.nix6
-rw-r--r--contrib/libs/backtrace/README.md2
-rw-r--r--contrib/libs/backtrace/ya.make4
-rw-r--r--contrib/python/ruamel.yaml.clib/py3/.dist-info/METADATA69
-rw-r--r--contrib/python/ruamel.yaml.clib/py3/.yandex_meta/yamaker.yaml2
-rw-r--r--contrib/python/ruamel.yaml.clib/py3/LICENSE2
-rw-r--r--contrib/python/ruamel.yaml.clib/py3/README.md42
-rw-r--r--contrib/python/ruamel.yaml.clib/py3/README.rst26
-rw-r--r--contrib/python/ruamel.yaml.clib/py3/_ruamel_yaml.pxd23
-rw-r--r--contrib/python/ruamel.yaml.clib/py3/_ruamel_yaml.pyx10
-rw-r--r--contrib/python/ruamel.yaml.clib/py3/ya.make2
-rw-r--r--yt/yt/core/phoenix/unittests/phoenix_ut.cpp17
12 files changed, 126 insertions, 79 deletions
diff --git a/contrib/libs/backtrace/.yandex_meta/override.nix b/contrib/libs/backtrace/.yandex_meta/override.nix
index f37d2abc98..8d595da73a 100644
--- a/contrib/libs/backtrace/.yandex_meta/override.nix
+++ b/contrib/libs/backtrace/.yandex_meta/override.nix
@@ -1,11 +1,11 @@
pkgs: attrs: with pkgs; with attrs; rec {
- version = "2024-10-18";
+ version = "2024-10-20";
src = fetchFromGitHub {
owner = "ianlancetaylor";
repo = "libbacktrace";
- rev = "3d0be558448724ff2618b72249143aa774d594ad";
- hash = "sha256-4+ivxVvoPeEMOUagg0NolzlwHKEY2pKRXViLAAlkC+I=";
+ rev = "531aec7c52b66cd750a28a698f3c060f279b18b0";
+ hash = "sha256-TNo8x/aiwZFkJfzRe8Eq6cZwnzzUBGPJEnzVWHGnWC8=";
};
patches = [];
diff --git a/contrib/libs/backtrace/README.md b/contrib/libs/backtrace/README.md
index d1807842cc..1a7a045683 100644
--- a/contrib/libs/backtrace/README.md
+++ b/contrib/libs/backtrace/README.md
@@ -14,7 +14,7 @@ occurs or to gather detailed profiling information.
In general the functions provided by this library are async-signal-safe,
meaning that they may be safely called from a signal handler.
That said, on systems that use `dl_iterate_phdr`, such as GNU/Linux,
-gitthe first call to a libbacktrace function will call `dl_iterate_phdr`,
+the first call to a libbacktrace function will call `dl_iterate_phdr`,
which is not in general async-signal-safe. Therefore, programs
that call libbacktrace from a signal handler should ensure that they
make an initial call from outside of a signal handler.
diff --git a/contrib/libs/backtrace/ya.make b/contrib/libs/backtrace/ya.make
index a803bbcc4e..149b5cca76 100644
--- a/contrib/libs/backtrace/ya.make
+++ b/contrib/libs/backtrace/ya.make
@@ -6,9 +6,9 @@ LICENSE(BSD-3-Clause)
LICENSE_TEXTS(.yandex_meta/licenses.list.txt)
-VERSION(2024-10-18)
+VERSION(2024-10-20)
-ORIGINAL_SOURCE(https://github.com/ianlancetaylor/libbacktrace/archive/3d0be558448724ff2618b72249143aa774d594ad.tar.gz)
+ORIGINAL_SOURCE(https://github.com/ianlancetaylor/libbacktrace/archive/531aec7c52b66cd750a28a698f3c060f279b18b0.tar.gz)
ADDINCL(
contrib/libs/backtrace
diff --git a/contrib/python/ruamel.yaml.clib/py3/.dist-info/METADATA b/contrib/python/ruamel.yaml.clib/py3/.dist-info/METADATA
index 01aea7bcfa..601e9643f8 100644
--- a/contrib/python/ruamel.yaml.clib/py3/.dist-info/METADATA
+++ b/contrib/python/ruamel.yaml.clib/py3/.dist-info/METADATA
@@ -1,11 +1,13 @@
Metadata-Version: 2.1
Name: ruamel.yaml.clib
-Version: 0.2.8
+Version: 0.2.12
Summary: C version of reader, parser and emitter for ruamel.yaml derived from libyaml
-Home-page: https://sourceforge.net/p/ruamel-yaml-clib/code/ci/default/tree
Author: Anthon van der Neut
Author-email: a.van.der.neut@ruamel.eu
License: MIT
+Project-URL: Home, https://sourceforge.net/p/ruamel-yaml-clib/
+Project-URL: Source, https://sourceforge.net/p/ruamel-yaml-clib/code/ci/default/tree/
+Project-URL: Tracker, https://sourceforge.net/p/ruamel-yaml-clib/tickets/
Keywords: yaml 1.2 parser c-library config
Classifier: Development Status :: 4 - Beta
Classifier: Intended Audience :: Developers
@@ -14,39 +16,54 @@ Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python
Classifier: Programming Language :: Python :: 3.10
Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.6
-Classifier: Programming Language :: Python :: 3.7
-Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
Classifier: Programming Language :: Python :: 3.9
Classifier: Programming Language :: Python :: Implementation :: CPython
Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: >=3.6
-Description-Content-Type: text/x-rst
+Requires-Python: >=3.9
+Description-Content-Type: text/markdown; charset=UTF-8; variant=CommonMark
License-File: LICENSE
-ruamel.yaml.clib
-================
+# ruamel.yaml.clib
-``ruamel.yaml.clib`` is the C based reader/scanner and emitter for ruamel.yaml
+`ruamel.yaml.clib` is the C based reader/scanner and emitter for ruamel.yaml
-:version: 0.2.7
-:updated: 2022-10-19
-:documentation: http://yaml.readthedocs.io
-:repository: https://sourceforge.net/projects/ruamel-yaml-clib/
-:pypi: https://pypi.org/project/ruamel.yaml.clib/
+<table class="docutils">
+ <tr>
+ <td>version</td>
+ <td>0.2.12</td>
+ </tr>
+ <tr>
+ <td>updated</td>
+ <td>2024-10-20</td>
+ </tr>
+ <tr>
+ <td>documentation</td>
+ <td><https://yaml.dev/doc/ruamel.yaml.clib></td>
+ </tr>
+ <tr>
+ <td>repository</td>
+ <td><https://sourceforge.net/projects/ruamel-yaml-clib/></td>
+ </tr>
+ <tr>
+ <td>pypi</td>
+ <td><https://pypi.org/project/ruamel.yaml.clib/></td>
+ </tr>
+</table>
-This package was split of from ruamel.yaml, so that ruamel.yaml can be build as
-a universal wheel. Apart from the C code seldom changing, and taking a long
-time to compile for all platforms, this allows installation of the .so
-on Linux systems under /usr/lib64/pythonX.Y (without a .pth file or a ruamel
-directory) and the Python code for ruamel.yaml under /usr/lib/pythonX.Y.
+This package was split of from ruamel.yaml, so that ruamel.yaml can be
+build as a universal wheel. Apart from the C code seldom changing, and
+taking a long time to compile for all platforms, this allows
+installation of the .so on Linux systems under /usr/lib64/pythonX.Y
+(without a .pth file or a ruamel directory) and the Python code for
+ruamel.yaml under /usr/lib/pythonX.Y.
-.. image:: https://bestpractices.coreinfrastructure.org/projects/1128/badge
- :target: https://bestpractices.coreinfrastructure.org/projects/1128
+[![image](https://bestpractices.coreinfrastructure.org/projects/1128/badge)](https://bestpractices.coreinfrastructure.org/projects/1128)
+[![image](https://sourceforge.net/p/ruamel-yaml-clib/code/ci/default/tree/_doc/_static/license.svg?format=raw)](https://opensource.org/licenses/MIT)
+[![image](https://sourceforge.net/p/ruamel-yaml-clib/code/ci/default/tree/_doc/_static/pypi.svg?format=raw)](https://pypi.org/project/ruamel.yaml.clib/)
-.. image:: https://sourceforge.net/p/ruamel-yaml-clib/code/ci/default/tree/_doc/_static/license.svg?format=raw
- :target: https://opensource.org/licenses/MIT
-
-This release in loving memory of Johanna Clasina van der Neut-Bandel [1922-10-19 - 2015-11-21]
+This release in loving memory of Johanna Clasina van der Neut-Bandel
+\[1922-10-19 &ndash; 2015-11-21\]
diff --git a/contrib/python/ruamel.yaml.clib/py3/.yandex_meta/yamaker.yaml b/contrib/python/ruamel.yaml.clib/py3/.yandex_meta/yamaker.yaml
index 89d9149610..3ee341b2fb 100644
--- a/contrib/python/ruamel.yaml.clib/py3/.yandex_meta/yamaker.yaml
+++ b/contrib/python/ruamel.yaml.clib/py3/.yandex_meta/yamaker.yaml
@@ -2,5 +2,5 @@ requirements:
- contrib/libs/yaml
mark_as_cython_c:
- _ruamel_yaml.pyx
-keep:
+copy:
- _ruamel_yaml.*
diff --git a/contrib/python/ruamel.yaml.clib/py3/LICENSE b/contrib/python/ruamel.yaml.clib/py3/LICENSE
index 2383b7c6c4..d81f0ea737 100644
--- a/contrib/python/ruamel.yaml.clib/py3/LICENSE
+++ b/contrib/python/ruamel.yaml.clib/py3/LICENSE
@@ -1,6 +1,6 @@
The MIT License (MIT)
- Copyright (c) 2019-2023 Anthon van der Neut, Ruamel bvba
+ Copyright (c) 2019-2024 Anthon van der Neut, Ruamel bvba
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff --git a/contrib/python/ruamel.yaml.clib/py3/README.md b/contrib/python/ruamel.yaml.clib/py3/README.md
new file mode 100644
index 0000000000..bf93b22be9
--- /dev/null
+++ b/contrib/python/ruamel.yaml.clib/py3/README.md
@@ -0,0 +1,42 @@
+
+# ruamel.yaml.clib
+
+`ruamel.yaml.clib` is the C based reader/scanner and emitter for ruamel.yaml
+
+<table class="docutils">
+ <tr>
+ <td>version</td>
+ <td>0.2.12</td>
+ </tr>
+ <tr>
+ <td>updated</td>
+ <td>2024-10-20</td>
+ </tr>
+ <tr>
+ <td>documentation</td>
+ <td><https://yaml.dev/doc/ruamel.yaml.clib></td>
+ </tr>
+ <tr>
+ <td>repository</td>
+ <td><https://sourceforge.net/projects/ruamel-yaml-clib/></td>
+ </tr>
+ <tr>
+ <td>pypi</td>
+ <td><https://pypi.org/project/ruamel.yaml.clib/></td>
+ </tr>
+</table>
+
+
+This package was split of from ruamel.yaml, so that ruamel.yaml can be
+build as a universal wheel. Apart from the C code seldom changing, and
+taking a long time to compile for all platforms, this allows
+installation of the .so on Linux systems under /usr/lib64/pythonX.Y
+(without a .pth file or a ruamel directory) and the Python code for
+ruamel.yaml under /usr/lib/pythonX.Y.
+
+[![image](https://bestpractices.coreinfrastructure.org/projects/1128/badge)](https://bestpractices.coreinfrastructure.org/projects/1128)
+[![image](https://sourceforge.net/p/ruamel-yaml-clib/code/ci/default/tree/_doc/_static/license.svg?format=raw)](https://opensource.org/licenses/MIT)
+[![image](https://sourceforge.net/p/ruamel-yaml-clib/code/ci/default/tree/_doc/_static/pypi.svg?format=raw)](https://pypi.org/project/ruamel.yaml.clib/)
+
+This release in loving memory of Johanna Clasina van der Neut-Bandel
+\[1922-10-19 &ndash; 2015-11-21\]
diff --git a/contrib/python/ruamel.yaml.clib/py3/README.rst b/contrib/python/ruamel.yaml.clib/py3/README.rst
deleted file mode 100644
index 0e83f9e423..0000000000
--- a/contrib/python/ruamel.yaml.clib/py3/README.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-
-ruamel.yaml.clib
-================
-
-``ruamel.yaml.clib`` is the C based reader/scanner and emitter for ruamel.yaml
-
-:version: 0.2.7
-:updated: 2022-10-19
-:documentation: http://yaml.readthedocs.io
-:repository: https://sourceforge.net/projects/ruamel-yaml-clib/
-:pypi: https://pypi.org/project/ruamel.yaml.clib/
-
-This package was split of from ruamel.yaml, so that ruamel.yaml can be build as
-a universal wheel. Apart from the C code seldom changing, and taking a long
-time to compile for all platforms, this allows installation of the .so
-on Linux systems under /usr/lib64/pythonX.Y (without a .pth file or a ruamel
-directory) and the Python code for ruamel.yaml under /usr/lib/pythonX.Y.
-
-
-.. image:: https://bestpractices.coreinfrastructure.org/projects/1128/badge
- :target: https://bestpractices.coreinfrastructure.org/projects/1128
-
-.. image:: https://sourceforge.net/p/ruamel-yaml-clib/code/ci/default/tree/_doc/_static/license.svg?format=raw
- :target: https://opensource.org/licenses/MIT
-
-This release in loving memory of Johanna Clasina van der Neut-Bandel [1922-10-19 - 2015-11-21]
diff --git a/contrib/python/ruamel.yaml.clib/py3/_ruamel_yaml.pxd b/contrib/python/ruamel.yaml.clib/py3/_ruamel_yaml.pxd
index d8dc3c6bda..346a487f38 100644
--- a/contrib/python/ruamel.yaml.clib/py3/_ruamel_yaml.pxd
+++ b/contrib/python/ruamel.yaml.clib/py3/_ruamel_yaml.pxd
@@ -1,16 +1,17 @@
+# cython: language_level=3
cdef extern from "_ruamel_yaml.h":
- void malloc(int l)
- void memcpy(char *d, char *s, int l)
- int strlen(char *s)
+ void malloc(size_t l)
+ void memcpy(void *d, const void *s, size_t l)
+ int strlen(const char *s)
int PyString_CheckExact(object o)
int PyUnicode_CheckExact(object o)
char *PyString_AS_STRING(object o)
- int PyString_GET_SIZE(object o)
- object PyString_FromStringAndSize(char *v, int l)
- object PyUnicode_FromString(char *u)
- object PyUnicode_DecodeUTF8(char *u, int s, char *e)
+ Py_ssize_t PyString_GET_SIZE(object o)
+ object PyString_FromStringAndSize(char *v, Py_ssize_t l)
+ object PyUnicode_FromString(const char *u)
+ object PyUnicode_DecodeUTF8(const char *u, int s, const char *e)
object PyUnicode_AsUTF8String(object o)
int PY_MAJOR_VERSION
@@ -85,11 +86,11 @@ cdef extern from "_ruamel_yaml.h":
YAML_MAPPING_START_EVENT
YAML_MAPPING_END_EVENT
- ctypedef int yaml_read_handler_t(void *data, char *buffer,
- int size, int *size_read) except 0
+ ctypedef int yaml_read_handler_t(void *data, unsigned char *buffer,
+ size_t size, size_t *size_read) except 0
- ctypedef int yaml_write_handler_t(void *data, char *buffer,
- int size) except 0
+ ctypedef int yaml_write_handler_t(void *data, unsigned char *buffer,
+ size_t size) except 0
ctypedef struct yaml_mark_t:
int index
diff --git a/contrib/python/ruamel.yaml.clib/py3/_ruamel_yaml.pyx b/contrib/python/ruamel.yaml.clib/py3/_ruamel_yaml.pyx
index 4fd50e207b..d1ff538e74 100644
--- a/contrib/python/ruamel.yaml.clib/py3/_ruamel_yaml.pyx
+++ b/contrib/python/ruamel.yaml.clib/py3/_ruamel_yaml.pyx
@@ -1,4 +1,4 @@
-
+# cython: language_level=3
def get_version_string():
cdef char *value
@@ -904,7 +904,7 @@ cdef class CParser:
raise error
return 1
-cdef int input_handler(void *data, char *buffer, int size, int *read) except 0:
+cdef int input_handler(void *data, unsigned char *buffer, size_t size, size_t *read) except 0:
cdef CParser parser
parser = <CParser>data
if parser.stream_cache is None:
@@ -1514,13 +1514,13 @@ cdef class CEmitter:
self.ascend_resolver()
return 1
-cdef int output_handler(void *data, char *buffer, int size) except 0:
+cdef int output_handler(void *data, unsigned char *buffer, size_t size) except 0:
cdef CEmitter emitter
emitter = <CEmitter>data
if emitter.dump_unicode == 0:
- value = PyString_FromStringAndSize(buffer, size)
+ value = PyString_FromStringAndSize(<char *>buffer, size)
else:
- value = PyUnicode_DecodeUTF8(buffer, size, 'strict')
+ value = PyUnicode_DecodeUTF8(<char *>buffer, size, 'strict')
emitter.stream.write(value)
return 1
diff --git a/contrib/python/ruamel.yaml.clib/py3/ya.make b/contrib/python/ruamel.yaml.clib/py3/ya.make
index 1c874c3925..34faa3db8e 100644
--- a/contrib/python/ruamel.yaml.clib/py3/ya.make
+++ b/contrib/python/ruamel.yaml.clib/py3/ya.make
@@ -2,7 +2,7 @@
PY3_LIBRARY()
-VERSION(0.2.8)
+VERSION(0.2.12)
LICENSE(MIT)
diff --git a/yt/yt/core/phoenix/unittests/phoenix_ut.cpp b/yt/yt/core/phoenix/unittests/phoenix_ut.cpp
index cbb700c36f..a4297105ab 100644
--- a/yt/yt/core/phoenix/unittests/phoenix_ut.cpp
+++ b/yt/yt/core/phoenix/unittests/phoenix_ut.cpp
@@ -25,11 +25,11 @@ using NYT::Load;
////////////////////////////////////////////////////////////////////////////////
template <class T>
-TString Serialize(const T& value)
+TString Serialize(const T& value, int version = 0)
{
TString buffer;
TStringOutput output(buffer);
- TSaveContext context(&output);
+ TSaveContext context(&output, version);
Save(context, value);
context.Finish();
return buffer;
@@ -319,6 +319,7 @@ struct S
int A;
int B;
int C;
+ int D = 0;
bool operator==(const S&) const = default;
@@ -339,6 +340,11 @@ void S::RegisterMetadata(auto&& registrar)
.WhenMissing([] (TThis* this_, auto& /*context*/) {
this_->C = 777;
})();
+ PHOENIX_REGISTER_FIELD(4, D)
+ .SinceVersion(250)
+ .WhenMissing([] (TThis* this_, auto& /*context*/) {
+ this_->D = 888;
+ })();
}
PHOENIX_DEFINE_TYPE(S);
@@ -425,13 +431,20 @@ TEST(TPhoenixTest, InVersion5)
s1.A = 123;
s1.B = 0;
s1.C = 777;
+ s1.D = 42;
auto buffer = MakeBuffer([] (auto& context) {
Save<int>(context, 123);
+ Save<int>(context, 42);
});
+ auto buffer3 = Serialize(s1, 300);
+ EXPECT_EQ(buffer, buffer3);
auto s2 = Deserialize<S>(buffer, /*version*/ 300);
EXPECT_EQ(s1, s2);
+
+ auto s3 = Deserialize<S>(buffer3, /*version*/ 300);
+ EXPECT_EQ(s1, s3);
}
////////////////////////////////////////////////////////////////////////////////