aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexSm <alex@ydb.tech>2024-03-07 12:46:25 +0100
committerGitHub <noreply@github.com>2024-03-07 12:46:25 +0100
commit2abba456f87f6bea8fe2fe4beb30d1d85892f95b (patch)
tree65540437c8dd4238d61d3b43fad0ab77354302e0
parentac1bb12c809320006babe97794e1ea44f4561f81 (diff)
parent03186979959ff003a87d3e09bc351acd65e856c5 (diff)
downloadydb-2abba456f87f6bea8fe2fe4beb30d1d85892f95b.tar.gz
Merge pull request #2528 from alexv-smirnov/mergelibs18
Library import 19
-rw-r--r--build/platform/yfm/ya.make8
-rwxr-xr-xbuild/ymake_conf.py73
-rw-r--r--contrib/libs/c-ares/src/lib/ares_config-android.h12
-rw-r--r--contrib/libs/c-ares/src/lib/ares_config-linux.h293
-rw-r--r--contrib/libs/c-ares/src/lib/ares_config-osx.h43
-rw-r--r--contrib/libs/c-ares/ya.make1
-rw-r--r--yt/python/yt/yson/__init__.py4
-rw-r--r--yt/yt/RpcProxyProtocolVersion.txt2
-rw-r--r--yt/yt/client/queue_client/common.cpp1
-rw-r--r--yt/yt/client/queue_client/common.h1
-rw-r--r--yt/yt/core/misc/hr_timer.cpp95
-rw-r--r--yt/yt/core/misc/hr_timer.h53
-rw-r--r--yt/yt/core/ya.make1
13 files changed, 220 insertions, 367 deletions
diff --git a/build/platform/yfm/ya.make b/build/platform/yfm/ya.make
index 09c7877b6a1..d9fba49d4c7 100644
--- a/build/platform/yfm/ya.make
+++ b/build/platform/yfm/ya.make
@@ -6,10 +6,10 @@ ENDIF()
DECLARE_EXTERNAL_HOST_RESOURCES_BUNDLE(
YFM_TOOL
- sbr:5896074622 FOR DARWIN-ARM64
- sbr:5896074622 FOR DARWIN
- sbr:5896068554 FOR LINUX
- sbr:5896080661 FOR WIN32
+ sbr:5944977120 FOR DARWIN-ARM64
+ sbr:5944977120 FOR DARWIN
+ sbr:5944970894 FOR LINUX
+ sbr:5944984013 FOR WIN32
)
END()
diff --git a/build/ymake_conf.py b/build/ymake_conf.py
index 0a2d86a4168..0613a78e79b 100755
--- a/build/ymake_conf.py
+++ b/build/ymake_conf.py
@@ -21,6 +21,32 @@ import six
logger = logging.getLogger(__name__ if __name__ != '__main__' else 'ymake_conf.py')
+class WindowsVersion(object):
+ """
+ Predefined values for _WIN32_WINNT macro.
+ This macro specifies minimal Windows version required by the binary being build.
+
+ A complete list of the values supported by the Windows SDK can be found at
+ https://docs.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt
+ """
+ Windows07 = '0x0601'
+ Windows08 = '0x0602'
+ Windows10 = '0x0A00'
+
+
+# This is default Android API level unless `-DANDROID_API` is specified in cmdline
+# Android api level can be resolved to Android version using
+# https://android.googlesource.com/platform/bionic/+/master/docs/status.md
+ANDROID_API_DEFAULT = 21
+
+# This is default Linux SDK unless `-DOS_SDK` is specified in cmdline
+LINUX_SDK_DEFAULT = "ubuntu-14"
+
+MACOS_VERSION_MIN = "11.0"
+IOS_VERSION_MIN = "13.0"
+WINDOWS_VERSION_MIN = WindowsVersion.Windows07
+
+
def init_logger(verbose):
logging.basicConfig(level=logging.DEBUG if verbose else logging.INFO)
@@ -129,9 +155,7 @@ class Platform(object):
self.is_android = self.os == 'android'
if self.is_android:
- # This is default Android API level unless `-DANDROID_API` is specified in cmdline
- default_android_api = 21
- self.android_api = int(preset('ANDROID_API', default_android_api))
+ self.android_api = int(preset('ANDROID_API', ANDROID_API_DEFAULT))
self.is_cygwin = self.os == 'cygwin'
self.is_yocto = self.os == 'yocto'
@@ -1073,7 +1097,7 @@ class GnuToolchainOptions(ToolchainOptions):
return 'ubuntu-18'
# Default OS SDK for Linux builds
- return 'ubuntu-14'
+ return LINUX_SDK_DEFAULT
class Toolchain(object):
@@ -1155,13 +1179,10 @@ class GnuToolchain(Toolchain):
for lib_path in build.host.library_path_variables:
self.env.setdefault(lib_path, []).append('{}/lib'.format(self.tc.name_marker))
- macos_version_min = '11.0'
- ios_version_min = '13.0'
-
swift_target = select(default=None, selectors=[
- (target.is_iossim and target.is_x86_64, 'x86_64-apple-ios{}-simulator'.format(ios_version_min)),
- (target.is_iossim and target.is_x86, 'i386-apple-ios{}-simulator'.format(ios_version_min)),
- (target.is_iossim and target.is_armv8, 'arm64-apple-ios{}-simulator'.format(ios_version_min)),
+ (target.is_iossim and target.is_x86_64, 'x86_64-apple-ios{}-simulator'.format(IOS_VERSION_MIN)),
+ (target.is_iossim and target.is_x86, 'i386-apple-ios{}-simulator'.format(IOS_VERSION_MIN)),
+ (target.is_iossim and target.is_armv8, 'arm64-apple-ios{}-simulator'.format(IOS_VERSION_MIN)),
(not target.is_iossim and target.is_ios and target.is_armv8, 'arm64-apple-ios9'),
(not target.is_iossim and target.is_ios and target.is_armv7, 'armv7-apple-ios9'),
])
@@ -1184,11 +1205,11 @@ class GnuToolchain(Toolchain):
(target.is_linux and target.is_armv7 and target.armv7_float_abi == 'softfp', 'armv7-linux-gnueabi'),
(target.is_linux and target.is_powerpc, 'powerpc64le-linux-gnu'),
- (target.is_iossim and target.is_x86_64, 'x86_64-apple-ios{}-simulator'.format(ios_version_min)),
- (target.is_iossim and target.is_x86, 'i386-apple-ios{}-simulator'.format(ios_version_min)),
- (target.is_iossim and target.is_armv8, 'arm64-apple-ios{}-simulator'.format(ios_version_min)),
- (not target.is_iossim and target.is_ios and target.is_armv8, 'arm64-apple-ios{}'.format(ios_version_min)),
- (not target.is_iossim and target.is_ios and target.is_armv7, 'armv7-apple-ios{}'.format(ios_version_min)),
+ (target.is_iossim and target.is_x86_64, 'x86_64-apple-ios{}-simulator'.format(IOS_VERSION_MIN)),
+ (target.is_iossim and target.is_x86, 'i386-apple-ios{}-simulator'.format(IOS_VERSION_MIN)),
+ (target.is_iossim and target.is_armv8, 'arm64-apple-ios{}-simulator'.format(IOS_VERSION_MIN)),
+ (not target.is_iossim and target.is_ios and target.is_armv8, 'arm64-apple-ios{}'.format(IOS_VERSION_MIN)),
+ (not target.is_iossim and target.is_ios and target.is_armv7, 'armv7-apple-ios{}'.format(IOS_VERSION_MIN)),
(target.is_apple and target.is_x86, 'i386-apple-darwin14'),
(target.is_apple and target.is_x86_64, 'x86_64-apple-darwin14'),
@@ -1266,9 +1287,9 @@ class GnuToolchain(Toolchain):
(target.is_linux and target.is_power8le, ['-mcpu=power8', '-mtune=power8', '-maltivec']),
(target.is_linux and target.is_power9le, ['-mcpu=power9', '-mtune=power9', '-maltivec']),
(target.is_linux and target.is_armv8, ['-march=armv8a']),
- (target.is_macos, ['-mmacosx-version-min={}'.format(macos_version_min)]),
- (target.is_ios and not target.is_iossim, ['-mios-version-min={}'.format(ios_version_min)]),
- (target.is_iossim, ['-mios-simulator-version-min={}'.format(ios_version_min)]),
+ (target.is_macos, ['-mmacosx-version-min={}'.format(MACOS_VERSION_MIN)]),
+ (target.is_ios and not target.is_iossim, ['-mios-version-min={}'.format(IOS_VERSION_MIN)]),
+ (target.is_iossim, ['-mios-simulator-version-min={}'.format(IOS_VERSION_MIN)]),
(target.is_android and target.is_armv7, ['-march=armv7-a', '-mfloat-abi=softfp']),
(target.is_android and target.is_armv8, ['-march=armv8-a']),
(target.is_yocto and target.is_armv7, ['-march=armv7-a', '-mfpu=neon', '-mfloat-abi=hard', '-mcpu=cortex-a9', '-O1'])
@@ -1847,19 +1868,6 @@ class MSVCToolchainOptions(ToolchainOptions):
class MSVC(object):
- # noinspection PyPep8Naming
- class WindowsVersion(object):
- """
- Predefined values for _WIN32_WINNT macro.
- This macro specifies minimal Windows version required by the binary being build.
-
- A complete list of the values supported by the Windows SDK can be found at
- https://docs.microsoft.com/en-us/cpp/porting/modifying-winver-and-win32-winnt
- """
- Windows07 = '0x0601'
- Windows08 = '0x0602'
- Windows10 = '0x0A00'
-
def __init__(self, tc, build):
"""
:type tc: MSVCToolchainOptions
@@ -2062,8 +2070,7 @@ class MSVCCompiler(MSVC, Compiler):
'-Wno-unused-command-line-argument',
]
- win_version_min = self.WindowsVersion.Windows07
- defines.append('/D_WIN32_WINNT={0}'.format(win_version_min))
+ defines.append('/D_WIN32_WINNT={0}'.format(WINDOWS_VERSION_MIN))
if winapi_unicode:
defines += ['/DUNICODE', '/D_UNICODE']
diff --git a/contrib/libs/c-ares/src/lib/ares_config-android.h b/contrib/libs/c-ares/src/lib/ares_config-android.h
index 4d0d3640d20..2a2200ee6da 100644
--- a/contrib/libs/c-ares/src/lib/ares_config-android.h
+++ b/contrib/libs/c-ares/src/lib/ares_config-android.h
@@ -1,6 +1,16 @@
+/* Copyright (C) The c-ares project and its contributors
+ * SPDX-License-Identifier: MIT
+ */
+
#pragma once
#include "ares_config-linux.h"
-#undef HAVE_ARPA_NAMESER_COMPAT_H
+/* Define to 1 if you have the getservbyport_r function. */
#undef HAVE_GETSERVBYPORT_R
+
+/* Define to 1 if you have the getservbyname_r function. */
+#undef HAVE_GETSERVBYNAME_R
+
+/* Define to 1 if you have the __system_property_get function */
+#define HAVE___SYSTEM_PROPERTY_GET
diff --git a/contrib/libs/c-ares/src/lib/ares_config-linux.h b/contrib/libs/c-ares/src/lib/ares_config-linux.h
index ec7fa113344..fb69cd17c38 100644
--- a/contrib/libs/c-ares/src/lib/ares_config-linux.h
+++ b/contrib/libs/c-ares/src/lib/ares_config-linux.h
@@ -1,38 +1,38 @@
-/* src/lib/ares_config.h. Generated from ares_config.h.in by configure. */
-/* src/lib/ares_config.h.in. Generated from configure.ac by autoheader. */
+/* Copyright (C) The c-ares project and its contributors
+ * SPDX-License-Identifier: MIT
+ */
+
+/* Generated from ares_config.h.cmake */
/* Define if building universal (internal helper macro) */
-/* #undef AC_APPLE_UNIVERSAL_BUILD */
+#undef AC_APPLE_UNIVERSAL_BUILD
/* define this if ares is built for a big endian system */
-/* #undef ARES_BIG_ENDIAN */
+#undef ARES_BIG_ENDIAN
-/* Defined for build that exposes internal static functions for testing. */
-/* #undef CARES_EXPOSE_STATICS */
+/* when building as static part of libcurl */
+#undef BUILDING_LIBCURL
-/* a suitable file/device to read random data from */
-#define CARES_RANDOM_FILE "/dev/urandom"
+/* Defined for build that exposes internal static functions for testing. */
+#undef CARES_EXPOSE_STATICS
/* Defined for build with symbol hiding. */
-#define CARES_SYMBOL_HIDING 1
+#undef CARES_SYMBOL_HIDING
/* Definition to make a library symbol externally visible. */
-#define CARES_SYMBOL_SCOPE_EXTERN __attribute__ ((__visibility__ ("default")))
-
-/* the signed version of size_t */
-#define CARES_TYPEOF_ARES_SSIZE_T ssize_t
+#undef CARES_SYMBOL_SCOPE_EXTERN
/* Use resolver library to configure cares */
/* #undef CARES_USE_LIBRESOLV */
/* if a /etc/inet dir is being used */
-/* #undef ETC_INET */
+#undef ETC_INET
/* Define to the type of arg 2 for gethostname. */
#define GETHOSTNAME_TYPE_ARG2 size_t
/* Define to the type qualifier of arg 1 for getnameinfo. */
-#define GETNAMEINFO_QUAL_ARG1 const
+#define GETNAMEINFO_QUAL_ARG1
/* Define to the type of arg 1 for getnameinfo. */
#define GETNAMEINFO_TYPE_ARG1 struct sockaddr *
@@ -49,32 +49,32 @@
/* Specifies the number of arguments to getservbyport_r */
#define GETSERVBYPORT_R_ARGS 6
-/* Specifies the size of the buffer to pass to getservbyport_r */
-#define GETSERVBYPORT_R_BUFSIZE 4096
+/* Specifies the number of arguments to getservbyname_r */
+#define GETSERVBYNAME_R_ARGS 6
/* Define to 1 if you have AF_INET6. */
-#define HAVE_AF_INET6 1
+#define HAVE_AF_INET6
/* Define to 1 if you have the <arpa/inet.h> header file. */
-#define HAVE_ARPA_INET_H 1
+#define HAVE_ARPA_INET_H
/* Define to 1 if you have the <arpa/nameser_compat.h> header file. */
-#define HAVE_ARPA_NAMESER_COMPAT_H 1
+#define HAVE_ARPA_NAMESER_COMPAT_H
/* Define to 1 if you have the <arpa/nameser.h> header file. */
-#define HAVE_ARPA_NAMESER_H 1
+#define HAVE_ARPA_NAMESER_H
/* Define to 1 if you have the <assert.h> header file. */
-#define HAVE_ASSERT_H 1
+#define HAVE_ASSERT_H
/* Define to 1 if you have the `bitncmp' function. */
/* #undef HAVE_BITNCMP */
/* Define to 1 if bool is an available type. */
-#define HAVE_BOOL_T 1
+#define HAVE_BOOL_T
/* Define to 1 if you have the clock_gettime function and monotonic timer. */
-#define HAVE_CLOCK_GETTIME_MONOTONIC 1
+#define HAVE_CLOCK_GETTIME_MONOTONIC
/* Define to 1 if you have the closesocket function. */
/* #undef HAVE_CLOSESOCKET */
@@ -83,73 +83,79 @@
/* #undef HAVE_CLOSESOCKET_CAMEL */
/* Define to 1 if you have the connect function. */
-#define HAVE_CONNECT 1
+#define HAVE_CONNECT
/* define if the compiler supports basic C++11 syntax */
-#define HAVE_CXX11 1
+/* #undef HAVE_CXX11 */
/* Define to 1 if you have the <dlfcn.h> header file. */
-#define HAVE_DLFCN_H 1
+#define HAVE_DLFCN_H
/* Define to 1 if you have the <errno.h> header file. */
-#define HAVE_ERRNO_H 1
+#define HAVE_ERRNO_H
/* Define to 1 if you have the fcntl function. */
-#define HAVE_FCNTL 1
+#define HAVE_FCNTL
/* Define to 1 if you have the <fcntl.h> header file. */
-#define HAVE_FCNTL_H 1
+#define HAVE_FCNTL_H
/* Define to 1 if you have a working fcntl O_NONBLOCK function. */
-#define HAVE_FCNTL_O_NONBLOCK 1
+#define HAVE_FCNTL_O_NONBLOCK
/* Define to 1 if you have the freeaddrinfo function. */
-#define HAVE_FREEADDRINFO 1
+#define HAVE_FREEADDRINFO
/* Define to 1 if you have a working getaddrinfo function. */
-#define HAVE_GETADDRINFO 1
+#define HAVE_GETADDRINFO
/* Define to 1 if the getaddrinfo function is threadsafe. */
-#define HAVE_GETADDRINFO_THREADSAFE 1
+/* #undef HAVE_GETADDRINFO_THREADSAFE */
/* Define to 1 if you have the getenv function. */
-#define HAVE_GETENV 1
+#define HAVE_GETENV
/* Define to 1 if you have the gethostbyaddr function. */
-#define HAVE_GETHOSTBYADDR 1
+#define HAVE_GETHOSTBYADDR
/* Define to 1 if you have the gethostbyname function. */
-#define HAVE_GETHOSTBYNAME 1
+#define HAVE_GETHOSTBYNAME
/* Define to 1 if you have the gethostname function. */
-#define HAVE_GETHOSTNAME 1
+#define HAVE_GETHOSTNAME
/* Define to 1 if you have the getnameinfo function. */
-#define HAVE_GETNAMEINFO 1
+#define HAVE_GETNAMEINFO
+
+/* Define to 1 if you have the getrandom function. */
+#define HAVE_GETRANDOM
/* Define to 1 if you have the getservbyport_r function. */
-#define HAVE_GETSERVBYPORT_R 1
+#define HAVE_GETSERVBYPORT_R
+
+/* Define to 1 if you have the getservbyname_r function. */
+#define HAVE_GETSERVBYNAME_R
/* Define to 1 if you have the `gettimeofday' function. */
-#define HAVE_GETTIMEOFDAY 1
+#define HAVE_GETTIMEOFDAY
/* Define to 1 if you have the `if_indextoname' function. */
-#define HAVE_IF_INDEXTONAME 1
+#define HAVE_IF_INDEXTONAME
/* Define to 1 if you have a IPv6 capable working inet_net_pton function. */
/* #undef HAVE_INET_NET_PTON */
/* Define to 1 if you have a IPv6 capable working inet_ntop function. */
-#define HAVE_INET_NTOP 1
+#define HAVE_INET_NTOP
/* Define to 1 if you have a IPv6 capable working inet_pton function. */
-#define HAVE_INET_PTON 1
+#define HAVE_INET_PTON
/* Define to 1 if you have the <inttypes.h> header file. */
-#define HAVE_INTTYPES_H 1
+#define HAVE_INTTYPES_H
/* Define to 1 if you have the ioctl function. */
-#define HAVE_IOCTL 1
+#define HAVE_IOCTL
/* Define to 1 if you have the ioctlsocket function. */
/* #undef HAVE_IOCTLSOCKET */
@@ -165,112 +171,109 @@
/* #undef HAVE_IOCTLSOCKET_FIONBIO */
/* Define to 1 if you have a working ioctl FIONBIO function. */
-#define HAVE_IOCTL_FIONBIO 1
+#define HAVE_IOCTL_FIONBIO
/* Define to 1 if you have a working ioctl SIOCGIFADDR function. */
-#define HAVE_IOCTL_SIOCGIFADDR 1
+#define HAVE_IOCTL_SIOCGIFADDR
/* Define to 1 if you have the `resolve' library (-lresolve). */
-/* #undef HAVE_LIBRESOLVE */
+/* #undef HAVE_LIBRESOLV */
/* Define to 1 if you have the <limits.h> header file. */
-#define HAVE_LIMITS_H 1
+#define HAVE_LIMITS_H
/* if your compiler supports LL */
-#define HAVE_LL 1
+#define HAVE_LL
/* Define to 1 if the compiler supports the 'long long' data type. */
-#define HAVE_LONGLONG 1
+#define HAVE_LONGLONG
/* Define to 1 if you have the malloc.h header file. */
-#define HAVE_MALLOC_H 1
+#define HAVE_MALLOC_H
/* Define to 1 if you have the memory.h header file. */
-#define HAVE_MEMORY_H 1
+#define HAVE_MEMORY_H
/* Define to 1 if you have the MSG_NOSIGNAL flag. */
-#define HAVE_MSG_NOSIGNAL 1
+#define HAVE_MSG_NOSIGNAL
/* Define to 1 if you have the <netdb.h> header file. */
-#define HAVE_NETDB_H 1
+#define HAVE_NETDB_H
/* Define to 1 if you have the <netinet/in.h> header file. */
-#define HAVE_NETINET_IN_H 1
+#define HAVE_NETINET_IN_H
/* Define to 1 if you have the <netinet/tcp.h> header file. */
-#define HAVE_NETINET_TCP_H 1
+#define HAVE_NETINET_TCP_H
/* Define to 1 if you have the <net/if.h> header file. */
-#define HAVE_NET_IF_H 1
+#define HAVE_NET_IF_H
/* Define to 1 if you have PF_INET6. */
-#define HAVE_PF_INET6 1
+#define HAVE_PF_INET6
/* Define to 1 if you have the recv function. */
-#define HAVE_RECV 1
+#define HAVE_RECV
/* Define to 1 if you have the recvfrom function. */
-#define HAVE_RECVFROM 1
+#define HAVE_RECVFROM
/* Define to 1 if you have the send function. */
-#define HAVE_SEND 1
+#define HAVE_SEND
/* Define to 1 if you have the setsockopt function. */
-#define HAVE_SETSOCKOPT 1
+#define HAVE_SETSOCKOPT
/* Define to 1 if you have a working setsockopt SO_NONBLOCK function. */
/* #undef HAVE_SETSOCKOPT_SO_NONBLOCK */
/* Define to 1 if you have the <signal.h> header file. */
-#define HAVE_SIGNAL_H 1
+#define HAVE_SIGNAL_H
/* Define to 1 if sig_atomic_t is an available typedef. */
-#define HAVE_SIG_ATOMIC_T 1
+#define HAVE_SIG_ATOMIC_T
/* Define to 1 if sig_atomic_t is already defined as volatile. */
/* #undef HAVE_SIG_ATOMIC_T_VOLATILE */
/* Define to 1 if your struct sockaddr_in6 has sin6_scope_id. */
-#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID 1
+#define HAVE_SOCKADDR_IN6_SIN6_SCOPE_ID
/* Define to 1 if you have the socket function. */
-#define HAVE_SOCKET 1
+#define HAVE_SOCKET
/* Define to 1 if you have the <socket.h> header file. */
/* #undef HAVE_SOCKET_H */
/* Define to 1 if you have the <stdbool.h> header file. */
-#define HAVE_STDBOOL_H 1
+#define HAVE_STDBOOL_H
/* Define to 1 if you have the <stdint.h> header file. */
-#define HAVE_STDINT_H 1
-
-/* Define to 1 if you have the <stdio.h> header file. */
-#define HAVE_STDIO_H 1
+#define HAVE_STDINT_H
/* Define to 1 if you have the <stdlib.h> header file. */
-#define HAVE_STDLIB_H 1
+#define HAVE_STDLIB_H
/* Define to 1 if you have the strcasecmp function. */
-#define HAVE_STRCASECMP 1
+#define HAVE_STRCASECMP
/* Define to 1 if you have the strcmpi function. */
/* #undef HAVE_STRCMPI */
/* Define to 1 if you have the strdup function. */
-#define HAVE_STRDUP 1
+#define HAVE_STRDUP
/* Define to 1 if you have the stricmp function. */
/* #undef HAVE_STRICMP */
/* Define to 1 if you have the <strings.h> header file. */
-#define HAVE_STRINGS_H 1
+#define HAVE_STRINGS_H
/* Define to 1 if you have the <string.h> header file. */
-#define HAVE_STRING_H 1
+#define HAVE_STRING_H
/* Define to 1 if you have the strncasecmp function. */
-#define HAVE_STRNCASECMP 1
+#define HAVE_STRNCASECMP
/* Define to 1 if you have the strncmpi function. */
/* #undef HAVE_STRNCMPI */
@@ -282,49 +285,49 @@
/* #undef HAVE_STROPTS_H */
/* Define to 1 if you have struct addrinfo. */
-#define HAVE_STRUCT_ADDRINFO 1
+#define HAVE_STRUCT_ADDRINFO
/* Define to 1 if you have struct in6_addr. */
-#define HAVE_STRUCT_IN6_ADDR 1
+#define HAVE_STRUCT_IN6_ADDR
/* Define to 1 if you have struct sockaddr_in6. */
-#define HAVE_STRUCT_SOCKADDR_IN6 1
+#define HAVE_STRUCT_SOCKADDR_IN6
/* if struct sockaddr_storage is defined */
-#define HAVE_STRUCT_SOCKADDR_STORAGE 1
+#define HAVE_STRUCT_SOCKADDR_STORAGE
/* Define to 1 if you have the timeval struct. */
-#define HAVE_STRUCT_TIMEVAL 1
+#define HAVE_STRUCT_TIMEVAL
/* Define to 1 if you have the <sys/ioctl.h> header file. */
-#define HAVE_SYS_IOCTL_H 1
+#define HAVE_SYS_IOCTL_H
/* Define to 1 if you have the <sys/param.h> header file. */
-#define HAVE_SYS_PARAM_H 1
+#define HAVE_SYS_PARAM_H
/* Define to 1 if you have the <sys/select.h> header file. */
-#define HAVE_SYS_SELECT_H 1
+#define HAVE_SYS_SELECT_H
/* Define to 1 if you have the <sys/socket.h> header file. */
-#define HAVE_SYS_SOCKET_H 1
+#define HAVE_SYS_SOCKET_H
/* Define to 1 if you have the <sys/stat.h> header file. */
-#define HAVE_SYS_STAT_H 1
+#define HAVE_SYS_STAT_H
/* Define to 1 if you have the <sys/time.h> header file. */
-#define HAVE_SYS_TIME_H 1
+#define HAVE_SYS_TIME_H
/* Define to 1 if you have the <sys/types.h> header file. */
-#define HAVE_SYS_TYPES_H 1
+#define HAVE_SYS_TYPES_H
/* Define to 1 if you have the <sys/uio.h> header file. */
-#define HAVE_SYS_UIO_H 1
+#define HAVE_SYS_UIO_H
/* Define to 1 if you have the <time.h> header file. */
-#define HAVE_TIME_H 1
+#define HAVE_TIME_H
/* Define to 1 if you have the <unistd.h> header file. */
-#define HAVE_UNISTD_H 1
+#define HAVE_UNISTD_H
/* Define to 1 if you have the windows.h header file. */
/* #undef HAVE_WINDOWS_H */
@@ -336,52 +339,25 @@
/* #undef HAVE_WINSOCK_H */
/* Define to 1 if you have the writev function. */
-#define HAVE_WRITEV 1
+#define HAVE_WRITEV
/* Define to 1 if you have the ws2tcpip.h header file. */
/* #undef HAVE_WS2TCPIP_H */
-/* Define if __system_property_get exists. */
+/* Define to 1 if you have the __system_property_get function */
/* #undef HAVE___SYSTEM_PROPERTY_GET */
-/* Define to the sub-directory where libtool stores uninstalled libraries. */
-#define LT_OBJDIR ".libs/"
-
/* Define to 1 if you need the malloc.h header file even with stdlib.h */
/* #undef NEED_MALLOC_H */
/* Define to 1 if you need the memory.h header file even with stdlib.h */
/* #undef NEED_MEMORY_H */
-/* Define to 1 if _REENTRANT preprocessor symbol must be defined. */
-/* #undef NEED_REENTRANT */
-
-/* Define to 1 if _THREAD_SAFE preprocessor symbol must be defined. */
-/* #undef NEED_THREAD_SAFE */
+/* Define if have arc4random_buf() */
+/* #undef HAVE_ARC4RANDOM_BUF */
-/* cpu-machine-OS */
-#define OS "x86_64-pc-linux-gnu"
-
-/* Name of package */
-#define PACKAGE "c-ares"
-
-/* Define to the address where bug reports for this package should be sent. */
-#define PACKAGE_BUGREPORT "c-ares mailing list: http://lists.haxx.se/listinfo/c-ares"
-
-/* Define to the full name of this package. */
-#define PACKAGE_NAME "c-ares"
-
-/* Define to the full name and version of this package. */
-#define PACKAGE_STRING "c-ares 1.19.0"
-
-/* Define to the one symbol short name of this package. */
-#define PACKAGE_TARNAME "c-ares"
-
-/* Define to the home page for this package. */
-#define PACKAGE_URL ""
-
-/* Define to the version of this package. */
-#define PACKAGE_VERSION "1.19.0"
+/* a suitable file/device to read random data from */
+#define CARES_RANDOM_FILE "/dev/urandom"
/* Define to the type qualifier pointed by arg 5 for recvfrom. */
#define RECVFROM_QUAL_ARG5
@@ -390,10 +366,10 @@
#define RECVFROM_TYPE_ARG1 int
/* Define to the type pointed by arg 2 for recvfrom. */
-#define RECVFROM_TYPE_ARG2 void
+#define RECVFROM_TYPE_ARG2 void *
/* Define to 1 if the type pointed by arg 2 for recvfrom is void. */
-#define RECVFROM_TYPE_ARG2_IS_VOID 1
+#define RECVFROM_TYPE_ARG2_IS_VOID 0
/* Define to the type of arg 3 for recvfrom. */
#define RECVFROM_TYPE_ARG3 size_t
@@ -402,16 +378,16 @@
#define RECVFROM_TYPE_ARG4 int
/* Define to the type pointed by arg 5 for recvfrom. */
-#define RECVFROM_TYPE_ARG5 struct sockaddr
+#define RECVFROM_TYPE_ARG5 struct sockaddr *
/* Define to 1 if the type pointed by arg 5 for recvfrom is void. */
-/* #undef RECVFROM_TYPE_ARG5_IS_VOID */
+#define RECVFROM_TYPE_ARG5_IS_VOID 0
/* Define to the type pointed by arg 6 for recvfrom. */
-#define RECVFROM_TYPE_ARG6 socklen_t
+#define RECVFROM_TYPE_ARG6 socklen_t *
/* Define to 1 if the type pointed by arg 6 for recvfrom is void. */
-/* #undef RECVFROM_TYPE_ARG6_IS_VOID */
+#define RECVFROM_TYPE_ARG6_IS_VOID 0
/* Define to the function return type for recvfrom. */
#define RECVFROM_TYPE_RETV ssize_t
@@ -432,10 +408,10 @@
#define RECV_TYPE_RETV ssize_t
/* Define as the return type of signal handlers (`int' or `void'). */
-#define RETSIGTYPE void
+#define RETSIGTYPE
/* Define to the type qualifier of arg 2 for send. */
-#define SEND_QUAL_ARG2 const
+#define SEND_QUAL_ARG2
/* Define to the type of arg 1 for send. */
#define SEND_TYPE_ARG1 int
@@ -452,52 +428,15 @@
/* Define to the function return type for send. */
#define SEND_TYPE_RETV ssize_t
-/* Define to 1 if all of the C90 standard headers exist (not just the ones
- required in a freestanding environment). This macro is provided for
- backward compatibility; new code need not use it. */
-#define STDC_HEADERS 1
-
-/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. This
- macro is obsolete. */
-#define TIME_WITH_SYS_TIME 1
+/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
+#define TIME_WITH_SYS_TIME
/* Define to disable non-blocking sockets. */
-/* #undef USE_BLOCKING_SOCKETS */
-
-/* Version number of package */
-#define VERSION "1.19.0"
+#undef USE_BLOCKING_SOCKETS
/* Define to avoid automatic inclusion of winsock.h */
-/* #undef WIN32_LEAN_AND_MEAN */
-
-/* Define WORDS_BIGENDIAN to 1 if your processor stores words with the most
- significant byte first (like Motorola and SPARC, unlike Intel). */
-#if defined AC_APPLE_UNIVERSAL_BUILD
-# if defined __BIG_ENDIAN__
-# define WORDS_BIGENDIAN 1
-# endif
-#else
-# ifndef WORDS_BIGENDIAN
-/* # undef WORDS_BIGENDIAN */
-# endif
-#endif
-
-/* Define to 1 if OS is AIX. */
-#ifndef _ALL_SOURCE
-/* # undef _ALL_SOURCE */
-#endif
-
-/* Number of bits in a file offset, on hosts where this is settable. */
-/* #undef _FILE_OFFSET_BITS */
-
-/* Define for large files, on AIX-style hosts. */
-/* #undef _LARGE_FILES */
-
-/* Define to empty if `const' does not conform to ANSI C. */
-/* #undef const */
+#undef WIN32_LEAN_AND_MEAN
/* Type to use in place of in_addr_t when system does not provide it. */
-/* #undef in_addr_t */
+#undef in_addr_t
-/* Define to `unsigned int' if <sys/types.h> does not define. */
-/* #undef size_t */
diff --git a/contrib/libs/c-ares/src/lib/ares_config-osx.h b/contrib/libs/c-ares/src/lib/ares_config-osx.h
index 2d752325be0..a62b624920a 100644
--- a/contrib/libs/c-ares/src/lib/ares_config-osx.h
+++ b/contrib/libs/c-ares/src/lib/ares_config-osx.h
@@ -1,6 +1,49 @@
+/* Copyright (C) The c-ares project and its contributors
+ * SPDX-License-Identifier: MIT
+ */
+
#pragma once
#include "ares_config-linux.h"
+/* Use resolver library to configure cares */
#define CARES_USE_LIBRESOLV
+
+/* Define to 1 if you have the pipe2 function. */
+#undef HAVE_PIPE2
+
+/* Define to 1 if you have the kqueue function. */
+#define HAVE_KQUEUE
+
+/* Define to 1 if you have the epoll{_create,ctl,wait} functions. */
+#undef HAVE_EPOLL
+
+/* Define to 1 if you have the getrandom function. */
+#undef HAVE_GETRANDOM
+
+/* Define to 1 if you have the getservbyport_r function. */
#undef HAVE_GETSERVBYPORT_R
+
+/* Define to 1 if you have the getservbyname_r function. */
+#undef HAVE_GETSERVBYNAME_R
+
+/* Define to 1 if you have the `resolve' library (-lresolve). */
+#define HAVE_LIBRESOLV
+
+/* Define to 1 if you have the malloc.h header file. */
+#undef HAVE_MALLOC_H
+
+/* Define to 1 if you have the AvailabilityMacros.h header file. */
+#define HAVE_AVAILABILITYMACROS_H
+
+/* Define to 1 if you have the <sys/random.h> header file. */
+#undef HAVE_SYS_RANDOM_H
+
+/* Define to 1 if you have the <sys/event.h> header file. */
+#define HAVE_SYS_EVENT_H
+
+/* Define to 1 if you have the <sys/epoll.h> header file. */
+#undef HAVE_SYS_EPOLL_H
+
+/* Define if have arc4random_buf() */
+#define HAVE_ARC4RANDOM_BUF
diff --git a/contrib/libs/c-ares/ya.make b/contrib/libs/c-ares/ya.make
index 642c9e773ed..a72f1f9e6d3 100644
--- a/contrib/libs/c-ares/ya.make
+++ b/contrib/libs/c-ares/ya.make
@@ -21,7 +21,6 @@ PEERDIR(
)
ADDINCL(
- GLOBAL contrib/libs/c-ares
GLOBAL contrib/libs/c-ares/include
contrib/libs/c-ares/src/lib
)
diff --git a/yt/python/yt/yson/__init__.py b/yt/python/yt/yson/__init__.py
index aca29e6030e..8fa64bd180d 100644
--- a/yt/python/yt/yson/__init__.py
+++ b/yt/python/yt/yson/__init__.py
@@ -32,6 +32,7 @@ Examples:
"""
from __future__ import print_function
+import os
from . import writer # noqa
from . import parser # noqa
@@ -63,7 +64,8 @@ except ImportError:
message = str(error)
if "No module named" not in message:
import sys as _sys
- print("Warning! Failed to import dump_parquet binding: " + message, file=_sys.stderr)
+ if os.environ.get("YT_LOG_LEVEL", "").lower() == "debug":
+ print("Warning! Failed to import dump_parquet binding: " + message, file=_sys.stderr)
if TYPE is None:
from .parser import load, loads # noqa
diff --git a/yt/yt/RpcProxyProtocolVersion.txt b/yt/yt/RpcProxyProtocolVersion.txt
index de98282d4de..0e120bc4857 100644
--- a/yt/yt/RpcProxyProtocolVersion.txt
+++ b/yt/yt/RpcProxyProtocolVersion.txt
@@ -16,7 +16,7 @@ SET(YT_RPC_PROXY_SERVER_PROTOCOL_VERSION_MINOR 2)
SET(YT_RPC_MODIFY_ROWS_STRONG_LOCKS_VERSION 2)
# RPC python client has protocol version plus some patch version
-SET(YT_RPC_PYTHON_BINDINGS_PATCH_VERSION 17)
+SET(YT_RPC_PYTHON_BINDINGS_PATCH_VERSION 18)
# YT proto package has protocol version plus some patch version
SET(YT_PROTO_PACKAGE_PATCH_VERSION 13)
diff --git a/yt/yt/client/queue_client/common.cpp b/yt/yt/client/queue_client/common.cpp
index 4d286440433..22beeb98bbf 100644
--- a/yt/yt/client/queue_client/common.cpp
+++ b/yt/yt/client/queue_client/common.cpp
@@ -94,6 +94,7 @@ size_t THash<NYT::NQueueClient::TProfilingTags>::operator()(const NYT::NQueueCli
HashCombine(result, tag.Cluster);
HashCombine(result, tag.LeadingStatus);
HashCombine(result, tag.QueueAgentStage);
+ HashCombine(result, tag.ObjectType);
return result;
}
diff --git a/yt/yt/client/queue_client/common.h b/yt/yt/client/queue_client/common.h
index 0f008f39dcb..93e5bc409e2 100644
--- a/yt/yt/client/queue_client/common.h
+++ b/yt/yt/client/queue_client/common.h
@@ -36,6 +36,7 @@ struct TProfilingTags
TString Cluster;
TString LeadingStatus;
TString QueueAgentStage;
+ TString ObjectType;
bool operator==(const TProfilingTags& other) const = default;
bool operator<(const TProfilingTags& other) const = default;
diff --git a/yt/yt/core/misc/hr_timer.cpp b/yt/yt/core/misc/hr_timer.cpp
deleted file mode 100644
index 18a6c1019c7..00000000000
--- a/yt/yt/core/misc/hr_timer.cpp
+++ /dev/null
@@ -1,95 +0,0 @@
-#include "hr_timer.h"
-
-#if defined(_linux_)
-#include <time.h>
-#elif defined(_darwin_)
-#include <mach/mach_time.h>
-#elif defined(_win_)
-// Any other includes?
-#endif
-
-#include <limits>
-
-namespace NYT::NHRTimer {
-
-////////////////////////////////////////////////////////////////////////////////
-
-static const ui64 NumberOfNsInS = 1000000000UL;
-static const i64 NumberOfSamples = 1000UL;
-
-void GetHRInstant(THRInstant* instant)
-{
-#if defined(_linux_)
- // See:
- // http://stackoverflow.com/questions/6814792/why-is-clock-gettime-so-erratic
- // http://stackoverflow.com/questions/7935518/is-clock-gettime-adequate-for-submicrosecond-timing
- struct timespec* ts = reinterpret_cast<struct timespec*>(instant);
- YT_VERIFY(clock_gettime(CLOCK_REALTIME, ts) == 0);
-#elif defined(_darwin_)
- // See http://lists.mysql.com/commits/70966
- static mach_timebase_info_data_t info = { 0, 0 };
- if (Y_UNLIKELY(info.denom == 0)) {
- YT_VERIFY(mach_timebase_info(&info) == 0);
- }
- ui64 time;
- YT_VERIFY((time = mach_absolute_time()));
- time *= info.numer;
- time /= info.denom;
- instant->Seconds = time / NumberOfNsInS;
- instant->Nanoseconds = time % NumberOfNsInS;
-#elif defined(_win_)
- static LARGE_INTEGER frequency = { 0 };
- if (Y_UNLIKELY(frequency.QuadPart == 0)) {
- YT_VERIFY(QueryPerformanceFrequency(&frequency));
-
- }
- LARGE_INTEGER time;
- YT_VERIFY((QueryPerformanceCounter(&time)));
- instant->Seconds = time.QuadPart / frequency.QuadPart;
- instant->Nanoseconds = (time.QuadPart % frequency.QuadPart) * NumberOfNsInS / frequency.QuadPart;
-#else
- #error "Unsupported architecture"
-#endif
-}
-
-THRDuration GetHRDuration(const THRInstant& begin, const THRInstant& end)
-{
- if (end.Seconds == begin.Seconds) {
- YT_ASSERT(end.Nanoseconds >= begin.Nanoseconds);
- return end.Nanoseconds - begin.Nanoseconds;
- }
-
- YT_ASSERT(
- end.Seconds > begin.Seconds &&
- end.Seconds - begin.Seconds <
- static_cast<i64>(std::numeric_limits<THRDuration>::max() / NumberOfNsInS));
-
- return
- ( end.Seconds - begin.Seconds ) * NumberOfNsInS
- + end.Nanoseconds - begin.Nanoseconds;
-}
-
-THRDuration GetHRResolution()
-{
- static THRDuration result = 0;
- if (Y_LIKELY(result)) {
- return result;
- }
-
- std::vector<THRDuration> samples(NumberOfSamples);
- THRInstant begin;
- THRInstant end;
- for (int i = 0; i < NumberOfSamples; ++i) {
- GetHRInstant(&begin);
- GetHRInstant(&end);
- samples[i] = GetHRDuration(begin, end);
- }
-
- std::sort(samples.begin(), samples.end());
- result = samples[samples.size() / 2];
- return result;
-}
-
-////////////////////////////////////////////////////////////////////////////////
-
-} // namespace NYT::NHRTimer
diff --git a/yt/yt/core/misc/hr_timer.h b/yt/yt/core/misc/hr_timer.h
deleted file mode 100644
index a39223f2c4a..00000000000
--- a/yt/yt/core/misc/hr_timer.h
+++ /dev/null
@@ -1,53 +0,0 @@
-#pragma once
-
-#include "common.h"
-
-#include <util/system/datetime.h>
-
-namespace NYT::NHRTimer {
-
-////////////////////////////////////////////////////////////////////////////////
-
-// Returns CPU internal cycle counter.
-// On modern systems, cycle counters are consistent across cores and cycle rate
-// can be considered constant for practical purposes.
-Y_FORCE_INLINE ui64 GetRdtsc()
-{
- return GetCycleCount();
-}
-
-// Represents an offset from an arbitrary point in the past;
-// it should be used only for relative measurements.
-struct THRInstant
-{
- i64 Seconds;
- i64 Nanoseconds;
-};
-
-// Represents a duration in nano-seconds.
-using THRDuration = ui64;
-
-#ifdef _linux_
-static_assert(
- sizeof(THRInstant) == sizeof(struct timespec),
- "THRInstant should be ABI-compatible with struct timespec");
-static_assert(
- offsetof(THRInstant, Seconds) == offsetof(struct timespec, tv_sec),
- "THRInstant should be ABI-compatible with struct timespec");
-static_assert(
- offsetof(THRInstant, Nanoseconds) == offsetof(struct timespec, tv_nsec),
- "THRInstant should be ABI-compatible with struct timespec");
-#endif
-
-// Returns instant.
-void GetHRInstant(THRInstant* instant);
-
-// Returns time difference in nanoseconds.
-THRDuration GetHRDuration(const THRInstant& begin, const THRInstant& end);
-
-// Returns instant resolution.
-THRDuration GetHRResolution();
-
-////////////////////////////////////////////////////////////////////////////////
-
-} // namespace NYT::NHRTimer
diff --git a/yt/yt/core/ya.make b/yt/yt/core/ya.make
index 8d449fdc30c..6ca8870f3ce 100644
--- a/yt/yt/core/ya.make
+++ b/yt/yt/core/ya.make
@@ -129,7 +129,6 @@ SRCS(
misc/hedging_manager.cpp
misc/histogram.cpp
misc/adjusted_exponential_moving_average.cpp
- misc/hr_timer.cpp
misc/id_generator.cpp
misc/linear_probe.cpp
misc/memory_reference_tracker.cpp