Library import 5, delete go dependencies (#832)

* Library import 5, delete go dependencies

* Fix yt client

19 files changed, 37 insertions, 474 deletions

diff --git a/library/cpp/clickhouse/client/client.cpp b/library/cpp/clickhouse/client/client.cpp
index b0b2613bb5..576731ed76 100644
--- a/library/cpp/clickhouse/client/client.cpp
+++ b/library/cpp/clickhouse/client/client.cpp
@@ -64,7 +64,7 @@ namespace NClickHouse {
 
         void ExecuteQuery(TQuery query);
 
-        void Insert(const TString& table_name, const TBlock& block);
+        void Insert(const TString& table_name, const TBlock& block, const TString& query_id);
 
         void Ping();
 
@@ -75,7 +75,7 @@ namespace NClickHouse {
 
         bool ReceivePacket(ui64* server_packet = nullptr);
 
-        void SendQuery(const TString& query);
+        void SendQuery(const TString& query, const TString& query_id);
 
         void SendData(const TBlock& block);
 
@@ -183,7 +183,7 @@ namespace NClickHouse {
             RetryGuard([this]() { Ping(); });
         }
 
-        SendQuery(query.GetText());
+        SendQuery(query.GetText(), query.GetId());
 
         ui64 server_packet = 0;
         while (ReceivePacket(&server_packet)) {
@@ -195,7 +195,7 @@ namespace NClickHouse {
         }
     }
 
-    void TClient::TImpl::Insert(const TString& table_name, const TBlock& block) {
+    void TClient::TImpl::Insert(const TString& table_name, const TBlock& block, const TString& query_id) {
         if (Options_.PingBeforeQuery) {
             RetryGuard([this]() { Ping(); });
         }
@@ -216,7 +216,7 @@ namespace NClickHouse {
             }
         }
 
-        SendQuery("INSERT INTO " + table_name + " ( " + fields_section + " ) VALUES");
+        SendQuery("INSERT INTO " + table_name + " ( " + fields_section + " ) VALUES", query_id);
 
         ui64 server_packet(0);
         // Receive data packet.
@@ -536,9 +536,9 @@ namespace NClickHouse {
         return exception_received;
     }
 
-    void TClient::TImpl::SendQuery(const TString& query) {
+    void TClient::TImpl::SendQuery(const TString& query, const TString& query_id) {
         TWireFormat::WriteUInt64(&Output_, ClientCodes::Query);
-        TWireFormat::WriteString(&Output_, TString());
+        TWireFormat::WriteString(&Output_, query_id);
 
         /// Client info.
         if (ServerInfo_.Revision >= DBMS_MIN_REVISION_WITH_CLIENT_INFO) {
@@ -744,16 +744,16 @@ namespace NClickHouse {
         Impl_->ExecuteQuery(query);
     }
 
-    void TClient::Select(const TString& query, TSelectCallback cb) {
-        Execute(TQuery(query).OnData(cb));
+    void TClient::Select(const TString& query, TSelectCallback cb, const TString& query_id) {
+        Execute(TQuery(query, query_id).OnData(cb));
     }
 
     void TClient::Select(const TQuery& query) {
         Execute(query);
     }
 
-    void TClient::Insert(const TString& table_name, const TBlock& block) {
-        Impl_->Insert(table_name, block);
+    void TClient::Insert(const TString& table_name, const TBlock& block, const TString& query_id) {
+        Impl_->Insert(table_name, block, query_id);
     }
 
     void TClient::Ping() {
diff --git a/library/cpp/clickhouse/client/client.h b/library/cpp/clickhouse/client/client.h
index 865a9df551..b008ef99a5 100644
--- a/library/cpp/clickhouse/client/client.h
+++ b/library/cpp/clickhouse/client/client.h
@@ -81,13 +81,13 @@ namespace NClickHouse {
 
         /// Intends for execute select queries.  Data will be returned with
         /// one or more call of \p cb.
-        void Select(const TString& query, TSelectCallback cb);
+        void Select(const TString& query, TSelectCallback cb, const TString& query_id = "");
 
         /// Alias for Execute.
         void Select(const TQuery& query);
 
         /// Intends for insert block of data into a table \p table_name.
-        void Insert(const TString& table_name, const TBlock& block);
+        void Insert(const TString& table_name, const TBlock& block, const TString& query_id = "");
 
         /// Ping server for aliveness.
         void Ping();
diff --git a/library/cpp/clickhouse/client/query.cpp b/library/cpp/clickhouse/client/query.cpp
index 875dc4a078..4c20bc8d88 100644
--- a/library/cpp/clickhouse/client/query.cpp
+++ b/library/cpp/clickhouse/client/query.cpp
@@ -14,6 +14,12 @@ namespace NClickHouse {
     {
     }
 
+    TQuery::TQuery(const TString& query, const TString& query_id)
+        : Query_(query)
+        , QueryId_(query_id)
+    {
+    }
+
     TQuery::~TQuery() {
     }
 
diff --git a/library/cpp/clickhouse/client/query.h b/library/cpp/clickhouse/client/query.h
index fc5879b4f5..5d4a578df5 100644
--- a/library/cpp/clickhouse/client/query.h
+++ b/library/cpp/clickhouse/client/query.h
@@ -83,6 +83,7 @@ namespace NClickHouse {
         TQuery();
         TQuery(const char* query);
         TQuery(const TString& query);
+        TQuery(const TString& query, const TString& query_id);
         ~TQuery();
 
         ///
@@ -90,6 +91,10 @@ namespace NClickHouse {
             return Query_;
         }
 
+        inline TString GetId() const {
+            return QueryId_;
+        }
+
         /// Set handler for receiving result data.
         inline TQuery& OnData(TSelectCallback cb) {
             SelectCb_ = cb;
@@ -144,6 +149,7 @@ namespace NClickHouse {
 
     private:
         TString Query_;
+        TString QueryId_;
         TExceptionCallback ExceptionCb_;
         TProfileCallback ProfileCb_;
         TProgressCallback ProgressCb_;
diff --git a/library/cpp/clickhouse_deps/h3_compat/README.md b/library/cpp/clickhouse_deps/h3_compat/README.md
deleted file mode 100644
index 56e2fce66f..0000000000
--- a/library/cpp/clickhouse_deps/h3_compat/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-ClickHouse uses a not stable version of H3 library, which interface is incompatible with both 3.x and 4.x H3 versions.
-
-To avoid having several versions of H3 library in our monorepository, we implement H3 API used in ClickHouse via H3 3.x version.
diff --git a/library/cpp/clickhouse_deps/h3_compat/constants.h b/library/cpp/clickhouse_deps/h3_compat/constants.h
deleted file mode 100644
index 680e7d8323..0000000000
--- a/library/cpp/clickhouse_deps/h3_compat/constants.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <contrib/libs/h3/h3lib/include/constants.h>
diff --git a/library/cpp/clickhouse_deps/h3_compat/h3api.h b/library/cpp/clickhouse_deps/h3_compat/h3api.h
deleted file mode 100644
index 96201508fa..0000000000
--- a/library/cpp/clickhouse_deps/h3_compat/h3api.h
+++ /dev/null
@@ -1,262 +0,0 @@
-#pragma once
-
-#include <contrib/libs/h3/h3lib/include/h3api.h>
-
-// TODO(dakovalkov): eliminate it.
-#define lng lon
-
-using LatLng = GeoCoord;
-using CellBoundary = GeoBoundary;
-using H3Error = uint32_t;
-
-enum H3ErrorCodes
-{
-    E_SUCCESS = 0,
-    E_FAILED = 1,
-};
-
-#define H3_NULL 0
-
-inline H3Error latLngToCell(const LatLng *g, int res, H3Index *out)
-{
-    *out = geoToH3(g, res);
-    return *out == H3_NULL ? E_FAILED : E_SUCCESS;
-}
-
-// NOTE(dakovalkov): The real function signature in H3 4.x is
-// H3Error getHexagonEdgeLengthAvgM(int res, double *out)
-// But CH uses a random commit from H3 master branch which is incompatible with both 3.x and 4.x.
-inline double getHexagonEdgeLengthAvgM(int res)
-{
-    return edgeLengthM(res);
-}
-
-inline int getBaseCellNumber(H3Index h)
-{
-    return h3GetBaseCell(h);
-}
-
-inline int getResolution(H3Index h)
-{
-    return h3GetResolution(h);
-}
-
-// NOTE(dakovalkov): The real function signature in H3 4.x is
-// H3Error getHexagonAreaAvgM2(int res, double *out)
-inline double getHexagonAreaAvgM2(int res)
-{
-    return hexAreaM2(res);
-}
-
-// NOTE(dakovalkov): The real function signature in H3 4.x is
-// H3Error areNeighborCells(H3Index origin, H3Index destination, int *out)
-inline int areNeighborCells(H3Index origin, H3Index destination)
-{
-    return h3IndexesAreNeighbors(origin, destination);
-}
-
-inline int isValidCell(H3Index h)
-{
-    return h3IsValid(h);
-}
-
-// NOTE(dakovalkov): The real function signature in H3 4.x is
-// H3Error cellToChildrenSize(H3Index cell, int childRes, int64_t *out)
-inline int64_t cellToChildrenSize(H3Index cell, int childRes)
-{
-    return maxH3ToChildrenSize(cell, childRes);
-}
-
-// NOTE(dakovalkov): The real function signature in H3 4.x is
-// H3Error cellToChildren(H3Index cell, int childRes, H3Index *children)
-inline H3Error cellToChildren(H3Index cell, int childRes, H3Index *children)
-{
-    h3ToChildren(cell, childRes, children);
-    return *children == H3_NULL ? E_FAILED : E_SUCCESS;
-}
-
-// NOTE(dakovalkov): The real function signature in H3 4.x is
-// H3Error cellToParent(H3Index cell, int parentRes, H3Index *parent)
-inline H3Index cellToParent(H3Index cell, int parentRes)
-{
-    return h3ToParent(cell, parentRes);
-}
-
-// NOTE(dakovalkov): The real function signature in H3 4.x is
-// H3Error maxGridDiskSize(int k, int64_t *out)
-inline int64_t maxGridDiskSize(int k) {
-    return maxKringSize(k);
-}
-
-
-inline H3Error gridDisk(H3Index origin, int k, H3Index* out)
-{
-    kRing(origin, k, out);
-    return *out == H3_NULL ? E_FAILED : E_SUCCESS;
-}
-
-inline H3Error cellToLatLng(H3Index cell, LatLng *g)
-{
-    h3ToGeo(cell, g);
-    // NOTE(dakovalkov): There is no way to get the error in 3.x (is it even possible?).
-    return E_SUCCESS;
-}
-
-// NOTE(dakovalkov): The real function signature in H3 4.x is
-// H3Error cellsToDirectedEdge(H3Index origin, H3Index destination, H3Index *out)
-inline H3Index cellsToDirectedEdge(H3Index origin, H3Index destination)
-{
-    return getH3UnidirectionalEdge(origin, destination);
-}
-
-// NOTE(dakovalkov): The real function signature in H3 4.x is
-// H3Error gridPathCellsSize(H3Index start, H3Index end, int64_t* size);
-inline int64_t gridPathCellsSize(H3Index start, H3Index end)
-{
-    return h3LineSize(start, end);
-}
-
-inline H3Error cellToBoundary(H3Index cell, CellBoundary *bndry)
-{
-    h3ToGeoBoundary(cell, bndry);
-    // NOTE(dakovalkov): There is no way to get the error in 3.x (is it even possible?).
-    return E_SUCCESS;
-}
-
-inline int isResClassIII(H3Index h)
-{
-    return h3IsResClassIII(h);
-}
-
-inline int isPentagon(H3Index h)
-{
-    return h3IsPentagon(h);
-}
-
-// NOTE(dakovalkov): The real function signature in H3 4.x is
-// H3Error getHexagonEdgeLengthAvgKm(int res, double *out)
-inline double getHexagonEdgeLengthAvgKm(int res)
-{
-    return edgeLengthKm(res);
-}
-
-inline H3Error getIcosahedronFaces(H3Index h, int* out)
-{
-    h3GetFaces(h, out);
-    // NOTE(dakovalkov): There is no way to get the error in 3.x (is the error even possible?).
-    return E_SUCCESS;
-}
-
-// NOTE(dakovalkov): The real function signature in H3 4.x is
-// H3Error getHexagonAreaAvgKm2(int res, double *out)
-inline double getHexagonAreaAvgKm2(int res)
-{
-    return hexAreaKm2(res);
-}
-
-inline H3Error gridPathCells(H3Index start, H3Index end, H3Index* out)
-{
-    return h3Line(start, end, out);
-}
-
-inline int isValidDirectedEdge(H3Index edge)
-{
-    return h3UnidirectionalEdgeIsValid(edge);
-}
-
-inline H3Error originToDirectedEdges(H3Index origin, H3Index* edges)
-{
-    // TODO(dakovalkov): Find out how to implement it via 3.x version.
-    throw "Not implemented";
-}
-
-// NOTE(dakovalkov): The real function signature in H3 4.x is
-// H3Error getDirectedEdgeDestination(H3Index edge, H3Index *out);
-inline H3Index getDirectedEdgeDestination(H3Index edge)
-{
-    return getDestinationH3IndexFromUnidirectionalEdge(edge);
-}
-
-inline int res0CellCount()
-{
-    return res0IndexCount();
-}
-
-inline H3Error getRes0Cells(H3Index *out)
-{
-    getRes0Indexes(out);
-    // NOTE(dakovalkov): There is no way to get the error in 3.x.
-    return E_SUCCESS;
-}
-
-// NOTE(dakovalkov): The real function signature in H3 4.x is
-// H3Error getNumCells(int res, int64_t *out);
-inline int64_t getNumCells(int res)
-{
-    return numHexagons(res);
-}
-
-inline H3Error directedEdgeToBoundary(H3Index edge, CellBoundary* gb)
-{
-    getH3UnidirectionalEdgeBoundary(edge, gb);
-    // NOTE(dakovalkov): There is no way to get the error in 3.x.
-    return E_SUCCESS;
-}
-
-// NOTE(dakovalkov): The real function signature in H3 4.x is
-// H3Error cellToCenterChild(H3Index cell, int childRes, H3Index *child);
-inline H3Index cellToCenterChild(H3Index cell, int childRes)
-{
-    return h3ToCenterChild(cell, childRes);
-}
-
-// NOTE(dakovalkov): The real function signature in H3 4.x is
-// double greatCircleDistanceKm(const LatLng *a, const LatLng *b)
-inline double distanceKm(const LatLng *a, const LatLng *b)
-{
-    return pointDistKm(a, b);
-}
-
-// NOTE(dakovalkov): The real function signature in H3 4.x is
-// double greatCircleDistanceM(const LatLng *a, const LatLng *b)
-inline double distanceM(const LatLng *a, const LatLng *b)
-{
-    return pointDistM(a, b);
-}
-
-// NOTE(dakovalkov): The real function signature in H3 4.x is
-// double greatCircleDistanceRads(const LatLng *a, const LatLng *b)
-inline double distanceRads(const LatLng *a, const LatLng *b)
-{
-    return pointDistRads(a, b);
-}
-
-inline H3Error directedEdgeToCells(H3Index edge, H3Index* originDestination)
-{
-    getH3IndexesFromUnidirectionalEdge(edge, originDestination);
-    return *originDestination == H3_NULL ? E_FAILED : E_SUCCESS;
-}
-
-// NOTE(dakovalkov): The real function signature in H3 4.x is
-// H3Error getDirectedEdgeOrigin(H3Index edge, H3Index *out);
-inline H3Index getDirectedEdgeOrigin(H3Index edge)
-{
-    return getOriginH3IndexFromUnidirectionalEdge(edge);
-}
-
-inline int pentagonCount()
-{
-    return pentagonIndexCount();
-}
-
-inline H3Error getPentagons(int res, H3Index *out)
-{
-    getPentagonIndexes(res, out);
-    // NOTE(dakovalkov): There is no way to get the error in 3.x.
-    return E_SUCCESS;
-}
-
-inline H3Error gridRingUnsafe(H3Index origin, int k, H3Index* out)
-{
-    return hexRing(origin, k, out);
-}
diff --git a/library/cpp/clickhouse_deps/h3_compat/ya.make b/library/cpp/clickhouse_deps/h3_compat/ya.make
deleted file mode 100644
index 3a63f92143..0000000000
--- a/library/cpp/clickhouse_deps/h3_compat/ya.make
+++ /dev/null
@@ -1,7 +0,0 @@
-LIBRARY()
-
-PEERDIR(
-    contrib/libs/h3
-)
-
-END()
diff --git a/library/cpp/clickhouse_deps/incbin_stub/incbin.h b/library/cpp/clickhouse_deps/incbin_stub/incbin.h
deleted file mode 100644
index f5fc17ea14..0000000000
--- a/library/cpp/clickhouse_deps/incbin_stub/incbin.h
+++ /dev/null
@@ -1,5 +0,0 @@
-#pragma once
-
-#define INCBIN(name, file) \
-const unsigned char * g ## name ## Data = nullptr; \
-unsigned int g ## name ## Size = 0;
diff --git a/library/cpp/clickhouse_deps/incbin_stub/ya.make b/library/cpp/clickhouse_deps/incbin_stub/ya.make
deleted file mode 100644
index 9865d255c8..0000000000
--- a/library/cpp/clickhouse_deps/incbin_stub/ya.make
+++ /dev/null
@@ -1,3 +0,0 @@
-LIBRARY()
-
-END()
diff --git a/library/cpp/clickhouse_deps/re2_st_stub/README.md b/library/cpp/clickhouse_deps/re2_st_stub/README.md
deleted file mode 100644
index fc8660564d..0000000000
--- a/library/cpp/clickhouse_deps/re2_st_stub/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-re2_st is a modification of re2 library, which is generated during ClickHouse build:
-
-https://github.com/ClickHouse/ClickHouse/blob/master/contrib/re2-cmake/CMakeLists.txt#L52
-https://github.com/ClickHouse/ClickHouse/blob/master/contrib/re2-cmake/re2_transform.cmake
-
-This library mimics re2_st interface via original re2 library, so we can build ClickHouse properly in Arcadia.
-
-This library should not be used outside of ClickHouse build.
diff --git a/library/cpp/clickhouse_deps/re2_st_stub/include/re2_st/re2.h b/library/cpp/clickhouse_deps/re2_st_stub/include/re2_st/re2.h
deleted file mode 100644
index 48c2b6915b..0000000000
--- a/library/cpp/clickhouse_deps/re2_st_stub/include/re2_st/re2.h
+++ /dev/null
@@ -1,3 +0,0 @@
-#include <contrib/libs/re2/re2/re2.h>
-
-namespace re2_st = re2;
diff --git a/library/cpp/clickhouse_deps/re2_st_stub/ya.make b/library/cpp/clickhouse_deps/re2_st_stub/ya.make
deleted file mode 100644
index 6cfb279469..0000000000
--- a/library/cpp/clickhouse_deps/re2_st_stub/ya.make
+++ /dev/null
@@ -1,11 +0,0 @@
-LIBRARY()
-
-PEERDIR(
-    contrib/libs/re2
-)
-
-ADDINCL(
-    GLOBAL library/cpp/clickhouse_deps/re2_st_stub/include
-)
-
-END()
diff --git a/library/cpp/consistent_hashing/consistent_hashing.cpp b/library/cpp/consistent_hashing/consistent_hashing.cpp
deleted file mode 100644
index 77ef3898ff..0000000000
--- a/library/cpp/consistent_hashing/consistent_hashing.cpp
+++ /dev/null
@@ -1,119 +0,0 @@
-#include "consistent_hashing.h"
-
-#include <library/cpp/pop_count/popcount.h>
-
-#include <util/generic/bitops.h>
-
-/*
- * (all numbers are written in big-endian manner: the least significant digit on the right)
- * (only bit representations are used - no hex or octal, leading zeroes are ommited)
- *
- * Consistent hashing scheme:
- *
- *      (sizeof(TValue) * 8, y]  (y, 0]
- * a =             *             ablock
- * b =             *             cblock
- *
- *      (sizeof(TValue) * 8, k]  (k, 0]
- * c =             *             cblock
- *
- * d =             *
- *
- * k - is determined by 2^(k-1) < n <= 2^k inequality
- * z - is number of ones in cblock
- * y - number of digits after first one in cblock
- *
- * The cblock determines logic of using a- and b- blocks:
- *
- *  bits of cblock | result of a function
- *              0  :   0
- *              1  :   1 (optimization, the next case includes this one)
- *          1?..?  :   1ablock (z is even) or 1bblock (z is odd) if possible (<n)
- *
- * If last case is not possible (>=n), than smooth moving from n=2^(k-1) to n=2^k is applied.
- * Using "*" bits of a-,b-,c-,d- blocks ui64 value is combined, modulo of which determines
- * if the value should be greather than 2^(k-1) or ConsistentHashing(x, 2^(k-1)) should be used.
- * The last case is optimized according to previous checks.
- */
-
-namespace {
-    ui64 PowerOf2(size_t k) {
-        return (ui64)0x1 << k;
-    }
-
-    template <class TValue>
-    TValue SelectAOrBBlock(TValue a, TValue b, TValue cBlock) {
-        size_t z = PopCount<unsigned long long>(cBlock);
-        bool useABlock = z % 2 == 0;
-        return useABlock ? a : b;
-    }
-
-    // Gets the exact result for n = k2 = 2 ^ k
-    template <class TValue>
-    size_t ConsistentHashingForPowersOf2(TValue a, TValue b, TValue c, ui64 k2) {
-        TValue cBlock = c & (k2 - 1); // (k, 0] bits of c
-        // Zero and one cases
-        if (cBlock < 2) {
-            // First two cases of result function table: 0 if cblock is 0, 1 if cblock is 1.
-            return cBlock;
-        }
-        size_t y = GetValueBitCount<unsigned long long>(cBlock) - 1; // cblock = 0..01?..? (y = number of digits after 1), y > 0
-        ui64 y2 = PowerOf2(y);                                       // y2 = 2^y
-        TValue abBlock = SelectAOrBBlock(a, b, cBlock) & (y2 - 1);
-        return y2 + abBlock;
-    }
-
-    template <class TValue>
-    ui64 GetAsteriskBits(TValue a, TValue b, TValue c, TValue d, size_t k) {
-        size_t shift = sizeof(TValue) * 8 - k;
-        ui64 res = (d << shift) | (c >> k);
-        ++shift;
-        res <<= shift;
-        res |= b >> (k - 1);
-        res <<= shift;
-        res |= a >> (k - 1);
-
-        return res;
-    }
-
-    template <class TValue>
-    size_t ConsistentHashingImpl(TValue a, TValue b, TValue c, TValue d, size_t n) {
-        Y_ABORT_UNLESS(n > 0, "Can't map consistently to a zero values.");
-        // Uninteresting case
-        if (n == 1) {
-            return 0;
-        }
-        size_t k = GetValueBitCount(n - 1); // 2^(k-1) < n <= 2^k, k >= 1
-        ui64 k2 = PowerOf2(k);              // k2 = 2^k
-        size_t largeValue;
-        {
-            // Bit determined variant. Large scheme.
-            largeValue = ConsistentHashingForPowersOf2(a, b, c, k2);
-            if (largeValue < n) {
-                return largeValue;
-            }
-        }
-        // Since largeValue is not assigned yet
-        // Smooth moving from one bit scheme to another
-        ui64 k21 = PowerOf2(k - 1);
-        {
-            size_t s = GetAsteriskBits(a, b, c, d, k) % (largeValue * (largeValue + 1));
-            size_t largeValue2 = s / k2 + k21;
-            if (largeValue2 < n) {
-                return largeValue2;
-            }
-        }
-        // Bit determined variant. Short scheme.
-        return ConsistentHashingForPowersOf2(a, b, c, k21); // Do not apply checks. It is always less than k21 = 2^(k-1)
-    }
-
-}
-
-size_t ConsistentHashing(ui64 x, size_t n) {
-    ui32 lo = Lo32(x);
-    ui32 hi = Hi32(x);
-    return ConsistentHashingImpl<ui16>(Lo16(lo), Hi16(lo), Lo16(hi), Hi16(hi), n);
-}
-size_t ConsistentHashing(ui64 lo, ui64 hi, size_t n) {
-    return ConsistentHashingImpl<ui32>(Lo32(lo), Hi32(lo), Lo32(hi), Hi32(hi), n);
-}
diff --git a/library/cpp/consistent_hashing/consistent_hashing.h b/library/cpp/consistent_hashing/consistent_hashing.h
deleted file mode 100644
index 8e4d299150..0000000000
--- a/library/cpp/consistent_hashing/consistent_hashing.h
+++ /dev/null
@@ -1,16 +0,0 @@
-#pragma once
-
-#include <util/system/defaults.h>
-
-/*
- * Maps random ui64 x (in fact hash of some string) to n baskets/shards.
- * Output value is id of a basket. 0 <= ConsistentHashing(x, n) < n.
- * Probability of all baskets must be equal. Also, it should be consistent
- * in terms, that with different n_1 < n_2 probability of
- * ConsistentHashing(x, n_1) != ConsistentHashing(x, n_2) must be equal to
- * (n_2 - n_1) / n_2 - the least possible with previous conditions.
- * It requires O(1) memory and cpu to calculate. So, it is faster than classic
- * consistent hashing algos with points on circle.
- */
-size_t ConsistentHashing(ui64 x, size_t n);           // Works good for n < 65536
-size_t ConsistentHashing(ui64 lo, ui64 hi, size_t n); // Works good for n < 4294967296
diff --git a/library/cpp/consistent_hashing/ya.make b/library/cpp/consistent_hashing/ya.make
deleted file mode 100644
index b7e9e25426..0000000000
--- a/library/cpp/consistent_hashing/ya.make
+++ /dev/null
@@ -1,11 +0,0 @@
-LIBRARY(consistent-hashing)
-
-PEERDIR(
-    library/cpp/pop_count
-)
-
-SRCS(
-    consistent_hashing.cpp
-)
-
-END()
diff --git a/library/cpp/getopt/small/last_getopt_opt.h b/library/cpp/getopt/small/last_getopt_opt.h
index 5b035dbe6d..8754ebb7ee 100644
--- a/library/cpp/getopt/small/last_getopt_opt.h
+++ b/library/cpp/getopt/small/last_getopt_opt.h
@@ -670,7 +670,7 @@ namespace NLastGetopt {
 
         // Similar to store_true in Python's argparse
         TOpt& StoreTrue(bool* target) {
-            return NoArgument().StoreResult(target, true);
+            return NoArgument().SetFlag(target);
         }
 
         // Similar to store_false in Python's argparse
diff --git a/library/cpp/threading/future/core/future-inl.h b/library/cpp/threading/future/core/future-inl.h
index db58b3156c..df6b7c21b2 100644
--- a/library/cpp/threading/future/core/future-inl.h
+++ b/library/cpp/threading/future/core/future-inl.h
@@ -624,7 +624,7 @@ namespace NThreading {
     inline TFuture<TFutureType<TFutureCallResult<F, T>>> TFuture<T>::Apply(F&& func) const {
         auto promise = NewPromise<TFutureType<TFutureCallResult<F, T>>>();
         Subscribe([promise, func = std::forward<F>(func)](const TFuture<T>& future) mutable {
-            NImpl::SetValue(promise, [&]() { return func(future); });
+            NImpl::SetValue(promise, [&]() { return std::move(func)(future); });
         });
         return promise;
     }
@@ -723,7 +723,7 @@ namespace NThreading {
     inline TFuture<TFutureType<TFutureCallResult<F, void>>> TFuture<void>::Apply(F&& func) const {
         auto promise = NewPromise<TFutureType<TFutureCallResult<F, void>>>();
         Subscribe([promise, func = std::forward<F>(func)](const TFuture<void>& future) mutable {
-            NImpl::SetValue(promise, [&]() { return func(future); });
+            NImpl::SetValue(promise, [&]() { return std::move(func)(future); });
         });
         return promise;
     }
diff --git a/library/cpp/yt/small_containers/unittests/compact_flat_map_ut.cpp b/library/cpp/yt/small_containers/unittests/compact_flat_map_ut.cpp
index a946245736..c4b3508652 100644
--- a/library/cpp/yt/small_containers/unittests/compact_flat_map_ut.cpp
+++ b/library/cpp/yt/small_containers/unittests/compact_flat_map_ut.cpp
@@ -259,24 +259,24 @@ TEST(TCompactFlatMapTest, UpperBound)
 TEST(TCompactFlatMapTest, EqualRange)
 {
     TMap m;
-    EXPECT_EQ(m.equal_range("a"), std::make_pair(m.end(), m.end()));
+    EXPECT_EQ(m.equal_range("a"), std::pair(m.end(), m.end()));
 
     m.emplace("b", "value-b");
-    EXPECT_EQ(m.equal_range("a"), std::make_pair(m.begin(), m.begin()));
-    EXPECT_EQ(m.equal_range("b"), std::make_pair(m.begin(), m.end()));
-    EXPECT_EQ(m.equal_range("c"), std::make_pair(m.end(), m.end()));
+    EXPECT_EQ(m.equal_range("a"), std::pair(m.begin(), m.begin()));
+    EXPECT_EQ(m.equal_range("b"), std::pair(m.begin(), m.end()));
+    EXPECT_EQ(m.equal_range("c"), std::pair(m.end(), m.end()));
 
     m.emplace("c", "value-c");
     m.emplace("d", "value-d");
 
     auto it = m.begin();
-    EXPECT_EQ(m.equal_range("a"), std::make_pair(it, it));
-    EXPECT_EQ(m.equal_range("b"), std::make_pair(it, std::next(it)));
+    EXPECT_EQ(m.equal_range("a"), std::pair(it, it));
+    EXPECT_EQ(m.equal_range("b"), std::pair(it, std::next(it)));
     ++it;
-    EXPECT_EQ(m.equal_range("c"), std::make_pair(it, std::next(it)));
+    EXPECT_EQ(m.equal_range("c"), std::pair(it, std::next(it)));
     ++it;
-    EXPECT_EQ(m.equal_range("d"), std::make_pair(it, std::next(it)));
-    EXPECT_EQ(m.equal_range("e"), std::make_pair(m.end(), m.end()));
+    EXPECT_EQ(m.equal_range("d"), std::pair(it, std::next(it)));
+    EXPECT_EQ(m.equal_range("e"), std::pair(m.end(), m.end()));
 }
 
 ////////////////////////////////////////////////////////////////////////////////