diff options
author | Maxim Yurchuk <maxim-yurchuk@ydb.tech> | 2024-11-20 17:37:57 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-11-20 17:37:57 +0000 |
commit | f76323e9b295c15751e51e3443aa47a36bee8023 (patch) | |
tree | 4113c8cad473a33e0f746966e0cf087252fa1d7a /contrib/libs/apache | |
parent | 753ecb8d410a4cb459c26f3a0082fb2d1724fe63 (diff) | |
parent | a7b9a6afea2a9d7a7bfac4c5eb4c1a8e60adb9e6 (diff) | |
download | ydb-f76323e9b295c15751e51e3443aa47a36bee8023.tar.gz |
Merge pull request #11788 from ydb-platform/mergelibs-241120-1113
Library import 241120-1113
Diffstat (limited to 'contrib/libs/apache')
-rw-r--r-- | contrib/libs/apache/arrow/cpp/src/arrow/python/ya.make | 4 | ||||
-rw-r--r-- | contrib/libs/apache/arrow/cpp/src/arrow/result.h | 4 | ||||
-rw-r--r-- | contrib/libs/apache/arrow/cpp/src/arrow/util/bitmap_generate.h | 2 | ||||
-rw-r--r-- | contrib/libs/apache/arrow/cpp/src/arrow/util/functional.h | 2 | ||||
-rw-r--r-- | contrib/libs/apache/arrow/cpp/src/arrow/util/future.h | 11 | ||||
-rw-r--r-- | contrib/libs/apache/arrow/patches/no_result_of.patch | 64 | ||||
-rw-r--r-- | contrib/libs/apache/arrow/ya.make | 2 | ||||
-rw-r--r-- | contrib/libs/apache/orc/README.md | 2 | ||||
-rw-r--r-- | contrib/libs/apache/orc/c++/include/orc/orc-config.hh | 2 | ||||
-rw-r--r-- | contrib/libs/apache/orc/c++/src/sargs/PredicateLeaf.cc | 3 | ||||
-rw-r--r-- | contrib/libs/apache/orc/ya.make | 4 |
11 files changed, 88 insertions, 12 deletions
diff --git a/contrib/libs/apache/arrow/cpp/src/arrow/python/ya.make b/contrib/libs/apache/arrow/cpp/src/arrow/python/ya.make index 6c0a186f88..689ff96961 100644 --- a/contrib/libs/apache/arrow/cpp/src/arrow/python/ya.make +++ b/contrib/libs/apache/arrow/cpp/src/arrow/python/ya.make @@ -2,12 +2,12 @@ PY3_LIBRARY() -VERSION(5.0.0) - LICENSE(Apache-2.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) +VERSION(5.0.0) + PEERDIR( contrib/libs/apache/arrow contrib/libs/python diff --git a/contrib/libs/apache/arrow/cpp/src/arrow/result.h b/contrib/libs/apache/arrow/cpp/src/arrow/result.h index cb7437cd24..af4a72f65e 100644 --- a/contrib/libs/apache/arrow/cpp/src/arrow/result.h +++ b/contrib/libs/apache/arrow/cpp/src/arrow/result.h @@ -385,7 +385,7 @@ class ARROW_MUST_USE_TYPE Result : public util::EqualityComparable<Result<T>> { /// Apply a function to the internally stored value to produce a new result or propagate /// the stored error. template <typename M> - typename EnsureResult<typename std::result_of<M && (T)>::type>::type Map(M&& m) && { + typename EnsureResult<decltype(std::declval<M&&>()(std::declval<T&&>()))>::type Map(M&& m) && { if (!ok()) { return status(); } @@ -395,7 +395,7 @@ class ARROW_MUST_USE_TYPE Result : public util::EqualityComparable<Result<T>> { /// Apply a function to the internally stored value to produce a new result or propagate /// the stored error. template <typename M> - typename EnsureResult<typename std::result_of<M && (const T&)>::type>::type Map( + typename EnsureResult<decltype(std::declval<M&&>()(std::declval<const T&>()))>::type Map( M&& m) const& { if (!ok()) { return status(); diff --git a/contrib/libs/apache/arrow/cpp/src/arrow/util/bitmap_generate.h b/contrib/libs/apache/arrow/cpp/src/arrow/util/bitmap_generate.h index 129fa91323..6b900f246f 100644 --- a/contrib/libs/apache/arrow/cpp/src/arrow/util/bitmap_generate.h +++ b/contrib/libs/apache/arrow/cpp/src/arrow/util/bitmap_generate.h @@ -62,7 +62,7 @@ void GenerateBits(uint8_t* bitmap, int64_t start_offset, int64_t length, Generat template <class Generator> void GenerateBitsUnrolled(uint8_t* bitmap, int64_t start_offset, int64_t length, Generator&& g) { - static_assert(std::is_same<typename std::result_of<Generator && ()>::type, bool>::value, + static_assert(std::is_same<decltype(std::declval<Generator>()()), bool>::value, "Functor passed to GenerateBitsUnrolled must return bool"); if (length == 0) { diff --git a/contrib/libs/apache/arrow/cpp/src/arrow/util/functional.h b/contrib/libs/apache/arrow/cpp/src/arrow/util/functional.h index 9da79046fe..41e268852f 100644 --- a/contrib/libs/apache/arrow/cpp/src/arrow/util/functional.h +++ b/contrib/libs/apache/arrow/cpp/src/arrow/util/functional.h @@ -129,7 +129,7 @@ class FnOnce<R(A...)> { template <typename Fn, typename = typename std::enable_if<std::is_convertible< - typename std::result_of<Fn && (A...)>::type, R>::value>::type> + decltype(std::declval<Fn&&>()(std::declval<A>()...)), R>::value>::type> FnOnce(Fn fn) : impl_(new FnImpl<Fn>(std::move(fn))) { // NOLINT runtime/explicit } diff --git a/contrib/libs/apache/arrow/cpp/src/arrow/util/future.h b/contrib/libs/apache/arrow/cpp/src/arrow/util/future.h index d9e0a939f2..2b8c522096 100644 --- a/contrib/libs/apache/arrow/cpp/src/arrow/util/future.h +++ b/contrib/libs/apache/arrow/cpp/src/arrow/util/future.h @@ -47,8 +47,17 @@ struct is_future : std::false_type {}; template <typename T> struct is_future<Future<T>> : std::true_type {}; +template <typename Signature, typename Enable = void> +struct result_of; + +template <typename Fn, typename... A> +struct result_of<Fn(A...), + std::void_t<decltype(std::declval<Fn>()(std::declval<A>()...))>> { + using type = decltype(std::declval<Fn>()(std::declval<A>()...)); +}; + template <typename Signature> -using result_of_t = typename std::result_of<Signature>::type; +using result_of_t = typename result_of<Signature>::type; // Helper to find the synchronous counterpart for a Future template <typename T> diff --git a/contrib/libs/apache/arrow/patches/no_result_of.patch b/contrib/libs/apache/arrow/patches/no_result_of.patch new file mode 100644 index 0000000000..e75e1109e8 --- /dev/null +++ b/contrib/libs/apache/arrow/patches/no_result_of.patch @@ -0,0 +1,64 @@ +--- contrib/libs/apache/arrow/cpp/src/arrow/result.h (2e0006a95f0ad665eca5b48386842a8a0354061f) ++++ contrib/libs/apache/arrow/cpp/src/arrow/result.h (working tree) +@@ -385,7 +385,7 @@ class ARROW_MUST_USE_TYPE Result : public util::EqualityComparable<Result<T>> { + /// Apply a function to the internally stored value to produce a new result or propagate + /// the stored error. + template <typename M> +- typename EnsureResult<typename std::result_of<M && (T)>::type>::type Map(M&& m) && { ++ typename EnsureResult<decltype(std::declval<M&&>()(std::declval<T&&>()))>::type Map(M&& m) && { + if (!ok()) { + return status(); + } +@@ -395,7 +395,7 @@ class ARROW_MUST_USE_TYPE Result : public util::EqualityComparable<Result<T>> { + /// Apply a function to the internally stored value to produce a new result or propagate + /// the stored error. + template <typename M> +- typename EnsureResult<typename std::result_of<M && (const T&)>::type>::type Map( ++ typename EnsureResult<decltype(std::declval<M&&>()(std::declval<const T&>()))>::type Map( + M&& m) const& { + if (!ok()) { + return status(); +--- contrib/libs/apache/arrow/cpp/src/arrow/util/bitmap_generate.h (2e0006a95f0ad665eca5b48386842a8a0354061f) ++++ contrib/libs/apache/arrow/cpp/src/arrow/util/bitmap_generate.h (working tree) +@@ -62,7 +62,7 @@ void GenerateBits(uint8_t* bitmap, int64_t start_offset, int64_t length, Generat + template <class Generator> + void GenerateBitsUnrolled(uint8_t* bitmap, int64_t start_offset, int64_t length, + Generator&& g) { +- static_assert(std::is_same<typename std::result_of<Generator && ()>::type, bool>::value, ++ static_assert(std::is_same<decltype(std::declval<Generator>()()), bool>::value, + "Functor passed to GenerateBitsUnrolled must return bool"); + + if (length == 0) { +--- contrib/libs/apache/arrow/cpp/src/arrow/util/functional.h (2e0006a95f0ad665eca5b48386842a8a0354061f) ++++ contrib/libs/apache/arrow/cpp/src/arrow/util/functional.h (working tree) +@@ -129,7 +129,7 @@ class FnOnce<R(A...)> { + + template <typename Fn, + typename = typename std::enable_if<std::is_convertible< +- typename std::result_of<Fn && (A...)>::type, R>::value>::type> ++ decltype(std::declval<Fn&&>()(std::declval<A>()...)), R>::value>::type> + FnOnce(Fn fn) : impl_(new FnImpl<Fn>(std::move(fn))) { // NOLINT runtime/explicit + } + +--- contrib/libs/apache/arrow/cpp/src/arrow/util/future.h (2e0006a95f0ad665eca5b48386842a8a0354061f) ++++ contrib/libs/apache/arrow/cpp/src/arrow/util/future.h (working tree) +@@ -47,8 +47,17 @@ struct is_future : std::false_type {}; + template <typename T> + struct is_future<Future<T>> : std::true_type {}; + ++template <typename Signature, typename Enable = void> ++struct result_of; ++ ++template <typename Fn, typename... A> ++struct result_of<Fn(A...), ++ std::void_t<decltype(std::declval<Fn>()(std::declval<A>()...))>> { ++ using type = decltype(std::declval<Fn>()(std::declval<A>()...)); ++}; ++ + template <typename Signature> +-using result_of_t = typename std::result_of<Signature>::type; ++using result_of_t = typename result_of<Signature>::type; + + // Helper to find the synchronous counterpart for a Future + template <typename T> + diff --git a/contrib/libs/apache/arrow/ya.make b/contrib/libs/apache/arrow/ya.make index 1eedb9f95d..f4ed4463d1 100644 --- a/contrib/libs/apache/arrow/ya.make +++ b/contrib/libs/apache/arrow/ya.make @@ -1,4 +1,4 @@ -# Generated by devtools/yamaker from nixpkgs 24.05. +# Generated by devtools/yamaker from nixpkgs 23.05. LIBRARY() diff --git a/contrib/libs/apache/orc/README.md b/contrib/libs/apache/orc/README.md index 60b0da5fcb..cf5c5d0793 100644 --- a/contrib/libs/apache/orc/README.md +++ b/contrib/libs/apache/orc/README.md @@ -43,7 +43,7 @@ The subdirectories are: ### Building * Install java 17 or higher -* Install maven 3.9.6 or higher +* Install maven 3.9.9 or higher * Install cmake 3.12 or higher To build a release version with debug information: diff --git a/contrib/libs/apache/orc/c++/include/orc/orc-config.hh b/contrib/libs/apache/orc/c++/include/orc/orc-config.hh index 6d6ae91a34..5205a56af6 100644 --- a/contrib/libs/apache/orc/c++/include/orc/orc-config.hh +++ b/contrib/libs/apache/orc/c++/include/orc/orc-config.hh @@ -19,7 +19,7 @@ #ifndef ORC_CONFIG_HH #define ORC_CONFIG_HH -#define ORC_VERSION "2.0.2" +#define ORC_VERSION "2.0.3" #define ORC_CXX_HAS_CSTDINT diff --git a/contrib/libs/apache/orc/c++/src/sargs/PredicateLeaf.cc b/contrib/libs/apache/orc/c++/src/sargs/PredicateLeaf.cc index dda89f7c3b..3c23e28beb 100644 --- a/contrib/libs/apache/orc/c++/src/sargs/PredicateLeaf.cc +++ b/contrib/libs/apache/orc/c++/src/sargs/PredicateLeaf.cc @@ -701,6 +701,9 @@ namespace orc { } } + // files written by trino may lack of hasnull field. + if (!colStats.has_has_null()) return TruthValue::YES_NO_NULL; + bool allNull = colStats.has_null() && colStats.number_of_values() == 0; if (mOperator == Operator::IS_NULL || ((mOperator == Operator::EQUALS || mOperator == Operator::NULL_SAFE_EQUALS) && diff --git a/contrib/libs/apache/orc/ya.make b/contrib/libs/apache/orc/ya.make index 3484882d72..12617d59ab 100644 --- a/contrib/libs/apache/orc/ya.make +++ b/contrib/libs/apache/orc/ya.make @@ -6,9 +6,9 @@ LICENSE(Apache-2.0) LICENSE_TEXTS(.yandex_meta/licenses.list.txt) -VERSION(2.0.2) +VERSION(2.0.3) -ORIGINAL_SOURCE(https://github.com/apache/orc/archive/rel/release-2.0.2.tar.gz) +ORIGINAL_SOURCE(https://github.com/apache/orc/archive/rel/release-2.0.3.tar.gz) PEERDIR( contrib/libs/apache/orc-format |