From 91e9b44b7492cd9106e748070dfc9e3ad57c0181 Mon Sep 17 00:00:00 2001 From: robot-piglet Date: Fri, 21 Nov 2025 12:53:40 +0300 Subject: [PATCH 01/16] Intermediate changes commit_hash:7c46473c65e9345d84bcc6cc1fcc90efb7e1a006 --- yql/essentials/cfg/tests/gateways-experimental.conf | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/yql/essentials/cfg/tests/gateways-experimental.conf b/yql/essentials/cfg/tests/gateways-experimental.conf index ef5235a59dcc..033806e6929b 100644 --- a/yql/essentials/cfg/tests/gateways-experimental.conf +++ b/yql/essentials/cfg/tests/gateways-experimental.conf @@ -112,6 +112,12 @@ Dq { } } +SqlCore { + TranslationFlags: [ + "DisableDirectRowDependsOn" + ] +} + YqlCore { Flags { Name: "OptimizerFlags" @@ -128,4 +134,7 @@ YqlCore { Flags { Name: "UseUrlListerForFolder" } + Flags { + Name: "NormalizeDependsOn" + } } From bb55dd3fa41ccd541aa86a07750719275b617ae8 Mon Sep 17 00:00:00 2001 From: dimdim11 Date: Fri, 21 Nov 2025 13:59:02 +0300 Subject: [PATCH 02/16] Remove compile depends to codegens with special output folders commit_hash:4ead73401b43578b30e48dd0991f4a9079f89d19 --- build/export_generators/ide-gradle/codegen.jinja | 2 +- build/export_generators/ide-gradle/codegen_current_target.jinja | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/build/export_generators/ide-gradle/codegen.jinja b/build/export_generators/ide-gradle/codegen.jinja index cba896274cc4..9357e46e0ba2 100644 --- a/build/export_generators/ide-gradle/codegen.jinja +++ b/build/export_generators/ide-gradle/codegen.jinja @@ -58,7 +58,7 @@ tasks.withType().configureEach { tasks.named("{{ parent_taskvar }}").configure { dependsOn({{ taskvar }}) } -{%- else -%} +{%- elif not obj['_object_index'] in current_target_object_indexes_with_codegen_dirs -%} {{ TopDepends(taskvar) }} {%- endif -%} {%- endmacro -%} diff --git a/build/export_generators/ide-gradle/codegen_current_target.jinja b/build/export_generators/ide-gradle/codegen_current_target.jinja index fd59527ffa6c..ab6756e1489e 100644 --- a/build/export_generators/ide-gradle/codegen_current_target.jinja +++ b/build/export_generators/ide-gradle/codegen_current_target.jinja @@ -12,6 +12,7 @@ {%- endif -%} {#- Here in current_target_object_indexes all codegens with special output dirs -#} +{%- set current_target_object_indexes_with_codegen_dirs = current_target_object_indexes -%} {#- Select only some runs with parents (depend runs) -#} {%- set some_runs_with_parents = some_runs|selectattr('_parent_object_index', 'in', current_target_object_indexes) -%} From b95db1bbf58c51f3f744c6123b6bed27a6e48cea Mon Sep 17 00:00:00 2001 From: robot-piglet Date: Fri, 21 Nov 2025 14:01:44 +0300 Subject: [PATCH 03/16] Intermediate changes commit_hash:634a6e7050be0ef5d6b113e6167d1213044c9524 --- contrib/libs/cxxsupp/libcxxcuda11/ya.make | 2 ++ contrib/libs/cxxsupp/libcxxmsvc/ya.make | 2 ++ contrib/libs/cxxsupp/ya.make | 17 ++++++++++++++--- 3 files changed, 18 insertions(+), 3 deletions(-) diff --git a/contrib/libs/cxxsupp/libcxxcuda11/ya.make b/contrib/libs/cxxsupp/libcxxcuda11/ya.make index 7430ee6b7e74..ea321b10dc50 100644 --- a/contrib/libs/cxxsupp/libcxxcuda11/ya.make +++ b/contrib/libs/cxxsupp/libcxxcuda11/ya.make @@ -18,6 +18,8 @@ VERSION(2023-10-05) ORIGINAL_SOURCE(https://github.com/llvm/llvm-project/archive/dc129d6f715cf83a2072fc8de8b4e4c70bca6935.tar.gz) +SUBSCRIBER(g:cpp-contrib) + ADDINCL( GLOBAL contrib/libs/cxxsupp/libcxxcuda11/include contrib/libs/cxxsupp/libcxxcuda11/src diff --git a/contrib/libs/cxxsupp/libcxxmsvc/ya.make b/contrib/libs/cxxsupp/libcxxmsvc/ya.make index ea8eefb5cc54..0466697ae966 100644 --- a/contrib/libs/cxxsupp/libcxxmsvc/ya.make +++ b/contrib/libs/cxxsupp/libcxxmsvc/ya.make @@ -20,6 +20,8 @@ VERSION(2022-02-18) ORIGINAL_SOURCE(https://github.com/llvm/llvm-project/archive/34313583331e5c8cb0d3df28efb6c34c428fd235.tar.gz) +SUBSCRIBER(g:cpp-contrib) + ADDINCL( GLOBAL contrib/libs/cxxsupp/libcxxmsvc/include contrib/libs/cxxsupp/libcxxmsvc/src diff --git a/contrib/libs/cxxsupp/ya.make b/contrib/libs/cxxsupp/ya.make index 17c7e592e366..e293cbe79859 100644 --- a/contrib/libs/cxxsupp/ya.make +++ b/contrib/libs/cxxsupp/ya.make @@ -31,11 +31,22 @@ ENDIF() END() IF (NOT USE_STL_SYSTEM) + IF (MSVC AND NOT CLANG_CL) + RECURSE( + libcxxmsvc + ) + ELSEIF (NVCC_STD_VER == "17" OR CUDA11) + RECURSE( + libcxxcuda11 + ) + ELSE() + RECURSE( + libcxx + ) + ENDIF() + RECURSE( - libcxx libcxxabi - libcxxcuda11 - libcxxmsvc libcxxrt openmp ) From 7294312e4392dddd2e157dedcf5a71f971553862 Mon Sep 17 00:00:00 2001 From: vitya-smirnov Date: Fri, 21 Nov 2025 14:01:51 +0300 Subject: [PATCH 04/16] YQL-20086: Add yql/essentials Clang Tidy config This patch introduces an extension configuration for the Clang Tidy. It is merged with Arcadia Clang Tidy configuration. To begin with, more checks for identifiers naming are added. Documentation: https://nda.ya.ru/t/AhbDZbiF7MKe3M. commit_hash:3481da4c8df0a4d23a991d4a660ae050d2dc5d33 --- yql/essentials/.clang-tidy | 11 + yql/essentials/ast/yql_ast_escaping.cpp | 4 +- yql/essentials/ast/yql_expr.cpp | 4 +- yql/essentials/ast/yql_type_string.cpp | 6 +- .../core/cbo/cbo_interesting_orderings.cpp | 24 +-- .../core/cbo/cbo_interesting_orderings.h | 25 +-- yql/essentials/core/cbo/cbo_optimizer_new.cpp | 4 +- yql/essentials/core/cbo/cbo_optimizer_new.h | 15 +- .../core/common_opt/yql_co_finalizers.cpp | 12 +- .../core/common_opt/yql_co_flow2.cpp | 46 ++-- .../core/common_opt/yql_co_simple1.cpp | 36 ++-- .../core/common_opt/yql_co_simple2.cpp | 8 +- .../core/common_opt/yql_flatmap_over_join.cpp | 30 +-- .../extract_predicate_impl.cpp | 6 +- yql/essentials/core/facade/yql_facade.cpp | 10 +- .../core/file_storage/defs/downloader.h | 4 +- .../core/file_storage/file_storage.h | 3 +- .../core/file_storage/sized_cache.h | 3 +- .../core/services/yql_eval_expr.cpp | 4 +- .../core/type_ann/type_ann_core.cpp | 12 +- .../core/type_ann/type_ann_list.cpp | 8 +- .../interface/url_preprocessing.h | 2 +- yql/essentials/core/yql_execution.cpp | 8 +- yql/essentials/core/yql_expr_constraint.cpp | 4 +- yql/essentials/core/yql_join.cpp | 4 +- .../core/yql_opt_match_recognize.cpp | 4 +- yql/essentials/core/yql_opt_utils.cpp | 8 +- yql/essentials/core/yql_opt_window.cpp | 6 +- yql/essentials/core/yql_statistics.h | 3 +- yql/essentials/minikql/arrow/arrow_util.cpp | 4 +- yql/essentials/minikql/arrow/arrow_util.h | 4 +- yql/essentials/minikql/arrow/mkql_bit_utils.h | 4 +- .../minikql/benchmark/pack_num/pack.cpp | 8 +- .../minikql/comp_nodes/mkql_udf.cpp | 4 +- .../minikql/comp_nodes/ut/mkql_udf_ut.cpp | 8 +- .../computation/mkql_block_transport.cpp | 4 +- .../computation/mkql_computation_node_list.h | 54 ++--- .../mkql_computation_node_pack.cpp | 4 +- .../mkql_computation_pattern_cache.cpp | 2 +- .../mkql_computation_pattern_cache.h | 19 +- .../mkql_computation_pattern_cache_ut.cpp | 6 +- .../minikql/computation/mkql_spiller.h | 3 +- .../minikql/computation/mkql_validate_ut.cpp | 156 +++++++------- yql/essentials/minikql/datetime/datetime.cpp | 7 +- yql/essentials/minikql/datetime/datetime.h | 7 +- yql/essentials/minikql/datetime/datetime64.h | 7 +- .../minikql/jsonpath/benchmark/main.cpp | 6 +- yql/essentials/minikql/mkql_alloc.h | 6 +- .../minikql/mkql_function_registry.cpp | 10 +- yql/essentials/minikql/mkql_mem_info.cpp | 4 +- .../minikql/mkql_stats_registry_ut.cpp | 50 ++--- .../providers/common/codec/yql_codec_buf.h | 6 +- .../providers/common/codec/yql_json_codec.h | 4 +- .../common/metrics/metrics_registry.cpp | 10 +- .../providers/common/metrics/sensors_group.h | 4 +- .../common/provider/yql_provider.cpp | 16 +- .../udf_resolve/yql_outproc_udf_resolver.cpp | 4 +- yql/essentials/public/decimal/yql_decimal.cpp | 4 +- .../public/purecalc/common/logger_init.cpp | 2 +- .../purecalc/io_specs/arrow/ut/test_spec.cpp | 4 +- .../purecalc/io_specs/protobuf_raw/spec.cpp | 4 +- yql/essentials/public/udf/udf_helpers.h | 4 +- yql/essentials/public/udf/udf_ptr.h | 9 +- yql/essentials/public/udf/udf_value_inl.h | 4 +- yql/essentials/sql/pg/pg_sql.cpp | 6 +- .../sql/settings/translation_settings.h | 2 +- yql/essentials/sql/v0/builtin.cpp | 4 +- yql/essentials/sql/v0/context.h | 5 +- yql/essentials/sql/v0/join.cpp | 4 +- yql/essentials/sql/v0/node.cpp | 10 +- yql/essentials/sql/v0/node.h | 4 +- yql/essentials/sql/v0/select.cpp | 12 +- yql/essentials/sql/v0/sql.cpp | 8 +- yql/essentials/sql/v0/sql_ut.cpp | 16 +- yql/essentials/sql/v1/builtin.cpp | 4 +- .../v1/complete/analysis/global/evaluate.cpp | 4 +- yql/essentials/sql/v1/context.cpp | 10 +- .../sql/v1/highlight/sql_highlight.cpp | 36 ++-- yql/essentials/sql/v1/join.cpp | 4 +- yql/essentials/sql/v1/lexer/lexer_ut.cpp | 14 +- yql/essentials/sql/v1/node.cpp | 8 +- yql/essentials/sql/v1/node.h | 4 +- yql/essentials/sql/v1/select.cpp | 18 +- yql/essentials/sql/v1/source.h | 5 +- yql/essentials/sql/v1/sql_into_tables.cpp | 6 +- yql/essentials/sql/v1/sql_query.cpp | 8 +- yql/essentials/sql/v1/sql_select.cpp | 2 +- yql/essentials/sql/v1/sql_translation.cpp | 22 +- yql/essentials/sql/v1/sql_translation.h | 2 +- yql/essentials/sql/v1/sql_ut_common.h | 12 +- yql/essentials/tools/pgrun/pgrun.cpp | 100 ++++----- .../tools/yql_facade_run/yql_facade_run.cpp | 4 +- .../yql_highlight/generator_textmate.cpp | 8 +- .../udfs/common/datetime2/datetime_udf.cpp | 196 +++++++++--------- .../udfs/common/digest/digest_udf.cpp | 46 ++-- yql/essentials/udfs/common/file/file_udf.cpp | 34 ++- .../udfs/common/histogram/histogram_udf.cpp | 48 ++--- .../common/hyperloglog/hyperloglog_udf.cpp | 24 +-- .../udfs/common/hyperscan/hyperscan_udf.cpp | 32 +-- .../udfs/common/json2/compile_path.h | 4 +- yql/essentials/udfs/common/json2/parse.h | 4 +- yql/essentials/udfs/common/json2/serialize.h | 9 +- yql/essentials/udfs/common/json2/sql_value.h | 14 +- .../udfs/common/math/lib/erfinv.cpp | 18 +- yql/essentials/udfs/common/pire/pire_udf.cpp | 20 +- .../common/python/bindings/py_callable.cpp | 5 +- .../python/bindings/py_lazy_mkql_dict.cpp | 2 +- .../udfs/common/python/bindings/py_ptr.h | 2 +- .../udfs/common/python/bindings/py_utils.cpp | 14 +- yql/essentials/udfs/common/re2/re2_udf.cpp | 36 ++-- .../udfs/common/streaming/streaming_udf.cpp | 32 +-- .../udfs/common/url_base/lib/url_base_udf.h | 4 +- .../udfs/common/url_base/lib/url_parse.h | 4 +- .../udfs/common/url_base/lib/url_query.h | 12 +- .../udfs/common/yson2/yson2_udf.cpp | 24 +-- .../udfs/examples/callables/callables_udf.cpp | 20 +- .../udfs/examples/dicts/dicts_udf.cpp | 4 +- .../udfs/examples/linear/linear_udf.cpp | 4 +- .../udfs/examples/lists/lists_udf.cpp | 8 +- .../udfs/examples/tagged/tagged_udf.cpp | 4 +- .../type_inspection/type_inspection_udf.cpp | 12 +- .../udfs/test/simple/simple_udf.cpp | 8 +- yql/essentials/utils/docs/page.cpp | 20 +- .../failure_injector/failure_injector_ut.cpp | 2 +- yql/essentials/utils/fetch/fetch.cpp | 4 +- yql/essentials/utils/fetch/fetch.h | 3 +- yql/essentials/utils/log/log.cpp | 10 +- yql/essentials/utils/log/log.h | 14 +- yql/essentials/utils/log/log_component.h | 14 +- yql/essentials/utils/log/log_level.h | 14 +- yql/essentials/utils/log/ut/log_parser.cpp | 12 +- yql/essentials/utils/signals/signals.cpp | 4 +- yql/essentials/utils/signals/utils.h | 6 +- yql/essentials/utils/utf8.cpp | 4 +- yt/yql/providers/yt/lib/log/yt_logger.cpp | 4 +- .../providers/yt/provider/yql_yt_join_impl.h | 2 +- 136 files changed, 974 insertions(+), 891 deletions(-) create mode 100644 yql/essentials/.clang-tidy diff --git a/yql/essentials/.clang-tidy b/yql/essentials/.clang-tidy new file mode 100644 index 000000000000..739b0808a2f5 --- /dev/null +++ b/yql/essentials/.clang-tidy @@ -0,0 +1,11 @@ +Checks: > + -*, +CheckOptions: + - key: readability-identifier-naming.StructPrefix + value: T + - key: readability-identifier-naming.EnumPrefix + value: E + - key: readability-identifier-naming.NamespacePrefix + value: N + - key: readability-identifier-naming.StaticVariableCase + value: CamelCase diff --git a/yql/essentials/ast/yql_ast_escaping.cpp b/yql/essentials/ast/yql_ast_escaping.cpp index 8b0117394bad..4b6dcdfce6f5 100644 --- a/yql/essentials/ast/yql_ast_escaping.cpp +++ b/yql/essentials/ast/yql_ast_escaping.cpp @@ -56,13 +56,13 @@ static void EscapedPrintChar(ui8 c, IOutputStream* out) static void EscapedPrintUnicode(wchar32 rune, IOutputStream* out) { - static const int MAX_ESCAPE_LEN = 10; + static const int MaxEscapeLen = 10; if (rune < 0x80) { EscapedPrintChar(static_cast(rune & 0xff), out); } else { int i = 0; - char buf[MAX_ESCAPE_LEN]; + char buf[MaxEscapeLen]; if (rune < 0x10000) { buf[i++] = '\\'; diff --git a/yql/essentials/ast/yql_expr.cpp b/yql/essentials/ast/yql_expr.cpp index 135f07635662..998b6dc50d63 100644 --- a/yql/essentials/ast/yql_expr.cpp +++ b/yql/essentials/ast/yql_expr.cpp @@ -1747,8 +1747,8 @@ struct TVisitNodeContext { } } - static const TString stub; - return stub; + static const TString Stub; + return Stub; } size_t FindCommonAncestor(size_t one, size_t two) const { diff --git a/yql/essentials/ast/yql_type_string.cpp b/yql/essentials/ast/yql_type_string.cpp index 58164523f0da..296a2db89d9d 100644 --- a/yql/essentials/ast/yql_type_string.cpp +++ b/yql/essentials/ast/yql_type_string.cpp @@ -107,7 +107,7 @@ bool IsTypeKeyword(int token) EToken TokenTypeFromStr(TStringBuf str) { - static const THashMap map = { + static const THashMap Map = { {TStringBuf("String"), TOKEN_STRING}, {TStringBuf("Bool"), TOKEN_BOOL}, {TStringBuf("Int32"), TOKEN_INT32}, @@ -168,8 +168,8 @@ EToken TokenTypeFromStr(TStringBuf str) {TStringBuf("DynamicLinear"), TOKEN_DYNAMICLINEAR}, }; - auto it = map.find(str); - if (it != map.end()) { + auto it = Map.find(str); + if (it != Map.end()) { return it->second; } diff --git a/yql/essentials/core/cbo/cbo_interesting_orderings.cpp b/yql/essentials/core/cbo/cbo_interesting_orderings.cpp index f898924d55cb..c9d8feb572f1 100644 --- a/yql/essentials/core/cbo/cbo_interesting_orderings.cpp +++ b/yql/essentials/core/cbo/cbo_interesting_orderings.cpp @@ -661,7 +661,7 @@ i64 TOrderingsStateMachine::TLogicalOrderings::GetState() const { return State_; } -bool TOrderingsStateMachine::TLogicalOrderings::IsSubset(const std::bitset& lhs, const std::bitset& rhs) { +bool TOrderingsStateMachine::TLogicalOrderings::IsSubset(const std::bitset& lhs, const std::bitset& rhs) { return (lhs & rhs) == lhs; } @@ -779,7 +779,7 @@ TString TOrderingsStateMachine::TNFSM::TEdge::ToString() const { TStringBuilder ss; ss << "Edge{src=" << SrcNodeIdx << ", dst=" << DstNodeIdx - << ", fdIdx=" << (FdIdx == EPSILON ? "EPSILON" : std::to_string(FdIdx)) + << ", fdIdx=" << (FdIdx == Epsilon ? "EPSILON" : std::to_string(FdIdx)) << "}"; return ss; } @@ -859,7 +859,7 @@ void TOrderingsStateMachine::TNFSM::PrefixClosure() { if (k == iItems.size()) { if (Nodes_[i].Ordering.Type == TOrdering::EShuffle) { - AddEdge(i, j, TNFSM::TEdge::EPSILON); + AddEdge(i, j, TNFSM::TEdge::Epsilon); } Y_ENSURE(Nodes_[i].Ordering.Directions.size() <= Nodes_[j].Ordering.Directions.size()); @@ -868,7 +868,7 @@ void TOrderingsStateMachine::TNFSM::PrefixClosure() { Nodes_[i].Ordering.Directions.end(), Nodes_[j].Ordering.Directions.begin()); if (Nodes_[i].Ordering.Type == TOrdering::ESorting && areDirsCompatable) { - AddEdge(j, i, TNFSM::TEdge::EPSILON); + AddEdge(j, i, TNFSM::TEdge::Epsilon); } } } @@ -889,8 +889,8 @@ void TOrderingsStateMachine::TNFSM::ApplyFDs( ->Items.size(); } - for (std::size_t nodeIdx = 0; nodeIdx < Nodes_.size() && Nodes_.size() < EMaxNFSMStates; ++nodeIdx) { - for (std::size_t fdIdx = 0; fdIdx < fds.size() && Nodes_.size() < EMaxNFSMStates; ++fdIdx) { + for (std::size_t nodeIdx = 0; nodeIdx < Nodes_.size() && Nodes_.size() < MaxNFSMStates; ++nodeIdx) { + for (std::size_t fdIdx = 0; fdIdx < fds.size() && Nodes_.size() < MaxNFSMStates; ++fdIdx) { if (Nodes_[nodeIdx].Ordering.Items.empty()) { continue; } @@ -898,7 +898,7 @@ void TOrderingsStateMachine::TNFSM::ApplyFDs( TFunctionalDependency fd = fds[fdIdx]; auto applyFD = [this, &itemInfo, nodeIdx, maxInterestingOrderingSize](const TFunctionalDependency& fd, std::size_t fdIdx) { - if (Nodes_.size() >= EMaxNFSMStates) { + if (Nodes_.size() >= MaxNFSMStates) { return; } @@ -970,7 +970,7 @@ void TOrderingsStateMachine::TNFSM::ApplyFDs( } if (fd.IsImplication() || fd.IsEquivalence()) { - for (std::size_t i = antecedentItemIdx + fd.AntecedentItems.size(); i <= Nodes_[nodeIdx].Ordering.Items.size() && Nodes_.size() < EMaxNFSMStates; ++i) { + for (std::size_t i = antecedentItemIdx + fd.AntecedentItems.size(); i <= Nodes_[nodeIdx].Ordering.Items.size() && Nodes_.size() < MaxNFSMStates; ++i) { std::vector newOrdering = Nodes_[nodeIdx].Ordering.Items; newOrdering.insert(newOrdering.begin() + i, fd.ConsequentItem); @@ -1074,7 +1074,7 @@ void TOrderingsStateMachine::TDFSM::Build( } } - for (std::size_t nodeIdx = 0; nodeIdx < Nodes_.size() && Nodes_.size() < EMaxDFSMStates; ++nodeIdx) { + for (std::size_t nodeIdx = 0; nodeIdx < Nodes_.size() && Nodes_.size() < MaxDFSMStates; ++nodeIdx) { std::unordered_set outgoingDFSMNodeFDs; for (std::size_t nfsmNodeIdx : Nodes_[nodeIdx].NFSMNodes) { for (std::size_t nfsmEdgeIdx : nfsm.Nodes_[nfsmNodeIdx].OutgoingEdges) { @@ -1083,7 +1083,7 @@ void TOrderingsStateMachine::TDFSM::Build( } for (i64 fdIdx : outgoingDFSMNodeFDs) { - if (fdIdx == TNFSM::TEdge::EPSILON) { + if (fdIdx == TNFSM::TEdge::Epsilon) { continue; } @@ -1132,7 +1132,7 @@ std::vector TOrderingsStateMachine::TDFSM::CollectNodesWithEpsOrFdE for (std::size_t edgeIdx : nfsm.Nodes_[nodeIdx].OutgoingEdges) { const TNFSM::TEdge& edge = nfsm.Edges_[edgeIdx]; - if (edge.FdIdx == fdIdx || edge.FdIdx == TNFSM::TEdge::EPSILON || fds[edge.FdIdx].AlwaysActive) { + if (edge.FdIdx == fdIdx || edge.FdIdx == TNFSM::TEdge::Epsilon || fds[edge.FdIdx].AlwaysActive) { DFS(edge.DstNodeIdx); } } @@ -1194,7 +1194,7 @@ std::vector TOrderingsStateMachine::PruneFDs( } } - if (canLeadToInteresting && filteredFds.size() < EMaxFDCount) { + if (canLeadToInteresting && filteredFds.size() < MaxFDCount) { filteredFds.push_back(std::move(fds[i])); FdMapping_[i] = filteredFds.size() - 1; } else { diff --git a/yql/essentials/core/cbo/cbo_interesting_orderings.h b/yql/essentials/core/cbo/cbo_interesting_orderings.h index 00b704678d68..03200ad82e23 100644 --- a/yql/essentials/core/cbo/cbo_interesting_orderings.h +++ b/yql/essentials/core/cbo/cbo_interesting_orderings.h @@ -326,11 +326,10 @@ class TFDStorage { class TOrderingsStateMachine { private: class TDFSM; - enum _: std::uint32_t { - EMaxFDCount = 64, - EMaxNFSMStates = 256, - EMaxDFSMStates = 512, - }; + + static constexpr std::uint32_t MaxFDCount = 64; + static constexpr std::uint32_t MaxNFSMStates = 256; + static constexpr std::uint32_t MaxDFSMStates = 512; struct TItemInfo { bool UsedInAscOrdering = false; @@ -338,7 +337,7 @@ class TOrderingsStateMachine { }; public: - using TFDSet = std::bitset; + using TFDSet = std::bitset; /* * This class represents a state of the FSM (node idx in the DFSM and some metadata). @@ -374,7 +373,7 @@ class TOrderingsStateMachine { bool IsInitialized() const; private: - bool IsSubset(const std::bitset& lhs, const std::bitset& rhs); + bool IsSubset(const std::bitset& lhs, const std::bitset& rhs); private: TDFSM* Dfsm_ = nullptr; @@ -461,9 +460,7 @@ class TOrderingsStateMachine { std::size_t DstNodeIdx; i64 FdIdx; - enum _: i64 { - EPSILON = -1 // eps edges with give us nodes without applying any FDs. - }; + static constexpr i64 Epsilon = -1; // eps edges with give us nodes without applying any FDs. bool operator==(const TEdge& other) const; @@ -514,9 +511,9 @@ class TOrderingsStateMachine { struct TNode { std::vector NFSMNodes; - std::bitset OutgoingFDs; - std::bitset NFSMNodesBitset; - std::bitset InterestingOrderings; + std::bitset OutgoingFDs; + std::bitset NFSMNodesBitset; + std::bitset InterestingOrderings; TString ToString() const; }; @@ -543,7 +540,7 @@ class TOrderingsStateMachine { const TNFSM& nfsm, const std::vector& startNFSMNodes, const std::vector& fds, - i64 fdIdx = TNFSM::TEdge::EPSILON); + i64 fdIdx = TNFSM::TEdge::Epsilon); void Precompute( const TNFSM& nfsm, const std::vector& fds); diff --git a/yql/essentials/core/cbo/cbo_optimizer_new.cpp b/yql/essentials/core/cbo/cbo_optimizer_new.cpp index bd400d26a77b..87efa695796b 100644 --- a/yql/essentials/core/cbo/cbo_optimizer_new.cpp +++ b/yql/essentials/core/cbo/cbo_optimizer_new.cpp @@ -329,8 +329,8 @@ TOptimizerStatistics TBaseProviderContext::ComputeJoinStats( } const TBaseProviderContext& TBaseProviderContext::Instance() { - static TBaseProviderContext staticContext; - return staticContext; + static TBaseProviderContext StaticContext; + return StaticContext; } TVector TOptimizerHints::GetUnappliedString() { diff --git a/yql/essentials/core/cbo/cbo_optimizer_new.h b/yql/essentials/core/cbo/cbo_optimizer_new.h index 232ebd9addae..14736ad92eb7 100644 --- a/yql/essentials/core/cbo/cbo_optimizer_new.h +++ b/yql/essentials/core/cbo/cbo_optimizer_new.h @@ -30,7 +30,8 @@ enum EOptimizerNodeKind: ui32 { * It records a pointer to statistics and records the current cost of the * operator tree, rooted at this node */ -struct IBaseOptimizerNode { +class IBaseOptimizerNode { +public: EOptimizerNodeKind Kind; TOptimizerStatistics Stats; @@ -38,6 +39,7 @@ struct IBaseOptimizerNode { : Kind(k) { } + IBaseOptimizerNode(EOptimizerNodeKind k, TOptimizerStatistics s) : Kind(k) , Stats(std::move(s)) @@ -120,19 +122,23 @@ struct TJoinAlgoHints { }; struct TJoinOrderHints { - struct ITreeNode { - enum _: ui32 { + class ITreeNode { + public: + enum EKind: ui32 { Relation, Join }; virtual TVector Labels() = 0; + bool IsRelation() { return Type == Relation; } + bool IsJoin() { return Type == Join; } + virtual ~ITreeNode() = default; ui32 Type; @@ -369,7 +375,8 @@ struct TJoinOptimizerNode: public IBaseOptimizerNode { virtual void Print(std::stringstream& stream, int ntabs = 0); }; -struct IOptimizerNew { +class IOptimizerNew { +public: using TPtr = std::shared_ptr; IProviderContext& Pctx; diff --git a/yql/essentials/core/common_opt/yql_co_finalizers.cpp b/yql/essentials/core/common_opt/yql_co_finalizers.cpp index b84d4759aa37..8d037ac6d61a 100644 --- a/yql/essentials/core/common_opt/yql_co_finalizers.cpp +++ b/yql/essentials/core/common_opt/yql_co_finalizers.cpp @@ -49,8 +49,8 @@ IGraphTransformer::TStatus MultiUsageFlatMapOverJoin(const TExprNode::TPtr& node bool IsFilterMultiusageEnabled(const TOptimizeContext& optCtx) { YQL_ENSURE(optCtx.Types); - static const char optName[] = "FilterPushdownEnableMultiusage"; - return IsOptimizerEnabled(*optCtx.Types) && !IsOptimizerDisabled(*optCtx.Types); + static const char OptName[] = "FilterPushdownEnableMultiusage"; + return IsOptimizerEnabled(*optCtx.Types) && !IsOptimizerDisabled(*optCtx.Types); } void FilterPushdownWithMultiusage(const TExprNode::TPtr& node, TNodeOnNodeOwnedMap& toOptimize, TExprContext& ctx, TOptimizeContext& optCtx) { @@ -64,7 +64,7 @@ void FilterPushdownWithMultiusage(const TExprNode::TPtr& node, TNodeOnNodeOwnedM return; } - static const THashSet skipNodes = {"ExtractMembers", "Unordered", "AssumeColumnOrder"}; + static const THashSet SkipNodes = {"ExtractMembers", "Unordered", "AssumeColumnOrder"}; TVector immediateParents; YQL_ENSURE(optCtx.ParentsMap); @@ -91,7 +91,7 @@ void FilterPushdownWithMultiusage(const TExprNode::TPtr& node, TNodeOnNodeOwnedM const auto genColumnNames = GenNoClashColumns(*inputStructType, "_yql_filter_pushdown", immediateParents.size()); for (size_t i = 0; i < immediateParents.size(); ++i) { const TExprNode* parent = immediateParents[i]; - while (skipNodes.contains(parent->Content())) { + while (SkipNodes.contains(parent->Content())) { auto newParent = optCtx.GetParentIfSingle(*parent); if (newParent) { parent = newParent; @@ -264,7 +264,7 @@ void FilterPushdownWithMultiusage(const TExprNode::TPtr& node, TNodeOnNodeOwnedM } bool AllConsumersAreUnordered(const TExprNode::TPtr& node, const TParentsMap& parents, TNodeSet& unorderedConsumers) { - static const THashSet traverseCallables = { + static const THashSet TraverseCallables = { TCoExtractMembers::CallableName(), TCoAssumeDistinct::CallableName(), TCoAssumeUnique::CallableName(), @@ -284,7 +284,7 @@ bool AllConsumersAreUnordered(const TExprNode::TPtr& node, const TParentsMap& pa unorderedConsumers.insert(parent); continue; } - if (!parent->IsCallable(traverseCallables)) { + if (!parent->IsCallable(TraverseCallables)) { return false; } YQL_ENSURE(&parent->Head() == curr); diff --git a/yql/essentials/core/common_opt/yql_co_flow2.cpp b/yql/essentials/core/common_opt/yql_co_flow2.cpp index 3e4a007f5700..a74554ab4561 100644 --- a/yql/essentials/core/common_opt/yql_co_flow2.cpp +++ b/yql/essentials/core/common_opt/yql_co_flow2.cpp @@ -18,22 +18,22 @@ using namespace NNodes; bool AllowSubsetFieldsForNode(const TExprNode& node, const TOptimizeContext& optCtx) { YQL_ENSURE(optCtx.Types); - static const char flag[] = "FieldSubsetEnableMultiusage"; - return !IsOptimizerDisabled(*optCtx.Types) || optCtx.IsSingleUsage(node); + static const char Flag[] = "FieldSubsetEnableMultiusage"; + return !IsOptimizerDisabled(*optCtx.Types) || optCtx.IsSingleUsage(node); } bool AllowComplexFiltersOverAggregatePushdown(const TOptimizeContext& optCtx) { YQL_ENSURE(optCtx.Types); - static const char optName[] = "PushdownComplexFiltersOverAggregate"; - return IsOptimizerEnabled(*optCtx.Types) && - !IsOptimizerDisabled(*optCtx.Types) && + static const char OptName[] = "PushdownComplexFiltersOverAggregate"; + return IsOptimizerEnabled(*optCtx.Types) && + !IsOptimizerDisabled(*optCtx.Types) && optCtx.Types->MaxAggPushdownPredicates > 0; } bool AllowPullUpExtendOverEquiJoin(const TOptimizeContext& optCtx) { YQL_ENSURE(optCtx.Types); - static const char optName[] = "PullUpExtendOverEquiJoin"; - return IsOptimizerEnabled(*optCtx.Types) && !IsOptimizerDisabled(*optCtx.Types); + static const char OptName[] = "PullUpExtendOverEquiJoin"; + return IsOptimizerEnabled(*optCtx.Types) && !IsOptimizerDisabled(*optCtx.Types); } THashSet GetAggregationInputKeys(const TCoAggregate& node) { @@ -249,8 +249,8 @@ bool HaveFieldsSubsetLMap(const TExprNode::TPtr& start, const TExprNode& arg, TS } TExprNode::TPtr LMapSubsetFields(const TCoMapBase& node, TExprContext& ctx, TOptimizeContext& optCtx) { - static const char optName[] = "LMapSubsetFields"; - if (IsOptimizerDisabled(*optCtx.Types)) { + static const char OptName[] = "LMapSubsetFields"; + if (IsOptimizerDisabled(*optCtx.Types)) { return node.Ptr(); } auto itemArg = node.Lambda().Args().Arg(0); @@ -453,8 +453,8 @@ TExprNode::TPtr FuseJoinTree(TExprNode::TPtr downstreamJoinTree, TExprNode::TPtr bool IsSuitableToFuseInputMultiLabels(TOptimizeContext &optCtx) { YQL_ENSURE(optCtx.Types); - static const char optName[] = "FuseEquiJoinsInputMultiLabels"; - return IsOptimizerEnabled(*optCtx.Types); + static const char OptName[] = "FuseEquiJoinsInputMultiLabels"; + return IsOptimizerEnabled(*optCtx.Types); } TExprNode::TPtr FuseEquiJoins(const TExprNode::TPtr& node, ui32 upstreamIndex, TExprContext& ctx, TOptimizeContext &optCtx) { @@ -1125,8 +1125,8 @@ TVector BuildOutputFlattenMembersArg(const TCoEquiJoinInput& in } bool IsPullFlatMapOverJoinMultipleLabelsInputEnabled(TOptimizeContext &optCtx) { - static const char optName[] = "PullUpFlatMapOverJoinMultipleLabels"; - return IsOptimizerEnabled(*optCtx.Types); + static const char OptName[] = "PullUpFlatMapOverJoinMultipleLabels"; + return IsOptimizerEnabled(*optCtx.Types); } bool IsSuitableToPullUpFlatMapInputAssociatedWithLabelList(TCoEquiJoinInput& input, TOptimizeContext& optCtx) { @@ -1192,7 +1192,7 @@ TExprNode::TPtr PullUpFlatMapOverEquiJoin(const TExprNode::TPtr& node, TExprCont return node; } - static const TStringBuf canaryBaseName = YqlCanaryColumnName; + static const TStringBuf CanaryBaseName = YqlCanaryColumnName; THashMap> joinKeysByLabel = CollectEquiJoinKeyColumnsByLabel(*joinTree); const auto renames = LoadJoinRenameMap(*settings); @@ -1225,7 +1225,7 @@ TExprNode::TPtr PullUpFlatMapOverEquiJoin(const TExprNode::TPtr& node, TExprCont auto flatMapInputItem = GetSequenceItemType(flatMap.Input(), false); auto structItems = flatMapInputItem->Cast()->GetItems(); - TString canaryName = TStringBuilder() << canaryBaseName << i; + TString canaryName = TStringBuilder() << CanaryBaseName << i; if (input.Scope().Maybe()) { auto list = input.Scope().Cast(); @@ -1292,7 +1292,7 @@ TExprNode::TPtr PullUpFlatMapOverEquiJoin(const TExprNode::TPtr& node, TExprCont if (j < toPull.size() && i == toPull[j]) { j++; - const TString canaryName = TStringBuilder() << canaryBaseName << i; + const TString canaryName = TStringBuilder() << CanaryBaseName << i; const TString fullCanaryName = FullColumnName(label, canaryName); TCoFlatMapBase flatMap = input.List().Cast(); @@ -1370,7 +1370,7 @@ TExprNode::TPtr PullUpFlatMapOverEquiJoin(const TExprNode::TPtr& node, TExprCont auto newLambdaBody = ctx.Builder(node->Pos()) .Callable("Just") - .Add(0, ApplyRenames(flattenMembers, renames, *noRenamesResultType, canaryBaseName, ctx)) + .Add(0, ApplyRenames(flattenMembers, renames, *noRenamesResultType, CanaryBaseName, ctx)) .Seal() .Build(); @@ -1784,8 +1784,8 @@ bool CanPushdownOverAggregate( TSet usedFields; // Predicate with HaveFieldsSubset()==true and any usedFields (including empty) can be used for pushdown (for example constant predicates can have empty usedFields). if (!HaveFieldsSubset(p, *arg, usedFields, *optCtx.ParentsMap)) { - static const char optName[] = "FilterOverAggregateAllFields"; - const bool canPushdownAll = IsOptimizerEnabled(*optCtx.Types) && !IsOptimizerDisabled(*optCtx.Types); + static const char OptName[] = "FilterOverAggregateAllFields"; + const bool canPushdownAll = IsOptimizerEnabled(*optCtx.Types) && !IsOptimizerDisabled(*optCtx.Types); if (!canPushdownAll) { return false; } @@ -1992,8 +1992,8 @@ TExprNode::TPtr FilterNullMembersToSkipNullMembers(const TCoFlatMapBase& node, T } bool CheckWindowFramesFieldSubset(const TExprNodeList& calcNodes, const TStructExprType& inputItemType, const TTypeAnnotationContext& types) { - static const char optName[] = "CheckWindowFramesFieldSubset"; - if (!IsOptimizerEnabled(types) || IsOptimizerDisabled(types)) { + static const char OptName[] = "CheckWindowFramesFieldSubset"; + if (!IsOptimizerEnabled(types) || IsOptimizerDisabled(types)) { return true; } @@ -2347,8 +2347,8 @@ void RegisterCoFlowCallables2(TCallableOptimizerMap& map) { } // Add PruneKeys to EquiJoin - static const char optName[] = "EmitPruneKeys"; - if (!IsOptimizerEnabled(*optCtx.Types) || IsOptimizerDisabled(*optCtx.Types)) { + static const char OptName[] = "EmitPruneKeys"; + if (!IsOptimizerEnabled(*optCtx.Types) || IsOptimizerDisabled(*optCtx.Types)) { return node; } auto equiJoin = TCoEquiJoin(node); diff --git a/yql/essentials/core/common_opt/yql_co_simple1.cpp b/yql/essentials/core/common_opt/yql_co_simple1.cpp index 3615dcac6d34..25d6e6e1a813 100644 --- a/yql/essentials/core/common_opt/yql_co_simple1.cpp +++ b/yql/essentials/core/common_opt/yql_co_simple1.cpp @@ -704,9 +704,9 @@ TExprNode::TPtr PropagateCoalesceWithConstIntoLogicalOps(const TExprNode::TPtr& } bool IsPullJustFromLogicalOpsEnabled(const TOptimizeContext& optCtx) { - static const char optName[] = "PullJustFromLogicalOps"; + static const char OptName[] = "PullJustFromLogicalOps"; YQL_ENSURE(optCtx.Types); - return !IsOptimizerDisabled(*optCtx.Types); + return !IsOptimizerDisabled(*optCtx.Types); } TExprNode::TPtr PullJustFromLogicalOps(const TExprNode::TPtr& node, TExprContext& ctx, const TOptimizeContext& optCtx) { @@ -1905,8 +1905,8 @@ TExprNode::TPtr BuildEquiJoinForSqlInChain(const TExprNode::TPtr& flatMapNode, c auto inputRowType = input->GetTypeAnn()->Cast()->GetItemType(); YQL_ENSURE(inputRowType->GetKind() == ETypeAnnotationKind::Struct); - static const TStringBuf inputTable = "_yql_injoin_input"; - auto inputTableAtom = ctx.NewAtom(input->Pos(), inputTable, TNodeFlags::Default); + static const TStringBuf InputTable = "_yql_injoin_input"; + auto inputTableAtom = ctx.NewAtom(input->Pos(), InputTable, TNodeFlags::Default); size_t startColumnIndex = 0; for (;;) { @@ -1969,7 +1969,7 @@ TExprNode::TPtr BuildEquiJoinForSqlInChain(const TExprNode::TPtr& flatMapNode, c auto rename = ctx.Builder(pos) .List() .Atom(0, "rename", TNodeFlags::Default) - .Atom(1, FullColumnName(inputTable, columnName)) + .Atom(1, FullColumnName(InputTable, columnName)) .Atom(2, "") .Seal() .Build(); @@ -1989,7 +1989,7 @@ TExprNode::TPtr BuildEquiJoinForSqlInChain(const TExprNode::TPtr& flatMapNode, c auto rename = ctx.Builder(input->Pos()) .List() .Atom(0, "rename", TNodeFlags::Default) - .Atom(1, FullColumnName(inputTable, i->GetName())) + .Atom(1, FullColumnName(InputTable, i->GetName())) .Atom(2, i->GetName()) .Seal() .Build(); @@ -3547,8 +3547,8 @@ TExprNode::TPtr PullAssumeColumnOrderOverEquiJoin(const TExprNode::TPtr& node, T bool IsDropAnyOverEquiJoinInputsEnabled(const TTypeAnnotationContext* types) { YQL_ENSURE(types); - static const char flag[] = "DropAnyOverEquiJoinInputs"; - return IsOptimizerEnabled(*types) && !IsOptimizerDisabled(*types); + static const char Flag[] = "DropAnyOverEquiJoinInputs"; + return IsOptimizerEnabled(*types) && !IsOptimizerDisabled(*types); } TExprNode::TPtr DropAnyOverEquiJoinInputs(const TExprNode::TPtr& node, TExprContext& ctx, TOptimizeContext& optCtx) { @@ -3638,18 +3638,18 @@ TExprNode::TPtr FoldParseAfterSerialize(const TExprNode::TPtr& node, const TStri } TExprNode::TPtr FoldYsonParseAfterSerialize(const TExprNode::TPtr& node) { - static const THashSet serializeUdfNames = {"Yson.Serialize", "Yson.SerializeText", "Yson.SerializePretty"}; - return FoldParseAfterSerialize(node, "Yson.Parse", serializeUdfNames); + static const THashSet SerializeUdfNames = {"Yson.Serialize", "Yson.SerializeText", "Yson.SerializePretty"}; + return FoldParseAfterSerialize(node, "Yson.Parse", SerializeUdfNames); } TExprNode::TPtr FoldYson2ParseAfterSerialize(const TExprNode::TPtr& node) { - static const THashSet serializeUdfNames = {"Yson2.Serialize", "Yson2.SerializeText", "Yson2.SerializePretty"}; - return FoldParseAfterSerialize(node, "Yson2.Parse", serializeUdfNames); + static const THashSet SerializeUdfNames = {"Yson2.Serialize", "Yson2.SerializeText", "Yson2.SerializePretty"}; + return FoldParseAfterSerialize(node, "Yson2.Parse", SerializeUdfNames); } TExprNode::TPtr FoldJsonParseAfterSerialize(const TExprNode::TPtr& node) { - static const THashSet serializeUdfNames = {"Json2.Serialize"}; - return FoldParseAfterSerialize(node, "Json2.Parse", serializeUdfNames); + static const THashSet SerializeUdfNames = {"Json2.Serialize"}; + return FoldParseAfterSerialize(node, "Json2.Parse", SerializeUdfNames); } TExprNode::TPtr FoldSeralizeAfterParse(const TExprNode::TPtr& node, const TStringBuf parseUdfName, const TStringBuf serializeUdfName) { @@ -3845,8 +3845,8 @@ TExprNode::TPtr OptimizeMerge(const TExprNode::TPtr& node, TExprContext& ctx, TO bool IsEarlyExpandOfSkipNullAllowed(const TOptimizeContext& optCtx) { YQL_ENSURE(optCtx.Types); - static const char optName[] = "EarlyExpandSkipNull"; - return IsOptimizerEnabled(*optCtx.Types) && !IsOptimizerDisabled(*optCtx.Types); + static const char OptName[] = "EarlyExpandSkipNull"; + return IsOptimizerEnabled(*optCtx.Types) && !IsOptimizerDisabled(*optCtx.Types); } TExprNode::TPtr ReplaceFuncWithImpl(const TExprNode::TPtr& node, TExprContext& ctx, TOptimizeContext& optCtx) { @@ -3953,9 +3953,9 @@ TExprNode::TPtr MemberOverFilterSkipNullMembers(const TExprNode::TPtr& node, TEx } bool IsSqlWithNothingOrNullOpsEnabled(const TOptimizeContext& optCtx) { - static const char optName[] = "SqlInWithNothingOrNull"; + static const char OptName[] = "SqlInWithNothingOrNull"; YQL_ENSURE(optCtx.Types); - return IsOptimizerEnabled(*optCtx.Types) && !IsOptimizerDisabled(*optCtx.Types); + return IsOptimizerEnabled(*optCtx.Types) && !IsOptimizerDisabled(*optCtx.Types); } } // namespace diff --git a/yql/essentials/core/common_opt/yql_co_simple2.cpp b/yql/essentials/core/common_opt/yql_co_simple2.cpp index 6626835c0fe8..06276bcc7a2a 100644 --- a/yql/essentials/core/common_opt/yql_co_simple2.cpp +++ b/yql/essentials/core/common_opt/yql_co_simple2.cpp @@ -541,8 +541,8 @@ TExprNode::TPtr OptimizeExistsAndUnwrap(const TExprNode::TPtr& node, TExprContex bool IsExtractCommonPredicatesFromLogicalOpsEnabled(const TOptimizeContext& optCtx) { YQL_ENSURE(optCtx.Types); - static const char optName[] = "ExtractCommonPredicatesFromLogicalOps"; - return !IsOptimizerDisabled(*optCtx.Types); + static const char OptName[] = "ExtractCommonPredicatesFromLogicalOps"; + return !IsOptimizerDisabled(*optCtx.Types); } size_t GetNodeId(const TExprNode* node, const TNodeMap& node2id) { @@ -670,8 +670,8 @@ TExprNode::TPtr ApplyAndAbsorption(const TExprNode::TPtr& node, TExprContext& ct bool IsOptimizeXNotXEnabled(const TOptimizeContext& optCtx) { YQL_ENSURE(optCtx.Types); - static const char flag[] = "OptimizeXNotX"; - return IsOptimizerEnabled(*optCtx.Types) && !IsOptimizerDisabled(*optCtx.Types); + static const char Flag[] = "OptimizeXNotX"; + return IsOptimizerEnabled(*optCtx.Types) && !IsOptimizerDisabled(*optCtx.Types); } const TExprNode* UnwrapUnessential(const TExprNode* node) { diff --git a/yql/essentials/core/common_opt/yql_flatmap_over_join.cpp b/yql/essentials/core/common_opt/yql_flatmap_over_join.cpp index 0c17135b8beb..e150d50fc72a 100644 --- a/yql/essentials/core/common_opt/yql_flatmap_over_join.cpp +++ b/yql/essentials/core/common_opt/yql_flatmap_over_join.cpp @@ -84,7 +84,7 @@ void MakeTransitiveClosure(TMap>& aliases) { } } -struct GatherOptionalKeyColumnsOptions { +struct TGatherOptionalKeyColumnsOptions { const TJoinLabels& Labels; ui32 InputIndex; bool WithInnerOptionals; @@ -94,7 +94,7 @@ struct GatherOptionalKeyColumnsOptions { void GatherOptionalKeyColumnsFromEquality( TExprNode::TPtr columns, TSet& optionalKeyColumns, - const GatherOptionalKeyColumnsOptions& options + const TGatherOptionalKeyColumnsOptions& options ) { for (ui32 i = 0; i < columns->ChildrenSize(); i += 2) { const auto table = columns->Child(i)->Content(); @@ -112,7 +112,7 @@ void GatherOptionalKeyColumnsFromEquality( void GatherOptionalKeyColumns( TExprNode::TPtr joinTree, TSet& optionalKeyColumns, - const GatherOptionalKeyColumnsOptions& options + const TGatherOptionalKeyColumnsOptions& options ) { auto left = joinTree->Child(1); auto right = joinTree->Child(2); @@ -240,14 +240,14 @@ TExprNode::TPtr ApplyJoinPredicate(const TExprNode::TPtr& predicate, const TExpr bool NeedEmitSkipNullMembers(const TTypeAnnotationContext* types) { YQL_ENSURE(types); - static const char flag[] = "EmitSkipNullOnPushdown"; - return IsOptimizerEnabled(*types) || !IsOptimizerDisabled(*types); + static const char Flag[] = "EmitSkipNullOnPushdown"; + return IsOptimizerEnabled(*types) || !IsOptimizerDisabled(*types); } bool IsPredicatePushdownOverEquiJoinBothSides(const TTypeAnnotationContext* types) { YQL_ENSURE(types); - static const char flag[] = "PredicatePushdownOverEquiJoinBothSides"; - return IsOptimizerEnabled(*types) && !IsOptimizerDisabled(*types); + static const char Flag[] = "PredicatePushdownOverEquiJoinBothSides"; + return IsOptimizerEnabled(*types) && !IsOptimizerDisabled(*types); } TExprNode::TPtr SingleInputPredicatePushdownOverEquiJoin( @@ -608,8 +608,8 @@ TExprNode::TPtr CreateLabelList(const THashSet& labels, TExprContext& c bool FilterPushdownOverJoinOptionalSideIgnoreOnlyKeys(const TTypeAnnotationContext* types) { YQL_ENSURE(types); - static const char flag[] = "FilterPushdownOverJoinOptionalSideIgnoreOnlyKeys"; - return IsOptimizerEnabled(*types) && !IsOptimizerDisabled(*types); + static const char Flag[] = "FilterPushdownOverJoinOptionalSideIgnoreOnlyKeys"; + return IsOptimizerEnabled(*types) && !IsOptimizerDisabled(*types); } TExprNode::TPtr FilterPushdownOverJoinOptionalSide( @@ -1240,20 +1240,20 @@ TExprNode::TPtr DecayCrossJoinIntoInner(TExprNode::TPtr equiJoin, const TExprNod bool IsEqualityFilterOverJoinEnabled(const TTypeAnnotationContext* types) { YQL_ENSURE(types); - static const char flag[] = "EqualityFilterOverJoin"; - return IsOptimizerEnabled(*types) && !IsOptimizerDisabled(*types); + static const char Flag[] = "EqualityFilterOverJoin"; + return IsOptimizerEnabled(*types) && !IsOptimizerDisabled(*types); } bool IsExtractOrPredicatesOverEquiJoinEnabled(const TTypeAnnotationContext* types) { YQL_ENSURE(types); - static const char flag[] = "ExtractOrPredicatesOverEquiJoin"; - return IsOptimizerEnabled(*types) && !IsOptimizerDisabled(*types); + static const char Flag[] = "ExtractOrPredicatesOverEquiJoin"; + return IsOptimizerEnabled(*types) && !IsOptimizerDisabled(*types); } bool IsNormalizeEqualityFilterOverJoinEnabled(const TTypeAnnotationContext* types) { YQL_ENSURE(types); - static const char flag[] = "NormalizeEqualityFilterOverJoin"; - return IsOptimizerEnabled(*types) && !IsOptimizerDisabled(*types); + static const char Flag[] = "NormalizeEqualityFilterOverJoin"; + return IsOptimizerEnabled(*types) && !IsOptimizerDisabled(*types); } struct TExtraInputPredicates { diff --git a/yql/essentials/core/extract_predicate/extract_predicate_impl.cpp b/yql/essentials/core/extract_predicate/extract_predicate_impl.cpp index bdf58f7b6186..1d43b507b76b 100644 --- a/yql/essentials/core/extract_predicate/extract_predicate_impl.cpp +++ b/yql/essentials/core/extract_predicate/extract_predicate_impl.cpp @@ -678,7 +678,7 @@ TExprNode::TPtr OptimizeNodeForRangeExtraction(const TExprNode::TPtr& node, cons // clang-format on } - static const THashMap binOpsWithNegations = { + static const THashMap BinOpsWithNegations = { {"<", ">="}, {"<=", ">"}, {">", "<="}, @@ -687,8 +687,8 @@ TExprNode::TPtr OptimizeNodeForRangeExtraction(const TExprNode::TPtr& node, cons {"!=", "=="}, }; - auto it = node->Head().IsCallable() ? binOpsWithNegations.find(node->Head().Content()) : binOpsWithNegations.end(); - if (it != binOpsWithNegations.end() && (IsMemberBinOpNode(node->Head()) || IsMemberListBinOpNode(node->Head()))) { + auto it = node->Head().IsCallable() ? BinOpsWithNegations.find(node->Head().Content()) : BinOpsWithNegations.end(); + if (it != BinOpsWithNegations.end() && (IsMemberBinOpNode(node->Head()) || IsMemberListBinOpNode(node->Head()))) { YQL_CLOG(DEBUG, Core) << node->Content() << " over " << node->Head().Content(); return ctx.RenameNode(node->Head(), it->second); } diff --git a/yql/essentials/core/facade/yql_facade.cpp b/yql/essentials/core/facade/yql_facade.cpp index bc139c804924..ba2d332291fd 100644 --- a/yql/essentials/core/facade/yql_facade.cpp +++ b/yql/essentials/core/facade/yql_facade.cpp @@ -886,11 +886,11 @@ bool TProgram::ParseYql() { bool TProgram::ParseSql() { YQL_PROFILE_FUNC(TRACE); - static const THashMap clusters = { + static const THashMap Clusters = { {"plato", TString(YtProviderName)}}; NSQLTranslation::TTranslationSettings settings; - settings.ClusterMapping = clusters; + settings.ClusterMapping = Clusters; return ParseSql(settings); } @@ -1965,12 +1965,12 @@ TIssue MakeNoBlocksInfoIssue(const TVector& names, bool isTypes) { void TProgram::FinalizeIssues() { FinalIssues_.Clear(); if (TypeCtx_) { - static const size_t topCount = 10; - auto noBlockTypes = TypeCtx_->GetTopNoBlocksTypes(topCount); + constexpr size_t TopCount = 10; + auto noBlockTypes = TypeCtx_->GetTopNoBlocksTypes(TopCount); if (!noBlockTypes.empty()) { FinalIssues_.AddIssue(MakeNoBlocksInfoIssue(noBlockTypes, true)); } - auto noBlockCallables = TypeCtx_->GetTopNoBlocksCallables(topCount); + auto noBlockCallables = TypeCtx_->GetTopNoBlocksCallables(TopCount); if (!noBlockCallables.empty()) { FinalIssues_.AddIssue(MakeNoBlocksInfoIssue(noBlockCallables, false)); } diff --git a/yql/essentials/core/file_storage/defs/downloader.h b/yql/essentials/core/file_storage/defs/downloader.h index b835eec84a4d..4dcacc6ac650 100644 --- a/yql/essentials/core/file_storage/defs/downloader.h +++ b/yql/essentials/core/file_storage/defs/downloader.h @@ -11,10 +11,12 @@ namespace NYql::NFS { -struct IDownloader: public TThrRefBase { +class IDownloader: public TThrRefBase { +public: virtual bool Accept(const THttpURL& url) = 0; virtual std::tuple Download(const THttpURL& url, const TString& token, const TString& etag, const TString& lastModified) = 0; }; + using IDownloaderPtr = TIntrusivePtr; } // namespace NYql::NFS diff --git a/yql/essentials/core/file_storage/file_storage.h b/yql/essentials/core/file_storage/file_storage.h index 8a9f432ac3de..ee1b9fd334fe 100644 --- a/yql/essentials/core/file_storage/file_storage.h +++ b/yql/essentials/core/file_storage/file_storage.h @@ -17,7 +17,8 @@ namespace NYql { class TFileStorageConfig; -struct IFileStorage: public TThrRefBase { +class IFileStorage: public TThrRefBase { +public: virtual ~IFileStorage() = default; virtual TFileLinkPtr PutFile(const TString& file, const TString& outFileName = {}) = 0; virtual TFileLinkPtr PutFileStripped(const TString& file, const TString& originalMd5 = {}) = 0; diff --git a/yql/essentials/core/file_storage/sized_cache.h b/yql/essentials/core/file_storage/sized_cache.h index 71e570809391..b881c9d5e4b5 100644 --- a/yql/essentials/core/file_storage/sized_cache.h +++ b/yql/essentials/core/file_storage/sized_cache.h @@ -19,7 +19,8 @@ namespace NYql { */ class TSizedCache { public: - struct ICacheObj: public TThrRefBase { + class ICacheObj: public TThrRefBase { + public: // Unique object identifier virtual TString GetName() = 0; // Object size diff --git a/yql/essentials/core/services/yql_eval_expr.cpp b/yql/essentials/core/services/yql_eval_expr.cpp index 17becb121b1c..33445069082b 100644 --- a/yql/essentials/core/services/yql_eval_expr.cpp +++ b/yql/essentials/core/services/yql_eval_expr.cpp @@ -140,8 +140,8 @@ class TMarkReachable { } } - static THashSet FILE_CALLABLES = {"FilePath", "FileContent", "FolderPath"}; - if (node.IsCallable(FILE_CALLABLES)) { + static THashSet FileCallables = {"FilePath", "FileContent", "FolderPath"}; + if (node.IsCallable(FileCallables)) { const auto alias = node.Head().Content(); if (PendingFileAliases_.contains(alias) || AnyOf(PendingFolderPrefixes_, [alias](const TStringBuf prefix) { auto withSlash = TString(prefix) + "/"; diff --git a/yql/essentials/core/type_ann/type_ann_core.cpp b/yql/essentials/core/type_ann/type_ann_core.cpp index ed62b7314ead..c116057348e2 100644 --- a/yql/essentials/core/type_ann/type_ann_core.cpp +++ b/yql/essentials/core/type_ann/type_ann_core.cpp @@ -5902,9 +5902,9 @@ template } const auto optionName = option->Head().Content(); - static const THashSet supportedOptions = + static const THashSet SupportedOptions = {"isCompact", "tableSource", "nullsProcessed", "ansi", "warnNoAnsi"}; - if (!supportedOptions.contains(optionName)) { + if (!SupportedOptions.contains(optionName)) { ctx.Expr.AddError( TIssue(ctx.Expr.GetPosition(option->Pos()), TStringBuilder() << "Unknown IN option '" << optionName)); return IGraphTransformer::TStatus::Error; @@ -8135,7 +8135,7 @@ template return status; } - static const std::unordered_map deprecated = { + static const std::unordered_map Deprecated = { {"String.Reverse", "'Unicode::Reverse'"}, {"String.ToLower", "'String::AsciiToLower' or 'Unicode::ToLower'"}, {"String.ToUpper", "'String::AsciiToUpper' or 'Unicode::ToUpper'"}, @@ -8149,7 +8149,7 @@ template {"Math.Fabs", "'Abs' builtin function"}, }; - if (const auto bad = deprecated.find(name); deprecated.cend() != bad) { + if (const auto bad = Deprecated.find(name); Deprecated.cend() != bad) { auto issue = TIssue(ctx.Expr.GetPosition(input->Head().Pos()), TStringBuilder() << "Deprecated UDF function '" << moduleName << "::" << funcName << "', use " << bad->second << " instead."); SetIssueCode(EYqlIssueCode::TIssuesIds_EIssueCode_YQL_DEPRECATED_UDF_FUNCTION, issue); if (!ctx.Expr.AddWarning(issue)) { @@ -12748,8 +12748,8 @@ template } TStringBuf op = input->Head().Content(); - static const THashSet ops = {"==", "!=", "<=", "<", ">=", ">", "Exists", "NotExists", "===", "StartsWith", "NotStartsWith"}; - if (!ops.contains(op)) { + static const THashSet Ops = {"==", "!=", "<=", "<", ">=", ">", "Exists", "NotExists", "===", "StartsWith", "NotStartsWith"}; + if (!Ops.contains(op)) { ctx.Expr.AddError(TIssue(ctx.Expr.GetPosition(input->Head().Pos()), TStringBuilder() << "Unknown operation: " << op)); return IGraphTransformer::TStatus::Error; diff --git a/yql/essentials/core/type_ann/type_ann_list.cpp b/yql/essentials/core/type_ann/type_ann_list.cpp index 8701097d5392..53f0b79e2774 100644 --- a/yql/essentials/core/type_ann/type_ann_list.cpp +++ b/yql/essentials/core/type_ann/type_ann_list.cpp @@ -6658,9 +6658,9 @@ namespace { } const auto optionName = option->Head().Content(); - static const THashSet supportedOptions = + static const THashSet SupportedOptions = {"ansi"}; - if (!supportedOptions.contains(optionName)) { + if (!SupportedOptions.contains(optionName)) { ctx.Expr.AddError( TIssue(ctx.Expr.GetPosition(option->Pos()), TStringBuilder() << "Unknown " << input->Content() << "option '" << optionName)); @@ -6718,9 +6718,9 @@ namespace { } const auto optionName = option->Head().Content(); - static const THashSet supportedOptions = + static const THashSet SupportedOptions = {"ansi", "warnNoAnsi"}; - if (!supportedOptions.contains(optionName)) { + if (!SupportedOptions.contains(optionName)) { ctx.Expr.AddError( TIssue(ctx.Expr.GetPosition(option->Pos()), TStringBuilder() << "Unknown " << input->Content() << "option '" << optionName)); diff --git a/yql/essentials/core/url_preprocessing/interface/url_preprocessing.h b/yql/essentials/core/url_preprocessing/interface/url_preprocessing.h index 7978cab9a6db..3d8e15331793 100644 --- a/yql/essentials/core/url_preprocessing/interface/url_preprocessing.h +++ b/yql/essentials/core/url_preprocessing/interface/url_preprocessing.h @@ -7,7 +7,7 @@ namespace NYql { -struct IUrlPreprocessing: public TThrRefBase { +class IUrlPreprocessing: public TThrRefBase { public: using TPtr = TIntrusivePtr; // Returns pair of , diff --git a/yql/essentials/core/yql_execution.cpp b/yql/essentials/core/yql_execution.cpp index 373bd4cfb354..a0a6ff7213db 100644 --- a/yql/essentials/core/yql_execution.cpp +++ b/yql/essentials/core/yql_execution.cpp @@ -978,16 +978,16 @@ TAutoPtr CreateCheckExecutionTransformer(const TTypeAnnotatio return true; }; - static const THashSet noExecutionList = {"InstanceOf", "Lag", "Lead", "RowNumber", "Rank", "DenseRank", "PercentRank", "CumeDist", "NTile"}; - static const THashSet noExecutionListForCalcOverWindow = {"InstanceOf"}; + static const THashSet NoExecutionList = {"InstanceOf", "Lag", "Lead", "RowNumber", "Rank", "DenseRank", "PercentRank", "CumeDist", "NTile"}; + static const THashSet NoExecutionListForCalcOverWindow = {"InstanceOf"}; VisitExpr(input, [funcCheckExecution](const TExprNode::TPtr& node) { bool collectCalcOverWindow = true; - return funcCheckExecution(noExecutionList, collectCalcOverWindow, node); + return funcCheckExecution(NoExecutionList, collectCalcOverWindow, node); }); for (auto overWin: overWinNodes) { VisitExpr(overWin, [funcCheckExecution](const TExprNode::TPtr& node) { bool collectCalcOverWindow = false; - return funcCheckExecution(noExecutionListForCalcOverWindow, collectCalcOverWindow, node); + return funcCheckExecution(NoExecutionListForCalcOverWindow, collectCalcOverWindow, node); }); } diff --git a/yql/essentials/core/yql_expr_constraint.cpp b/yql/essentials/core/yql_expr_constraint.cpp index 2c0d91d2dcc8..c703c6eb242b 100644 --- a/yql/essentials/core/yql_expr_constraint.cpp +++ b/yql/essentials/core/yql_expr_constraint.cpp @@ -1160,11 +1160,11 @@ class TCallableConstraintTransformer : public TCallableTransformerBaseGetIndexMapping().equal_range(0); - static const TConstraintSet defConstr; + static const TConstraintSet DefConstr; std::vector nonEmpty; for (auto i = range.first; i != range.second; ++i) { if (i->second == Max()) { - nonEmpty.push_back(&defConstr); + nonEmpty.push_back(&DefConstr); } else if (auto origConstr = inputMulti->GetItem(i->second)) { nonEmpty.push_back(origConstr); } diff --git a/yql/essentials/core/yql_join.cpp b/yql/essentials/core/yql_join.cpp index 085d3316c5b2..36db0e7c3e59 100644 --- a/yql/essentials/core/yql_join.cpp +++ b/yql/essentials/core/yql_join.cpp @@ -1063,8 +1063,8 @@ THashMap CollectAdditiveInputLabels(const TCoEquiJoinTuple& jo bool IsSkipNullsUnessential(const TTypeAnnotationContext* types) { YQL_ENSURE(types); - static const char flag[] = "EmitSkipNullOnPushdownUsingUnessential"; - return IsOptimizerEnabled(*types) && !IsOptimizerDisabled(*types); + static const char Flag[] = "EmitSkipNullOnPushdownUsingUnessential"; + return IsOptimizerEnabled(*types) && !IsOptimizerDisabled(*types); } TExprNode::TPtr FilterOutNullJoinColumns( diff --git a/yql/essentials/core/yql_opt_match_recognize.cpp b/yql/essentials/core/yql_opt_match_recognize.cpp index ddf2c673f7db..08840d3d9f1a 100644 --- a/yql/essentials/core/yql_opt_match_recognize.cpp +++ b/yql/essentials/core/yql_opt_match_recognize.cpp @@ -134,8 +134,8 @@ std::unordered_set FindUsedVars(const TExprNode::TPtr& params) } const auto defines = params->Child(4); - static constexpr size_t defineLambdasStartPos = 3; - for (const auto& define : defines->Children() | std::views::drop(defineLambdasStartPos)) { + static constexpr size_t DefineLambdasStartPos = 3; + for (const auto& define : defines->Children() | std::views::drop(DefineLambdasStartPos)) { const auto lambda = TCoLambda(define); const auto varsArg = lambda.Args().Arg(1).Ptr(); const auto lambdaBody = lambda.Body().Ptr(); diff --git a/yql/essentials/core/yql_opt_utils.cpp b/yql/essentials/core/yql_opt_utils.cpp index 3090e43678d0..72d44ed6789f 100644 --- a/yql/essentials/core/yql_opt_utils.cpp +++ b/yql/essentials/core/yql_opt_utils.cpp @@ -2150,12 +2150,12 @@ TExprNode::TPtr FindNonYieldTransparentNode(const TExprNode::TPtr& root, const T }); } - static const THashSet WHITE_LIST = {"EmptyIterator"sv, TCoToStream::CallableName(), TCoIterator::CallableName(), + static const THashSet WhiteList = {"EmptyIterator"sv, TCoToStream::CallableName(), TCoIterator::CallableName(), TCoToFlow::CallableName(), TCoApply::CallableName(), TCoNth::CallableName(), TCoMux::CallableName()}; // Find all other flow sources (readers) auto sources = FindNodes(from, [](const TExprNode::TPtr& node) { - return !node->IsCallable(WHITE_LIST) + return !node->IsCallable(WhiteList) && node->IsCallable() && IsFlowOrStream(*node) && (node->ChildrenSize() == 0 || !IsFlowOrStream(node->Head())); @@ -2858,8 +2858,8 @@ bool CanFuseLambdas(const TExprNode& outer, const TExprNode& inner, const TTypeA bool CanApplyExtractMembersToPartitionsByKeys(const TTypeAnnotationContext* types) { YQL_ENSURE(types); - static const char optName[] = "ExtractMembersForPartitionsByKeys"; - return !IsOptimizerDisabled(*types); + static const char OptName[] = "ExtractMembersForPartitionsByKeys"; + return !IsOptimizerDisabled(*types); } } diff --git a/yql/essentials/core/yql_opt_window.cpp b/yql/essentials/core/yql_opt_window.cpp index af0b1e992d32..ecc7c0e14800 100644 --- a/yql/essentials/core/yql_opt_window.cpp +++ b/yql/essentials/core/yql_opt_window.cpp @@ -2396,7 +2396,7 @@ TExprNode::TPtr ExpandNonCompactFullFrames(TPositionHandle pos, const TExprNode: auto rowArg = ctx.NewArgument(pos, "row"); auto addMembersBody = rowArg; - static const TStringBuf keyColumnNamePrefix = "_yql_CalcOverWindowJoinKey"; + static const TStringBuf KeyColumnNamePrefix = "_yql_CalcOverWindowJoinKey"; const TStructExprType* rowTypeWithSession = ctx.MakeType(rowItems); for (auto& keyColumn : originalKeysWithSession) { @@ -2405,7 +2405,7 @@ TExprNode::TPtr ExpandNonCompactFullFrames(TPositionHandle pos, const TExprNode: const TTypeAnnotationNode* columnType = rowTypeWithSession->GetItems()[*rowTypeWithSession->FindItem(columnName)]->GetItemType(); if (columnType->HasOptionalOrNull()) { - addedColumns.push_back(ctx.NewAtom(pos, TStringBuilder() << keyColumnNamePrefix << addedColumns.size())); + addedColumns.push_back(ctx.NewAtom(pos, TStringBuilder() << KeyColumnNamePrefix << addedColumns.size())); keyColumns.push_back(addedColumns.back()); TStringBuf newName = addedColumns.back()->Content(); @@ -2457,7 +2457,7 @@ TExprNode::TPtr ExpandNonCompactFullFrames(TPositionHandle pos, const TExprNode: addedColumns.push_back(ctx.NewAtom(pos, SessionParamsMemberName)); if (sessionKeyType->HasOptionalOrNull()) { - addedColumns.push_back(ctx.NewAtom(pos, TStringBuilder() << keyColumnNamePrefix << addedColumns.size())); + addedColumns.push_back(ctx.NewAtom(pos, TStringBuilder() << KeyColumnNamePrefix << addedColumns.size())); preprocessLambda = ctx.Builder(pos) .Lambda() .Param("stream") diff --git a/yql/essentials/core/yql_statistics.h b/yql/essentials/core/yql_statistics.h index 97044f5b6f96..a2725639ab91 100644 --- a/yql/essentials/core/yql_statistics.h +++ b/yql/essentials/core/yql_statistics.h @@ -59,7 +59,8 @@ class TShufflingOrderingsByJoinLabels { // Providers may subclass this struct to associate specific statistics, useful to // derive stats for higher-level operators in the plan. -struct IProviderStatistics { +class IProviderStatistics { +public: virtual ~IProviderStatistics() {} }; diff --git a/yql/essentials/minikql/arrow/arrow_util.cpp b/yql/essentials/minikql/arrow/arrow_util.cpp index f3dba0671a71..41746e582927 100644 --- a/yql/essentials/minikql/arrow/arrow_util.cpp +++ b/yql/essentials/minikql/arrow/arrow_util.cpp @@ -31,8 +31,8 @@ std::shared_ptr UnwrapScalar(std::shared_ptr scala } std::shared_ptr MakeEmptyBuffer() { - static constexpr ui8 data alignas(ArrowAlignment)[1]{}; - return std::make_shared(data, 0); + static constexpr ui8 Data alignas(ArrowAlignment)[1]{}; + return std::make_shared(Data, 0); } } // namespace NKikimr::NMiniKQL diff --git a/yql/essentials/minikql/arrow/arrow_util.h b/yql/essentials/minikql/arrow/arrow_util.h index c70c80e61cce..5500e4f7d144 100644 --- a/yql/essentials/minikql/arrow/arrow_util.h +++ b/yql/essentials/minikql/arrow/arrow_util.h @@ -214,8 +214,8 @@ inline arrow::Datum MakeDefaultScalarDatum() { template inline std::shared_ptr GetPrimitiveDataType() { - static std::shared_ptr result = std::make_shared::TResult>(); - return result; + static std::shared_ptr Result = std::make_shared::TResult>(); + return Result; } using NYql::NUdf::TTypedBufferBuilder; diff --git a/yql/essentials/minikql/arrow/mkql_bit_utils.h b/yql/essentials/minikql/arrow/mkql_bit_utils.h index 8370eeb431d3..8b549ebcdb4b 100644 --- a/yql/essentials/minikql/arrow/mkql_bit_utils.h +++ b/yql/essentials/minikql/arrow/mkql_bit_utils.h @@ -60,7 +60,7 @@ inline ui8 CompressByte(ui8 x, ui8 m) { } inline ui8 PopCountByte(ui8 value) { - static constexpr uint8_t bytePopCounts[] = { + static constexpr uint8_t BytePopCounts[] = { 0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 1, 2, 2, 3, 2, 3, 3, 4, 2, 3, 3, 4, 3, 4, 4, 5, 2, 3, 3, 4, 3, 4, 4, @@ -70,7 +70,7 @@ inline ui8 PopCountByte(ui8 value) { 5, 6, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, 2, 3, 3, 4, 3, 4, 4, 5, 3, 4, 4, 5, 4, 5, 5, 6, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, 3, 4, 4, 5, 4, 5, 5, 6, 4, 5, 5, 6, 5, 6, 6, 7, 4, 5, 5, 6, 5, 6, 6, 7, 5, 6, 6, 7, 6, 7, 7, 8}; - return bytePopCounts[value]; + return BytePopCounts[value]; } inline size_t GetSparseBitmapPopCount(const ui8* src, size_t len) { diff --git a/yql/essentials/minikql/benchmark/pack_num/pack.cpp b/yql/essentials/minikql/benchmark/pack_num/pack.cpp index 7dff047ff15f..f2ceab453160 100644 --- a/yql/essentials/minikql/benchmark/pack_num/pack.cpp +++ b/yql/essentials/minikql/benchmark/pack_num/pack.cpp @@ -107,9 +107,9 @@ int UnpackU32(ui32* value, const void* buf) { } int SkipU32(const void* buf) { - static const i8 skip[16] = {1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 4, 5}; + static const i8 Skip[16] = {1, 1, 1, 1, 1, 1, 1, 1, 2, 2, 2, 2, 3, 3, 4, 5}; int i = ((const ui8*)buf)[0] >> 4; - return skip[i]; + return Skip[i]; } //////////////////////////////////////////////////////////////////////////////// @@ -308,10 +308,10 @@ int UnpackU64(ui64* value, const void* buf) { #define REPEAT_128(x) REPEAT_64(x), REPEAT_64(x) int SkipU64(const void* buf) { - static const i8 skip[256] = { + static const i8 Skip[256] = { REPEAT_128(1), REPEAT_64(2), REPEAT_32(3), REPEAT_16(4), 5, 5, 5, 5, 5, 5, 5, 5, 6, 6, 6, 6, 7, 7, 8, 9}; - return skip[*(const ui8*)buf]; + return Skip[*(const ui8*)buf]; } #undef REPEAT_16 diff --git a/yql/essentials/minikql/comp_nodes/mkql_udf.cpp b/yql/essentials/minikql/comp_nodes/mkql_udf.cpp index ab79e33914e5..92f74c827fe3 100644 --- a/yql/essentials/minikql/comp_nodes/mkql_udf.cpp +++ b/yql/essentials/minikql/comp_nodes/mkql_udf.cpp @@ -58,8 +58,8 @@ class TDateTimeConvertWrapper: public NUdf::TBoxedValue { NUdf::TUnboxedValue Run(const NUdf::IValueBuilder* valueBuilder, const NUdf::TUnboxedValuePod* args) const final { NUdf::TUnboxedValuePod newArg; const auto arg = args[0]; - const auto& narrow = *reinterpret_cast(arg.GetRawPtr()); - auto& extended = *reinterpret_cast(newArg.GetRawPtr()); + const auto& narrow = *reinterpret_cast(arg.GetRawPtr()); + auto& extended = *reinterpret_cast(newArg.GetRawPtr()); extended.From(narrow); return Closure_.Run(valueBuilder, &newArg); } diff --git a/yql/essentials/minikql/comp_nodes/ut/mkql_udf_ut.cpp b/yql/essentials/minikql/comp_nodes/ut/mkql_udf_ut.cpp index 933eba9f0854..32df65881cc7 100644 --- a/yql/essentials/minikql/comp_nodes/ut/mkql_udf_ut.cpp +++ b/yql/essentials/minikql/comp_nodes/ut/mkql_udf_ut.cpp @@ -541,16 +541,16 @@ enum class EBuilds { template > + NYql::NDateTime::TTMStorage, + NYql::NDateTime::TTM64Storage>> TStorage& Reference(TValue& value) { return *reinterpret_cast(value.GetRawPtr()); } template > + NYql::NDateTime::TTMStorage, + NYql::NDateTime::TTM64Storage>> const TStorage& Reference(const TValue& value) { return *reinterpret_cast(value.GetRawPtr()); } diff --git a/yql/essentials/minikql/computation/mkql_block_transport.cpp b/yql/essentials/minikql/computation/mkql_block_transport.cpp index 5c859bb77b4e..d207ee1b1b6c 100644 --- a/yql/essentials/minikql/computation/mkql_block_transport.cpp +++ b/yql/essentials/minikql/computation/mkql_block_transport.cpp @@ -42,12 +42,12 @@ std::shared_ptr MakeZeroBuffer(size_t byteLen) { constexpr size_t NullWordCount = (MaxBlockSizeInBytes + sizeof(ui64) - 1) / sizeof(ui64); constexpr size_t ExtraAlignWords = (ArrowMemoryAlignment > sizeof(ui64)) ? (ArrowMemoryAlignment / sizeof(ui64) - 1) : 0; - static const ui64 nulls[NullWordCount + ExtraAlignWords] = {0}; + static const ui64 Nulls[NullWordCount + ExtraAlignWords] = {0}; // round all buffer length to 64 bytes size_t capacity = AlignUp(byteLen, size_t(64)); if (capacity <= NullWordCount * sizeof(ui64)) { - return std::make_shared(AlignUp(reinterpret_cast(nulls), ArrowMemoryAlignment), byteLen); + return std::make_shared(AlignUp(reinterpret_cast(Nulls), ArrowMemoryAlignment), byteLen); } auto result = AllocateResizableBuffer(byteLen, GetYqlMemoryPool()); diff --git a/yql/essentials/minikql/computation/mkql_computation_node_list.h b/yql/essentials/minikql/computation/mkql_computation_node_list.h index ff59be1fd31c..8833f649eb9c 100644 --- a/yql/essentials/minikql/computation/mkql_computation_node_list.h +++ b/yql/essentials/minikql/computation/mkql_computation_node_list.h @@ -88,13 +88,13 @@ class TListRepresentation { using TChunk = TListChunk; private: - enum Type { + enum EType { Normal, Freezed }; void NewNormal(const T* begin1, const T* end1, const T* begin2, const T* end2) { - Type_ = Type::Normal; + Type_ = EType::Normal; ui64 oldLength = (end1 - begin1) + (end2 - begin2); ui64 newLength = std::max((oldLength << 1) - 1, (MinChunkSize + sizeof(T) - 1) / sizeof(T) + 1); Chunk_ = TChunk::AllocateChunk(newLength); @@ -102,7 +102,7 @@ class TListRepresentation { End_ = std::copy(begin2, end2, std::copy(begin1, end1, Begin_)); } - TListRepresentation(TChunk* chunk, T* begin, T* end, Type type) + TListRepresentation(TChunk* chunk, T* begin, T* end, EType type) : Chunk_(chunk) , Begin_(begin) , End_(end) @@ -218,7 +218,7 @@ class TListRepresentation { : Chunk_(nullptr) , Begin_(nullptr) , End_(nullptr) - , Type_(Type::Freezed) + , Type_(EType::Freezed) { } @@ -234,7 +234,7 @@ class TListRepresentation { , End_(other.End_) , Type_(other.Type_) { - other.Type_ = Type::Freezed; + other.Type_ = EType::Freezed; if (Chunk_) { Chunk_->Ref(); } @@ -249,7 +249,7 @@ class TListRepresentation { other.Chunk_ = nullptr; other.Begin_ = nullptr; other.End_ = nullptr; - other.Type_ = Type::Freezed; + other.Type_ = EType::Freezed; } void operator=(const TSelf& other) { @@ -267,7 +267,7 @@ class TListRepresentation { End_ = other.End_; Type_ = other.Type_; - other.Type_ = Type::Freezed; + other.Type_ = EType::Freezed; } } @@ -284,11 +284,11 @@ class TListRepresentation { other.Chunk_ = nullptr; other.Begin_ = nullptr; other.End_ = nullptr; - other.Type_ = Type::Freezed; + other.Type_ = EType::Freezed; } inline void FromSingleElement(T&& element) { - Type_ = Type::Normal; + Type_ = EType::Normal; ui64 chunkLength = (MinChunkSize + sizeof(T) - 1) / sizeof(T); Chunk_ = TChunk::AllocateChunk(chunkLength); Begin_ = Chunk_->DataBegin() + (chunkLength >> 2); @@ -307,9 +307,9 @@ class TListRepresentation { FromSingleElement(std::move(element)); return; } - if ((that.Type_ == Type::Normal) && (that.Begin_ != that.Chunk_->DataBegin())) { - Type_ = Type::Normal; - that.Type_ = Type::Freezed; + if ((that.Type_ == EType::Normal) && (that.Begin_ != that.Chunk_->DataBegin())) { + Type_ = EType::Normal; + that.Type_ = EType::Freezed; Chunk_ = that.Chunk_; Chunk_->Ref(); Begin_ = that.Begin_; @@ -326,9 +326,9 @@ class TListRepresentation { FromSingleElement(std::move(element)); return; } - if ((that.Type_ == Type::Normal) && (that.End_ != that.Chunk_->DataEnd())) { - Type_ = Type::Normal; - that.Type_ = Type::Freezed; + if ((that.Type_ == EType::Normal) && (that.End_ != that.Chunk_->DataEnd())) { + Type_ = EType::Normal; + that.Type_ = EType::Freezed; Chunk_ = that.Chunk_; Chunk_->Ref(); Begin_ = that.Begin_; @@ -360,18 +360,18 @@ class TListRepresentation { } TSelf MassPrepend(T* begin, T* end) const { - if ((Type_ == Type::Normal) && (Chunk_->DataBegin() + (end - begin) <= Begin_)) { - Type_ = Type::Freezed; - return TSelf(Chunk_, std::copy_backward(begin, end, Begin_), End_, Type::Normal); + if ((Type_ == EType::Normal) && (Chunk_->DataBegin() + (end - begin) <= Begin_)) { + Type_ = EType::Freezed; + return TSelf(Chunk_, std::copy_backward(begin, end, Begin_), End_, EType::Normal); } else { return TSelf(begin, end, Begin_, End_); } } TSelf MassAppend(T* begin, T* end) const { - if ((Type_ == Type::Normal) && (End_ + (end - begin) <= Chunk_->DataEnd())) { - Type_ = Type::Freezed; - return TSelf(Chunk_, Begin_, std::copy(begin, end, End_), Type::Normal); + if ((Type_ == EType::Normal) && (End_ + (end - begin) <= Chunk_->DataEnd())) { + Type_ = EType::Freezed; + return TSelf(Chunk_, Begin_, std::copy(begin, end, End_), EType::Normal); } else { return TSelf(Begin_, End_, begin, end); } @@ -389,13 +389,13 @@ class TListRepresentation { return TSelf(*this); } - if (Type_ == Type::Freezed) { - if (right.Type_ == Type::Freezed) { + if (Type_ == EType::Freezed) { + if (right.Type_ == EType::Freezed) { return TSelf(Begin_, End_, right.Begin_, right.End_); } else { return right.MassPrepend(Begin_, End_); } - } else if ((right.Type_ == Type::Freezed) || (thisLength > rightLength)) { + } else if ((right.Type_ == EType::Freezed) || (thisLength > rightLength)) { return MassAppend(right.Begin_, right.End_); } else { return right.MassPrepend(Begin_, End_); @@ -404,12 +404,12 @@ class TListRepresentation { TSelf SkipFromBegin(ui64 count) const { Y_DEBUG_ABORT_UNLESS((count > 0) && (count < GetLength())); - return TSelf(Chunk_, Begin_ + count, End_, Type::Freezed); + return TSelf(Chunk_, Begin_ + count, End_, EType::Freezed); } TSelf SkipFromEnd(ui64 count) const { Y_DEBUG_ABORT_UNLESS((count > 0) && (count < GetLength())); - return TSelf(Chunk_, Begin_, End_ - count, Type::Freezed); + return TSelf(Chunk_, Begin_, End_ - count, EType::Freezed); } T GetItemByIndex(ui64 index) const { @@ -425,7 +425,7 @@ class TListRepresentation { TChunk* Chunk_; T* Begin_; T* End_; - mutable Type Type_; + mutable EType Type_; }; using TDefaultListRepresentation = TListRepresentation; diff --git a/yql/essentials/minikql/computation/mkql_computation_node_pack.cpp b/yql/essentials/minikql/computation/mkql_computation_node_pack.cpp index 46ec9b2869d7..02cf92da0509 100644 --- a/yql/essentials/minikql/computation/mkql_computation_node_pack.cpp +++ b/yql/essentials/minikql/computation/mkql_computation_node_pack.cpp @@ -985,8 +985,8 @@ bool IsLegacyStructBlock(const TType* type, ui32& blockLengthIndex, TVector(type); - static const TStringBuf blockLenColumnName = "_yql_block_length"; - auto index = structType->FindMemberIndex(blockLenColumnName); + static const TStringBuf BlockLenColumnName = "_yql_block_length"; + auto index = structType->FindMemberIndex(BlockLenColumnName); if (!index) { return false; } diff --git a/yql/essentials/minikql/computation/mkql_computation_pattern_cache.cpp b/yql/essentials/minikql/computation/mkql_computation_pattern_cache.cpp index 07c01e2cf2c8..4da8eda25c07 100644 --- a/yql/essentials/minikql/computation/mkql_computation_pattern_cache.cpp +++ b/yql/essentials/minikql/computation/mkql_computation_pattern_cache.cpp @@ -216,7 +216,7 @@ class TComputationPatternLRUCache::TLRUPatternCacheImpl { }; TComputationPatternLRUCache::TComputationPatternLRUCache( - const TComputationPatternLRUCache::Config& configuration, + const TComputationPatternLRUCache::TConfig& configuration, NMonitoring::TDynamicCounterPtr counters) : Cache_(std::make_unique( CacheMaxElementsSize, configuration.MaxSizeBytes, CacheMaxElementsSize, configuration.MaxCompiledSizeBytes)) diff --git a/yql/essentials/minikql/computation/mkql_computation_pattern_cache.h b/yql/essentials/minikql/computation/mkql_computation_pattern_cache.h index 41cc613e4bc6..efd3ad631201 100644 --- a/yql/essentials/minikql/computation/mkql_computation_pattern_cache.h +++ b/yql/essentials/minikql/computation/mkql_computation_pattern_cache.h @@ -59,14 +59,14 @@ using TPatternCacheEntryFuture = NThreading::TFuture; class TComputationPatternLRUCache { public: - struct Config { - Config(size_t maxSizeBytes, size_t maxCompiledSizeBytes) + struct TConfig { + TConfig(size_t maxSizeBytes, size_t maxCompiledSizeBytes) : MaxSizeBytes(maxSizeBytes) , MaxCompiledSizeBytes(maxCompiledSizeBytes) { } - Config(size_t maxSizeBytes, size_t maxCompiledSizeBytes, size_t patternAccessTimesBeforeTryToCompile) + TConfig(size_t maxSizeBytes, size_t maxCompiledSizeBytes, size_t patternAccessTimesBeforeTryToCompile) : MaxSizeBytes(maxSizeBytes) , MaxCompiledSizeBytes(maxCompiledSizeBytes) , PatternAccessTimesBeforeTryToCompile(patternAccessTimesBeforeTryToCompile) @@ -77,17 +77,20 @@ class TComputationPatternLRUCache { const size_t MaxCompiledSizeBytes; const std::optional PatternAccessTimesBeforeTryToCompile; - bool operator==(const Config& rhs) { + bool operator==(const TConfig& rhs) { return std::tie(MaxSizeBytes, MaxCompiledSizeBytes, PatternAccessTimesBeforeTryToCompile) == std::tie(rhs.MaxSizeBytes, rhs.MaxCompiledSizeBytes, rhs.PatternAccessTimesBeforeTryToCompile); } - bool operator!=(const Config& rhs) { + bool operator!=(const TConfig& rhs) { return !(*this == rhs); } }; - TComputationPatternLRUCache(const Config& configuration, + // TODO(YQL-20086): Migrate YDB to TConfig + using Config = TConfig; + + TComputationPatternLRUCache(const TConfig& configuration, NMonitoring::TDynamicCounterPtr counters = MakeIntrusive()); ~TComputationPatternLRUCache(); @@ -107,7 +110,7 @@ class TComputationPatternLRUCache { void CleanCache(); - Config GetConfiguration() const { + TConfig GetConfiguration() const { std::lock_guard lock(Mutex_); return Configuration_; } @@ -147,7 +150,7 @@ class TComputationPatternLRUCache { std::unique_ptr Cache_; // protected by Mutex THashMap PatternsToCompile_; // protected by Mutex - const Config Configuration_; + const TConfig Configuration_; NMonitoring::TDynamicCounters::TCounterPtr Hits_; NMonitoring::TDynamicCounters::TCounterPtr HitsCompiled_; diff --git a/yql/essentials/minikql/computation/mkql_computation_pattern_cache_ut.cpp b/yql/essentials/minikql/computation/mkql_computation_pattern_cache_ut.cpp index b052385852f5..2cd946848363 100644 --- a/yql/essentials/minikql/computation/mkql_computation_pattern_cache_ut.cpp +++ b/yql/essentials/minikql/computation/mkql_computation_pattern_cache_ut.cpp @@ -831,10 +831,10 @@ Y_UNIT_TEST_TWIN(FilterPerf, Wide) { { auto data = genData(); - static auto predicate = [](ui64 a) { + static auto Predicate = [](ui64 a) { return a % 128 == 0; }; - Y_DO_NOT_OPTIMIZE_AWAY(predicate); + Y_DO_NOT_OPTIMIZE_AWAY(Predicate); TDuration total; for (ui64 i = 0; i < kIter; ++i) { @@ -842,7 +842,7 @@ Y_UNIT_TEST_TWIN(FilterPerf, Wide) { ui64 acc = 0; ui64 count = 0; for (ui64 j = 0; j < data.size(); ++j) { - if (predicate(data[j])) { + if (Predicate(data[j])) { acc += data[j]; ++count; } diff --git a/yql/essentials/minikql/computation/mkql_spiller.h b/yql/essentials/minikql/computation/mkql_spiller.h index 0fcf6585c110..65ef2d0e181c 100644 --- a/yql/essentials/minikql/computation/mkql_spiller.h +++ b/yql/essentials/minikql/computation/mkql_spiller.h @@ -5,7 +5,8 @@ namespace NKikimr::NMiniKQL { -struct ISpiller { +class ISpiller { +public: using TPtr = std::shared_ptr; using TMemoryReportCallback = std::function; using TKey = ui64; diff --git a/yql/essentials/minikql/computation/mkql_validate_ut.cpp b/yql/essentials/minikql/computation/mkql_validate_ut.cpp index e54c0198ac1d..d8cb32dfb961 100644 --- a/yql/essentials/minikql/computation/mkql_validate_ut.cpp +++ b/yql/essentials/minikql/computation/mkql_validate_ut.cpp @@ -105,7 +105,7 @@ struct TListRef: public NUdf::TBoxedValue { } }; -struct PersonStruct { +struct TPersonStruct { static const size_t MEMBERS_COUNT = 3; static ui32 MetaIndexes[MEMBERS_COUNT]; static ui32 MetaBackIndexes[MEMBERS_COUNT]; @@ -128,10 +128,10 @@ struct PersonStruct { } }; -ui32 PersonStruct::MetaIndexes[MEMBERS_COUNT]; -ui32 PersonStruct::MetaBackIndexes[MEMBERS_COUNT]; +ui32 TPersonStruct::MetaIndexes[MEMBERS_COUNT]; +ui32 TPersonStruct::MetaBackIndexes[MEMBERS_COUNT]; -struct PersonStructWithOptList { +struct TPersonStructWithOptList { static const size_t MEMBERS_COUNT = 4; static ui32 MetaIndexes[MEMBERS_COUNT]; static ui32 MetaBackIndexes[MEMBERS_COUNT]; @@ -158,8 +158,8 @@ struct PersonStructWithOptList { } }; -ui32 PersonStructWithOptList::MetaIndexes[MEMBERS_COUNT]; -ui32 PersonStructWithOptList::MetaBackIndexes[MEMBERS_COUNT]; +ui32 TPersonStructWithOptList::MetaIndexes[MEMBERS_COUNT]; +ui32 TPersonStructWithOptList::MetaBackIndexes[MEMBERS_COUNT]; struct TCallableOneUi32Arg { }; @@ -167,37 +167,37 @@ struct TCallableOneUi32Arg { namespace NImpl { template <> -struct TTypeBuilderHelper { +struct TTypeBuilderHelper { static TType* Build(const IFunctionTypeInfoBuilder& builder) { auto structBuilder = builder.Struct(3); - structBuilder->AddField("FirstName", &PersonStruct::MetaIndexes[0]) - .AddField("LastName", &PersonStruct::MetaIndexes[1]) - .AddField("Age", &PersonStruct::MetaIndexes[2]); + structBuilder->AddField("FirstName", &TPersonStruct::MetaIndexes[0]) + .AddField("LastName", &TPersonStruct::MetaIndexes[1]) + .AddField("Age", &TPersonStruct::MetaIndexes[2]); auto structType = structBuilder->Build(); - for (const auto& index : PersonStruct::MetaIndexes) { - Y_ABORT_UNLESS(index < NUdf::PersonStruct::MEMBERS_COUNT); - NUdf::PersonStruct::MetaBackIndexes[index] = &index - PersonStruct::MetaIndexes; - Y_ABORT_UNLESS(NUdf::PersonStruct::MetaBackIndexes[index] < NUdf::PersonStruct::MEMBERS_COUNT); + for (const auto& index : TPersonStruct::MetaIndexes) { + Y_ABORT_UNLESS(index < NUdf::TPersonStruct::MEMBERS_COUNT); + NUdf::TPersonStruct::MetaBackIndexes[index] = &index - TPersonStruct::MetaIndexes; + Y_ABORT_UNLESS(NUdf::TPersonStruct::MetaBackIndexes[index] < NUdf::TPersonStruct::MEMBERS_COUNT); } return structType; } }; template <> -struct TTypeBuilderHelper { +struct TTypeBuilderHelper { static TType* Build(const IFunctionTypeInfoBuilder& builder) { auto listTags = builder.List()->Item().Build(); auto optionalListTags = builder.Optional()->Item(listTags).Build(); auto structBuilder = builder.Struct(3); - structBuilder->AddField("FirstName", &PersonStructWithOptList::MetaIndexes[0]) - .AddField("LastName", &PersonStructWithOptList::MetaIndexes[1]) - .AddField("Age", &PersonStructWithOptList::MetaIndexes[2]) - .AddField("Tags", optionalListTags, &PersonStructWithOptList::MetaIndexes[3]); + structBuilder->AddField("FirstName", &TPersonStructWithOptList::MetaIndexes[0]) + .AddField("LastName", &TPersonStructWithOptList::MetaIndexes[1]) + .AddField("Age", &TPersonStructWithOptList::MetaIndexes[2]) + .AddField("Tags", optionalListTags, &TPersonStructWithOptList::MetaIndexes[3]); auto structType = structBuilder->Build(); - for (const auto& index : PersonStructWithOptList::MetaIndexes) { - Y_ABORT_UNLESS(index < NUdf::PersonStructWithOptList::MEMBERS_COUNT); - NUdf::PersonStructWithOptList::MetaBackIndexes[index] = &index - PersonStructWithOptList::MetaIndexes; - Y_ABORT_UNLESS(NUdf::PersonStructWithOptList::MetaBackIndexes[index] < NUdf::PersonStructWithOptList::MEMBERS_COUNT); + for (const auto& index : TPersonStructWithOptList::MetaIndexes) { + Y_ABORT_UNLESS(index < NUdf::TPersonStructWithOptList::MEMBERS_COUNT); + NUdf::TPersonStructWithOptList::MetaBackIndexes[index] = &index - TPersonStructWithOptList::MetaIndexes; + Y_ABORT_UNLESS(NUdf::TPersonStructWithOptList::MetaBackIndexes[index] < NUdf::TPersonStructWithOptList::MEMBERS_COUNT); } return structType; } @@ -292,13 +292,13 @@ struct TBrokenStructBoxedValue: public NUdf::TBoxedValue { namespace { template <> -NUdf::TUnboxedValue ToUnboxedValue(const NUdf::PersonStruct& val) { - return NUdf::TUnboxedValuePod(new TBrokenStructBoxedValue(val)); +NUdf::TUnboxedValue ToUnboxedValue(const NUdf::TPersonStruct& val) { + return NUdf::TUnboxedValuePod(new TBrokenStructBoxedValue(val)); } template <> -NUdf::TUnboxedValue ToUnboxedValue(const NUdf::PersonStructWithOptList& val) { - return NUdf::TUnboxedValuePod(new TBrokenStructBoxedValue(val)); +NUdf::TUnboxedValue ToUnboxedValue(const NUdf::TPersonStructWithOptList& val) { + return NUdf::TUnboxedValuePod(new TBrokenStructBoxedValue(val)); } template @@ -526,22 +526,22 @@ SIMPLE_UDF(TDictDigDigHoleAsOpt, NUdfDictDigDig(ui32, ui32)) { return NUdf::TUnboxedValuePod(std::move(boxed)); } -static const NUdf::PersonStruct STRUCT_PERSON_JONNIE = {"Johnnie Walker", "Blue Label", 25}; -static const NUdf::PersonStruct STRUCT_PERSON_HITHCOCK = {"Alfred", "Hithcock", 81}; -static const NUdf::PersonStruct STRUCT_PERSON_LOVECRAFT = {"Howard", "Lovecraft", 25}; -static const NUdf::PersonStruct STRUCT_PERSON_KING = {"Stephen", "King", 25}; -static const NUdf::PersonStructWithOptList STRUCT_PERSON_HITHCOCK_LIST = {"Alfred", "Hithcock", 81, {}}; -static const NUdf::PersonStructWithOptList STRUCT_PERSON_LOVECRAFT_LIST = {"Howard", "Lovecraft", 25, {3, 2, 99}}; -static const NUdf::PersonStructWithOptList STRUCT_PERSON_KING_LIST = {"Stephen", "King", 25, {}}; +static const NUdf::TPersonStruct STRUCT_PERSON_JONNIE = {"Johnnie Walker", "Blue Label", 25}; +static const NUdf::TPersonStruct STRUCT_PERSON_HITHCOCK = {"Alfred", "Hithcock", 81}; +static const NUdf::TPersonStruct STRUCT_PERSON_LOVECRAFT = {"Howard", "Lovecraft", 25}; +static const NUdf::TPersonStruct STRUCT_PERSON_KING = {"Stephen", "King", 25}; +static const NUdf::TPersonStructWithOptList STRUCT_PERSON_HITHCOCK_LIST = {"Alfred", "Hithcock", 81, {}}; +static const NUdf::TPersonStructWithOptList STRUCT_PERSON_LOVECRAFT_LIST = {"Howard", "Lovecraft", 25, {3, 2, 99}}; +static const NUdf::TPersonStructWithOptList STRUCT_PERSON_KING_LIST = {"Stephen", "King", 25, {}}; -SIMPLE_UDF_RUN(TPersonStruct, NUdf::PersonStruct(ui32), NUdf::TOptional) { +SIMPLE_UDF_RUN(TPersonStruct, NUdf::TPersonStruct(ui32), NUdf::TOptional) { Y_UNUSED(valueBuilder); const ui32 holePos = args[0].Get(); - NUdf::IBoxedValuePtr boxed(new TBrokenStructBoxedValue(STRUCT_PERSON_JONNIE, holePos)); + NUdf::IBoxedValuePtr boxed(new TBrokenStructBoxedValue(STRUCT_PERSON_JONNIE, holePos)); return NUdf::TUnboxedValuePod(std::move(boxed)); } -typedef NUdf::TTuple NUdfPersonTuple; +typedef NUdf::TTuple NUdfPersonTuple; static const auto TUPLE_OF_PERSON = std::make_tuple( STRUCT_PERSON_HITHCOCK_LIST, STRUCT_PERSON_JONNIE, @@ -567,12 +567,12 @@ SIMPLE_UDF(TTupleOfPersonStructNoList, NUdfPersonTuple(ui32)) { return NUdf::TUnboxedValuePod(std::move(boxed)); } -static const std::vector LIST_OF_STRUCT_PERSON = { +static const std::vector LIST_OF_STRUCT_PERSON = { STRUCT_PERSON_HITHCOCK_LIST, STRUCT_PERSON_LOVECRAFT_LIST, STRUCT_PERSON_KING_LIST}; -typedef NUdf::TDict TIndexDictFromPersonList; +typedef NUdf::TDict TIndexDictFromPersonList; SIMPLE_UDF(TListOfPersonStructToIndexDict, TIndexDictFromPersonList(ui32)) { Y_UNUSED(valueBuilder); Y_UNUSED(args); @@ -580,14 +580,14 @@ SIMPLE_UDF(TListOfPersonStructToIndexDict, TIndexDictFromPersonList(ui32)) { return valueBuilder->ToIndexDict(NUdf::TUnboxedValuePod(std::move(boxed))); } -SIMPLE_UDF(TListOfPersonStruct, NUdf::TListType(ui32)) { +SIMPLE_UDF(TListOfPersonStruct, NUdf::TListType(ui32)) { Y_UNUSED(valueBuilder); Y_UNUSED(args); NUdf::IBoxedValuePtr boxed(new NUdf::TListRef(LIST_OF_STRUCT_PERSON)); return NUdf::TUnboxedValuePod(std::move(boxed)); } -SIMPLE_UDF(TListOfPersonStructWithBrokenIndexToDict, NUdf::TListType()) { +SIMPLE_UDF(TListOfPersonStructWithBrokenIndexToDict, NUdf::TListType()) { Y_UNUSED(valueBuilder); Y_UNUSED(args); NUdf::IBoxedValuePtr boxed(new NUdf::TListRef( @@ -595,28 +595,28 @@ SIMPLE_UDF(TListOfPersonStructWithBrokenIndexToDict, NUdf::TListType> MakeDictDigiT2PersonBroken() { std::vector> DICT_DIGIT2PERSON_BROKEN = { - {333, new TBrokenStructBoxedValue(STRUCT_PERSON_HITHCOCK, RAW_INDEX_NO_HOLE)}, - {5, new TBrokenStructBoxedValue(STRUCT_PERSON_JONNIE, DICT_DIGIT2PERSON_BROKEN_STRUCT_INDEX)}, - {77, new TBrokenStructBoxedValue(STRUCT_PERSON_LOVECRAFT, RAW_INDEX_NO_HOLE)}, + {333, new TBrokenStructBoxedValue(STRUCT_PERSON_HITHCOCK, RAW_INDEX_NO_HOLE)}, + {5, new TBrokenStructBoxedValue(STRUCT_PERSON_JONNIE, DICT_DIGIT2PERSON_BROKEN_STRUCT_INDEX)}, + {77, new TBrokenStructBoxedValue(STRUCT_PERSON_LOVECRAFT, RAW_INDEX_NO_HOLE)}, }; return DICT_DIGIT2PERSON_BROKEN; } -typedef NUdf::TDict NUdfDictDigPerson; +typedef NUdf::TDict NUdfDictDigPerson; std::vector> MakeDictDigiT2Person() { const std::vector> DICT_DIGIT2PERSON = { - {333, new TBrokenStructBoxedValue(STRUCT_PERSON_HITHCOCK, RAW_INDEX_NO_HOLE)}, - {5, new TBrokenStructBoxedValue(STRUCT_PERSON_JONNIE, RAW_INDEX_NO_HOLE)}, - {77, new TBrokenStructBoxedValue(STRUCT_PERSON_LOVECRAFT, RAW_INDEX_NO_HOLE)}, + {333, new TBrokenStructBoxedValue(STRUCT_PERSON_HITHCOCK, RAW_INDEX_NO_HOLE)}, + {5, new TBrokenStructBoxedValue(STRUCT_PERSON_JONNIE, RAW_INDEX_NO_HOLE)}, + {77, new TBrokenStructBoxedValue(STRUCT_PERSON_LOVECRAFT, RAW_INDEX_NO_HOLE)}, }; return DICT_DIGIT2PERSON; @@ -814,9 +814,9 @@ Y_UNIT_TEST(TestUdfResultCheckEmptySeqList) { } Y_UNIT_TEST(TestUdfResultCheckSeqList) { - static constexpr ui32 listSize = 31; + static constexpr ui32 ListSize = 31; BuildArgsFunc argsFunc = [](TProgramBuilder& pgmBuilder) { - return std::vector{pgmBuilder.NewDataLiteral(listSize)}; + return std::vector{pgmBuilder.NewDataLiteral(ListSize)}; }; ValidateValueFunc validateFunc = [](const NUdf::TUnboxedValuePod& value, const NUdf::IValueBuilder* valueBuilder) { Y_UNUSED(valueBuilder); @@ -825,7 +825,7 @@ Y_UNIT_TEST(TestUdfResultCheckSeqList) { for (NUdf::TUnboxedValue item; listIter.Next(item); ++index) { UNIT_ASSERT_VALUES_EQUAL(item.Get(), index); } - UNIT_ASSERT_VALUES_EQUAL(index, listSize); + UNIT_ASSERT_VALUES_EQUAL(index, ListSize); }; ProcessSimpleUdfFunc("UtUDF.SeqList", argsFunc, validateFunc); } @@ -852,17 +852,17 @@ Y_UNIT_TEST(TestUdfResultCheckSeqListWithHoleFirst) { } Y_UNIT_TEST(TestUdfResultCheckSeqListWithHoleMiddle) { - static constexpr ui32 listSize = 31; + static constexpr ui32 ListSize = 31; BuildArgsFunc argsFunc = [](TProgramBuilder& pgmBuilder) { - return std::vector{pgmBuilder.NewDataLiteral(listSize), - pgmBuilder.NewDataLiteral(listSize / 2)}; + return std::vector{pgmBuilder.NewDataLiteral(ListSize), + pgmBuilder.NewDataLiteral(ListSize / 2)}; }; ValidateValueFunc validateFunc = [](const NUdf::TUnboxedValuePod& value, const NUdf::IValueBuilder* valueBuilder) { Y_UNUSED(valueBuilder); - UNIT_ASSERT_VALUES_EQUAL(value.GetListLength(), listSize); + UNIT_ASSERT_VALUES_EQUAL(value.GetListLength(), ListSize); ui32 index = 0; const auto listIter = value.GetListIterator(); - for (NUdf::TUnboxedValue item; index < listSize / 2 && listIter.Next(item); ++index) { + for (NUdf::TUnboxedValue item; index < ListSize / 2 && listIter.Next(item); ++index) { UNIT_ASSERT_VALUES_EQUAL(item.Get(), index); } NUdf::TUnboxedValue bad; @@ -879,20 +879,20 @@ Y_UNIT_TEST(TestUdfResultCheckSeqListWithHoleMiddle) { } Y_UNIT_TEST(TestUdfResultCheckSeqListWithHoleLast) { - static constexpr ui32 listSize = 31; + static constexpr ui32 ListSize = 31; BuildArgsFunc argsFunc = [](TProgramBuilder& pgmBuilder) { - return std::vector{pgmBuilder.NewDataLiteral(listSize), - pgmBuilder.NewDataLiteral(listSize - 1)}; + return std::vector{pgmBuilder.NewDataLiteral(ListSize), + pgmBuilder.NewDataLiteral(ListSize - 1)}; }; ValidateValueFunc validateFunc = [](const NUdf::TUnboxedValuePod& value, const NUdf::IValueBuilder* valueBuilder) { Y_UNUSED(valueBuilder); - UNIT_ASSERT_VALUES_EQUAL(value.GetListLength(), listSize); + UNIT_ASSERT_VALUES_EQUAL(value.GetListLength(), ListSize); ui32 index = 0; auto listIter = value.GetListIterator(); - for (NUdf::TUnboxedValue item; index < listSize - 1 && listIter.Next(item); ++index) { + for (NUdf::TUnboxedValue item; index < ListSize - 1 && listIter.Next(item); ++index) { UNIT_ASSERT_VALUES_EQUAL(item.Get(), index); } - UNIT_ASSERT_VALUES_EQUAL(index, listSize - 1); + UNIT_ASSERT_VALUES_EQUAL(index, ListSize - 1); NUdf::TUnboxedValue bad; UNIT_ASSERT_EXCEPTION(listIter.Next(bad), TUdfValidateException); }; @@ -1090,27 +1090,27 @@ Y_UNIT_TEST(TestUdfResultCheckTupleOfPersonStructNoList) { void ValidateDictOfPersonStructFunc(const NUdf::TUnboxedValuePod& value, ui32 lookupIndex = 2, ui32 broken_index = RAW_INDEX_NO_HOLE) { const auto person = value.Lookup(NUdf::TUnboxedValuePod(ui64(lookupIndex))); UNIT_ASSERT(person); - auto firstName = person.GetElement(NUdf::PersonStructWithOptList::MetaIndexes[0]); + auto firstName = person.GetElement(NUdf::TPersonStructWithOptList::MetaIndexes[0]); UNIT_ASSERT_VALUES_EQUAL(TString(firstName.AsStringRef()), LIST_OF_STRUCT_PERSON[lookupIndex].FirstName); - auto lastName = person.GetElement(NUdf::PersonStructWithOptList::MetaIndexes[1]); + auto lastName = person.GetElement(NUdf::TPersonStructWithOptList::MetaIndexes[1]); UNIT_ASSERT_VALUES_EQUAL(TString(lastName.AsStringRef()), LIST_OF_STRUCT_PERSON[lookupIndex].LastName); - UNIT_ASSERT_VALUES_EQUAL(person.GetElement(NUdf::PersonStructWithOptList::MetaIndexes[2]).Get(), LIST_OF_STRUCT_PERSON[lookupIndex].Age); - UNIT_ASSERT(!person.GetElement(NUdf::PersonStructWithOptList::MetaIndexes[3])); + UNIT_ASSERT_VALUES_EQUAL(person.GetElement(NUdf::TPersonStructWithOptList::MetaIndexes[2]).Get(), LIST_OF_STRUCT_PERSON[lookupIndex].Age); + UNIT_ASSERT(!person.GetElement(NUdf::TPersonStructWithOptList::MetaIndexes[3])); auto dictIter = value.GetDictIterator(); NUdf::TUnboxedValue key, payload; for (ui32 index = 0; index < broken_index && dictIter.NextPair(key, payload); ++index) { UNIT_ASSERT_VALUES_EQUAL(key.Get(), index); auto person = payload; - auto firstName = person.GetElement(NUdf::PersonStructWithOptList::MetaIndexes[0]); + auto firstName = person.GetElement(NUdf::TPersonStructWithOptList::MetaIndexes[0]); UNIT_ASSERT_VALUES_EQUAL(TString(firstName.AsStringRef()), LIST_OF_STRUCT_PERSON[index].FirstName); - auto lastName = person.GetElement(NUdf::PersonStructWithOptList::MetaIndexes[1]); + auto lastName = person.GetElement(NUdf::TPersonStructWithOptList::MetaIndexes[1]); UNIT_ASSERT_VALUES_EQUAL(TString(lastName.AsStringRef()), LIST_OF_STRUCT_PERSON[index].LastName); - UNIT_ASSERT_VALUES_EQUAL(person.GetElement(NUdf::PersonStructWithOptList::MetaIndexes[2]).Get(), LIST_OF_STRUCT_PERSON[index].Age); + UNIT_ASSERT_VALUES_EQUAL(person.GetElement(NUdf::TPersonStructWithOptList::MetaIndexes[2]).Get(), LIST_OF_STRUCT_PERSON[index].Age); const auto origListPtr = LIST_OF_STRUCT_PERSON[index].Tags; if (origListPtr.empty()) { - UNIT_ASSERT(!person.GetElement(NUdf::PersonStructWithOptList::MetaIndexes[3])); + UNIT_ASSERT(!person.GetElement(NUdf::TPersonStructWithOptList::MetaIndexes[3])); } else { - auto memberTags = person.GetElement(NUdf::PersonStructWithOptList::MetaIndexes[3]); + auto memberTags = person.GetElement(NUdf::TPersonStructWithOptList::MetaIndexes[3]); UNIT_ASSERT(memberTags); UNIT_ASSERT_VALUES_EQUAL(memberTags.GetListLength(), origListPtr.size()); auto origIter = origListPtr.begin(); @@ -1170,11 +1170,11 @@ Y_UNIT_TEST(TestUdfResultCheckDictOfPerson) { for (ui32 index = 0; dictIter.NextPair(key, payload); ++index) { UNIT_ASSERT_VALUES_EQUAL(key.Get(), MakeDictDigiT2Person()[index].first); auto person = payload; - auto firstName = person.GetElement(NUdf::PersonStruct::MetaIndexes[0]); + auto firstName = person.GetElement(NUdf::TPersonStruct::MetaIndexes[0]); UNIT_ASSERT_VALUES_EQUAL(TString(firstName.AsStringRef()), DICT_DIGIT2PERSON_BROKEN_CONTENT_BY_INDEX[index]->FirstName); - auto lastName = person.GetElement(NUdf::PersonStruct::MetaIndexes[1]); + auto lastName = person.GetElement(NUdf::TPersonStruct::MetaIndexes[1]); UNIT_ASSERT_VALUES_EQUAL(TString(lastName.AsStringRef()), DICT_DIGIT2PERSON_BROKEN_CONTENT_BY_INDEX[index]->LastName); - UNIT_ASSERT_VALUES_EQUAL(person.GetElement(NUdf::PersonStruct::MetaIndexes[2]).Get(), DICT_DIGIT2PERSON_BROKEN_CONTENT_BY_INDEX[index]->Age); + UNIT_ASSERT_VALUES_EQUAL(person.GetElement(NUdf::TPersonStruct::MetaIndexes[2]).Get(), DICT_DIGIT2PERSON_BROKEN_CONTENT_BY_INDEX[index]->Age); } }; ProcessSimpleUdfFunc("UtUDF.DictOfPerson", {}, validateFunc); @@ -1187,11 +1187,11 @@ Y_UNIT_TEST(TestUdfResultCheckDictOfPersonBroken) { for (ui32 index = 0; index < DICT_DIGIT2PERSON_BROKEN_PERSON_INDEX && dictIter.NextPair(key, payload); ++index) { UNIT_ASSERT_VALUES_EQUAL(key.Get(), MakeDictDigiT2PersonBroken()[index].first); auto person = payload; - auto firstName = person.GetElement(NUdf::PersonStruct::MetaIndexes[0]); + auto firstName = person.GetElement(NUdf::TPersonStruct::MetaIndexes[0]); UNIT_ASSERT_VALUES_EQUAL(TString(firstName.AsStringRef()), DICT_DIGIT2PERSON_BROKEN_CONTENT_BY_INDEX[index]->FirstName); - auto lastName = person.GetElement(NUdf::PersonStruct::MetaIndexes[1]); + auto lastName = person.GetElement(NUdf::TPersonStruct::MetaIndexes[1]); UNIT_ASSERT_VALUES_EQUAL(TString(lastName.AsStringRef()), DICT_DIGIT2PERSON_BROKEN_CONTENT_BY_INDEX[index]->LastName); - UNIT_ASSERT_VALUES_EQUAL(person.GetElement(NUdf::PersonStruct::MetaIndexes[2]).Get(), DICT_DIGIT2PERSON_BROKEN_CONTENT_BY_INDEX[index]->Age); + UNIT_ASSERT_VALUES_EQUAL(person.GetElement(NUdf::TPersonStruct::MetaIndexes[2]).Get(), DICT_DIGIT2PERSON_BROKEN_CONTENT_BY_INDEX[index]->Age); } UNIT_ASSERT_EXCEPTION(dictIter.NextPair(key, payload), TUdfValidateException); }; diff --git a/yql/essentials/minikql/datetime/datetime.cpp b/yql/essentials/minikql/datetime/datetime.cpp index 94040595aecc..f795c7d4518a 100644 --- a/yql/essentials/minikql/datetime/datetime.cpp +++ b/yql/essentials/minikql/datetime/datetime.cpp @@ -1,6 +1,6 @@ #include "datetime.h" -namespace NYql::DateTime { +namespace NYql::NDateTime { TInstant DoAddMonths(TInstant current, i64 months, const NUdf::IDateBuilder& builder) { TTMStorage storage; @@ -20,4 +20,9 @@ TInstant DoAddYears(TInstant current, i64 years, const NUdf::IDateBuilder& build return TInstant::FromValue(storage.ToTimestamp(builder)); } +} // namespace NYql::NDateTime + +// TODO(YQL-20086): Migrate YDB to NYql::NDateTime +namespace NYql::DateTime { // NOLINT(readability-identifier-naming) +using namespace NYql::NDateTime; } // namespace NYql::DateTime diff --git a/yql/essentials/minikql/datetime/datetime.h b/yql/essentials/minikql/datetime/datetime.h index 30810fa5fb40..f21dbc7134f8 100644 --- a/yql/essentials/minikql/datetime/datetime.h +++ b/yql/essentials/minikql/datetime/datetime.h @@ -8,7 +8,7 @@ #include #include -namespace NYql::DateTime { +namespace NYql::NDateTime { constexpr size_t MAX_TIMEZONE_NAME_LEN = 64; @@ -207,4 +207,9 @@ TInstant DoAddMonths(TInstant current, i64 months, const NUdf::IDateBuilder& bui TInstant DoAddYears(TInstant current, i64 years, const NUdf::IDateBuilder& builder); +} // namespace NYql::NDateTime + +// TODO(YQL-20086): Migrate YDB to NYql::NDateTime +namespace NYql::DateTime { // NOLINT(readability-identifier-naming) +using namespace NYql::NDateTime; } // namespace NYql::DateTime diff --git a/yql/essentials/minikql/datetime/datetime64.h b/yql/essentials/minikql/datetime/datetime64.h index c5e1b3c766a6..e4b3b164acd8 100644 --- a/yql/essentials/minikql/datetime/datetime64.h +++ b/yql/essentials/minikql/datetime/datetime64.h @@ -4,7 +4,7 @@ #include "datetime.h" -namespace NYql::DateTime { +namespace NYql::NDateTime { struct TTM64Storage { i32 Year : 19; @@ -182,4 +182,9 @@ struct TTM64Storage { } }; +} // namespace NYql::NDateTime + +// TODO(YQL-20086): Migrate YDB to NYql::NDateTime +namespace NYql::DateTime { // NOLINT(readability-identifier-naming) +using namespace NYql::NDateTime; } // namespace NYql::DateTime diff --git a/yql/essentials/minikql/jsonpath/benchmark/main.cpp b/yql/essentials/minikql/jsonpath/benchmark/main.cpp index c1c1974d9c00..8dce1a2baa42 100644 --- a/yql/essentials/minikql/jsonpath/benchmark/main.cpp +++ b/yql/essentials/minikql/jsonpath/benchmark/main.cpp @@ -24,12 +24,12 @@ using namespace NJson; using namespace NKikimr::NMiniKQL; TString RandomString(ui32 min, ui32 max) { - static TReallyFastRng32 rand(0); + static TReallyFastRng32 Rand(0); TString result; - const ui32 length = rand.Uniform(min, max + 1); + const ui32 length = Rand.Uniform(min, max + 1); result.reserve(length); for (ui32 i = 0; i < length; ++i) { - result.push_back(char(rand.Uniform('a', 'z' + 1))); + result.push_back(char(Rand.Uniform('a', 'z' + 1))); } return result; } diff --git a/yql/essentials/minikql/mkql_alloc.h b/yql/essentials/minikql/mkql_alloc.h index 03ee199bb633..bb28f7efddb9 100644 --- a/yql/essentials/minikql/mkql_alloc.h +++ b/yql/essentials/minikql/mkql_alloc.h @@ -624,14 +624,12 @@ struct TMKQLHugeAllocator { template TMKQLHugeAllocator(const TMKQLHugeAllocator&) noexcept { } - template - struct Rebind { - typedef TMKQLHugeAllocator other; - }; + template bool operator==(const TMKQLHugeAllocator&) const { return true; } + template bool operator!=(const TMKQLHugeAllocator&) const { return false; diff --git a/yql/essentials/minikql/mkql_function_registry.cpp b/yql/essentials/minikql/mkql_function_registry.cpp index fc7ff04624b6..5371a9965b08 100644 --- a/yql/essentials/minikql/mkql_function_registry.cpp +++ b/yql/essentials/minikql/mkql_function_registry.cpp @@ -480,8 +480,8 @@ namespace NMiniKQL { void FindUdfsInDir(const TString& dirPath, TVector* paths) { - static const TStringBuf libPrefix = TStringBuf(MKQL_UDF_LIB_PREFIX); - static const TStringBuf libSuffix = TStringBuf(MKQL_UDF_LIB_SUFFIX); + static const TStringBuf LibPrefix = TStringBuf(MKQL_UDF_LIB_PREFIX); + static const TStringBuf LibSuffix = TStringBuf(MKQL_UDF_LIB_SUFFIX); if (!dirPath.empty()) { std::vector dirs; @@ -501,14 +501,14 @@ void FindUdfsInDir(const TString& dirPath, TVector* paths) TString fileName = GetBaseName(path); // skip non shared libraries - if (!fileName.StartsWith(libPrefix) || - !fileName.EndsWith(libSuffix)) + if (!fileName.StartsWith(LibPrefix) || + !fileName.EndsWith(LibSuffix)) { continue; } // skip test udfs when scanning dir - auto udfName = TStringBuf(fileName).Skip(libPrefix.length()); + auto udfName = TStringBuf(fileName).Skip(LibPrefix.length()); if (udfName.StartsWith(TStringBuf("test_"))) { continue; } diff --git a/yql/essentials/minikql/mkql_mem_info.cpp b/yql/essentials/minikql/mkql_mem_info.cpp index 56b9ccf71de9..0bb4b149250b 100644 --- a/yql/essentials/minikql/mkql_mem_info.cpp +++ b/yql/essentials/minikql/mkql_mem_info.cpp @@ -12,11 +12,11 @@ namespace { static constexpr char COLLECT_STACK_TRACE_KEY[] = "YQL_MKQL_COLLECT_STACKTRACES_FOR_ALLOCATIONS"; bool ShouldCollectStackTracesForAllocations() { - static bool result = []() { + static bool Result = []() { auto collectEnvValue = TryGetEnv(TString(COLLECT_STACK_TRACE_KEY)); return collectEnvValue.Defined(); }(); - return result; + return Result; } TMemoryUsageInfo::TAllocatorLocation WrapLocation(TMkqlLocation location) { diff --git a/yql/essentials/minikql/mkql_stats_registry_ut.cpp b/yql/essentials/minikql/mkql_stats_registry_ut.cpp index 16e8a99fc1cd..c14159a993e0 100644 --- a/yql/essentials/minikql/mkql_stats_registry_ut.cpp +++ b/yql/essentials/minikql/mkql_stats_registry_ut.cpp @@ -8,42 +8,42 @@ using namespace NMiniKQL; Y_UNIT_TEST_SUITE(TStatsRegistryTest) { Y_UNIT_TEST(Stats) { - static TStatKey key("key", false); + static TStatKey Key("key", false); auto stats = CreateDefaultStatsRegistry(); - stats->SetStat(key, 37); - UNIT_ASSERT_EQUAL(stats->GetStat(key), 37); + stats->SetStat(Key, 37); + UNIT_ASSERT_EQUAL(stats->GetStat(Key), 37); - stats->AddStat(key, 3); - UNIT_ASSERT_EQUAL(stats->GetStat(key), 40); + stats->AddStat(Key, 3); + UNIT_ASSERT_EQUAL(stats->GetStat(Key), 40); - stats->IncStat(key); - UNIT_ASSERT_EQUAL(stats->GetStat(key), 41); + stats->IncStat(Key); + UNIT_ASSERT_EQUAL(stats->GetStat(Key), 41); - stats->DecStat(key); - UNIT_ASSERT_EQUAL(stats->GetStat(key), 40); + stats->DecStat(Key); + UNIT_ASSERT_EQUAL(stats->GetStat(Key), 40); - stats->SetMaxStat(key, 3); - UNIT_ASSERT_EQUAL(stats->GetStat(key), 40); + stats->SetMaxStat(Key, 3); + UNIT_ASSERT_EQUAL(stats->GetStat(Key), 40); - stats->SetMaxStat(key, 43); - UNIT_ASSERT_EQUAL(stats->GetStat(key), 43); + stats->SetMaxStat(Key, 43); + UNIT_ASSERT_EQUAL(stats->GetStat(Key), 43); - stats->SetMinStat(key, 57); - UNIT_ASSERT_EQUAL(stats->GetStat(key), 43); + stats->SetMinStat(Key, 57); + UNIT_ASSERT_EQUAL(stats->GetStat(Key), 43); - stats->SetMinStat(key, 34); - UNIT_ASSERT_EQUAL(stats->GetStat(key), 34); + stats->SetMinStat(Key, 34); + UNIT_ASSERT_EQUAL(stats->GetStat(Key), 34); } Y_UNIT_TEST(ForEach) { - static TStatKey key1("key1", false), key2("key2", true); - UNIT_ASSERT(!key1.IsDeriv()); - UNIT_ASSERT(key2.IsDeriv()); + static TStatKey Key1("key1", false), Key2("key2", true); + UNIT_ASSERT(!Key1.IsDeriv()); + UNIT_ASSERT(Key2.IsDeriv()); auto stats = CreateDefaultStatsRegistry(); - stats->SetStat(key1, 42); - stats->SetStat(key2, 37); + stats->SetStat(Key1, 42); + stats->SetStat(Key2, 37); stats->ForEachStat([](const TStatKey& key, i64 value) { if (key.GetName() == "key1") { @@ -60,10 +60,10 @@ Y_UNIT_TEST(ForEach) { Y_UNIT_TEST(DuplicateKeys) { TString error; try { - static TStatKey key("my_key", false), sameKey("my_key", false); + static TStatKey Key("my_key", false), SameKey("my_key", false); // avoid variables elimitation - Cerr << key.GetId() << ": " << key.GetName() << '\n' - << sameKey.GetId() << ": " << sameKey.GetName() << Endl; + Cerr << Key.GetId() << ": " << Key.GetName() << '\n' + << SameKey.GetId() << ": " << SameKey.GetName() << Endl; } catch (const yexception& e) { error = e.AsStrBuf(); } diff --git a/yql/essentials/providers/common/codec/yql_codec_buf.h b/yql/essentials/providers/common/codec/yql_codec_buf.h index 7425fb1c3320..c876b9947f15 100644 --- a/yql/essentials/providers/common/codec/yql_codec_buf.h +++ b/yql/essentials/providers/common/codec/yql_codec_buf.h @@ -23,7 +23,8 @@ namespace NCommon { class TTimeoutException: public yexception { }; -struct IBlockReader { +class IBlockReader { +public: virtual ~IBlockReader() = default; virtual void SetDeadline(TInstant deadline) = 0; @@ -32,7 +33,8 @@ struct IBlockReader { virtual bool Retry(const TMaybe& rangeIndex, const TMaybe& rowIndex, const std::exception_ptr& error) = 0; }; -struct IBlockWriter { +class IBlockWriter { +public: virtual ~IBlockWriter() = default; virtual void SetRecordBoundaryCallback(std::function callback) = 0; diff --git a/yql/essentials/providers/common/codec/yql_json_codec.h b/yql/essentials/providers/common/codec/yql_json_codec.h index a8de5e7243d1..190e23c51ef4 100644 --- a/yql/essentials/providers/common/codec/yql_json_codec.h +++ b/yql/essentials/providers/common/codec/yql_json_codec.h @@ -26,8 +26,8 @@ using TValueConvertPolicy = TEnumBitSetGetSubgroup(userGroup, userName ? *userName : TOTAL) + ->GetSubgroup(userGroup, userName ? *userName : Total) ->GetNamedCounter(labelName, labelValue, derivative); } diff --git a/yql/essentials/providers/common/metrics/sensors_group.h b/yql/essentials/providers/common/metrics/sensors_group.h index 8605f84fd95e..1a849f87f0da 100644 --- a/yql/essentials/providers/common/metrics/sensors_group.h +++ b/yql/essentials/providers/common/metrics/sensors_group.h @@ -20,8 +20,8 @@ using TSensorCounterPtr = TIntrusivePtr; TSensorsGroupPtr GetSensorsRootGroup(); inline TSensorsGroupPtr GetSensorsGroupFor(const TString& compName) { - static TString compLabel("component"); - return GetSensorsRootGroup()->GetSubgroup(compLabel, compName); + static TString CompLabel("component"); + return GetSensorsRootGroup()->GetSubgroup(CompLabel, compName); } } // namespace NYql diff --git a/yql/essentials/providers/common/provider/yql_provider.cpp b/yql/essentials/providers/common/provider/yql_provider.cpp index a4e5ffa697f9..8d4bd13e6e97 100644 --- a/yql/essentials/providers/common/provider/yql_provider.cpp +++ b/yql/essentials/providers/common/provider/yql_provider.cpp @@ -66,19 +66,19 @@ constexpr std::array TimestampFormatNames = { "UNIX_TIME_MICROSECONDS"sv}; TCoAtom InferIndexName(TCoAtomList key, TExprContext& ctx) { - static const TString end = "_idx"; - static const TString delimiter = "_"; + static const TString End = "_idx"; + static const TString Delimiter = "_"; - size_t sz = end.size(); + size_t sz = End.size(); for (const auto& n : key) { - sz += n.Value().size() + delimiter.size(); + sz += n.Value().size() + Delimiter.size(); } TString name(Reserve(sz)); for (const auto& n : key) { - name += n.Value() + delimiter; + name += n.Value() + Delimiter; } - name += end; + name += End; return Build(ctx, key.Pos()) .Value(name) @@ -404,7 +404,7 @@ TWriteSequenceSettings ParseSequenceSettings(NNodes::TExprList node, TExprContex TVector other; - const static std::unordered_set sequenceSettingNames = + const static std::unordered_set SequenceSettingNames = {"start", "increment", "cache", "minvalue", "maxvalue", "cycle", "restart"}; for (auto child : node) { @@ -420,7 +420,7 @@ TWriteSequenceSettings ParseSequenceSettings(NNodes::TExprList node, TExprContex valueType = tuple.Value().Cast(); } else if (name == "temporary") { temporary = Build(ctx, node.Pos()).Value("true").Done(); - } else if (sequenceSettingNames.contains(TString(name))) { + } else if (SequenceSettingNames.contains(TString(name))) { sequenceSettings.push_back(tuple); } else { other.push_back(tuple); diff --git a/yql/essentials/providers/common/udf_resolve/yql_outproc_udf_resolver.cpp b/yql/essentials/providers/common/udf_resolve/yql_outproc_udf_resolver.cpp index 67946dda5f96..c5dcd45be307 100644 --- a/yql/essentials/providers/common/udf_resolve/yql_outproc_udf_resolver.cpp +++ b/yql/essentials/providers/common/udf_resolve/yql_outproc_udf_resolver.cpp @@ -90,9 +90,9 @@ TString ExtractSharedObjectNameFromErrorMessage(const char* message) { // example: // util/system/dynlib.cpp:56: libcuda.so.1: cannot open shared object file: No such file or directory - static std::regex re(".*: (.+): cannot open shared object file: No such file or directory"); + static std::regex Re(".*: (.+): cannot open shared object file: No such file or directory"); std::cmatch match; - if (!std::regex_match(message, match, re)) { + if (!std::regex_match(message, match, Re)) { return ""; } diff --git a/yql/essentials/public/decimal/yql_decimal.cpp b/yql/essentials/public/decimal/yql_decimal.cpp index 9c62939686fd..1970537bff8a 100644 --- a/yql/essentials/public/decimal/yql_decimal.cpp +++ b/yql/essentials/public/decimal/yql_decimal.cpp @@ -70,8 +70,8 @@ const char* ToString(TInt128 val, ui8 precision, ui8 scale) { // log_{10}(2^120) ~= 36.12, 37 decimal places // plus dot, zero before dot, sign and zero byte at the end - static thread_local char str[40]; - auto end = str + sizeof(str); + static thread_local char Str[40]; + auto end = Str + sizeof(Str); *--end = 0; auto s = end; diff --git a/yql/essentials/public/purecalc/common/logger_init.cpp b/yql/essentials/public/purecalc/common/logger_init.cpp index ec3f66140bb0..17eb2ee55192 100644 --- a/yql/essentials/public/purecalc/common/logger_init.cpp +++ b/yql/essentials/public/purecalc/common/logger_init.cpp @@ -15,7 +15,7 @@ void InitLogging(const TLoggingOptions& options) { NLog::InitLogger(options.LogDestination); auto& logger = NLog::YqlLogger(); logger.SetDefaultPriority(options.LogLevel); - for (int i = 0; i < NLog::EComponentHelpers::ToInt(NLog::EComponent::MaxValue); ++i) { + for (int i = 0; i < NLog::TComponentHelpers::ToInt(NLog::EComponent::MaxValue); ++i) { logger.SetComponentLevel((NLog::EComponent)i, (NLog::ELevel)options.LogLevel); } Initialized = true; diff --git a/yql/essentials/public/purecalc/io_specs/arrow/ut/test_spec.cpp b/yql/essentials/public/purecalc/io_specs/arrow/ut/test_spec.cpp index 2d0d42ca21a0..4238c7939506 100644 --- a/yql/essentials/public/purecalc/io_specs/arrow/ut/test_spec.cpp +++ b/yql/essentials/public/purecalc/io_specs/arrow/ut/test_spec.cpp @@ -29,13 +29,13 @@ namespace { void N(NUnitTest::TTestContext&) NYql::NPureCalc::TProgramFactoryOptions TestOptions(NYql::EBlockEngineMode mode) { - static const TMap mode2settings = { + static const TMap Mode2settings = { {NYql::EBlockEngineMode::Disable, "disable"}, {NYql::EBlockEngineMode::Auto, "auto"}, {NYql::EBlockEngineMode::Force, "force"}, }; auto options = NYql::NPureCalc::TProgramFactoryOptions(); - options.SetBlockEngineSettings(mode2settings.at(mode)); + options.SetBlockEngineSettings(Mode2settings.at(mode)); return options; } diff --git a/yql/essentials/public/purecalc/io_specs/protobuf_raw/spec.cpp b/yql/essentials/public/purecalc/io_specs/protobuf_raw/spec.cpp index af4561a49b8d..c8eee4a241ff 100644 --- a/yql/essentials/public/purecalc/io_specs/protobuf_raw/spec.cpp +++ b/yql/essentials/public/purecalc/io_specs/protobuf_raw/spec.cpp @@ -182,7 +182,7 @@ void FillFieldMappingsImpl( bool listIsOptional, bool enableRecursiveRenaming, const THashMap& inverseFieldRenames) { - static const THashMap emptyInverseFieldRenames; + static const THashMap EmptyInverseFieldRenames; mappings.resize(fromType->GetMembersCount()); for (ui32 i = 0; i < fromType->GetMembersCount(); ++i) { TString fieldName(fromType->GetMemberName(i)); @@ -222,7 +222,7 @@ void FillFieldMappingsImpl( Nothing(), listIsOptional, enableRecursiveRenaming, - enableRecursiveRenaming ? inverseFieldRenames : emptyInverseFieldRenames); + enableRecursiveRenaming ? inverseFieldRenames : EmptyInverseFieldRenames); } } } diff --git a/yql/essentials/public/udf/udf_helpers.h b/yql/essentials/public/udf/udf_helpers.h index 23f25c16b966..b180a358d7e0 100644 --- a/yql/essentials/public/udf/udf_helpers.h +++ b/yql/essentials/public/udf/udf_helpers.h @@ -288,8 +288,8 @@ class TUserDataTypeFuncFactory: public ::NYql::NUdf::TBoxedValue { public: static const ::NYql::NUdf::TStringRef& Name() { - static auto name = ::NYql::NUdf::TStringRef(TFuncName, std::strlen(TFuncName)); - return name; + static auto Name = ::NYql::NUdf::TStringRef(TFuncName, std::strlen(TFuncName)); + return Name; } static const TType* ExtractArgFromUserType(::NYql::NUdf::TType const* userType, ::NYql::NUdf::IFunctionTypeInfoBuilder& builder) { diff --git a/yql/essentials/public/udf/udf_ptr.h b/yql/essentials/public/udf/udf_ptr.h index e0a62ce4d304..88d7ed3689a5 100644 --- a/yql/essentials/public/udf/udf_ptr.h +++ b/yql/essentials/public/udf/udf_ptr.h @@ -114,10 +114,11 @@ class TDefaultRefCountedPtrOps { template > class TRefCountedPtr { public: - enum AddRef { + enum EAddRef { ADD_REF }; - enum StealRef { + + enum EStealRef { STEAL_REF }; @@ -128,7 +129,7 @@ class TRefCountedPtr { Ref(); } - inline TRefCountedPtr(T* ptr, StealRef) + inline TRefCountedPtr(T* ptr, EStealRef) : Ptr_(ptr) { // do not call Ref() on new pointer @@ -178,7 +179,7 @@ class TRefCountedPtr { } } - inline void Reset(T* ptr, StealRef) { + inline void Reset(T* ptr, EStealRef) { if (Ptr_ != ptr) { UnRef(); Ptr_ = ptr; diff --git a/yql/essentials/public/udf/udf_value_inl.h b/yql/essentials/public/udf/udf_value_inl.h index 20445a5d4f7d..5ccae10f1d00 100644 --- a/yql/essentials/public/udf/udf_value_inl.h +++ b/yql/essentials/public/udf/udf_value_inl.h @@ -551,8 +551,8 @@ inline TUnboxedValue TUnboxedValuePod::GetVariantItem() const { } inline bool TUnboxedValuePod::TryMakeVariant(ui32 index) { - static const ui32 limit = (1U << 6U) - 1U; - if (index >= limit || Raw.GetIndex()) { + static const ui32 Limit = (1U << 6U) - 1U; + if (index >= Limit || Raw.GetIndex()) { return false; } diff --git a/yql/essentials/sql/pg/pg_sql.cpp b/yql/essentials/sql/pg/pg_sql.cpp index 3d2b994439ba..8f5f2440c7b6 100644 --- a/yql/essentials/sql/pg/pg_sql.cpp +++ b/yql/essentials/sql/pg/pg_sql.cpp @@ -1879,7 +1879,7 @@ class TConverter: public IPGParseEvents { } const TString& FindColumnTypeAlias(const TString& colType, bool& isTypeSerial) { - const static std::unordered_map aliasMap{ + const static std::unordered_map AliasMap{ {"smallserial", "int2"}, {"serial2", "int2"}, {"serial", "int4"}, @@ -1887,8 +1887,8 @@ class TConverter: public IPGParseEvents { {"bigserial", "int8"}, {"serial8", "int8"}, }; - const auto aliasIt = aliasMap.find(to_lower(colType)); - if (aliasIt == aliasMap.end()) { + const auto aliasIt = AliasMap.find(to_lower(colType)); + if (aliasIt == AliasMap.end()) { isTypeSerial = false; return colType; } diff --git a/yql/essentials/sql/settings/translation_settings.h b/yql/essentials/sql/settings/translation_settings.h index 3fd97f110cb0..f11eb3b3bea0 100644 --- a/yql/essentials/sql/settings/translation_settings.h +++ b/yql/essentials/sql/settings/translation_settings.h @@ -9,7 +9,7 @@ #include #include -namespace google::protobuf { +namespace google::protobuf { // NOLINT(readability-identifier-naming) class Arena; } // namespace google::protobuf diff --git a/yql/essentials/sql/v0/builtin.cpp b/yql/essentials/sql/v0/builtin.cpp index 72cd71038c62..2f725a2fa8a6 100644 --- a/yql/essentials/sql/v0/builtin.cpp +++ b/yql/essentials/sql/v0/builtin.cpp @@ -734,9 +734,9 @@ static const TSet AvailableDataTypes = {"Bool", "String", "Uint32", "Ui "Date", "Datetime", "Timestamp", "Interval", "Uint8", "Int8", "Uint16", "Int16", "TzDate", "TzDatetime", "TzTimestamp", "Uuid", "Decimal"}; TNodePtr GetDataTypeStringNode(TContext& ctx, TCallNode& node, unsigned argNum, TString* outTypeStrPtr = nullptr) { auto errMsgFunc = [&node, argNum]() { - static std::array numToName = {{"first", "second"}}; + static std::array NumToName = {{"first", "second"}}; TStringBuilder sb; - sb << "At " << numToName.at(argNum) << " argument of " << node.GetOpName() << " expected type string, available one of: " + sb << "At " << NumToName.at(argNum) << " argument of " << node.GetOpName() << " expected type string, available one of: " << JoinRange(", ", AvailableDataTypes.begin(), AvailableDataTypes.end()) << ";"; return TString(sb); }; diff --git a/yql/essentials/sql/v0/context.h b/yql/essentials/sql/v0/context.h index 4c08659ce68d..36ed5676887c 100644 --- a/yql/essentials/sql/v0/context.h +++ b/yql/essentials/sql/v0/context.h @@ -159,11 +159,12 @@ namespace NSQLTranslationV0 { TVector AllResults; TSet UsedClusters; - struct ShortcutStore { + struct TShortcutStore { THashMap BaseMap; TVector> Goal; }; - THashMap Shortcuts; + + THashMap Shortcuts; ui32 ShortcutCurrentLevel = 0; }; diff --git a/yql/essentials/sql/v0/join.cpp b/yql/essentials/sql/v0/join.cpp index 7303322f1241..25bfcbc3117d 100644 --- a/yql/essentials/sql/v0/join.cpp +++ b/yql/essentials/sql/v0/join.cpp @@ -140,8 +140,8 @@ class TJoinBase: public IJoin { TNodePtr BuildJoinKeys(TContext& ctx, const TVector& names) override { const size_t n = JoinOps_.size(); TString what(Sources_[n]->GetLabel()); - static const TSet noRightSourceJoinOps = {"LeftOnly", "LeftSemi"}; - for (size_t nn = n; nn > 0 && noRightSourceJoinOps.contains(JoinOps_[nn-1]); --nn) { + static const TSet NoRightSourceJoinOps = {"LeftOnly", "LeftSemi"}; + for (size_t nn = n; nn > 0 && NoRightSourceJoinOps.contains(JoinOps_[nn-1]); --nn) { what = Sources_[nn-1]->GetLabel(); } const TString with(Sources_[n + 1]->GetLabel()); diff --git a/yql/essentials/sql/v0/node.cpp b/yql/essentials/sql/v0/node.cpp index ae448da087b0..7e11d7f04072 100644 --- a/yql/essentials/sql/v0/node.cpp +++ b/yql/essentials/sql/v0/node.cpp @@ -1494,7 +1494,7 @@ struct TWinPartition { /// \todo use few levels of grouping (got from group by cube, etc) class WindowFuncSupp { public: - struct EvalOverWindow { + struct TEvalOverWindow { TVector Aggregations; TVector Functions; }; @@ -1503,6 +1503,7 @@ class WindowFuncSupp { auto iter = WindowMap_.find(windowName); return iter != WindowMap_.end() ? iter->second : 0; } + size_t CreateWindowBySpec(const TString& windowName, const TWindowSpecificationPtr& winSpec) { Y_UNUSED(windowName); auto curPartitions = winSpec->Partitions; @@ -1544,6 +1545,7 @@ class WindowFuncSupp { } return *frame; } + void AddAggregationFunc(size_t windowId, TAggregationPtr func) { Evals_[windowId-1].Aggregations.push_back(func); } @@ -1555,10 +1557,12 @@ class WindowFuncSupp { const TVector& GetPartitions() { return Partitions_; } - const EvalOverWindow& GetEvals(size_t frameId) { + + const TEvalOverWindow& GetEvals(size_t frameId) { YQL_ENSURE(frameId && frameId <= Evals_.size()); return Evals_[frameId-1]; } + TNodePtr BuildFrame(TPosition pos, size_t frameId) { Y_UNUSED(frameId); /// \todo support not default frame @@ -1568,7 +1572,7 @@ class WindowFuncSupp { private: TVector Partitions_; TMap WindowMap_; - TVector Evals_; + TVector Evals_; }; TNodePtr ISource::BuildCalcOverWindow(TContext& ctx, const TString& label, const TNodePtr& ground) { diff --git a/yql/essentials/sql/v0/node.h b/yql/essentials/sql/v0/node.h index 0a996501502a..4426cb426caa 100644 --- a/yql/essentials/sql/v0/node.h +++ b/yql/essentials/sql/v0/node.h @@ -978,11 +978,11 @@ namespace NSQLTranslationV0 { TSourcePtr BuildSelect(TPosition pos, TSourcePtr source, TNodePtr skipTake); - enum class ReduceMode { + enum class EReduceMode { ByPartition, ByAll, }; - TSourcePtr BuildReduce(TPosition pos, ReduceMode mode, TSourcePtr source, TVector&& orderBy, + TSourcePtr BuildReduce(TPosition pos, EReduceMode mode, TSourcePtr source, TVector&& orderBy, TVector&& keys, TVector&& args, TNodePtr udf, TNodePtr having, const TWriteSettings& settings); TSourcePtr BuildProcess(TPosition pos, TSourcePtr source, TNodePtr with, TVector&& terms, bool listCall, bool stream, const TWriteSettings& settings); diff --git a/yql/essentials/sql/v0/select.cpp b/yql/essentials/sql/v0/select.cpp index 0e5271191efd..f9fc13491db9 100644 --- a/yql/essentials/sql/v0/select.cpp +++ b/yql/essentials/sql/v0/select.cpp @@ -727,7 +727,7 @@ TSourcePtr BuildInnerSource(TPosition pos, TNodePtr node, const TString& label) class TReduceSource: public IRealSource { public: TReduceSource(TPosition pos, - ReduceMode mode, + EReduceMode mode, TSourcePtr source, TVector&& orderBy, TVector&& keys, @@ -836,7 +836,7 @@ class TReduceSource: public IRealSource { TNodePtr processPartitions; switch (Mode_) { - case ReduceMode::ByAll: { + case EReduceMode::ByAll: { auto columnPtr = Args_[0]->GetColumnName(); TNodePtr expr = BuildAtom(Pos_, "partitionStream"); if (!columnPtr || *columnPtr != "*") { @@ -848,7 +848,7 @@ class TReduceSource: public IRealSource { processPartitions = Y("ToSequence", Y("Apply", Udf_, expr)); break; } - case ReduceMode::ByPartition: { + case EReduceMode::ByPartition: { processPartitions = Y("SqlReduce", "partitionStream", extractKeyLambda, Udf_, BuildLambda(Pos_, Y("row"), GroundWithExpr(ExprGround_, Args_[0]))); break; @@ -864,7 +864,7 @@ class TReduceSource: public IRealSource { sortKeySelector = BuildLambda(Pos_, Y("row"), Y("SqlExtractKey", "row", sortKeySelector)); } - auto partitionByKey = Y(Mode_ == ReduceMode::ByAll ? "PartitionByKey" : "PartitionsByKeys", "core", extractKeyLambda, + auto partitionByKey = Y(Mode_ == EReduceMode::ByAll ? "PartitionByKey" : "PartitionsByKeys", "core", extractKeyLambda, sortDirection, sortKeySelector, BuildLambda(Pos_, Y("partitionStream"), processPartitions)); auto block(Y(Y("let", "core", input))); @@ -890,7 +890,7 @@ class TReduceSource: public IRealSource { CloneContainer(Keys_), CloneContainer(Args_), SafeClone(Udf_), SafeClone(Having_), Settings_); } private: - ReduceMode Mode_; + EReduceMode Mode_; TSourcePtr Source_; TVector OrderBy_; TVector Keys_; @@ -905,7 +905,7 @@ class TReduceSource: public IRealSource { }; TSourcePtr BuildReduce(TPosition pos, - ReduceMode mode, + EReduceMode mode, TSourcePtr source, TVector&& orderBy, TVector&& keys, diff --git a/yql/essentials/sql/v0/sql.cpp b/yql/essentials/sql/v0/sql.cpp index b4fab79deaa9..af735b125c49 100644 --- a/yql/essentials/sql/v0/sql.cpp +++ b/yql/essentials/sql/v0/sql.cpp @@ -3067,7 +3067,7 @@ TSourcePtr TSqlSelect::ReduceCore(const TRule_reduce_core& node, const TWriteSet udf->SetLabel(IdOrString(node.GetBlock10().GetRule_id_or_string2(), *this)); } - const auto reduceMode = node.HasBlock8() ? ReduceMode::ByAll : ReduceMode::ByPartition; + const auto reduceMode = node.HasBlock8() ? EReduceMode::ByAll : EReduceMode::ByPartition; return BuildReduce(startPos, reduceMode, std::move(source), std::move(orderBy), std::move(keys), std::move(args), udf, having, settings); } @@ -3969,7 +3969,7 @@ class TSqlIntoTable: public TSqlTranslation { }; TNodePtr TSqlIntoTable::Build(const TRule_into_table_stmt& node) { - static const TMap str2Mode = { + static const TMap Str2Mode = { {"InsertInto", ESQLWriteColumnMode::InsertInto}, {"InsertOrAbortInto", ESQLWriteColumnMode::InsertOrAbortInto}, {"InsertOrIgnoreInto", ESQLWriteColumnMode::InsertOrIgnoreInto}, @@ -4118,8 +4118,8 @@ TNodePtr TSqlIntoTable::Build(const TRule_into_table_stmt& node) { SqlIntoModeStr_ += "WithTruncate"; SqlIntoUserModeStr_ += " ... WITH TRUNCATE"; } - const auto iterMode = str2Mode.find(SqlIntoModeStr_); - YQL_ENSURE(iterMode != str2Mode.end(), "Invalid sql write mode string: " << SqlIntoModeStr_); + const auto iterMode = Str2Mode.find(SqlIntoModeStr_); + YQL_ENSURE(iterMode != Str2Mode.end(), "Invalid sql write mode string: " << SqlIntoModeStr_); const auto SqlIntoMode = iterMode->second; TPosition pos(Ctx_.Pos()); diff --git a/yql/essentials/sql/v0/sql_ut.cpp b/yql/essentials/sql/v0/sql_ut.cpp index cfd44605d736..e3874398f16e 100644 --- a/yql/essentials/sql/v0/sql_ut.cpp +++ b/yql/essentials/sql/v0/sql_ut.cpp @@ -169,13 +169,13 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) { TVerifyLineFunc verifyLine = [](const TString& word, const TString& line) { if (word == "FlattenMembers") { - static ui32 count1 = 0; - if (++count1 == 1) { + static ui32 Count1 = 0; + if (++Count1 == 1) { UNIT_ASSERT_VALUES_UNEQUAL(TString::npos, line.find("interested_table.")); } } else if (word == "AsStruct") { - static ui32 count2 = 0; - if (++count2 == 2) { + static ui32 Count2 = 0; + if (++Count2 == 2) { UNIT_ASSERT_VALUES_UNEQUAL(TString::npos, line.find("megahelpful_len")); } } @@ -192,13 +192,13 @@ Y_UNIT_TEST_SUITE(SqlParsingOnly) { TVerifyLineFunc verifyLine = [](const TString& word, const TString& line) { if (word == "FlattenMembers") { - static ui32 count1 = 0; - if (++count1 == 1) { + static ui32 Count1 = 0; + if (++Count1 == 1) { UNIT_ASSERT_VALUES_UNEQUAL(TString::npos, line.find("interested_table.")); } } else if (word == "AsStruct") { - static ui32 count2 = 0; - if (++count2 == 2) { + static ui32 Count2 = 0; + if (++Count2 == 2) { UNIT_ASSERT_VALUES_UNEQUAL(TString::npos, line.find("megahelpful_len")); } } diff --git a/yql/essentials/sql/v1/builtin.cpp b/yql/essentials/sql/v1/builtin.cpp index 8971c207dd8e..67ab413d9fce 100644 --- a/yql/essentials/sql/v1/builtin.cpp +++ b/yql/essentials/sql/v1/builtin.cpp @@ -1308,9 +1308,9 @@ static const TSet AvailableDataTypes = {"Bool", "String", "Uint32", "Ui "Date32", "Datetime64", "Timestamp64", "Interval64", "TzDate32", "TzDatetime64", "TzTimestamp64"}; TNodePtr GetDataTypeStringNode(TContext& ctx, TCallNode& node, unsigned argNum, TString* outTypeStrPtr = nullptr) { auto errMsgFunc = [&node, argNum]() { - static std::array numToName = {{"first", "second"}}; + static std::array NumToName = {{"first", "second"}}; TStringBuilder sb; - sb << "At " << numToName.at(argNum) << " argument of " << node.GetOpName() << " expected type string, available one of: " + sb << "At " << NumToName.at(argNum) << " argument of " << node.GetOpName() << " expected type string, available one of: " << JoinRange(", ", AvailableDataTypes.begin(), AvailableDataTypes.end()) << ";"; return TString(sb); }; diff --git a/yql/essentials/sql/v1/complete/analysis/global/evaluate.cpp b/yql/essentials/sql/v1/complete/analysis/global/evaluate.cpp index 74b4266c1715..62e974eb587a 100644 --- a/yql/essentials/sql/v1/complete/analysis/global/evaluate.cpp +++ b/yql/essentials/sql/v1/complete/analysis/global/evaluate.cpp @@ -196,11 +196,11 @@ class TVisitor: public SQLv1Antlr4BaseVisitor { } TMaybe GetContent(antlr4::tree::TerminalNode* node) const { - static RE2 regex(R"re(["']([^"'\\]*)["'])re"); + static RE2 Regex(R"re(["']([^"'\\]*)["'])re"); TString text = GetText(node); TString content; - if (!RE2::FullMatch(text, regex, &content)) { + if (!RE2::FullMatch(text, Regex, &content)) { return Nothing(); } diff --git a/yql/essentials/sql/v1/context.cpp b/yql/essentials/sql/v1/context.cpp index 1617f1d348c2..5ff1d3d85944 100644 --- a/yql/essentials/sql/v1/context.cpp +++ b/yql/essentials/sql/v1/context.cpp @@ -529,7 +529,7 @@ TScopedStatePtr TContext::CreateScopedState() const { } TMaybe GetFunctionArgColumnStatus(TContext& ctx, const TString& module, const TString& func, size_t argIndex) { - static const TSet denyForAllArgs = { + static const TSet DenyForAllArgs = { "datatype", "optionaltype", "listtype", @@ -551,7 +551,7 @@ TMaybe GetFunctionArgColumnStatus(TContext& ctx, const TString& "callableargumenttype", "variantunderlyingtype", }; - static const TMap, EColumnRefState> positionalArgsCustomStatus = { + static const TMap, EColumnRefState> PositionalArgsCustomStatus = { {{"frombytes", 1}, EColumnRefState::Deny}, {{"enum", 0}, EColumnRefState::Deny}, {{"asenum", 0}, EColumnRefState::Deny}, @@ -598,12 +598,12 @@ TMaybe GetFunctionArgColumnStatus(TContext& ctx, const TString& return ctx.GetTopLevelColumnReferenceState(); } - if (denyForAllArgs.contains(normalized)) { + if (DenyForAllArgs.contains(normalized)) { return EColumnRefState::Deny; } - auto it = positionalArgsCustomStatus.find(std::make_pair(normalized, argIndex)); - if (it != positionalArgsCustomStatus.end()) { + auto it = PositionalArgsCustomStatus.find(std::make_pair(normalized, argIndex)); + if (it != PositionalArgsCustomStatus.end()) { return it->second; } return {}; diff --git a/yql/essentials/sql/v1/highlight/sql_highlight.cpp b/yql/essentials/sql/v1/highlight/sql_highlight.cpp index b50a8585b0ad..45554f777052 100644 --- a/yql/essentials/sql/v1/highlight/sql_highlight.cpp +++ b/yql/essentials/sql/v1/highlight/sql_highlight.cpp @@ -19,7 +19,7 @@ namespace NSQLHighlight { using NSQLTranslationV1::Merged; using NSQLTranslationV1::TRegexPattern; -struct Syntax { +struct TSyntax { const NSQLReflect::TLexerGrammar* Grammar; THashMap RegexesDefault; THashMap RegexesANSI; @@ -51,10 +51,10 @@ NSQLTranslationV1::TRegexPattern CaseInsensitive(TStringBuf text) { } template -TUnit MakeUnit(Syntax& syntax); +TUnit MakeUnit(TSyntax& syntax); template <> -TUnit MakeUnit(Syntax& s) { +TUnit MakeUnit(TSyntax& s) { using NSQLReflect::TLexerGrammar; TUnit unit = {.Kind = EUnitKind::Keyword}; @@ -73,7 +73,7 @@ TUnit MakeUnit(Syntax& s) { } template <> -TUnit MakeUnit(Syntax& s) { +TUnit MakeUnit(TSyntax& s) { TUnit unit = {.Kind = EUnitKind::Punctuation}; for (const auto& name : s.Grammar->PunctuationNames) { const TString content = s.Get(name); @@ -87,7 +87,7 @@ TUnit MakeUnit(Syntax& s) { } template <> -TUnit MakeUnit(Syntax& s) { +TUnit MakeUnit(TSyntax& s) { return { .Kind = EUnitKind::QuotedIdentifier, .Patterns = { @@ -98,7 +98,7 @@ TUnit MakeUnit(Syntax& s) { } template <> -TUnit MakeUnit(Syntax& s) { +TUnit MakeUnit(TSyntax& s) { return { .Kind = EUnitKind::BindParameterIdentifier, .Patterns = { @@ -109,7 +109,7 @@ TUnit MakeUnit(Syntax& s) { } template <> -TUnit MakeUnit(Syntax& s) { +TUnit MakeUnit(TSyntax& s) { return { .Kind = EUnitKind::OptionIdentifier, .Patterns = { @@ -124,7 +124,7 @@ TUnit MakeUnit(Syntax& s) { } template <> -TUnit MakeUnit(Syntax& s) { +TUnit MakeUnit(TSyntax& s) { TVector types; for (const TString& type : LoadTypes()) { types.emplace_back(CaseInsensitive(type)); @@ -140,7 +140,7 @@ TUnit MakeUnit(Syntax& s) { }; } -TUnit MakeUnitUDF(Syntax& s) { +TUnit MakeUnitUDF(TSyntax& s) { return { .Kind = EUnitKind::FunctionIdentifier, .Patterns = { @@ -149,7 +149,7 @@ TUnit MakeUnitUDF(Syntax& s) { }; } -TUnit MakeUnitBuiltin(Syntax& s) { +TUnit MakeUnitBuiltin(TSyntax& s) { return { .Kind = EUnitKind::FunctionIdentifier, .Patterns = { @@ -159,7 +159,7 @@ TUnit MakeUnitBuiltin(Syntax& s) { } template <> -TUnit MakeUnit(Syntax& s) { +TUnit MakeUnit(TSyntax& s) { return { .Kind = EUnitKind::Identifier, .Patterns = { @@ -169,7 +169,7 @@ TUnit MakeUnit(Syntax& s) { } template <> -TUnit MakeUnit(Syntax& s) { +TUnit MakeUnit(TSyntax& s) { return { .Kind = EUnitKind::Literal, .Patterns = { @@ -183,7 +183,7 @@ TUnit MakeUnit(Syntax& s) { } template <> -TUnit MakeUnit(Syntax& s) { +TUnit MakeUnit(TSyntax& s) { return { .Kind = EUnitKind::StringLiteral, .RangePatterns = { @@ -202,7 +202,7 @@ TUnit MakeUnit(Syntax& s) { } template <> -TUnit MakeUnit(Syntax& s) { +TUnit MakeUnit(TSyntax& s) { return { .Kind = EUnitKind::Comment, .RangePatterns = {{R"(/*)", R"(*/)"}}, @@ -213,7 +213,7 @@ TUnit MakeUnit(Syntax& s) { } template <> -TUnit MakeUnit(Syntax& s) { +TUnit MakeUnit(TSyntax& s) { return { .Kind = EUnitKind::Whitespace, .Patterns = { @@ -224,10 +224,10 @@ TUnit MakeUnit(Syntax& s) { }; } -Syntax MakeSyntax(const NSQLReflect::TLexerGrammar& grammar) { +TSyntax MakeSyntax(const NSQLReflect::TLexerGrammar& grammar) { using NSQLTranslationV1::MakeRegexByOtherName; - Syntax syntax; + TSyntax syntax; syntax.Grammar = &grammar; for (auto& [k, v] : MakeRegexByOtherName(*syntax.Grammar, /* ansi = */ false)) { syntax.RegexesDefault.emplace(std::move(k), std::move(v)); @@ -243,7 +243,7 @@ THighlighting MakeHighlighting() { } THighlighting MakeHighlighting(const NSQLReflect::TLexerGrammar& grammar) { - Syntax s = MakeSyntax(grammar); + TSyntax s = MakeSyntax(grammar); THighlighting h; h.Units.emplace_back(MakeUnit(s)); diff --git a/yql/essentials/sql/v1/join.cpp b/yql/essentials/sql/v1/join.cpp index 325eb877bbf8..59ad557d9ab5 100644 --- a/yql/essentials/sql/v1/join.cpp +++ b/yql/essentials/sql/v1/join.cpp @@ -146,8 +146,8 @@ class TJoinBase: public IJoin { TNodePtr BuildJoinKeys(TContext& ctx, const TVector& names) override { const size_t n = JoinOps_.size(); TString what(Sources_[n]->GetLabel()); - static const TSet noRightSourceJoinOps = {"LeftOnly", "LeftSemi"}; - for (size_t nn = n; nn > 0 && noRightSourceJoinOps.contains(JoinOps_[nn - 1]); --nn) { + static const TSet NoRightSourceJoinOps = {"LeftOnly", "LeftSemi"}; + for (size_t nn = n; nn > 0 && NoRightSourceJoinOps.contains(JoinOps_[nn - 1]); --nn) { what = Sources_[nn - 1]->GetLabel(); } const TString with(Sources_[n + 1]->GetLabel()); diff --git a/yql/essentials/sql/v1/lexer/lexer_ut.cpp b/yql/essentials/sql/v1/lexer/lexer_ut.cpp index a79f3d077bd0..18a8ca58231b 100644 --- a/yql/essentials/sql/v1/lexer/lexer_ut.cpp +++ b/yql/essentials/sql/v1/lexer/lexer_ut.cpp @@ -147,7 +147,7 @@ Y_UNIT_TEST(UnsupportedIssues) { } Y_UNIT_TEST_ON_EACH_LEXER(AntlrAndFlavorIndependent) { - static const TVector queries = { + static const TVector Queries = { "", " ", "SELECT", @@ -165,7 +165,7 @@ Y_UNIT_TEST_ON_EACH_LEXER(AntlrAndFlavorIndependent) { "\"select\"select", }; - static TVector expectations(queries.size()); + static TVector Expectations(Queries.size()); if (ANSI) { return; @@ -173,9 +173,9 @@ Y_UNIT_TEST_ON_EACH_LEXER(AntlrAndFlavorIndependent) { auto lexer = MakeLexer(Lexers, ANSI, ANTLR4, FLAVOR); - for (size_t i = 0; i < queries.size(); ++i) { - const auto& query = queries[i]; - auto& expected = expectations[i]; + for (size_t i = 0; i < Queries.size(); ++i) { + const auto& query = Queries[i]; + auto& expected = Expectations[i]; if (expected.empty()) { expected = Tokenized(lexer, query); @@ -469,7 +469,7 @@ Y_UNIT_TEST_ON_EACH_LEXER(AsciiEscape) { } Y_UNIT_TEST_ON_EACH_LEXER(AsciiEscapeCanon) { - static THashMap canon; + static THashMap Canon; auto lexer = MakeLexer(Lexers, ANSI, ANTLR4, FLAVOR); @@ -477,7 +477,7 @@ Y_UNIT_TEST_ON_EACH_LEXER(AsciiEscapeCanon) { TString input; input += c; - TString& expected = canon[c]; + TString& expected = Canon[c]; if (expected.empty()) { expected = Tokenized(lexer, input); } diff --git a/yql/essentials/sql/v1/node.cpp b/yql/essentials/sql/v1/node.cpp index 7d92c5b15ffc..4720a2e3e58f 100644 --- a/yql/essentials/sql/v1/node.cpp +++ b/yql/essentials/sql/v1/node.cpp @@ -3254,10 +3254,10 @@ TNodePtr BuildBinaryOp(TContext& ctx, TPosition pos, const TString& opName, TNod return nullptr; } - static const THashSet nullSafeOps = { + static const THashSet NullSafeOps = { "IsDistinctFrom", "IsNotDistinctFrom", "EqualsIgnoreCase", "StartsWithIgnoreCase", "EndsWithIgnoreCase", "StringContainsIgnoreCase"}; - if (!nullSafeOps.contains(opName)) { + if (!NullSafeOps.contains(opName)) { const bool bothArgNull = a->IsNull() && b->IsNull(); const bool oneArgNull = a->IsNull() || b->IsNull(); @@ -3645,12 +3645,12 @@ TNodePtr BuildNamedExpr(TNodePtr parent) { return new TNamedExprNode(parent); } -bool TSecretParameters::ValidateParameters(TContext& ctx, const TPosition stmBeginPos, const TSecretParameters::TOperationMode mode) { +bool TSecretParameters::ValidateParameters(TContext& ctx, const TPosition stmBeginPos, const TSecretParameters::EOperationMode mode) { if (!Value) { ctx.Error(stmBeginPos) << "parameter VALUE must be set"; return false; } - if (mode == TOperationMode::Alter) { + if (mode == EOperationMode::Alter) { if (InheritPermissions) { ctx.Error(stmBeginPos) << "parameter INHERIT_PERMISSIONS is not supported for alter operation"; return false; diff --git a/yql/essentials/sql/v1/node.h b/yql/essentials/sql/v1/node.h index 1e80486a4e19..913ba2785d96 100644 --- a/yql/essentials/sql/v1/node.h +++ b/yql/essentials/sql/v1/node.h @@ -1362,7 +1362,7 @@ struct TSequenceParameters { class TSecretParameters { public: - enum class TOperationMode { + enum class EOperationMode { Create, Alter, }; @@ -1371,7 +1371,7 @@ class TSecretParameters { TMaybe InheritPermissions; public: - bool ValidateParameters(TContext& ctx, const TPosition stmBeginPos, const TSecretParameters::TOperationMode mode); + bool ValidateParameters(TContext& ctx, const TPosition stmBeginPos, const TSecretParameters::EOperationMode mode); }; struct TTopicConsumerSettings { diff --git a/yql/essentials/sql/v1/select.cpp b/yql/essentials/sql/v1/select.cpp index a33c5cdae53d..d0efdee1bd9a 100644 --- a/yql/essentials/sql/v1/select.cpp +++ b/yql/essentials/sql/v1/select.cpp @@ -984,7 +984,7 @@ static bool IsComparableExpression(TContext& ctx, const TNodePtr& expr, bool ass class TReduceSource: public IRealSource { public: TReduceSource(TPosition pos, - ReduceMode mode, + EReduceMode mode, TSourcePtr source, TVector&& orderBy, TVector&& keys, @@ -1103,7 +1103,7 @@ class TReduceSource: public IRealSource { TNodePtr processPartitions; if (ListCall_) { - if (Mode_ != ReduceMode::ByAll) { + if (Mode_ != EReduceMode::ByAll) { ctx.Error(Pos_) << "TableRows() must be used only with USING ALL"; return nullptr; } @@ -1112,7 +1112,7 @@ class TReduceSource: public IRealSource { processPartitions = Y("SqlReduce", "partitionStream", BuildQuotedAtom(Pos_, "byAllList", TNodeFlags::Default), Udf_, expr); } else { switch (Mode_) { - case ReduceMode::ByAll: { + case EReduceMode::ByAll: { auto columnPtr = Args_[0]->GetColumnName(); TNodePtr expr = BuildAtom(Pos_, "partitionStream"); if (!columnPtr || *columnPtr != "*") { @@ -1123,7 +1123,7 @@ class TReduceSource: public IRealSource { processPartitions = Y("SqlReduce", "partitionStream", BuildQuotedAtom(Pos_, "byAll", TNodeFlags::Default), Udf_, expr); break; } - case ReduceMode::ByPartition: { + case EReduceMode::ByPartition: { processPartitions = Y("SqlReduce", "partitionStream", extractKeyLambda, Udf_, BuildLambda(Pos_, Y("row"), Args_[0])); break; @@ -1138,7 +1138,7 @@ class TReduceSource: public IRealSource { sortKeySelector = BuildLambda(Pos_, Y("row"), Y("SqlExtractKey", "row", sortKeySelector)); } - auto partitionByKey = Y(!ListCall_ && Mode_ == ReduceMode::ByAll ? "PartitionByKey" : "PartitionsByKeys", "core", extractKeyLambda, + auto partitionByKey = Y(!ListCall_ && Mode_ == EReduceMode::ByAll ? "PartitionByKey" : "PartitionsByKeys", "core", extractKeyLambda, sortDirection, sortKeySelector, BuildLambda(Pos_, Y("partitionStream"), processPartitions)); auto inputLabel = ListCall_ ? "inputRowsList" : "core"; @@ -1190,7 +1190,7 @@ class TReduceSource: public IRealSource { } private: - ReduceMode Mode_; + EReduceMode Mode_; TSourcePtr Source_; TVector OrderBy_; TVector Keys_; @@ -1203,7 +1203,7 @@ class TReduceSource: public IRealSource { }; TSourcePtr BuildReduce(TPosition pos, - ReduceMode mode, + EReduceMode mode, TSourcePtr source, TVector&& orderBy, TVector&& keys, @@ -3009,8 +3009,8 @@ class TSkipTakeNode final: public TAstListNode { if (skip) { select = Y("Skip", select, Y("Coalesce", skip, Y("Uint64", Q("0")))); } - static const TString uiMax = ::ToString(std::numeric_limits::max()); - Add("let", "select", Y("Take", select, Y("Coalesce", take, Y("Uint64", Q(uiMax))))); + static const TString Max = ::ToString(std::numeric_limits::max()); + Add("let", "select", Y("Take", select, Y("Coalesce", take, Y("Uint64", Q(Max))))); } TPtr DoClone() const final { diff --git a/yql/essentials/sql/v1/source.h b/yql/essentials/sql/v1/source.h index 6c52af6be1f4..7e1323442b51 100644 --- a/yql/essentials/sql/v1/source.h +++ b/yql/essentials/sql/v1/source.h @@ -284,11 +284,12 @@ TSourcePtr BuildSelectCore( TSourcePtr BuildSelect(TPosition pos, TSourcePtr source, TNodePtr skipTake); TSourcePtr BuildAnyColumnSource(TPosition pos); -enum class ReduceMode { +enum class EReduceMode { ByPartition, ByAll, }; -TSourcePtr BuildReduce(TPosition pos, ReduceMode mode, TSourcePtr source, TVector&& orderBy, + +TSourcePtr BuildReduce(TPosition pos, EReduceMode mode, TSourcePtr source, TVector&& orderBy, TVector&& keys, TVector&& args, TNodePtr udf, TNodePtr having, const TWriteSettings& settings, const TVector& assumeOrderBy, bool listCall); TSourcePtr BuildProcess(TPosition pos, TSourcePtr source, TNodePtr with, bool withExtFunction, TVector&& terms, bool listCall, diff --git a/yql/essentials/sql/v1/sql_into_tables.cpp b/yql/essentials/sql/v1/sql_into_tables.cpp index 30200cc85152..dbbccfea35f8 100644 --- a/yql/essentials/sql/v1/sql_into_tables.cpp +++ b/yql/essentials/sql/v1/sql_into_tables.cpp @@ -10,7 +10,7 @@ namespace NSQLTranslationV1 { using namespace NSQLv1Generated; TNodePtr TSqlIntoTable::Build(const TRule_into_table_stmt& node) { - static const TMap str2Mode = { + static const TMap Str2Mode = { {"InsertInto", ESQLWriteColumnMode::InsertInto}, {"InsertOrAbortInto", ESQLWriteColumnMode::InsertOrAbortInto}, {"InsertOrIgnoreInto", ESQLWriteColumnMode::InsertOrIgnoreInto}, @@ -179,8 +179,8 @@ TNodePtr TSqlIntoTable::Build(const TRule_into_table_stmt& node) { SqlIntoModeStr_ += "WithTruncate"; SqlIntoUserModeStr_ += " ... WITH TRUNCATE"; } - const auto iterMode = str2Mode.find(SqlIntoModeStr_); - YQL_ENSURE(iterMode != str2Mode.end(), "Invalid sql write mode string: " << SqlIntoModeStr_); + const auto iterMode = Str2Mode.find(SqlIntoModeStr_); + YQL_ENSURE(iterMode != Str2Mode.end(), "Invalid sql write mode string: " << SqlIntoModeStr_); const auto SqlIntoMode = iterMode->second; TPosition pos(Ctx_.Pos()); diff --git a/yql/essentials/sql/v1/sql_query.cpp b/yql/essentials/sql/v1/sql_query.cpp index 966d893e662b..e9ebc2ce74fc 100644 --- a/yql/essentials/sql/v1/sql_query.cpp +++ b/yql/essentials/sql/v1/sql_query.cpp @@ -2194,7 +2194,7 @@ bool TSqlQuery::Statement(TVector& blocks, const TRule_sql_stmt_core& stmBeginPos, node.GetRule_with_secret_settings4(), secretParams, - TSecretParameters::TOperationMode::Create)) { + TSecretParameters::EOperationMode::Create)) { return false; } @@ -2233,7 +2233,7 @@ bool TSqlQuery::Statement(TVector& blocks, const TRule_sql_stmt_core& stmBeginPos, node.GetRule_with_secret_settings4(), secretParams, - TSecretParameters::TOperationMode::Alter)) { + TSecretParameters::EOperationMode::Alter)) { return false; } @@ -3680,7 +3680,7 @@ TMaybe TSqlQuery::PragmaStatement(const TRule_pragma_stmt& stmt) { } const bool withConfigure = prefix || normalizedPragma == "file" || normalizedPragma == "folder" || normalizedPragma == "udf" || normalizedPragma == "layer"; - static const THashSet lexicalScopePragmas = { + static const THashSet LexicalScopePragmas = { "classicdivision", "strictjoinkeytypes", "disablestrictjoinkeytypes", @@ -3692,7 +3692,7 @@ TMaybe TSqlQuery::PragmaStatement(const TRule_pragma_stmt& stmt) { "simplepg", "disablesimplepg", }; - const bool hasLexicalScope = withConfigure || lexicalScopePragmas.contains(normalizedPragma); + const bool hasLexicalScope = withConfigure || LexicalScopePragmas.contains(normalizedPragma); const bool withFileAlias = normalizedPragma == "file" || normalizedPragma == "folder" || normalizedPragma == "library" || normalizedPragma == "udf"; const bool allowTopLevelPragmas = TopLevel_ || AllowTopLevelPragmas_; for (auto pragmaValue : pragmaValues) { diff --git a/yql/essentials/sql/v1/sql_select.cpp b/yql/essentials/sql/v1/sql_select.cpp index ac84e2377821..11074e1decba 100644 --- a/yql/essentials/sql/v1/sql_select.cpp +++ b/yql/essentials/sql/v1/sql_select.cpp @@ -947,7 +947,7 @@ TSourcePtr TSqlSelect::ReduceCore(const TRule_reduce_core& node, const TWriteSet udf->SetLabel(Id(node.GetBlock10().GetRule_an_id2(), *this)); } - const auto reduceMode = node.HasBlock8() ? ReduceMode::ByAll : ReduceMode::ByPartition; + const auto reduceMode = node.HasBlock8() ? EReduceMode::ByAll : EReduceMode::ByPartition; TVector assumeOrderBy; if (node.HasBlock13()) { diff --git a/yql/essentials/sql/v1/sql_translation.cpp b/yql/essentials/sql/v1/sql_translation.cpp index 6b9250d28ef3..41309eca6d54 100644 --- a/yql/essentials/sql/v1/sql_translation.cpp +++ b/yql/essentials/sql/v1/sql_translation.cpp @@ -4034,8 +4034,8 @@ bool TSqlTranslation::RoleNameClause(const TRule_role_name& node, TDeferredAtom& } if (auto literalName = result.GetLiteral(); literalName && !allowSystemRoles) { - static const THashSet systemRoles = {"current_role", "current_user", "session_user"}; - if (systemRoles.contains(to_lower(*literalName))) { + static const THashSet SystemRoles = {"current_role", "current_user", "session_user"}; + if (SystemRoles.contains(to_lower(*literalName))) { Ctx_.Error() << "System role " << to_upper(*literalName) << " can not be used here"; return false; } @@ -5348,7 +5348,7 @@ bool TSqlTranslation::ParseSecretSettings( const TPosition pos, const TRule_with_secret_settings& settingsNode, TSecretParameters& secretParams, - const TSecretParameters::TOperationMode mode) { + const TSecretParameters::EOperationMode mode) { // with_secret_settings: WITH LPAREN secret_setting_entry (COMMA secret_setting_entry)* RPAREN; auto tryStoreEntry = [&](const auto& entry) -> bool { return StoreSecretSettingEntry( @@ -5387,7 +5387,7 @@ bool TSqlTranslation::ParseSecretId(const TRule_id_or_at& node, TString& objectI } bool TSqlTranslation::ValidateAuthMethod(const std::map& result) { - const static TSet allAuthFields{ + const static TSet AllAuthFields{ "service_account_id", "service_account_secret_name", "login", @@ -5396,7 +5396,7 @@ bool TSqlTranslation::ValidateAuthMethod(const std::map& "aws_secret_access_key_secret_name", "aws_region", "token_secret_name"}; - const static TMap> authMethodFields{ + const static TMap> AuthMethodFields{ {"NONE", {}}, {"SERVICE_ACCOUNT", {"service_account_id", "service_account_secret_name"}}, {"BASIC", {"login", "password_secret_name"}}, @@ -5409,13 +5409,13 @@ bool TSqlTranslation::ValidateAuthMethod(const std::map& return false; } const auto& authMethod = *authMethodIt->second.GetLiteral(); - auto it = authMethodFields.find(authMethod); - if (it == authMethodFields.end()) { + auto it = AuthMethodFields.find(authMethod); + if (it == AuthMethodFields.end()) { Ctx_.Error() << "Unknown AUTH_METHOD = " << authMethod; return false; } const auto& currentAuthFields = it->second; - for (const auto& authField : allAuthFields) { + for (const auto& authField : AllAuthFields) { if (currentAuthFields.contains(authField) && !result.contains(TString{authField})) { Ctx_.Error() << to_upper(TString{authField}) << " requires key"; return false; @@ -5563,7 +5563,7 @@ bool TSqlTranslation::ParseViewQuery( namespace { static TString GetLambdaText(TTranslation& ctx, TContext& Ctx, const TRule_lambda_or_parameter& lambdaOrParameter) { - static const TString statementSeparator = ";\n"; + static const TString StatementSeparator = ";\n"; TVector statements; NYql::TIssues issues; @@ -5599,14 +5599,14 @@ static TString GetLambdaText(TTranslation& ctx, TContext& Ctx, const TRule_lambd return {}; } - result << "$__ydb_transfer_lambda = " << Ctx.Query.substr(begin, end - begin + endToken->value().size()) << statementSeparator; + result << "$__ydb_transfer_lambda = " << Ctx.Query.substr(begin, end - begin + endToken->value().size()) << StatementSeparator; return result; } case NSQLv1Generated::TRule_lambda_or_parameter::kAltLambdaOrParameter2: { const auto& valueBlock = lambdaOrParameter.GetAlt_lambda_or_parameter2().GetRule_bind_parameter1().GetBlock2(); const auto id = Id(valueBlock.GetAlt1().GetRule_an_id_or_type1(), ctx); - result << "$__ydb_transfer_lambda = $" << id << statementSeparator; + result << "$__ydb_transfer_lambda = $" << id << StatementSeparator; return result; } case NSQLv1Generated::TRule_lambda_or_parameter::ALT_NOT_SET: diff --git a/yql/essentials/sql/v1/sql_translation.h b/yql/essentials/sql/v1/sql_translation.h index 4975f4c90bb9..e0bd73eaa258 100644 --- a/yql/essentials/sql/v1/sql_translation.h +++ b/yql/essentials/sql/v1/sql_translation.h @@ -245,7 +245,7 @@ class TSqlTranslation: public TTranslation { bool ParseObjectFeatures(std::map& result, const TRule_object_features& features); bool ParseExternalDataSourceSettings(std::map& result, const TRule_with_table_settings& settings); bool ParseExternalDataSourceSettings(std::map& result, std::set& toReset, const TRule_alter_external_data_source_action& alterActions); - bool ParseSecretSettings(const TPosition stmBeginPos, const TRule_with_secret_settings& settings, TSecretParameters& secretParams, const TSecretParameters::TOperationMode mode); + bool ParseSecretSettings(const TPosition stmBeginPos, const TRule_with_secret_settings& settings, TSecretParameters& secretParams, const TSecretParameters::EOperationMode mode); [[nodiscard]] bool ParseSecretId(const TRule_id_or_at& node, TString& objectId); bool ParseViewOptions(std::map& features, const TRule_with_table_settings& options); bool ParseViewQuery(std::map& features, const TRule_select_stmt& query); diff --git a/yql/essentials/sql/v1/sql_ut_common.h b/yql/essentials/sql/v1/sql_ut_common.h index 1892131d26d1..d72f60a376ff 100644 --- a/yql/essentials/sql/v1/sql_ut_common.h +++ b/yql/essentials/sql/v1/sql_ut_common.h @@ -272,14 +272,14 @@ Y_UNIT_TEST(QualifiedAsteriskBefore) { UNIT_ASSERT(res.Root); TVerifyLineFunc verifyLine = [](const TString& word, const TString& line) { - static bool seenStar = false; + static bool SeenStar = false; if (word == "FlattenMembers") { UNIT_ASSERT_VALUES_UNEQUAL(TString::npos, line.find("interested_table.")); } else if (word == "SqlProjectItem") { UNIT_ASSERT_VALUES_UNEQUAL(TString::npos, line.find(Quote("megahelpful_len"))); - UNIT_ASSERT_VALUES_EQUAL(seenStar, true); + UNIT_ASSERT_VALUES_EQUAL(SeenStar, true); } else if (word == "SqlProjectStarItem") { - seenStar = true; + SeenStar = true; } }; TWordCountHive elementStat = {{TString("FlattenMembers"), 0}, {TString("SqlProjectItem"), 0}, {TString("SqlProjectStarItem"), 0}}; @@ -296,14 +296,14 @@ Y_UNIT_TEST(QualifiedAsteriskAfter) { UNIT_ASSERT(res.Root); TVerifyLineFunc verifyLine = [](const TString& word, const TString& line) { - static bool seenStar = false; + static bool SeenStar = false; if (word == "FlattenMembers") { UNIT_ASSERT_VALUES_UNEQUAL(TString::npos, line.find("interested_table.")); } else if (word == "SqlProjectItem") { UNIT_ASSERT_VALUES_UNEQUAL(TString::npos, line.find(Quote("megahelpful_len"))); - UNIT_ASSERT_VALUES_EQUAL(seenStar, false); + UNIT_ASSERT_VALUES_EQUAL(SeenStar, false); } else if (word == "SqlProjectStarItem") { - seenStar = true; + SeenStar = true; } }; TWordCountHive elementStat = {{TString("FlattenMembers"), 0}, {TString("SqlProjectItem"), 0}, {TString("SqlProjectStarItem"), 0}}; diff --git a/yql/essentials/tools/pgrun/pgrun.cpp b/yql/essentials/tools/pgrun/pgrun.cpp index 7f8cfec4a016..4617ee333680 100644 --- a/yql/essentials/tools/pgrun/pgrun.cpp +++ b/yql/essentials/tools/pgrun/pgrun.cpp @@ -67,7 +67,7 @@ bool IsEscapedChar(const TString& s, size_t pos) { class TStatementIterator final : public TInputRangeAdaptor { - enum class State { + enum class EState { InOperator, EndOfOperator, LineComment, @@ -86,21 +86,21 @@ class TStatementIterator final : Program_(std::move(program)) , Cur_() , Pos_(0) - , State_(State::InOperator) + , State_(EState::InOperator) , AtStmtStart_(true) - , Mode_(State::InOperator) + , Mode_(EState::InOperator) , Depth_(0) , Tag_() , StandardConformingStrings_(true) { } - static bool IsInWsSignificantState(State state) { + static bool IsInWsSignificantState(EState state) { switch (state) { - case State::QuotedIdentifier: - case State::StringLiteral: - case State::EscapedStringLiteral: - case State::DollarStringLiteral: + case EState::QuotedIdentifier: + case EState::StringLiteral: + case EState::EscapedStringLiteral: + case EState::DollarStringLiteral: return true; default: return false; @@ -282,10 +282,10 @@ class TStatementIterator final bool InOperatorParser(size_t startPos) { // need \ to detect psql meta-commands - static const TString midNextTokens{"'\";-/$\\"}; + static const TString MidNextTokens{"'\";-/$\\"}; // need : for basic psql-vars support - static const TString initNextTokens{"'\";-/$\\:"}; - const auto& nextTokens = (AtStmtStart_) ? initNextTokens : midNextTokens; + static const TString InitNextTokens{"'\";-/$\\:"}; + const auto& nextTokens = (AtStmtStart_) ? InitNextTokens : MidNextTokens; if (AtStmtStart_) { Pos_ = Program_.find_first_not_of(" \t\n\r\v", Pos_); @@ -303,30 +303,30 @@ class TStatementIterator final switch (Program_[Pos_]) { case '\'': State_ = (!StandardConformingStrings_ || 0 < Pos_ && std::toupper(Program_[Pos_ - 1]) == 'E') - ? State::EscapedStringLiteral - : State::StringLiteral; + ? EState::EscapedStringLiteral + : EState::StringLiteral; break; case '"': - State_ = State::QuotedIdentifier; + State_ = EState::QuotedIdentifier; break; case ';': State_ = Mode_ = IsCopyFromStdin(startPos, Pos_) - ? State::InCopyFromStdin - : State::EndOfOperator; + ? EState::InCopyFromStdin + : EState::EndOfOperator; break; case '-': if (Pos_ < Program_.length() && Program_[Pos_ + 1] == '-') { - State_ = State::LineComment; + State_ = EState::LineComment; ++Pos_; } break; case '/': if (Pos_ < Program_.length() && Program_[Pos_ + 1] == '*') { - State_ = State::BlockComment; + State_ = EState::BlockComment; ++Depth_; ++Pos_; } @@ -335,14 +335,14 @@ class TStatementIterator final case '$': if (Pos_ == 0 || std::isspace(Program_[Pos_ - 1])) { if (SaveDollarTag()) { - State_ = State::DollarStringLiteral; + State_ = EState::DollarStringLiteral; } } break; case '\\': if (AtStmtStart_) { - State_ = State::InMetaCommand; + State_ = EState::InMetaCommand; } else if (Program_.Contains("\\gexec", Pos_)) { Pos_ += 6; return Emit(Program_[Pos_] == '\n'); @@ -351,7 +351,7 @@ class TStatementIterator final case ':': if (Pos_ == 0 || Program_[Pos_ - 1] == '\n') { - State_ = State::InVar; + State_ = EState::InVar; } break; } @@ -365,7 +365,7 @@ class TStatementIterator final } bool Emit(bool atEol) { - State_ = Mode_ = State::InOperator; + State_ = Mode_ = EState::InOperator; AtStmtStart_ = true; if (atEol) { @@ -395,14 +395,14 @@ class TStatementIterator final switch (*p) { case '-': if (Pos_ < Program_.length() && Program_[Pos_ + 1] == '-') { - State_ = State::LineComment; + State_ = EState::LineComment; ++Pos_; } break; case '/': if (Pos_ < Program_.length() && Program_[Pos_ + 1] == '*') { - State_ = State::BlockComment; + State_ = EState::BlockComment; ++Depth_; ++Pos_; } @@ -434,7 +434,7 @@ class TStatementIterator final return true; } - if (Mode_ == State::EndOfOperator) { + if (Mode_ == EState::EndOfOperator) { return Emit(false); } @@ -491,7 +491,7 @@ class TStatementIterator final return true; } - State_ = State::InOperator; + State_ = EState::InOperator; AtStmtStart_ = false; return false; @@ -510,7 +510,7 @@ class TStatementIterator final return true; } - State_ = State::InOperator; + State_ = EState::InOperator; AtStmtStart_ = false; return false; @@ -534,7 +534,7 @@ class TStatementIterator final return true; } - State_ = State::InOperator; + State_ = EState::InOperator; AtStmtStart_ = false; return false; @@ -557,7 +557,7 @@ class TStatementIterator final Tag_.Clear(); - State_ = State::InOperator; + State_ = EState::InOperator; AtStmtStart_ = false; return false; @@ -610,37 +610,37 @@ class TStatementIterator final bool CallParser(size_t startPos) { switch (State_) { - case State::InOperator: + case EState::InOperator: return InOperatorParser(startPos); - case State::EndOfOperator: + case EState::EndOfOperator: return EndOfOperatorParser(); - case State::LineComment: + case EState::LineComment: return LineCommentParser(); - case State::BlockComment: + case EState::BlockComment: return BlockCommentParser(); - case State::QuotedIdentifier: + case EState::QuotedIdentifier: return QuotedIdentifierParser(); - case State::StringLiteral: + case EState::StringLiteral: return StringLiteralParser(); - case State::EscapedStringLiteral: + case EState::EscapedStringLiteral: return EscapedStringLiteralParser(); - case State::DollarStringLiteral: + case EState::DollarStringLiteral: return DollarStringLiteralParser(); - case State::InMetaCommand: + case EState::InMetaCommand: return MetaCommandParser(); - case State::InCopyFromStdin: + case EState::InCopyFromStdin: return InCopyFromStdinParser(); - case State::InVar: + case EState::InVar: return VarParser(); default: @@ -661,10 +661,10 @@ class TStatementIterator final TString Program_; TString Cur_; size_t Pos_; - State State_; + EState State_; bool AtStmtStart_; - State Mode_; + EState Mode_; ui16 Depth_; TStringBuf Tag_; bool StandardConformingStrings_; @@ -768,15 +768,15 @@ inline const TString FormatNumeric(const TString& value) } const TString FormatFloat(const TString& value, std::function formatter) { - static const TString nan = "NaN"; - static const TString inf = "Infinity"; - static const TString minf = "-Infinity"; + static const TString Nan = "NaN"; + static const TString Inf = "Infinity"; + static const TString Minf = "-Infinity"; try { return (value == "") ? "" - : (value == "nan") ? nan - : (value == "inf") ? inf - : (value == "-inf") ? minf + : (value == "Nan") ? Nan + : (value == "Inf") ? Inf + : (value == "-Inf") ? Minf : formatter(value); } catch (const std::exception& e) { Cerr << "Unexpected float value '" << value << "'\n"; @@ -1291,9 +1291,9 @@ int Main(int argc, char* argv[]) PrintExprTo(program, Cerr); } - static const THashSet ignoredNodes{"CommitAll!", "Commit!"}; + static const THashSet IgnoredNodes{"CommitAll!", "Commit!"}; const auto opNode = NYql::FindNode(program->ExprRoot(), - [](const TExprNode::TPtr& node) { return !ignoredNodes.contains(node->Content()); }); + [](const TExprNode::TPtr& node) { return !IgnoredNodes.contains(node->Content()); }); if (opNode->IsCallable("Write!")) { Y_ENSURE(opNode->ChildrenSize() == 5); diff --git a/yql/essentials/tools/yql_facade_run/yql_facade_run.cpp b/yql/essentials/tools/yql_facade_run/yql_facade_run.cpp index 48c2a72f82d8..92c3a10a4718 100644 --- a/yql/essentials/tools/yql_facade_run/yql_facade_run.cpp +++ b/yql/essentials/tools/yql_facade_run/yql_facade_run.cpp @@ -158,11 +158,11 @@ TFacadeRunOptions::~TFacadeRunOptions() { void TFacadeRunOptions::InitLogger() { if (Verbosity != LOG_DEF_PRIORITY || ShowLog) { - NLog::ELevel level = NLog::ELevelHelpers::FromInt(Verbosity); + NLog::ELevel level = NLog::TLevelHelpers::FromInt(Verbosity); if (ShowLog) { level = Max(level, NLog::ELevel::DEBUG); } - NLog::EComponentHelpers::ForEach([level](NLog::EComponent c) { + NLog::TComponentHelpers::ForEach([level](NLog::EComponent c) { NYql::NLog::YqlLogger().SetComponentLevel(c, level); }); } diff --git a/yql/essentials/tools/yql_highlight/generator_textmate.cpp b/yql/essentials/tools/yql_highlight/generator_textmate.cpp index 2b4a9b93e962..6a032ab5ea51 100644 --- a/yql/essentials/tools/yql_highlight/generator_textmate.cpp +++ b/yql/essentials/tools/yql_highlight/generator_textmate.cpp @@ -217,21 +217,21 @@ TString EscapeXML(TString string) { } void WriteXML(IOutputStream& out, const NJson::TJsonValue& json, TString indent = "") { - static constexpr TStringBuf extra = " "; + static constexpr TStringBuf Extra = " "; if (TString string; json.GetString(&string)) { out << indent << "" << EscapeXML(string) << "" << "\n"; } else if (NJson::TJsonValue::TMapType dict; json.GetMap(&dict)) { out << indent << "" << '\n'; for (const auto& [key, value] : dict) { - out << indent << extra << "" << EscapeXML(key) << "" << '\n'; - WriteXML(out, value, indent + extra); + out << indent << Extra << "" << EscapeXML(key) << "" << '\n'; + WriteXML(out, value, indent + Extra); } out << indent << "" << '\n'; } else if (NJson::TJsonValue::TArray array; json.GetArray(&array)) { out << indent << "" << '\n'; for (const auto& value : array) { - WriteXML(out, value, indent + extra); + WriteXML(out, value, indent + Extra); } out << indent << "" << '\n'; } else { diff --git a/yql/essentials/udfs/common/datetime2/datetime_udf.cpp b/yql/essentials/udfs/common/datetime2/datetime_udf.cpp index f6ae912cb797..21a2a01e223c 100644 --- a/yql/essentials/udfs/common/datetime2/datetime_udf.cpp +++ b/yql/essentials/udfs/common/datetime2/datetime_udf.cpp @@ -13,7 +13,7 @@ using namespace NKikimr; using namespace NUdf; -using namespace NYql::DateTime; +using namespace NYql::NDateTime; extern const char SplitUDF[] = "Split"; extern const char ToDaysUDF[] = "ToDays"; @@ -195,8 +195,8 @@ class TToUnits { } static const TStringRef& Name() { - static auto name = TStringRef(TFuncName, std::strlen(TFuncName)); - return name; + static auto Name = TStringRef(TFuncName, std::strlen(TFuncName)); + return Name; } template @@ -386,8 +386,8 @@ struct TGetTimeComponent { typedef bool TTypeAwareMarker; static const TStringRef& Name() { - static auto name = TStringRef(TFuncName, std::strlen(TFuncName)); - return name; + static auto Name = TStringRef(TFuncName, std::strlen(TFuncName)); + return Name; } static bool DeclareSignature( @@ -593,7 +593,7 @@ template TUnboxedValuePod DoAddMonths(const TUnboxedValuePod& date, i64 months, const NUdf::IDateBuilder& builder) { auto result = date; auto& storage = Reference(result); - if (!NYql::DateTime::DoAddMonths(storage, months, builder)) { + if (!NYql::NDateTime::DoAddMonths(storage, months, builder)) { return TUnboxedValuePod{}; } return result; @@ -608,7 +608,7 @@ template TUnboxedValuePod DoAddYears(const TUnboxedValuePod& date, i64 years, const NUdf::IDateBuilder& builder) { auto result = date; auto& storage = Reference(result); - if (!NYql::DateTime::DoAddYears(storage, years, builder)) { + if (!NYql::NDateTime::DoAddYears(storage, years, builder)) { return TUnboxedValuePod{}; } return result; @@ -682,14 +682,14 @@ inline bool ValidateTimezoneId(ui16 timezoneId) { } inline bool ValidateMonthShortName(const std::string_view& monthName, ui8& month) { - static constexpr auto cmp = [](const std::string_view& a, const std::string_view& b) { + static constexpr auto Cmp = [](const std::string_view& a, const std::string_view& b) { int cmp = strnicmp(a.data(), b.data(), std::min(a.size(), b.size())); if (cmp == 0) { return a.size() < b.size(); } return cmp < 0; }; - static const std::map mp = { + static const std::map Mp = { {"jan", 1}, {"feb", 2}, {"mar", 3}, @@ -702,8 +702,8 @@ inline bool ValidateMonthShortName(const std::string_view& monthName, ui8& month {"oct", 10}, {"nov", 11}, {"dec", 12}}; - const auto& it = mp.find(monthName); - if (it != mp.end()) { + const auto& it = Mp.find(monthName); + if (it != Mp.end()) { month = it->second; return true; } @@ -711,14 +711,14 @@ inline bool ValidateMonthShortName(const std::string_view& monthName, ui8& month } inline bool ValidateMonthFullName(const std::string_view& monthName, ui8& month) { - static constexpr auto cmp = [](const std::string_view& a, const std::string_view& b) { + static constexpr auto Cmp = [](const std::string_view& a, const std::string_view& b) { int cmp = strnicmp(a.data(), b.data(), std::min(a.size(), b.size())); if (cmp == 0) { return a.size() < b.size(); } return cmp < 0; }; - static const std::map mp = { + static const std::map Mp = { {"january", 1}, {"february", 2}, {"march", 3}, @@ -731,8 +731,8 @@ inline bool ValidateMonthFullName(const std::string_view& monthName, ui8& month) {"october", 10}, {"november", 11}, {"december", 12}}; - const auto& it = mp.find(monthName); - if (it != mp.end()) { + const auto& it = Mp.find(monthName); + if (it != Mp.end()) { month = it->second; return true; } @@ -1300,9 +1300,10 @@ template TUnboxedValue GetMonthName(const IValueBuilder* valueBuilder, const TUnboxedValuePod& arg) { Y_UNUSED(valueBuilder); - static const std::array monthNames = {{TUnboxedValuePod::Embedded(TStringRef::Of("January")), + static const std::array MonthNames = {{TUnboxedValuePod::Embedded(TStringRef::Of("January")), TUnboxedValuePod::Embedded(TStringRef::Of("February")), TUnboxedValuePod::Embedded(TStringRef::Of("March")), TUnboxedValuePod::Embedded(TStringRef::Of("April")), @@ -1562,7 +1563,7 @@ TUnboxedValue GetMonthName(const IValueBuilder* valueBuilder, const TUnboxedValu TUnboxedValuePod::Embedded(TStringRef::Of("October")), TUnboxedValuePod::Embedded(TStringRef::Of("November")), TUnboxedValuePod::Embedded(TStringRef::Of("December"))}}; - return monthNames.at(GetMonth(arg) - 1U); + return MonthNames.at(GetMonth(arg) - 1U); } // struct TGetDayOfMonthKernelExec : TUnaryKernelExec, TFixedSizeArrayBuilder> { @@ -1581,14 +1582,14 @@ TUnboxedValue GetMonthName(const IValueBuilder* valueBuilder, const TUnboxedValu template TUnboxedValue GetDayOfWeekName(const IValueBuilder* valueBuilder, const TUnboxedValuePod& arg) { Y_UNUSED(valueBuilder); - static const std::array dayNames = {{TUnboxedValuePod::Embedded(TStringRef::Of("Monday")), + static const std::array DayNames = {{TUnboxedValuePod::Embedded(TStringRef::Of("Monday")), TUnboxedValuePod::Embedded(TStringRef::Of("Tuesday")), TUnboxedValuePod::Embedded(TStringRef::Of("Wednesday")), TUnboxedValuePod::Embedded(TStringRef::Of("Thursday")), TUnboxedValuePod::Embedded(TStringRef::Of("Friday")), TUnboxedValuePod::Embedded(TStringRef::Of("Saturday")), TUnboxedValuePod::Embedded(TStringRef::Of("Sunday"))}}; - return dayNames.at(GetDayOfWeek(arg) - 1U); + return DayNames.at(GetDayOfWeek(arg) - 1U); } // struct TGetDayOfWeekNameKernelExec : TUnaryKernelExec, TStringArrayBuilder> { @@ -1633,9 +1634,10 @@ TUnboxedValue GetTimezoneName(const IValueBuilder* valueBuilder, const TUnboxedV class TUpdate: public TBoxedValue { public: typedef bool TTypeAwareMarker; + static const TStringRef& Name() { - static auto name = TStringRef::Of("Update"); - return name; + static auto Name = TStringRef::Of("Update"); + return Name; } static bool DeclareSignature( @@ -1867,9 +1869,10 @@ template class TBoundaryOf: public ::NYql::NUdf::TBoxedValue { public: typedef bool TTypeAwareMarker; + static const ::NYql::NUdf::TStringRef& Name() { - static auto name = TStringRef(TUdfName, std::strlen(TUdfName)); - return name; + static auto Name = TStringRef(TUdfName, std::strlen(TUdfName)); + return Name; } static bool DeclareSignature( @@ -2319,9 +2323,10 @@ template class TBoundaryOfInterval: public ::NYql::NUdf::TBoxedValue { public: typedef bool TTypeAwareMarker; + static const TStringRef& Name() { - static auto name = TStringRef(TUdfName, std::strlen(TUdfName)); - return name; + static auto Name = TStringRef(TUdfName, std::strlen(TUdfName)); + return Name; } static bool DeclareSignature( @@ -2441,9 +2446,10 @@ struct TTimeOfDayKernelExec: TUnaryKernelExec(value); Y_DEBUG_ABORT_UNLESS(year != 0); @@ -2838,66 +2844,66 @@ class TFormat: public TBoxedValue { if (year < 0) { *out++ = '-'; } - return (year < 0 ? 1 : 0) + PrintNDigits::Do(yearRepr, out); + return (year < 0 ? 1 : 0) + PrintNDigits::Do(yearRepr, out); }); // Reserve one more slot for possible '-' char. - ReservedSize_ += size + 1; + ReservedSize_ += Size + 1; break; } case 'm': { - static constexpr size_t size = 2; + static constexpr size_t Size = 2; Printers_.emplace_back([](char* out, const TUnboxedValuePod& value, const IDateBuilder&) { - return PrintNDigits::Do(GetMonth(value), out); + return PrintNDigits::Do(GetMonth(value), out); }); - ReservedSize_ += size; + ReservedSize_ += Size; break; } case 'd': { - static constexpr size_t size = 2; + static constexpr size_t Size = 2; Printers_.emplace_back([](char* out, const TUnboxedValuePod& value, const IDateBuilder&) { - return PrintNDigits::Do(GetDay(value), out); + return PrintNDigits::Do(GetDay(value), out); }); - ReservedSize_ += size; + ReservedSize_ += Size; break; } case 'H': { - static constexpr size_t size = 2; + static constexpr size_t Size = 2; Printers_.emplace_back([](char* out, const TUnboxedValuePod& value, const IDateBuilder&) { - return PrintNDigits::Do(GetHour(value), out); + return PrintNDigits::Do(GetHour(value), out); }); - ReservedSize_ += size; + ReservedSize_ += Size; break; } case 'M': { - static constexpr size_t size = 2; + static constexpr size_t Size = 2; Printers_.emplace_back([](char* out, const TUnboxedValuePod& value, const IDateBuilder&) { - return PrintNDigits::Do(GetMinute(value), out); + return PrintNDigits::Do(GetMinute(value), out); }); - ReservedSize_ += size; + ReservedSize_ += Size; break; } case 'S': Printers_.emplace_back([alwaysWriteFractionalSeconds](char* out, const TUnboxedValuePod& value, const IDateBuilder&) { - constexpr size_t size = 2; + constexpr size_t Size = 2; if (const auto microsecond = GetMicrosecond(value); microsecond || alwaysWriteFractionalSeconds) { - out += PrintNDigits::Do(GetSecond(value), out); + out += PrintNDigits::Do(GetSecond(value), out); *out++ = '.'; - constexpr size_t msize = 6; - auto addSz = alwaysWriteFractionalSeconds ? PrintNDigits::Do(microsecond, out) : PrintNDigits::Do(microsecond, out); - return size + 1U + addSz; + constexpr size_t MSize = 6; + auto addSz = alwaysWriteFractionalSeconds ? PrintNDigits::Do(microsecond, out) : PrintNDigits::Do(microsecond, out); + return Size + 1U + addSz; } - return PrintNDigits::Do(GetSecond(value), out); + return PrintNDigits::Do(GetSecond(value), out); }); ReservedSize_ += 9; break; case 'z': { - static constexpr size_t size = 5; + static constexpr size_t Size = 5; Printers_.emplace_back([](char* out, const TUnboxedValuePod& value, const IDateBuilder& builder) { auto timezoneId = GetTimezoneId(value); if (TTMStorage::IsUniversal(timezoneId)) { - std::memcpy(out, "+0000", size); - return size; + std::memcpy(out, "+0000", Size); + return Size; } i32 shift; if (!builder.GetTimezoneShift(GetYear(value), @@ -2908,17 +2914,17 @@ class TFormat: public TBoxedValue { GetSecond(value), timezoneId, shift)) { - std::memcpy(out, "+0000", size); - return size; + std::memcpy(out, "+0000", Size); + return Size; } *out++ = shift > 0 ? '+' : '-'; shift = std::abs(shift); out += PrintNDigits<2U>::Do(shift / 60U, out); out += PrintNDigits<2U>::Do(shift % 60U, out); - return size; + return Size; }); - ReservedSize_ += size; + ReservedSize_ += Size; break; } case 'Z': @@ -2931,9 +2937,9 @@ class TFormat: public TBoxedValue { ReservedSize_ += MAX_TIMEZONE_NAME_LEN; break; case 'b': { - static constexpr size_t size = 3; + static constexpr size_t Size = 3; Printers_.emplace_back([](char* out, const TUnboxedValuePod& value, const IDateBuilder&) { - static constexpr std::string_view mp[]{ + static constexpr std::string_view Mp[]{ "Jan", "Feb", "Mar", @@ -2947,16 +2953,16 @@ class TFormat: public TBoxedValue { "Nov", "Dec"}; auto month = GetMonth(value); - Y_ENSURE(month > 0 && month <= sizeof(mp) / sizeof(mp[0]), "Invalid month value"); - std::memcpy(out, mp[month - 1].data(), size); - return size; + Y_ENSURE(month > 0 && month <= sizeof(Mp) / sizeof(Mp[0]), "Invalid month value"); + std::memcpy(out, Mp[month - 1].data(), Size); + return Size; }); - ReservedSize_ += size; + ReservedSize_ += Size; break; } case 'B': { Printers_.emplace_back([](char* out, const TUnboxedValuePod& value, const IDateBuilder&) { - static constexpr std::string_view mp[]{ + static constexpr std::string_view Mp[]{ "January", "February", "March", @@ -2970,8 +2976,8 @@ class TFormat: public TBoxedValue { "November", "December"}; auto month = GetMonth(value); - Y_ENSURE(month > 0 && month <= sizeof(mp) / sizeof(mp[0]), "Invalid month value"); - const std::string_view monthFullName = mp[month - 1]; + Y_ENSURE(month > 0 && month <= sizeof(Mp) / sizeof(Mp[0]), "Invalid month value"); + const std::string_view monthFullName = Mp[month - 1]; std::memcpy(out, monthFullName.data(), monthFullName.size()); return monthFullName.size(); }); @@ -3059,8 +3065,8 @@ class TParse: public TBoxedValue { }; static const TStringRef& Name() { - static auto name = TStringRef(TUdfName, std::strlen(TUdfName)); - return name; + static auto Name = TStringRef(TUdfName, std::strlen(TUdfName)); + return Name; } static bool DeclareSignature( @@ -3164,9 +3170,9 @@ class TParse: public TBoxedValue { case 'Y': { Scanners_.emplace_back([](std::string_view::const_iterator& it, size_t limit, TUnboxedValuePod& result, const IDateBuilder&) { if constexpr (TResourceName == TMResourceName) { - static constexpr size_t size = 4; + static constexpr size_t Size = 4; ui32 year = 0U; - if (limit < size || !ParseNDigits::Do(it, year) || !ValidateYear(year)) { + if (limit < Size || !ParseNDigits::Do(it, year) || !ValidateYear(year)) { return false; } SetYear(result, year); @@ -3211,10 +3217,10 @@ class TParse: public TBoxedValue { break; } case 'm': { - static constexpr size_t size = 2; + static constexpr size_t Size = 2; Scanners_.emplace_back([](std::string_view::const_iterator& it, size_t limit, TUnboxedValuePod& result, const IDateBuilder&) { ui32 month = 0U; - if (limit < size || !ParseNDigits::Do(it, month) || !ValidateMonth(month)) { + if (limit < Size || !ParseNDigits::Do(it, month) || !ValidateMonth(month)) { return false; } SetMonth(result, month); @@ -3223,10 +3229,10 @@ class TParse: public TBoxedValue { break; } case 'd': { - static constexpr size_t size = 2; + static constexpr size_t Size = 2; Scanners_.emplace_back([](std::string_view::const_iterator& it, size_t limit, TUnboxedValuePod& result, const IDateBuilder&) { ui32 day = 0U; - if (limit < size || !ParseNDigits::Do(it, day) || !ValidateDay(day)) { + if (limit < Size || !ParseNDigits::Do(it, day) || !ValidateDay(day)) { return false; } SetDay(result, day); @@ -3235,10 +3241,10 @@ class TParse: public TBoxedValue { break; } case 'H': { - static constexpr size_t size = 2; + static constexpr size_t Size = 2; Scanners_.emplace_back([](std::string_view::const_iterator& it, size_t limit, TUnboxedValuePod& result, const IDateBuilder&) { ui32 hour = 0U; - if (limit < size || !ParseNDigits::Do(it, hour) || !ValidateHour(hour)) { + if (limit < Size || !ParseNDigits::Do(it, hour) || !ValidateHour(hour)) { return false; } SetHour(result, hour); @@ -3247,10 +3253,10 @@ class TParse: public TBoxedValue { break; } case 'M': { - static constexpr size_t size = 2; + static constexpr size_t Size = 2; Scanners_.emplace_back([](std::string_view::const_iterator& it, size_t limit, TUnboxedValuePod& result, const IDateBuilder&) { ui32 minute = 0U; - if (limit < size || !ParseNDigits::Do(it, minute) || !ValidateMinute(minute)) { + if (limit < Size || !ParseNDigits::Do(it, minute) || !ValidateMinute(minute)) { return false; } SetMinute(result, minute); @@ -3259,14 +3265,14 @@ class TParse: public TBoxedValue { break; } case 'S': { - static constexpr size_t size = 2; + static constexpr size_t Size = 2; Scanners_.emplace_back([](std::string_view::const_iterator& it, size_t limit, TUnboxedValuePod& result, const IDateBuilder&) { ui32 second = 0U; - if (limit < size || !ParseNDigits::Do(it, second) || !ValidateSecond(second)) { + if (limit < Size || !ParseNDigits::Do(it, second) || !ValidateSecond(second)) { return false; } SetSecond(result, second); - limit -= size; + limit -= Size; if (!limit || *it != '.') { return true; @@ -3315,18 +3321,18 @@ class TParse: public TBoxedValue { }); break; case 'b': { - static constexpr size_t size = 3; + static constexpr size_t Size = 3; Scanners_.emplace_back([](std::string_view::const_iterator& it, size_t limit, TUnboxedValuePod& result, const IDateBuilder&) { const auto start = it; size_t cnt = 0U; - while (limit > 0 && cnt < size && std::isalpha(*it)) { + while (limit > 0 && cnt < Size && std::isalpha(*it)) { ++it; ++cnt; --limit; } const std::string_view monthName{start, cnt}; ui8 month = 0U; - if (cnt < size || !ValidateMonthShortName(monthName, month)) { + if (cnt < Size || !ValidateMonthShortName(monthName, month)) { return false; } SetMonth(result, month); diff --git a/yql/essentials/udfs/common/digest/digest_udf.cpp b/yql/essentials/udfs/common/digest/digest_udf.cpp index 63aa748e56c6..c9c08266a76c 100644 --- a/yql/essentials/udfs/common/digest/digest_udf.cpp +++ b/yql/essentials/udfs/common/digest/digest_udf.cpp @@ -53,8 +53,8 @@ class TDigestFunctionUdf: public TBoxedValue { } static TStringRef Name() { - static TString name = DigestNames[DigestType]; - return TStringRef(name); + static TString Name = DigestNames[DigestType]; + return TStringRef(Name); } static bool DeclareSignature( @@ -170,8 +170,8 @@ using TCityHash = TDigestFunctionUdf)) { } SIMPLE_STRICT_UDF(TArgon2, char*(TAutoMap, TAutoMap)) { - const static ui32 outSize = 32; - const static NArgonish::TArgon2Factory afactory; - const static THolder argon2 = afactory.Create( + const static ui32 OutSize = 32; + const static NArgonish::TArgon2Factory AFactory; + const static THolder Argon2 = AFactory.Create( NArgonish::EArgon2Type::Argon2d, 1, 32, 1); const TStringRef inputRef = args[0].AsStringRef(); const TStringRef saltRef = args[1].AsStringRef(); - ui8 out[outSize]; - argon2->Hash(reinterpret_cast(inputRef.Data()), inputRef.Size(), + ui8 out[OutSize]; + Argon2->Hash(reinterpret_cast(inputRef.Data()), inputRef.Size(), reinterpret_cast(saltRef.Data()), saltRef.Size(), - out, outSize); - return valueBuilder->NewString(TStringRef(reinterpret_cast(&out[0]), outSize)); + out, OutSize); + return valueBuilder->NewString(TStringRef(reinterpret_cast(&out[0]), OutSize)); } SIMPLE_STRICT_UDF_WITH_OPTIONAL_ARGS(TBlake2B, char*(TAutoMap, TOptional), 1) { - const static ui32 outSize = 32; - const static NArgonish::TBlake2BFactory bfactory; + const static ui32 OutSize = 32; + const static NArgonish::TBlake2BFactory BFactory; const TStringRef inputRef = args[0].AsStringRef(); THolder blake2b; if (args[1]) { const TStringRef keyRef = args[1].AsStringRef(); if (keyRef.Size() == 0) { - blake2b = bfactory.Create(outSize); + blake2b = BFactory.Create(OutSize); } else { - blake2b = bfactory.Create(outSize, reinterpret_cast(keyRef.Data()), keyRef.Size()); + blake2b = BFactory.Create(OutSize, reinterpret_cast(keyRef.Data()), keyRef.Size()); } } else { - blake2b = bfactory.Create(outSize); + blake2b = BFactory.Create(OutSize); } - ui8 out[outSize]; + ui8 out[OutSize]; blake2b->Update(inputRef.Data(), inputRef.Size()); - blake2b->Final(out, outSize); - return valueBuilder->NewString(TStringRef(reinterpret_cast(&out[0]), outSize)); + blake2b->Final(out, OutSize); + return valueBuilder->NewString(TStringRef(reinterpret_cast(&out[0]), OutSize)); } SIMPLE_STRICT_UDF(TSipHash, ui64(ui64, ui64, TAutoMap)) { @@ -326,8 +326,8 @@ SIMPLE_STRICT_UDF(TFarmHashFingerprint64, ui64(TAutoMap)) { class TFarmHashFingerprint128: public TBoxedValue { public: static TStringRef Name() { - static auto name = TStringRef::Of("FarmHashFingerprint128"); - return name; + static auto Name = TStringRef::Of("FarmHashFingerprint128"); + return Name; } static bool DeclareSignature( @@ -423,8 +423,8 @@ SIMPLE_STRICT_UDF(TXXH3, ui64(TAutoMap)) { class TXXH3_128: public TBoxedValue { // NOLINT(readability-identifier-naming) public: static TStringRef Name() { - static auto name = TStringRef::Of("XXH3_128"); - return name; + static auto Name = TStringRef::Of("XXH3_128"); + return Name; } static bool DeclareSignature(const TStringRef& name, TType*, IFunctionTypeInfoBuilder& builder, bool typesOnly) { diff --git a/yql/essentials/udfs/common/file/file_udf.cpp b/yql/essentials/udfs/common/file/file_udf.cpp index c06da057dee6..68d2af88ea34 100644 --- a/yql/essentials/udfs/common/file/file_udf.cpp +++ b/yql/essentials/udfs/common/file/file_udf.cpp @@ -16,7 +16,9 @@ extern const char ByLineFuncName[]; const char ByLineFuncName[] = "ByLines"; namespace { -namespace Helper { + +namespace NHelper { + template inline bool ConvertToUnboxed(const IValueBuilder& valueBuilder, const TString& curLine, TUnboxedValue& result) { Y_UNUSED(valueBuilder); @@ -58,97 +60,113 @@ struct TypeToTypeName { return "Unknown"; } }; + template <> struct TypeToTypeName { static constexpr const char* Name() { return "Bool"; } }; + template <> struct TypeToTypeName { static constexpr const char* Name() { return "Int8"; } }; + template <> struct TypeToTypeName { static constexpr const char* Name() { return "Uint8"; } }; + template <> struct TypeToTypeName { static constexpr const char* Name() { return "Int16"; } }; + template <> struct TypeToTypeName { static constexpr const char* Name() { return "Uint16"; } }; + template <> struct TypeToTypeName { static constexpr const char* Name() { return "Uint32"; } }; + template <> struct TypeToTypeName { static constexpr const char* Name() { return "Uint64"; } }; + template <> struct TypeToTypeName { static constexpr const char* Name() { return "Int32"; } }; + template <> struct TypeToTypeName { static constexpr const char* Name() { return "Int64"; } }; + template <> struct TypeToTypeName { static constexpr const char* Name() { return "Float"; } }; + template <> struct TypeToTypeName { static constexpr const char* Name() { return "Double"; } }; + template <> struct TypeToTypeName { static constexpr const char* Name() { return "String"; } }; + template <> struct TypeToTypeName { static constexpr const char* Name() { return "Utf8"; } }; + template <> struct TypeToTypeName { static constexpr const char* Name() { return "Yson"; } }; + template <> struct TypeToTypeName { static constexpr const char* Name() { return "Json"; } }; -} // namespace Helper + +} // namespace NHelper static const ui64 TAKE_UNLIM = -1; @@ -204,12 +222,12 @@ class TStreamMeta: public TThrRefBase { private: std::unique_ptr DoCreateStream() { - static const auto bufferSize = 1 << 12; + static const auto BufferSize = 1 << 12; TFile file(FilePath_, OpenExisting | RdOnly | Seq); if (FileSize_ == Unknown) { FileSize_ = file.GetLength(); } - return std::make_unique>(bufferSize, file); + return std::make_unique>(BufferSize, file); } TString FilePath_; @@ -274,9 +292,9 @@ class TLineByLineBoxedValueIterator: public TBoxedValue { if (!Skip()) { return false; } - if (!Helper::ConvertToUnboxed(ValueBuilder_, CurLine_, value)) { + if (!NHelper::ConvertToUnboxed(ValueBuilder_, CurLine_, value)) { TStringBuilder sb; - sb << "File::ByLines failed to cast string '" << CurLine_ << "' to " << Helper::TypeToTypeName::Name() << Endl; + sb << "File::ByLines failed to cast string '" << CurLine_ << "' to " << NHelper::TypeToTypeName::Name() << Endl; sb << "- path: " << MetaPtr_->GetFilePath() << Endl; sb << "- line: " << CurLineNum_ << Endl; TerminateFunc_(sb); @@ -529,8 +547,8 @@ class TFolderListFromFile: public TBoxedValue { } static const ::NYql::NUdf::TStringRef& Name() { - static auto name = ::NYql::NUdf::TStringRef::Of("FolderListFromFile"); - return name; + static auto Name = ::NYql::NUdf::TStringRef::Of("FolderListFromFile"); + return Name; } TUnboxedValue Run(const IValueBuilder* valueBuilder, const TUnboxedValuePod* args) const override { diff --git a/yql/essentials/udfs/common/histogram/histogram_udf.cpp b/yql/essentials/udfs/common/histogram/histogram_udf.cpp index 283e243396bf..4f36cc205bd8 100644 --- a/yql/essentials/udfs/common/histogram/histogram_udf.cpp +++ b/yql/essentials/udfs/common/histogram/histogram_udf.cpp @@ -122,9 +122,9 @@ class THistogram_Create: public TBoxedValue { typedef TBoxedResource THistogramResource; static const TStringRef& Name() { - static auto name = TString(ResourceName).substr(10) + "Histogram_Create"; - static auto nameRef = TStringRef(name); - return nameRef; + static auto Name = TString(ResourceName).substr(10) + "Histogram_Create"; + static auto NameRef = TStringRef(Name); + return NameRef; } private: @@ -174,9 +174,9 @@ class THistogram_AddValue: public TBoxedValue { typedef TBoxedResource THistogramResource; static const TStringRef& Name() { - static auto name = TString(ResourceName).substr(10) + "Histogram_AddValue"; - static auto nameRef = TStringRef(name); - return nameRef; + static auto Name = TString(ResourceName).substr(10) + "Histogram_AddValue"; + static auto NameRef = TStringRef(Name); + return NameRef; } private: @@ -226,9 +226,9 @@ class THistogram_Serialize: public TBoxedValue { typedef TBoxedResource THistogramResource; static const TStringRef& Name() { - static auto name = TString(ResourceName).substr(10) + "Histogram_Serialize"; - static auto nameRef = TStringRef(name); - return nameRef; + static auto Name = TString(ResourceName).substr(10) + "Histogram_Serialize"; + static auto NameRef = TStringRef(Name); + return NameRef; } private: @@ -279,9 +279,9 @@ class THistogram_Deserialize: public TBoxedValue { typedef TBoxedResource THistogramResource; static const TStringRef& Name() { - static auto name = TString(ResourceName).substr(10) + "Histogram_Deserialize"; - static auto nameRef = TStringRef(name); - return nameRef; + static auto Name = TString(ResourceName).substr(10) + "Histogram_Deserialize"; + static auto NameRef = TStringRef(Name); + return NameRef; } private: @@ -333,9 +333,9 @@ class THistogram_Merge: public TBoxedValue { typedef TBoxedResource THistogramResource; static const TStringRef& Name() { - static auto name = TString(ResourceName).substr(10) + "Histogram_Merge"; - static auto nameRef = TStringRef(name); - return nameRef; + static auto Name = TString(ResourceName).substr(10) + "Histogram_Merge"; + static auto NameRef = TStringRef(Name); + return NameRef; } private: @@ -409,9 +409,9 @@ class THistogram_GetResult: public TBoxedValue { } static const TStringRef& Name() { - static auto name = TString(ResourceName).substr(10) + "Histogram_GetResult"; - static auto nameRef = TStringRef(name); - return nameRef; + static auto Name = TString(ResourceName).substr(10) + "Histogram_GetResult"; + static auto NameRef = TStringRef(Name); + return NameRef; } private: @@ -624,8 +624,8 @@ class THistogramPrint: public TBoxedValue { } static const TStringRef& Name() { - static auto name = TStringRef::Of("Print"); - return name; + static auto Name = TStringRef::Of("Print"); + return Name; } TUnboxedValue Run( @@ -721,8 +721,8 @@ class THistogramToCumulativeDistributionFunction: public TBoxedValue { } static const TStringRef& Name() { - static auto name = TStringRef::Of("ToCumulativeDistributionFunction"); - return name; + static auto Name = TStringRef::Of("ToCumulativeDistributionFunction"); + return Name; } TUnboxedValue Run( @@ -793,8 +793,8 @@ class THistogramNormalize: public TBoxedValue { } static const TStringRef& Name() { - static auto name = TStringRef::Of("Normalize"); - return name; + static auto Name = TStringRef::Of("Normalize"); + return Name; } TUnboxedValue Run( diff --git a/yql/essentials/udfs/common/hyperloglog/hyperloglog_udf.cpp b/yql/essentials/udfs/common/hyperloglog/hyperloglog_udf.cpp index f0e2ad691492..1d147f43981b 100644 --- a/yql/essentials/udfs/common/hyperloglog/hyperloglog_udf.cpp +++ b/yql/essentials/udfs/common/hyperloglog/hyperloglog_udf.cpp @@ -140,8 +140,8 @@ class THyperLogLogCreate: public TBoxedValue { } static const TStringRef& Name() { - static auto nameRef = TStringRef::Of("Create"); - return nameRef; + static auto Name = TStringRef::Of("Create"); + return Name; } private: @@ -187,8 +187,8 @@ class THyperLogLogAddValue: public TBoxedValue { } static const TStringRef& Name() { - static auto nameRef = TStringRef::Of("AddValue"); - return nameRef; + static auto Name = TStringRef::Of("AddValue"); + return Name; } private: @@ -237,8 +237,8 @@ class THyperLogLogSerialize: public TBoxedValue { public: static const TStringRef& Name() { - static auto nameRef = TStringRef::Of("Serialize"); - return nameRef; + static auto Name = TStringRef::Of("Serialize"); + return Name; } private: @@ -284,8 +284,8 @@ class THyperLogLogDeserialize: public TBoxedValue { } static const TStringRef& Name() { - static auto nameRef = TStringRef::Of("Deserialize"); - return nameRef; + static auto Name = TStringRef::Of("Deserialize"); + return Name; } private: @@ -333,8 +333,8 @@ class THyperLogLogMerge: public TBoxedValue { } static const TStringRef& Name() { - static auto nameRef = TStringRef::Of("Merge"); - return nameRef; + static auto Name = TStringRef::Of("Merge"); + return Name; } private: @@ -382,8 +382,8 @@ class THyperLogLogGetResult: public TBoxedValue { } static const TStringRef& Name() { - static auto nameRef = TStringRef::Of("GetResult"); - return nameRef; + static auto Name = TStringRef::Of("GetResult"); + return Name; } private: diff --git a/yql/essentials/udfs/common/hyperscan/hyperscan_udf.cpp b/yql/essentials/udfs/common/hyperscan/hyperscan_udf.cpp index afa8d65f6d33..f18feca0f4e4 100644 --- a/yql/essentials/udfs/common/hyperscan/hyperscan_udf.cpp +++ b/yql/essentials/udfs/common/hyperscan/hyperscan_udf.cpp @@ -79,29 +79,29 @@ class THyperscanMatch: public THyperscanUdfBase { }; static const TStringRef& Name(bool isGrep, THyperscanMatch::EMode mode) { - static auto match = TStringRef::Of("Match"); - static auto grep = TStringRef::Of("Grep"); - static auto backtrackingMatch = TStringRef::Of("BacktrackingMatch"); - static auto backtrackingGrep = TStringRef::Of("BacktrackingGrep"); - static auto multiMatch = TStringRef::Of("MultiMatch"); - static auto multiGrep = TStringRef::Of("MultiGrep"); + static auto Match = TStringRef::Of("Match"); + static auto Grep = TStringRef::Of("Grep"); + static auto BacktrackingMatch = TStringRef::Of("BacktrackingMatch"); + static auto BacktrackingGrep = TStringRef::Of("BacktrackingGrep"); + static auto MultiMatch = TStringRef::Of("MultiMatch"); + static auto MultiGrep = TStringRef::Of("MultiGrep"); if (isGrep) { switch (mode) { case THyperscanMatch::EMode::NORMAL: - return grep; + return Grep; case THyperscanMatch::EMode::BACKTRACKING: - return backtrackingGrep; + return BacktrackingGrep; case THyperscanMatch::EMode::MULTI: - return multiGrep; + return MultiGrep; } } else { switch (mode) { case THyperscanMatch::EMode::NORMAL: - return match; + return Match; case THyperscanMatch::EMode::BACKTRACKING: - return backtrackingMatch; + return BacktrackingMatch; case THyperscanMatch::EMode::MULTI: - return multiMatch; + return MultiMatch; } } @@ -258,8 +258,8 @@ class THyperscanCapture: public THyperscanUdfBase { }; static const TStringRef& Name() { - static auto name = TStringRef::Of("Capture"); - return name; + static auto Name = TStringRef::Of("Capture"); + return Name; } THyperscanCapture(const TUnboxedValuePod& runConfig, TSourcePosition pos) @@ -323,8 +323,8 @@ class THyperscanReplace: public THyperscanUdfBase { }; static const TStringRef& Name() { - static auto name = TStringRef::Of("Replace"); - return name; + static auto Name = TStringRef::Of("Replace"); + return Name; } THyperscanReplace(const TUnboxedValuePod& runConfig, TSourcePosition pos) diff --git a/yql/essentials/udfs/common/json2/compile_path.h b/yql/essentials/udfs/common/json2/compile_path.h index f932c6df60cb..93ac63fe7cfd 100644 --- a/yql/essentials/udfs/common/json2/compile_path.h +++ b/yql/essentials/udfs/common/json2/compile_path.h @@ -18,8 +18,8 @@ class TCompilePath: public TBoxedValue { } static const TStringRef& Name() { - static auto name = TStringRef::Of("CompilePath"); - return name; + static auto Name = TStringRef::Of("CompilePath"); + return Name; } static bool DeclareSignature( diff --git a/yql/essentials/udfs/common/json2/parse.h b/yql/essentials/udfs/common/json2/parse.h index 72db2106fa5b..93a85694d695 100644 --- a/yql/essentials/udfs/common/json2/parse.h +++ b/yql/essentials/udfs/common/json2/parse.h @@ -22,8 +22,8 @@ class TParse: public TBoxedValue { } static const TStringRef& Name() { - static auto name = TStringRef::Of("Parse"); - return name; + static auto Name = TStringRef::Of("Parse"); + return Name; } static bool DeclareSignature( diff --git a/yql/essentials/udfs/common/json2/serialize.h b/yql/essentials/udfs/common/json2/serialize.h index 2443259fbeed..7956c5c33c97 100644 --- a/yql/essentials/udfs/common/json2/serialize.h +++ b/yql/essentials/udfs/common/json2/serialize.h @@ -76,13 +76,14 @@ class TSerialize: public TBoxedValue { template <> const TStringRef& TSerialize::Name() { - static auto name = TStringRef::Of("Serialize"); - return name; + static auto Name = TStringRef::Of("Serialize"); + return Name; } template <> const TStringRef& TSerialize::Name() { - static auto name = TStringRef::Of("SerializeToJsonDocument"); - return name; + static auto Name = TStringRef::Of("SerializeToJsonDocument"); + return Name; } + } // namespace NJson2Udf diff --git a/yql/essentials/udfs/common/json2/sql_value.h b/yql/essentials/udfs/common/json2/sql_value.h index 525d1296a6b5..33cf9d3e8e90 100644 --- a/yql/essentials/udfs/common/json2/sql_value.h +++ b/yql/essentials/udfs/common/json2/sql_value.h @@ -109,7 +109,7 @@ TUnboxedValue TryConvertJson(const IValueBuilder* valueBuilder, const TUnb template class TSqlValue: public TBoxedValue { public: - enum class TErrorCode: ui8 { + enum class EErrorCode: ui8 { Empty = 0, Error = 1 }; @@ -165,7 +165,7 @@ class TSqlValue: public TBoxedValue { } private: - TUnboxedValue BuildErrorResult(const IValueBuilder* valueBuilder, TErrorCode code, const TStringBuf message) const { + TUnboxedValue BuildErrorResult(const IValueBuilder* valueBuilder, EErrorCode code, const TStringBuf message) const { TUnboxedValue* items = nullptr; auto errorTuple = valueBuilder->NewArray(2, items); items[0] = TUnboxedValuePod(static_cast(code)); @@ -199,22 +199,22 @@ class TSqlValue: public TBoxedValue { const auto result = ExecuteJsonPath(jsonPath, jsonDom, variables, valueBuilder); if (result.IsError()) { - return BuildErrorResult(valueBuilder, TErrorCode::Error, TStringBuilder() << "Error executing jsonpath:" << Endl << result.GetError() << Endl); + return BuildErrorResult(valueBuilder, EErrorCode::Error, TStringBuilder() << "Error executing jsonpath:" << Endl << result.GetError() << Endl); } const auto& nodes = result.GetNodes(); if (nodes.empty()) { - return BuildErrorResult(valueBuilder, TErrorCode::Empty, "Result is empty"); + return BuildErrorResult(valueBuilder, EErrorCode::Empty, "Result is empty"); } if (nodes.size() > 1) { - return BuildErrorResult(valueBuilder, TErrorCode::Error, "Result consists of multiple items"); + return BuildErrorResult(valueBuilder, EErrorCode::Error, "Result consists of multiple items"); } const auto& value = nodes[0]; if (value.Is(EValueType::Array) || value.Is(EValueType::Object)) { // SqlValue can return only scalar values - return BuildErrorResult(valueBuilder, TErrorCode::Error, "Extracted JSON value is either object or array"); + return BuildErrorResult(valueBuilder, EErrorCode::Error, "Extracted JSON value is either object or array"); } if (value.Is(EValueType::Null)) { @@ -226,7 +226,7 @@ class TSqlValue: public TBoxedValue { TUnboxedValue convertedValue = TryConvertJson(valueBuilder, source); if (!convertedValue) { // error while converting JSON value type to TValueType - return BuildErrorResult(valueBuilder, TErrorCode::Error, "Cannot convert extracted JSON value to target type"); + return BuildErrorResult(valueBuilder, EErrorCode::Error, "Cannot convert extracted JSON value to target type"); } return BuildSuccessfulResult(valueBuilder, std::move(convertedValue)); diff --git a/yql/essentials/udfs/common/math/lib/erfinv.cpp b/yql/essentials/udfs/common/math/lib/erfinv.cpp index c7626b8faf0c..c29000b2d6ba 100644 --- a/yql/essentials/udfs/common/math/lib/erfinv.cpp +++ b/yql/essentials/udfs/common/math/lib/erfinv.cpp @@ -17,7 +17,7 @@ namespace NMathUdf { // https://www.jstor.org/stable/2347330 double ErfInv(double x) { - static constexpr std::array a = { + static constexpr std::array A = { 1.1975323115670912564578e0, 4.7072688112383978012285e1, 6.9706266534389598238465e2, @@ -27,7 +27,7 @@ double ErfInv(double x) { 1.1819493347062294404278e4, 8.8709406962545514830200e2, }; - static constexpr std::array b = { + static constexpr std::array B = { 1., 4.2313330701600911252e1, 6.8718700749205790830e2, @@ -37,7 +37,7 @@ double ErfInv(double x) { 2.8729085735721942674e4, 5.2264952788528545610e3, }; - static constexpr std::array c = { + static constexpr std::array C = { 1.42343711074968357734e0, 4.63033784615654529590e0, 5.76949722146069140550e0, @@ -47,7 +47,7 @@ double ErfInv(double x) { 2.27238449892691845833e-2, 7.74545014278341407640e-4, }; - static constexpr std::array d = { + static constexpr std::array D = { 1.4142135623730950488016887e0, 2.9036514445419946173133295e0, 2.3707661626024532365971225e0, @@ -57,7 +57,7 @@ double ErfInv(double x) { 7.7441459065157709165577218e-4, 1.4859850019840355905497876e-9, }; - static constexpr std::array e = { + static constexpr std::array E = { 6.65790464350110377720e0, 5.46378491116411436990e0, 1.78482653991729133580e0, @@ -67,7 +67,7 @@ double ErfInv(double x) { 2.71155556874348757815e-5, 2.01033439929228813265e-7, }; - static constexpr std::array f = { + static constexpr std::array F = { 1.414213562373095048801689e0, 8.482908416595164588112026e-1, 1.936480946950659106176712e-1, @@ -97,14 +97,14 @@ double ErfInv(double x) { double ans; if (x <= 0.85) { double r = 0.180625 - 0.25 * x * x; - ans = x * PolEval(r, a) / PolEval(r, b); + ans = x * PolEval(r, A) / PolEval(r, B); } else { double r = std::sqrt(M_LN2 - log(1. - x)) - 1.6; if (r <= 3.4) { - ans = PolEval(r, c) / PolEval(r, d); + ans = PolEval(r, C) / PolEval(r, D); } else { r -= 3.4; - ans = PolEval(r, e) / PolEval(r, f); + ans = PolEval(r, E) / PolEval(r, F); } } diff --git a/yql/essentials/udfs/common/pire/pire_udf.cpp b/yql/essentials/udfs/common/pire/pire_udf.cpp index 1357107a12b9..f08e36dfbdb0 100644 --- a/yql/essentials/udfs/common/pire/pire_udf.cpp +++ b/yql/essentials/udfs/common/pire/pire_udf.cpp @@ -70,14 +70,14 @@ class TPireMatch: public TPireUdfBase { }; static const TStringRef& Name(bool surroundMode, bool multiMode) { - static auto match = TStringRef::Of("Match"); - static auto grep = TStringRef::Of("Grep"); - static auto multiMatch = TStringRef::Of("MultiMatch"); - static auto multiGrep = TStringRef::Of("MultiGrep"); + static auto Match = TStringRef::Of("Match"); + static auto Grep = TStringRef::Of("Grep"); + static auto MultiMatch = TStringRef::Of("MultiMatch"); + static auto MultiGrep = TStringRef::Of("MultiGrep"); if (surroundMode) { - return multiMode ? multiGrep : grep; + return multiMode ? MultiGrep : Grep; } else { - return multiMode ? multiMatch : match; + return multiMode ? MultiMatch : Match; } } @@ -190,8 +190,8 @@ class TPireCapture: public TPireUdfBase { }; static const TStringRef& Name() { - static auto name = TStringRef::Of("Capture"); - return name; + static auto Name = TStringRef::Of("Capture"); + return Name; } TPireCapture(const TUnboxedValuePod& runConfig, TSourcePosition pos) @@ -245,8 +245,8 @@ class TPireReplace: public TPireUdfBase { }; static const TStringRef& Name() { - static auto name = TStringRef::Of("Replace"); - return name; + static auto Name = TStringRef::Of("Replace"); + return Name; } TPireReplace(const TUnboxedValuePod& runConfig, TSourcePosition pos) diff --git a/yql/essentials/udfs/common/python/bindings/py_callable.cpp b/yql/essentials/udfs/common/python/bindings/py_callable.cpp index c951e0dce8fd..03094d464a09 100644 --- a/yql/essentials/udfs/common/python/bindings/py_callable.cpp +++ b/yql/essentials/udfs/common/python/bindings/py_callable.cpp @@ -277,16 +277,17 @@ PyObject* SecureParamCall(PyObject* self, PyObject* args, PyObject* kwargs) { Y_UNUSED(kwargs); - struct PyBufDeleter { + struct TPyBufDeleter { void operator()(Py_buffer* view) { PyBuffer_Release(view); } }; + Py_buffer input; if (!PyArg_ParseTuple(args, "s*", &input)) { return nullptr; } - std::unique_ptr bufPtr(&input); + std::unique_ptr bufPtr(&input); auto valueBuilder = CastToSecureParam(self)->CastCtx->ValueBuilder; NUdf::TStringRef key(static_cast(input.buf), input.len); PY_TRY { diff --git a/yql/essentials/udfs/common/python/bindings/py_lazy_mkql_dict.cpp b/yql/essentials/udfs/common/python/bindings/py_lazy_mkql_dict.cpp index 4ffaee2b66cd..75868e3d6dd8 100644 --- a/yql/essentials/udfs/common/python/bindings/py_lazy_mkql_dict.cpp +++ b/yql/essentials/udfs/common/python/bindings/py_lazy_mkql_dict.cpp @@ -139,7 +139,7 @@ class TLazyDictBase: public NUdf::TBoxedValue { TLazyDictBase(const TPyCastContext::TPtr& castCtx, const NUdf::TType* itemType, PyObject* pyObject) : CastCtx_(castCtx) , ItemType_(itemType) - , PyObject_(pyObject, TPyObjectPtr::AddRef()) + , PyObject_(pyObject, TPyObjectPtr::EAddRef()) { } diff --git a/yql/essentials/udfs/common/python/bindings/py_ptr.h b/yql/essentials/udfs/common/python/bindings/py_ptr.h index 66f70cea01c0..e17a290aaaf2 100644 --- a/yql/essentials/udfs/common/python/bindings/py_ptr.h +++ b/yql/essentials/udfs/common/python/bindings/py_ptr.h @@ -38,7 +38,7 @@ class TPyObjectPtr: public NYql::NUdf::TRefCountedPtr maxLen) { - string.resize(maxLen - truncSuffix.size()); - string += truncSuffix; + if (string.size() > MaxLen) { + string.resize(MaxLen - TruncSuffix.size()); + string += TruncSuffix; } return string; } @@ -62,7 +62,7 @@ bool HasEncodingCookie(const TString& source) { // See https://www.python.org/dev/peps/pep-0263 for more details. // - static std::regex encodingRe( + static std::regex EncodingRe( "^[ \\t\\v]*#.*?coding[:=][ \\t]*[-_.a-zA-Z0-9]+.*"); int i = 0; @@ -72,7 +72,7 @@ bool HasEncodingCookie(const TString& source) { } TStringBuf line = it.Token(); - if (std::regex_match(line.begin(), line.end(), encodingRe)) { + if (std::regex_match(line.begin(), line.end(), EncodingRe)) { return true; } } diff --git a/yql/essentials/udfs/common/re2/re2_udf.cpp b/yql/essentials/udfs/common/re2/re2_udf.cpp index b13d975cf356..7a7b5f54c9ed 100644 --- a/yql/essentials/udfs/common/re2/re2_udf.cpp +++ b/yql/essentials/udfs/common/re2/re2_udf.cpp @@ -55,8 +55,8 @@ bool ShouldFailOnInvalidRegexp(const std::string_view regexp, NYql::TLangVersion return true; } THashType hash = GetStringHash(regexp) % 100; - static ui64 failProbability = GetFailProbability(); - return hash < failProbability; + static ui64 FailProbability = GetFailProbability(); + return hash < FailProbability; } RE2::Options CreateDefaultOptions() { @@ -157,26 +157,26 @@ class TRe2Udf: public TBoxedValue { }; static const TStringRef& Name(EMode mode) { - static auto match = TStringRef::Of("Match"); - static auto grep = TStringRef::Of("Grep"); - static auto capture = TStringRef::Of("Capture"); - static auto replace = TStringRef::Of("Replace"); - static auto count = TStringRef::Of("Count"); - static auto findAndconsume = TStringRef::Of("FindAndConsume"); + static auto Match = TStringRef::Of("Match"); + static auto Grep = TStringRef::Of("Grep"); + static auto Capture = TStringRef::Of("Capture"); + static auto Replace = TStringRef::Of("Replace"); + static auto Count = TStringRef::Of("Count"); + static auto FindAndconsume = TStringRef::Of("FindAndConsume"); switch (mode) { case EMode::MATCH: - return match; + return Match; case EMode::GREP: - return grep; + return Grep; case EMode::CAPTURE: - return capture; + return Capture; case EMode::REPLACE: - return replace; + return Replace; case EMode::COUNT: - return count; + return Count; case EMode::FIND_AND_CONSUME: - return findAndconsume; + return FindAndconsume; } Y_ABORT("Unexpected mode"); } @@ -359,8 +359,8 @@ class TOptions: public TBoxedValue { } static const ::NKikimr::NUdf::TStringRef& Name() { - static auto name = ::NKikimr::NUdf::TStringRef::Of("Options"); - return name; + static auto Name = ::NKikimr::NUdf::TStringRef::Of("Options"); + return Name; } static bool DeclareSignature( @@ -411,8 +411,8 @@ class TIsValidRegexp: public TBoxedValue { } static const ::NKikimr::NUdf::TStringRef& Name() { - static auto name = ::NKikimr::NUdf::TStringRef::Of("IsValidRegexp"); - return name; + static auto Name = ::NKikimr::NUdf::TStringRef::Of("IsValidRegexp"); + return Name; } static bool DeclareSignature( diff --git a/yql/essentials/udfs/common/streaming/streaming_udf.cpp b/yql/essentials/udfs/common/streaming/streaming_udf.cpp index 2229e8ff9e75..c880f66b3e32 100644 --- a/yql/essentials/udfs/common/streaming/streaming_udf.cpp +++ b/yql/essentials/udfs/common/streaming/streaming_udf.cpp @@ -181,7 +181,7 @@ class TStringListBufferedInputStream: public IInputStream { , DelimiterMatcher_(delimiter) , DelimiterInput_(delimiter) , Buffer_(bufferSizeBytes) - , CurReadMode_(ReadMode::Start) + , CurReadMode_(EReadMode::Start) { } @@ -201,9 +201,9 @@ class TStringListBufferedInputStream: public IInputStream { bool receivedYield = false; - while (Buffer_.CanWrite() && CurReadMode_ != ReadMode::Done && !receivedYield) { + while (Buffer_.CanWrite() && CurReadMode_ != EReadMode::Done && !receivedYield) { switch (CurReadMode_) { - case ReadMode::Start: { + case EReadMode::Start: { auto status = ReadNextString(); if (status == EFetchStatus::Yield) { receivedYield = true; @@ -211,25 +211,25 @@ class TStringListBufferedInputStream: public IInputStream { } CurReadMode_ = (status == EFetchStatus::Ok) - ? ReadMode::String - : ReadMode::Done; + ? EReadMode::String + : EReadMode::Done; break; } - case ReadMode::String: + case EReadMode::String: if (CurStringInput_.Exhausted()) { DelimiterInput_.Reset(Delimiter_.data(), Delimiter_.size()); - CurReadMode_ = ReadMode::Delimiter; + CurReadMode_ = EReadMode::Delimiter; break; } Buffer_.Write(CurStringInput_); break; - case ReadMode::Delimiter: + case EReadMode::Delimiter: if (DelimiterInput_.Exhausted()) { - CurReadMode_ = ReadMode::Start; + CurReadMode_ = EReadMode::Start; break; } @@ -241,7 +241,7 @@ class TStringListBufferedInputStream: public IInputStream { } } - if (CurReadMode_ == ReadMode::Done) { + if (CurReadMode_ == EReadMode::Done) { Buffer_.Finish(); } @@ -312,7 +312,7 @@ class TStringListBufferedInputStream: public IInputStream { } private: - enum class ReadMode { + enum class EReadMode { Start, String, Delimiter, @@ -331,7 +331,7 @@ class TStringListBufferedInputStream: public IInputStream { TCyclicRWBuffer Buffer_; - ReadMode CurReadMode_; + EReadMode CurReadMode_; }; class TStringListBufferedOutputStream: public IOutputStream { @@ -719,8 +719,8 @@ class TStreamingProcess: public TBoxedValue { public: static TStringRef Name() { - static auto name = TStringRef::Of("Process"); - return name; + static auto Name = TStringRef::Of("Process"); + return Name; } private: @@ -765,8 +765,8 @@ class TStreamingProcessInline: public TBoxedValue { public: static TStringRef Name() { - static auto name = TStringRef::Of("ProcessInline"); - return name; + static auto Name = TStringRef::Of("ProcessInline"); + return Name; } private: diff --git a/yql/essentials/udfs/common/url_base/lib/url_base_udf.h b/yql/essentials/udfs/common/url_base/lib/url_base_udf.h index 676d7a802d13..275d7e0deaa9 100644 --- a/yql/essentials/udfs/common/url_base/lib/url_base_udf.h +++ b/yql/essentials/udfs/common/url_base/lib/url_base_udf.h @@ -315,8 +315,8 @@ SIMPLE_UDF_WITH_OPTIONAL_ARGS(TGetSignificantDomain, char*(TAutoMap, TOpt } } } else { - static const std::set zones{"com", "net", "org", "co", "gov", "edu"}; - secondLevelIsZone = zones.count(secondLevel); + static const std::set Zones{"com", "net", "org", "co", "gov", "edu"}; + secondLevelIsZone = Zones.count(secondLevel); } const auto from = parts[parts.size() - (secondLevelIsZone ? 3U : 2U)].begin(); diff --git a/yql/essentials/udfs/common/url_base/lib/url_parse.h b/yql/essentials/udfs/common/url_base/lib/url_parse.h index 8dab6ac7f47a..4a0adccdab45 100644 --- a/yql/essentials/udfs/common/url_base/lib/url_parse.h +++ b/yql/essentials/udfs/common/url_base/lib/url_parse.h @@ -34,8 +34,8 @@ class TParse: public TBoxedValue { } static const TStringRef& Name() { - static auto nameRef = TStringRef("Parse"); - return nameRef; + static const auto Name = TStringRef("Parse"); + return Name; } private: diff --git a/yql/essentials/udfs/common/url_base/lib/url_query.h b/yql/essentials/udfs/common/url_base/lib/url_query.h index 7ba822418962..f5e55f09b8dd 100644 --- a/yql/essentials/udfs/common/url_base/lib/url_query.h +++ b/yql/essentials/udfs/common/url_base/lib/url_query.h @@ -67,8 +67,8 @@ struct TQueryStringToList: public TQueryStringParse { } static const TStringRef& Name() { - static const auto name = TStringRef::Of("QueryStringToList"); - return name; + static const auto Name = TStringRef::Of("QueryStringToList"); + return Name; } static bool DeclareSignature(const TStringRef& name, @@ -88,8 +88,8 @@ struct TQueryStringToDict: public TQueryStringParse { } static const TStringRef& Name() { - static const auto name = TStringRef::Of("QueryStringToDict"); - return name; + static const auto Name = TStringRef::Of("QueryStringToDict"); + return Name; } static bool DeclareSignature(const TStringRef& name, @@ -123,8 +123,8 @@ class TBuildQueryString: public TQueryStringConv { } static const TStringRef& Name() { - static const auto name = TStringRef::Of("BuildQueryString"); - return name; + static const auto Name = TStringRef::Of("BuildQueryString"); + return Name; } TUnboxedValue Run(const IValueBuilder* valueBuilder, diff --git a/yql/essentials/udfs/common/yson2/yson2_udf.cpp b/yql/essentials/udfs/common/yson2/yson2_udf.cpp index a6ed9d13002a..1ff683d11b51 100644 --- a/yql/essentials/udfs/common/yson2/yson2_udf.cpp +++ b/yql/essentials/udfs/common/yson2/yson2_udf.cpp @@ -69,8 +69,8 @@ class TOptions: public TBoxedValue { public: static const TStringRef& Name() { - static auto name = TStringRef::Of("Options"); - return name; + static auto Name = TStringRef::Of("Options"); + return Name; } static bool DeclareSignature( @@ -931,8 +931,8 @@ class TFrom: public TBase { public: static const TStringRef& Name() { - static auto name = TStringRef::Of("From"); - return name; + static auto Name = TStringRef::Of("From"); + return Name; } TFrom(TSourcePosition pos, const ITypeInfoHelper::TPtr typeHelper, const TType* shape) @@ -1009,8 +1009,8 @@ class TConvert: public TBase { } static const TStringRef& Name() { - static auto name = TStringRef::Of("ConvertTo"); - return name; + static auto Name = TStringRef::Of("ConvertTo"); + return Name; } static bool DeclareSignature(const TStringRef& name, TType* userType, IFunctionTypeInfoBuilder& builder, bool typesOnly) { @@ -1191,20 +1191,20 @@ TUnboxedValue TParse::Run(const IValueBuilder* valueBuilder, const template <> const TStringRef& TParse::Name() { - static auto yson = TStringRef::Of("Parse"); - return yson; + static auto Name = TStringRef::Of("Parse"); + return Name; } template <> const TStringRef& TParse::Name() { - static auto yson = TStringRef::Of("ParseJson"); - return yson; + static auto Name = TStringRef::Of("ParseJson"); + return Name; } template <> const TStringRef& TParse::Name() { - static auto yson = TStringRef::Of("ParseJsonDecodeUtf8"); - return yson; + static auto Name = TStringRef::Of("ParseJsonDecodeUtf8"); + return Name; } } // namespace diff --git a/yql/essentials/udfs/examples/callables/callables_udf.cpp b/yql/essentials/udfs/examples/callables/callables_udf.cpp index e367c3b990cf..edc62e9cf40d 100644 --- a/yql/essentials/udfs/examples/callables/callables_udf.cpp +++ b/yql/essentials/udfs/examples/callables/callables_udf.cpp @@ -16,8 +16,8 @@ namespace { class TFromString: public TBoxedValue { public: static TStringRef Name() { - static auto name = TStringRef::Of("FromString"); - return name; + static auto Name = TStringRef::Of("FromString"); + return Name; } private: @@ -37,8 +37,8 @@ class TFromString: public TBoxedValue { class TSum: public TBoxedValue { public: static TStringRef Name() { - static auto name = TStringRef::Of("Sum"); - return name; + static auto Name = TStringRef::Of("Sum"); + return Name; } private: @@ -63,8 +63,8 @@ class TSum: public TBoxedValue { class TMul: public TBoxedValue { public: static TStringRef Name() { - static auto name = TStringRef::Of("Mul"); - return name; + static auto Name = TStringRef::Of("Mul"); + return Name; } private: @@ -93,8 +93,8 @@ using TNamedA = TNamedArg; class TNamedArgUdf: public TBoxedValue { public: static TStringRef Name() { - static auto name = TStringRef::Of("NamedArgUdf"); - return name; + static auto Name = TStringRef::Of("NamedArgUdf"); + return Name; } private: @@ -114,8 +114,8 @@ class TNamedArgUdf: public TBoxedValue { class TReturnNamedArgCallable: public TBoxedValue { public: static TStringRef Name() { - static auto name = TStringRef::Of("ReturnNamedArgCallable"); - return name; + static auto Name = TStringRef::Of("ReturnNamedArgCallable"); + return Name; } TUnboxedValue Run( diff --git a/yql/essentials/udfs/examples/dicts/dicts_udf.cpp b/yql/essentials/udfs/examples/dicts/dicts_udf.cpp index 2ce8c509a6ea..545d8435573c 100644 --- a/yql/essentials/udfs/examples/dicts/dicts_udf.cpp +++ b/yql/essentials/udfs/examples/dicts/dicts_udf.cpp @@ -21,8 +21,8 @@ class TStrToInt: public TBoxedValue { } static TStringRef Name() { - static auto name = TStringRef::Of("StrToInt"); - return name; + static auto Name = TStringRef::Of("StrToInt"); + return Name; } private: diff --git a/yql/essentials/udfs/examples/linear/linear_udf.cpp b/yql/essentials/udfs/examples/linear/linear_udf.cpp index 8696799a865a..bce3d7221443 100644 --- a/yql/essentials/udfs/examples/linear/linear_udf.cpp +++ b/yql/essentials/udfs/examples/linear/linear_udf.cpp @@ -30,8 +30,8 @@ class TUnsafeConsumer: public TBoxedValue { } static const TStringRef& Name() { - static auto name = TStringRef::Of("UnsafeConsumer"); - return name; + static auto Name = TStringRef::Of("UnsafeConsumer"); + return Name; } static bool DeclareSignature(const TStringRef& name, TType* userType, IFunctionTypeInfoBuilder& builder, bool typesOnly) { diff --git a/yql/essentials/udfs/examples/lists/lists_udf.cpp b/yql/essentials/udfs/examples/lists/lists_udf.cpp index e310cde3e3b8..a20d263ffb50 100644 --- a/yql/essentials/udfs/examples/lists/lists_udf.cpp +++ b/yql/essentials/udfs/examples/lists/lists_udf.cpp @@ -18,8 +18,8 @@ namespace { class TNumbers: public TBoxedValue { public: static TStringRef Name() { - static auto name = TStringRef::Of("Numbers"); - return name; + static auto Name = TStringRef::Of("Numbers"); + return Name; } private: @@ -50,8 +50,8 @@ class TNumbers: public TBoxedValue { class TExtend: public TBoxedValue { public: static TStringRef Name() { - static auto name = TStringRef::Of("Extend"); - return name; + static auto Name = TStringRef::Of("Extend"); + return Name; } private: diff --git a/yql/essentials/udfs/examples/tagged/tagged_udf.cpp b/yql/essentials/udfs/examples/tagged/tagged_udf.cpp index 29e2c51540de..cf9a1b1c0d2f 100644 --- a/yql/essentials/udfs/examples/tagged/tagged_udf.cpp +++ b/yql/essentials/udfs/examples/tagged/tagged_udf.cpp @@ -28,8 +28,8 @@ class TGenericTag: public TBoxedValue { } static const TStringRef& Name() { - static auto name = TStringRef::Of("GenericTag"); - return name; + static auto Name = TStringRef::Of("GenericTag"); + return Name; } TGenericTag(TStringRef tag) diff --git a/yql/essentials/udfs/examples/type_inspection/type_inspection_udf.cpp b/yql/essentials/udfs/examples/type_inspection/type_inspection_udf.cpp index 07ad4f724fd4..48b0456c8d9b 100644 --- a/yql/essentials/udfs/examples/type_inspection/type_inspection_udf.cpp +++ b/yql/essentials/udfs/examples/type_inspection/type_inspection_udf.cpp @@ -17,8 +17,8 @@ namespace { class TZip: public TBoxedValue { public: static TStringRef Name() { - static auto name = TStringRef::Of("Zip"); - return name; + static auto Name = TStringRef::Of("Zip"); + return Name; } private: @@ -49,8 +49,8 @@ class TZip: public TBoxedValue { class TFold: public TBoxedValue { public: static TStringRef Name() { - static auto name = TStringRef::Of("Fold"); - return name; + static auto Name = TStringRef::Of("Fold"); + return Name; } private: @@ -109,8 +109,8 @@ class TInterleave: public TBoxedValue { }; static TStringRef Name() { - static auto name = TStringRef::Of("Interleave"); - return name; + static auto Name = TStringRef::Of("Interleave"); + return Name; } private: diff --git a/yql/essentials/udfs/test/simple/simple_udf.cpp b/yql/essentials/udfs/test/simple/simple_udf.cpp index cca46ab41905..318dac9e01d1 100644 --- a/yql/essentials/udfs/test/simple/simple_udf.cpp +++ b/yql/essentials/udfs/test/simple/simple_udf.cpp @@ -176,8 +176,8 @@ class TGenericAsStruct: public TBoxedValue { } static const TStringRef& Name() { - static auto name = TStringRef::Of("GenericAsStruct"); - return name; + static auto Name = TStringRef::Of("GenericAsStruct"); + return Name; } TGenericAsStruct(size_t argc) @@ -248,8 +248,8 @@ class TLogging: public TBoxedValue { } static const TStringRef& Name() { - static auto name = TStringRef::Of("Logging"); - return name; + static auto Name = TStringRef::Of("Logging"); + return Name; } static bool DeclareSignature(const TStringRef& name, TType* userType, IFunctionTypeInfoBuilder& builder, bool typesOnly) { diff --git a/yql/essentials/utils/docs/page.cpp b/yql/essentials/utils/docs/page.cpp index 542d7f72c642..57189334058a 100644 --- a/yql/essentials/utils/docs/page.cpp +++ b/yql/essentials/utils/docs/page.cpp @@ -7,8 +7,8 @@ namespace NYql::NDocs { TString ResolvedMarkdownText(TStringBuf relativePath, TString text, TStringBuf baseURL) { - static const RE2 anchorRegex(R"re(\[([^\\\]]+)\]\((#[^\\)]+)\))re"); - static const RE2 linkRegex(R"re(\[([^\\\]]+)\]\(([A-Za-z0-9/_\-\.]+).md(#[^\\)]+)?\))re"); + static const RE2 AnchorRegex(R"re(\[([^\\\]]+)\]\((#[^\\)]+)\))re"); + static const RE2 LinkRegex(R"re(\[([^\\\]]+)\]\(([A-Za-z0-9/_\-\.]+).md(#[^\\)]+)?\))re"); TString base = TString(baseURL) + "/" + TString(relativePath); TString anchorRewrite = "[\\1](" + base + "\\2)"; @@ -16,14 +16,14 @@ TString ResolvedMarkdownText(TStringBuf relativePath, TString text, TStringBuf b TString error; YQL_ENSURE( - anchorRegex.CheckRewriteString(anchorRewrite, &error), + AnchorRegex.CheckRewriteString(anchorRewrite, &error), "Bad rewrite '" << anchorRewrite << "': " << error); YQL_ENSURE( - linkRegex.CheckRewriteString(linkRewrite, &error), + LinkRegex.CheckRewriteString(linkRewrite, &error), "Bad rewrite '" << linkRewrite << "': " << error); - RE2::GlobalReplace(&text, anchorRegex, anchorRewrite); - RE2::GlobalReplace(&text, linkRegex, linkRewrite); + RE2::GlobalReplace(&text, AnchorRegex, anchorRewrite); + RE2::GlobalReplace(&text, LinkRegex, linkRewrite); return text; } @@ -37,14 +37,14 @@ TMarkdownPage Resolved(TStringBuf relativePath, TMarkdownPage page, TStringBuf b } TString ExtendedSyntaxRemoved(TString text) { - static const RE2 regex(R"re( *{%[^\\]*?%} *\n?)re"); - RE2::GlobalReplace(&text, regex, ""); + static const RE2 Regex(R"re( *{%[^\\]*?%} *\n?)re"); + RE2::GlobalReplace(&text, Regex, ""); return text; } TString CodeListingsTagRemoved(TString text) { - static const RE2 regex(R"re(```[a-z0-9]{1,16})re"); - RE2::GlobalReplace(&text, regex, "```"); + static const RE2 Regex(R"re(```[a-z0-9]{1,16})re"); + RE2::GlobalReplace(&text, Regex, "```"); return text; } diff --git a/yql/essentials/utils/failure_injector/failure_injector_ut.cpp b/yql/essentials/utils/failure_injector/failure_injector_ut.cpp index 75c67e30048d..a55bdaccb85b 100644 --- a/yql/essentials/utils/failure_injector/failure_injector_ut.cpp +++ b/yql/essentials/utils/failure_injector/failure_injector_ut.cpp @@ -20,7 +20,7 @@ void OnReach(std::atomic& called) { void SetUpLogger() { TString logType = "cout"; NLog::InitLogger(logType, false); - NLog::EComponentHelpers::ForEach([](NLog::EComponent component) { + NLog::TComponentHelpers::ForEach([](NLog::EComponent component) { NLog::YqlLogger().SetComponentLevel(component, ELevel::DEBUG); }); } diff --git a/yql/essentials/utils/fetch/fetch.cpp b/yql/essentials/utils/fetch/fetch.cpp index 8099cd3ac1a9..ef2aabd03c0f 100644 --- a/yql/essentials/utils/fetch/fetch.cpp +++ b/yql/essentials/utils/fetch/fetch.cpp @@ -143,7 +143,7 @@ ERetryErrorClass DefaultClassifyHttpCode(unsigned code) { } IRetryPolicy::TPtr GetDefaultPolicy() { - static const auto policy = IRetryPolicy::GetExponentialBackoffPolicy( + static const auto Policy = IRetryPolicy::GetExponentialBackoffPolicy( /*retryClassFunction=*/DefaultClassifyHttpCode, /*minDelay=*/TDuration::Seconds(1), /*minLongRetryDelay:*/ TDuration::Seconds(5), @@ -151,7 +151,7 @@ IRetryPolicy::TPtr GetDefaultPolicy() { /*maxRetries=*/3, /*maxTime=*/TDuration::Minutes(3), /*scaleFactor=*/2); - return policy; + return Policy; } THttpURL ParseURL(const TStringBuf addr) { diff --git a/yql/essentials/utils/fetch/fetch.h b/yql/essentials/utils/fetch/fetch.h index f767026599dd..f13c91ed2892 100644 --- a/yql/essentials/utils/fetch/fetch.h +++ b/yql/essentials/utils/fetch/fetch.h @@ -11,7 +11,8 @@ namespace NYql { -struct IFetchResult: public TThrRefBase { +class IFetchResult: public TThrRefBase { +public: virtual THttpInput& GetStream() = 0; virtual unsigned GetRetCode() = 0; virtual THttpURL GetRedirectURL(const THttpURL& baseUrl) = 0; diff --git a/yql/essentials/utils/log/log.cpp b/yql/essentials/utils/log/log.cpp index 73394c4f2def..06a7344bfdc7 100644 --- a/yql/essentials/utils/log/log.cpp +++ b/yql/essentials/utils/log/log.cpp @@ -301,7 +301,7 @@ TYqlLog::TYqlLog(const TString& logType, const TComponentLevels& levels) , WriteTruncMsg_(0) { for (size_t component = 0; component < levels.size(); ++component) { - SetComponentLevel(EComponentHelpers::FromInt(component), levels[component]); + SetComponentLevel(TComponentHelpers::FromInt(component), levels[component]); } } @@ -312,7 +312,7 @@ TYqlLog::TYqlLog(TAutoPtr backend, const TComponentLevels& levels) , WriteTruncMsg_(0) { for (size_t component = 0; component < levels.size(); ++component) { - SetComponentLevel(EComponentHelpers::FromInt(component), levels[component]); + SetComponentLevel(TComponentHelpers::FromInt(component), levels[component]); } } @@ -325,12 +325,12 @@ TAutoPtr TYqlLog::CreateLogElement( EComponent component, ELevel level, TStringBuf file, int line) const { if (/* const bool writeMsg = */ AtomicCas(&WriteTruncMsg_, 0, 1)) { - TLogElement fatal(this, ELevelHelpers::ToLogPriority(ELevel::FATAL)); + TLogElement fatal(this, TLevelHelpers::ToLogPriority(ELevel::FATAL)); Contextify(fatal, EComponent::Default, ELevel::FATAL, __FILE__, __LINE__); fatal << "Log is truncated by limit"; } - auto element = MakeHolder(this, ELevelHelpers::ToLogPriority(level)); + auto element = MakeHolder(this, TLevelHelpers::ToLogPriority(level)); Contextify(*element, component, level, file, line); return element.Release(); } @@ -388,7 +388,7 @@ void InitLogger(const NProto::TLoggingConfig& config, bool startAsDaemon) { for (const auto& cmpLevel : config.GetLevels()) { auto component = ConvertComponent(cmpLevel.GetC()); auto level = ConvertLevel(cmpLevel.GetL()); - levels[EComponentHelpers::ToInt(component)] = level; + levels[TComponentHelpers::ToInt(component)] = level; } TLoggerOperator::Set(new TYqlLog("null", levels)); diff --git a/yql/essentials/utils/log/log.h b/yql/essentials/utils/log/log.h index e531c1831043..ec6a607f0658 100644 --- a/yql/essentials/utils/log/log.h +++ b/yql/essentials/utils/log/log.h @@ -99,7 +99,7 @@ TString GetLocalTime(); } // namespace NImpl using TComponentLevels = - std::array; + std::array; void WriteLocalTime(IOutputStream* out); @@ -116,15 +116,15 @@ class TYqlLog: public TLog { void UpdateProcInfo(const TString& procName); ELevel GetComponentLevel(EComponent component) const { - return ELevelHelpers::FromInt(AtomicGet(ComponentLevels_[EComponentHelpers::ToInt(component)])); + return TLevelHelpers::FromInt(AtomicGet(ComponentLevels_[TComponentHelpers::ToInt(component)])); } void SetComponentLevel(EComponent component, ELevel level) { - AtomicSet(ComponentLevels_[EComponentHelpers::ToInt(component)], ELevelHelpers::ToInt(level)); + AtomicSet(ComponentLevels_[TComponentHelpers::ToInt(component)], TLevelHelpers::ToInt(level)); } bool NeedToLog(EComponent component, ELevel level) const { - return ELevelHelpers::Lte(level, GetComponentLevel(component)); + return TLevelHelpers::Lte(level, GetComponentLevel(component)); } void SetMaxLogLimit(ui64 limit); @@ -139,18 +139,18 @@ class TYqlLog: public TLog { template > Action> void Contextify(Action action, EComponent component, ELevel level, TStringBuf file, int line) const { action(std::make_pair(TString(ToStringBuf(EContextKey::DateTime)), NImpl::GetLocalTime())); - action(std::make_pair(TString(ToStringBuf(EContextKey::Level)), TString(ELevelHelpers::ToString(level)))); + action(std::make_pair(TString(ToStringBuf(EContextKey::Level)), TString(TLevelHelpers::ToString(level)))); action(std::make_pair(TString(ToStringBuf(EContextKey::ProcessName)), ProcName_)); action(std::make_pair(TString(ToStringBuf(EContextKey::ProcessID)), ToString(ProcId_))); action(std::make_pair(TString(ToStringBuf(EContextKey::ThreadID)), NImpl::GetThreadId())); - action(std::make_pair(TString(ToStringBuf(EContextKey::Component)), TString(EComponentHelpers::ToString(component)))); + action(std::make_pair(TString(ToStringBuf(EContextKey::Component)), TString(TComponentHelpers::ToString(component)))); action(std::make_pair(TString(ToStringBuf(EContextKey::FileName)), TString(file.RAfter(LOCSLASH_C)))); action(std::make_pair(TString(ToStringBuf(EContextKey::Line)), ToString(line))); } TString ProcName_; pid_t ProcId_; - std::array ComponentLevels_{0}; + std::array ComponentLevels_{0}; mutable TAtomic WriteTruncMsg_; }; diff --git a/yql/essentials/utils/log/log_component.h b/yql/essentials/utils/log/log_component.h index bd284cb9d811..a0dc5820b386 100644 --- a/yql/essentials/utils/log/log_component.h +++ b/yql/essentials/utils/log/log_component.h @@ -42,7 +42,10 @@ enum class EComponent { MaxValue }; -struct EComponentHelpers { +class TComponentHelpers { +public: + TComponentHelpers() = delete; + static constexpr int ToInt(EComponent component) { return static_cast(component); } @@ -213,14 +216,17 @@ struct EComponentHelpers { template static void ForEach(TFunctor&& f) { - static const int minValue = ToInt(EComponent::Default); - static const int maxValue = ToInt(EComponent::MaxValue); + static const int MinValue = ToInt(EComponent::Default); + static const int MaxValue = ToInt(EComponent::MaxValue); - for (int c = minValue; c < maxValue; c++) { + for (int c = MinValue; c < MaxValue; c++) { f(FromInt(c)); } } }; +// TODO(YQL-20086): Migrate YDB to TComponentHelpers +using EComponentHelpers = TComponentHelpers; + } // namespace NLog } // namespace NYql diff --git a/yql/essentials/utils/log/log_level.h b/yql/essentials/utils/log/log_level.h index 5471e411d528..f4acd9f868ab 100644 --- a/yql/essentials/utils/log/log_level.h +++ b/yql/essentials/utils/log/log_level.h @@ -18,7 +18,10 @@ enum class ELevel { TRACE = TLOG_RESOURCES, }; -struct ELevelHelpers { +class TLevelHelpers { +public: + TLevelHelpers() = delete; + static constexpr bool Lte(ELevel l1, ELevel l2) { return ToInt(l1) <= ToInt(l2); } @@ -110,14 +113,17 @@ struct ELevelHelpers { template static void ForEach(TFunctor&& f) { - static const int minValue = ToInt(ELevel::FATAL); - static const int maxValue = ToInt(ELevel::TRACE); + static const int MinValue = ToInt(ELevel::FATAL); + static const int MaxValue = ToInt(ELevel::TRACE); - for (int l = minValue; l <= maxValue; l++) { + for (int l = MinValue; l <= MaxValue; l++) { f(FromInt(l)); } } }; +// TODO(YQL-20086): Migrate YDB to TLevelHelpers +using ELevelHelpers = TLevelHelpers; + } // namespace NLog } // namespace NYql diff --git a/yql/essentials/utils/log/ut/log_parser.cpp b/yql/essentials/utils/log/ut/log_parser.cpp index 55f23ba0f576..a0cbd0a2aff7 100644 --- a/yql/essentials/utils/log/ut/log_parser.cpp +++ b/yql/essentials/utils/log/ut/log_parser.cpp @@ -10,7 +10,7 @@ TLogRow ParseJsonLogRow(TStringBuf str) { return { .Time = TInstant::ParseIso8601(json["@fields"]["datetime"].GetStringSafe()) - TDuration::Hours(4), - .Level = ELevelHelpers::FromString(json["@fields"]["level"].GetStringSafe()), + .Level = TLevelHelpers::FromString(json["@fields"]["level"].GetStringSafe()), .ProcName = json["@fields"]["procname"].GetStringSafe(), .ProcId = FromString(json["@fields"]["pid"].GetStringSafe()), .ThreadId = [&] { @@ -21,7 +21,7 @@ TLogRow ParseJsonLogRow(TStringBuf str) { return IntFromString(string); } }(), - .Component = EComponentHelpers::FromString(json["@fields"]["component"].GetStringSafe()), + .Component = TComponentHelpers::FromString(json["@fields"]["component"].GetStringSafe()), .FileName = json["@fields"]["filename"].GetStringSafe(), .LineNumber = FromString(json["@fields"]["line"].GetStringSafe()), .Path = json["@fields"]["path"].GetStringRobust(), @@ -30,7 +30,7 @@ TLogRow ParseJsonLogRow(TStringBuf str) { } TLogRow ParseLegacyLogRow(TStringBuf str) { - static std::regex rowRe( + static std::regex RowRe( "^([0-9]{4}-[0-9]{2}-[0-9]{2} [0-9]{2}:[0-9]{2}:[0-9]{2}\\.[0-9]{3}) " // (1) time "([A-Z ]{5}) " // (2) level "([a-zA-Z0-9_\\.-]+)" // (3) process name @@ -44,20 +44,20 @@ TLogRow ParseLegacyLogRow(TStringBuf str) { , std::regex_constants::extended); std::cmatch match; - bool isMatch = std::regex_match(str.data(), match, rowRe); + bool isMatch = std::regex_match(str.data(), match, RowRe); UNIT_ASSERT_C(isMatch, "log row does not match format: '" << str << '\''); UNIT_ASSERT_EQUAL_C(match.size(), 11, "expected 11 groups in log row: '" << str << '\''); return { .Time = TInstant::ParseIso8601(match[1].str()) - TDuration::Hours(4), - .Level = ELevelHelpers::FromString(match[2].str()), + .Level = TLevelHelpers::FromString(match[2].str()), .ProcName = match[3].str(), .ProcId = FromString(match[4].str()), .ThreadId = match[5].str().substr(0, 2) == "0x" ? IntFromString(match[5].str().substr(2)) : IntFromString(match[5].str()), - .Component = EComponentHelpers::FromString(match[6].str()), + .Component = TComponentHelpers::FromString(match[6].str()), .FileName = match[7].str(), .LineNumber = FromString(match[8].str()), .Path = match[9].str() != "" diff --git a/yql/essentials/utils/signals/signals.cpp b/yql/essentials/utils/signals/signals.cpp index 6d3a3c05f7e1..94484c4b0fae 100644 --- a/yql/essentials/utils/signals/signals.cpp +++ b/yql/essentials/utils/signals/signals.cpp @@ -81,11 +81,11 @@ void SignalHandlerWithSelfPipe(int signo) int savedErrno = errno; if (write(SignalPipeW.GetHandle(), "x", 1) == -1 && errno != EAGAIN) { - static TStringBuf msg("cannot write to signal pipe"); + static TStringBuf Msg("cannot write to signal pipe"); #ifndef STDERR_FILENO #define STDERR_FILENO 2 #endif - write(STDERR_FILENO, msg.data(), msg.size()); + write(STDERR_FILENO, Msg.data(), Msg.size()); abort(); } errno = savedErrno; diff --git a/yql/essentials/utils/signals/utils.h b/yql/essentials/utils/signals/utils.h index 845695e34696..16937119cf7c 100644 --- a/yql/essentials/utils/signals/utils.h +++ b/yql/essentials/utils/signals/utils.h @@ -2,11 +2,9 @@ #include -namespace google { -namespace protobuf { +namespace google::protobuf { // NOLINT(readability-identifier-naming) class Message; -} // namespace protobuf -} // namespace google +} // namespace google::protobuf namespace NYql { diff --git a/yql/essentials/utils/utf8.cpp b/yql/essentials/utils/utf8.cpp index d47743e2b7a6..3abb2d5702b6 100644 --- a/yql/essentials/utils/utf8.cpp +++ b/yql/essentials/utils/utf8.cpp @@ -13,7 +13,7 @@ unsigned char GetRange(unsigned char c) { // Referring to DFA of http://bjoern.hoehrmann.de/utf-8/decoder/dfa/ // With new mapping 1 -> 0x10, 7 -> 0x20, 9 -> 0x40, such that AND operation can test multiple types. // clang-format off - static const unsigned char type[] = { + static const unsigned char Type[] = { 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, 0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0, @@ -26,7 +26,7 @@ unsigned char GetRange(unsigned char c) { 10,3,3,3,3,3,3,3,3,3,3,3,3,4,3,3, 11,6,6,6,5,8,8,8,8,8,8,8,8,8,8,8, }; // clang-format on - return type[c]; + return Type[c]; } struct TByteRange { diff --git a/yt/yql/providers/yt/lib/log/yt_logger.cpp b/yt/yql/providers/yt/lib/log/yt_logger.cpp index 2355772f02b4..0d170b60db0e 100644 --- a/yt/yql/providers/yt/lib/log/yt_logger.cpp +++ b/yt/yql/providers/yt/lib/log/yt_logger.cpp @@ -128,12 +128,12 @@ class TGlobalLoggerImpl: public NYT::ILogger path = std::move(out.Str()); } - TLogRecord record(NLog::ELevelHelpers::ToLogPriority(yqlLevel), message.data(), message.length()); + TLogRecord record(NLog::TLevelHelpers::ToLogPriority(yqlLevel), message.data(), message.length()); NLog::YqlLogger().Contextify(record, NLog::EComponent::ProviderYt, yqlLevel, sl.File, sl.Line); record.MetaFlags.emplace_back(NLog::ToStringBuf(NLog::EContextKey::Path), std::move(path)); if (needLog) { - ELogPriority level = NLog::ELevelHelpers::ToLogPriority(yqlLevel); + ELogPriority level = NLog::TLevelHelpers::ToLogPriority(yqlLevel); NLog::YqlLogger().Write(level, record.Data, record.Len, record.MetaFlags); } diff --git a/yt/yql/providers/yt/provider/yql_yt_join_impl.h b/yt/yql/providers/yt/provider/yql_yt_join_impl.h index b8d867488845..6fa2ae458a7a 100644 --- a/yt/yql/providers/yt/provider/yql_yt_join_impl.h +++ b/yt/yql/providers/yt/provider/yql_yt_join_impl.h @@ -74,7 +74,7 @@ IGraphTransformer::TStatus RewriteYtEquiJoin(TYtEquiJoin equiJoin, TYtJoinNodeOp TMaybeNode ExportYtEquiJoin(TYtEquiJoin equiJoin, const TYtJoinNodeOp& op, TExprContext& ctx, const TYtState::TPtr& state); TYtJoinNodeOp::TPtr OrderJoins(TYtJoinNodeOp::TPtr op, const TYtState::TPtr& state, TExprContext& ctx, bool debug = false); -struct IBaseOptimizerNode; +class IBaseOptimizerNode; struct IProviderContext; void BuildOptimizerJoinTree(TYtState::TPtr state, std::shared_ptr& tree, std::shared_ptr& providerCtx, TOptimizerLinkSettings& settings, TYtJoinNodeOp::TPtr op, TExprContext& ctx); From bedf8ef876c6acd19a41a1c5936d281dde0534fb Mon Sep 17 00:00:00 2001 From: babenko Date: Fri, 21 Nov 2025 14:28:05 +0300 Subject: [PATCH 05/16] Add support for OnRaw in TJsonWriter commit_hash:08d34b8a675920b41ee3e2e0d08e1658c9b0ce95 --- yt/yt/core/json/json_writer.cpp | 9 ++------- yt/yt/core/json/unittests/writer_ut.cpp | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/yt/yt/core/json/json_writer.cpp b/yt/yt/core/json/json_writer.cpp index e2daab82a15b..70d140770675 100644 --- a/yt/yt/core/json/json_writer.cpp +++ b/yt/yt/core/json/json_writer.cpp @@ -16,7 +16,8 @@ using namespace NYson; //////////////////////////////////////////////////////////////////////////////// class TJsonWriter - : public IJsonWriter + : public TYsonConsumerBase + , public IJsonWriter { public: TJsonWriter(IOutputStream* output, bool isPretty); @@ -42,7 +43,6 @@ class TJsonWriter void OnBeginAttributes() override; void OnEndAttributes() override; - void OnRaw(TStringBuf yson, EYsonType type) override; void StartNextValue() override; @@ -311,11 +311,6 @@ void TJsonWriter::OnEndAttributes() THROW_ERROR_EXCEPTION("TJsonWriter does not support attributes"); } -void TJsonWriter::OnRaw(TStringBuf /*yson*/, NYT::NYson::EYsonType /*type*/) -{ - THROW_ERROR_EXCEPTION("TJsonWriter does not support OnRaw()"); -} - ui64 TJsonWriter::GetWrittenByteCount() const { return GetBuffer().size() + WrittenToOutputByteCount_; diff --git a/yt/yt/core/json/unittests/writer_ut.cpp b/yt/yt/core/json/unittests/writer_ut.cpp index 275ad5b5822a..541fc2d4a9c8 100644 --- a/yt/yt/core/json/unittests/writer_ut.cpp +++ b/yt/yt/core/json/unittests/writer_ut.cpp @@ -74,6 +74,18 @@ TEST(TJsonWriterTest, StartNextValue) EXPECT_EQ(outputStream.Str(), "[123,\"hello\"]\n{\"abc\":true,\"def\":-1.5}"); } +TEST(TJsonWriterTest, Raw) +{ + TStringStream outputStream; + { + auto writer = CreateJsonWriter(&outputStream); + writer->OnRaw(TYsonStringBuf("{hello=world}")); + writer->Flush(); + } + + EXPECT_EQ(outputStream.Str(), "{\"hello\":\"world\"}"); +} + TEST(TJsonWriterTest, Errors) { TStringStream outputStream; @@ -87,10 +99,6 @@ TEST(TJsonWriterTest, Errors) auto writer = CreateJsonWriter(&outputStream); EXPECT_THROW(writer->OnBeginAttributes(), TErrorException); } - { - auto writer = CreateJsonWriter(&outputStream); - EXPECT_THROW(writer->OnRaw("{x=3}", EYsonType::Node), TErrorException); - } } //////////////////////////////////////////////////////////////////////////////// From 79cbe2a35b20c766550904b72b10226bca2e14b3 Mon Sep 17 00:00:00 2001 From: robot-piglet Date: Fri, 21 Nov 2025 15:00:19 +0300 Subject: [PATCH 06/16] Intermediate changes commit_hash:e227fe879645ae86ec05a318d99d8996962186b3 --- .../cpp/src/arrow/adapters/orc/adapter.cc | 30 ++++---- .../cpp/src/arrow/adapters/orc/adapter.h | 18 ++--- .../cpp/src/arrow/adapters/orc/options.cc | 2 +- .../cpp/src/arrow/adapters/orc/options.h | 8 +- .../cpp/src/arrow/adapters/orc/util.cc | 26 +++---- .../cpp/src/arrow/adapters/orc/util.h | 8 +- .../apache/arrow_next/cpp/src/arrow/api.h | 46 +++++------ .../apache/arrow_next/cpp/src/arrow/array.h | 18 ++--- .../cpp/src/arrow/array/array_base.cc | 38 ++++----- .../cpp/src/arrow/array/array_base.h | 20 ++--- .../cpp/src/arrow/array/array_binary.cc | 16 ++-- .../cpp/src/arrow/array/array_binary.h | 16 ++-- .../cpp/src/arrow/array/array_decimal.cc | 14 ++-- .../cpp/src/arrow/array/array_decimal.h | 8 +- .../cpp/src/arrow/array/array_dict.cc | 38 ++++----- .../cpp/src/arrow/array/array_dict.h | 14 ++-- .../cpp/src/arrow/array/array_nested.cc | 38 ++++----- .../cpp/src/arrow/array/array_nested.h | 18 ++--- .../cpp/src/arrow/array/array_primitive.cc | 12 +-- .../cpp/src/arrow/array/array_primitive.h | 18 ++--- .../cpp/src/arrow/array/array_run_end.cc | 10 +-- .../cpp/src/arrow/array/array_run_end.h | 18 ++--- .../cpp/src/arrow/array/builder_adaptive.cc | 18 ++--- .../cpp/src/arrow/array/builder_adaptive.h | 12 +-- .../cpp/src/arrow/array/builder_base.cc | 22 +++--- .../cpp/src/arrow/array/builder_base.h | 18 ++--- .../cpp/src/arrow/array/builder_binary.cc | 22 +++--- .../cpp/src/arrow/array/builder_binary.h | 22 +++--- .../cpp/src/arrow/array/builder_decimal.cc | 14 ++-- .../cpp/src/arrow/array/builder_decimal.h | 14 ++-- .../cpp/src/arrow/array/builder_dict.cc | 18 ++--- .../cpp/src/arrow/array/builder_dict.h | 32 ++++---- .../cpp/src/arrow/array/builder_nested.cc | 12 +-- .../cpp/src/arrow/array/builder_nested.h | 18 ++--- .../cpp/src/arrow/array/builder_primitive.cc | 18 ++--- .../cpp/src/arrow/array/builder_primitive.h | 10 +-- .../cpp/src/arrow/array/builder_run_end.cc | 14 ++-- .../cpp/src/arrow/array/builder_run_end.h | 4 +- .../cpp/src/arrow/array/builder_time.h | 4 +- .../cpp/src/arrow/array/builder_union.cc | 8 +- .../cpp/src/arrow/array/builder_union.h | 16 ++-- .../cpp/src/arrow/array/concatenate.cc | 48 ++++++------ .../cpp/src/arrow/array/concatenate.h | 6 +- .../arrow_next/cpp/src/arrow/array/data.cc | 34 ++++---- .../arrow_next/cpp/src/arrow/array/data.h | 18 ++--- .../cpp/src/arrow/array/dict_internal.h | 20 ++--- .../arrow_next/cpp/src/arrow/array/diff.cc | 44 +++++------ .../arrow_next/cpp/src/arrow/array/diff.h | 12 +-- .../cpp/src/arrow/array/statistics.cc | 2 +- .../cpp/src/arrow/array/statistics.h | 4 +- .../arrow_next/cpp/src/arrow/array/util.cc | 42 +++++----- .../arrow_next/cpp/src/arrow/array/util.h | 14 ++-- .../cpp/src/arrow/array/validate.cc | 36 ++++----- .../arrow_next/cpp/src/arrow/array/validate.h | 6 +- .../apache/arrow_next/cpp/src/arrow/buffer.cc | 16 ++-- .../apache/arrow_next/cpp/src/arrow/buffer.h | 12 +-- .../arrow_next/cpp/src/arrow/buffer_builder.h | 16 ++-- .../arrow_next/cpp/src/arrow/builder.cc | 12 +-- .../apache/arrow_next/cpp/src/arrow/builder.h | 24 +++--- .../arrow_next/cpp/src/arrow/c/bridge.cc | 48 ++++++------ .../arrow_next/cpp/src/arrow/c/bridge.h | 16 ++-- .../arrow_next/cpp/src/arrow/c/dlpack.cc | 12 +-- .../arrow_next/cpp/src/arrow/c/dlpack.h | 4 +- .../arrow_next/cpp/src/arrow/c/helpers.h | 2 +- .../cpp/src/arrow/c/util_internal.h | 2 +- .../cpp/src/arrow/chunk_resolver.cc | 6 +- .../arrow_next/cpp/src/arrow/chunk_resolver.h | 6 +- .../arrow_next/cpp/src/arrow/chunked_array.cc | 24 +++--- .../arrow_next/cpp/src/arrow/chunked_array.h | 16 ++-- .../arrow_next/cpp/src/arrow/compare.cc | 48 ++++++------ .../apache/arrow_next/cpp/src/arrow/compare.h | 4 +- .../arrow_next/cpp/src/arrow/compute/api.h | 26 +++---- .../cpp/src/arrow/compute/api_aggregate.cc | 12 +-- .../cpp/src/arrow/compute/api_aggregate.h | 10 +-- .../cpp/src/arrow/compute/api_scalar.cc | 18 ++--- .../cpp/src/arrow/compute/api_scalar.h | 12 +-- .../cpp/src/arrow/compute/api_vector.cc | 28 +++---- .../cpp/src/arrow/compute/api_vector.h | 8 +- .../arrow_next/cpp/src/arrow/compute/cast.cc | 18 ++--- .../arrow_next/cpp/src/arrow/compute/cast.h | 16 ++-- .../cpp/src/arrow/compute/cast_internal.h | 6 +- .../arrow_next/cpp/src/arrow/compute/exec.cc | 52 ++++++------- .../arrow_next/cpp/src/arrow/compute/exec.h | 18 ++--- .../cpp/src/arrow/compute/exec_internal.h | 12 +-- .../cpp/src/arrow/compute/expression.cc | 36 ++++----- .../cpp/src/arrow/compute/expression.h | 8 +- .../src/arrow/compute/expression_internal.h | 16 ++-- .../cpp/src/arrow/compute/function.cc | 28 +++---- .../cpp/src/arrow/compute/function.h | 16 ++-- .../src/arrow/compute/function_internal.cc | 22 +++--- .../cpp/src/arrow/compute/function_internal.h | 28 +++---- .../cpp/src/arrow/compute/function_options.h | 10 +-- .../cpp/src/arrow/compute/kernel.cc | 22 +++--- .../arrow_next/cpp/src/arrow/compute/kernel.h | 20 ++--- .../arrow/compute/kernels/aggregate_basic.cc | 16 ++-- .../compute/kernels/aggregate_basic.inc.cc | 18 ++--- .../kernels/aggregate_basic_internal.h | 8 +- .../compute/kernels/aggregate_internal.h | 12 +-- .../arrow/compute/kernels/aggregate_mode.cc | 16 ++-- .../arrow/compute/kernels/aggregate_pivot.cc | 16 ++-- .../compute/kernels/aggregate_quantile.cc | 8 +- .../compute/kernels/aggregate_tdigest.cc | 10 +-- .../compute/kernels/aggregate_var_std.cc | 14 ++-- .../kernels/aggregate_var_std_internal.h | 6 +- .../kernels/base_arithmetic_internal.h | 16 ++-- .../arrow/compute/kernels/chunked_internal.cc | 6 +- .../arrow/compute/kernels/chunked_internal.h | 8 +- .../arrow/compute/kernels/codegen_internal.cc | 6 +- .../arrow/compute/kernels/codegen_internal.h | 44 +++++------ .../arrow/compute/kernels/common_internal.h | 32 ++++---- .../compute/kernels/copy_data_internal.h | 2 +- .../arrow/compute/kernels/gather_internal.h | 12 +-- .../arrow/compute/kernels/hash_aggregate.cc | 44 +++++------ .../compute/kernels/hash_aggregate_internal.h | 22 +++--- .../compute/kernels/hash_aggregate_numeric.cc | 26 +++---- .../compute/kernels/hash_aggregate_pivot.cc | 24 +++--- .../arrow/compute/kernels/pivot_internal.cc | 28 +++---- .../arrow/compute/kernels/pivot_internal.h | 10 +-- .../compute/kernels/ree_util_internal.cc | 14 ++-- .../arrow/compute/kernels/ree_util_internal.h | 16 ++-- .../compute/kernels/scalar_arithmetic.cc | 28 +++---- .../arrow/compute/kernels/scalar_boolean.cc | 8 +- .../compute/kernels/scalar_cast_boolean.cc | 8 +- .../compute/kernels/scalar_cast_dictionary.cc | 16 ++-- .../compute/kernels/scalar_cast_extension.cc | 6 +- .../compute/kernels/scalar_cast_internal.cc | 14 ++-- .../compute/kernels/scalar_cast_internal.h | 10 +-- .../compute/kernels/scalar_cast_nested.cc | 16 ++-- .../compute/kernels/scalar_cast_numeric.cc | 18 ++--- .../compute/kernels/scalar_cast_string.cc | 30 ++++---- .../compute/kernels/scalar_cast_temporal.cc | 14 ++-- .../arrow/compute/kernels/scalar_compare.cc | 10 +-- .../arrow/compute/kernels/scalar_if_else.cc | 28 +++---- .../arrow/compute/kernels/scalar_nested.cc | 22 +++--- .../arrow/compute/kernels/scalar_random.cc | 10 +-- .../src/arrow/compute/kernels/scalar_round.cc | 30 ++++---- .../compute/kernels/scalar_set_lookup.cc | 20 ++--- .../compute/kernels/scalar_string_ascii.cc | 16 ++-- .../compute/kernels/scalar_string_internal.h | 4 +- .../compute/kernels/scalar_string_utf8.cc | 6 +- .../compute/kernels/scalar_temporal_binary.cc | 14 ++-- .../compute/kernels/scalar_temporal_unary.cc | 16 ++-- .../arrow/compute/kernels/scalar_validity.cc | 8 +- .../arrow/compute/kernels/temporal_internal.h | 4 +- .../arrow/compute/kernels/util_internal.cc | 10 +-- .../src/arrow/compute/kernels/util_internal.h | 14 ++-- .../compute/kernels/vector_array_sort.cc | 22 +++--- .../compute/kernels/vector_cumulative_ops.cc | 24 +++--- .../src/arrow/compute/kernels/vector_hash.cc | 30 ++++---- .../arrow/compute/kernels/vector_nested.cc | 16 ++-- .../arrow/compute/kernels/vector_pairwise.cc | 32 ++++---- .../src/arrow/compute/kernels/vector_rank.cc | 8 +- .../arrow/compute/kernels/vector_replace.cc | 10 +-- .../compute/kernels/vector_run_end_encode.cc | 14 ++-- .../arrow/compute/kernels/vector_select_k.cc | 6 +- .../arrow/compute/kernels/vector_selection.cc | 46 +++++------ .../vector_selection_filter_internal.cc | 40 +++++----- .../vector_selection_filter_internal.h | 6 +- .../kernels/vector_selection_internal.cc | 40 +++++----- .../kernels/vector_selection_internal.h | 12 +-- .../kernels/vector_selection_take_internal.cc | 42 +++++----- .../kernels/vector_selection_take_internal.h | 8 +- .../src/arrow/compute/kernels/vector_sort.cc | 6 +- .../compute/kernels/vector_sort_internal.h | 12 +-- .../compute/kernels/vector_statistics.cc | 26 +++---- .../arrow/compute/kernels/vector_swizzle.cc | 12 +-- .../src/arrow/compute/key_hash_internal.cc | 8 +- .../cpp/src/arrow/compute/key_hash_internal.h | 6 +- .../cpp/src/arrow/compute/key_map_internal.cc | 10 +-- .../cpp/src/arrow/compute/key_map_internal.h | 10 +-- .../src/arrow/compute/light_array_internal.cc | 8 +- .../src/arrow/compute/light_array_internal.h | 14 ++-- .../cpp/src/arrow/compute/ordering.cc | 4 +- .../cpp/src/arrow/compute/ordering.h | 6 +- .../cpp/src/arrow/compute/registry.cc | 14 ++-- .../cpp/src/arrow/compute/registry.h | 6 +- .../src/arrow/compute/row/compare_internal.cc | 10 +-- .../src/arrow/compute/row/compare_internal.h | 14 ++-- .../src/arrow/compute/row/encode_internal.cc | 4 +- .../src/arrow/compute/row/encode_internal.h | 18 ++--- .../cpp/src/arrow/compute/row/grouper.cc | 36 ++++----- .../cpp/src/arrow/compute/row/grouper.h | 8 +- .../arrow/compute/row/row_encoder_internal.cc | 6 +- .../arrow/compute/row/row_encoder_internal.h | 4 +- .../cpp/src/arrow/compute/row/row_internal.cc | 4 +- .../cpp/src/arrow/compute/row/row_internal.h | 10 +-- .../cpp/src/arrow/compute/type_fwd.h | 2 +- .../arrow_next/cpp/src/arrow/compute/util.cc | 6 +- .../arrow_next/cpp/src/arrow/compute/util.h | 10 +-- .../cpp/src/arrow/compute/util_internal.cc | 6 +- .../cpp/src/arrow/compute/util_internal.h | 8 +- .../apache/arrow_next/cpp/src/arrow/config.cc | 10 +-- .../apache/arrow_next/cpp/src/arrow/config.h | 6 +- .../apache/arrow_next/cpp/src/arrow/csv/api.h | 6 +- .../arrow_next/cpp/src/arrow/csv/chunker.cc | 8 +- .../arrow_next/cpp/src/arrow/csv/chunker.h | 10 +-- .../cpp/src/arrow/csv/column_builder.cc | 26 +++---- .../cpp/src/arrow/csv/column_builder.h | 8 +- .../cpp/src/arrow/csv/column_decoder.cc | 24 +++--- .../cpp/src/arrow/csv/column_decoder.h | 8 +- .../arrow_next/cpp/src/arrow/csv/converter.cc | 30 ++++---- .../arrow_next/cpp/src/arrow/csv/converter.h | 10 +-- .../cpp/src/arrow/csv/inference_internal.h | 6 +- .../cpp/src/arrow/csv/lexing_internal.h | 4 +- .../arrow_next/cpp/src/arrow/csv/options.cc | 2 +- .../arrow_next/cpp/src/arrow/csv/options.h | 10 +-- .../arrow_next/cpp/src/arrow/csv/parser.cc | 14 ++-- .../arrow_next/cpp/src/arrow/csv/parser.h | 12 +-- .../arrow_next/cpp/src/arrow/csv/reader.cc | 46 +++++------ .../arrow_next/cpp/src/arrow/csv/reader.h | 18 ++--- .../arrow_next/cpp/src/arrow/csv/writer.cc | 24 +++--- .../arrow_next/cpp/src/arrow/csv/writer.h | 10 +-- .../apache/arrow_next/cpp/src/arrow/datum.cc | 22 +++--- .../apache/arrow_next/cpp/src/arrow/datum.h | 16 ++-- .../apache/arrow_next/cpp/src/arrow/device.cc | 14 ++-- .../apache/arrow_next/cpp/src/arrow/device.h | 14 ++-- .../src/arrow/device_allocation_type_set.cc | 4 +- .../src/arrow/device_allocation_type_set.h | 4 +- .../cpp/src/arrow/extension/bool8.cc | 4 +- .../cpp/src/arrow/extension/bool8.h | 2 +- .../src/arrow/extension/fixed_shape_tensor.cc | 26 +++---- .../src/arrow/extension/fixed_shape_tensor.h | 2 +- .../cpp/src/arrow/extension/json.cc | 12 +-- .../arrow_next/cpp/src/arrow/extension/json.h | 8 +- .../cpp/src/arrow/extension/opaque.cc | 6 +- .../cpp/src/arrow/extension/opaque.h | 4 +- .../cpp/src/arrow/extension/tensor_internal.h | 4 +- .../cpp/src/arrow/extension/uuid.cc | 6 +- .../arrow_next/cpp/src/arrow/extension/uuid.h | 2 +- .../cpp/src/arrow/extension_type.cc | 26 +++---- .../arrow_next/cpp/src/arrow/extension_type.h | 18 ++--- .../arrow_next/cpp/src/arrow/filesystem/api.h | 8 +- .../cpp/src/arrow/filesystem/filesystem.cc | 42 +++++----- .../cpp/src/arrow/filesystem/filesystem.h | 16 ++-- .../cpp/src/arrow/filesystem/localfs.cc | 26 +++---- .../cpp/src/arrow/filesystem/localfs.h | 2 +- .../cpp/src/arrow/filesystem/mockfs.cc | 22 +++--- .../cpp/src/arrow/filesystem/mockfs.h | 4 +- .../cpp/src/arrow/filesystem/path_util.cc | 14 ++-- .../cpp/src/arrow/filesystem/path_util.h | 2 +- .../cpp/src/arrow/filesystem/util_internal.cc | 14 ++-- .../cpp/src/arrow/filesystem/util_internal.h | 10 +-- .../apache/arrow_next/cpp/src/arrow/io/api.h | 10 +-- .../arrow_next/cpp/src/arrow/io/buffered.cc | 12 +-- .../arrow_next/cpp/src/arrow/io/buffered.h | 6 +- .../arrow_next/cpp/src/arrow/io/caching.cc | 12 +-- .../arrow_next/cpp/src/arrow/io/caching.h | 6 +- .../arrow_next/cpp/src/arrow/io/compressed.cc | 14 ++-- .../arrow_next/cpp/src/arrow/io/compressed.h | 6 +- .../arrow_next/cpp/src/arrow/io/concurrency.h | 12 +-- .../arrow_next/cpp/src/arrow/io/file.cc | 22 +++--- .../apache/arrow_next/cpp/src/arrow/io/file.h | 6 +- .../arrow_next/cpp/src/arrow/io/interfaces.cc | 26 +++---- .../arrow_next/cpp/src/arrow/io/interfaces.h | 12 +-- .../arrow_next/cpp/src/arrow/io/memory.cc | 20 ++--- .../arrow_next/cpp/src/arrow/io/memory.h | 8 +- .../apache/arrow_next/cpp/src/arrow/io/mman.h | 2 +- .../arrow_next/cpp/src/arrow/io/slow.cc | 14 ++-- .../apache/arrow_next/cpp/src/arrow/io/slow.h | 4 +- .../arrow_next/cpp/src/arrow/io/stdio.cc | 6 +- .../arrow_next/cpp/src/arrow/io/stdio.h | 4 +- .../arrow_next/cpp/src/arrow/io/transform.cc | 12 +-- .../arrow_next/cpp/src/arrow/io/transform.h | 4 +- .../arrow_next/cpp/src/arrow/io/type_fwd.h | 4 +- .../cpp/src/arrow/io/util_internal.h | 8 +- .../apache/arrow_next/cpp/src/arrow/ipc/api.h | 12 +-- .../cpp/src/arrow/ipc/dictionary.cc | 20 ++--- .../arrow_next/cpp/src/arrow/ipc/dictionary.h | 10 +-- .../arrow_next/cpp/src/arrow/ipc/feather.cc | 42 +++++----- .../arrow_next/cpp/src/arrow/ipc/feather.h | 8 +- .../cpp/src/arrow/ipc/json_simple.cc | 38 ++++----- .../cpp/src/arrow/ipc/json_simple.h | 6 +- .../arrow_next/cpp/src/arrow/ipc/message.cc | 32 ++++---- .../arrow_next/cpp/src/arrow/ipc/message.h | 14 ++-- .../cpp/src/arrow/ipc/metadata_internal.cc | 46 +++++------ .../cpp/src/arrow/ipc/metadata_internal.h | 26 +++---- .../arrow_next/cpp/src/arrow/ipc/options.cc | 4 +- .../arrow_next/cpp/src/arrow/ipc/options.h | 12 +-- .../arrow_next/cpp/src/arrow/ipc/reader.cc | 70 ++++++++--------- .../arrow_next/cpp/src/arrow/ipc/reader.h | 20 ++--- .../cpp/src/arrow/ipc/reader_internal.h | 6 +- .../arrow_next/cpp/src/arrow/ipc/writer.cc | 60 +++++++-------- .../arrow_next/cpp/src/arrow/ipc/writer.h | 12 +-- .../cpp/src/arrow/json/chunked_builder.cc | 16 ++-- .../cpp/src/arrow/json/chunked_builder.h | 8 +- .../arrow_next/cpp/src/arrow/json/chunker.cc | 10 +-- .../arrow_next/cpp/src/arrow/json/chunker.h | 6 +- .../cpp/src/arrow/json/converter.cc | 24 +++--- .../arrow_next/cpp/src/arrow/json/converter.h | 6 +- .../cpp/src/arrow/json/object_parser.cc | 4 +- .../cpp/src/arrow/json/object_parser.h | 4 +- .../cpp/src/arrow/json/object_writer.cc | 4 +- .../cpp/src/arrow/json/object_writer.h | 2 +- .../arrow_next/cpp/src/arrow/json/options.cc | 2 +- .../arrow_next/cpp/src/arrow/json/options.h | 4 +- .../arrow_next/cpp/src/arrow/json/parser.cc | 22 +++--- .../arrow_next/cpp/src/arrow/json/parser.h | 10 +-- .../arrow_next/cpp/src/arrow/json/reader.cc | 32 ++++---- .../arrow_next/cpp/src/arrow/json/reader.h | 16 ++-- .../arrow_next/cpp/src/arrow/memory_pool.cc | 28 +++---- .../arrow_next/cpp/src/arrow/memory_pool.h | 8 +- .../cpp/src/arrow/memory_pool_internal.h | 4 +- .../arrow_next/cpp/src/arrow/pretty_print.cc | 30 ++++---- .../arrow_next/cpp/src/arrow/pretty_print.h | 2 +- .../arrow_next/cpp/src/arrow/record_batch.cc | 36 ++++----- .../arrow_next/cpp/src/arrow/record_batch.h | 16 ++-- .../apache/arrow_next/cpp/src/arrow/result.cc | 6 +- .../apache/arrow_next/cpp/src/arrow/result.h | 6 +- .../apache/arrow_next/cpp/src/arrow/scalar.cc | 36 ++++----- .../apache/arrow_next/cpp/src/arrow/scalar.h | 22 +++--- .../arrow_next/cpp/src/arrow/sparse_tensor.cc | 14 ++-- .../arrow_next/cpp/src/arrow/sparse_tensor.h | 18 ++--- .../apache/arrow_next/cpp/src/arrow/status.cc | 4 +- .../apache/arrow_next/cpp/src/arrow/status.h | 8 +- .../cpp/src/arrow/status_internal.h | 4 +- .../arrow_next/cpp/src/arrow/stl_allocator.h | 6 +- .../arrow_next/cpp/src/arrow/stl_iterator.h | 10 +-- .../apache/arrow_next/cpp/src/arrow/table.cc | 36 ++++----- .../apache/arrow_next/cpp/src/arrow/table.h | 14 ++-- .../arrow_next/cpp/src/arrow/table_builder.cc | 14 ++-- .../arrow_next/cpp/src/arrow/table_builder.h | 12 +-- .../apache/arrow_next/cpp/src/arrow/tensor.cc | 20 ++--- .../apache/arrow_next/cpp/src/arrow/tensor.h | 16 ++-- .../cpp/src/arrow/tensor/converter.h | 2 +- .../cpp/src/arrow/tensor/converter_internal.h | 2 +- .../cpp/src/arrow/tensor/coo_converter.cc | 14 ++-- .../cpp/src/arrow/tensor/csf_converter.cc | 18 ++--- .../cpp/src/arrow/tensor/csx_converter.cc | 12 +-- .../apache/arrow_next/cpp/src/arrow/type.cc | 36 ++++----- .../apache/arrow_next/cpp/src/arrow/type.h | 14 ++-- .../arrow_next/cpp/src/arrow/type_fwd.h | 4 +- .../arrow_next/cpp/src/arrow/type_traits.cc | 4 +- .../arrow_next/cpp/src/arrow/type_traits.h | 4 +- .../arrow_next/cpp/src/arrow/util/algorithm.h | 2 +- .../cpp/src/arrow/util/align_util.cc | 18 ++--- .../cpp/src/arrow/util/align_util.h | 6 +- .../cpp/src/arrow/util/aligned_storage.h | 4 +- .../cpp/src/arrow/util/async_generator.h | 18 ++--- .../cpp/src/arrow/util/async_generator_fwd.h | 4 +- .../cpp/src/arrow/util/async_util.cc | 10 +-- .../cpp/src/arrow/util/async_util.h | 18 ++--- .../cpp/src/arrow/util/atfork_internal.cc | 6 +- .../cpp/src/arrow/util/atfork_internal.h | 2 +- .../arrow_next/cpp/src/arrow/util/base64.h | 2 +- .../cpp/src/arrow/util/basic_decimal.cc | 18 ++--- .../cpp/src/arrow/util/basic_decimal.h | 8 +- .../cpp/src/arrow/util/binary_view_util.h | 4 +- .../cpp/src/arrow/util/bit_block_counter.cc | 6 +- .../cpp/src/arrow/util/bit_block_counter.h | 14 ++-- .../cpp/src/arrow/util/bit_run_reader.cc | 4 +- .../cpp/src/arrow/util/bit_run_reader.h | 10 +-- .../arrow/util/bit_stream_utils_internal.h | 10 +-- .../arrow_next/cpp/src/arrow/util/bit_util.cc | 4 +- .../arrow_next/cpp/src/arrow/util/bit_util.h | 4 +- .../arrow_next/cpp/src/arrow/util/bitmap.cc | 10 +-- .../arrow_next/cpp/src/arrow/util/bitmap.h | 22 +++--- .../cpp/src/arrow/util/bitmap_builders.cc | 10 +-- .../cpp/src/arrow/util/bitmap_builders.h | 8 +- .../cpp/src/arrow/util/bitmap_generate.h | 10 +-- .../cpp/src/arrow/util/bitmap_ops.cc | 18 ++--- .../cpp/src/arrow/util/bitmap_ops.h | 4 +- .../cpp/src/arrow/util/bitmap_reader.h | 8 +- .../cpp/src/arrow/util/bitmap_visit.h | 4 +- .../cpp/src/arrow/util/bitmap_writer.h | 6 +- .../cpp/src/arrow/util/bitset_stack.h | 22 +++--- .../arrow_next/cpp/src/arrow/util/bpacking.cc | 12 +-- .../arrow_next/cpp/src/arrow/util/bpacking.h | 4 +- .../cpp/src/arrow/util/bpacking64_default.h | 4 +- .../cpp/src/arrow/util/bpacking_default.h | 4 +- .../cpp/src/arrow/util/byte_size.cc | 20 ++--- .../arrow_next/cpp/src/arrow/util/byte_size.h | 2 +- .../arrow/util/byte_stream_split_internal.h | 8 +- .../arrow_next/cpp/src/arrow/util/cancel.cc | 14 ++-- .../arrow_next/cpp/src/arrow/util/cancel.h | 8 +- .../arrow_next/cpp/src/arrow/util/compare.h | 2 +- .../cpp/src/arrow/util/compression.cc | 12 +-- .../cpp/src/arrow/util/compression.h | 8 +- .../cpp/src/arrow/util/compression_brotli.cc | 10 +-- .../cpp/src/arrow/util/compression_internal.h | 2 +- .../cpp/src/arrow/util/compression_lz4.cc | 16 ++-- .../cpp/src/arrow/util/compression_snappy.cc | 10 +-- .../cpp/src/arrow/util/compression_zlib.cc | 10 +-- .../cpp/src/arrow/util/compression_zstd.cc | 10 +-- .../cpp/src/arrow/util/counting_semaphore.cc | 4 +- .../cpp/src/arrow/util/counting_semaphore.h | 2 +- .../arrow_next/cpp/src/arrow/util/cpu_info.cc | 12 +-- .../arrow_next/cpp/src/arrow/util/cpu_info.h | 4 +- .../arrow_next/cpp/src/arrow/util/crc32.cc | 4 +- .../arrow_next/cpp/src/arrow/util/crc32.h | 2 +- .../arrow_next/cpp/src/arrow/util/debug.cc | 4 +- .../arrow_next/cpp/src/arrow/util/debug.h | 2 +- .../arrow_next/cpp/src/arrow/util/decimal.cc | 20 ++--- .../arrow_next/cpp/src/arrow/util/decimal.h | 8 +- .../cpp/src/arrow/util/decimal_internal.h | 10 +-- .../cpp/src/arrow/util/delimiting.cc | 6 +- .../cpp/src/arrow/util/delimiting.h | 6 +- .../cpp/src/arrow/util/dict_util.cc | 8 +- .../arrow_next/cpp/src/arrow/util/dict_util.h | 2 +- .../arrow_next/cpp/src/arrow/util/dispatch.h | 4 +- .../arrow_next/cpp/src/arrow/util/endian.h | 4 +- .../src/arrow/util/fixed_width_internal.cc | 16 ++-- .../cpp/src/arrow/util/fixed_width_internal.h | 8 +- .../arrow_next/cpp/src/arrow/util/float16.cc | 4 +- .../arrow_next/cpp/src/arrow/util/float16.h | 8 +- .../cpp/src/arrow/util/formatting.cc | 10 +-- .../cpp/src/arrow/util/formatting.h | 18 ++--- .../cpp/src/arrow/util/functional.h | 4 +- .../arrow_next/cpp/src/arrow/util/future.cc | 12 +-- .../arrow_next/cpp/src/arrow/util/future.h | 20 ++--- .../arrow_next/cpp/src/arrow/util/hashing.cc | 8 +- .../arrow_next/cpp/src/arrow/util/hashing.h | 24 +++--- .../cpp/src/arrow/util/int128_internal.h | 4 +- .../arrow_next/cpp/src/arrow/util/int_util.cc | 28 +++---- .../arrow_next/cpp/src/arrow/util/int_util.h | 4 +- .../cpp/src/arrow/util/int_util_overflow.h | 12 +-- .../arrow_next/cpp/src/arrow/util/io_util.cc | 22 +++--- .../arrow_next/cpp/src/arrow/util/io_util.h | 10 +-- .../arrow_next/cpp/src/arrow/util/iterator.h | 14 ++-- .../cpp/src/arrow/util/key_value_metadata.cc | 10 +-- .../cpp/src/arrow/util/key_value_metadata.h | 8 +- .../cpp/src/arrow/util/list_util.cc | 20 ++--- .../arrow_next/cpp/src/arrow/util/list_util.h | 4 +- .../arrow_next/cpp/src/arrow/util/logger.cc | 2 +- .../arrow_next/cpp/src/arrow/util/logger.h | 10 +-- .../arrow_next/cpp/src/arrow/util/logging.cc | 4 +- .../arrow_next/cpp/src/arrow/util/logging.h | 4 +- .../cpp/src/arrow/util/math_internal.cc | 4 +- .../cpp/src/arrow/util/math_internal.h | 4 +- .../arrow_next/cpp/src/arrow/util/memory.cc | 6 +- .../arrow_next/cpp/src/arrow/util/memory.h | 2 +- .../arrow_next/cpp/src/arrow/util/mutex.cc | 6 +- .../arrow_next/cpp/src/arrow/util/mutex.h | 4 +- .../arrow_next/cpp/src/arrow/util/parallel.h | 8 +- .../cpp/src/arrow/util/pcg_random.h | 2 +- .../arrow_next/cpp/src/arrow/util/print.h | 2 +- .../arrow_next/cpp/src/arrow/util/queue.h | 2 +- .../arrow_next/cpp/src/arrow/util/ree_util.cc | 8 +- .../arrow_next/cpp/src/arrow/util/ree_util.h | 8 +- .../cpp/src/arrow/util/reflection_internal.h | 2 +- .../src/arrow/util/rle_encoding_internal.h | 10 +-- .../cpp/src/arrow/util/slice_util_internal.h | 2 +- .../cpp/src/arrow/util/small_vector.h | 4 +- .../arrow_next/cpp/src/arrow/util/spaced.h | 2 +- .../arrow_next/cpp/src/arrow/util/string.cc | 4 +- .../arrow_next/cpp/src/arrow/util/string.h | 4 +- .../cpp/src/arrow/util/string_builder.cc | 2 +- .../cpp/src/arrow/util/string_builder.h | 2 +- .../cpp/src/arrow/util/task_group.cc | 10 +-- .../cpp/src/arrow/util/task_group.h | 14 ++-- .../arrow_next/cpp/src/arrow/util/tdigest.cc | 6 +- .../arrow_next/cpp/src/arrow/util/tdigest.h | 6 +- .../cpp/src/arrow/util/thread_pool.cc | 14 ++-- .../cpp/src/arrow/util/thread_pool.h | 18 ++--- .../arrow_next/cpp/src/arrow/util/time.cc | 6 +- .../arrow_next/cpp/src/arrow/util/time.h | 4 +- .../arrow_next/cpp/src/arrow/util/tracing.cc | 6 +- .../arrow_next/cpp/src/arrow/util/tracing.h | 2 +- .../cpp/src/arrow/util/tracing_internal.h | 12 +-- .../arrow_next/cpp/src/arrow/util/trie.cc | 4 +- .../arrow_next/cpp/src/arrow/util/trie.h | 6 +- .../arrow_next/cpp/src/arrow/util/ubsan.h | 2 +- .../cpp/src/arrow/util/union_util.cc | 8 +- .../cpp/src/arrow/util/union_util.h | 2 +- .../cpp/src/arrow/util/unreachable.cc | 4 +- .../cpp/src/arrow/util/unreachable.h | 2 +- .../arrow_next/cpp/src/arrow/util/uri.cc | 6 +- .../arrow_next/cpp/src/arrow/util/uri.h | 4 +- .../arrow_next/cpp/src/arrow/util/utf8.cc | 10 +-- .../arrow_next/cpp/src/arrow/util/utf8.h | 6 +- .../cpp/src/arrow/util/utf8_internal.h | 12 +-- .../cpp/src/arrow/util/value_parsing.cc | 4 +- .../cpp/src/arrow/util/value_parsing.h | 18 ++--- .../arrow_next/cpp/src/arrow/util/vector.h | 8 +- .../src/arrow/util/windows_compatibility.h | 2 +- .../cpp/src/arrow/vendored/base64.cpp | 2 +- .../cpp/src/arrow/vendored/datetime.h | 6 +- .../cpp/src/arrow/vendored/musl/strptime.c | 2 +- .../cpp/src/arrow/vendored/strptime.h | 2 +- .../cpp/src/arrow/visit_array_inline.h | 6 +- .../cpp/src/arrow/visit_data_inline.h | 18 ++--- .../cpp/src/arrow/visit_scalar_inline.h | 8 +- .../cpp/src/arrow/visit_type_inline.h | 10 +-- .../arrow_next/cpp/src/arrow/visitor.cc | 12 +-- .../apache/arrow_next/cpp/src/arrow/visitor.h | 6 +- .../cpp/src/generated/parquet_types.h | 2 +- .../arrow_next/cpp/src/parquet/api/io.h | 2 +- .../arrow_next/cpp/src/parquet/api/reader.h | 22 +++--- .../arrow_next/cpp/src/parquet/api/schema.h | 2 +- .../arrow_next/cpp/src/parquet/api/writer.h | 12 +-- .../cpp/src/parquet/arrow/path_internal.cc | 32 ++++---- .../cpp/src/parquet/arrow/path_internal.h | 6 +- .../cpp/src/parquet/arrow/reader.cc | 46 +++++------ .../arrow_next/cpp/src/parquet/arrow/reader.h | 6 +- .../cpp/src/parquet/arrow/reader_internal.cc | 62 +++++++-------- .../cpp/src/parquet/arrow/reader_internal.h | 12 +-- .../cpp/src/parquet/arrow/schema.cc | 38 ++++----- .../arrow_next/cpp/src/parquet/arrow/schema.h | 16 ++-- .../cpp/src/parquet/arrow/schema_internal.cc | 8 +- .../cpp/src/parquet/arrow/schema_internal.h | 6 +- .../cpp/src/parquet/arrow/writer.cc | 42 +++++----- .../arrow_next/cpp/src/parquet/arrow/writer.h | 4 +- .../cpp/src/parquet/bloom_filter.cc | 16 ++-- .../arrow_next/cpp/src/parquet/bloom_filter.h | 10 +-- .../cpp/src/parquet/bloom_filter_reader.cc | 8 +- .../cpp/src/parquet/bloom_filter_reader.h | 6 +- .../arrow_next/cpp/src/parquet/column_page.h | 6 +- .../cpp/src/parquet/column_reader.cc | 54 ++++++------- .../cpp/src/parquet/column_reader.h | 14 ++-- .../cpp/src/parquet/column_scanner.cc | 4 +- .../cpp/src/parquet/column_scanner.h | 10 +-- .../cpp/src/parquet/column_writer.cc | 70 ++++++++--------- .../cpp/src/parquet/column_writer.h | 10 +-- .../arrow_next/cpp/src/parquet/decoder.cc | 46 +++++------ .../arrow_next/cpp/src/parquet/encoder.cc | 42 +++++----- .../arrow_next/cpp/src/parquet/encoding.h | 8 +- .../cpp/src/parquet/encryption/encryption.cc | 8 +- .../cpp/src/parquet/encryption/encryption.h | 6 +- .../parquet/encryption/encryption_internal.h | 6 +- .../encryption/encryption_internal_nossl.cc | 4 +- .../encryption/internal_file_decryptor.cc | 10 +-- .../encryption/internal_file_decryptor.h | 2 +- .../encryption/internal_file_encryptor.cc | 6 +- .../encryption/internal_file_encryptor.h | 4 +- .../arrow_next/cpp/src/parquet/exception.cc | 2 +- .../arrow_next/cpp/src/parquet/exception.h | 6 +- .../arrow_next/cpp/src/parquet/file_reader.cc | 50 ++++++------ .../arrow_next/cpp/src/parquet/file_reader.h | 10 +-- .../arrow_next/cpp/src/parquet/file_writer.cc | 20 ++--- .../arrow_next/cpp/src/parquet/file_writer.h | 8 +- .../arrow_next/cpp/src/parquet/hasher.h | 2 +- .../cpp/src/parquet/level_comparison.cc | 6 +- .../cpp/src/parquet/level_comparison.h | 2 +- .../cpp/src/parquet/level_comparison_inc.h | 6 +- .../cpp/src/parquet/level_conversion.cc | 16 ++-- .../cpp/src/parquet/level_conversion.h | 6 +- .../cpp/src/parquet/level_conversion_inc.h | 16 ++-- .../arrow_next/cpp/src/parquet/metadata.cc | 24 +++--- .../arrow_next/cpp/src/parquet/metadata.h | 6 +- .../arrow_next/cpp/src/parquet/page_index.cc | 26 +++---- .../arrow_next/cpp/src/parquet/page_index.h | 8 +- .../arrow_next/cpp/src/parquet/platform.cc | 6 +- .../arrow_next/cpp/src/parquet/platform.h | 10 +-- .../arrow_next/cpp/src/parquet/printer.cc | 20 ++--- .../arrow_next/cpp/src/parquet/printer.h | 2 +- .../arrow_next/cpp/src/parquet/properties.cc | 10 +-- .../arrow_next/cpp/src/parquet/properties.h | 22 +++--- .../arrow_next/cpp/src/parquet/schema.cc | 10 +-- .../arrow_next/cpp/src/parquet/schema.h | 6 +- .../cpp/src/parquet/schema_internal.h | 6 +- .../cpp/src/parquet/size_statistics.cc | 8 +- .../cpp/src/parquet/size_statistics.h | 6 +- .../arrow_next/cpp/src/parquet/statistics.cc | 28 +++---- .../arrow_next/cpp/src/parquet/statistics.h | 4 +- .../cpp/src/parquet/stream_reader.cc | 4 +- .../cpp/src/parquet/stream_reader.h | 6 +- .../cpp/src/parquet/stream_writer.cc | 2 +- .../cpp/src/parquet/stream_writer.h | 4 +- .../cpp/src/parquet/thrift_internal.h | 22 +++--- .../arrow_next/cpp/src/parquet/types.cc | 12 +-- .../apache/arrow_next/cpp/src/parquet/types.h | 6 +- .../cpp/src/parquet/windows_compatibility.h | 4 +- .../cpp/src/parquet/windows_fixup.h | 2 +- .../arrow_next/cpp/src/parquet/xxhasher.cc | 2 +- .../arrow_next/cpp/src/parquet/xxhasher.h | 6 +- .../apache/arrow_next/patches/fix-includes.sh | 67 ++++++++++++++++ .../google-auth/py3/.dist-info/METADATA | 2 +- .../py3/google/auth/transport/_mtls_helper.py | 41 +++++++++- .../py3/google/auth/transport/grpc.py | 16 ++-- .../py3/google/auth/transport/mtls.py | 17 ++++ .../py3/google/auth/transport/requests.py | 9 +-- .../py3/google/auth/transport/urllib3.py | 9 +-- .../google-auth/py3/google/auth/version.py | 2 +- .../py3/tests/transport/test__mtls_helper.py | 77 +++++++++++++++++++ .../py3/tests/transport/test_mtls.py | 9 +++ contrib/python/google-auth/py3/ya.make | 2 +- 575 files changed, 3939 insertions(+), 3746 deletions(-) create mode 100644 contrib/libs/apache/arrow_next/patches/fix-includes.sh diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/adapter.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/adapter.cc index bb02dc50b932..511bb1377830 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/adapter.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/adapter.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/adapters/orc/adapter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/adapter.h" #include #include @@ -28,20 +28,20 @@ # include #endif -#include "arrow/adapters/orc/util.h" -#include "arrow/builder.h" -#include "arrow/io/interfaces.h" -#include "arrow/memory_pool.h" -#include "arrow/record_batch.h" -#include "arrow/status.h" -#include "arrow/table.h" -#include "arrow/table_builder.h" -#include "arrow/type.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/decimal.h" -#include "arrow/util/key_value_metadata.h" -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" #include "orc/Exceptions.hh" // alias to not interfere with nested orc namespace diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/adapter.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/adapter.h index c40020c3c2a1..7b5e9fa681ae 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/adapter.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/adapter.h @@ -22,15 +22,15 @@ #include #include -#include "arrow/adapters/orc/options.h" -#include "arrow/io/interfaces.h" -#include "arrow/memory_pool.h" -#include "arrow/record_batch.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_fwd.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace adapters { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/options.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/options.cc index 1cc0ea623cab..d8df30c376ab 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/options.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/options.cc @@ -17,7 +17,7 @@ #include -#include "arrow/adapters/orc/options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/options.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/options.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/options.h index ff904124cbdd..28ca3c5e197f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/options.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/options.h @@ -20,10 +20,10 @@ #include -#include "arrow/io/interfaces.h" -#include "arrow/status.h" -#include "arrow/util/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/util.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/util.cc index 1fd02c046564..99d57d5f6631 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/util.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/util.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/adapters/orc/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/util.h" #include #include @@ -23,18 +23,18 @@ #include #include -#include "arrow/array/builder_base.h" -#include "arrow/builder.h" -#include "arrow/chunked_array.h" -#include "arrow/scalar.h" -#include "arrow/status.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/decimal.h" -#include "arrow/util/key_value_metadata.h" -#include "arrow/util/range.h" -#include "arrow/util/string.h" -#include "arrow/visit_data_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/range.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_data_inline.h" #include "orc/MemoryPool.hh" #include "orc/OrcFile.hh" diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/util.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/util.h index 2f402dc37413..59b12df233e9 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/util.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/adapters/orc/util.h @@ -21,10 +21,10 @@ #include #include -#include "arrow/array/builder_base.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" #include "orc/OrcFile.hh" namespace liborc = orc; diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/api.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/api.h index 8f0dde54ce15..c76eab3ae24c 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/api.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/api.h @@ -20,29 +20,29 @@ #pragma once -#include "arrow/array.h" // IWYU pragma: export -#include "arrow/array/array_run_end.h" // IWYU pragma: export -#include "arrow/array/concatenate.h" // IWYU pragma: export -#include "arrow/buffer.h" // IWYU pragma: export -#include "arrow/builder.h" // IWYU pragma: export -#include "arrow/chunked_array.h" // IWYU pragma: export -#include "arrow/compare.h" // IWYU pragma: export -#include "arrow/config.h" // IWYU pragma: export -#include "arrow/datum.h" // IWYU pragma: export -#include "arrow/extension_type.h" // IWYU pragma: export -#include "arrow/memory_pool.h" // IWYU pragma: export -#include "arrow/pretty_print.h" // IWYU pragma: export -#include "arrow/record_batch.h" // IWYU pragma: export -#include "arrow/result.h" // IWYU pragma: export -#include "arrow/status.h" // IWYU pragma: export -#include "arrow/table.h" // IWYU pragma: export -#include "arrow/table_builder.h" // IWYU pragma: export -#include "arrow/tensor.h" // IWYU pragma: export -#include "arrow/type.h" // IWYU pragma: export -#include "arrow/util/key_value_metadata.h" // IWYU pragma: export -#include "arrow/visit_array_inline.h" // IWYU pragma: export -#include "arrow/visit_scalar_inline.h" // IWYU pragma: export -#include "arrow/visitor.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_run_end.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/concatenate.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/builder.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compare.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/config.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/datum.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/pretty_print.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table_builder.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/tensor.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_array_inline.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_scalar_inline.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visitor.h" // IWYU pragma: export /// \brief Top-level namespace for Apache Arrow C++ API namespace arrow20 {} diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array.h index 0a13d8818c1c..2677f809882a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array.h @@ -39,12 +39,12 @@ /// @{ /// @} -#include "arrow/array/array_base.h" // IWYU pragma: keep -#include "arrow/array/array_binary.h" // IWYU pragma: keep -#include "arrow/array/array_decimal.h" // IWYU pragma: keep -#include "arrow/array/array_dict.h" // IWYU pragma: keep -#include "arrow/array/array_nested.h" // IWYU pragma: keep -#include "arrow/array/array_primitive.h" // IWYU pragma: keep -#include "arrow/array/array_run_end.h" // IWYU pragma: keep -#include "arrow/array/data.h" // IWYU pragma: keep -#include "arrow/array/util.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_binary.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_decimal.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_dict.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_nested.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_primitive.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_run_end.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.h" // IWYU pragma: keep diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.cc index bd56a092efda..d45f01f54c17 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" #include #include @@ -24,24 +24,24 @@ #include #include -#include "arrow/array/array_binary.h" -#include "arrow/array/array_dict.h" -#include "arrow/array/array_nested.h" -#include "arrow/array/array_primitive.h" -#include "arrow/array/util.h" -#include "arrow/array/validate.h" -#include "arrow/buffer.h" -#include "arrow/compare.h" -#include "arrow/pretty_print.h" -#include "arrow/scalar.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_fwd.h" -#include "arrow/type_traits.h" -#include "arrow/util/logging.h" -#include "arrow/util/ree_util.h" -#include "arrow/visit_array_inline.h" -#include "arrow/visitor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_binary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_dict.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/validate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compare.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/pretty_print.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ree_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_array_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visitor.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h index 73115bdea264..7dd4cfd55374 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h @@ -24,16 +24,16 @@ #include #include -#include "arrow/array/data.h" -#include "arrow/buffer.h" -#include "arrow/compare.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" -#include "arrow/visitor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compare.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visitor.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_binary.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_binary.cc index 763e3b086035..4069f897db87 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_binary.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_binary.cc @@ -15,18 +15,18 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/array/array_binary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_binary.h" #include #include -#include "arrow/array/array_base.h" -#include "arrow/array/validate.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/binary_view_util.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/validate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/binary_view_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_binary.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_binary.h index d9c2b8c35703..8713ccef55bf 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_binary.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_binary.h @@ -28,14 +28,14 @@ #include #include -#include "arrow/array/array_base.h" -#include "arrow/array/data.h" -#include "arrow/buffer.h" -#include "arrow/stl_iterator.h" -#include "arrow/type.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/stl_iterator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_decimal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_decimal.cc index 320133239c91..bbaf1cb39511 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_decimal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_decimal.cc @@ -15,18 +15,18 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/array/array_decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_decimal.h" #include #include #include -#include "arrow/array/array_binary.h" -#include "arrow/array/data.h" -#include "arrow/type.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/decimal.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_binary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_decimal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_decimal.h index 450508f5421b..ce42c9155f3e 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_decimal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_decimal.h @@ -22,10 +22,10 @@ #include #include -#include "arrow/array/array_binary.h" -#include "arrow/array/data.h" -#include "arrow/type.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_binary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_dict.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_dict.cc index a25978dff389..a92537d5397a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_dict.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_dict.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/array/array_dict.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_dict.h" #include #include @@ -24,24 +24,24 @@ #include #include -#include "arrow/array/array_primitive.h" -#include "arrow/array/data.h" -#include "arrow/array/dict_internal.h" -#include "arrow/array/util.h" -#include "arrow/buffer.h" -#include "arrow/chunked_array.h" -#include "arrow/compute/api.h" -#include "arrow/datum.h" -#include "arrow/status.h" -#include "arrow/table.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/int_util.h" -#include "arrow/util/logging.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/dict_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/datum.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_dict.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_dict.h index 14c17798d367..733ca6382f88 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_dict.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_dict.h @@ -21,13 +21,13 @@ #include #include -#include "arrow/array/array_base.h" -#include "arrow/array/data.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_nested.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_nested.cc index dbba4762e1ec..1d9d9f19103b 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_nested.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_nested.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/array/array_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_nested.h" #include #include @@ -25,24 +25,24 @@ #include #include -#include "arrow/array/array_base.h" -#include "arrow/array/array_primitive.h" -#include "arrow/array/builder_base.h" -#include "arrow/array/builder_nested.h" -#include "arrow/array/concatenate.h" -#include "arrow/array/util.h" -#include "arrow/buffer.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_fwd.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_generate.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/list_util.h" -#include "arrow/util/logging.h" -#include "arrow/util/unreachable.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/concatenate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_generate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/list_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/unreachable.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_nested.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_nested.h index 1c2cc7e9a31f..c5b34d1cc0b5 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_nested.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_nested.h @@ -27,15 +27,15 @@ #include #include -#include "arrow/array/array_base.h" -#include "arrow/array/data.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_fwd.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_primitive.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_primitive.cc index 6568a5b6cf01..61f8d4093c36 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_primitive.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_primitive.cc @@ -15,16 +15,16 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/array/array_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_primitive.h" #include #include -#include "arrow/array/array_base.h" -#include "arrow/type.h" -#include "arrow/util/bit_block_counter.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_primitive.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_primitive.h index 7942569199e7..bfc9363857d3 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_primitive.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_primitive.h @@ -24,15 +24,15 @@ #include #include -#include "arrow/array/array_base.h" -#include "arrow/array/data.h" -#include "arrow/stl_iterator.h" -#include "arrow/type.h" -#include "arrow/type_fwd.h" // IWYU pragma: export -#include "arrow/type_traits.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/stl_iterator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_run_end.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_run_end.cc index 69a9a3b8f598..1663f5da2803 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_run_end.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_run_end.cc @@ -15,11 +15,11 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/array/array_run_end.h" -#include "arrow/array/builder_primitive.h" -#include "arrow/array/util.h" -#include "arrow/util/logging.h" -#include "arrow/util/ree_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_run_end.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ree_util.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_run_end.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_run_end.h index fc4eebc05fa7..f38f6878270c 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_run_end.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_run_end.h @@ -26,15 +26,15 @@ #include #include -#include "arrow/array/array_base.h" -#include "arrow/array/data.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_fwd.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_adaptive.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_adaptive.cc index 4f9f790e5c76..47eb5d8accc5 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_adaptive.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_adaptive.cc @@ -15,19 +15,19 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/array/builder_adaptive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_adaptive.h" #include #include -#include "arrow/array/data.h" -#include "arrow/buffer.h" -#include "arrow/buffer_builder.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/util/int_util.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_adaptive.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_adaptive.h index 0a00889e2510..2b68d5d90dd7 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_adaptive.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_adaptive.h @@ -23,12 +23,12 @@ #include #include -#include "arrow/array/builder_base.h" -#include "arrow/buffer.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.cc index 509b12d87f7e..bbb2364082a9 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.cc @@ -15,22 +15,22 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/array/builder_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h" #include #include #include -#include "arrow/array/array_base.h" -#include "arrow/array/builder_dict.h" -#include "arrow/array/data.h" -#include "arrow/array/util.h" -#include "arrow/buffer.h" -#include "arrow/builder.h" -#include "arrow/scalar.h" -#include "arrow/status.h" -#include "arrow/util/logging.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_dict.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h index 579d1c6efdf6..935f6f5b0afe 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h @@ -25,15 +25,15 @@ #include #include -#include "arrow/array/array_base.h" -#include "arrow/array/array_primitive.h" -#include "arrow/buffer.h" -#include "arrow/buffer_builder.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type_fwd.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_binary.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_binary.cc index 5760725beed1..892981f56a7f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_binary.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_binary.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/array/builder_binary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_binary.h" #include #include @@ -26,16 +26,16 @@ #include #include -#include "arrow/array.h" -#include "arrow/buffer.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/decimal.h" -#include "arrow/util/logging.h" -#include "arrow/visit_data_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_data_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_binary.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_binary.h index 195eaa05e8fb..d1baf2ebfb0b 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_binary.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_binary.h @@ -29,17 +29,17 @@ #include #include -#include "arrow/array/array_base.h" -#include "arrow/array/array_binary.h" -#include "arrow/array/builder_base.h" -#include "arrow/array/data.h" -#include "arrow/buffer.h" -#include "arrow/buffer_builder.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/util/binary_view_util.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_binary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/binary_view_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_decimal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_decimal.cc index 10e474349f5b..f9c3888d191f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_decimal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_decimal.cc @@ -15,17 +15,17 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/array/builder_decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_decimal.h" #include #include -#include "arrow/array/data.h" -#include "arrow/buffer.h" -#include "arrow/buffer_builder.h" -#include "arrow/status.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_decimal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_decimal.h index 0c5fc2e96fef..698783a0c85a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_decimal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_decimal.h @@ -20,13 +20,13 @@ #include -#include "arrow/array/array_decimal.h" -#include "arrow/array/builder_base.h" -#include "arrow/array/builder_binary.h" -#include "arrow/array/data.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_binary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_dict.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_dict.cc index 31bb3ca9e977..92af94e8c5cd 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_dict.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_dict.cc @@ -15,19 +15,19 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/array/builder_dict.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_dict.h" #include #include -#include "arrow/array/dict_internal.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/hashing.h" -#include "arrow/util/logging.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/dict_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/hashing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_dict.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_dict.h index 95829b570e16..1f4a298c0fc2 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_dict.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_dict.h @@ -23,22 +23,22 @@ #include #include -#include "arrow/array/array_base.h" -#include "arrow/array/array_binary.h" -#include "arrow/array/builder_adaptive.h" // IWYU pragma: export -#include "arrow/array/builder_base.h" // IWYU pragma: export -#include "arrow/array/builder_primitive.h" // IWYU pragma: export -#include "arrow/array/data.h" -#include "arrow/array/util.h" -#include "arrow/scalar.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_block_counter.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/decimal.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_binary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_adaptive.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_nested.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_nested.cc index a5a35c2aedf0..5d89e7b93e5b 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_nested.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_nested.cc @@ -15,18 +15,18 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/array/builder_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_nested.h" #include #include #include #include -#include "arrow/buffer.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_nested.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_nested.h index 32e3ee642143..170b4b540b78 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_nested.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_nested.h @@ -24,15 +24,15 @@ #include #include -#include "arrow/array/array_nested.h" -#include "arrow/array/builder_base.h" -#include "arrow/array/data.h" -#include "arrow/buffer.h" -#include "arrow/buffer_builder.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.cc index 754becf35468..32f540bafdf9 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/array/builder_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" #include #include @@ -24,14 +24,14 @@ #include #include -#include "arrow/array.h" -#include "arrow/buffer.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/int_util.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h index f3d06926820f..602d759931a0 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h @@ -22,11 +22,11 @@ #include #include -#include "arrow/array/builder_base.h" -#include "arrow/array/data.h" -#include "arrow/result.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_run_end.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_run_end.cc index 6e0645b8a8d9..01d5ff0dff91 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_run_end.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_run_end.cc @@ -15,19 +15,19 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/array/builder_run_end.h" -#include "arrow/array/builder_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_run_end.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" #include #include #include #include -#include "arrow/scalar.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/int_util_overflow.h" -#include "arrow/util/logging.h" -#include "arrow/util/ree_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ree_util.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_run_end.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_run_end.h index 0fc824f00c81..ea42b341f9f2 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_run_end.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_run_end.h @@ -24,8 +24,8 @@ #include #include -#include "arrow/array.h" -#include "arrow/array/builder_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_time.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_time.h index 44b12a839fd4..e7bec96bff22 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_time.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_time.h @@ -22,8 +22,8 @@ #include -#include "arrow/array/builder_base.h" -#include "arrow/array/builder_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_union.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_union.cc index 15fce1e24be7..efb057778117 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_union.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_union.cc @@ -15,14 +15,14 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/array/builder_union.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_union.h" #include #include -#include "arrow/buffer.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_union.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_union.h index af1be391e2fe..5bdf3d4024d8 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_union.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_union.h @@ -23,14 +23,14 @@ #include #include -#include "arrow/array/array_nested.h" -#include "arrow/array/builder_base.h" -#include "arrow/array/data.h" -#include "arrow/buffer_builder.h" -#include "arrow/memory_pool.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/concatenate.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/concatenate.cc index c66de3f0c65a..3fdeca254e69 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/concatenate.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/concatenate.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/array/concatenate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/concatenate.h" #include #include @@ -25,29 +25,29 @@ #include #include -#include "arrow/array.h" -#include "arrow/array/builder_primitive.h" -#include "arrow/array/builder_run_end.h" -#include "arrow/array/data.h" -#include "arrow/array/util.h" -#include "arrow/buffer.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_fwd.h" -#include "arrow/util/bit_block_counter.h" -#include "arrow/util/bit_run_reader.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/int_util.h" -#include "arrow/util/int_util_overflow.h" -#include "arrow/util/list_util.h" -#include "arrow/util/logging.h" -#include "arrow/util/ree_util.h" -#include "arrow/util/slice_util_internal.h" -#include "arrow/visit_data_inline.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_run_end.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/list_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ree_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/slice_util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_data_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/concatenate.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/concatenate.h index 400a3ff8d324..6ccf6c893c53 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/concatenate.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/concatenate.h @@ -20,9 +20,9 @@ #include -#include "arrow/type_fwd.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.cc index a099cdd44b68..6e8589260d9a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" #include #include @@ -25,22 +25,22 @@ #include #include -#include "arrow/array/util.h" -#include "arrow/buffer.h" -#include "arrow/device.h" -#include "arrow/scalar.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/binary_view_util.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/dict_util.h" -#include "arrow/util/logging.h" -#include "arrow/util/macros.h" -#include "arrow/util/range.h" -#include "arrow/util/ree_util.h" -#include "arrow/util/slice_util_internal.h" -#include "arrow/util/union_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/device.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/binary_view_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/dict_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/range.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ree_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/slice_util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/union_util.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h index 9d2bd5bfd2f1..44bf299d78f4 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h @@ -25,15 +25,15 @@ #include #include -#include "arrow/array/statistics.h" -#include "arrow/buffer.h" -#include "arrow/result.h" -#include "arrow/type.h" -#include "arrow/type_fwd.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/macros.h" -#include "arrow/util/span.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/statistics.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/span.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/dict_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/dict_internal.h index 554dee0ed233..d3386e587791 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/dict_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/dict_internal.h @@ -18,7 +18,7 @@ #pragma once -#include "arrow/array/builder_dict.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_dict.h" #include #include @@ -28,15 +28,15 @@ #include #include -#include "arrow/array.h" -#include "arrow/buffer.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/hashing.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/hashing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/diff.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/diff.cc index c11e2d195b3a..2377eb01ff22 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/diff.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/diff.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/array/diff.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/diff.h" #include #include @@ -29,27 +29,27 @@ #include #include -#include "arrow/array/array_base.h" -#include "arrow/array/array_decimal.h" -#include "arrow/array/array_nested.h" -#include "arrow/array/array_primitive.h" -#include "arrow/array/array_run_end.h" -#include "arrow/buffer.h" -#include "arrow/buffer_builder.h" -#include "arrow/extension_type.h" -#include "arrow/memory_pool.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/logging.h" -#include "arrow/util/range.h" -#include "arrow/util/ree_util.h" -#include "arrow/util/string.h" -#include "arrow/util/unreachable.h" -#include "arrow/vendored/datetime.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_run_end.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/range.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ree_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/unreachable.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/datetime.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/diff.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/diff.h index efba11956831..28083d28ffae 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/diff.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/diff.h @@ -23,12 +23,12 @@ #include #include -#include "arrow/array/array_base.h" -#include "arrow/array/array_nested.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/statistics.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/statistics.cc index 125410e89c58..e4ad7f6378fb 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/statistics.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/statistics.cc @@ -18,4 +18,4 @@ // This empty .cc file is for embedding not inlined symbols in // arrow20::ArrayStatistics into libarrow. -#include "arrow/array/statistics.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/statistics.h" diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/statistics.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/statistics.h index 053520e9777a..1d93a62f3c66 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/statistics.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/statistics.h @@ -23,8 +23,8 @@ #include #include -#include "arrow/type.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.cc index 3c4a7c2cab2f..8a2b8131650e 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/array/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.h" #include #include @@ -27,26 +27,26 @@ #include #include -#include "arrow/array.h" -#include "arrow/array/builder_base.h" -#include "arrow/array/concatenate.h" -#include "arrow/buffer.h" -#include "arrow/buffer_builder.h" -#include "arrow/extension_type.h" -#include "arrow/result.h" -#include "arrow/scalar.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/decimal.h" -#include "arrow/util/endian.h" -#include "arrow/util/logging.h" -#include "arrow/util/sort.h" -#include "arrow/util/span.h" -#include "arrow/visit_data_inline.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/concatenate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/sort.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/span.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_data_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.h index 7ead941cd508..707666fdcdd7 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.h @@ -22,13 +22,13 @@ #include #include -#include "arrow/array/data.h" -#include "arrow/compare.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compare.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/validate.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/validate.cc index 45b2fa14c334..6c03e8ffc100 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/validate.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/validate.cc @@ -15,27 +15,27 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/array/validate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/validate.h" #include -#include "arrow/array.h" // IWYU pragma: keep -#include "arrow/extension_type.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/decimal.h" -#include "arrow/util/int_util_overflow.h" -#include "arrow/util/logging.h" -#include "arrow/util/ree_util.h" -#include "arrow/util/sort.h" -#include "arrow/util/string.h" -#include "arrow/util/unreachable.h" -#include "arrow/util/utf8.h" -#include "arrow/visit_data_inline.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ree_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/sort.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/unreachable.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/utf8.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_data_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/validate.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/validate.h index e8ab472e1425..fccdd1873fac 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/array/validate.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/array/validate.h @@ -18,9 +18,9 @@ #pragma once -#include "arrow/status.h" -#include "arrow/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.cc index 938b029d208b..8f5863cb3ef7 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.cc @@ -15,19 +15,19 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" #include #include #include -#include "arrow/memory_pool_internal.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/logging.h" -#include "arrow/util/slice_util_internal.h" -#include "arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/slice_util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h index 4da0bebf67c6..69da051abbff 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h @@ -27,12 +27,12 @@ #include #include -#include "arrow/device.h" -#include "arrow/status.h" -#include "arrow/type_fwd.h" -#include "arrow/util/macros.h" -#include "arrow/util/span.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/device.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/span.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/buffer_builder.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/buffer_builder.h index 1e618f10be51..96fc89c4b59e 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/buffer_builder.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/buffer_builder.h @@ -25,14 +25,14 @@ #include #include -#include "arrow/buffer.h" -#include "arrow/status.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_generate.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/macros.h" -#include "arrow/util/ubsan.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_generate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/builder.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/builder.cc index d0dc274f6988..51395c1ef0fa 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/builder.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/builder.cc @@ -15,18 +15,18 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/builder.h" #include #include #include #include -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/hashing.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/hashing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/builder.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/builder.h index 5fae660c8bef..dfe72900e258 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/builder.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/builder.h @@ -20,15 +20,15 @@ #include -#include "arrow/array/builder_adaptive.h" // IWYU pragma: keep -#include "arrow/array/builder_base.h" // IWYU pragma: keep -#include "arrow/array/builder_binary.h" // IWYU pragma: keep -#include "arrow/array/builder_decimal.h" // IWYU pragma: keep -#include "arrow/array/builder_dict.h" // IWYU pragma: keep -#include "arrow/array/builder_nested.h" // IWYU pragma: keep -#include "arrow/array/builder_primitive.h" // IWYU pragma: keep -#include "arrow/array/builder_run_end.h" // IWYU pragma: keep -#include "arrow/array/builder_time.h" // IWYU pragma: keep -#include "arrow/array/builder_union.h" // IWYU pragma: keep -#include "arrow/status.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_adaptive.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_binary.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_decimal.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_dict.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_nested.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_run_end.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_time.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_union.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/c/bridge.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/c/bridge.cc index 304496d49742..12ec4d9b4a88 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/c/bridge.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/c/bridge.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/c/bridge.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/c/bridge.h" #include #include @@ -29,29 +29,29 @@ #include #include -#include "arrow/array.h" -#include "arrow/buffer.h" -#include "arrow/c/helpers.h" -#include "arrow/c/util_internal.h" -#include "arrow/extension_type.h" -#include "arrow/memory_pool.h" -#include "arrow/memory_pool_internal.h" // for kZeroSizeArea -#include "arrow/record_batch.h" -#include "arrow/result.h" -#include "arrow/stl_allocator.h" -#include "arrow/type_traits.h" -#include "arrow/util/async_generator.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/future.h" -#include "arrow/util/key_value_metadata.h" -#include "arrow/util/logging.h" -#include "arrow/util/macros.h" -#include "arrow/util/range.h" -#include "arrow/util/small_vector.h" -#include "arrow/util/string.h" -#include "arrow/util/value_parsing.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/c/helpers.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/c/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool_internal.h" // for kZeroSizeArea +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/stl_allocator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_generator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/range.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/small_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/value_parsing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/c/bridge.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/c/bridge.h index 97662d6ffa5b..f1ff8dce2ff8 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/c/bridge.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/c/bridge.h @@ -22,14 +22,14 @@ #include #include -#include "arrow/c/abi.h" -#include "arrow/device.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type_fwd.h" -#include "arrow/util/async_generator_fwd.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/c/abi.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/device.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_generator_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/c/dlpack.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/c/dlpack.cc index 59c4447418f1..2d13ca49f704 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/c/dlpack.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/c/dlpack.cc @@ -15,13 +15,13 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/c/dlpack.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/c/dlpack.h" -#include "arrow/array/array_base.h" -#include "arrow/c/dlpack_abi.h" -#include "arrow/device.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/c/dlpack_abi.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/device.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" namespace arrow20::dlpack { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/c/dlpack.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/c/dlpack.h index 6f8a569e0432..977d8ff9949d 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/c/dlpack.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/c/dlpack.h @@ -18,8 +18,8 @@ #pragma once -#include "arrow/array/array_base.h" -#include "arrow/c/dlpack_abi.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/c/dlpack_abi.h" namespace arrow20::dlpack { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/c/helpers.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/c/helpers.h index 6f9c5a20cb40..b7bda9a33af8 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/c/helpers.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/c/helpers.h @@ -23,7 +23,7 @@ #include #include -#include "arrow/c/abi.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/c/abi.h" #define ARROW_C_ASSERT(condition, msg) \ do { \ diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/c/util_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/c/util_internal.h index 800d55a44140..a20d5ded5232 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/c/util_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/c/util_internal.h @@ -18,7 +18,7 @@ #pragma once -#include "arrow/c/helpers.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/c/helpers.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/chunk_resolver.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/chunk_resolver.cc index d12fdc079f24..674c9c870942 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/chunk_resolver.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/chunk_resolver.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/chunk_resolver.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunk_resolver.h" #include #include @@ -23,8 +23,8 @@ #include #include -#include "arrow/array.h" -#include "arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/chunk_resolver.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/chunk_resolver.h index 5dcfcbf08624..11886ba4976d 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/chunk_resolver.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/chunk_resolver.h @@ -25,9 +25,9 @@ #include #include -#include "arrow/type_fwd.h" -#include "arrow/util/macros.h" -#include "arrow/util/span.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/span.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.cc index 16378012555e..c221a6059c7b 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/chunked_array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h" #include #include @@ -23,17 +23,17 @@ #include #include -#include "arrow/array/array_base.h" -#include "arrow/array/array_nested.h" -#include "arrow/array/util.h" -#include "arrow/array/validate.h" -#include "arrow/device_allocation_type_set.h" -#include "arrow/pretty_print.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/validate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/device_allocation_type_set.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/pretty_print.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h index e32da1e0c1d0..a6bb72159924 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h @@ -24,14 +24,14 @@ #include #include -#include "arrow/chunk_resolver.h" -#include "arrow/compare.h" -#include "arrow/device_allocation_type_set.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type_fwd.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunk_resolver.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compare.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/device_allocation_type_set.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compare.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compare.cc index 1b088a69977e..dacb996fcad7 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compare.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compare.cc @@ -17,7 +17,7 @@ // Functions for comparing Arrow data structures -#include "arrow/compare.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compare.h" #include #include @@ -29,29 +29,29 @@ #include #include -#include "arrow/array.h" -#include "arrow/array/diff.h" -#include "arrow/buffer.h" -#include "arrow/scalar.h" -#include "arrow/sparse_tensor.h" -#include "arrow/status.h" -#include "arrow/tensor.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/binary_view_util.h" -#include "arrow/util/bit_run_reader.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/bitmap_reader.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/float16.h" -#include "arrow/util/key_value_metadata.h" -#include "arrow/util/logging.h" -#include "arrow/util/macros.h" -#include "arrow/util/memory.h" -#include "arrow/util/ree_util.h" -#include "arrow/visit_scalar_inline.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/diff.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/sparse_tensor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/tensor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/binary_view_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/float16.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/memory.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ree_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_scalar_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compare.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compare.h index e9c9d8ea30f8..f2b5f7d7211d 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compare.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compare.h @@ -23,8 +23,8 @@ #include #include -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api.h index 27de59004efb..f8f90401c492 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api.h @@ -29,26 +29,26 @@ /// @{ /// @} -#include "arrow/compute/api_aggregate.h" // IWYU pragma: export -#include "arrow/compute/api_scalar.h" // IWYU pragma: export -#include "arrow/compute/api_vector.h" // IWYU pragma: export -#include "arrow/compute/cast.h" // IWYU pragma: export -#include "arrow/compute/function.h" // IWYU pragma: export -#include "arrow/compute/function_options.h" // IWYU pragma: export -#include "arrow/compute/kernel.h" // IWYU pragma: export -#include "arrow/compute/registry.h" // IWYU pragma: export -#include "arrow/datum.h" // IWYU pragma: export - -#include "arrow/compute/expression.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_aggregate.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_options.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/datum.h" // IWYU pragma: export + +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/expression.h" // IWYU pragma: export /// \defgroup execnode-row Utilities for working with data in a row-major format /// @{ /// @} -#include "arrow/compute/row/grouper.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/grouper.h" // IWYU pragma: export /// \defgroup acero-internals Acero internals, useful for those extending Acero /// @{ /// @} -#include "arrow/compute/exec.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.h" // IWYU pragma: export diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_aggregate.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_aggregate.cc index 60527a32b55d..fe8f9eb8a0cc 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_aggregate.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_aggregate.cc @@ -15,13 +15,13 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/api_aggregate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_aggregate.h" -#include "arrow/compute/exec.h" -#include "arrow/compute/function_internal.h" -#include "arrow/compute/registry.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_aggregate.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_aggregate.h index be9a1416a5e6..441cfaf8f807 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_aggregate.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_aggregate.h @@ -23,11 +23,11 @@ #include -#include "arrow/compute/function_options.h" -#include "arrow/datum.h" -#include "arrow/result.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/datum.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.cc index 2d3e66c72f41..1eb28e529f18 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.cc @@ -15,21 +15,21 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/api_scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.h" #include #include #include #include -#include "arrow/array/array_base.h" -#include "arrow/compute/exec.h" -#include "arrow/compute/function_internal.h" -#include "arrow/compute/registry.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.h index ec2774845aaf..16cceb2d156f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.h @@ -25,12 +25,12 @@ #include #include -#include "arrow/compute/function_options.h" -#include "arrow/compute/type_fwd.h" -#include "arrow/datum.h" -#include "arrow/result.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/datum.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.cc index e843f3d2d877..2a9fa2c72e65 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/api_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" #include #include @@ -23,19 +23,19 @@ #include #include -#include "arrow/array/array_nested.h" -#include "arrow/array/builder_primitive.h" -#include "arrow/compute/exec.h" -#include "arrow/compute/function.h" -#include "arrow/compute/function_internal.h" -#include "arrow/compute/kernels/vector_sort_internal.h" -#include "arrow/compute/registry.h" -#include "arrow/datum.h" -#include "arrow/record_batch.h" -#include "arrow/result.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/logging.h" -#include "arrow/util/reflection_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_sort_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/datum.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/reflection_internal.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h index a54458884af2..ef330570f039 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h @@ -21,10 +21,10 @@ #include #include -#include "arrow/compute/function_options.h" -#include "arrow/compute/ordering.h" -#include "arrow/result.h" -#include "arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/ordering.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast.cc index dc1301c877b4..413b55816db2 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast.h" #include #include @@ -25,14 +25,14 @@ #include #include -#include "arrow/compute/cast_internal.h" -#include "arrow/compute/exec.h" -#include "arrow/compute/function_internal.h" -#include "arrow/compute/kernel.h" -#include "arrow/compute/kernels/codegen_internal.h" -#include "arrow/compute/registry.h" -#include "arrow/util/logging.h" -#include "arrow/util/reflection_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/reflection_internal.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast.h index 681d25b9cc28..53a88617e2a7 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast.h @@ -22,14 +22,14 @@ #include #include -#include "arrow/compute/function.h" -#include "arrow/compute/function_options.h" -#include "arrow/compute/type_fwd.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast_internal.h index 9ca01a966615..28990271b152 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast_internal.h @@ -21,9 +21,9 @@ #include #include -#include "arrow/compute/cast.h" // IWYU pragma: keep -#include "arrow/compute/kernel.h" // IWYU pragma: keep -#include "arrow/compute/kernels/codegen_internal.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h" // IWYU pragma: keep namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.cc index 23088be4a596..5e18d5025fb8 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/exec.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.h" #include #include @@ -25,31 +25,31 @@ #include #include -#include "arrow/array/array_base.h" -#include "arrow/array/array_primitive.h" -#include "arrow/array/data.h" -#include "arrow/array/util.h" -#include "arrow/buffer.h" -#include "arrow/chunked_array.h" -#include "arrow/compute/exec_internal.h" -#include "arrow/compute/function.h" -#include "arrow/compute/function_internal.h" -#include "arrow/compute/kernel.h" -#include "arrow/compute/registry.h" -#include "arrow/datum.h" -#include "arrow/pretty_print.h" -#include "arrow/record_batch.h" -#include "arrow/scalar.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/cpu_info.h" -#include "arrow/util/logging.h" -#include "arrow/util/thread_pool.h" -#include "arrow/util/vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/datum.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/pretty_print.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/cpu_info.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/thread_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/vector.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.h index b24ee0e75746..af801210df50 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.h @@ -30,15 +30,15 @@ #include #include -#include "arrow/array/data.h" -#include "arrow/compute/expression.h" -#include "arrow/compute/type_fwd.h" -#include "arrow/datum.h" -#include "arrow/result.h" -#include "arrow/type_fwd.h" -#include "arrow/util/macros.h" -#include "arrow/util/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/expression.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/datum.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec_internal.h index 5dc9eecdb924..45f6bf7f6cf9 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec_internal.h @@ -24,12 +24,12 @@ #include #include -#include "arrow/array.h" -#include "arrow/buffer.h" -#include "arrow/compute/exec.h" -#include "arrow/compute/kernel.h" -#include "arrow/status.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/expression.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/expression.cc index 29512c0dd4a3..fdd7570c5188 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/expression.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/expression.cc @@ -15,33 +15,33 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/config.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" -#include "arrow/compute/expression.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/expression.h" #include #include #include #include -#include "arrow/chunked_array.h" -#include "arrow/compute/api_aggregate.h" -#include "arrow/compute/api_vector.h" -#include "arrow/compute/exec_internal.h" -#include "arrow/compute/expression_internal.h" -#include "arrow/compute/function_internal.h" -#include "arrow/compute/util.h" -#include "arrow/io/memory.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_aggregate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/expression_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/memory.h" #ifdef ARROW_IPC -# include "arrow/ipc/reader.h" -# include "arrow/ipc/writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/writer.h" #endif -#include "arrow/util/hash_util.h" -#include "arrow/util/key_value_metadata.h" -#include "arrow/util/logging.h" -#include "arrow/util/string.h" -#include "arrow/util/value_parsing.h" -#include "arrow/util/vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/hash_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/value_parsing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/vector.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/expression.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/expression.h index 779ad1b61181..567136939dc6 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/expression.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/expression.h @@ -26,10 +26,10 @@ #include #include -#include "arrow/compute/type_fwd.h" -#include "arrow/datum.h" -#include "arrow/type_fwd.h" -#include "arrow/util/small_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/datum.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/small_vector.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/expression_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/expression_internal.h index 17100236393f..47c17748e3a1 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/expression_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/expression_internal.h @@ -16,19 +16,19 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/expression.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/expression.h" #include #include #include -#include "arrow/compute/api_scalar.h" -#include "arrow/compute/cast.h" -#include "arrow/compute/cast_internal.h" -#include "arrow/compute/registry.h" -#include "arrow/record_batch.h" -#include "arrow/table.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.cc index be1e535eee29..8024d74d03b0 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.cc @@ -15,25 +15,25 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/function.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.h" #include #include #include -#include "arrow/compute/api_scalar.h" -#include "arrow/compute/cast.h" -#include "arrow/compute/exec.h" -#include "arrow/compute/exec_internal.h" -#include "arrow/compute/function_internal.h" -#include "arrow/compute/function_options.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/registry.h" -#include "arrow/datum.h" -#include "arrow/device_allocation_type_set.h" -#include "arrow/util/cpu_info.h" -#include "arrow/util/logging.h" -#include "arrow/util/tracing_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/datum.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/device_allocation_type_set.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/cpu_info.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/tracing_internal.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.h index d3c31d7212ba..81a354724a75 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.h @@ -25,14 +25,14 @@ #include #include -#include "arrow/compute/kernel.h" -#include "arrow/compute/type_fwd.h" -#include "arrow/datum.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/compare.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/datum.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compare.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_internal.cc index 798e8ea30046..320cfa622295 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_internal.cc @@ -15,21 +15,21 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/config.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" -#include "arrow/compute/function_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_internal.h" -#include "arrow/array/util.h" -#include "arrow/compute/function.h" -#include "arrow/compute/registry.h" -#include "arrow/io/memory.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/memory.h" #ifdef ARROW_IPC -# include "arrow/ipc/reader.h" -# include "arrow/ipc/writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/writer.h" #endif -#include "arrow/record_batch.h" -#include "arrow/scalar.h" -#include "arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_internal.h index 7275e95dacb7..a978f3d6395c 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_internal.h @@ -22,20 +22,20 @@ #include #include -#include "arrow/array/builder_base.h" -#include "arrow/array/builder_binary.h" -#include "arrow/array/builder_nested.h" -#include "arrow/compute/api_vector.h" -#include "arrow/compute/function.h" -#include "arrow/compute/type_fwd.h" -#include "arrow/result.h" -#include "arrow/scalar.h" -#include "arrow/status.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/key_value_metadata.h" -#include "arrow/util/reflection_internal.h" -#include "arrow/util/string.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_binary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/reflection_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { struct Scalar; diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_options.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_options.h index 9f5e1de22cd4..827422b87afc 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_options.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_options.h @@ -21,11 +21,11 @@ #pragma once -#include "arrow/compute/type_fwd.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.cc index 115f0b7606f9..81b0be1699c9 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.cc @@ -15,23 +15,23 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/kernel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h" #include #include #include #include -#include "arrow/buffer.h" -#include "arrow/compute/exec.h" -#include "arrow/device_allocation_type_set.h" -#include "arrow/result.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/hash_util.h" -#include "arrow/util/logging.h" -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/device_allocation_type_set.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/hash_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h index 6c63abc4cdf1..bfec1e483d01 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h @@ -29,16 +29,16 @@ #include #include -#include "arrow/buffer.h" -#include "arrow/compute/exec.h" -#include "arrow/datum.h" -#include "arrow/device_allocation_type_set.h" -#include "arrow/memory_pool.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/datum.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/device_allocation_type_set.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" // macOS defines PREALLOCATE as a preprocessor macro in the header sys/vnode.h. // No other BSD seems to do so. The name is used as an identifier in MemAllocation enum. diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_basic.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_basic.cc index d75cc0bc212a..9a8d6e4fa055 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_basic.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_basic.cc @@ -15,17 +15,17 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/api_aggregate.h" -#include "arrow/compute/kernels/aggregate_basic_internal.h" -#include "arrow/compute/kernels/aggregate_internal.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/kernels/util_internal.h" -#include "arrow/util/cpu_info.h" -#include "arrow/util/hashing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_aggregate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_basic_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/cpu_info.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/hashing.h" // Include templated definitions for aggregate kernels that must compiled here // with the SIMD level configured for this compilation unit in the build. -#include "arrow/compute/kernels/aggregate_basic.inc.cc" // NOLINT(build/include) +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_basic.inc.cc" // NOLINT(build/include) namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_basic.inc.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_basic.inc.cc index 36df29c73f3e..7e607ffb7181 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_basic.inc.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_basic.inc.cc @@ -28,15 +28,15 @@ #include #include -#include "arrow/compute/api_aggregate.h" -#include "arrow/compute/kernels/aggregate_internal.h" -#include "arrow/compute/kernels/codegen_internal.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/align_util.h" -#include "arrow/util/bit_block_counter.h" -#include "arrow/util/decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_aggregate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/align_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h" namespace arrow20::compute::internal { namespace { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_basic_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_basic_internal.h index 3d0781d06212..bc7bd64c0e10 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_basic_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_basic_internal.h @@ -21,10 +21,10 @@ #include #include -#include "arrow/compute/kernel.h" -#include "arrow/compute/kernels/codegen_internal.h" -#include "arrow/compute/type_fwd.h" -#include "arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" namespace arrow20::compute::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_internal.h index 4bc54aad1c8b..ab28816eb136 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_internal.h @@ -21,12 +21,12 @@ #include #include -#include "arrow/compute/kernels/util_internal.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_run_reader.h" -#include "arrow/util/int128_internal.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int128_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20::compute::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_mode.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_mode.cc index 680fa1e96bfa..1b08efce9655 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_mode.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_mode.cc @@ -19,14 +19,14 @@ #include #include -#include "arrow/compute/api_aggregate.h" -#include "arrow/compute/kernels/aggregate_internal.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/kernels/util_internal.h" -#include "arrow/result.h" -#include "arrow/stl_allocator.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_aggregate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/stl_allocator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_pivot.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_pivot.cc index 6a8c807dd798..81be67aec309 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_pivot.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_pivot.cc @@ -15,14 +15,14 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/api_aggregate.h" -#include "arrow/compute/kernels/aggregate_internal.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/kernels/pivot_internal.h" -#include "arrow/scalar.h" -#include "arrow/util/bit_run_reader.h" -#include "arrow/util/logging.h" -#include "arrow/visit_data_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_aggregate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/pivot_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_data_inline.h" namespace arrow20::compute::internal { namespace { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_quantile.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_quantile.cc index c3b2d7e4ccb2..2e16e7cfe720 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_quantile.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_quantile.cc @@ -19,10 +19,10 @@ #include #include -#include "arrow/compute/api_aggregate.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/kernels/util_internal.h" -#include "arrow/stl_allocator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_aggregate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/stl_allocator.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_tdigest.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_tdigest.cc index 1f4d9c43f1a4..221a20fc8f33 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_tdigest.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_tdigest.cc @@ -15,11 +15,11 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/api_aggregate.h" -#include "arrow/compute/kernels/aggregate_internal.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/util/bit_run_reader.h" -#include "arrow/util/tdigest.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_aggregate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/tdigest.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_var_std.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_var_std.cc index ec321268e76a..0dc74a91deab 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_var_std.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_var_std.cc @@ -19,13 +19,13 @@ #include #include -#include "arrow/compute/api_aggregate.h" -#include "arrow/compute/kernels/aggregate_internal.h" -#include "arrow/compute/kernels/aggregate_var_std_internal.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/util/bit_run_reader.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/int128_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_aggregate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_var_std_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int128_internal.h" namespace arrow20::compute::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_var_std_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_var_std_internal.h index c95fadec8f2d..5a63321e5aa3 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_var_std_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_var_std_internal.h @@ -18,9 +18,9 @@ #pragma once -#include "arrow/util/int128_internal.h" -#include "arrow/util/logging.h" -#include "arrow/util/math_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int128_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/math_internal.h" #include #include diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/base_arithmetic_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/base_arithmetic_internal.h index 7ce315b1c688..60f3871a3a00 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/base_arithmetic_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/base_arithmetic_internal.h @@ -19,14 +19,14 @@ #pragma once #include -#include "arrow/compute/api_scalar.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/kernels/util_internal.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/decimal.h" -#include "arrow/util/int_util_overflow.h" -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/chunked_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/chunked_internal.cc index c72d8b79ee9a..d9e3fa06781d 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/chunked_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/chunked_internal.cc @@ -15,12 +15,12 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/kernels/chunked_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/chunked_internal.h" #include -#include "arrow/record_batch.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20::compute::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/chunked_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/chunked_internal.h index 37ac0e766207..24c56186a300 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/chunked_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/chunked_internal.h @@ -24,10 +24,10 @@ #include #include -#include "arrow/array.h" -#include "arrow/chunk_resolver.h" -#include "arrow/compute/kernels/codegen_internal.h" -#include "arrow/util/span.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunk_resolver.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/span.h" namespace arrow20::compute::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.cc index 05dae66a990a..bcdbbcb13056 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/kernels/codegen_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h" #include #include @@ -23,8 +23,8 @@ #include #include -#include "arrow/compute/api_vector.h" -#include "arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h index a518c60d332d..7f8e7407c250 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h @@ -27,28 +27,28 @@ #include #include -#include "arrow/array/builder_binary.h" -#include "arrow/array/data.h" -#include "arrow/buffer.h" -#include "arrow/buffer_builder.h" -#include "arrow/compute/kernel.h" -#include "arrow/datum.h" -#include "arrow/result.h" -#include "arrow/scalar.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_block_counter.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_generate.h" -#include "arrow/util/bitmap_reader.h" -#include "arrow/util/bitmap_writer.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/decimal.h" -#include "arrow/util/logging.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" -#include "arrow/visit_data_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_binary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/datum.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_generate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_data_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h index c72a286c0257..0e9f844beda9 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h @@ -28,22 +28,22 @@ #include #include -#include "arrow/array/data.h" -#include "arrow/buffer.h" -#include "arrow/chunked_array.h" - -#include "arrow/compute/function.h" -#include "arrow/compute/kernel.h" -#include "arrow/compute/kernels/codegen_internal.h" -#include "arrow/compute/registry.h" -#include "arrow/datum.h" -#include "arrow/memory_pool.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/logging.h" -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h" + +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/datum.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" // IWYU pragma: end_exports diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/copy_data_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/copy_data_internal.h index 05b4367941f8..f4ea4d9b4f0b 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/copy_data_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/copy_data_internal.h @@ -18,7 +18,7 @@ #pragma once -#include "arrow/compute/kernels/codegen_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/gather_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/gather_internal.h index 263523f55992..ef881073dc37 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/gather_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/gather_internal.h @@ -22,12 +22,12 @@ #include #include -#include "arrow/array/data.h" -#include "arrow/util/bit_block_counter.h" -#include "arrow/util/bit_run_reader.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" // Implementation helpers for kernels that need to load/gather fixed-width // data from multiple, arbitrary indices. diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/hash_aggregate.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/hash_aggregate.cc index 433f451a7983..23f7f2be7060 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/hash_aggregate.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/hash_aggregate.cc @@ -21,28 +21,28 @@ #include #include -#include "arrow/array/builder_nested.h" -#include "arrow/array/builder_primitive.h" -#include "arrow/array/concatenate.h" -#include "arrow/compute/api_aggregate.h" -#include "arrow/compute/api_vector.h" -#include "arrow/compute/kernels/aggregate_internal.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/kernels/hash_aggregate_internal.h" -#include "arrow/compute/kernels/util_internal.h" -#include "arrow/compute/row/grouper.h" -#include "arrow/compute/row/row_encoder_internal.h" -#include "arrow/record_batch.h" -#include "arrow/stl_allocator.h" -#include "arrow/util/bit_run_reader.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/bitmap_writer.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/int_util_overflow.h" -#include "arrow/util/ree_util.h" -#include "arrow/util/span.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/concatenate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_aggregate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/hash_aggregate_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/grouper.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/row_encoder_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/stl_allocator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ree_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/span.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20::compute::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/hash_aggregate_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/hash_aggregate_internal.h index b910139cb22a..bfd76da3be3e 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/hash_aggregate_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/hash_aggregate_internal.h @@ -20,17 +20,17 @@ #include -#include "arrow/array/data.h" -#include "arrow/buffer_builder.h" -#include "arrow/compute/exec.h" -#include "arrow/compute/kernel.h" -#include "arrow/compute/kernels/codegen_internal.h" -#include "arrow/result.h" -#include "arrow/scalar.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" namespace arrow20::compute::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/hash_aggregate_numeric.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/hash_aggregate_numeric.cc index e769afcea8a6..5f5b191b6c0e 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/hash_aggregate_numeric.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/hash_aggregate_numeric.cc @@ -21,19 +21,19 @@ #include #include -#include "arrow/array/concatenate.h" -#include "arrow/compute/api_aggregate.h" -#include "arrow/compute/kernel.h" -#include "arrow/compute/kernels/aggregate_internal.h" -#include "arrow/compute/kernels/aggregate_var_std_internal.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/kernels/hash_aggregate_internal.h" -#include "arrow/compute/row/grouper.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/int128_internal.h" -#include "arrow/util/span.h" -#include "arrow/util/tdigest.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/concatenate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_aggregate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/aggregate_var_std_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/hash_aggregate_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/grouper.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int128_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/span.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/tdigest.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20::compute::internal { namespace { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/hash_aggregate_pivot.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/hash_aggregate_pivot.cc index db5bc86275dc..6950d117d741 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/hash_aggregate_pivot.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/hash_aggregate_pivot.cc @@ -21,18 +21,18 @@ #include #include -#include "arrow/array/concatenate.h" -#include "arrow/compute/api_aggregate.h" -#include "arrow/compute/api_vector.h" -#include "arrow/compute/kernel.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/kernels/hash_aggregate_internal.h" -#include "arrow/compute/kernels/pivot_internal.h" -#include "arrow/compute/row/grouper.h" -#include "arrow/util/bit_block_counter.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/span.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/concatenate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_aggregate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/hash_aggregate_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/pivot_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/grouper.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/span.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20::compute::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/pivot_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/pivot_internal.cc index 8343b1c390a4..690e3c6d2d97 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/pivot_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/pivot_internal.cc @@ -15,25 +15,25 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/kernels/pivot_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/pivot_internal.h" #include #include #include -#include "arrow/array/array_primitive.h" -#include "arrow/array/builder_binary.h" -#include "arrow/compute/cast.h" -#include "arrow/compute/exec.h" -#include "arrow/compute/kernels/codegen_internal.h" -#include "arrow/compute/row/grouper.h" -#include "arrow/scalar.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_run_reader.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/logging.h" -#include "arrow/util/unreachable.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_binary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/grouper.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/unreachable.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20::compute::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/pivot_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/pivot_internal.h index 8eb8f3358596..31cecd763118 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/pivot_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/pivot_internal.h @@ -23,11 +23,11 @@ #include #include -#include "arrow/compute/api_aggregate.h" -#include "arrow/compute/type_fwd.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_aggregate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" namespace arrow20::compute::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/ree_util_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/ree_util_internal.cc index ed2d17602b08..ee65a6778e4e 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/ree_util_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/ree_util_internal.cc @@ -18,14 +18,14 @@ #include #include -#include "arrow/compute/kernels/ree_util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/ree_util_internal.h" -#include "arrow/buffer.h" -#include "arrow/memory_pool.h" -#include "arrow/result.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/ree_util_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/ree_util_internal.h index 5f676c9a37e0..548433ba0e07 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/ree_util_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/ree_util_internal.h @@ -25,14 +25,14 @@ #include #include -#include "arrow/array/data.h" -#include "arrow/compute/exec.h" -#include "arrow/compute/kernel.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_arithmetic.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_arithmetic.cc index e433e8beffe8..c2276c136529 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_arithmetic.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_arithmetic.cc @@ -22,20 +22,20 @@ #include #include -#include "arrow/compare.h" -#include "arrow/compute/api_scalar.h" -#include "arrow/compute/cast.h" -#include "arrow/compute/kernels/base_arithmetic_internal.h" -#include "arrow/compute/kernels/codegen_internal.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/kernels/util_internal.h" -#include "arrow/type.h" -#include "arrow/type_fwd.h" -#include "arrow/type_traits.h" -#include "arrow/util/decimal.h" -#include "arrow/util/int_util_overflow.h" -#include "arrow/util/macros.h" -#include "arrow/visit_scalar_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compare.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/base_arithmetic_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_scalar_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_boolean.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_boolean.cc index 4d02b3efee46..da29873f32a7 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_boolean.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_boolean.cc @@ -17,10 +17,10 @@ #include -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap.h" -#include "arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_boolean.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_boolean.cc index c1c896a30613..b2e440017474 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_boolean.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_boolean.cc @@ -17,10 +17,10 @@ // Cast types to boolean -#include "arrow/array/builder_primitive.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/kernels/scalar_cast_internal.h" -#include "arrow/util/value_parsing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/value_parsing.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_dictionary.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_dictionary.cc index 05494b22d056..dea6639e6813 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_dictionary.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_dictionary.cc @@ -17,14 +17,14 @@ // Implementation of casting to dictionary type -#include -#include - -#include "arrow/array/builder_primitive.h" -#include "arrow/compute/cast_internal.h" -#include "arrow/compute/kernels/scalar_cast_internal.h" -#include "arrow/compute/kernels/util_internal.h" -#include "arrow/util/int_util.h" +#include +#include + +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util.h" namespace arrow20 { using internal::CopyBitmap; diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_extension.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_extension.cc index c53d3ff8965b..bb69d232087c 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_extension.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_extension.cc @@ -16,9 +16,9 @@ // under the License. // Implementation of casting to extension types -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/kernels/scalar_cast_internal.h" -#include "arrow/scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_internal.cc index 878a43a62e52..9f4490d42587 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_internal.cc @@ -15,13 +15,13 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/kernels/scalar_cast_internal.h" -#include "arrow/compute/cast_internal.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/extension_type.h" -#include "arrow/type_traits.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/float16.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/float16.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_internal.h index 021a0fb51a38..a9bbd328d333 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_internal.h @@ -18,11 +18,11 @@ #pragma once -#include "arrow/compute/api_vector.h" -#include "arrow/compute/cast.h" // IWYU pragma: export -#include "arrow/compute/cast_internal.h" // IWYU pragma: export -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/kernels/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast_internal.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/util_internal.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_nested.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_nested.cc index 4162c84c4e36..a6d9e711f8b8 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_nested.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_nested.cc @@ -22,14 +22,14 @@ #include #include -#include "arrow/array/builder_nested.h" -#include "arrow/array/builder_primitive.h" -#include "arrow/compute/api_scalar.h" -#include "arrow/compute/cast.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/kernels/scalar_cast_internal.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/int_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_numeric.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_numeric.cc index 957abcc95ad0..338678e9e9f7 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_numeric.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_numeric.cc @@ -17,15 +17,15 @@ // Implementation of casting to integer, floating point, or decimal types -#include "arrow/array/builder_primitive.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/kernels/scalar_cast_internal.h" -#include "arrow/compute/kernels/util_internal.h" -#include "arrow/scalar.h" -#include "arrow/util/bit_block_counter.h" -#include "arrow/util/float16.h" -#include "arrow/util/int_util.h" -#include "arrow/util/value_parsing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/float16.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/value_parsing.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_string.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_string.cc index c4586dad7ee2..5845227922d4 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_string.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_string.cc @@ -18,21 +18,21 @@ #include #include -#include "arrow/array/array_base.h" -#include "arrow/array/builder_binary.h" -#include "arrow/compute/kernels/base_arithmetic_internal.h" -#include "arrow/compute/kernels/codegen_internal.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/kernels/scalar_cast_internal.h" -#include "arrow/compute/kernels/temporal_internal.h" -#include "arrow/result.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/formatting.h" -#include "arrow/util/int_util.h" -#include "arrow/util/logging.h" -#include "arrow/util/utf8_internal.h" -#include "arrow/visit_data_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_binary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/base_arithmetic_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/temporal_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/formatting.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/utf8_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_data_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_temporal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_temporal.cc index 3c6f3f45d162..87b054fcfbff 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_temporal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_temporal.cc @@ -19,13 +19,13 @@ #include -#include "arrow/array/builder_time.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/kernels/scalar_cast_internal.h" -#include "arrow/compute/kernels/temporal_internal.h" -#include "arrow/util/bitmap_reader.h" -#include "arrow/util/time.h" -#include "arrow/util/value_parsing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_time.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_cast_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/temporal_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/time.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/value_parsing.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_compare.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_compare.cc index c93c0e9ddb14..1d36676e742e 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_compare.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_compare.cc @@ -20,11 +20,11 @@ #include #include -#include "arrow/compute/api_scalar.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/type.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_if_else.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_if_else.cc index 67aa5e2e645d..23faca355c28 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_if_else.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_if_else.cc @@ -16,20 +16,20 @@ // under the License. #include -#include "arrow/array/builder_nested.h" -#include "arrow/array/builder_primitive.h" -#include "arrow/array/builder_time.h" -#include "arrow/array/builder_union.h" -#include "arrow/compute/api.h" -#include "arrow/compute/kernels/codegen_internal.h" -#include "arrow/compute/kernels/copy_data_internal.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/bit_block_counter.h" -#include "arrow/util/bit_run_reader.h" -#include "arrow/util/bitmap.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/bitmap_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_time.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_union.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/copy_data_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_reader.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_nested.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_nested.cc index b418834f3412..24a4f515d983 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_nested.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_nested.cc @@ -18,17 +18,17 @@ // Vector kernels involving nested types #include -#include "arrow/array/array_base.h" -#include "arrow/array/builder_nested.h" -#include "arrow/compute/api_scalar.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/result.h" -#include "arrow/type_fwd.h" -#include "arrow/util/bit_block_counter.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_generate.h" -#include "arrow/util/string.h" -#include "arrow/util/unreachable.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_generate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/unreachable.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_random.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_random.cc index 6a5f76da8b41..25c09d88df64 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_random.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_random.cc @@ -19,11 +19,11 @@ #include #include -#include "arrow/compute/api_scalar.h" -#include "arrow/compute/kernel.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/registry.h" -#include "arrow/util/pcg_random.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/pcg_random.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_round.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_round.cc index fe436f7b0558..a8b2e00b83fa 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_round.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_round.cc @@ -22,21 +22,21 @@ #include #include -#include "arrow/compare.h" -#include "arrow/compute/api_scalar.h" -#include "arrow/compute/cast.h" -#include "arrow/compute/kernel.h" -#include "arrow/compute/kernels/base_arithmetic_internal.h" -#include "arrow/compute/kernels/codegen_internal.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/kernels/util_internal.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/decimal.h" -#include "arrow/util/int_util_overflow.h" -#include "arrow/util/macros.h" -#include "arrow/visit_scalar_inline.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compare.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/base_arithmetic_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_scalar_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_set_lookup.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_set_lookup.cc index 52f6611d60cb..3d62c7532b27 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_set_lookup.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_set_lookup.cc @@ -15,16 +15,16 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/array/array_base.h" -#include "arrow/compute/api_scalar.h" -#include "arrow/compute/cast.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/kernels/util_internal.h" -#include "arrow/type.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_writer.h" -#include "arrow/util/hashing.h" -#include "arrow/visit_data_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/hashing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_data_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_string_ascii.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_string_ascii.cc index e5f81602c732..853189cb08b3 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_string_ascii.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_string_ascii.cc @@ -21,14 +21,14 @@ #include #include -#include "arrow/array/builder_nested.h" -#include "arrow/array/builder_primitive.h" -#include "arrow/compute/kernels/scalar_string_internal.h" -#include "arrow/result.h" -#include "arrow/util/config.h" -#include "arrow/util/macros.h" -#include "arrow/util/string.h" -#include "arrow/util/value_parsing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_string_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/value_parsing.h" #ifdef ARROW_WITH_RE2 # include diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_string_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_string_internal.h index 353712ceb41a..3cf27760cc6b 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_string_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_string_internal.h @@ -20,8 +20,8 @@ #include -#include "arrow/compute/api_scalar.h" -#include "arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_string_utf8.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_string_utf8.cc index fdcfa09c6be7..76582c5f20e9 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_string_utf8.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_string_utf8.cc @@ -19,9 +19,9 @@ #include #include -#include "arrow/compute/kernels/scalar_string_internal.h" -#include "arrow/util/config.h" -#include "arrow/util/utf8_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_string_internal.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/utf8_internal.h" #ifdef ARROW_WITH_UTF8PROC # include diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_temporal_binary.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_temporal_binary.cc index 540450708e5a..83c1e3239439 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_temporal_binary.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_temporal_binary.cc @@ -19,13 +19,13 @@ #include #include -#include "arrow/builder.h" -#include "arrow/compute/api_scalar.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/kernels/temporal_internal.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/time.h" -#include "arrow/vendored/datetime.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/temporal_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/time.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/datetime.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_temporal_unary.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_temporal_unary.cc index f90c743dd74f..25a32f13f74f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_temporal_unary.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_temporal_unary.cc @@ -19,14 +19,14 @@ #include #include -#include "arrow/builder.h" -#include "arrow/compute/api_scalar.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/kernels/temporal_internal.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/time.h" -#include "arrow/util/value_parsing.h" -#include "arrow/vendored/datetime.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/temporal_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/time.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/value_parsing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/datetime.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_validity.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_validity.cc index cc33934202f5..05a283c87a64 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_validity.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/scalar_validity.cc @@ -17,11 +17,11 @@ #include -#include "arrow/compute/api_scalar.h" -#include "arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/temporal_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/temporal_internal.h index c9afcbfe5334..17660cb556ce 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/temporal_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/temporal_internal.h @@ -21,8 +21,8 @@ #include #include -#include "arrow/compute/api_scalar.h" -#include "arrow/vendored/datetime.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/datetime.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/util_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/util_internal.cc index 2179a1dd26c6..7650d9c582ef 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/util_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/util_internal.cc @@ -15,14 +15,14 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/kernels/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/util_internal.h" #include -#include "arrow/array/data.h" -#include "arrow/compute/function.h" -#include "arrow/type.h" -#include "arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/util_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/util_internal.h index c8164bbebafa..f11c4f88142f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/util_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/util_internal.h @@ -22,13 +22,13 @@ #include #include -#include "arrow/array/util.h" -#include "arrow/buffer.h" -#include "arrow/compute/kernels/codegen_internal.h" -#include "arrow/compute/type_fwd.h" -#include "arrow/util/bit_run_reader.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/math_constants.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/math_constants.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_array_sort.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_array_sort.cc index 791c0af54bb9..fbf7c42808e4 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_array_sort.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_array_sort.cc @@ -23,17 +23,17 @@ #include #include -#include "arrow/array/data.h" -#include "arrow/compute/api_vector.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/kernels/util_internal.h" -#include "arrow/compute/kernels/vector_sort_internal.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_block_counter.h" -#include "arrow/util/bitmap.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/checked_cast.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_sort_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_cumulative_ops.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_cumulative_ops.cc index 11236b994731..622b171ef0f7 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_cumulative_ops.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_cumulative_ops.cc @@ -16,18 +16,18 @@ // under the License. #include -#include "arrow/array/array_base.h" -#include "arrow/array/builder_primitive.h" -#include "arrow/compute/api_scalar.h" -#include "arrow/compute/api_vector.h" -#include "arrow/compute/cast.h" -#include "arrow/compute/kernels/base_arithmetic_internal.h" -#include "arrow/compute/kernels/codegen_internal.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/result.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_util.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/base_arithmetic_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20::compute::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_hash.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_hash.cc index e5571aa23e91..1901ca30729f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_hash.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_hash.cc @@ -19,21 +19,21 @@ #include #include -#include "arrow/array/array_base.h" -#include "arrow/array/array_dict.h" -#include "arrow/array/array_nested.h" -#include "arrow/array/builder_primitive.h" -#include "arrow/array/concatenate.h" -#include "arrow/array/dict_internal.h" -#include "arrow/array/util.h" -#include "arrow/buffer.h" -#include "arrow/compute/api_vector.h" -#include "arrow/compute/cast.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/result.h" -#include "arrow/util/hashing.h" -#include "arrow/util/int_util.h" -#include "arrow/util/unreachable.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_dict.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/concatenate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/dict_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/hashing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/unreachable.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_nested.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_nested.cc index eeec3196da76..80231069d47d 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_nested.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_nested.cc @@ -17,14 +17,14 @@ // Vector kernels involving nested types -#include "arrow/array/array_base.h" -#include "arrow/compute/api_vector.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/result.h" -#include "arrow/util/bit_run_reader.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/list_util.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/list_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_pairwise.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_pairwise.cc index 79f6da708464..4e4f05ceb693 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_pairwise.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_pairwise.cc @@ -20,22 +20,22 @@ #include #include -#include "arrow/array/builder_base.h" -#include "arrow/compute/api_vector.h" -#include "arrow/compute/exec.h" -#include "arrow/compute/function.h" -#include "arrow/compute/kernel.h" -#include "arrow/compute/kernels/base_arithmetic_internal.h" -#include "arrow/compute/kernels/codegen_internal.h" -#include "arrow/compute/registry.h" -#include "arrow/compute/util.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_fwd.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/base_arithmetic_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20::compute::internal { namespace { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_rank.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_rank.cc index fb7d477a1a99..08a2585ed583 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_rank.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_rank.cc @@ -18,10 +18,10 @@ #include #include -#include "arrow/compute/function.h" -#include "arrow/compute/kernels/vector_sort_internal.h" -#include "arrow/compute/registry.h" -#include "arrow/util/math_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_sort_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/math_internal.h" namespace arrow20::compute::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_replace.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_replace.cc index a3e8d2dc6bdb..92c169be769f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_replace.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_replace.cc @@ -15,11 +15,11 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/api_scalar.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/kernels/copy_data_internal.h" -#include "arrow/compute/kernels/util_internal.h" -#include "arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/copy_data_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_run_end_encode.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_run_end_encode.cc index b7e2ab5b661b..6ad13c48ddba 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_run_end_encode.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_run_end_encode.cc @@ -17,13 +17,13 @@ #include -#include "arrow/compute/api_vector.h" -#include "arrow/compute/kernel.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/kernels/ree_util_internal.h" -#include "arrow/type_traits.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/ree_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/ree_util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ree_util.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_select_k.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_select_k.cc index 12481b399daa..7a043c0cd256 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_select_k.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_select_k.cc @@ -17,9 +17,9 @@ #include -#include "arrow/compute/function.h" -#include "arrow/compute/kernels/vector_sort_internal.h" -#include "arrow/compute/registry.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_sort_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection.cc index 420092416246..bbc0a0ccafe9 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection.cc @@ -22,29 +22,29 @@ #include #include -#include "arrow/array/array_binary.h" -#include "arrow/array/array_dict.h" -#include "arrow/array/array_nested.h" -#include "arrow/array/builder_primitive.h" -#include "arrow/array/concatenate.h" -#include "arrow/buffer_builder.h" -#include "arrow/chunked_array.h" -#include "arrow/compute/api_vector.h" -#include "arrow/compute/kernels/common_internal.h" -#include "arrow/compute/kernels/util_internal.h" -#include "arrow/compute/kernels/vector_selection_filter_internal.h" -#include "arrow/compute/kernels/vector_selection_take_internal.h" -#include "arrow/extension_type.h" -#include "arrow/record_batch.h" -#include "arrow/result.h" -#include "arrow/table.h" -#include "arrow/type.h" -#include "arrow/util/bit_block_counter.h" -#include "arrow/util/bit_run_reader.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/bitmap_reader.h" -#include "arrow/util/int_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_binary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_dict.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/concatenate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/common_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_filter_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_take_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_filter_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_filter_internal.cc index 72d992b27b36..ec1e5e8b5628 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_filter_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_filter_internal.cc @@ -22,26 +22,26 @@ #include #include -#include "arrow/array/concatenate.h" -#include "arrow/array/data.h" -#include "arrow/buffer_builder.h" -#include "arrow/chunked_array.h" -#include "arrow/compute/api_vector.h" -#include "arrow/compute/exec.h" -#include "arrow/compute/kernel.h" -#include "arrow/compute/kernels/codegen_internal.h" -#include "arrow/compute/kernels/vector_selection_filter_internal.h" -#include "arrow/compute/kernels/vector_selection_internal.h" -#include "arrow/datum.h" -#include "arrow/extension_type.h" -#include "arrow/record_batch.h" -#include "arrow/table.h" -#include "arrow/type.h" -#include "arrow/util/bit_block_counter.h" -#include "arrow/util/bit_run_reader.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/fixed_width_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/concatenate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_filter_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/datum.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/fixed_width_internal.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_filter_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_filter_internal.h index 8dc2e033428b..6a1fab31ec93 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_filter_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_filter_internal.h @@ -21,9 +21,9 @@ #include #include -#include "arrow/array/data.h" -#include "arrow/compute/api_vector.h" -#include "arrow/compute/kernels/vector_selection_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_internal.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_internal.cc index e3d9484e7927..b7a00710f286 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_internal.cc @@ -21,26 +21,26 @@ #include #include -#include "arrow/array/array_binary.h" -#include "arrow/array/array_nested.h" -#include "arrow/array/builder_primitive.h" -#include "arrow/buffer_builder.h" -#include "arrow/chunked_array.h" -#include "arrow/compute/api_vector.h" -#include "arrow/compute/function.h" -#include "arrow/compute/kernel.h" -#include "arrow/compute/kernels/codegen_internal.h" -#include "arrow/compute/kernels/vector_selection_internal.h" -#include "arrow/compute/registry.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_block_counter.h" -#include "arrow/util/bit_run_reader.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/fixed_width_internal.h" -#include "arrow/util/int_util.h" -#include "arrow/util/logging.h" -#include "arrow/util/ree_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_binary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/fixed_width_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ree_util.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_internal.h index 96d52eb829f5..d3f684c2a206 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_internal.h @@ -22,12 +22,12 @@ #include #include -#include "arrow/array/data.h" -#include "arrow/compute/api_vector.h" -#include "arrow/compute/exec.h" -#include "arrow/compute/function.h" -#include "arrow/compute/kernel.h" -#include "arrow/compute/kernels/codegen_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h" namespace arrow20::compute::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_take_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_take_internal.cc index 8bc6dfa9a4a3..c48157cbfa4c 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_take_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_take_internal.cc @@ -22,27 +22,27 @@ #include #include -#include "arrow/array/builder_primitive.h" -#include "arrow/array/concatenate.h" -#include "arrow/buffer_builder.h" -#include "arrow/chunked_array.h" -#include "arrow/compute/api_vector.h" -#include "arrow/compute/kernels/codegen_internal.h" -#include "arrow/compute/kernels/gather_internal.h" -#include "arrow/compute/kernels/vector_selection_internal.h" -#include "arrow/compute/kernels/vector_selection_take_internal.h" -#include "arrow/compute/registry.h" -#include "arrow/memory_pool.h" -#include "arrow/record_batch.h" -#include "arrow/table.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_block_counter.h" -#include "arrow/util/bit_run_reader.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/fixed_width_internal.h" -#include "arrow/util/int_util.h" -#include "arrow/util/ree_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/concatenate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/gather_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_take_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/fixed_width_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ree_util.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_take_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_take_internal.h index 8ee166030500..0f0611924686 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_take_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_take_internal.h @@ -21,10 +21,10 @@ #include #include -#include "arrow/array/data.h" -#include "arrow/compute/api_vector.h" -#include "arrow/compute/kernels/vector_selection_internal.h" -#include "arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_selection_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_sort.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_sort.cc index 5aa7fb1db760..0126eac2dafe 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_sort.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_sort.cc @@ -17,9 +17,9 @@ #include -#include "arrow/compute/function.h" -#include "arrow/compute/kernels/vector_sort_internal.h" -#include "arrow/compute/registry.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_sort_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_sort_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_sort_internal.h index 17ff91a0712e..ec6fa1320e66 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_sort_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_sort_internal.h @@ -23,12 +23,12 @@ #include #include -#include "arrow/array.h" -#include "arrow/compute/api_vector.h" -#include "arrow/compute/kernels/chunked_internal.h" -#include "arrow/table.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/chunked_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" namespace arrow20::compute::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_statistics.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_statistics.cc index c8366f312d9b..7e136e20083c 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_statistics.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_statistics.cc @@ -20,19 +20,19 @@ #include #include -#include "arrow/compute/api_aggregate.h" -#include "arrow/compute/api_vector.h" -#include "arrow/compute/exec.h" -#include "arrow/compute/function.h" -#include "arrow/compute/kernel.h" -#include "arrow/compute/kernels/codegen_internal.h" -#include "arrow/compute/registry.h" -#include "arrow/result.h" -#include "arrow/scalar.h" -#include "arrow/status.h" -#include "arrow/util/bit_run_reader.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_aggregate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20::compute::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_swizzle.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_swizzle.cc index 71924a6f2032..b03839cdc2ea 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_swizzle.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/vector_swizzle.cc @@ -15,12 +15,12 @@ // specific language governing permissions and limitations // under the License.#include "arrow/compute/api_vector.h" -#include "arrow/compute/api_vector.h" -#include "arrow/compute/function.h" -#include "arrow/compute/kernels/codegen_internal.h" -#include "arrow/compute/registry.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20::compute::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/key_hash_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/key_hash_internal.cc index c01cb6b46fae..e3357f2e4ccd 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/key_hash_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/key_hash_internal.cc @@ -15,16 +15,16 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/key_hash_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/key_hash_internal.h" #include #include #include -#include "arrow/compute/light_array_internal.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/ubsan.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/light_array_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/key_hash_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/key_hash_internal.h index fdad177cb3db..d3041ba0b58f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/key_hash_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/key_hash_internal.h @@ -20,9 +20,9 @@ #include -#include "arrow/compute/light_array_internal.h" -#include "arrow/compute/util.h" -#include "arrow/util/simd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/light_array_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/simd.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/key_map_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/key_map_internal.cc index 4b96bf8927ab..32370fd9caf6 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/key_map_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/key_map_internal.cc @@ -15,15 +15,15 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/key_map_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/key_map_internal.h" #include #include -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/logging.h" -#include "arrow/util/ubsan.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/key_map_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/key_map_internal.h index aa51588d6f6e..13f7727e2b99 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/key_map_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/key_map_internal.h @@ -21,11 +21,11 @@ #include #include -#include "arrow/compute/util.h" -#include "arrow/compute/util_internal.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/light_array_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/light_array_internal.cc index 684ec84080f5..86ae6cd83710 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/light_array_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/light_array_internal.cc @@ -15,13 +15,13 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/light_array_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/light_array_internal.h" #include -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/int_util_overflow.h" -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/light_array_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/light_array_internal.h index b570919ae3b9..1fb306432ed7 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/light_array_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/light_array_internal.h @@ -20,13 +20,13 @@ #include -#include "arrow/array.h" -#include "arrow/compute/exec.h" -#include "arrow/compute/util.h" -#include "arrow/compute/util_internal.h" -#include "arrow/type.h" -#include "arrow/util/cpu_info.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/exec.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/cpu_info.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" /// This file contains lightweight containers for Arrow buffers. These containers /// makes compromises in terms of strong ownership and the range of data types supported diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/ordering.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/ordering.cc index 86d3ff6a8c28..57d22806f969 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/ordering.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/ordering.cc @@ -17,8 +17,8 @@ #include -#include "arrow/compute/ordering.h" -#include "arrow/util/unreachable.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/ordering.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/unreachable.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/ordering.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/ordering.h index 7d9f180b8d30..f864b3c75b3a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/ordering.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/ordering.h @@ -21,9 +21,9 @@ #include #include -#include "arrow/type.h" -#include "arrow/util/compare.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compare.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.cc index 56ec6f23918e..08ca05d2f714 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/registry.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h" #include #include @@ -23,12 +23,12 @@ #include #include -#include "arrow/compute/function.h" -#include "arrow/compute/function_internal.h" -#include "arrow/compute/registry_internal.h" -#include "arrow/status.h" -#include "arrow/util/config.h" // For ARROW_COMPUTE -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" // For ARROW_COMPUTE +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h index e208acbb3e91..0e3a4a985d19 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h @@ -25,9 +25,9 @@ #include #include -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/compare_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/compare_internal.cc index 132a3975f5a3..40cade8c47ee 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/compare_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/compare_internal.cc @@ -15,17 +15,17 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/row/compare_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/compare_internal.h" #include #include #include -#include "arrow/compute/util.h" -#include "arrow/compute/util_internal.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/ubsan.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/compare_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/compare_internal.h index 019ba08c0626..503cf0592198 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/compare_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/compare_internal.h @@ -20,13 +20,13 @@ #include -#include "arrow/compute/light_array_internal.h" -#include "arrow/compute/row/encode_internal.h" -#include "arrow/compute/row/row_internal.h" -#include "arrow/compute/util.h" -#include "arrow/memory_pool.h" -#include "arrow/result.h" -#include "arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/light_array_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/encode_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/row_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/encode_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/encode_internal.cc index ec214cf1b8fb..04d6aea24cb9 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/encode_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/encode_internal.cc @@ -15,8 +15,8 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/row/encode_internal.h" -#include "arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/encode_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/encode_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/encode_internal.h index e505d704768f..63afeb4623d7 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/encode_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/encode_internal.h @@ -22,15 +22,15 @@ #include #include -#include "arrow/array/data.h" -#include "arrow/compute/key_map_internal.h" -#include "arrow/compute/light_array_internal.h" -#include "arrow/compute/row/row_internal.h" -#include "arrow/compute/util.h" -#include "arrow/memory_pool.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/key_map_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/light_array_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/row_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/grouper.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/grouper.cc index 68ad08050ceb..14930720a1cc 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/grouper.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/grouper.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/row/grouper.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/grouper.h" #include #include @@ -23,23 +23,23 @@ #include #include -#include "arrow/array/builder_primitive.h" - -#include "arrow/compute/api_vector.h" -#include "arrow/compute/function.h" -#include "arrow/compute/key_hash_internal.h" -#include "arrow/compute/light_array_internal.h" -#include "arrow/compute/registry.h" -#include "arrow/compute/row/compare_internal.h" -#include "arrow/compute/row/grouper_internal.h" -#include "arrow/compute/row/row_encoder_internal.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/cpu_info.h" -#include "arrow/util/logging.h" -#include "arrow/util/task_group.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" + +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/function.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/key_hash_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/light_array_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/registry.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/compare_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/grouper_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/row_encoder_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/cpu_info.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/task_group.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/grouper.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/grouper.h index 464e233dd46b..291d5b59e4a1 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/grouper.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/grouper.h @@ -21,10 +21,10 @@ #include #include -#include "arrow/compute/kernel.h" -#include "arrow/datum.h" -#include "arrow/result.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/datum.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/row_encoder_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/row_encoder_internal.cc index 0d620b009608..0a1ca529d988 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/row_encoder_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/row_encoder_internal.cc @@ -15,10 +15,10 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/row/row_encoder_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/row_encoder_internal.h" -#include "arrow/util/bitmap_writer.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" #include diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/row_encoder_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/row_encoder_internal.h index 41040c306411..10a344339976 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/row_encoder_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/row_encoder_internal.h @@ -20,8 +20,8 @@ #include -#include "arrow/compute/kernels/codegen_internal.h" -#include "arrow/visit_data_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernels/codegen_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_data_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/row_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/row_internal.cc index e7ee13cb8909..fdd3da6a74c1 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/row_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/row_internal.cc @@ -15,9 +15,9 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/row/row_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/row_internal.h" -#include "arrow/compute/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/row_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/row_internal.h index a0e3dadc4a34..5608c440d251 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/row_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/row/row_internal.h @@ -20,11 +20,11 @@ #include #include -#include "arrow/buffer.h" -#include "arrow/compute/light_array_internal.h" -#include "arrow/memory_pool.h" -#include "arrow/status.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/light_array_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { namespace compute { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/type_fwd.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/type_fwd.h index bb862c0eff0f..01d45eb13f2c 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/type_fwd.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/type_fwd.h @@ -18,7 +18,7 @@ #pragma once -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util.cc index 20c9bd1e1573..48a4babf886f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util.cc @@ -15,10 +15,10 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util.h" -#include "arrow/util/logging.h" -#include "arrow/util/ubsan.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util.h index ae91380a3dc8..9326fa096396 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util.h @@ -25,11 +25,11 @@ #include #include -#include "arrow/compute/expression.h" -#include "arrow/compute/type_fwd.h" -#include "arrow/result.h" -#include "arrow/util/cpu_info.h" -#include "arrow/util/simd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/expression.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/cpu_info.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/simd.h" #if defined(__clang__) || defined(__GNUC__) # define BYTESWAP(x) __builtin_bswap64(x) diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util_internal.cc index 838055c4a69a..e25d8156d41d 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util_internal.cc @@ -15,10 +15,10 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/compute/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util_internal.h" -#include "arrow/compute/util.h" -#include "arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" #ifdef ADDRESS_SANITIZER # include diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util_internal.h index d0f1f632bfa4..319302a0cf2a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/compute/util_internal.h @@ -18,10 +18,10 @@ #pragma once -#include "arrow/status.h" -#include "arrow/type_fwd.h" -#include "arrow/util/logging.h" -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/config.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/config.cc index 19817162917d..bdee5fd65a94 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/config.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/config.cc @@ -15,14 +15,14 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/config.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/config.h" #include -#include "arrow/util/config.h" -#include "arrow/util/config_internal.h" -#include "arrow/util/cpu_info.h" -#include "arrow/vendored/datetime.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/cpu_info.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/datetime.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/config.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/config.h index b14a7464bf01..de36ae11cfa4 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/config.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/config.h @@ -21,9 +21,9 @@ #include #include -#include "arrow/status.h" -#include "arrow/util/config.h" // IWYU pragma: export -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/api.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/api.h index 1b8cec493bcb..9393a120c692 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/api.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/api.h @@ -18,6 +18,6 @@ #pragma once -#include "arrow/csv/options.h" -#include "arrow/csv/reader.h" -#include "arrow/csv/writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/writer.h" diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/chunker.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/chunker.cc index fcfa87fac7bc..4f6abb2dc217 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/chunker.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/chunker.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/csv/chunker.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/chunker.h" #include #include @@ -23,9 +23,9 @@ #include #include -#include "arrow/csv/lexing_internal.h" -#include "arrow/status.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/lexing_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { namespace csv { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/chunker.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/chunker.h index e0e043160555..772a68612a38 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/chunker.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/chunker.h @@ -21,11 +21,11 @@ #include #include -#include "arrow/csv/options.h" -#include "arrow/status.h" -#include "arrow/util/delimiting.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/delimiting.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace csv { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/column_builder.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/column_builder.cc index 7f1d0894b2e0..14fb3a5acf05 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/column_builder.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/column_builder.cc @@ -24,19 +24,19 @@ #include #include -#include "arrow/array.h" -#include "arrow/array/builder_base.h" -#include "arrow/chunked_array.h" -#include "arrow/csv/column_builder.h" -#include "arrow/csv/converter.h" -#include "arrow/csv/inference_internal.h" -#include "arrow/csv/options.h" -#include "arrow/csv/parser.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_fwd.h" -#include "arrow/util/logging.h" -#include "arrow/util/task_group.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/column_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/converter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/inference_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/parser.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/task_group.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/column_builder.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/column_builder.h index 63c8927ec4c0..b38a3b9cfe4c 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/column_builder.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/column_builder.h @@ -22,10 +22,10 @@ #include #include -#include "arrow/result.h" -#include "arrow/type_fwd.h" -#include "arrow/util/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace csv { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/column_decoder.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/column_decoder.cc index 9b58d7ba0725..6d2b17852922 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/column_decoder.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/column_decoder.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/csv/column_decoder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/column_decoder.h" #include #include @@ -24,17 +24,17 @@ #include #include -#include "arrow/array.h" -#include "arrow/array/builder_base.h" -#include "arrow/csv/converter.h" -#include "arrow/csv/inference_internal.h" -#include "arrow/csv/options.h" -#include "arrow/csv/parser.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_fwd.h" -#include "arrow/util/future.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/converter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/inference_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/parser.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { namespace csv { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/column_decoder.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/column_decoder.h index 78ffea0acb42..c7db831880b2 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/column_decoder.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/column_decoder.h @@ -22,10 +22,10 @@ #include #include -#include "arrow/result.h" -#include "arrow/type_fwd.h" -#include "arrow/util/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace csv { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/converter.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/converter.cc index 96d135ec65bc..88101f8c74ee 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/converter.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/converter.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/csv/converter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/converter.h" #include #include @@ -25,20 +25,20 @@ #include #include -#include "arrow/array/builder_binary.h" -#include "arrow/array/builder_decimal.h" -#include "arrow/array/builder_dict.h" -#include "arrow/array/builder_primitive.h" -#include "arrow/csv/parser.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_fwd.h" -#include "arrow/type_traits.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/decimal.h" -#include "arrow/util/trie.h" -#include "arrow/util/utf8_internal.h" -#include "arrow/util/value_parsing.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_binary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_dict.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/parser.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/trie.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/utf8_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/value_parsing.h" // IWYU pragma: keep namespace arrow20 { namespace csv { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/converter.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/converter.h index a1c1dc615108..be68154e3d1d 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/converter.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/converter.h @@ -21,11 +21,11 @@ #include #include -#include "arrow/csv/options.h" -#include "arrow/result.h" -#include "arrow/type_fwd.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace csv { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/inference_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/inference_internal.h index 51abe9046604..12a1fe645c07 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/inference_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/inference_internal.h @@ -20,9 +20,9 @@ #include -#include "arrow/csv/converter.h" -#include "arrow/csv/options.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/converter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { namespace csv { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/lexing_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/lexing_internal.h index c60da0c9c495..72521823d770 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/lexing_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/lexing_internal.h @@ -20,8 +20,8 @@ #include -#include "arrow/csv/options.h" -#include "arrow/util/simd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/simd.h" namespace arrow20 { namespace csv { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/options.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/options.cc index f86550fdb8ca..f54abf53cf60 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/options.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/options.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/csv/options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/options.h" namespace arrow20 { namespace csv { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/options.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/options.h index 402d011eeb5f..abdab181add3 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/options.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/options.h @@ -24,11 +24,11 @@ #include #include -#include "arrow/csv/invalid_row.h" -#include "arrow/csv/type_fwd.h" -#include "arrow/io/interfaces.h" -#include "arrow/status.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/invalid_row.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/parser.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/parser.cc index 748485907f15..8e352ac6f1e8 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/parser.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/parser.cc @@ -15,19 +15,19 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/csv/parser.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/parser.h" #include #include #include #include -#include "arrow/csv/lexing_internal.h" -#include "arrow/memory_pool.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/logging.h" -#include "arrow/util/simd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/lexing_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/simd.h" namespace arrow20 { namespace csv { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/parser.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/parser.h index 24805b288897..ce1c7f8acde0 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/parser.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/parser.h @@ -25,12 +25,12 @@ #include #include -#include "arrow/buffer.h" -#include "arrow/csv/options.h" -#include "arrow/csv/type_fwd.h" -#include "arrow/status.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/reader.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/reader.cc index eacb3faf7c44..c3d3fca8839e 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/reader.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/reader.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/csv/reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/reader.h" #include #include @@ -29,28 +29,28 @@ #include #include -#include "arrow/array.h" -#include "arrow/buffer.h" -#include "arrow/csv/chunker.h" -#include "arrow/csv/column_builder.h" -#include "arrow/csv/column_decoder.h" -#include "arrow/csv/options.h" -#include "arrow/csv/parser.h" -#include "arrow/io/interfaces.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/table.h" -#include "arrow/type.h" -#include "arrow/type_fwd.h" -#include "arrow/util/async_generator.h" -#include "arrow/util/future.h" -#include "arrow/util/iterator.h" -#include "arrow/util/logging.h" -#include "arrow/util/macros.h" -#include "arrow/util/task_group.h" -#include "arrow/util/thread_pool.h" -#include "arrow/util/utf8_internal.h" -#include "arrow/util/vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/chunker.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/column_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/column_decoder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/parser.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_generator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/iterator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/task_group.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/thread_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/utf8_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/vector.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/reader.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/reader.h index 4881421d07bc..9cfcd3bd0a1f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/reader.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/reader.h @@ -20,15 +20,15 @@ #include -#include "arrow/csv/options.h" // IWYU pragma: keep -#include "arrow/io/interfaces.h" -#include "arrow/record_batch.h" -#include "arrow/result.h" -#include "arrow/type.h" -#include "arrow/type_fwd.h" -#include "arrow/util/future.h" -#include "arrow/util/thread_pool.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/options.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/thread_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace io { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/writer.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/writer.cc index 16ce27c98542..ae99bd07fe11 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/writer.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/writer.cc @@ -15,18 +15,18 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/csv/writer.h" -#include "arrow/array.h" -#include "arrow/compute/cast.h" -#include "arrow/io/interfaces.h" -#include "arrow/ipc/writer.h" -#include "arrow/record_batch.h" -#include "arrow/result.h" -#include "arrow/stl_allocator.h" -#include "arrow/util/iterator.h" -#include "arrow/util/logging.h" -#include "arrow/visit_data_inline.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/stl_allocator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/iterator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_data_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" #include diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/writer.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/writer.h index 4d4ca0e37cd5..a6062fb5d765 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/writer.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/csv/writer.h @@ -20,11 +20,11 @@ #include -#include "arrow/csv/options.h" -#include "arrow/io/interfaces.h" -#include "arrow/ipc/type_fwd.h" -#include "arrow/record_batch.h" -#include "arrow/table.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/csv/options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" namespace arrow20 { namespace csv { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/datum.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/datum.cc index 761696312a6a..2cf8ed4d27e9 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/datum.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/datum.cc @@ -15,23 +15,23 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/datum.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/datum.h" #include #include #include #include -#include "arrow/array/array_base.h" -#include "arrow/array/util.h" -#include "arrow/chunked_array.h" -#include "arrow/device_allocation_type_set.h" -#include "arrow/record_batch.h" -#include "arrow/scalar.h" -#include "arrow/table.h" -#include "arrow/util/byte_size.h" -#include "arrow/util/logging.h" -#include "arrow/util/memory.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/device_allocation_type_set.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/byte_size.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/memory.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/datum.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/datum.h index e5d152f82725..db83da57ded5 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/datum.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/datum.h @@ -26,14 +26,14 @@ #include #include -#include "arrow/array/data.h" -#include "arrow/device_allocation_type_set.h" -#include "arrow/scalar.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/device_allocation_type_set.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/device.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/device.cc index fc74fe8e7462..bcd3d8e8e560 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/device.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/device.cc @@ -15,19 +15,19 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/device.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/device.h" #include #include #include #include -#include "arrow/array.h" -#include "arrow/buffer.h" -#include "arrow/io/memory.h" -#include "arrow/record_batch.h" -#include "arrow/result.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/memory.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/device.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/device.h index a452759baf68..561f01e28b6a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/device.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/device.h @@ -23,13 +23,13 @@ #include #include -#include "arrow/io/type_fwd.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type_fwd.h" -#include "arrow/util/compare.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compare.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/device_allocation_type_set.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/device_allocation_type_set.cc index 7465c0640047..a254fe865b72 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/device_allocation_type_set.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/device_allocation_type_set.cc @@ -17,8 +17,8 @@ #include -#include "arrow/device_allocation_type_set.h" -#include "arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/device_allocation_type_set.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/device_allocation_type_set.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/device_allocation_type_set.h index e66093aab002..e874d26dec2e 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/device_allocation_type_set.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/device_allocation_type_set.h @@ -21,8 +21,8 @@ #include #include -#include "arrow/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/bool8.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/bool8.cc index 0c8420af2205..95d4cc9bbf99 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/bool8.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/bool8.cc @@ -17,8 +17,8 @@ #include -#include "arrow/extension/bool8.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension/bool8.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20::extension { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/bool8.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/bool8.h index 4417cf92d8b1..22791be3e3be 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/bool8.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/bool8.h @@ -18,7 +18,7 @@ #pragma once -#include "arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" namespace arrow20::extension { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/fixed_shape_tensor.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/fixed_shape_tensor.cc index 9c6a15ac88fc..cbd387a8acbb 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/fixed_shape_tensor.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/fixed_shape_tensor.cc @@ -18,19 +18,19 @@ #include #include -#include "arrow/extension/fixed_shape_tensor.h" -#include "arrow/extension/tensor_internal.h" -#include "arrow/scalar.h" - -#include "arrow/array/array_nested.h" -#include "arrow/array/array_primitive.h" -#include "arrow/json/rapidjson_defs.h" // IWYU pragma: keep -#include "arrow/tensor.h" -#include "arrow/util/int_util_overflow.h" -#include "arrow/util/logging.h" -#include "arrow/util/print.h" -#include "arrow/util/sort.h" -#include "arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension/fixed_shape_tensor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension/tensor_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" + +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/rapidjson_defs.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/tensor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/print.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/sort.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" #include #include diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/fixed_shape_tensor.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/fixed_shape_tensor.h index 214cacdd9ae4..cf993e08b8a2 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/fixed_shape_tensor.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/fixed_shape_tensor.h @@ -18,7 +18,7 @@ #pragma once -#include "arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" namespace arrow20 { namespace extension { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/json.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/json.cc index 925d31f94a4c..b247849fcb2c 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/json.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/json.cc @@ -15,15 +15,15 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/extension/json.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension/json.h" #include -#include "arrow/extension_type.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type_fwd.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20::extension { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/json.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/json.h index 986494b2c038..6fe8d2408472 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/json.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/json.h @@ -21,10 +21,10 @@ #include #include -#include "arrow/extension_type.h" -#include "arrow/result.h" -#include "arrow/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20::extension { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/opaque.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/opaque.cc index 0712df1ab2e1..5c340e1af0a4 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/opaque.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/opaque.cc @@ -15,12 +15,12 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/extension/opaque.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension/opaque.h" #include -#include "arrow/json/rapidjson_defs.h" // IWYU pragma: keep -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/rapidjson_defs.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" #include #include diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/opaque.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/opaque.h index 4dd7c4278d2d..cd55cb811c93 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/opaque.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/opaque.h @@ -18,8 +18,8 @@ #pragma once -#include "arrow/extension_type.h" -#include "arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" namespace arrow20::extension { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/tensor_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/tensor_internal.h index 38c57343fcc7..10091446fe7d 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/tensor_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/tensor_internal.h @@ -21,8 +21,8 @@ #include #include -#include "arrow/status.h" -#include "arrow/util/print.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/print.h" namespace arrow20::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/uuid.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/uuid.cc index fa1220e59440..0d5fca930616 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/uuid.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/uuid.cc @@ -17,10 +17,10 @@ #include -#include "arrow/extension_type.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" -#include "arrow/extension/uuid.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension/uuid.h" namespace arrow20::extension { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/uuid.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/uuid.h index 68ac6d0702b6..0ba2bd91e014 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/uuid.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension/uuid.h @@ -18,7 +18,7 @@ #pragma once -#include "arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" namespace arrow20::extension { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.cc index 78522bfd6ca3..b6627fbca076 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" #include #include @@ -24,20 +24,20 @@ #include #include -#include "arrow/array/util.h" -#include "arrow/chunked_array.h" -#include "arrow/config.h" -#include "arrow/extension/bool8.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/config.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension/bool8.h" #ifdef ARROW_JSON -# include "arrow/extension/fixed_shape_tensor.h" -# include "arrow/extension/opaque.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension/fixed_shape_tensor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension/opaque.h" #endif -#include "arrow/extension/json.h" -#include "arrow/extension/uuid.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension/json.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension/uuid.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h index 89678ba5b5ce..9debcb3d6aa7 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h @@ -24,15 +24,15 @@ #include #include -#include "arrow/array/array_base.h" -#include "arrow/array/data.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_fwd.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/api.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/api.h index bfc704ac24e4..ae977866c559 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/api.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/api.h @@ -18,9 +18,9 @@ #pragma once -#include "arrow/util/config.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" // IWYU pragma: export -#include "arrow/filesystem/filesystem.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/filesystem.h" // IWYU pragma: export #ifdef ARROW_AZURE # error #include "arrow/filesystem/azurefs.h" // IWYU pragma: export #endif @@ -28,8 +28,8 @@ # error #include "arrow/filesystem/gcsfs.h" // IWYU pragma: export #endif #error #include "arrow/filesystem/hdfs.h" // IWYU pragma: export -#include "arrow/filesystem/localfs.h" // IWYU pragma: export -#include "arrow/filesystem/mockfs.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/localfs.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/mockfs.h" // IWYU pragma: export #ifdef ARROW_S3 # error #include "arrow/filesystem/s3fs.h" // IWYU pragma: export #endif diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/filesystem.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/filesystem.cc index be18ebb633ed..fa5ab065c340 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/filesystem.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/filesystem.cc @@ -21,10 +21,10 @@ #include #include -#include "arrow/type_fwd.h" -#include "arrow/util/config.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" -#include "arrow/filesystem/filesystem.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/filesystem.h" #ifdef ARROW_AZURE # error #include "arrow/filesystem/azurefs.h" #endif @@ -37,24 +37,24 @@ #ifdef ARROW_S3 # error #include "arrow/filesystem/s3fs.h" #endif -#include "arrow/filesystem/localfs.h" -#include "arrow/filesystem/mockfs.h" -#include "arrow/filesystem/path_util.h" -#include "arrow/filesystem/util_internal.h" -#include "arrow/io/slow.h" -#include "arrow/io/util_internal.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/async_generator.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/logging.h" -#include "arrow/util/macros.h" -#include "arrow/util/parallel.h" -#include "arrow/util/string.h" -#include "arrow/util/uri.h" -#include "arrow/util/vector.h" -#include "arrow/util/visibility.h" -#include "arrow/util/windows_fixup.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/localfs.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/mockfs.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/path_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/slow.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_generator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/parallel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/uri.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/windows_fixup.h" namespace arrow20::fs { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/filesystem.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/filesystem.h index f3b9aaafafc0..f478e7f496cc 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/filesystem.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/filesystem.h @@ -27,14 +27,14 @@ #include #include -#include "arrow/filesystem/type_fwd.h" -#include "arrow/io/interfaces.h" -#include "arrow/type_fwd.h" -#include "arrow/util/compare.h" -#include "arrow/util/macros.h" -#include "arrow/util/type_fwd.h" -#include "arrow/util/visibility.h" -#include "arrow/util/windows_fixup.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compare.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/windows_fixup.h" namespace arrow20 { namespace fs { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/localfs.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/localfs.cc index de9e2385339e..41ec05e5bf58 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/localfs.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/localfs.cc @@ -22,7 +22,7 @@ #include #ifdef _WIN32 -# include "arrow/util/windows_compatibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/windows_compatibility.h" #else # include # include @@ -30,18 +30,18 @@ # include #endif -#include "arrow/filesystem/filesystem.h" -#include "arrow/filesystem/localfs.h" -#include "arrow/filesystem/path_util.h" -#include "arrow/filesystem/type_fwd.h" -#include "arrow/filesystem/util_internal.h" -#include "arrow/io/file.h" -#include "arrow/io/type_fwd.h" -#include "arrow/util/async_generator.h" -#include "arrow/util/io_util.h" -#include "arrow/util/string.h" -#include "arrow/util/uri.h" -#include "arrow/util/windows_fixup.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/filesystem.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/localfs.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/path_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/file.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_generator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/io_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/uri.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/windows_fixup.h" namespace arrow20::fs { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/localfs.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/localfs.h index 447c31a3f3a5..75788bf2e9ab 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/localfs.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/localfs.h @@ -22,7 +22,7 @@ #include #include -#include "arrow/filesystem/filesystem.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/filesystem.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/mockfs.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/mockfs.cc index c7cf555e34d9..c0484c9c36f5 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/mockfs.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/mockfs.cc @@ -26,17 +26,17 @@ #include #include -#include "arrow/buffer.h" -#include "arrow/buffer_builder.h" -#include "arrow/filesystem/mockfs.h" -#include "arrow/filesystem/path_util.h" -#include "arrow/filesystem/util_internal.h" -#include "arrow/io/interfaces.h" -#include "arrow/io/memory.h" -#include "arrow/util/async_generator.h" -#include "arrow/util/future.h" -#include "arrow/util/logging.h" -#include "arrow/util/windows_fixup.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/mockfs.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/path_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/memory.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_generator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/windows_fixup.h" namespace arrow20 { namespace fs { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/mockfs.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/mockfs.h index 305456a7465a..7e990d09fa64 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/mockfs.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/mockfs.h @@ -24,8 +24,8 @@ #include #include -#include "arrow/filesystem/filesystem.h" -#include "arrow/util/windows_fixup.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/filesystem.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/windows_fixup.h" namespace arrow20::fs::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/path_util.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/path_util.cc index 2e67cebd6cda..33273f47fa1c 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/path_util.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/path_util.cc @@ -19,13 +19,13 @@ #include #include -#include "arrow/filesystem/path_util.h" -#include "arrow/filesystem/util_internal.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/logging.h" -#include "arrow/util/string.h" -#include "arrow/util/uri.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/path_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/uri.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/path_util.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/path_util.h index b9103e6ae6c1..9416d10e6dac 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/path_util.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/path_util.h @@ -24,7 +24,7 @@ #include #include -#include "arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" namespace arrow20 { namespace fs { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/util_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/util_internal.cc index 13877d217819..28730fcabd9b 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/util_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/util_internal.cc @@ -15,17 +15,17 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/filesystem/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/util_internal.h" #include #include -#include "arrow/buffer.h" -#include "arrow/filesystem/path_util.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/io_util.h" -#include "arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/path_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/io_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/util_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/util_internal.h index 7f88b26a2876..90c3cb42bf68 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/util_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/util_internal.h @@ -22,11 +22,11 @@ #include #include -#include "arrow/filesystem/filesystem.h" -#include "arrow/io/interfaces.h" -#include "arrow/status.h" -#include "arrow/util/uri.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/filesystem/filesystem.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/uri.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { using util::Uri; diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/api.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/api.h index f3bcef2c019d..2518a964ffbb 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/api.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/api.h @@ -18,13 +18,13 @@ #pragma once -#include "arrow/io/buffered.h" -#include "arrow/io/compressed.h" -#include "arrow/io/file.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/buffered.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/compressed.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/file.h" #if USE_HDFS #error #include "arrow/io/hdfs.h" #endif -#include "arrow/io/interfaces.h" -#include "arrow/io/memory.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/memory.h" diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/buffered.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/buffered.cc index 3c52d41fdf12..395f3e2001a4 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/buffered.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/buffered.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/io/buffered.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/buffered.h" #include #include @@ -24,11 +24,11 @@ #include #include -#include "arrow/buffer.h" -#include "arrow/io/util_internal.h" -#include "arrow/memory_pool.h" -#include "arrow/status.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { namespace io { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/buffered.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/buffered.h index 142899d1d11c..a68a39b4cec6 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/buffered.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/buffered.h @@ -24,9 +24,9 @@ #include #include -#include "arrow/io/concurrency.h" -#include "arrow/io/interfaces.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/concurrency.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/caching.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/caching.cc index fcf2a2a8d25a..7713af01c828 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/caching.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/caching.cc @@ -22,12 +22,12 @@ #include #include -#include "arrow/buffer.h" -#include "arrow/io/caching.h" -#include "arrow/io/util_internal.h" -#include "arrow/result.h" -#include "arrow/util/future.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/caching.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { namespace io { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/caching.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/caching.h index 697d477b7dc0..817c3da648b9 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/caching.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/caching.h @@ -24,9 +24,9 @@ #include #include -#include "arrow/io/interfaces.h" -#include "arrow/util/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace io { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/compressed.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/compressed.cc index f13c3add1529..d2044a3eb28c 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/compressed.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/compressed.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/io/compressed.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/compressed.h" #include #include @@ -24,12 +24,12 @@ #include #include -#include "arrow/buffer.h" -#include "arrow/io/util_internal.h" -#include "arrow/memory_pool.h" -#include "arrow/status.h" -#include "arrow/util/compression.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/compressed.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/compressed.h index 89825d793203..1d974a6f7091 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/compressed.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/compressed.h @@ -23,9 +23,9 @@ #include #include -#include "arrow/io/concurrency.h" -#include "arrow/io/interfaces.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/concurrency.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/concurrency.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/concurrency.h index 5ccbb6899927..eac57b233805 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/concurrency.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/concurrency.h @@ -20,12 +20,12 @@ #include -#include "arrow/io/interfaces.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace io { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/file.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/file.cc index d7787dba4ae3..b87e9c8686a5 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/file.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/file.cc @@ -15,14 +15,14 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/windows_compatibility.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/windows_compatibility.h" // IWYU pragma: keep // sys/mman.h not present in Visual Studio or Cygwin #ifdef _WIN32 # ifndef NOMINMAX # define NOMINMAX # endif -# include "arrow/io/mman.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/mman.h" # undef Realloc # undef Free #else @@ -46,16 +46,16 @@ // ---------------------------------------------------------------------- // Other Arrow includes -#include "arrow/io/file.h" -#include "arrow/io/interfaces.h" -#include "arrow/io/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/file.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/util_internal.h" -#include "arrow/buffer.h" -#include "arrow/memory_pool.h" -#include "arrow/status.h" -#include "arrow/util/future.h" -#include "arrow/util/io_util.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/io_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/file.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/file.h index 00d5acbcc42b..deb1a4550f69 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/file.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/file.h @@ -25,9 +25,9 @@ #include #include -#include "arrow/io/concurrency.h" -#include "arrow/io/interfaces.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/concurrency.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.cc index c1a6f74d8598..d7761ec2e782 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" #include #include @@ -28,18 +28,18 @@ #include #include -#include "arrow/buffer.h" -#include "arrow/io/concurrency.h" -#include "arrow/io/type_fwd.h" -#include "arrow/io/util_internal.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/future.h" -#include "arrow/util/io_util.h" -#include "arrow/util/iterator.h" -#include "arrow/util/logging.h" -#include "arrow/util/thread_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/concurrency.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/io_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/iterator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/thread_pool.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h index 818e232dadf1..32a615a89fcb 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h @@ -24,12 +24,12 @@ #include #include -#include "arrow/io/type_fwd.h" -#include "arrow/type_fwd.h" -#include "arrow/util/cancel.h" -#include "arrow/util/macros.h" -#include "arrow/util/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/cancel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace io { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/memory.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/memory.cc index cf2549c1b677..cd2334cd52e3 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/memory.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/memory.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/io/memory.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/memory.h" #include #include @@ -23,15 +23,15 @@ #include #include -#include "arrow/buffer.h" -#include "arrow/io/util_internal.h" -#include "arrow/memory_pool.h" -#include "arrow/status.h" -#include "arrow/util/future.h" -#include "arrow/util/io_util.h" -#include "arrow/util/logging.h" -#include "arrow/util/macros.h" -#include "arrow/util/memory.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/io_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/memory.h" namespace arrow20 { namespace io { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/memory.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/memory.h index 5af823f30f1c..320bc080a760 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/memory.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/memory.h @@ -25,10 +25,10 @@ #include #include -#include "arrow/io/concurrency.h" -#include "arrow/io/interfaces.h" -#include "arrow/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/concurrency.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/mman.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/mman.h index 96644110f977..eafa0ea7d8b3 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/mman.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/mman.h @@ -8,7 +8,7 @@ #pragma once -#include "arrow/util/windows_compatibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/windows_compatibility.h" #include #include diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/slow.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/slow.cc index a37238c10417..72ae24e3d8a7 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/slow.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/slow.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/io/slow.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/slow.h" #include #include @@ -24,12 +24,12 @@ #include #include -#include "arrow/buffer.h" -#include "arrow/io/util_internal.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/io_util.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/io_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { namespace io { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/slow.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/slow.h index 29278f21573d..360185321713 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/slow.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/slow.h @@ -24,8 +24,8 @@ #include #include -#include "arrow/io/interfaces.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/stdio.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/stdio.cc index e2e5ba81c50c..b8c06b7014fa 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/stdio.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/stdio.cc @@ -15,12 +15,12 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/io/stdio.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/stdio.h" #include -#include "arrow/buffer.h" -#include "arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" namespace arrow20 { namespace io { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/stdio.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/stdio.h index 5be5109e5534..2e5eae447d09 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/stdio.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/stdio.h @@ -20,8 +20,8 @@ #include -#include "arrow/io/interfaces.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace io { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/transform.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/transform.cc index a10c45647952..9bde4c6a6d2b 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/transform.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/transform.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/io/transform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/transform.h" #include #include @@ -24,11 +24,11 @@ #include #include -#include "arrow/buffer.h" -#include "arrow/io/util_internal.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { namespace io { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/transform.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/transform.h index ad94b950fd36..4de1951e9950 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/transform.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/transform.h @@ -25,8 +25,8 @@ #include #include -#include "arrow/io/interfaces.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace io { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/type_fwd.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/type_fwd.h index 620a3ecfbda9..2ffa07b7a7c9 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/type_fwd.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/type_fwd.h @@ -18,8 +18,8 @@ #pragma once -#include "arrow/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace io { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/util_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/util_internal.h index b2df0fb73490..692b5bac3a54 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/io/util_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/io/util_internal.h @@ -22,10 +22,10 @@ #include #include -#include "arrow/io/interfaces.h" -#include "arrow/util/thread_pool.h" -#include "arrow/util/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/thread_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace io { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/api.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/api.h index bf36f5fa6b23..0e5304421480 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/api.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/api.h @@ -18,9 +18,9 @@ #pragma once -#include "arrow/ipc/dictionary.h" -#include "arrow/ipc/feather.h" -#include "arrow/ipc/json_simple.h" -#include "arrow/ipc/message.h" -#include "arrow/ipc/reader.h" -#include "arrow/ipc/writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/dictionary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/feather.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/json_simple.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/message.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/writer.h" diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/dictionary.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/dictionary.cc index 68f10cc3e706..db185e4cb9a9 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/dictionary.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/dictionary.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/ipc/dictionary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/dictionary.h" #include #include @@ -25,15 +25,15 @@ #include #include -#include "arrow/array.h" -#include "arrow/array/concatenate.h" -#include "arrow/array/validate.h" -#include "arrow/extension_type.h" -#include "arrow/record_batch.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/concatenate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/validate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/dictionary.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/dictionary.h index 8a6d0418642d..719903363cba 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/dictionary.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/dictionary.h @@ -25,11 +25,11 @@ #include #include -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type_fwd.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace ipc { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/feather.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/feather.cc index b6f1c85e5935..518338c4387d 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/feather.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/feather.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/ipc/feather.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/feather.h" #include #include @@ -29,26 +29,26 @@ #include -#include "arrow/array.h" -#include "arrow/buffer.h" -#include "arrow/chunked_array.h" -#include "arrow/io/interfaces.h" -#include "arrow/ipc/metadata_internal.h" -#include "arrow/ipc/options.h" -#include "arrow/ipc/reader.h" -#include "arrow/ipc/util.h" -#include "arrow/ipc/writer.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/table.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/logging.h" -#include "arrow/visit_type_inline.h" - -#include "generated/feather.fbs.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/metadata_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" + +#include "contrib/libs/apache/arrow_next/cpp/src/generated/feather.fbs.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/feather.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/feather.h index 1938c694dc24..e83b3d25a514 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/feather.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/feather.h @@ -26,10 +26,10 @@ #include #include -#include "arrow/ipc/options.h" -#include "arrow/type_fwd.h" -#include "arrow/util/compression.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/json_simple.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/json_simple.cc index 6b6dab2f9ce0..77d2d8be2fd0 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/json_simple.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/json_simple.cc @@ -22,25 +22,25 @@ #include #include -#include "arrow/array/array_dict.h" -#include "arrow/array/builder_binary.h" -#include "arrow/array/builder_decimal.h" -#include "arrow/array/builder_dict.h" -#include "arrow/array/builder_nested.h" -#include "arrow/array/builder_primitive.h" -#include "arrow/array/builder_time.h" -#include "arrow/array/builder_union.h" -#include "arrow/chunked_array.h" -#include "arrow/ipc/json_simple.h" -#include "arrow/scalar.h" -#include "arrow/type_traits.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/decimal.h" -#include "arrow/util/float16.h" -#include "arrow/util/logging.h" -#include "arrow/util/value_parsing.h" - -#include "arrow/json/rapidjson_defs.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_dict.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_binary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_dict.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_time.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_union.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/json_simple.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/float16.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/value_parsing.h" + +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/rapidjson_defs.h" #include #include diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/json_simple.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/json_simple.h index 10008f12f7bb..d02aca6dcf34 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/json_simple.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/json_simple.h @@ -24,9 +24,9 @@ #include #include -#include "arrow/status.h" -#include "arrow/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/message.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/message.cc index 2dd641e4833c..f103f850047d 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/message.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/message.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/ipc/message.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/message.h" #include #include @@ -25,21 +25,21 @@ #include #include -#include "arrow/buffer.h" -#include "arrow/device.h" -#include "arrow/io/interfaces.h" -#include "arrow/ipc/metadata_internal.h" -#include "arrow/ipc/options.h" -#include "arrow/ipc/reader.h" -#include "arrow/ipc/reader_internal.h" -#include "arrow/ipc/util.h" -#include "arrow/status.h" -#include "arrow/util/endian.h" -#include "arrow/util/future.h" -#include "arrow/util/logging.h" -#include "arrow/util/ubsan.h" - -#include "generated/Message.fbs.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/device.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/metadata_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/reader_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" + +#include "contrib/libs/apache/arrow_next/cpp/src/generated/Message.fbs.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/message.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/message.h index 36a36405c78b..46b60c89cc2b 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/message.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/message.h @@ -26,13 +26,13 @@ #include #include -#include "arrow/io/type_fwd.h" -#include "arrow/ipc/type_fwd.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type_fwd.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace ipc { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/metadata_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/metadata_internal.cc index ee1b5f916ce6..14cfead0f69f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/metadata_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/metadata_internal.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/ipc/metadata_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/metadata_internal.h" #include #include @@ -25,28 +25,28 @@ #include -#include "arrow/extension_type.h" -#include "arrow/io/interfaces.h" -#include "arrow/ipc/dictionary.h" -#include "arrow/ipc/message.h" -#include "arrow/ipc/options.h" -#include "arrow/ipc/util.h" -#include "arrow/sparse_tensor.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/key_value_metadata.h" -#include "arrow/util/logging.h" -#include "arrow/util/string.h" -#include "arrow/util/ubsan.h" -#include "arrow/visit_type_inline.h" - -#include "generated/File.fbs.h" -#include "generated/Message.fbs.h" -#include "generated/Schema.fbs.h" -#include "generated/SparseTensor.fbs.h" -#include "generated/Tensor.fbs.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/dictionary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/message.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/sparse_tensor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" + +#include "contrib/libs/apache/arrow_next/cpp/src/generated/File.fbs.h" +#include "contrib/libs/apache/arrow_next/cpp/src/generated/Message.fbs.h" +#include "contrib/libs/apache/arrow_next/cpp/src/generated/Schema.fbs.h" +#include "contrib/libs/apache/arrow_next/cpp/src/generated/SparseTensor.fbs.h" +#include "contrib/libs/apache/arrow_next/cpp/src/generated/Tensor.fbs.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/metadata_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/metadata_internal.h index 8a78aa487df3..9b833988e2dd 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/metadata_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/metadata_internal.h @@ -29,19 +29,19 @@ #include -#include "arrow/buffer.h" -#include "arrow/io/type_fwd.h" -#include "arrow/ipc/message.h" -#include "arrow/result.h" -#include "arrow/sparse_tensor.h" -#include "arrow/status.h" -#include "arrow/type_fwd.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" - -#include "generated/Message.fbs.h" -#include "generated/Schema.fbs.h" -#include "generated/SparseTensor.fbs.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/message.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/sparse_tensor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" + +#include "contrib/libs/apache/arrow_next/cpp/src/generated/Message.fbs.h" +#include "contrib/libs/apache/arrow_next/cpp/src/generated/Schema.fbs.h" +#include "contrib/libs/apache/arrow_next/cpp/src/generated/SparseTensor.fbs.h" // IWYU pragma: keep namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/options.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/options.cc index c9b3f05908ff..c0ba21f1ae4a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/options.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/options.cc @@ -15,9 +15,9 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/ipc/options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/options.h" -#include "arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" namespace arrow20 { namespace ipc { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/options.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/options.h index bfd4b668416a..8d403484a648 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/options.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/options.h @@ -22,12 +22,12 @@ #include #include -#include "arrow/io/caching.h" -#include "arrow/ipc/type_fwd.h" -#include "arrow/status.h" -#include "arrow/type_fwd.h" -#include "arrow/util/compression.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/caching.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/reader.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/reader.cc index 061fe8491fdf..94a5b19a04f1 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/reader.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/reader.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/ipc/reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/reader.h" #include #include @@ -31,40 +31,40 @@ #include // IWYU pragma: export -#include "arrow/array.h" -#include "arrow/buffer.h" -#include "arrow/extension_type.h" -#include "arrow/io/caching.h" -#include "arrow/io/interfaces.h" -#include "arrow/io/memory.h" -#include "arrow/ipc/message.h" -#include "arrow/ipc/metadata_internal.h" -#include "arrow/ipc/reader_internal.h" -#include "arrow/ipc/writer.h" -#include "arrow/record_batch.h" -#include "arrow/sparse_tensor.h" -#include "arrow/status.h" -#include "arrow/table.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/compression.h" -#include "arrow/util/endian.h" -#include "arrow/util/key_value_metadata.h" -#include "arrow/util/logging.h" -#include "arrow/util/parallel.h" -#include "arrow/util/string.h" -#include "arrow/util/thread_pool.h" -#include "arrow/util/ubsan.h" -#include "arrow/util/vector.h" -#include "arrow/visit_type_inline.h" - -#include "generated/File.fbs.h" // IWYU pragma: export -#include "generated/Message.fbs.h" -#include "generated/Schema.fbs.h" -#include "generated/SparseTensor.fbs.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/caching.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/memory.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/message.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/metadata_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/reader_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/sparse_tensor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/parallel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/thread_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" + +#include "contrib/libs/apache/arrow_next/cpp/src/generated/File.fbs.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/generated/Message.fbs.h" +#include "contrib/libs/apache/arrow_next/cpp/src/generated/Schema.fbs.h" +#include "contrib/libs/apache/arrow_next/cpp/src/generated/SparseTensor.fbs.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/reader.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/reader.h index f355b1df135e..51be4a5a8033 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/reader.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/reader.h @@ -26,16 +26,16 @@ #include #include -#include "arrow/io/caching.h" -#include "arrow/io/type_fwd.h" -#include "arrow/ipc/message.h" -#include "arrow/ipc/options.h" -#include "arrow/record_batch.h" -#include "arrow/result.h" -#include "arrow/type_fwd.h" -#include "arrow/util/async_generator.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/caching.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/message.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_generator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace ipc { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/reader_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/reader_internal.h index afa79c3c06bd..71f04e6597a8 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/reader_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/reader_internal.h @@ -21,9 +21,9 @@ #include #include -#include "arrow/io/type_fwd.h" -#include "arrow/result.h" -#include "arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" namespace arrow20 { namespace io { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/writer.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/writer.cc index 88c70255d598..d99fb10d0d8f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/writer.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/writer.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/ipc/writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/writer.h" #include #include @@ -30,35 +30,35 @@ #include #include -#include "arrow/array.h" -#include "arrow/buffer.h" -#include "arrow/device.h" -#include "arrow/extension_type.h" -#include "arrow/io/interfaces.h" -#include "arrow/io/memory.h" -#include "arrow/ipc/dictionary.h" -#include "arrow/ipc/message.h" -#include "arrow/ipc/metadata_internal.h" -#include "arrow/ipc/util.h" -#include "arrow/record_batch.h" -#include "arrow/result.h" -#include "arrow/sparse_tensor.h" -#include "arrow/status.h" -#include "arrow/table.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/compression.h" -#include "arrow/util/endian.h" -#include "arrow/util/int_util_overflow.h" -#include "arrow/util/key_value_metadata.h" -#include "arrow/util/logging.h" -#include "arrow/util/parallel.h" -#include "arrow/visit_array_inline.h" -#include "arrow/visit_data_inline.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/device.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/memory.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/dictionary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/message.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/metadata_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/sparse_tensor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/parallel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_array_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_data_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/writer.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/writer.h index f7260a7917c7..de2f9f6a011e 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/writer.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/writer.h @@ -24,12 +24,12 @@ #include #include -#include "arrow/ipc/dictionary.h" // IWYU pragma: export -#include "arrow/ipc/message.h" -#include "arrow/ipc/options.h" -#include "arrow/result.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/dictionary.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/message.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/chunked_builder.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/chunked_builder.cc index 5239e902b258..354752af0bb9 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/chunked_builder.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/chunked_builder.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/json/chunked_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/chunked_builder.h" #include #include @@ -23,13 +23,13 @@ #include #include -#include "arrow/array.h" -#include "arrow/buffer.h" -#include "arrow/json/converter.h" -#include "arrow/table.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/logging.h" -#include "arrow/util/task_group.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/converter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/task_group.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/chunked_builder.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/chunked_builder.h index 34063685ad32..11f8eff6790f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/chunked_builder.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/chunked_builder.h @@ -21,10 +21,10 @@ #include #include -#include "arrow/status.h" -#include "arrow/type_fwd.h" -#include "arrow/util/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace json { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/chunker.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/chunker.cc index 0e4035d1a10c..7830ae4d47eb 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/chunker.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/chunker.cc @@ -15,19 +15,19 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/json/chunker.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/chunker.h" #include #include #include #include -#include "arrow/json/rapidjson_defs.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/rapidjson_defs.h" #include "rapidjson/reader.h" -#include "arrow/buffer.h" -#include "arrow/json/options.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/chunker.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/chunker.h index e2ced4cafe3b..ec78bae62afc 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/chunker.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/chunker.h @@ -20,9 +20,9 @@ #include -#include "arrow/util/delimiting.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/delimiting.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace json { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/converter.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/converter.cc index fc4b3763f975..536521ff1dec 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/converter.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/converter.cc @@ -15,23 +15,23 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/json/converter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/converter.h" #include #include #include -#include "arrow/array.h" -#include "arrow/array/builder_binary.h" -#include "arrow/array/builder_decimal.h" -#include "arrow/array/builder_primitive.h" -#include "arrow/array/builder_time.h" -#include "arrow/json/parser.h" -#include "arrow/type.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/decimal.h" -#include "arrow/util/logging.h" -#include "arrow/util/value_parsing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_binary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_time.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/parser.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/value_parsing.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/converter.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/converter.h index b42763a41840..8938b40a0b64 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/converter.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/converter.h @@ -21,9 +21,9 @@ #include #include -#include "arrow/status.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/object_parser.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/object_parser.cc index 1ac863b9743e..0333c3b6be85 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/object_parser.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/object_parser.cc @@ -15,8 +15,8 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/json/object_parser.h" -#include "arrow/json/rapidjson_defs.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/object_parser.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/rapidjson_defs.h" // IWYU pragma: keep #include diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/object_parser.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/object_parser.h index 475b55878d6b..3fc535b4c262 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/object_parser.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/object_parser.h @@ -22,8 +22,8 @@ #include #include -#include "arrow/result.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace json { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/object_writer.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/object_writer.cc index 9d54b800102d..27f319583df4 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/object_writer.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/object_writer.cc @@ -15,8 +15,8 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/json/object_writer.h" -#include "arrow/json/rapidjson_defs.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/object_writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/rapidjson_defs.h" // IWYU pragma: keep #include #include diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/object_writer.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/object_writer.h index dc27318af048..ba98c392c685 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/object_writer.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/object_writer.h @@ -22,7 +22,7 @@ #include #include -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace json { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/options.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/options.cc index 0c151a8830fc..4e0a0476ba9a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/options.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/options.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/json/options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/options.h" namespace arrow20 { namespace json { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/options.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/options.h index 7143546e0a05..1498e7aad000 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/options.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/options.h @@ -21,8 +21,8 @@ #include #include -#include "arrow/json/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/parser.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/parser.cc index 49aae62bf462..236796fcd2a1 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/parser.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/parser.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/json/parser.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/parser.h" #include #include @@ -27,19 +27,19 @@ #include #include -#include "arrow/json/rapidjson_defs.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/rapidjson_defs.h" #include "rapidjson/error/en.h" #include "rapidjson/reader.h" -#include "arrow/array.h" -#include "arrow/array/builder_binary.h" -#include "arrow/buffer_builder.h" -#include "arrow/type.h" -#include "arrow/util/bitset_stack.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/logging.h" -#include "arrow/util/trie.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_binary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitset_stack.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/trie.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/parser.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/parser.h index 8ac1673a9f5e..b6022d62d112 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/parser.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/parser.h @@ -21,11 +21,11 @@ #include #include -#include "arrow/json/options.h" -#include "arrow/status.h" -#include "arrow/util/key_value_metadata.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/reader.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/reader.cc index 3b63c2683f7d..14edcc88e77d 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/reader.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/reader.cc @@ -15,27 +15,27 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/json/reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/reader.h" #include #include #include -#include "arrow/array.h" -#include "arrow/buffer.h" -#include "arrow/io/interfaces.h" -#include "arrow/json/chunked_builder.h" -#include "arrow/json/chunker.h" -#include "arrow/json/converter.h" -#include "arrow/json/parser.h" -#include "arrow/record_batch.h" -#include "arrow/table.h" -#include "arrow/util/async_generator.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/iterator.h" -#include "arrow/util/logging.h" -#include "arrow/util/task_group.h" -#include "arrow/util/thread_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/chunked_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/chunker.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/converter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/parser.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_generator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/iterator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/task_group.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/thread_pool.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/reader.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/reader.h index e6d08ad51a8d..9393d524cb1a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/json/reader.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/json/reader.h @@ -20,14 +20,14 @@ #include -#include "arrow/io/type_fwd.h" -#include "arrow/json/options.h" -#include "arrow/record_batch.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/macros.h" -#include "arrow/util/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/json/options.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace json { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.cc index 73901cc94bc4..2d8e93378add 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/memory_pool_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool_internal.h" #include // IWYU pragma: keep #include @@ -31,19 +31,19 @@ # include #endif -#include "arrow/buffer.h" -#include "arrow/io/util_internal.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/config.h" -#include "arrow/util/debug.h" -#include "arrow/util/int_util_overflow.h" -#include "arrow/util/io_util.h" -#include "arrow/util/logging.h" // IWYU pragma: keep -#include "arrow/util/string.h" -#include "arrow/util/thread_pool.h" -#include "arrow/util/ubsan.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/debug.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/io_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/thread_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" #ifdef __GLIBC__ # include diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h index cafbe1c30742..857a587e7b54 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h @@ -24,10 +24,10 @@ #include #include -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool_internal.h index 07e4e3c21332..79fbd3baa0b9 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool_internal.h @@ -18,8 +18,8 @@ #pragma once -#include "arrow/memory_pool.h" -#include "arrow/util/config.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/pretty_print.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/pretty_print.cc index f698f2040a05..4c144ebf1332 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/pretty_print.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/pretty_print.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/pretty_print.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/pretty_print.h" #include #include @@ -30,20 +30,20 @@ #include #include -#include "arrow/array.h" -#include "arrow/chunked_array.h" -#include "arrow/record_batch.h" -#include "arrow/status.h" -#include "arrow/table.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/formatting.h" -#include "arrow/util/int_util_overflow.h" -#include "arrow/util/key_value_metadata.h" -#include "arrow/util/string.h" -#include "arrow/vendored/datetime.h" -#include "arrow/visit_array_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/formatting.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/datetime.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_array_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/pretty_print.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/pretty_print.h index eb5881f2e141..f72267a8fb8d 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/pretty_print.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/pretty_print.h @@ -22,7 +22,7 @@ #include #include -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.cc index 722a19076358..9277acc99a9b 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" #include #include @@ -26,23 +26,23 @@ #include #include -#include "arrow/array.h" -#include "arrow/array/builder_binary.h" -#include "arrow/array/builder_dict.h" -#include "arrow/array/builder_nested.h" -#include "arrow/array/builder_union.h" -#include "arrow/array/concatenate.h" -#include "arrow/array/validate.h" -#include "arrow/c/abi.h" -#include "arrow/pretty_print.h" -#include "arrow/status.h" -#include "arrow/table.h" -#include "arrow/tensor.h" -#include "arrow/type.h" -#include "arrow/util/iterator.h" -#include "arrow/util/logging.h" -#include "arrow/util/vector.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_binary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_dict.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_union.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/concatenate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/validate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/c/abi.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/pretty_print.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/tensor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/iterator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h index 1f214d42a5f5..02d379b05877 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h @@ -23,14 +23,14 @@ #include #include -#include "arrow/compare.h" -#include "arrow/device.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type_fwd.h" -#include "arrow/util/iterator.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compare.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/device.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/iterator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/result.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/result.cc index c2885739005c..b72b4748afd5 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/result.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/result.cc @@ -15,12 +15,12 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" #include -#include "arrow/status_internal.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/result.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/result.h index 797b1d82bec0..55e838083d44 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/result.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/result.h @@ -25,9 +25,9 @@ #include #include -#include "arrow/status.h" -#include "arrow/util/aligned_storage.h" -#include "arrow/util/compare.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/aligned_storage.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compare.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.cc index b27e7e58c560..451019046167 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" #include #include @@ -23,23 +23,23 @@ #include #include -#include "arrow/array.h" -#include "arrow/array/util.h" -#include "arrow/buffer.h" -#include "arrow/compare.h" -#include "arrow/pretty_print.h" -#include "arrow/type.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/decimal.h" -#include "arrow/util/formatting.h" -#include "arrow/util/hashing.h" -#include "arrow/util/logging.h" -#include "arrow/util/time.h" -#include "arrow/util/unreachable.h" -#include "arrow/util/utf8.h" -#include "arrow/util/value_parsing.h" -#include "arrow/visit_scalar_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compare.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/pretty_print.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/formatting.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/hashing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/time.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/unreachable.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/utf8.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/value_parsing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_scalar_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h index 926e1177bc78..66133cabe602 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h @@ -29,17 +29,17 @@ #include #include -#include "arrow/compare.h" -#include "arrow/extension_type.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_fwd.h" -#include "arrow/type_traits.h" -#include "arrow/util/compare.h" -#include "arrow/util/decimal.h" -#include "arrow/util/visibility.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compare.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compare.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/sparse_tensor.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/sparse_tensor.cc index 41d678afe5f9..3f2da0f0301e 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/sparse_tensor.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/sparse_tensor.cc @@ -15,19 +15,19 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/sparse_tensor.h" -#include "arrow/tensor/converter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/sparse_tensor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/converter.h" #include #include #include #include -#include "arrow/compare.h" -#include "arrow/type_traits.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/logging.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compare.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/sparse_tensor.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/sparse_tensor.h index 9b0e56574e71..000fe951e306 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/sparse_tensor.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/sparse_tensor.h @@ -25,15 +25,15 @@ #include #include -#include "arrow/buffer.h" -#include "arrow/compare.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/tensor.h" // IWYU pragma: export -#include "arrow/type.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compare.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/tensor.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/status.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/status.cc index 832da78a543a..8b102c935dd1 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/status.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/status.cc @@ -10,7 +10,7 @@ // non-const method, all threads accessing the same Status must use // external synchronization. -#include "arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" #include #include @@ -19,7 +19,7 @@ # include #endif -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/status.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/status.h index e296d7febb58..172a4e3a9ae8 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/status.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/status.h @@ -21,10 +21,10 @@ #include #include -#include "arrow/util/compare.h" -#include "arrow/util/macros.h" -#include "arrow/util/string_builder.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compare.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" #ifdef ARROW_EXTRA_ERROR_CONTEXT diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/status_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/status_internal.h index 32b0505a114f..2da12b73cfdd 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/status_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/status_internal.h @@ -18,8 +18,8 @@ #pragma once -#include "arrow/status.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/stl_allocator.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/stl_allocator.h index 1e69b99f68e0..7e5e16c2a1d9 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/stl_allocator.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/stl_allocator.h @@ -24,9 +24,9 @@ #include #include -#include "arrow/memory_pool.h" -#include "arrow/type_fwd.h" -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" namespace arrow20 { namespace stl { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/stl_iterator.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/stl_iterator.h index aea7f500d641..a0391f34e471 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/stl_iterator.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/stl_iterator.h @@ -24,11 +24,11 @@ #include #include -#include "arrow/chunked_array.h" -#include "arrow/type.h" -#include "arrow/type_fwd.h" -#include "arrow/type_traits.h" -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" namespace arrow20 { namespace stl { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/table.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/table.cc index e05cddc70dbd..d82fe27a0405 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/table.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/table.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/table.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" #include #include @@ -24,23 +24,23 @@ #include #include -#include "arrow/array/array_base.h" -#include "arrow/array/array_binary.h" -#include "arrow/array/array_nested.h" -#include "arrow/array/concatenate.h" -#include "arrow/array/util.h" -#include "arrow/chunked_array.h" -#include "arrow/compute/cast.h" -#include "arrow/pretty_print.h" -#include "arrow/record_batch.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_fwd.h" -#include "arrow/type_traits.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/logging.h" -#include "arrow/util/vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_binary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/concatenate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/pretty_print.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/vector.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/table.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/table.h index 3234b9a6712b..6a53f4f100ed 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/table.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/table.h @@ -23,13 +23,13 @@ #include #include -#include "arrow/chunked_array.h" // IWYU pragma: keep -#include "arrow/record_batch.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_fwd.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/table_builder.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/table_builder.cc index 311c30eca1bb..795be00ccd7f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/table_builder.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/table_builder.cc @@ -15,17 +15,17 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/table_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table_builder.h" #include #include -#include "arrow/array/array_base.h" -#include "arrow/array/builder_base.h" -#include "arrow/record_batch.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/table_builder.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/table_builder.h index 1e2e67a787d3..dc3b0ce3b516 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/table_builder.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/table_builder.h @@ -22,12 +22,12 @@ #include #include -#include "arrow/array/builder_base.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_base.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor.cc index 68fcbead4554..d69c14ddeb20 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/tensor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/tensor.h" #include #include @@ -28,15 +28,15 @@ #include #include -#include "arrow/record_batch.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/int_util_overflow.h" -#include "arrow/util/logging.h" -#include "arrow/util/unreachable.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/unreachable.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor.h index b077a2772dd4..5c434a069bb5 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor.h @@ -23,14 +23,14 @@ #include #include -#include "arrow/buffer.h" -#include "arrow/compare.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compare.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/converter.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/converter.h index 4818ccc30f2c..e285c95245e8 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/converter.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/converter.h @@ -18,7 +18,7 @@ #pragma once -#include "arrow/sparse_tensor.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/sparse_tensor.h" // IWYU pragma: export #include diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/converter_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/converter_internal.h index 1b9d960178bb..ef6e549fd737 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/converter_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/converter_internal.h @@ -18,7 +18,7 @@ #pragma once -#include "arrow/tensor/converter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/converter.h" #define DISPATCH(ACTION, index_elsize, value_elsize, ...) \ switch (index_elsize) { \ diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/coo_converter.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/coo_converter.cc index a1ac8be1e607..8f946ba45fe0 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/coo_converter.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/coo_converter.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/tensor/converter_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/converter_internal.h" #include #include @@ -23,12 +23,12 @@ #include #include -#include "arrow/buffer.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/macros.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/csf_converter.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/csf_converter.cc index 215ad90eb0dd..09ca1d87f47c 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/csf_converter.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/csf_converter.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/tensor/converter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/converter.h" #include #include @@ -23,14 +23,14 @@ #include #include -#include "arrow/buffer.h" -#include "arrow/buffer_builder.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/sort.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/sort.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/csx_converter.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/csx_converter.cc index 22dd618a98f2..4b4d98e89a4a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/csx_converter.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/csx_converter.cc @@ -15,18 +15,18 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/tensor/converter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/tensor/converter.h" #include #include #include #include -#include "arrow/buffer.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/util/checked_cast.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/type.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/type.cc index 4c4cf2b2677d..b862f0351f23 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/type.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/type.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" #include #include @@ -32,23 +32,23 @@ #include #include -#include "arrow/array.h" -#include "arrow/compare.h" -#include "arrow/record_batch.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/table.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/decimal.h" -#include "arrow/util/hash_util.h" -#include "arrow/util/hashing.h" -#include "arrow/util/key_value_metadata.h" -#include "arrow/util/logging.h" -#include "arrow/util/range.h" -#include "arrow/util/string.h" -#include "arrow/util/unreachable.h" -#include "arrow/util/vector.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compare.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/hash_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/hashing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/range.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/unreachable.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/type.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/type.h index d8e21987ec55..424181db9f4e 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/type.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/type.h @@ -30,13 +30,13 @@ #include #include -#include "arrow/result.h" -#include "arrow/type_fwd.h" // IWYU pragma: export -#include "arrow/util/checked_cast.h" -#include "arrow/util/endian.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" -#include "arrow/visitor.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visitor.h" // IWYU pragma: keep namespace arrow20 { namespace detail { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h index 121987116862..10e3b4126f25 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h @@ -23,8 +23,8 @@ #include #include -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.cc index 7c6eb536d783..9410a3c23050 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.cc @@ -15,9 +15,9 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h index 60d4d85332b2..b17ddd5b45a7 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h @@ -23,8 +23,8 @@ #include #include -#include "arrow/type.h" -#include "arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/algorithm.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/algorithm.h index 299c8342098d..984b0a768925 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/algorithm.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/algorithm.h @@ -18,7 +18,7 @@ #pragma once -#include "arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/align_util.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/align_util.cc index 62869366e827..33ba151484e2 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/align_util.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/align_util.cc @@ -15,16 +15,16 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/align_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/align_util.h" -#include "arrow/array.h" -#include "arrow/chunked_array.h" -#include "arrow/record_batch.h" -#include "arrow/table.h" -#include "arrow/type_fwd.h" -#include "arrow/type_traits.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/align_util.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/align_util.h index b8b5b4b0e405..630c2c413a21 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/align_util.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/align_util.h @@ -20,9 +20,9 @@ #include -#include "arrow/memory_pool.h" -#include "arrow/type_fwd.h" -#include "arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/aligned_storage.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/aligned_storage.h index 5f122ef221bd..859ed3e553c6 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/aligned_storage.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/aligned_storage.h @@ -22,8 +22,8 @@ #include #include -#include "arrow/util/launder.h" -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/launder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_generator.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_generator.h index eb29e3dcf098..4d9b378ca50e 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_generator.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_generator.h @@ -26,15 +26,15 @@ #include #include -#include "arrow/util/async_generator_fwd.h" -#include "arrow/util/async_util.h" -#include "arrow/util/functional.h" -#include "arrow/util/future.h" -#include "arrow/util/io_util.h" -#include "arrow/util/iterator.h" -#include "arrow/util/mutex.h" -#include "arrow/util/queue.h" -#include "arrow/util/thread_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_generator_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/functional.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/io_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/iterator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/mutex.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/queue.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/thread_pool.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_generator_fwd.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_generator_fwd.h index c6d7229e1208..3b3ecacf7952 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_generator_fwd.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_generator_fwd.h @@ -20,8 +20,8 @@ #include -#include "arrow/type_fwd.h" -#include "arrow/util/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/type_fwd.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_util.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_util.cc index 1c6664f2fe48..3aae51c9397b 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_util.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_util.cc @@ -15,12 +15,12 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/async_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_util.h" -#include "arrow/util/future.h" -#include "arrow/util/logging.h" -#include "arrow/util/string.h" -#include "arrow/util/tracing_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/tracing_internal.h" #include #include diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_util.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_util.h index 397248829c01..cf5eec051580 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_util.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_util.h @@ -23,15 +23,15 @@ #include #include -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/cancel.h" -#include "arrow/util/functional.h" -#include "arrow/util/future.h" -#include "arrow/util/iterator.h" -#include "arrow/util/mutex.h" -#include "arrow/util/thread_pool.h" -#include "arrow/util/tracing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/cancel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/functional.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/iterator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/mutex.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/thread_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/tracing.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/atfork_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/atfork_internal.cc index 525c28b1298f..2a639216bd14 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/atfork_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/atfork_internal.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/atfork_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/atfork_internal.h" #include #include @@ -26,8 +26,8 @@ # include #endif -#include "arrow/util/io_util.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/io_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/atfork_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/atfork_internal.h index d5755662a3e6..7af1df41959a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/atfork_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/atfork_internal.h @@ -23,7 +23,7 @@ #include #include -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/base64.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/base64.h index 0cf9af893f62..7e8e1c526e6e 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/base64.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/base64.h @@ -21,7 +21,7 @@ #include #include -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/basic_decimal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/basic_decimal.cc index 56c88bd92769..4b7d613aed7a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/basic_decimal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/basic_decimal.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/basic_decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/basic_decimal.h" #include #include @@ -27,14 +27,14 @@ #include #include -#include "arrow/util/bit_util.h" -#include "arrow/util/config.h" // for ARROW_USE_NATIVE_INT128 -#include "arrow/util/decimal_internal.h" -#include "arrow/util/endian.h" -#include "arrow/util/int128_internal.h" -#include "arrow/util/int_util_overflow.h" -#include "arrow/util/logging.h" -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" // for ARROW_USE_NATIVE_INT128 +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int128_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/basic_decimal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/basic_decimal.h index 5d1997ea4753..4f1f35571552 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/basic_decimal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/basic_decimal.h @@ -26,10 +26,10 @@ #include #include -#include "arrow/util/endian.h" -#include "arrow/util/macros.h" -#include "arrow/util/type_traits.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/binary_view_util.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/binary_view_util.h index 16dddb404648..7052b2e202f9 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/binary_view_util.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/binary_view_util.h @@ -21,8 +21,8 @@ #include #include -#include "arrow/type.h" -#include "arrow/util/span.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/span.h" namespace arrow20::util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.cc index 5aa4b01f8654..68a0bacd3add 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.cc @@ -15,14 +15,14 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/bit_block_counter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h" #include #include #include -#include "arrow/buffer.h" -#include "arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h index bff966b1f374..18a1b15872e9 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h @@ -23,13 +23,13 @@ #include #include -#include "arrow/buffer.h" -#include "arrow/status.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/endian.h" -#include "arrow/util/macros.h" -#include "arrow/util/ubsan.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.cc index 4f7889b06c52..cfccf8368bd4 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.cc @@ -15,11 +15,11 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" #include -#include "arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h index 05ef47d15ba6..19a95ea30fdb 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h @@ -23,11 +23,11 @@ #include #include -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_reader.h" -#include "arrow/util/endian.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_stream_utils_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_stream_utils_internal.h index 737645274ba4..7531e58fc15d 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_stream_utils_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_stream_utils_internal.h @@ -24,11 +24,11 @@ #include #include -#include "arrow/util/bit_util.h" -#include "arrow/util/bpacking.h" -#include "arrow/util/logging.h" -#include "arrow/util/macros.h" -#include "arrow/util/ubsan.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bpacking.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" namespace arrow20 { namespace bit_util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.cc index edfb72cb6810..f4cbaf8ce3f3 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.cc @@ -15,12 +15,12 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" #include #include -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { namespace bit_util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h index 1d070f637c9e..6e1f32bf3575 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h @@ -35,8 +35,8 @@ #include #include -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace detail { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap.cc index d6dae7997d58..669840a5ae7f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap.cc @@ -15,17 +15,17 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/bitmap.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap.h" #include #include #include #include -#include "arrow/array/array_primitive.h" -#include "arrow/buffer.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap.h index b63064793d4b..25360119578c 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap.h @@ -29,17 +29,17 @@ #include #include -#include "arrow/buffer.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/bitmap_reader.h" -#include "arrow/util/bitmap_writer.h" -#include "arrow/util/compare.h" -#include "arrow/util/endian.h" -#include "arrow/util/functional.h" -#include "arrow/util/span.h" -#include "arrow/util/string_builder.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compare.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/functional.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/span.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_builders.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_builders.cc index 3063f0872507..06cfddb00260 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_builders.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_builders.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/bitmap_builders.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_builders.h" #include #include @@ -23,10 +23,10 @@ #include #include -#include "arrow/buffer.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_builders.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_builders.h index 9d5f7331ba8a..fb4f67613b8e 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_builders.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_builders.h @@ -22,10 +22,10 @@ #include #include -#include "arrow/result.h" -#include "arrow/type_fwd.h" -#include "arrow/util/span.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/span.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_generate.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_generate.h index ea9efd7fda02..521985f3eb79 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_generate.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_generate.h @@ -21,11 +21,11 @@ #include #include -#include "arrow/buffer.h" -#include "arrow/memory_pool.h" -#include "arrow/result.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.cc index 07287a0c85f3..9849dba8367a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.cc @@ -15,21 +15,21 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" #include #include #include #include -#include "arrow/buffer.h" -#include "arrow/result.h" -#include "arrow/util/align_util.h" -#include "arrow/util/bit_block_counter.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_reader.h" -#include "arrow/util/bitmap_writer.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/align_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h index 61bfb804d964..4fe20f446b39 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h @@ -21,8 +21,8 @@ #include #include -#include "arrow/result.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_reader.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_reader.h index 6444f90a731e..213f2ae1ab25 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_reader.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_reader.h @@ -22,10 +22,10 @@ #include #include -#include "arrow/buffer.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/endian.h" -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_visit.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_visit.h index b7017866ae56..8c9eeff26ebb 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_visit.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_visit.h @@ -20,8 +20,8 @@ #include -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_reader.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_writer.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_writer.h index 458582099f3c..e05a48862d9b 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_writer.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_writer.h @@ -21,9 +21,9 @@ #include #include -#include "arrow/util/bit_util.h" -#include "arrow/util/endian.h" -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitset_stack.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitset_stack.h index cf6ed7281f78..1bd280a344eb 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitset_stack.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitset_stack.h @@ -31,17 +31,17 @@ #include #include -#include "arrow/buffer.h" -#include "arrow/memory_pool.h" -#include "arrow/result.h" -#include "arrow/type_fwd.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/compare.h" -#include "arrow/util/functional.h" -#include "arrow/util/macros.h" -#include "arrow/util/string_builder.h" -#include "arrow/util/type_traits.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compare.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/functional.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bpacking.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bpacking.cc index ad917f840db5..ee72ed29d8a4 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bpacking.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bpacking.cc @@ -15,13 +15,13 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/bpacking.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bpacking.h" -#include "arrow/util/bpacking64_default.h" -#include "arrow/util/bpacking_default.h" -#include "arrow/util/cpu_info.h" -#include "arrow/util/dispatch.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bpacking64_default.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bpacking_default.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/cpu_info.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/dispatch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" #if defined(ARROW_HAVE_RUNTIME_AVX2) # error #include "arrow/util/bpacking_avx2.h" diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bpacking.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bpacking.h index 8ff75f7778fd..1995b900a68c 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bpacking.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bpacking.h @@ -18,8 +18,8 @@ #pragma once -#include "arrow/util/endian.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" #include diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bpacking64_default.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bpacking64_default.h index f066e099ee34..d62205bfdd1d 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bpacking64_default.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bpacking64_default.h @@ -27,8 +27,8 @@ #pragma once -#include "arrow/util/bit_util.h" -#include "arrow/util/ubsan.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bpacking_default.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bpacking_default.h index 96ba14c1db55..ba827d295ba1 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bpacking_default.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/bpacking_default.h @@ -27,8 +27,8 @@ #pragma once -#include "arrow/util/bit_util.h" -#include "arrow/util/ubsan.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/byte_size.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/byte_size.cc index c13170b2f942..432cf3d35599 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/byte_size.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/byte_size.cc @@ -15,20 +15,20 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/byte_size.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/byte_size.h" #include #include -#include "arrow/array.h" -#include "arrow/array/builder_primitive.h" -#include "arrow/buffer.h" -#include "arrow/chunked_array.h" -#include "arrow/record_batch.h" -#include "arrow/table.h" -#include "arrow/util/logging.h" -#include "arrow/util/ree_util.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ree_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/byte_size.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/byte_size.h index 5dd510920e15..5edfedb1b06a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/byte_size.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/byte_size.h @@ -20,7 +20,7 @@ #include -#include "arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/byte_stream_split_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/byte_stream_split_internal.h index 24a090afa691..c8e55e6ada06 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/byte_stream_split_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/byte_stream_split_internal.h @@ -18,10 +18,10 @@ #pragma once -#include "arrow/util/endian.h" -#include "arrow/util/simd.h" -#include "arrow/util/small_vector.h" -#include "arrow/util/ubsan.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/simd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/small_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" #include #include diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/cancel.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/cancel.cc index cabe98fe57b1..4e61faec81fd 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/cancel.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/cancel.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/cancel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/cancel.h" #include #include @@ -23,12 +23,12 @@ #include #include -#include "arrow/result.h" -#include "arrow/util/atfork_internal.h" -#include "arrow/util/io_util.h" -#include "arrow/util/logging.h" -#include "arrow/util/mutex.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/atfork_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/io_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/mutex.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/cancel.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/cancel.h index a0a7519a37a5..436daa0d09d9 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/cancel.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/cancel.h @@ -23,10 +23,10 @@ #include #include -#include "arrow/status.h" -#include "arrow/type_fwd.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compare.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compare.h index 8d754c8e4041..91fb735824f5 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compare.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compare.h @@ -22,7 +22,7 @@ #include #include -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression.cc index 570219edfff0..47350aec3382 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression.cc @@ -15,17 +15,17 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/compression.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression.h" #include #include #include -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/compression_internal.h" -#include "arrow/util/config.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_internal.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression.h index e30a5f354205..1d4be79dd108 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression.h @@ -24,10 +24,10 @@ #include #include -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_brotli.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_brotli.cc index d52e4d80890e..05c330a5faae 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_brotli.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_brotli.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/compression_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_internal.h" #include #include @@ -25,10 +25,10 @@ #include #include -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/logging.h" -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_internal.h index cf8a1d20bd6e..1158c5056c67 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_internal.h @@ -20,7 +20,7 @@ #include -#include "arrow/util/compression.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression.h" // IWYU pragma: export namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_lz4.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_lz4.cc index b3b48688b1a2..b58f250cfb70 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_lz4.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_lz4.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/compression_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_internal.h" #include #include @@ -25,13 +25,13 @@ #include #include -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/endian.h" -#include "arrow/util/logging.h" -#include "arrow/util/macros.h" -#include "arrow/util/ubsan.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" #ifndef LZ4F_HEADER_SIZE_MAX # define LZ4F_HEADER_SIZE_MAX 19 diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_snappy.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_snappy.cc index be0965c053d0..fb3b5b1c4037 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_snappy.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_snappy.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/compression_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_internal.h" #include #include @@ -23,10 +23,10 @@ #include -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/logging.h" -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" using std::size_t; diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_zlib.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_zlib.cc index ca671c2c6b4e..3fa3bea6b5ee 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_zlib.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_zlib.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/compression_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_internal.h" #include #include @@ -26,10 +26,10 @@ #include #include -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/logging.h" -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_zstd.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_zstd.cc index caadfedd0bd5..dfa52705a417 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_zstd.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_zstd.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/compression_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression_internal.h" #include #include @@ -23,10 +23,10 @@ #include -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/logging.h" -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" using std::size_t; diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/counting_semaphore.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/counting_semaphore.cc index c298ff1fb8fd..c6a6b08b3091 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/counting_semaphore.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/counting_semaphore.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/counting_semaphore.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/counting_semaphore.h" #include #include @@ -23,7 +23,7 @@ #include #include -#include "arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/counting_semaphore.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/counting_semaphore.h index e5eb146e533d..5b6311d898de 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/counting_semaphore.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/counting_semaphore.h @@ -21,7 +21,7 @@ #include -#include "arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/cpu_info.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/cpu_info.cc index 7d833fcca572..0cb7324c5e6c 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/cpu_info.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/cpu_info.cc @@ -17,7 +17,7 @@ // From Apache Impala (incubating) as of 2016-01-29. -#include "arrow/util/cpu_info.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/cpu_info.h" #ifdef __APPLE__ # include @@ -30,7 +30,7 @@ #ifdef _WIN32 # include -# include "arrow/util/windows_compatibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/windows_compatibility.h" #endif #include @@ -45,10 +45,10 @@ #include #include -#include "arrow/result.h" -#include "arrow/util/io_util.h" -#include "arrow/util/logging.h" -#include "arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/io_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" #undef CPUINFO_ARCH_X86 #undef CPUINFO_ARCH_ARM diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/cpu_info.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/cpu_info.h index f39ec656eb30..c6077323e38a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/cpu_info.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/cpu_info.h @@ -25,8 +25,8 @@ #include #include -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/crc32.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/crc32.cc index 69d8529463b5..89dd211bc132 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/crc32.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/crc32.cc @@ -86,11 +86,11 @@ * https://github.com/cyrusimap/cyrus-imapd/blob/master/lib/crc32.c */ -#include "arrow/util/crc32.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/crc32.h" #include -#include "arrow/util/endian.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/crc32.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/crc32.h index 9a9f3ff4d1ad..319b59a02438 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/crc32.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/crc32.h @@ -19,7 +19,7 @@ #include #include -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/debug.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/debug.cc index 42ef687455f8..6c2ab2a63a40 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/debug.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/debug.cc @@ -15,12 +15,12 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/debug.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/debug.h" #include #include -#include "arrow/vendored/portable-snippets/debug-trap.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/portable-snippets/debug-trap.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/debug.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/debug.h index f5440650b235..584a8c19935e 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/debug.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/debug.h @@ -18,7 +18,7 @@ #pragma once -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.cc index d2c343aa90b8..e61b7dce933d 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.cc @@ -28,16 +28,16 @@ #include #include -#include "arrow/status.h" -#include "arrow/util/decimal.h" -#include "arrow/util/decimal_internal.h" -#include "arrow/util/endian.h" -#include "arrow/util/formatting.h" -#include "arrow/util/int128_internal.h" -#include "arrow/util/int_util_overflow.h" -#include "arrow/util/logging.h" -#include "arrow/util/macros.h" -#include "arrow/util/value_parsing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/formatting.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int128_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/value_parsing.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h index 093103899f5d..86a58e07e290 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h @@ -25,10 +25,10 @@ #include #include -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type_fwd.h" -#include "arrow/util/basic_decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/basic_decimal.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal_internal.h index e6a1be7c3ba8..bc6ffee66cf4 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal_internal.h @@ -23,11 +23,11 @@ #include #include -#include "arrow/type_fwd.h" -#include "arrow/util/basic_decimal.h" -#include "arrow/util/endian.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/basic_decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/delimiting.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/delimiting.cc index bc91f972fa60..62834c68c941 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/delimiting.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/delimiting.cc @@ -15,9 +15,9 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/delimiting.h" -#include "arrow/buffer.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/delimiting.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/delimiting.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/delimiting.h index 73dee9a83f66..d2451bb7c9fe 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/delimiting.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/delimiting.h @@ -22,9 +22,9 @@ #include #include -#include "arrow/status.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/dict_util.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/dict_util.cc index 1ab981a3653f..1775e83a2f05 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/dict_util.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/dict_util.cc @@ -15,10 +15,10 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/dict_util.h" -#include "arrow/array/array_dict.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/dict_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_dict.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" namespace arrow20 { namespace dict_util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/dict_util.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/dict_util.h index f569c3a1f34e..32af2d2392cd 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/dict_util.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/dict_util.h @@ -18,7 +18,7 @@ #pragma once -#include "arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" namespace arrow20 { namespace dict_util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/dispatch.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/dispatch.h index d0332d1f4a7d..47797907569c 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/dispatch.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/dispatch.h @@ -21,8 +21,8 @@ #include #include -#include "arrow/status.h" -#include "arrow/util/cpu_info.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/cpu_info.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h index bdaefb9f6103..4b178b02096a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h @@ -56,8 +56,8 @@ #include #include -#include "arrow/util/type_traits.h" -#include "arrow/util/ubsan.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" namespace arrow20 { namespace bit_util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/fixed_width_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/fixed_width_internal.cc index 1778ad1366bc..b1e745e10053 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/fixed_width_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/fixed_width_internal.cc @@ -19,14 +19,14 @@ #include #include -#include "arrow/array/data.h" -#include "arrow/compute/kernel.h" -#include "arrow/result.h" -#include "arrow/type.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/fixed_width_internal.h" -#include "arrow/util/logging.h" -#include "arrow/util/small_vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/kernel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/fixed_width_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/small_vector.h" namespace arrow20::util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/fixed_width_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/fixed_width_internal.h index 83c56ee0db7a..d3aabb360e9a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/fixed_width_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/fixed_width_internal.h @@ -20,10 +20,10 @@ #include -#include "arrow/array/data.h" -#include "arrow/type.h" -#include "arrow/type_fwd.h" -#include "arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" namespace arrow20::compute { // XXX: remove dependency on compute::KernelContext diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/float16.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/float16.cc index 110d32436a2b..1d178fd63fab 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/float16.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/float16.cc @@ -18,8 +18,8 @@ #include #include -#include "arrow/util/float16.h" -#include "arrow/util/ubsan.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/float16.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/float16.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/float16.h index 4375e1888b2c..050377839fa6 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/float16.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/float16.h @@ -25,10 +25,10 @@ #include #include -#include "arrow/util/endian.h" -#include "arrow/util/macros.h" -#include "arrow/util/ubsan.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/formatting.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/formatting.cc index ba2bd6172c44..aeb7d7ff220e 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/formatting.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/formatting.cc @@ -15,11 +15,11 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/formatting.h" -#include "arrow/util/config.h" -#include "arrow/util/double_conversion.h" -#include "arrow/util/float16.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/formatting.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/double_conversion.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/float16.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/formatting.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/formatting.h index 3ee5f7028bc0..58d024261201 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/formatting.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/formatting.h @@ -30,15 +30,15 @@ #include #include -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/double_conversion.h" -#include "arrow/util/macros.h" -#include "arrow/util/string.h" -#include "arrow/util/time.h" -#include "arrow/util/visibility.h" -#include "arrow/vendored/datetime.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/double_conversion.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/time.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/datetime.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/functional.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/functional.h index 7f071ec2e4ce..3229297e9133 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/functional.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/functional.h @@ -22,8 +22,8 @@ #include #include -#include "arrow/result.h" -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.cc index 394da6006c6a..56d32c1dd303 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/future.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.h" #include #include @@ -24,11 +24,11 @@ #include #include -#include "arrow/util/checked_cast.h" -#include "arrow/util/config.h" -#include "arrow/util/logging.h" -#include "arrow/util/thread_pool.h" -#include "arrow/util/tracing_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/thread_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/tracing_internal.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.h index aec9534a326c..7ee0a111dfc9 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.h @@ -27,16 +27,16 @@ #include #include -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type_fwd.h" -#include "arrow/type_traits.h" -#include "arrow/util/config.h" -#include "arrow/util/functional.h" -#include "arrow/util/macros.h" -#include "arrow/util/tracing.h" -#include "arrow/util/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/functional.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/tracing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/hashing.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/hashing.cc index b3eef3312c48..5ee1e40c2930 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/hashing.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/hashing.cc @@ -15,10 +15,10 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/hashing.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_reader.h" -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/hashing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/hashing.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/hashing.h index 8fe979bf5995..aa086dc2f6e1 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/hashing.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/hashing.h @@ -32,18 +32,18 @@ #include #include -#include "arrow/array/builder_binary.h" -#include "arrow/buffer_builder.h" -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type_fwd.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_builders.h" -#include "arrow/util/endian.h" -#include "arrow/util/logging.h" -#include "arrow/util/macros.h" -#include "arrow/util/ubsan.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_binary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_builders.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" #define XXH_INLINE_ALL diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/int128_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/int128_internal.h index 2cd21754f64e..c45e5df1b9fa 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/int128_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/int128_internal.h @@ -17,8 +17,8 @@ // under the License. #pragma once -#include "arrow/util/config.h" -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" #ifndef ARROW_USE_NATIVE_INT128 # error #include diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util.cc index 3baaf04981b3..a1c3c5ad503f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util.cc @@ -15,25 +15,25 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/int_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util.h" #include #include #include -#include "arrow/array/data.h" -#include "arrow/datum.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_block_counter.h" -#include "arrow/util/bit_run_reader.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/logging.h" -#include "arrow/util/macros.h" -#include "arrow/util/string.h" -#include "arrow/util/ubsan.h" -#include "arrow/visit_type_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/datum.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util.h index 3f62473210d7..14db099ed4a8 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util.h @@ -21,9 +21,9 @@ #include #include -#include "arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h index b24940b8871b..73e9b26c522e 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h @@ -22,15 +22,15 @@ #include #include -#include "arrow/status.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" // "safe-math.h" includes from the Windows headers. -#include "arrow/util/windows_compatibility.h" -#include "arrow/vendored/portable-snippets/safe-math.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/windows_compatibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/portable-snippets/safe-math.h" // clang-format off (avoid include reordering) -#include "arrow/util/windows_fixup.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/windows_fixup.h" // clang-format on namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/io_util.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/io_util.cc index 81f4be4ba8fb..ba26a00c06c6 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/io_util.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/io_util.cc @@ -31,7 +31,7 @@ # define __EXTENSIONS__ #endif -#include "arrow/util/windows_compatibility.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/windows_compatibility.h" // IWYU pragma: keep #include #include @@ -68,7 +68,7 @@ #endif #ifdef _WIN32 -# include "arrow/io/mman.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/mman.h" # undef Realloc # undef Free #else // POSIX-like platforms @@ -91,18 +91,18 @@ #endif -#include "arrow/buffer.h" -#include "arrow/result.h" -#include "arrow/util/atfork_internal.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/config.h" -#include "arrow/util/io_util.h" -#include "arrow/util/logging.h" -#include "arrow/util/mutex.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/atfork_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/io_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/mutex.h" // For filename conversion #if defined(_WIN32) -# include "arrow/util/utf8.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/utf8.h" #endif #ifdef _WIN32 diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/io_util.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/io_util.h index 73876f480b78..9ddbd1cf4aaf 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/io_util.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/io_util.h @@ -33,11 +33,11 @@ # include // Needed for struct sigaction #endif -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type_fwd.h" -#include "arrow/util/macros.h" -#include "arrow/util/windows_fixup.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/windows_fixup.h" namespace arrow20::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/iterator.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/iterator.h index 07d595f50a4e..2db36c58f4a2 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/iterator.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/iterator.h @@ -27,13 +27,13 @@ #include #include -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/compare.h" -#include "arrow/util/functional.h" -#include "arrow/util/macros.h" -#include "arrow/util/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compare.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/functional.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.cc index 8a2638aef4d6..f524be9b7e10 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.cc @@ -26,11 +26,11 @@ #include #include -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/key_value_metadata.h" -#include "arrow/util/logging.h" -#include "arrow/util/sort.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/sort.h" using std::size_t; diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.h index 7c521e2b8eb4..002f3713341c 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.h @@ -26,10 +26,10 @@ #include #include -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/list_util.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/list_util.cc index 1b8e679ed572..fe0dbb931908 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/list_util.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/list_util.cc @@ -18,16 +18,16 @@ #include #include -#include "arrow/array/array_nested.h" -#include "arrow/array/builder_nested.h" -#include "arrow/array/data.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_run_reader.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/list_util.h" -#include "arrow/util/logging.h" -#include "arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_nested.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/list_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" namespace arrow20::list_util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/list_util.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/list_util.h index 8c3a88a54496..093448c336d6 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/list_util.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/list_util.h @@ -21,8 +21,8 @@ #include #include -#include "arrow/array/data.h" -#include "arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" namespace arrow20 { namespace list_util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/logger.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/logger.cc index 6182d56ac919..dc5ebcd9db2a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/logger.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/logger.cc @@ -20,7 +20,7 @@ #include #include -#include "arrow/util/logger.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logger.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/logger.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/logger.h index 6325878b2332..d051d37c0347 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/logger.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/logger.h @@ -23,11 +23,11 @@ #include #include -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/logging.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.cc index 537e1c21b184..f569d5936159 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.cc @@ -15,9 +15,9 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" -#include "arrow/util/config.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" #ifdef ARROW_WITH_BACKTRACE # include diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h index 64fd4c03242b..fabeedb22d48 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h @@ -40,8 +40,8 @@ # include # include -# include "arrow/util/macros.h" -# include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/math_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/math_internal.cc index 6f946214759b..3684931acb4c 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/math_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/math_internal.cc @@ -15,11 +15,11 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/math_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/math_internal.h" #include -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/math_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/math_internal.h index a649abefd2dc..379cd41bbd0f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/math_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/math_internal.h @@ -22,8 +22,8 @@ #include #include -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/memory.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/memory.cc index 34cf8fc4f609..de2c8eca3537 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/memory.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/memory.cc @@ -17,9 +17,9 @@ #include -#include "arrow/util/logging.h" -#include "arrow/util/memory.h" -#include "arrow/util/thread_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/memory.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/thread_pool.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/memory.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/memory.h index 9622092668da..c6dbbc83ea25 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/memory.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/memory.h @@ -21,7 +21,7 @@ #include #include -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/mutex.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/mutex.cc index 1e1f21b27994..da887d1bb2ed 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/mutex.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/mutex.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/mutex.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/mutex.h" #include @@ -24,8 +24,8 @@ # include #endif -#include "arrow/util/config.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/mutex.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/mutex.h index f3cb3bb688b5..a47d6026fe88 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/mutex.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/mutex.h @@ -20,8 +20,8 @@ #include -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/parallel.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/parallel.h index cf009dae2fee..708e61a1de87 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/parallel.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/parallel.h @@ -21,10 +21,10 @@ #include #include -#include "arrow/status.h" -#include "arrow/util/functional.h" -#include "arrow/util/thread_pool.h" -#include "arrow/util/vector.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/functional.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/thread_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/vector.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/pcg_random.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/pcg_random.h index 29148803f6fe..785c733990a3 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/pcg_random.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/pcg_random.h @@ -18,7 +18,7 @@ #pragma once -#include "arrow/vendored/pcg/pcg_random.hpp" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/pcg/pcg_random.hpp" // IWYU pragma: export namespace arrow20 { namespace random { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/print.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/print.h index d9a105000014..d82907cf38c0 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/print.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/print.h @@ -19,7 +19,7 @@ #pragma once #include -#include "arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" using arrow20::internal::ToChars; diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/queue.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/queue.h index 543069a0a5eb..4bbf5b3f75cb 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/queue.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/queue.h @@ -18,7 +18,7 @@ #pragma once -#include "arrow/vendored/ProducerConsumerQueue.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/ProducerConsumerQueue.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/ree_util.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/ree_util.cc index dee23b6d013e..e87c4d84dcb6 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/ree_util.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/ree_util.cc @@ -18,10 +18,10 @@ #include #include -#include "arrow/builder.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/logging.h" -#include "arrow/util/ree_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ree_util.h" namespace arrow20 { namespace ree_util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/ree_util.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/ree_util.h index 14494c2eab3a..4a24214d89e8 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/ree_util.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/ree_util.h @@ -22,10 +22,10 @@ #include #include -#include "arrow/array/data.h" -#include "arrow/type_traits.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" namespace arrow20 { namespace ree_util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/reflection_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/reflection_internal.h index a11715c1f5d6..59fdeab6410a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/reflection_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/reflection_internal.h @@ -23,7 +23,7 @@ #include #include -#include "arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/rle_encoding_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/rle_encoding_internal.h index fb16d9c86b3d..575327fa2f63 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/rle_encoding_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/rle_encoding_internal.h @@ -26,11 +26,11 @@ #include #include -#include "arrow/util/bit_block_counter.h" -#include "arrow/util/bit_run_reader.h" -#include "arrow/util/bit_stream_utils_internal.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_stream_utils_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/slice_util_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/slice_util_internal.h index b2613659fcf2..e563325b0061 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/slice_util_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/slice_util_internal.h @@ -18,7 +18,7 @@ #pragma once -#include "arrow/util/int_util_overflow.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/small_vector.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/small_vector.h index b03493ecbdf7..8bf6273100fd 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/small_vector.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/small_vector.h @@ -28,8 +28,8 @@ #include #include -#include "arrow/util/aligned_storage.h" -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/aligned_storage.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/spaced.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/spaced.h index a2b3942834fe..e44e86ffce8a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/spaced.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/spaced.h @@ -22,7 +22,7 @@ #include #include -#include "arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.cc index adc3995d2ab1..3f62319b1998 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.cc @@ -15,13 +15,13 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" #include #include #include -#include "arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h index da84f09b43c3..d8ffcc2176c6 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h @@ -30,8 +30,8 @@ # include #endif -#include "arrow/result.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/string_builder.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/string_builder.cc index 7da16309d56c..c4761363ef26 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/string_builder.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/string_builder.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/string_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string_builder.h" #include #include diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/string_builder.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/string_builder.h index a43973df0198..e25e85369372 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/string_builder.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/string_builder.h @@ -24,7 +24,7 @@ #include #include -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/task_group.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/task_group.cc index bc81c56c835b..9adc009de244 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/task_group.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/task_group.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/task_group.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/task_group.h" #include #include @@ -23,10 +23,10 @@ #include #include -#include "arrow/util/checked_cast.h" -#include "arrow/util/config.h" -#include "arrow/util/logging.h" -#include "arrow/util/thread_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/thread_pool.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/task_group.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/task_group.h index f39da55862d6..a595450c77e9 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/task_group.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/task_group.h @@ -21,13 +21,13 @@ #include #include -#include "arrow/status.h" -#include "arrow/type_fwd.h" -#include "arrow/util/cancel.h" -#include "arrow/util/functional.h" -#include "arrow/util/macros.h" -#include "arrow/util/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/cancel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/functional.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/tdigest.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/tdigest.cc index aa15850d5da9..81a6175fd64b 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/tdigest.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/tdigest.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/tdigest.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/tdigest.h" #include #include @@ -25,8 +25,8 @@ #include #include -#include "arrow/status.h" -#include "arrow/util/math_constants.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/math_constants.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/tdigest.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/tdigest.h index 8a62dded5546..285181ae0001 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/tdigest.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/tdigest.h @@ -27,9 +27,9 @@ #include #include -#include "arrow/util/logging.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/thread_pool.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/thread_pool.cc index c0a028035a46..c9a290c54a12 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/thread_pool.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/thread_pool.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/thread_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/thread_pool.h" #include #include @@ -26,13 +26,13 @@ #include #include -#include "arrow/util/atfork_internal.h" -#include "arrow/util/config.h" -#include "arrow/util/io_util.h" -#include "arrow/util/logging.h" -#include "arrow/util/mutex.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/atfork_internal.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/io_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/mutex.h" -#include "arrow/util/tracing_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/tracing_internal.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/thread_pool.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/thread_pool.h index 5794c6bd6616..7548e44a1566 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/thread_pool.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/thread_pool.h @@ -25,15 +25,15 @@ #include #include -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/util/cancel.h" -#include "arrow/util/config.h" -#include "arrow/util/functional.h" -#include "arrow/util/future.h" -#include "arrow/util/iterator.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/cancel.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/functional.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/iterator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" #if defined(_MSC_VER) // Disable harmless warning for decorated name length limit diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/time.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/time.cc index 85186d5c0be1..f2bbe583461e 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/time.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/time.cc @@ -17,9 +17,9 @@ #include -#include "arrow/type.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/time.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/time.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/time.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/time.h index 940d4be8129f..a0aaa764620b 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/time.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/time.h @@ -22,8 +22,8 @@ #include #include -#include "arrow/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/tracing.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/tracing.cc index 164ed90124d0..03b70a58ad37 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/tracing.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/tracing.cc @@ -15,10 +15,10 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/tracing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/tracing.h" -#include "arrow/util/config.h" -#include "arrow/util/tracing_internal.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/tracing_internal.h" #include diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/tracing.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/tracing.h index bc27c84bcb8f..cdf2884a2f7e 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/tracing.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/tracing.h @@ -20,7 +20,7 @@ #include -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/tracing_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/tracing_internal.h index 8f65ba4cfc46..0c1a2988c32f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/tracing_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/tracing_internal.h @@ -21,7 +21,7 @@ #include // Pick up ARROW_WITH_OPENTELEMETRY first -#include "arrow/util/config.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" #ifdef ARROW_WITH_OPENTELEMETRY # ifdef _MSC_VER @@ -35,11 +35,11 @@ # endif #endif -#include "arrow/memory_pool.h" -#include "arrow/util/async_generator.h" -#include "arrow/util/iterator.h" -#include "arrow/util/tracing.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_generator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/iterator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/tracing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/trie.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/trie.cc index e4ff5a87932d..236951bce3de 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/trie.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/trie.cc @@ -15,12 +15,12 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/trie.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/trie.h" #include #include -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/trie.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/trie.h index 19fcfeecf113..92e8fb4cc022 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/trie.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/trie.h @@ -28,9 +28,9 @@ #include #include -#include "arrow/status.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h index 7a66ecb45820..65ff6326527c 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h @@ -24,7 +24,7 @@ #include #include -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/union_util.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/union_util.cc index 7ed1d6aba016..77c94fdf2426 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/union_util.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/union_util.cc @@ -15,13 +15,13 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/union_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/union_util.h" #include -#include "arrow/array/data.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20::union_util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/union_util.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/union_util.h index a052dbc1b69b..cc8a226dd6ef 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/union_util.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/union_util.h @@ -17,7 +17,7 @@ // under the License. #include -#include "arrow/array/data.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/data.h" namespace arrow20 { namespace union_util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/unreachable.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/unreachable.cc index 2f2770a325ae..09f6c9467a30 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/unreachable.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/unreachable.cc @@ -15,9 +15,9 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/unreachable.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/unreachable.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" #include diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/unreachable.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/unreachable.h index b0f62110397a..7d764e8d139f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/unreachable.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/unreachable.h @@ -18,7 +18,7 @@ #pragma once -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" #include diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/uri.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/uri.cc index 9b2194f2a7e5..ea24b6f0ade3 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/uri.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/uri.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/uri.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/uri.h" #include #include @@ -23,8 +23,8 @@ #include #include -#include "arrow/util/logging.h" -#include "arrow/util/value_parsing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/value_parsing.h" #include "contrib/restricted/uriparser/include/uriparser/Uri.h" namespace arrow20::util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/uri.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/uri.h index 086359e2b910..9978ecf132c9 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/uri.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/uri.h @@ -25,8 +25,8 @@ #include #include -#include "arrow/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20::util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/utf8.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/utf8.cc index 1a9e040a927f..2b1a08013502 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/utf8.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/utf8.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/util/utf8.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/utf8.h" #include #include @@ -23,10 +23,10 @@ #include #include -#include "arrow/result.h" -#include "arrow/util/logging.h" -#include "arrow/util/utf8_internal.h" -#include "arrow/vendored/utfcpp/checked.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/utf8_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/utfcpp/checked.h" // Can be defined by utfcpp #ifdef NOEXCEPT diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/utf8.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/utf8.h index 5348bf46fa43..81bf9ae04c28 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/utf8.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/utf8.h @@ -23,9 +23,9 @@ #include #include -#include "arrow/type_fwd.h" -#include "arrow/util/macros.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/utf8_internal.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/utf8_internal.h index 35960a0c02fe..b44b3ba260e6 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/utf8_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/utf8_internal.h @@ -29,12 +29,12 @@ # error #include #endif -#include "arrow/type_fwd.h" -#include "arrow/util/macros.h" -#include "arrow/util/simd.h" -#include "arrow/util/ubsan.h" -#include "arrow/util/utf8.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/simd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/utf8.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { namespace util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/value_parsing.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/value_parsing.cc index 4b98736f3981..923626936899 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/value_parsing.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/value_parsing.cc @@ -17,12 +17,12 @@ #define FASTFLOAT_ALLOWS_LEADING_PLUS 1 -#include "arrow/util/value_parsing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/value_parsing.h" #include #include -#include "arrow/util/float16.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/float16.h" #include "contrib/restricted/fast_float/include/fast_float/fast_float.h" using arrow20::util::Float16; diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/value_parsing.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/value_parsing.h index 49635db12ce7..fca1dea09296 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/value_parsing.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/value_parsing.h @@ -29,15 +29,15 @@ #include #include -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/config.h" -#include "arrow/util/macros.h" -#include "arrow/util/time.h" -#include "arrow/util/visibility.h" -#include "arrow/vendored/datetime.h" -#include "arrow/vendored/strptime.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/src/arrow/util/config.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/time.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/datetime.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/strptime.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/vector.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/vector.h index 2396afe233c1..585e4347b4b3 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/vector.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/vector.h @@ -22,10 +22,10 @@ #include #include -#include "arrow/result.h" -#include "arrow/util/algorithm.h" -#include "arrow/util/functional.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/algorithm.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/functional.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/windows_compatibility.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/windows_compatibility.h index f7915e270f73..033a52fbcd9a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/util/windows_compatibility.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/util/windows_compatibility.h @@ -35,6 +35,6 @@ # include -# include "arrow/util/windows_fixup.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/windows_fixup.h" #endif // _WIN32 diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/base64.cpp b/contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/base64.cpp index 9daf033a6e7e..7986c4919103 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/base64.cpp +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/base64.cpp @@ -29,7 +29,7 @@ */ -#include "arrow/util/base64.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/base64.h" #include namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/datetime.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/datetime.h index 5cd6550da699..594845616b44 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/datetime.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/datetime.h @@ -18,9 +18,9 @@ #pragma once -#include "arrow/vendored/datetime/visibility.h" // IWYU pragma: export -#include "arrow/vendored/datetime/date.h" // IWYU pragma: export -#include "arrow/vendored/datetime/tz.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/datetime/visibility.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/datetime/date.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/datetime/tz.h" // IWYU pragma: export // Can be defined by date.h. #ifdef NOEXCEPT diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/musl/strptime.c b/contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/musl/strptime.c index 45d01948b998..4a70febe9624 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/musl/strptime.c +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/musl/strptime.c @@ -1,7 +1,7 @@ // Vendored from musl git commit 593caa456309714402ca4cb77c3770f4c24da9da // + adaptations -#include "arrow/vendored/strptime.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/strptime.h" #include #include diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/strptime.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/strptime.h index a29d16446ba8..5c8028c03e72 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/strptime.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/vendored/strptime.h @@ -20,7 +20,7 @@ #include -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" #ifdef __cplusplus extern "C" { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/visit_array_inline.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/visit_array_inline.h index 380b7fb4b404..800bedcf1ea8 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/visit_array_inline.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/visit_array_inline.h @@ -18,9 +18,9 @@ #pragma once -#include "arrow/array.h" -#include "arrow/extension_type.h" -#include "arrow/visitor_generate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visitor_generate.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/visit_data_inline.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/visit_data_inline.h index 50bb6909aec6..c6dcd0121dcf 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/visit_data_inline.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/visit_data_inline.h @@ -20,15 +20,15 @@ #include -#include "arrow/array.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/binary_view_util.h" -#include "arrow/util/bit_block_counter.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/functional.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/binary_view_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/functional.h" namespace arrow20 { namespace internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/visit_scalar_inline.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/visit_scalar_inline.h index c528c81de05d..ed1f59ff41e6 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/visit_scalar_inline.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/visit_scalar_inline.h @@ -22,10 +22,10 @@ #include -#include "arrow/scalar.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/visitor_generate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visitor_generate.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h index 897cb746967f..3acecdaeb074 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/visit_type_inline.h @@ -18,11 +18,11 @@ #pragma once -#include "arrow/extension_type.h" -#include "arrow/type.h" -#include "arrow/util/macros.h" -#include "arrow/util/unreachable.h" -#include "arrow/visitor_generate.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/unreachable.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visitor_generate.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/visitor.cc b/contrib/libs/apache/arrow_next/cpp/src/arrow/visitor.cc index b4fbd3e745d4..8392ef09f370 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/visitor.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/visitor.cc @@ -15,15 +15,15 @@ // specific language governing permissions and limitations // under the License. -#include "arrow/visitor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visitor.h" #include -#include "arrow/array.h" // IWYU pragma: keep -#include "arrow/extension_type.h" -#include "arrow/scalar.h" // IWYU pragma: keep -#include "arrow/status.h" -#include "arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/arrow/visitor.h b/contrib/libs/apache/arrow_next/cpp/src/arrow/visitor.h index be20aacc1fab..a3a7fa277818 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/arrow/visitor.h +++ b/contrib/libs/apache/arrow_next/cpp/src/arrow/visitor.h @@ -18,9 +18,9 @@ #pragma once -#include "arrow/status.h" -#include "arrow/type_fwd.h" -#include "arrow/util/visibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/visibility.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/generated/parquet_types.h b/contrib/libs/apache/arrow_next/cpp/src/generated/parquet_types.h index 11fa126a336f..26bef1afb496 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/generated/parquet_types.h +++ b/contrib/libs/apache/arrow_next/cpp/src/generated/parquet_types.h @@ -19,7 +19,7 @@ #include #include -#include "parquet/windows_compatibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/windows_compatibility.h" namespace parquet20 { namespace format { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/api/io.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/api/io.h index c27b5921aef2..caaf4d3669f8 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/api/io.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/api/io.h @@ -18,4 +18,4 @@ #pragma once -#include "parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/api/reader.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/api/reader.h index 375f71cdaac8..5893287192f6 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/api/reader.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/api/reader.h @@ -19,18 +19,18 @@ #pragma once // Column reader API -#include "parquet/column_reader.h" -#include "parquet/column_scanner.h" -#include "parquet/exception.h" -#include "parquet/file_reader.h" -#include "parquet/metadata.h" -#include "parquet/platform.h" -#include "parquet/printer.h" -#include "parquet/properties.h" -#include "parquet/statistics.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/column_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/column_scanner.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/file_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/printer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/properties.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/statistics.h" // Schemas -#include "parquet/api/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/api/schema.h" // IO -#include "parquet/api/io.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/api/io.h" diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/api/schema.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/api/schema.h index 48ed1a9d0ad4..aa66cb891111 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/api/schema.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/api/schema.h @@ -19,4 +19,4 @@ #pragma once // Schemas -#include "parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/api/writer.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/api/writer.h index 7081616761c1..ad7b04e6f487 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/api/writer.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/api/writer.h @@ -18,9 +18,9 @@ #pragma once -#include "parquet/api/io.h" -#include "parquet/api/schema.h" -#include "parquet/column_writer.h" -#include "parquet/exception.h" -#include "parquet/file_writer.h" -#include "parquet/statistics.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/api/io.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/api/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/column_writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/file_writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/statistics.h" diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/path_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/path_internal.cc index 0d218787fb40..d53e2d6c1cec 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/path_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/path_internal.cc @@ -82,7 +82,7 @@ // - Avoids virtual dispatch in favor of if/else statements on a set of well known // classes. -#include "parquet/arrow/path_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/path_internal.h" #include #include @@ -92,21 +92,21 @@ #include #include -#include "arrow/array.h" -#include "arrow/buffer.h" -#include "arrow/buffer_builder.h" -#include "arrow/extension_type.h" -#include "arrow/memory_pool.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_run_reader.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_visit.h" -#include "arrow/util/logging.h" -#include "arrow/util/macros.h" -#include "arrow/visit_array_inline.h" - -#include "parquet/properties.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/memory_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_visit.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_array_inline.h" + +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/properties.h" namespace parquet20::arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/path_internal.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/path_internal.h index 31d8a96f19fa..1c240a501963 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/path_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/path_internal.h @@ -23,10 +23,10 @@ #include #include -#include "arrow/result.h" -#include "arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" -#include "parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/reader.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/reader.cc index aebab51c3db0..0a2faecdca7c 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/reader.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/reader.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/arrow/reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/reader.h" #include #include @@ -24,28 +24,28 @@ #include #include -#include "arrow/array.h" -#include "arrow/buffer.h" -#include "arrow/extension_type.h" -#include "arrow/io/memory.h" -#include "arrow/record_batch.h" -#include "arrow/table.h" -#include "arrow/type.h" -#include "arrow/util/async_generator.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/future.h" -#include "arrow/util/iterator.h" -#include "arrow/util/logging.h" -#include "arrow/util/parallel.h" -#include "arrow/util/range.h" -#include "arrow/util/tracing_internal.h" -#include "parquet/arrow/reader_internal.h" -#include "parquet/column_reader.h" -#include "parquet/exception.h" -#include "parquet/file_reader.h" -#include "parquet/metadata.h" -#include "parquet/properties.h" -#include "parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/memory.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/async_generator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/iterator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/parallel.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/range.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/tracing_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/reader_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/column_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/file_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/properties.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" using arrow20::Array; using arrow20::ArrayData; diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/reader.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/reader.h index af82d3a97854..3265600c2cf1 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/reader.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/reader.h @@ -24,9 +24,9 @@ #include #include -#include "parquet/file_reader.h" -#include "parquet/platform.h" -#include "parquet/properties.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/file_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/properties.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/reader_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/reader_internal.cc index 285adbff4adb..f986d4aa662a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/reader_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/reader_internal.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/arrow/reader_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/reader_internal.h" #include #include @@ -27,36 +27,36 @@ #include #include -#include "arrow/array.h" -#include "arrow/compute/api.h" -#include "arrow/datum.h" -#include "arrow/io/memory.h" -#include "arrow/ipc/reader.h" -#include "arrow/ipc/writer.h" -#include "arrow/scalar.h" -#include "arrow/status.h" -#include "arrow/table.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/base64.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/endian.h" -#include "arrow/util/float16.h" -#include "arrow/util/int_util_overflow.h" -#include "arrow/util/logging.h" -#include "arrow/util/ubsan.h" - -#include "parquet/arrow/reader.h" -#include "parquet/arrow/schema.h" -#include "parquet/arrow/schema_internal.h" -#include "parquet/column_reader.h" -#include "parquet/platform.h" -#include "parquet/properties.h" -#include "parquet/schema.h" -#include "parquet/statistics.h" -#include "parquet/types.h" -#include "parquet/windows_fixup.h" // for OPTIONAL +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/datum.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/memory.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/scalar.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/base64.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/float16.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" + +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/schema_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/column_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/properties.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/statistics.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/windows_fixup.h" // for OPTIONAL using arrow20::Array; using arrow20::BooleanArray; diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/reader_internal.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/reader_internal.h index 54ccd90d9fef..bb5d0bbeb2ea 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/reader_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/reader_internal.h @@ -27,12 +27,12 @@ #include #include -#include "parquet/arrow/schema.h" -#include "parquet/column_reader.h" -#include "parquet/file_reader.h" -#include "parquet/metadata.h" -#include "parquet/platform.h" -#include "parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/column_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/file_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/schema.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/schema.cc index 5fe3c8de7921..74c1cf500bf4 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/schema.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/schema.cc @@ -15,30 +15,30 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/arrow/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/schema.h" #include #include #include -#include "arrow/extension/json.h" -#include "arrow/extension_type.h" -#include "arrow/io/memory.h" -#include "arrow/ipc/api.h" -#include "arrow/result.h" -#include "arrow/type.h" -#include "arrow/util/base64.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/key_value_metadata.h" -#include "arrow/util/logging.h" -#include "arrow/util/string.h" -#include "arrow/util/value_parsing.h" - -#include "parquet/arrow/schema_internal.h" -#include "parquet/exception.h" -#include "parquet/metadata.h" -#include "parquet/properties.h" -#include "parquet/types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension/json.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/memory.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/api.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/base64.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/value_parsing.h" + +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/schema_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/properties.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/types.h" using arrow20::DecimalType; using arrow20::Field; diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/schema.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/schema.h index de1789aac9b0..a24ffd547298 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/schema.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/schema.h @@ -24,14 +24,14 @@ #include #include -#include "arrow/result.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_fwd.h" - -#include "parquet/level_conversion.h" -#include "parquet/platform.h" -#include "parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" + +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/level_conversion.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/schema_internal.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/schema_internal.cc index 71c40ee34853..982b3c8882b1 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/schema_internal.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/schema_internal.cc @@ -15,12 +15,12 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/arrow/schema_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/schema_internal.h" -#include "arrow/extension/json.h" -#include "arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension/json.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" -#include "parquet/properties.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/properties.h" using ArrowType = ::arrow20::DataType; using ArrowTypeId = ::arrow20::Type; diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/schema_internal.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/schema_internal.h index ae0aaf20f11e..6705147883ae 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/schema_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/schema_internal.h @@ -18,9 +18,9 @@ #pragma once -#include "arrow/result.h" -#include "arrow/type_fwd.h" -#include "parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" namespace arrow20 { class DataType; diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/writer.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/writer.cc index 7e2f04ea03d7..4c49f84770d2 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/writer.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/writer.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/arrow/writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/writer.h" #include #include @@ -25,26 +25,26 @@ #include #include -#include "arrow/array.h" -#include "arrow/extension_type.h" -#include "arrow/ipc/writer.h" -#include "arrow/record_batch.h" -#include "arrow/table.h" -#include "arrow/type.h" -#include "arrow/util/base64.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/key_value_metadata.h" -#include "arrow/util/logging.h" -#include "arrow/util/parallel.h" - -#include "parquet/arrow/path_internal.h" -#include "parquet/arrow/reader_internal.h" -#include "parquet/arrow/schema.h" -#include "parquet/column_writer.h" -#include "parquet/exception.h" -#include "parquet/file_writer.h" -#include "parquet/platform.h" -#include "parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/extension_type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/ipc/writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/record_batch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/table.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/base64.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/parallel.h" + +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/path_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/reader_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/column_writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/file_writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" using arrow20::Array; using arrow20::BinaryArray; diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/writer.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/writer.h index 49a1ebaf73fa..6c58a7517896 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/writer.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/arrow/writer.h @@ -21,8 +21,8 @@ #include #include -#include "parquet/platform.h" -#include "parquet/properties.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/properties.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/bloom_filter.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/bloom_filter.cc index db4aaf7e73e2..4129182dc97d 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/bloom_filter.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/bloom_filter.cc @@ -19,16 +19,16 @@ #include #include -#include "arrow/result.h" -#include "arrow/util/logging.h" -#include "arrow/util/macros.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/result.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" -#include "generated/parquet_types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/generated/parquet_types.h" -#include "parquet/bloom_filter.h" -#include "parquet/exception.h" -#include "parquet/thrift_internal.h" -#include "parquet/xxhasher.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/bloom_filter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/thrift_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/xxhasher.h" namespace parquet20 { constexpr uint32_t BlockSplitBloomFilter::SALT[kBitsSetPerBlock]; diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/bloom_filter.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/bloom_filter.h index ae1233eebf26..0815361251ca 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/bloom_filter.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/bloom_filter.h @@ -22,11 +22,11 @@ #include #include -#include "arrow/util/bit_util.h" -#include "arrow/util/logging.h" -#include "parquet/hasher.h" -#include "parquet/platform.h" -#include "parquet/types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/hasher.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/types.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/bloom_filter_reader.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/bloom_filter_reader.cc index 3a713805b3b9..380f09f7db33 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/bloom_filter_reader.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/bloom_filter_reader.cc @@ -15,10 +15,10 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/bloom_filter_reader.h" -#include "parquet/bloom_filter.h" -#include "parquet/exception.h" -#include "parquet/metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/bloom_filter_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/bloom_filter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/metadata.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/bloom_filter_reader.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/bloom_filter_reader.h index e87111de7ceb..c85e23187c43 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/bloom_filter_reader.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/bloom_filter_reader.h @@ -18,9 +18,9 @@ #pragma once -#include "arrow/io/interfaces.h" -#include "parquet/properties.h" -#include "parquet/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/properties.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/type_fwd.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/column_page.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/column_page.h index e3ac5e149b89..9cab3abc8da9 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/column_page.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/column_page.h @@ -27,9 +27,9 @@ #include #include -#include "parquet/size_statistics.h" -#include "parquet/statistics.h" -#include "parquet/types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/size_statistics.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/statistics.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/types.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/column_reader.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/column_reader.cc index 96e9fe676c16..c7d727fe8039 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/column_reader.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/column_reader.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/column_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/column_reader.h" #include #include @@ -29,32 +29,32 @@ #include #include -#include "arrow/array.h" -#include "arrow/array/array_binary.h" -#include "arrow/array/builder_binary.h" -#include "arrow/array/builder_dict.h" -#include "arrow/array/builder_primitive.h" -#include "arrow/chunked_array.h" -#include "arrow/type.h" -#include "arrow/util/bit_stream_utils_internal.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/compression.h" -#include "arrow/util/crc32.h" -#include "arrow/util/int_util_overflow.h" -#include "arrow/util/logging.h" -#include "arrow/util/rle_encoding_internal.h" -#include "arrow/util/unreachable.h" -#include "parquet/column_page.h" -#include "parquet/encoding.h" -#include "parquet/encryption/encryption_internal.h" -#include "parquet/encryption/internal_file_decryptor.h" -#include "parquet/level_comparison.h" -#include "parquet/level_conversion.h" -#include "parquet/properties.h" -#include "parquet/statistics.h" -#include "parquet/thrift_internal.h" // IWYU pragma: keep -#include "parquet/windows_fixup.h" // for OPTIONAL +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/array_binary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_binary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_dict.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/chunked_array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_stream_utils_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/crc32.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/rle_encoding_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/unreachable.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/column_page.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encoding.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_decryptor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/level_comparison.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/level_conversion.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/properties.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/statistics.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/thrift_internal.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/windows_fixup.h" // for OPTIONAL using arrow20::MemoryPool; using arrow20::internal::AddWithOverflow; diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/column_reader.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/column_reader.h index 2e5b1399a380..20a64d9651de 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/column_reader.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/column_reader.h @@ -23,13 +23,13 @@ #include #include -#include "parquet/exception.h" -#include "parquet/level_conversion.h" -#include "parquet/metadata.h" -#include "parquet/platform.h" -#include "parquet/properties.h" -#include "parquet/schema.h" -#include "parquet/types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/level_conversion.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/properties.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/types.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/column_scanner.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/column_scanner.cc index 05a5b5d655f1..605953a5876a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/column_scanner.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/column_scanner.cc @@ -15,12 +15,12 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/column_scanner.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/column_scanner.h" #include #include -#include "parquet/column_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/column_reader.h" using arrow20::MemoryPool; diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/column_scanner.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/column_scanner.h index 5c572bf5e480..b86b3fb3e989 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/column_scanner.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/column_scanner.h @@ -27,11 +27,11 @@ #include #include -#include "parquet/column_reader.h" -#include "parquet/exception.h" -#include "parquet/platform.h" -#include "parquet/schema.h" -#include "parquet/types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/column_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/types.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/column_writer.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/column_writer.cc index 8d508349ab1a..6d0c4789a1f9 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/column_writer.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/column_writer.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/column_writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/column_writer.h" #include #include @@ -25,40 +25,40 @@ #include #include -#include "arrow/array.h" -#include "arrow/buffer_builder.h" -#include "arrow/compute/api.h" -#include "arrow/io/memory.h" -#include "arrow/status.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_stream_utils_internal.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/compression.h" -#include "arrow/util/crc32.h" -#include "arrow/util/endian.h" -#include "arrow/util/float16.h" -#include "arrow/util/key_value_metadata.h" -#include "arrow/util/logging.h" -#include "arrow/util/rle_encoding_internal.h" -#include "arrow/util/type_traits.h" -#include "arrow/visit_array_inline.h" -#include "parquet/column_page.h" -#include "parquet/encoding.h" -#include "parquet/encryption/encryption_internal.h" -#include "parquet/encryption/internal_file_encryptor.h" -#include "parquet/level_conversion.h" -#include "parquet/metadata.h" -#include "parquet/page_index.h" -#include "parquet/platform.h" -#include "parquet/properties.h" -#include "parquet/schema.h" -#include "parquet/size_statistics.h" -#include "parquet/statistics.h" -#include "parquet/thrift_internal.h" -#include "parquet/types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/compute/api.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/memory.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_stream_utils_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/crc32.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/float16.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/rle_encoding_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_array_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/column_page.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encoding.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_encryptor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/level_conversion.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/page_index.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/properties.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/size_statistics.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/statistics.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/thrift_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/types.h" using arrow20::Array; using arrow20::ArrayData; diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/column_writer.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/column_writer.h index c7662e947386..88a7f4526491 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/column_writer.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/column_writer.h @@ -22,11 +22,11 @@ #include #include -#include "arrow/type_fwd.h" -#include "arrow/util/compression.h" -#include "parquet/exception.h" -#include "parquet/platform.h" -#include "parquet/types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/types.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/decoder.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/decoder.cc index 13dafb44e7cf..6fcb7831dff8 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/decoder.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/decoder.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/encoding.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encoding.h" #include #include @@ -27,28 +27,28 @@ #include #include -#include "arrow/array.h" -#include "arrow/array/builder_binary.h" -#include "arrow/array/builder_dict.h" -#include "arrow/array/builder_primitive.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_block_counter.h" -#include "arrow/util/bit_stream_utils_internal.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/byte_stream_split_internal.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/int_util_overflow.h" -#include "arrow/util/logging.h" -#include "arrow/util/rle_encoding_internal.h" -#include "arrow/util/spaced.h" -#include "arrow/util/ubsan.h" -#include "arrow/visit_data_inline.h" - -#include "parquet/exception.h" -#include "parquet/platform.h" -#include "parquet/schema.h" -#include "parquet/types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_binary.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_dict.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array/builder_primitive.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_block_counter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_stream_utils_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/byte_stream_split_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/rle_encoding_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/spaced.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_data_inline.h" + +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/types.h" namespace bit_util = arrow20::bit_util; diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/encoder.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/encoder.cc index 3bb5084d9ce2..4f5f8d796752 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/encoder.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/encoder.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/encoding.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encoding.h" #include #include @@ -27,26 +27,26 @@ #include #include -#include "arrow/array.h" -#include "arrow/stl_allocator.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_stream_utils_internal.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_ops.h" -#include "arrow/util/byte_stream_split_internal.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/hashing.h" -#include "arrow/util/int_util_overflow.h" -#include "arrow/util/logging.h" -#include "arrow/util/rle_encoding_internal.h" -#include "arrow/util/spaced.h" -#include "arrow/util/ubsan.h" -#include "arrow/visit_data_inline.h" - -#include "parquet/exception.h" -#include "parquet/platform.h" -#include "parquet/schema.h" -#include "parquet/types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/stl_allocator.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_stream_utils_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_ops.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/byte_stream_split_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/hashing.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/rle_encoding_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/spaced.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_data_inline.h" + +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/types.h" namespace bit_util = arrow20::bit_util; diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/encoding.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/encoding.h index f29dab0fa59f..efdfd7d64c2c 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/encoding.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/encoding.h @@ -23,11 +23,11 @@ #include #include -#include "arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" -#include "parquet/exception.h" -#include "parquet/platform.h" -#include "parquet/types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/types.h" namespace arrow20 { template diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption.cc index 37420fc4563c..cd3c3ed113e3 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption.cc @@ -15,16 +15,16 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/encryption/encryption.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption.h" #include #include #include -#include "arrow/util/logging.h" -#include "arrow/util/utf8.h" -#include "parquet/encryption/encryption_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/utf8.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption_internal.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption.h index a5aa616a0e10..0e4f96dd4136 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption.h @@ -23,9 +23,9 @@ #include #include -#include "parquet/exception.h" -#include "parquet/schema.h" -#include "parquet/types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/types.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption_internal.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption_internal.h index d105f202178e..212670768512 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption_internal.h @@ -22,9 +22,9 @@ #include #include -#include "arrow/util/span.h" -#include "parquet/properties.h" -#include "parquet/types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/span.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/properties.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/types.h" using parquet20::ParquetCipher; diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption_internal_nossl.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption_internal_nossl.cc index 24fc6c799bd5..d20752461d9d 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption_internal_nossl.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption_internal_nossl.cc @@ -15,8 +15,8 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/encryption/encryption_internal.h" -#include "parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" namespace parquet20::encryption { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_decryptor.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_decryptor.cc index c96dcdc05a48..84dcff36c60e 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_decryptor.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_decryptor.cc @@ -15,12 +15,12 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/encryption/internal_file_decryptor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_decryptor.h" -#include "arrow/util/logging.h" -#include "parquet/encryption/encryption.h" -#include "parquet/encryption/encryption_internal.h" -#include "parquet/metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/metadata.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_decryptor.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_decryptor.h index 510587389b47..863472d2fd49 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_decryptor.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_decryptor.h @@ -23,7 +23,7 @@ #include #include -#include "parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_encryptor.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_encryptor.cc index fb8221b24321..b1ed558c89be 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_encryptor.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_encryptor.cc @@ -15,9 +15,9 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/encryption/internal_file_encryptor.h" -#include "parquet/encryption/encryption.h" -#include "parquet/encryption/encryption_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_encryptor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption_internal.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_encryptor.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_encryptor.h index 745f0c77427d..7a9e1be94eb1 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_encryptor.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_encryptor.h @@ -23,8 +23,8 @@ #include #include -#include "parquet/encryption/encryption.h" -#include "parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/exception.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/exception.cc index 3669b729f392..c75fc30405b8 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/exception.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/exception.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h index 6effe511dfd5..213e7bfe6b00 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h @@ -23,9 +23,9 @@ #include #include -#include "arrow/type_fwd.h" -#include "arrow/util/string_builder.h" -#include "parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string_builder.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" // PARQUET-1085 #if !defined(ARROW_UNUSED) diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/file_reader.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/file_reader.cc index 863246e8e71e..5977338c9d6e 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/file_reader.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/file_reader.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/file_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/file_reader.h" #include #include @@ -26,30 +26,30 @@ #include #include -#include "arrow/io/caching.h" -#include "arrow/io/file.h" -#include "arrow/io/memory.h" -#include "arrow/io/util_internal.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/future.h" -#include "arrow/util/int_util_overflow.h" -#include "arrow/util/logging.h" -#include "arrow/util/ubsan.h" -#include "parquet/bloom_filter.h" -#include "parquet/bloom_filter_reader.h" -#include "parquet/column_reader.h" -#include "parquet/column_scanner.h" -#include "parquet/encryption/encryption_internal.h" -#include "parquet/encryption/internal_file_decryptor.h" -#include "parquet/exception.h" -#include "parquet/file_writer.h" -#include "parquet/metadata.h" -#include "parquet/page_index.h" -#include "parquet/platform.h" -#include "parquet/properties.h" -#include "parquet/schema.h" -#include "parquet/types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/caching.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/file.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/memory.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/util_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/future.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/bloom_filter.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/bloom_filter_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/column_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/column_scanner.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_decryptor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/file_writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/page_index.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/properties.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/types.h" using arrow20::internal::AddWithOverflow; diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/file_reader.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/file_reader.h index 6940bad90b1c..e86474751a25 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/file_reader.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/file_reader.h @@ -23,11 +23,11 @@ #include #include -#include "arrow/io/caching.h" -#include "arrow/util/type_fwd.h" -#include "parquet/metadata.h" // IWYU pragma: keep -#include "parquet/platform.h" -#include "parquet/properties.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/caching.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/metadata.h" // IWYU pragma: keep +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/properties.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/file_writer.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/file_writer.cc index a6a2af629d1a..2e97b5e6061e 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/file_writer.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/file_writer.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/file_writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/file_writer.h" #include #include @@ -23,15 +23,15 @@ #include #include -#include "arrow/util/key_value_metadata.h" -#include "arrow/util/logging.h" -#include "parquet/column_writer.h" -#include "parquet/encryption/encryption_internal.h" -#include "parquet/encryption/internal_file_encryptor.h" -#include "parquet/exception.h" -#include "parquet/page_index.h" -#include "parquet/platform.h" -#include "parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/column_writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_encryptor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/page_index.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" using arrow20::MemoryPool; diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/file_writer.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/file_writer.h index e9db70ac17b4..235df5390d0f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/file_writer.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/file_writer.h @@ -22,10 +22,10 @@ #include #include -#include "parquet/metadata.h" -#include "parquet/platform.h" -#include "parquet/properties.h" -#include "parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/properties.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/hasher.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/hasher.h index 1f62da320962..7e72b7603870 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/hasher.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/hasher.h @@ -19,7 +19,7 @@ #pragma once #include -#include "parquet/types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/types.h" namespace parquet20 { // Abstract class for hash diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/level_comparison.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/level_comparison.cc index 2d97c3287ef5..a49911810fea 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/level_comparison.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/level_comparison.cc @@ -15,15 +15,15 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/level_comparison.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/level_comparison.h" #define PARQUET_IMPL_NAMESPACE standard -#include "parquet/level_comparison_inc.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/level_comparison_inc.h" #undef PARQUET_IMPL_NAMESPACE #include -#include "arrow/util/dispatch.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/dispatch.h" namespace parquet20::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/level_comparison.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/level_comparison.h index 2f525d708501..dc5e18e306b0 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/level_comparison.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/level_comparison.h @@ -20,7 +20,7 @@ #include #include -#include "parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" namespace parquet20::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/level_comparison_inc.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/level_comparison_inc.h index 12c9d7448c9b..afab82ec004a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/level_comparison_inc.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/level_comparison_inc.h @@ -17,9 +17,9 @@ // under the License. #pragma once -#include "arrow/util/bit_util.h" -#include "arrow/util/endian.h" -#include "parquet/level_comparison.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/level_comparison.h" // Used to make sure ODR rule isn't violated. #ifndef PARQUET_IMPL_NAMESPACE diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/level_conversion.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/level_conversion.cc index 6f0e80e7cc58..edb3c8070c8b 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/level_conversion.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/level_conversion.cc @@ -14,21 +14,21 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -#include "parquet/level_conversion.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/level_conversion.h" #include #include #include -#include "arrow/util/bit_run_reader.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/cpu_info.h" -#include "arrow/util/logging.h" -#include "parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/cpu_info.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" -#include "parquet/level_comparison.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/level_comparison.h" #define PARQUET_IMPL_NAMESPACE standard -#include "parquet/level_conversion_inc.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/level_conversion_inc.h" #undef PARQUET_IMPL_NAMESPACE namespace parquet20::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/level_conversion.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/level_conversion.h index 27908dd88bc4..c365dd67f3d6 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/level_conversion.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/level_conversion.h @@ -20,9 +20,9 @@ #include -#include "arrow/util/endian.h" -#include "parquet/platform.h" -#include "parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/endian.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" namespace parquet20::internal { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/level_conversion_inc.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/level_conversion_inc.h index 02f027e8c458..637b62175323 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/level_conversion_inc.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/level_conversion_inc.h @@ -17,19 +17,19 @@ // under the License. #pragma once -#include "parquet/level_conversion.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/level_conversion.h" #include #include #include -#include "arrow/util/bit_run_reader.h" -#include "arrow/util/bit_util.h" -#include "arrow/util/bitmap_writer.h" -#include "arrow/util/logging.h" -#include "arrow/util/simd.h" -#include "parquet/exception.h" -#include "parquet/level_comparison.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_util.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bitmap_writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/simd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/level_comparison.h" #ifndef PARQUET_IMPL_NAMESPACE # error "PARQUET_IMPL_NAMESPACE must be defined" diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/metadata.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/metadata.cc index 3b579cb89371..71204ebdaf7b 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/metadata.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/metadata.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/metadata.h" #include #include @@ -28,17 +28,17 @@ #include #include -#include "arrow/io/memory.h" -#include "arrow/util/key_value_metadata.h" -#include "arrow/util/logging.h" -#include "arrow/util/pcg_random.h" -#include "parquet/encryption/encryption_internal.h" -#include "parquet/encryption/internal_file_decryptor.h" -#include "parquet/exception.h" -#include "parquet/schema.h" -#include "parquet/schema_internal.h" -#include "parquet/size_statistics.h" -#include "parquet/thrift_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/memory.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/pcg_random.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_decryptor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/size_statistics.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/thrift_internal.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/metadata.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/metadata.h index 80e9a7e79a65..6bb6dd0b4f80 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/metadata.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/metadata.h @@ -26,9 +26,9 @@ #include #include -#include "parquet/encryption/type_fwd.h" -#include "parquet/platform.h" -#include "parquet/properties.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/properties.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/page_index.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/page_index.cc index c26127933392..c173285a1b5f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/page_index.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/page_index.cc @@ -15,19 +15,19 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/page_index.h" -#include "parquet/encoding.h" -#include "parquet/encryption/encryption_internal.h" -#include "parquet/encryption/internal_file_decryptor.h" -#include "parquet/encryption/internal_file_encryptor.h" -#include "parquet/exception.h" -#include "parquet/metadata.h" -#include "parquet/schema.h" -#include "parquet/statistics.h" -#include "parquet/thrift_internal.h" - -#include "arrow/util/int_util_overflow.h" -#include "arrow/util/unreachable.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/page_index.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encoding.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_decryptor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_encryptor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/statistics.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/thrift_internal.h" + +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/int_util_overflow.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/unreachable.h" #include #include diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/page_index.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/page_index.h index c99a70cdfaee..f56a9b951ca2 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/page_index.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/page_index.h @@ -18,10 +18,10 @@ #pragma once -#include "arrow/io/interfaces.h" -#include "parquet/encryption/type_fwd.h" -#include "parquet/type_fwd.h" -#include "parquet/types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/types.h" #include #include diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/platform.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/platform.cc index a5cca67017cb..b0848150a4db 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/platform.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/platform.cc @@ -15,15 +15,15 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" #include #include #include -#include "arrow/io/memory.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/memory.h" -#include "parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h index 5b34b74e2df3..3917b53bbede 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h @@ -21,11 +21,11 @@ #include #include -#include "arrow/buffer.h" // IWYU pragma: export -#include "arrow/io/interfaces.h" // IWYU pragma: export -#include "arrow/status.h" // IWYU pragma: export -#include "arrow/type_fwd.h" // IWYU pragma: export -#include "arrow/util/macros.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/buffer.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/interfaces.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/status.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_fwd.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/macros.h" // IWYU pragma: export #if defined(_WIN32) || defined(__CYGWIN__) diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/printer.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/printer.cc index 2dcb0d608177..942051f51d41 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/printer.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/printer.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/printer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/printer.h" #include #include @@ -24,16 +24,16 @@ #include #include -#include "arrow/util/key_value_metadata.h" -#include "arrow/util/string.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/key_value_metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/string.h" -#include "parquet/column_scanner.h" -#include "parquet/exception.h" -#include "parquet/file_reader.h" -#include "parquet/metadata.h" -#include "parquet/schema.h" -#include "parquet/statistics.h" -#include "parquet/types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/column_scanner.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/file_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/metadata.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/statistics.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/types.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/printer.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/printer.h index 5cdabeb0e7e7..1af709dfd6b5 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/printer.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/printer.h @@ -21,7 +21,7 @@ #include #include -#include "parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/properties.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/properties.cc index 3463992ce5ec..5b81951b7126 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/properties.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/properties.cc @@ -18,12 +18,12 @@ #include #include -#include "parquet/properties.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/properties.h" -#include "arrow/io/buffered.h" -#include "arrow/io/memory.h" -#include "arrow/util/logging.h" -#include "arrow/util/thread_pool.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/buffered.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/memory.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/thread_pool.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/properties.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/properties.h index 94a1ff3b0502..9da503abe0ec 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/properties.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/properties.h @@ -24,17 +24,17 @@ #include #include -#include "arrow/io/caching.h" -#include "arrow/type.h" -#include "arrow/util/compression.h" -#include "arrow/util/type_fwd.h" -#include "parquet/encryption/encryption.h" -#include "parquet/exception.h" -#include "parquet/parquet_version.h" -#include "parquet/platform.h" -#include "parquet/schema.h" -#include "parquet/type_fwd.h" -#include "parquet/types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/io/caching.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/encryption.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/src/parquet/parquet_version.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/types.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/schema.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/schema.cc index c0a3d8992a02..ecc13894a9c2 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/schema.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/schema.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" #include #include @@ -24,10 +24,10 @@ #include #include -#include "arrow/util/logging.h" -#include "parquet/exception.h" -#include "parquet/schema_internal.h" -#include "parquet/thrift_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema_internal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/thrift_internal.h" using parquet20::format::SchemaElement; diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h index b395289dce8b..64c4a753e43f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h @@ -29,9 +29,9 @@ #include #include -#include "parquet/platform.h" -#include "parquet/types.h" -#include "parquet/windows_fixup.h" // for OPTIONAL +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/windows_fixup.h" // for OPTIONAL namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/schema_internal.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/schema_internal.h index d2afa28a3168..24663be06cfd 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/schema_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/schema_internal.h @@ -23,9 +23,9 @@ #include #include -#include "parquet/platform.h" -#include "parquet/schema.h" -#include "parquet/types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/types.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/size_statistics.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/size_statistics.cc index a815db14b843..dfecc9a13b17 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/size_statistics.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/size_statistics.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/size_statistics.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/size_statistics.h" #include #include @@ -24,9 +24,9 @@ #include #include -#include "arrow/util/logging.h" -#include "parquet/exception.h" -#include "parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/size_statistics.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/size_statistics.h index c644d5d797ce..33067f0c945a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/size_statistics.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/size_statistics.h @@ -23,9 +23,9 @@ #include #include -#include "arrow/util/span.h" -#include "parquet/platform.h" -#include "parquet/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/span.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/type_fwd.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/statistics.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/statistics.cc index 7886f64e046a..12cd9555473b 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/statistics.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/statistics.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/statistics.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/statistics.h" #include #include @@ -25,19 +25,19 @@ #include #include -#include "arrow/array.h" -#include "arrow/type.h" -#include "arrow/type_traits.h" -#include "arrow/util/bit_run_reader.h" -#include "arrow/util/checked_cast.h" -#include "arrow/util/float16.h" -#include "arrow/util/logging.h" -#include "arrow/util/ubsan.h" -#include "arrow/visit_data_inline.h" -#include "parquet/encoding.h" -#include "parquet/exception.h" -#include "parquet/platform.h" -#include "parquet/schema.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/array.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/type_traits.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/bit_run_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/float16.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/ubsan.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/visit_data_inline.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encoding.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/schema.h" using arrow20::default_memory_pool; using arrow20::MemoryPool; diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/statistics.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/statistics.h index cd425cfe5574..ffad88cac93f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/statistics.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/statistics.h @@ -25,8 +25,8 @@ #include #include -#include "parquet/platform.h" -#include "parquet/types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/types.h" namespace arrow20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/stream_reader.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/stream_reader.cc index 5f8f8978a3cb..44c3f791fe3d 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/stream_reader.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/stream_reader.cc @@ -15,8 +15,8 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/stream_reader.h" -#include "arrow/util/decimal.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/stream_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/decimal.h" #include #include diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/stream_reader.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/stream_reader.h index 81e9d4acd6b0..38358706972a 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/stream_reader.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/stream_reader.h @@ -27,9 +27,9 @@ #include #include -#include "parquet/column_reader.h" -#include "parquet/file_reader.h" -#include "parquet/stream_writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/column_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/file_reader.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/stream_writer.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/stream_writer.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/stream_writer.cc index 021e09b58df9..0032feb86c52 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/stream_writer.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/stream_writer.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/stream_writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/stream_writer.h" #include diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/stream_writer.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/stream_writer.h index 2c20ae4a557a..88d4418f1697 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/stream_writer.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/stream_writer.h @@ -27,8 +27,8 @@ #include #include -#include "parquet/column_writer.h" -#include "parquet/file_writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/column_writer.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/file_writer.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/thrift_internal.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/thrift_internal.h index c5238ba0654c..fd2389827d88 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/thrift_internal.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/thrift_internal.h @@ -18,7 +18,7 @@ #pragma once -#include "parquet/windows_compatibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/windows_compatibility.h" #include #include @@ -37,18 +37,18 @@ #include #include -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" -#include "parquet/encryption/internal_file_decryptor.h" -#include "parquet/encryption/internal_file_encryptor.h" -#include "parquet/exception.h" -#include "parquet/platform.h" -#include "parquet/properties.h" -#include "parquet/size_statistics.h" -#include "parquet/statistics.h" -#include "parquet/types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_decryptor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/encryption/internal_file_encryptor.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/properties.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/size_statistics.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/statistics.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/types.h" -#include "generated/parquet_types.h" // IWYU pragma: export +#include "contrib/libs/apache/arrow_next/cpp/src/generated/parquet_types.h" // IWYU pragma: export namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/types.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/types.cc index bb638b30ea05..8326810c8e87 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/types.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/types.cc @@ -22,14 +22,14 @@ #include #include -#include "arrow/util/checked_cast.h" -#include "arrow/util/compression.h" -#include "arrow/util/logging.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/checked_cast.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/compression.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/logging.h" -#include "parquet/exception.h" -#include "parquet/types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/exception.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/types.h" -#include "generated/parquet_types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/generated/parquet_types.h" using arrow20::internal::checked_cast; using arrow20::util::Codec; diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/types.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/types.h index 109b8890fcf5..0d11f4adad18 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/types.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/types.h @@ -27,9 +27,9 @@ #include #include -#include "parquet/platform.h" -#include "parquet/type_fwd.h" -#include "parquet/windows_fixup.h" // for OPTIONAL +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/type_fwd.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/windows_fixup.h" // for OPTIONAL namespace arrow20::util { diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/windows_compatibility.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/windows_compatibility.h index 2176c47e385e..193beaf4eea3 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/windows_compatibility.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/windows_compatibility.h @@ -18,5 +18,5 @@ #pragma once -#include "arrow/util/windows_compatibility.h" -#include "parquet/windows_fixup.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/windows_compatibility.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/windows_fixup.h" diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/windows_fixup.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/windows_fixup.h index c18e89b48426..adc291196c96 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/windows_fixup.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/windows_fixup.h @@ -18,7 +18,7 @@ // This header needs to be included multiple times. -#include "arrow/util/windows_fixup.h" +#include "contrib/libs/apache/arrow_next/cpp/src/arrow/util/windows_fixup.h" #ifdef _WIN32 diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/xxhasher.cc b/contrib/libs/apache/arrow_next/cpp/src/parquet/xxhasher.cc index 3fa385816d60..7819bf0f0b3f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/xxhasher.cc +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/xxhasher.cc @@ -15,7 +15,7 @@ // specific language governing permissions and limitations // under the License. -#include "parquet/xxhasher.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/xxhasher.h" #include "contrib/libs/xxhash/xxhash.h" diff --git a/contrib/libs/apache/arrow_next/cpp/src/parquet/xxhasher.h b/contrib/libs/apache/arrow_next/cpp/src/parquet/xxhasher.h index d35da220eca6..662d21d93e1f 100644 --- a/contrib/libs/apache/arrow_next/cpp/src/parquet/xxhasher.h +++ b/contrib/libs/apache/arrow_next/cpp/src/parquet/xxhasher.h @@ -20,9 +20,9 @@ #include -#include "parquet/hasher.h" -#include "parquet/platform.h" -#include "parquet/types.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/hasher.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/platform.h" +#include "contrib/libs/apache/arrow_next/cpp/src/parquet/types.h" namespace parquet20 { diff --git a/contrib/libs/apache/arrow_next/patches/fix-includes.sh b/contrib/libs/apache/arrow_next/patches/fix-includes.sh new file mode 100644 index 000000000000..025fcfc42c73 --- /dev/null +++ b/contrib/libs/apache/arrow_next/patches/fix-includes.sh @@ -0,0 +1,67 @@ +#!/bin/sh + +set -xue + +LIB_ROOT="contrib/libs/apache/arrow_next" +TMP_PATTERNS_FILE=".vendored_ignore_patterns.sed" + +cat > "$TMP_PATTERNS_FILE" <]+)>|#include <$LIB_ROOT/cpp/src/generated/\1>|g" \ + "$file" + + # Replace specific config and version headers (not in cpp/src) + sed -i -E \ + -e "s|^#[[:space:]]*include[[:space:]]+\"arrow/util/config\.h\"|#include \"$LIB_ROOT/src/arrow/util/config.h\"|g" \ + -e "s|^#[[:space:]]*include[[:space:]]+\"arrow/util/config_internal\.h\"|#include \"$LIB_ROOT/src/arrow/util/config_internal.h\"|g" \ + -e "s|^#[[:space:]]*include[[:space:]]+\"parquet/parquet_version\.h\"|#include \"$LIB_ROOT/src/parquet/parquet_version.h\"|g" \ + "$file" + + # Quotes: replace arrow/ and parquet/, skipping vendored + sed -i -E \ + -e "/^#[[:space:]]*include[[:space:]]+\"arrow\/vendored\//! s|^#[[:space:]]*include[[:space:]]+\"arrow/|#include \"$LIB_ROOT/cpp/src/arrow/|g" \ + -e "s|^#[[:space:]]*include[[:space:]]+\"parquet/|#include \"$LIB_ROOT/cpp/src/parquet/|g" \ + "$file" + + # Angle brackets: same + sed -i -E \ + -e "/^#[[:space:]]*include[[:space:]]+]+)>.*|\1|') + if grep -Fxq "$include_path" "$TMP_PATTERNS_FILE"; then + continue + fi + new_path="$LIB_ROOT/cpp/src/$include_path" + sed -i "s|<$include_path>|<$new_path>|" "$file" + done + fi +done + +rm -f "$TMP_PATTERNS_FILE" diff --git a/contrib/python/google-auth/py3/.dist-info/METADATA b/contrib/python/google-auth/py3/.dist-info/METADATA index 3b32bc1beff0..6db5c89a9527 100644 --- a/contrib/python/google-auth/py3/.dist-info/METADATA +++ b/contrib/python/google-auth/py3/.dist-info/METADATA @@ -1,6 +1,6 @@ Metadata-Version: 2.4 Name: google-auth -Version: 2.42.1 +Version: 2.43.0 Summary: Google Authentication Library Home-page: https://github.com/googleapis/google-auth-library-python Author: Google Cloud Platform diff --git a/contrib/python/google-auth/py3/google/auth/transport/_mtls_helper.py b/contrib/python/google-auth/py3/google/auth/transport/_mtls_helper.py index 68568dd60395..7740f2fe8152 100644 --- a/contrib/python/google-auth/py3/google/auth/transport/_mtls_helper.py +++ b/contrib/python/google-auth/py3/google/auth/transport/_mtls_helper.py @@ -16,7 +16,7 @@ import json import logging -from os import environ, path +from os import environ, getenv, path import re import subprocess @@ -405,3 +405,42 @@ def client_cert_callback(): # Then dump the decrypted key bytes return crypto.dump_privatekey(crypto.FILETYPE_PEM, pkey) + + +def check_use_client_cert(): + """Returns boolean for whether the client certificate should be used for mTLS. + + If GOOGLE_API_USE_CLIENT_CERTIFICATE is set to true or false, a corresponding + bool value will be returned. If the value is set to an unexpected string, it + will default to False. + If GOOGLE_API_USE_CLIENT_CERTIFICATE is unset, the value will be inferred + by reading a file pointed at by GOOGLE_API_CERTIFICATE_CONFIG, and verifying + it contains a "workload" section. If so, the function will return True, + otherwise False. + + Returns: + bool: Whether the client certificate should be used for mTLS connection. + """ + use_client_cert = getenv("GOOGLE_API_USE_CLIENT_CERTIFICATE") + # Check if the value of GOOGLE_API_USE_CLIENT_CERTIFICATE is set. + if use_client_cert: + return use_client_cert.lower() == "true" + else: + # Check if the value of GOOGLE_API_CERTIFICATE_CONFIG is set. + cert_path = getenv("GOOGLE_API_CERTIFICATE_CONFIG") + if cert_path: + try: + with open(cert_path, "r") as f: + content = json.load(f) + # verify json has workload key + content["cert_configs"]["workload"] + return True + except ( + FileNotFoundError, + OSError, + KeyError, + TypeError, + json.JSONDecodeError, + ) as e: + _LOGGER.debug("error decoding certificate: %s", e) + return False diff --git a/contrib/python/google-auth/py3/google/auth/transport/grpc.py b/contrib/python/google-auth/py3/google/auth/transport/grpc.py index 1ebe1379579e..d9185e7aa4f1 100644 --- a/contrib/python/google-auth/py3/google/auth/transport/grpc.py +++ b/contrib/python/google-auth/py3/google/auth/transport/grpc.py @@ -17,9 +17,7 @@ from __future__ import absolute_import import logging -import os -from google.auth import environment_vars from google.auth import exceptions from google.auth.transport import _mtls_helper from google.oauth2 import service_account @@ -256,16 +254,14 @@ def my_client_cert_callback(): # If SSL credentials are not explicitly set, try client_cert_callback and ADC. if not ssl_credentials: - use_client_cert = os.getenv( - environment_vars.GOOGLE_API_USE_CLIENT_CERTIFICATE, "false" - ) - if use_client_cert == "true" and client_cert_callback: + use_client_cert = _mtls_helper.check_use_client_cert() + if use_client_cert and client_cert_callback: # Use the callback if provided. cert, key = client_cert_callback() ssl_credentials = grpc.ssl_channel_credentials( certificate_chain=cert, private_key=key ) - elif use_client_cert == "true": + elif use_client_cert: # Use application default SSL credentials. adc_ssl_credentils = SslCredentials() ssl_credentials = adc_ssl_credentils.ssl_credentials @@ -295,10 +291,8 @@ class SslCredentials: """ def __init__(self): - use_client_cert = os.getenv( - environment_vars.GOOGLE_API_USE_CLIENT_CERTIFICATE, "false" - ) - if use_client_cert != "true": + use_client_cert = _mtls_helper.check_use_client_cert() + if not use_client_cert: self._is_mtls = False else: # Load client SSL credentials. diff --git a/contrib/python/google-auth/py3/google/auth/transport/mtls.py b/contrib/python/google-auth/py3/google/auth/transport/mtls.py index e7a7304f60ee..75e43687fc2f 100644 --- a/contrib/python/google-auth/py3/google/auth/transport/mtls.py +++ b/contrib/python/google-auth/py3/google/auth/transport/mtls.py @@ -110,3 +110,20 @@ def callback(): return cert_path, key_path, passphrase_bytes return callback + + +def should_use_client_cert(): + """Returns boolean for whether the client certificate should be used for mTLS. + + This is a wrapper around _mtls_helper.check_use_client_cert(). + If GOOGLE_API_USE_CLIENT_CERTIFICATE is set to true or false, a corresponding + bool value will be returned + If GOOGLE_API_USE_CLIENT_CERTIFICATE is unset, the value will be inferred by + reading a file pointed at by GOOGLE_API_CERTIFICATE_CONFIG, and verifying it + contains a "workload" section. If so, the function will return True, + otherwise False. + + Returns: + bool: indicating whether the client certificate should be used for mTLS. + """ + return _mtls_helper.check_use_client_cert() diff --git a/contrib/python/google-auth/py3/google/auth/transport/requests.py b/contrib/python/google-auth/py3/google/auth/transport/requests.py index 2753912c6d91..d1ff8f368cce 100644 --- a/contrib/python/google-auth/py3/google/auth/transport/requests.py +++ b/contrib/python/google-auth/py3/google/auth/transport/requests.py @@ -19,7 +19,6 @@ import functools import logging import numbers -import os import time try: @@ -35,7 +34,6 @@ ) # pylint: disable=ungrouped-imports from google.auth import _helpers -from google.auth import environment_vars from google.auth import exceptions from google.auth import transport import google.auth.transport._mtls_helper @@ -444,13 +442,10 @@ def configure_mtls_channel(self, client_cert_callback=None): google.auth.exceptions.MutualTLSChannelError: If mutual TLS channel creation failed for any reason. """ - use_client_cert = os.getenv( - environment_vars.GOOGLE_API_USE_CLIENT_CERTIFICATE, "false" - ) - if use_client_cert != "true": + use_client_cert = google.auth.transport._mtls_helper.check_use_client_cert() + if not use_client_cert: self._is_mtls = False return - try: import OpenSSL except ImportError as caught_exc: diff --git a/contrib/python/google-auth/py3/google/auth/transport/urllib3.py b/contrib/python/google-auth/py3/google/auth/transport/urllib3.py index 03ed75aa2f52..353cb8e08eb1 100644 --- a/contrib/python/google-auth/py3/google/auth/transport/urllib3.py +++ b/contrib/python/google-auth/py3/google/auth/transport/urllib3.py @@ -17,7 +17,6 @@ from __future__ import absolute_import import logging -import os import warnings # Certifi is Mozilla's certificate bundle. Urllib3 needs a certificate bundle @@ -51,7 +50,6 @@ from google.auth import _helpers -from google.auth import environment_vars from google.auth import exceptions from google.auth import transport from google.oauth2 import service_account @@ -335,12 +333,9 @@ def configure_mtls_channel(self, client_cert_callback=None): google.auth.exceptions.MutualTLSChannelError: If mutual TLS channel creation failed for any reason. """ - use_client_cert = os.getenv( - environment_vars.GOOGLE_API_USE_CLIENT_CERTIFICATE, "false" - ) - if use_client_cert != "true": + use_client_cert = transport._mtls_helper.check_use_client_cert() + if not use_client_cert: return False - try: import OpenSSL except ImportError as caught_exc: diff --git a/contrib/python/google-auth/py3/google/auth/version.py b/contrib/python/google-auth/py3/google/auth/version.py index 4b6c4fb25de5..20f2c8c0a90d 100644 --- a/contrib/python/google-auth/py3/google/auth/version.py +++ b/contrib/python/google-auth/py3/google/auth/version.py @@ -12,4 +12,4 @@ # See the License for the specific language governing permissions and # limitations under the License. -__version__ = "2.42.1" +__version__ = "2.43.0" diff --git a/contrib/python/google-auth/py3/tests/transport/test__mtls_helper.py b/contrib/python/google-auth/py3/tests/transport/test__mtls_helper.py index f6e20b726a86..01d5e3a40937 100644 --- a/contrib/python/google-auth/py3/tests/transport/test__mtls_helper.py +++ b/contrib/python/google-auth/py3/tests/transport/test__mtls_helper.py @@ -12,6 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. +import json import os import re @@ -638,3 +639,79 @@ def test_crypto_error(self): _mtls_helper.decrypt_private_key( ENCRYPTED_EC_PRIVATE_KEY, b"wrong_password" ) + + def test_check_use_client_cert(self, monkeypatch): + monkeypatch.setenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "true") + use_client_cert = _mtls_helper.check_use_client_cert() + assert use_client_cert is True + + def test_check_use_client_cert_for_workload_with_config_file(self, monkeypatch): + config_data = { + "version": 1, + "cert_configs": { + "workload": { + "cert_path": "path/to/cert/file", + "key_path": "path/to/key/file", + } + }, + } + config_filename = "mock_certificate_config.json" + config_file_content = json.dumps(config_data) + monkeypatch.setenv("GOOGLE_API_CERTIFICATE_CONFIG", config_filename) + monkeypatch.setenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "") + # Use mock_open to simulate the file in memory + mock_file_handle = mock.mock_open(read_data=config_file_content) + with mock.patch("builtins.open", mock_file_handle): + use_client_cert = _mtls_helper.check_use_client_cert() + assert use_client_cert is True + + def test_check_use_client_cert_false(self, monkeypatch): + monkeypatch.setenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "false") + use_client_cert = _mtls_helper.check_use_client_cert() + assert use_client_cert is False + + def test_check_use_client_cert_unsupported_value(self, monkeypatch): + monkeypatch.setenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "dummy") + use_client_cert = _mtls_helper.check_use_client_cert() + assert use_client_cert is False + + def test_check_use_client_cert_for_workload_with_config_file_not_found( + self, monkeypatch + ): + monkeypatch.setenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "") + use_client_cert = _mtls_helper.check_use_client_cert() + assert use_client_cert is False + + def test_check_use_client_cert_for_workload_with_config_file_not_json( + self, monkeypatch + ): + config_filename = "mock_certificate_config.json" + config_file_content = "not_valid_json" + monkeypatch.setenv("GOOGLE_API_CERTIFICATE_CONFIG", config_filename) + monkeypatch.setenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "") + # Use mock_open to simulate the file in memory + mock_file_handle = mock.mock_open(read_data=config_file_content) + with mock.patch("builtins.open", mock_file_handle): + use_client_cert = _mtls_helper.check_use_client_cert() + assert use_client_cert is False + + def test_check_use_client_cert_for_workload_with_config_file_no_workload( + self, monkeypatch + ): + config_data = {"version": 1, "cert_configs": {"dummy_key": {}}} + config_filename = "mock_certificate_config.json" + config_file_content = json.dumps(config_data) + monkeypatch.setenv("GOOGLE_API_CERTIFICATE_CONFIG", config_filename) + monkeypatch.setenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "") + # Use mock_open to simulate the file in memory + mock_file_handle = mock.mock_open(read_data=config_file_content) + with mock.patch("builtins.open", mock_file_handle): + use_client_cert = _mtls_helper.check_use_client_cert() + assert use_client_cert is False + + def test_check_use_client_cert_when_file_does_not_exist(self, monkeypatch): + config_filename = "mock_certificate_config.json" + monkeypatch.setenv("GOOGLE_API_CERTIFICATE_CONFIG", config_filename) + monkeypatch.setenv("GOOGLE_API_USE_CLIENT_CERTIFICATE", "") + use_client_cert = _mtls_helper.check_use_client_cert() + assert use_client_cert is False diff --git a/contrib/python/google-auth/py3/tests/transport/test_mtls.py b/contrib/python/google-auth/py3/tests/transport/test_mtls.py index ea549ae142b2..ef305395827c 100644 --- a/contrib/python/google-auth/py3/tests/transport/test_mtls.py +++ b/contrib/python/google-auth/py3/tests/transport/test_mtls.py @@ -94,3 +94,12 @@ def test_default_client_encrypted_cert_source( callback = mtls.default_client_encrypted_cert_source("cert_path", "key_path") with pytest.raises(exceptions.MutualTLSChannelError): callback() + + +@mock.patch("google.auth.transport._mtls_helper.check_use_client_cert", autospec=True) +def test_should_use_client_cert(check_use_client_cert): + check_use_client_cert.return_value = mock.Mock() + assert mtls.should_use_client_cert() + + check_use_client_cert.return_value = False + assert not mtls.should_use_client_cert() diff --git a/contrib/python/google-auth/py3/ya.make b/contrib/python/google-auth/py3/ya.make index 04afc964c15c..8d9b67b15db1 100644 --- a/contrib/python/google-auth/py3/ya.make +++ b/contrib/python/google-auth/py3/ya.make @@ -2,7 +2,7 @@ PY3_LIBRARY() -VERSION(2.42.1) +VERSION(2.43.0) LICENSE(Apache-2.0) From c4aa7fe91a08c3f3333919c1fb7d810147f5cd18 Mon Sep 17 00:00:00 2001 From: robot-contrib Date: Fri, 21 Nov 2025 15:04:16 +0300 Subject: [PATCH 07/16] Update contrib/python/types-protobuf to 6.32.1.20251105 commit_hash:45d040686ac6113ae9774c853e5473e95feb4d07 --- contrib/python/types-protobuf/.dist-info/METADATA | 8 ++++---- contrib/python/types-protobuf/README.md | 6 +++--- .../google-stubs/protobuf/internal/well_known_types.pyi | 4 ++-- .../types-protobuf/google-stubs/protobuf/message.pyi | 2 +- contrib/python/types-protobuf/ya.make | 2 +- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/contrib/python/types-protobuf/.dist-info/METADATA b/contrib/python/types-protobuf/.dist-info/METADATA index 630318d66302..8c447b21cb37 100644 --- a/contrib/python/types-protobuf/.dist-info/METADATA +++ b/contrib/python/types-protobuf/.dist-info/METADATA @@ -1,6 +1,6 @@ Metadata-Version: 2.4 Name: types-protobuf -Version: 6.32.1.20250918 +Version: 6.32.1.20251105 Summary: Typing stubs for protobuf License-Expression: Apache-2.0 Project-URL: Homepage, https://github.com/python/typeshed @@ -37,8 +37,8 @@ for more details. The source for this package can be found in the directory. This package was tested with the following type checkers: -* [mypy](https://github.com/python/mypy/) 1.18.1 -* [pyright](https://github.com/microsoft/pyright) 1.1.405 +* [mypy](https://github.com/python/mypy/) 1.18.2 +* [pyright](https://github.com/microsoft/pyright) 1.1.407 It was generated from typeshed commit -[`add4e85823fe0a7e45c51d6d4f3ef46041593bc8`](https://github.com/python/typeshed/commit/add4e85823fe0a7e45c51d6d4f3ef46041593bc8). +[`29f78ddcd1806ff8e1855971b8e9de1d1a5d96c3`](https://github.com/python/typeshed/commit/29f78ddcd1806ff8e1855971b8e9de1d1a5d96c3). diff --git a/contrib/python/types-protobuf/README.md b/contrib/python/types-protobuf/README.md index a18ebce0d41b..ebf153699d93 100644 --- a/contrib/python/types-protobuf/README.md +++ b/contrib/python/types-protobuf/README.md @@ -20,8 +20,8 @@ for more details. The source for this package can be found in the directory. This package was tested with the following type checkers: -* [mypy](https://github.com/python/mypy/) 1.18.1 -* [pyright](https://github.com/microsoft/pyright) 1.1.405 +* [mypy](https://github.com/python/mypy/) 1.18.2 +* [pyright](https://github.com/microsoft/pyright) 1.1.407 It was generated from typeshed commit -[`add4e85823fe0a7e45c51d6d4f3ef46041593bc8`](https://github.com/python/typeshed/commit/add4e85823fe0a7e45c51d6d4f3ef46041593bc8). \ No newline at end of file +[`29f78ddcd1806ff8e1855971b8e9de1d1a5d96c3`](https://github.com/python/typeshed/commit/29f78ddcd1806ff8e1855971b8e9de1d1a5d96c3). \ No newline at end of file diff --git a/contrib/python/types-protobuf/google-stubs/protobuf/internal/well_known_types.pyi b/contrib/python/types-protobuf/google-stubs/protobuf/internal/well_known_types.pyi index 69649998db4f..6527d3f6978e 100644 --- a/contrib/python/types-protobuf/google-stubs/protobuf/internal/well_known_types.pyi +++ b/contrib/python/types-protobuf/google-stubs/protobuf/internal/well_known_types.pyi @@ -67,7 +67,7 @@ _StructValue: TypeAlias = struct_pb2.Struct | struct_pb2.ListValue | str | float _StructValueArg: TypeAlias = _StructValue | Mapping[str, _StructValueArg] | Sequence[_StructValueArg] class Struct: - __slots__: tuple[()] = () + __slots__: tuple[str, ...] = () def __getitem__(self, key: str) -> _StructValue: ... def __setitem__(self, key: str, value: _StructValueArg) -> None: ... def __delitem__(self, key: str) -> None: ... @@ -81,7 +81,7 @@ class Struct: def update(self, dictionary: SupportsItems[str, _StructValueArg]) -> None: ... class ListValue: - __slots__: tuple[()] = () + __slots__: tuple[str, ...] = () def __len__(self) -> int: ... def append(self, value: _StructValue) -> None: ... def extend(self, elem_seq: Iterable[_StructValue]) -> None: ... diff --git a/contrib/python/types-protobuf/google-stubs/protobuf/message.pyi b/contrib/python/types-protobuf/google-stubs/protobuf/message.pyi index 5145b5330a2c..bd2aff9b7676 100644 --- a/contrib/python/types-protobuf/google-stubs/protobuf/message.pyi +++ b/contrib/python/types-protobuf/google-stubs/protobuf/message.pyi @@ -12,7 +12,7 @@ class DecodeError(Error): ... class EncodeError(Error): ... class Message: - __slots__: tuple[()] = () + __slots__: tuple[str, ...] = () DESCRIPTOR: Descriptor | _upb_Descriptor def __deepcopy__(self, memo: Any = None) -> Self: ... def __eq__(self, other_msg): ... diff --git a/contrib/python/types-protobuf/ya.make b/contrib/python/types-protobuf/ya.make index 985b513132ff..080fdd33200d 100644 --- a/contrib/python/types-protobuf/ya.make +++ b/contrib/python/types-protobuf/ya.make @@ -2,7 +2,7 @@ PY3_LIBRARY() -VERSION(6.32.1.20250918) +VERSION(6.32.1.20251105) LICENSE(Apache-2.0) From b10feee783782a477b3f8da9d51c0114a66fd573 Mon Sep 17 00:00:00 2001 From: artemmashin Date: Fri, 21 Nov 2025 15:31:00 +0300 Subject: [PATCH 08/16] add SecureParam to YtflowWrap nodes commit_hash:9f8b4398bcb1b1d9231f1d677abe2c75c75ba742 --- .../providers/ytflow/expr_nodes/yql_ytflow_expr_nodes.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/yt/yql/providers/ytflow/expr_nodes/yql_ytflow_expr_nodes.json b/yt/yql/providers/ytflow/expr_nodes/yql_ytflow_expr_nodes.json index 6c4e8428e300..712e5ebef376 100644 --- a/yt/yql/providers/ytflow/expr_nodes/yql_ytflow_expr_nodes.json +++ b/yt/yql/providers/ytflow/expr_nodes/yql_ytflow_expr_nodes.json @@ -32,7 +32,8 @@ "Base": "TCallable", "Match": {"Type": "Callable", "Name": "YtflowReadWrap"}, "Children": [ - {"Index": 0, "Name": "Input", "Type": "TExprBase"} + {"Index": 0, "Name": "Input", "Type": "TExprBase"}, + {"Index": 1, "Name": "Token", "Type": "TCoSecureParam", "Optional": true} ] }, { @@ -40,7 +41,8 @@ "Base": "TCallable", "Match": {"Type": "Callable", "Name": "YtflowWriteWrap"}, "Children": [ - {"Index": 0, "Name": "Input", "Type": "TExprBase"} + {"Index": 0, "Name": "Input", "Type": "TExprBase"}, + {"Index": 1, "Name": "Token", "Type": "TCoSecureParam", "Optional": true} ] }, { From 43a5605256b60296cd390964a242d467eb525901 Mon Sep 17 00:00:00 2001 From: robot-piglet Date: Fri, 21 Nov 2025 17:30:56 +0300 Subject: [PATCH 09/16] Intermediate changes commit_hash:9a5dbe931f528210ec902a424a6bdb850a8662cf --- yt/yt/core/rpc/grpc/config.cpp | 22 ++++++++ yt/yt/core/rpc/grpc/config.h | 18 +++++++ yt/yt/core/rpc/grpc/configure_dispatcher.cpp | 17 +++++- yt/yt/core/rpc/grpc/dispatcher.cpp | 54 ++++++++++++++++++++ yt/yt/core/rpc/grpc/dispatcher.h | 2 + yt/yt/core/rpc/grpc/private.h | 1 + yt/yt/core/rpc/grpc/public.h | 1 + 7 files changed, 113 insertions(+), 2 deletions(-) diff --git a/yt/yt/core/rpc/grpc/config.cpp b/yt/yt/core/rpc/grpc/config.cpp index 09052d13f707..86eea5e88618 100644 --- a/yt/yt/core/rpc/grpc/config.cpp +++ b/yt/yt/core/rpc/grpc/config.cpp @@ -19,6 +19,28 @@ void TDispatcherConfig::Register(TRegistrar registrar) registrar.Parameter("grpc_event_engine_thread_count", &TThis::GrpcEventEngineThreadCount) .GreaterThan(0) .Default(4); + + registrar.Parameter("grpc_internal_min_log_level", &TThis::GrpcInternalMinLogLevel) + .Default(NLogging::ELogLevel::Error); +} + +TDispatcherConfigPtr TDispatcherConfig::ApplyDynamic( + const TDispatcherDynamicConfigPtr& dynamicConfig) const +{ + auto mergedConfig = CloneYsonStruct(MakeStrong(this)); + + NYTree::UpdateYsonStructField(mergedConfig->GrpcInternalMinLogLevel, dynamicConfig->GrpcInternalMinLogLevel); + + mergedConfig->Postprocess(); + return mergedConfig; +} + +//////////////////////////////////////////////////////////////////////////////// + +void TDispatcherDynamicConfig::Register(TRegistrar registrar) +{ + registrar.Parameter("grpc_internal_min_log_level", &TThis::GrpcInternalMinLogLevel) + .Default(); } //////////////////////////////////////////////////////////////////////////////// diff --git a/yt/yt/core/rpc/grpc/config.h b/yt/yt/core/rpc/grpc/config.h index 4788f338f9de..ba6ee457c578 100644 --- a/yt/yt/core/rpc/grpc/config.h +++ b/yt/yt/core/rpc/grpc/config.h @@ -19,6 +19,10 @@ struct TDispatcherConfig int GrpcThreadCount; int GrpcEventEngineThreadCount; + NLogging::ELogLevel GrpcInternalMinLogLevel; + + TDispatcherConfigPtr ApplyDynamic(const TDispatcherDynamicConfigPtr& dynamicConfig) const; + REGISTER_YSON_STRUCT(TDispatcherConfig); static void Register(TRegistrar registrar); @@ -28,6 +32,20 @@ DEFINE_REFCOUNTED_TYPE(TDispatcherConfig) //////////////////////////////////////////////////////////////////////////////// +struct TDispatcherDynamicConfig + : public NYTree::TYsonStruct +{ + std::optional GrpcInternalMinLogLevel; + + REGISTER_YSON_STRUCT(TDispatcherDynamicConfig); + + static void Register(TRegistrar registrar); +}; + +DEFINE_REFCOUNTED_TYPE(TDispatcherDynamicConfig) + +//////////////////////////////////////////////////////////////////////////////// + struct TSslPemKeyCertPairConfig : public NYTree::TYsonStruct { diff --git a/yt/yt/core/rpc/grpc/configure_dispatcher.cpp b/yt/yt/core/rpc/grpc/configure_dispatcher.cpp index e12e1f1739a0..910d8e8d059d 100644 --- a/yt/yt/core/rpc/grpc/configure_dispatcher.cpp +++ b/yt/yt/core/rpc/grpc/configure_dispatcher.cpp @@ -14,14 +14,27 @@ void SetupSingletonConfigParameter(TYsonStructParameter& p parameter.DefaultNew(); } +void SetupSingletonConfigParameter(TYsonStructParameter& parameter) +{ + parameter.DefaultNew(); +} + void ConfigureSingleton(const TDispatcherConfigPtr& config) { TDispatcher::Get()->Configure(config); } -YT_DEFINE_CONFIGURABLE_SINGLETON( +void ReconfigureSingleton( + const TDispatcherConfigPtr& config, + const TDispatcherDynamicConfigPtr& dynamicConfig) +{ + TDispatcher::Get()->Reconfigure(config->ApplyDynamic(dynamicConfig)); +} + +YT_DEFINE_RECONFIGURABLE_SINGLETON( "grpc_dispatcher", - TDispatcherConfig); + TDispatcherConfig, + TDispatcherDynamicConfig); //////////////////////////////////////////////////////////////////////////////// diff --git a/yt/yt/core/rpc/grpc/dispatcher.cpp b/yt/yt/core/rpc/grpc/dispatcher.cpp index f2dd2472f347..aee589e13661 100644 --- a/yt/yt/core/rpc/grpc/dispatcher.cpp +++ b/yt/yt/core/rpc/grpc/dispatcher.cpp @@ -66,6 +66,21 @@ class TDispatcher::TImpl } Config_ = config; + InternalMinLogLevel_.store(config->GrpcInternalMinLogLevel); + } + + void Reconfigure(const TDispatcherConfigPtr& newConfig) + { + auto oldMinLogLevel = InternalMinLogLevel_.load(); + auto newMinLogLevel = newConfig->GrpcInternalMinLogLevel; + if (oldMinLogLevel == newMinLogLevel) { + return; + } + + InternalMinLogLevel_.store(newMinLogLevel); + YT_LOG_INFO("GRPC dispatcher reconfigured (NewMinLogLevel: %v, OldMinLogLevel: %v)", + newMinLogLevel, + oldMinLogLevel); } TGrpcLibraryLockPtr GetLibraryLock() @@ -176,6 +191,9 @@ class TDispatcher::TImpl grpc_core::Executor::SetThreadsLimit(Config_->GrpcThreadCount); grpc_event_engine::experimental::ThreadPool::SetThreadsLimit(Config_->GrpcEventEngineThreadCount); + gpr_set_log_verbosity(GPR_LOG_SEVERITY_DEBUG); + gpr_set_log_function(ProcessGrpcLogEvent); + // Initialize grpc only after configuration is done. auto grpcLock = New(); for (int index = 0; index < Config_->DispatcherThreadCount; ++index) { @@ -187,8 +205,39 @@ class TDispatcher::TImpl Initialized_.store(true); } + static void ProcessGrpcLogEvent(gpr_log_func_args* args) + { + auto& self = *Get()->Impl_; + + NLogging::ELogLevel level; + switch (args->severity) { + case GPR_LOG_SEVERITY_DEBUG: + level = NLogging::ELogLevel::Debug; + break; + case GPR_LOG_SEVERITY_INFO: + level = NLogging::ELogLevel::Info; + break; + case GPR_LOG_SEVERITY_ERROR: + level = NLogging::ELogLevel::Error; + break; + } + + auto minLogLevel = self.InternalMinLogLevel_.load(std::memory_order::relaxed); + if (level < minLogLevel) { + return; + } + + YT_LOG_EVENT( + GrpcInternalLogger, + level, + "%v (File: %qv, Line: %v)", + args->message, + args->file, + args->line); + } std::atomic Initialized_ = false; + std::atomic InternalMinLogLevel_ = NLogging::ELogLevel::Maximum; YT_DECLARE_SPIN_LOCK(NThreading::TSpinLock, ConfigLock_); TDispatcherConfigPtr Config_ = New(); @@ -215,6 +264,11 @@ void TDispatcher::Configure(const TDispatcherConfigPtr& config) Impl_->Configure(config); } +void TDispatcher::Reconfigure(const TDispatcherConfigPtr& newConfig) +{ + Impl_->Reconfigure(newConfig); +} + bool TDispatcher::IsInitialized() const noexcept { return Impl_->IsInitialized(); diff --git a/yt/yt/core/rpc/grpc/dispatcher.h b/yt/yt/core/rpc/grpc/dispatcher.h index afa0ac0a3971..7c9b0b7658b9 100644 --- a/yt/yt/core/rpc/grpc/dispatcher.h +++ b/yt/yt/core/rpc/grpc/dispatcher.h @@ -31,6 +31,8 @@ class TDispatcher */ void Configure(const TDispatcherConfigPtr& config); + void Reconfigure(const TDispatcherConfigPtr& newConfig); + [[nodiscard]] bool IsInitialized() const noexcept; TGrpcLibraryLockPtr GetLibraryLock(); diff --git a/yt/yt/core/rpc/grpc/private.h b/yt/yt/core/rpc/grpc/private.h index b03426eb316e..acad58aedc80 100644 --- a/yt/yt/core/rpc/grpc/private.h +++ b/yt/yt/core/rpc/grpc/private.h @@ -27,6 +27,7 @@ YT_DEFINE_GLOBAL(const NProfiling::TProfiler, GrpcServerProfiler, "/grpc/server" //////////////////////////////////////////////////////////////////////////////// YT_DEFINE_GLOBAL(const NLogging::TLogger, GrpcLogger, "Grpc"); +YT_DEFINE_GLOBAL(const NLogging::TLogger, GrpcInternalLogger, "GrpcInternal"); //////////////////////////////////////////////////////////////////////////////// diff --git a/yt/yt/core/rpc/grpc/public.h b/yt/yt/core/rpc/grpc/public.h index d166a4239674..20e2bd844141 100644 --- a/yt/yt/core/rpc/grpc/public.h +++ b/yt/yt/core/rpc/grpc/public.h @@ -9,6 +9,7 @@ namespace NYT::NRpc::NGrpc { //////////////////////////////////////////////////////////////////////////////// DECLARE_REFCOUNTED_STRUCT(TDispatcherConfig) +DECLARE_REFCOUNTED_STRUCT(TDispatcherDynamicConfig) DECLARE_REFCOUNTED_STRUCT(TSslPemKeyCertPairConfig) DECLARE_REFCOUNTED_STRUCT(TServerCredentialsConfig) DECLARE_REFCOUNTED_STRUCT(TServerAddressConfig) From b089a54fc81d1dc2289830b3920ea57441f790db Mon Sep 17 00:00:00 2001 From: babenko Date: Fri, 21 Nov 2025 17:30:56 +0300 Subject: [PATCH 10/16] Treat X-Request-Id as a synonym for X-Req-Id commit_hash:e6bc73c4d54915c96db6c3c684f15e5031f0df67 --- yt/yt/core/http/helpers.cpp | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/yt/yt/core/http/helpers.cpp b/yt/yt/core/http/helpers.cpp index 8c3b2f0cd5cf..8d82eacfbef8 100644 --- a/yt/yt/core/http/helpers.cpp +++ b/yt/yt/core/http/helpers.cpp @@ -335,7 +335,13 @@ std::optional FindHeader(const IRequestPtr& req, TStringBuf headerN std::optional FindBalancerRequestId(const IRequestPtr& req) { - return FindHeader(req, "X-Req-Id"); + if (auto result = FindHeader(req, "X-Req-Id")) { + return *result; + } + if (auto result = FindHeader(req, "X-Request-Id")) { + return *result; + } + return std::nullopt; } std::optional FindBalancerRealIP(const IRequestPtr& req) From b40f0bf5ff69a02b5f957efab14b17743f0912e9 Mon Sep 17 00:00:00 2001 From: robot-piglet Date: Fri, 21 Nov 2025 17:45:32 +0300 Subject: [PATCH 11/16] Intermediate changes commit_hash:b7787e3074015ce17dbffc88377a7e535c58634c --- yql/essentials/udfs/test/simple/simple_udf.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/yql/essentials/udfs/test/simple/simple_udf.cpp b/yql/essentials/udfs/test/simple/simple_udf.cpp index 318dac9e01d1..7b2b124af31d 100644 --- a/yql/essentials/udfs/test/simple/simple_udf.cpp +++ b/yql/essentials/udfs/test/simple/simple_udf.cpp @@ -1,6 +1,7 @@ #include #include #include +#include #include #include @@ -277,6 +278,11 @@ class TLogging: public TBoxedValue { const TLogComponentId Component_; }; +SIMPLE_UDF(TFileExists, bool(char*)) { + Y_UNUSED(valueBuilder); + return TUnboxedValuePod(NFs::Exists(TString(args[0].AsStringRef()))); +} + SIMPLE_MODULE(TSimpleUdfModule, TCrash, TException, @@ -297,7 +303,8 @@ SIMPLE_MODULE(TSimpleUdfModule, TIncrementOpt, TIncrementWithCounters, TGenericAsStruct, - TLogging) + TLogging, + TFileExists) } // namespace From b5c7669027e72bc3a265ed586dadadb4ddf35b5d Mon Sep 17 00:00:00 2001 From: vokayndzop Date: Fri, 21 Nov 2025 17:59:09 +0300 Subject: [PATCH 12/16] Watermarks: YQL: watermarks sql 2.0 commit_hash:2248d808136868c425ce9ceb05681c37fd108bb8 --- yql/essentials/sql/v1/SQLv1Antlr4.g.in | 5 +- .../sql/v1/complete/sql_complete_ut.cpp | 6 +-- yql/essentials/sql/v1/sql_translation.cpp | 14 ++++++ yql/essentials/sql/v1/sql_ut_common.h | 46 +++++++++++++++++-- .../udfs/language/yql/yql_language_udf.cpp | 5 ++ 5 files changed, 67 insertions(+), 9 deletions(-) diff --git a/yql/essentials/sql/v1/SQLv1Antlr4.g.in b/yql/essentials/sql/v1/SQLv1Antlr4.g.in index 996daaed0a0a..f6ecaadd79f7 100644 --- a/yql/essentials/sql/v1/SQLv1Antlr4.g.in +++ b/yql/essentials/sql/v1/SQLv1Antlr4.g.in @@ -1043,7 +1043,8 @@ table_hint: an_id_hint (EQUALS (type_name_tag | LPAREN type_name_tag (COMMA type_name_tag)* COMMA? RPAREN))? | (SCHEMA | COLUMNS) EQUALS? type_name_or_bind | SCHEMA EQUALS? LPAREN (struct_arg_positional (COMMA struct_arg_positional)*)? COMMA? RPAREN - | WATERMARK AS LPAREN expr RPAREN + | WATERMARK AS LPAREN expr RPAREN // TODO: remove deprecated + | WATERMARK EQUALS expr ; object_ref: (cluster_expr DOT)? id_or_at; @@ -1861,8 +1862,8 @@ keyword_compat: ( | VALUES | VIEW | VIRTUAL - | WITH | WATERMARK + | WITH | WRAPPER // | WRITE | XOR diff --git a/yql/essentials/sql/v1/complete/sql_complete_ut.cpp b/yql/essentials/sql/v1/complete/sql_complete_ut.cpp index 3b2897fd30b8..09706211c3cd 100644 --- a/yql/essentials/sql/v1/complete/sql_complete_ut.cpp +++ b/yql/essentials/sql/v1/complete/sql_complete_ut.cpp @@ -1005,7 +1005,7 @@ Y_UNIT_TEST(SelectTableHintName) { TVector expected = { {Keyword, "COLUMNS"}, {Keyword, "SCHEMA"}, - {Keyword, "WATERMARK AS()", 1}, + {Keyword, "WATERMARK"}, {HintName, "XLOCK"}, }; UNIT_ASSERT_VALUES_EQUAL(Complete(engine, "REDUCE my_table WITH "), expected); @@ -1014,7 +1014,7 @@ Y_UNIT_TEST(SelectTableHintName) { TVector expected = { {Keyword, "COLUMNS"}, {Keyword, "SCHEMA"}, - {Keyword, "WATERMARK AS()", 1}, + {Keyword, "WATERMARK"}, {HintName, "XLOCK"}, }; UNIT_ASSERT_VALUES_EQUAL(Complete(engine, "SELECT key FROM my_table WITH "), expected); @@ -1026,7 +1026,7 @@ Y_UNIT_TEST(InsertTableHintName) { {Keyword, "COLUMNS"}, {HintName, "EXPIRATION"}, {Keyword, "SCHEMA"}, - {Keyword, "WATERMARK AS()", 1}, + {Keyword, "WATERMARK"}, }; auto engine = MakeSqlCompletionEngineUT(); diff --git a/yql/essentials/sql/v1/sql_translation.cpp b/yql/essentials/sql/v1/sql_translation.cpp index 41309eca6d54..934d1d80a3ba 100644 --- a/yql/essentials/sql/v1/sql_translation.cpp +++ b/yql/essentials/sql/v1/sql_translation.cpp @@ -3616,6 +3616,8 @@ bool TSqlTranslation::TableHintImpl(const TRule_table_hint& rule, TTableHints& h // | (SCHEMA | COLUMNS) EQUALS? type_name_or_bind // | SCHEMA EQUALS? LPAREN (struct_arg_positional (COMMA struct_arg_positional)*)? COMMA? RPAREN // | WATERMARK AS LPAREN expr RPAREN + // | WATERMARK EQUALS expr + switch (rule.Alt_case()) { case TRule_table_hint::kAltTableHint1: { const auto& alt = rule.GetAlt_table_hint1(); @@ -3740,6 +3742,18 @@ bool TSqlTranslation::TableHintImpl(const TRule_table_hint& rule, TTableHints& h break; } + case TRule_table_hint::kAltTableHint5: { + const auto& alt = rule.GetAlt_table_hint5(); + const auto pos = Ctx_.TokenPosition(alt.GetToken1()); + TColumnRefScope scope(Ctx_, EColumnRefState::Allow); + auto expr = TSqlExpression(Ctx_, Mode_).Build(alt.GetRule_expr3()); + if (!expr) { + return false; + } + hints["watermark"] = {BuildLambda(pos, BuildList(pos, {BuildAtom(pos, "row")}), std::move(expr))}; + break; + } + case TRule_table_hint::ALT_NOT_SET: Y_UNREACHABLE(); } diff --git a/yql/essentials/sql/v1/sql_ut_common.h b/yql/essentials/sql/v1/sql_ut_common.h index d72f60a376ff..6d5829c345cc 100644 --- a/yql/essentials/sql/v1/sql_ut_common.h +++ b/yql/essentials/sql/v1/sql_ut_common.h @@ -9827,7 +9827,7 @@ Y_UNIT_TEST(SingleArg) { } // Y_UNIT_TEST_SUITE(AggregationPhases) Y_UNIT_TEST_SUITE(Watermarks) { -Y_UNIT_TEST(Insert) { +Y_UNIT_TEST(InsertAs) { const auto stmt = R"sql( USE plato; @@ -9839,7 +9839,7 @@ WITH( SCHEMA( ts Timestamp, ), - WATERMARK AS (ts) + WATERMARK AS (CAST(ts AS TImestamp)) ); )sql"; const auto& res = SqlToYql(stmt); @@ -9847,7 +9847,7 @@ WITH( UNIT_ASSERT(res.IsOk()); } -Y_UNIT_TEST(Select) { +Y_UNIT_TEST(SelectAs) { const auto stmt = R"sql( USE plato; @@ -9858,7 +9858,45 @@ WITH( SCHEMA( ts Timestamp, ), - WATERMARK AS (ts) + WATERMARK AS (CAST(ts AS TImestamp)) +); +)sql"; + const auto& res = SqlToYql(stmt); + Err2Str(res, EDebugOutput::ToCerr); + UNIT_ASSERT(res.IsOk()); +} +Y_UNIT_TEST(InsertEquals) { + const auto stmt = R"sql( +USE plato; + +INSERT INTO Output +SELECT + * +FROM Input +WITH( + SCHEMA( + ts Timestamp, + ), + WATERMARK = CAST(ts AS TImestamp) +); +)sql"; + const auto& res = SqlToYql(stmt); + Err2Str(res, EDebugOutput::ToCerr); + UNIT_ASSERT(res.IsOk()); +} + +Y_UNIT_TEST(SelectEquals) { + const auto stmt = R"sql( +USE plato; + +SELECT + * +FROM Input +WITH( + SCHEMA( + ts Timestamp, + ), + WATERMARK = CAST(ts AS TImestamp) ); )sql"; const auto& res = SqlToYql(stmt); diff --git a/yql/essentials/udfs/language/yql/yql_language_udf.cpp b/yql/essentials/udfs/language/yql/yql_language_udf.cpp index 51456413f73c..2f92d0c0a9c6 100644 --- a/yql/essentials/udfs/language/yql/yql_language_udf.cpp +++ b/yql/essentials/udfs/language/yql/yql_language_udf.cpp @@ -126,6 +126,11 @@ class TRuleFreqVisitor { Freqs_[std::make_pair(parent, alt.GetToken1().GetValue())] += 1; break; } + case TRule_table_hint::kAltTableHint5: { + const auto& alt = msg.GetAlt_table_hint5(); + Freqs_[std::make_pair(parent, alt.GetToken1().GetValue())] += 1; + break; + } case TRule_table_hint::ALT_NOT_SET: return; } From aaaa21e476afc02584e70962f47ec8d466cdc704 Mon Sep 17 00:00:00 2001 From: vitya-smirnov Date: Fri, 21 Nov 2025 18:12:18 +0300 Subject: [PATCH 13/16] YQL-20436: Use std::expected at sql_expression This patch introduces a new `TSQLV1Result` for error-handling in YQL translator. A nullable `TNodePtr` with 2 states was sufficient for error reporting, but `YqlSelect` feature fallback mode requires one more state `YqlSelectUnsupported`. `TSQLV1Result` is used at `YqlSelect` sub-translator and `sql_expression`. The last is needed to support `YqlSelect`-subqueries. For an error-handling `std::expected` is used with `TNonNull` pointer decorator to prevent implicit casts and ensure safety. For a legacy code interoperability `Wrap` and `Unwrap` methods where added. They convert `nullptr` to `ESQLV1Error::Basic` Unwrap is used in places, where `TSqlExpression` is called without `YqlSelect` configuration, so `YqlSelectUnsupported` is impossible. Also I noticed some strange error ignorance at JSON API translation and added `FIXME`s. commit_hash:47c1e05ef02574bfd3af4712bd8bfa652ab7868b --- yql/essentials/sql/v1/node.cpp | 16 + yql/essentials/sql/v1/node.h | 12 +- yql/essentials/sql/v1/result.cpp | 24 + yql/essentials/sql/v1/result.h | 46 ++ yql/essentials/sql/v1/sql_call_expr.cpp | 16 +- yql/essentials/sql/v1/sql_expression.cpp | 568 +++++++++++------- yql/essentials/sql/v1/sql_expression.h | 78 +-- yql/essentials/sql/v1/sql_group_by.cpp | 4 +- yql/essentials/sql/v1/sql_match_recognize.cpp | 4 +- yql/essentials/sql/v1/sql_query.cpp | 14 +- yql/essentials/sql/v1/sql_select.cpp | 24 +- yql/essentials/sql/v1/sql_select_yql.cpp | 138 +++-- yql/essentials/sql/v1/sql_select_yql.h | 13 +- yql/essentials/sql/v1/sql_translation.cpp | 44 +- yql/essentials/sql/v1/sql_ut_common.h | 3 +- yql/essentials/sql/v1/sql_values.cpp | 2 +- yql/essentials/sql/v1/ya.make | 1 + 17 files changed, 615 insertions(+), 392 deletions(-) create mode 100644 yql/essentials/sql/v1/result.cpp create mode 100644 yql/essentials/sql/v1/result.h diff --git a/yql/essentials/sql/v1/node.cpp b/yql/essentials/sql/v1/node.cpp index 4720a2e3e58f..dab5111ec558 100644 --- a/yql/essentials/sql/v1/node.cpp +++ b/yql/essentials/sql/v1/node.cpp @@ -423,6 +423,22 @@ void INode::DoAdd(TNodePtr node) { Y_DEBUG_ABORT_UNLESS(false, "Node is not expandable"); } +TNodeResult Wrap(TNodePtr node) { + if (!node) { + return std::unexpected(ESQLError::Basic); + } + + return TNonNull(std::move(node)); +} + +TNodePtr Unwrap(TNodeResult result) { + EnsureUnwrappable(result); + + return result + ? TNodePtr(std::move(*result)) + : nullptr; +} + bool IProxyNode::IsNull() const { return Inner_->IsNull(); } diff --git a/yql/essentials/sql/v1/node.h b/yql/essentials/sql/v1/node.h index 913ba2785d96..c9d59dc58336 100644 --- a/yql/essentials/sql/v1/node.h +++ b/yql/essentials/sql/v1/node.h @@ -1,12 +1,14 @@ #pragma once -#include +#include "result.h" + #include #include #include #include #include #include + #include #include #include @@ -15,6 +17,8 @@ #include #include +#include + #include #include @@ -290,6 +294,12 @@ class INode: public TSimpleRefCount { }; typedef INode::TPtr TNodePtr; +using TNodeResult = TSQLResult>; + +TNodeResult Wrap(TNodePtr node); + +TNodePtr Unwrap(TNodeResult result); + class IProxyNode: public INode { public: IProxyNode(TPosition pos, const TNodePtr& parent) diff --git a/yql/essentials/sql/v1/result.cpp b/yql/essentials/sql/v1/result.cpp new file mode 100644 index 000000000000..96c8a30ce489 --- /dev/null +++ b/yql/essentials/sql/v1/result.cpp @@ -0,0 +1,24 @@ +#include "result.h" + +#include + +namespace NSQLTranslationV1 { + +bool Unwrap(TSQLStatus status) { + EnsureUnwrappable(status); + return static_cast(status); +} + +} // namespace NSQLTranslationV1 + +template <> +void Out(IOutputStream& out, NSQLTranslationV1::ESQLError value) { + switch (value) { + case NSQLTranslationV1::ESQLError::Basic: + out << "Basic"; + break; + case NSQLTranslationV1::ESQLError::UnsupportedYqlSelect: + out << "UnsupportedYqlSelect"; + break; + } +} diff --git a/yql/essentials/sql/v1/result.h b/yql/essentials/sql/v1/result.h new file mode 100644 index 000000000000..4dcf3036ed8b --- /dev/null +++ b/yql/essentials/sql/v1/result.h @@ -0,0 +1,46 @@ +#pragma once + +#include + +#include +#include + +namespace NSQLTranslationV1 { + +template +class TNonNull final: public TPtr { +public: + explicit TNonNull(TPtr ptr) + : TPtr(std::move(ptr)) + { + YQL_ENSURE(*this); + } +}; + +enum class ESQLError { + Basic, + UnsupportedYqlSelect, +}; + +template +using TSQLResult = std::expected; + +using TSQLStatus = TSQLResult; + +template +bool IsUnwrappable(const TSQLResult& result) { + return result || result.error() == ESQLError::Basic; +} + +template +void EnsureUnwrappable(const TSQLResult& result) { + YQL_ENSURE( + IsUnwrappable(result), + "Expected " + << "at most " << ESQLError::Basic << " error, " + << "but got " << result.error()); +} + +bool Unwrap(TSQLStatus status); + +} // namespace NSQLTranslationV1 diff --git a/yql/essentials/sql/v1/sql_call_expr.cpp b/yql/essentials/sql/v1/sql_call_expr.cpp index 54f7738f8aea..86bb6c7d820c 100644 --- a/yql/essentials/sql/v1/sql_call_expr.cpp +++ b/yql/essentials/sql/v1/sql_call_expr.cpp @@ -124,13 +124,13 @@ bool TSqlCallExpr::Init(const TRule_value_constructor& node) { auto& ctor = node.GetAlt_value_constructor1(); Func_ = "Variant"; TSqlExpression expr(Ctx_, Mode_); - if (!Expr(expr, Args_, ctor.GetRule_expr3())) { + if (!Unwrap(Expr(expr, Args_, ctor.GetRule_expr3()))) { return false; } - if (!Expr(expr, Args_, ctor.GetRule_expr5())) { + if (!Unwrap(Expr(expr, Args_, ctor.GetRule_expr5()))) { return false; } - if (!Expr(expr, Args_, ctor.GetRule_expr7())) { + if (!Unwrap(Expr(expr, Args_, ctor.GetRule_expr7()))) { return false; } break; @@ -139,10 +139,10 @@ bool TSqlCallExpr::Init(const TRule_value_constructor& node) { auto& ctor = node.GetAlt_value_constructor2(); Func_ = "Enum"; TSqlExpression expr(Ctx_, Mode_); - if (!Expr(expr, Args_, ctor.GetRule_expr3())) { + if (!Unwrap(Expr(expr, Args_, ctor.GetRule_expr3()))) { return false; } - if (!Expr(expr, Args_, ctor.GetRule_expr5())) { + if (!Unwrap(Expr(expr, Args_, ctor.GetRule_expr5()))) { return false; } break; @@ -151,10 +151,10 @@ bool TSqlCallExpr::Init(const TRule_value_constructor& node) { auto& ctor = node.GetAlt_value_constructor3(); Func_ = "Callable"; TSqlExpression expr(Ctx_, Mode_); - if (!Expr(expr, Args_, ctor.GetRule_expr3())) { + if (!Unwrap(Expr(expr, Args_, ctor.GetRule_expr3()))) { return false; } - if (!Expr(expr, Args_, ctor.GetRule_expr5())) { + if (!Unwrap(Expr(expr, Args_, ctor.GetRule_expr5()))) { return false; } break; @@ -185,7 +185,7 @@ bool TSqlCallExpr::ExtractCallParam(const TRule_external_call_param& node) { } TSqlExpression expression(Ctx_, Mode_); - auto value = expression.Build(node.GetRule_expr3()); + TNodePtr value = Unwrap(expression.Build(node.GetRule_expr3())); if (value && optimizeForParam) { TDeferredAtom atom; MakeTableFromExpression(Ctx_.Pos(), Ctx_, value, atom); diff --git a/yql/essentials/sql/v1/sql_expression.cpp b/yql/essentials/sql/v1/sql_expression.cpp index c3b36f45f7fa..c5b303219921 100644 --- a/yql/essentials/sql/v1/sql_expression.cpp +++ b/yql/essentials/sql/v1/sql_expression.cpp @@ -1,14 +1,17 @@ #include "sql_expression.h" + #include "sql_call_expr.h" #include "sql_select.h" #include "sql_values.h" +#include "antlr_token.h" + #include #include + #include #include #include #include -#include "antlr_token.h" namespace NSQLTranslationV1 { @@ -16,7 +19,7 @@ using NALPDefaultAntlr4::SQLv1Antlr4Lexer; using namespace NSQLv1Generated; -TNodePtr TSqlExpression::BuildSourceOrNode(const TRule_expr& node) { +TNodeResult TSqlExpression::BuildSourceOrNode(const TRule_expr& node) { // expr: // or_subexpr (OR or_subexpr)* // | type_name_composite @@ -27,14 +30,14 @@ TNodePtr TSqlExpression::BuildSourceOrNode(const TRule_expr& node) { node.GetAlt_expr1().GetBlock2().begin(), node.GetAlt_expr1().GetBlock2().end(), {}); } case TRule_expr::kAltExpr2: { - return TypeNode(node.GetAlt_expr2().GetRule_type_name_composite1()); + return Wrap(TypeNode(node.GetAlt_expr2().GetRule_type_name_composite1())); } case TRule_expr::ALT_NOT_SET: Y_UNREACHABLE(); } } -TNodePtr TSqlExpression::Build(const TRule_expr& node) { +TNodeResult TSqlExpression::Build(const TRule_expr& node) { const bool prevIsSourceAllowed = IsSourceAllowed_; Y_DEFER { IsSourceAllowed_ = prevIsSourceAllowed; @@ -44,7 +47,7 @@ TNodePtr TSqlExpression::Build(const TRule_expr& node) { return BuildSourceOrNode(node); } -TNodePtr TSqlExpression::Build(const TRule_lambda_or_parameter& node) { +TNodeResult TSqlExpression::Build(const TRule_lambda_or_parameter& node) { // lambda_or_parameter: // lambda // | bind_parameter @@ -55,14 +58,15 @@ TNodePtr TSqlExpression::Build(const TRule_lambda_or_parameter& node) { case TRule_lambda_or_parameter::kAltLambdaOrParameter2: { TString named; if (!NamedNodeImpl(node.GetAlt_lambda_or_parameter2().GetRule_bind_parameter1(), named, *this)) { - return nullptr; + return std::unexpected(ESQLError::Basic); } - auto namedNode = GetNamedNode(named); + + TNodePtr namedNode = GetNamedNode(named); if (!namedNode) { - return nullptr; + return std::unexpected(ESQLError::Basic); } - return namedNode; + return TNonNull(std::move(namedNode)); } case TRule_lambda_or_parameter::ALT_NOT_SET: Y_UNREACHABLE(); @@ -70,7 +74,7 @@ TNodePtr TSqlExpression::Build(const TRule_lambda_or_parameter& node) { } TSourcePtr TSqlExpression::BuildSource(const TRule_select_or_expr& node) { - TNodePtr result = SelectOrExpr(node); + TNodePtr result = Unwrap(SelectOrExpr(node)); if (!result) { return nullptr; } @@ -84,28 +88,28 @@ TSourcePtr TSqlExpression::BuildSource(const TRule_select_or_expr& node) { } TNodePtr TSqlExpression::BuildSourceOrNode(const TRule_smart_parenthesis& node) { - return SmartParenthesis(node); + return Unwrap(SmartParenthesis(node)); } -TNodePtr TSqlExpression::SubExpr(const TRule_mul_subexpr& node, const TTrailingQuestions& tail) { +TNodeResult TSqlExpression::SubExpr(const TRule_mul_subexpr& node, const TTrailingQuestions& tail) { // mul_subexpr: con_subexpr (DOUBLE_PIPE con_subexpr)*; auto getNode = [](const TRule_mul_subexpr::TBlock2& b) -> const TRule_con_subexpr& { return b.GetRule_con_subexpr2(); }; return BinOper("Concat", node.GetRule_con_subexpr1(), getNode, node.GetBlock2().begin(), node.GetBlock2().end(), tail); } -TNodePtr TSqlExpression::SubExpr(const TRule_add_subexpr& node, const TTrailingQuestions& tail) { +TNodeResult TSqlExpression::SubExpr(const TRule_add_subexpr& node, const TTrailingQuestions& tail) { // add_subexpr: mul_subexpr ((ASTERISK | SLASH | PERCENT) mul_subexpr)*; auto getNode = [](const TRule_add_subexpr::TBlock2& b) -> const TRule_mul_subexpr& { return b.GetRule_mul_subexpr2(); }; return BinOpList(node.GetRule_mul_subexpr1(), getNode, node.GetBlock2().begin(), node.GetBlock2().end(), tail); } -TNodePtr TSqlExpression::SubExpr(const TRule_bit_subexpr& node, const TTrailingQuestions& tail) { +TNodeResult TSqlExpression::SubExpr(const TRule_bit_subexpr& node, const TTrailingQuestions& tail) { // bit_subexpr: add_subexpr ((PLUS | MINUS) add_subexpr)*; auto getNode = [](const TRule_bit_subexpr::TBlock2& b) -> const TRule_add_subexpr& { return b.GetRule_add_subexpr2(); }; return BinOpList(node.GetRule_add_subexpr1(), getNode, node.GetBlock2().begin(), node.GetBlock2().end(), tail); } -TNodePtr TSqlExpression::SubExpr(const TRule_neq_subexpr& node, const TTrailingQuestions& tailExternal) { +TNodeResult TSqlExpression::SubExpr(const TRule_neq_subexpr& node, const TTrailingQuestions& tailExternal) { // neq_subexpr: bit_subexpr ((SHIFT_LEFT | shift_right | ROT_LEFT | rot_right | AMPERSAND | PIPE | CARET) bit_subexpr)* // // trailing QUESTIONS are used in optional simple types (String?) and optional lambda args: ($x, $y?) -> ($x) // ((double_question neq_subexpr) => double_question neq_subexpr | QUESTION+)?; @@ -120,39 +124,39 @@ TNodePtr TSqlExpression::SubExpr(const TRule_neq_subexpr& node, const TTrailingQ } auto getNode = [](const TRule_neq_subexpr::TBlock2& b) -> const TRule_bit_subexpr& { return b.GetRule_bit_subexpr2(); }; - auto result = BinOpList(node.GetRule_bit_subexpr1(), getNode, node.GetBlock2().begin(), node.GetBlock2().end(), tail); + TNodeResult result = BinOpList(node.GetRule_bit_subexpr1(), getNode, node.GetBlock2().begin(), node.GetBlock2().end(), tail); if (!result) { - return {}; + return std::unexpected(result.error()); } if (node.HasBlock3()) { auto& block = node.GetBlock3(); if (block.Alt_case() == TRule_neq_subexpr::TBlock3::kAlt1) { TSqlExpression altExpr(Ctx_, Mode_); - auto altResult = SubExpr(block.GetAlt1().GetRule_neq_subexpr2(), {}); + TNodeResult altResult = SubExpr(block.GetAlt1().GetRule_neq_subexpr2(), {}); if (!altResult) { - return {}; + return std::unexpected(altResult.error()); } - const TVector args({result, altResult}); + const TVector args({std::move(*result), std::move(*altResult)}); Token(block.GetAlt1().GetRule_double_question1().GetToken1()); - result = BuildBuiltinFunc(Ctx_, Ctx_.Pos(), "Coalesce", args); + result = Wrap(BuildBuiltinFunc(Ctx_, Ctx_.Pos(), "Coalesce", args)); } } return result; } -TNodePtr TSqlExpression::SubExpr(const TRule_eq_subexpr& node, const TTrailingQuestions& tail) { +TNodeResult TSqlExpression::SubExpr(const TRule_eq_subexpr& node, const TTrailingQuestions& tail) { // eq_subexpr: neq_subexpr ((LESS | LESS_OR_EQ | GREATER | GREATER_OR_EQ) neq_subexpr)*; auto getNode = [](const TRule_eq_subexpr::TBlock2& b) -> const TRule_neq_subexpr& { return b.GetRule_neq_subexpr2(); }; return BinOpList(node.GetRule_neq_subexpr1(), getNode, node.GetBlock2().begin(), node.GetBlock2().end(), tail); } -TNodePtr TSqlExpression::SubExpr(const TRule_or_subexpr& node, const TTrailingQuestions& tail) { +TNodeResult TSqlExpression::SubExpr(const TRule_or_subexpr& node, const TTrailingQuestions& tail) { // or_subexpr: and_subexpr (AND and_subexpr)*; auto getNode = [](const TRule_or_subexpr::TBlock2& b) -> const TRule_and_subexpr& { return b.GetRule_and_subexpr2(); }; return BinOper("And", node.GetRule_and_subexpr1(), getNode, node.GetBlock2().begin(), node.GetBlock2().end(), tail); } -TNodePtr TSqlExpression::SubExpr(const TRule_and_subexpr& node, const TTrailingQuestions& tail) { +TNodeResult TSqlExpression::SubExpr(const TRule_and_subexpr& node, const TTrailingQuestions& tail) { // and_subexpr: xor_subexpr (XOR xor_subexpr)*; auto getNode = [](const TRule_and_subexpr::TBlock2& b) -> const TRule_xor_subexpr& { return b.GetRule_xor_subexpr2(); }; return BinOper("Xor", node.GetRule_xor_subexpr1(), getNode, node.GetBlock2().begin(), node.GetBlock2().end(), tail); @@ -167,7 +171,7 @@ bool ChangefeedSettingsEntry(const TRule_changefeed_settings_entry& node, TSqlEx } const auto& setting = node.GetRule_changefeed_setting_value3(); - auto exprNode = ctx.Build(setting.GetRule_expr1()); + auto exprNode = Unwrap(ctx.Build(setting.GetRule_expr1())); if (!exprNode) { ctx.Context().Error(id.Pos) << "Invalid changefeed setting: " << id.Name; @@ -291,27 +295,31 @@ bool WithoutAlpha(const std::string_view& literal) { } } // namespace -bool Expr(TSqlExpression& sqlExpr, TVector& exprNodes, const TRule_expr& node) { - TNodePtr exprNode = sqlExpr.Build(node); +TSQLStatus Expr(TSqlExpression& sqlExpr, TVector& exprNodes, const TRule_expr& node) { + TNodeResult exprNode = sqlExpr.Build(node); if (!exprNode) { - return false; + return std::unexpected(exprNode.error()); } - exprNodes.push_back(exprNode); - return true; + + exprNodes.push_back(std::move(*exprNode)); + return std::monostate(); } -bool ExprList(TSqlExpression& sqlExpr, TVector& exprNodes, const TRule_expr_list& node) { - if (!Expr(sqlExpr, exprNodes, node.GetRule_expr1())) { - return false; +TSQLStatus ExprList(TSqlExpression& sqlExpr, TVector& exprNodes, const TRule_expr_list& node) { + if (auto status = Expr(sqlExpr, exprNodes, node.GetRule_expr1()); !status) { + return std::unexpected(status.error()); } + for (auto b : node.GetBlock2()) { sqlExpr.Token(b.GetToken1()); - if (!Expr(sqlExpr, exprNodes, b.GetRule_expr2())) { - return false; + if (auto status = Expr(sqlExpr, exprNodes, b.GetRule_expr2()); !status) { + return std::unexpected(status.error()); } } - return true; + + return std::monostate(); } + bool ParseNumbers(TContext& ctx, const TString& strOrig, ui64& value, TString& suffix) { const auto str = to_lower(strOrig); const auto strLen = str.size(); @@ -498,13 +506,13 @@ TMaybe TSqlExpression::LiteralExpr(const TRule_literal_value& node } template -TNodePtr TSqlExpression::UnaryExpr(const TUnarySubExprType& node, const TTrailingQuestions& tail) { +TNodeResult TSqlExpression::UnaryExpr(const TUnarySubExprType& node, const TTrailingQuestions& tail) { if constexpr (std::is_same_v) { if (node.Alt_case() == TRule_unary_subexpr::kAltUnarySubexpr1) { return UnaryCasualExpr(node.GetAlt_unary_subexpr1().GetRule_unary_casual_subexpr1(), tail); } else if (tail.Count) { UnexpectedQuestionToken(tail); - return {}; + return std::unexpected(ESQLError::Basic); } else { MaybeUnnamedSmartParenOnTop_ = false; return JsonApiExpr(node.GetAlt_unary_subexpr2().GetRule_json_api_expr1()); @@ -515,7 +523,7 @@ TNodePtr TSqlExpression::UnaryExpr(const TUnarySubExprType& node, const TTrailin return UnaryCasualExpr(node.GetAlt_in_unary_subexpr1().GetRule_in_unary_casual_subexpr1(), tail); } else if (tail.Count) { UnexpectedQuestionToken(tail); - return {}; + return std::unexpected(ESQLError::Basic); } else { return JsonApiExpr(node.GetAlt_in_unary_subexpr2().GetRule_json_api_expr1()); } @@ -543,28 +551,33 @@ TNodePtr TSqlExpression::JsonReturningTypeRule(const TRule_type_name_simple& nod return TypeSimple(node, /* onlyDataAllowed */ true); } -TNodePtr TSqlExpression::JsonInputArg(const TRule_json_common_args& node) { +TNodeResult TSqlExpression::JsonInputArg(const TRule_json_common_args& node) { /* json_common_args: expr COMMA jsonpath_spec (PASSING json_variables)?; */ - TNodePtr jsonExpr = Build(node.GetRule_expr1()); - if (!jsonExpr || jsonExpr->IsNull()) { - jsonExpr = new TCallNodeImpl(Ctx_.Pos(), "Nothing", {new TCallNodeImpl(Ctx_.Pos(), "OptionalType", {BuildDataType(Ctx_.Pos(), "Json")})}); + + TNodeResult jsonExpr = Build(node.GetRule_expr1()); + if (!IsUnwrappable(jsonExpr)) { + return std::unexpected(jsonExpr.error()); + } + + // FIXME(vityaman): do not suppress syntax errors. + if (!jsonExpr || (*jsonExpr)->IsNull()) { + jsonExpr = TNonNull(TNodePtr(new TCallNodeImpl(Ctx_.Pos(), "Nothing", {new TCallNodeImpl(Ctx_.Pos(), "OptionalType", {BuildDataType(Ctx_.Pos(), "Json")})}))); } return jsonExpr; } -void TSqlExpression::AddJsonVariable(const TRule_json_variable& node, TVector& children) { +TSQLStatus TSqlExpression::AddJsonVariable(const TRule_json_variable& node, TVector& children) { /* json_variable: expr AS json_variable_name; */ - TNodePtr expr; TString rawName; TPosition namePos = Ctx_.Pos(); ui32 nameFlags = 0; - expr = Build(node.GetRule_expr1()); + TNodeResult expr = Build(node.GetRule_expr1()); const auto& nameRule = node.GetRule_json_variable_name3(); switch (nameRule.GetAltCase()) { case TRule_json_variable_name::kAltJsonVariableName1: @@ -576,7 +589,7 @@ void TSqlExpression::AddJsonVariable(const TRule_json_variable& node, TVectorContent; nameFlags = parsed->Flags; @@ -587,20 +600,33 @@ void TSqlExpression::AddJsonVariable(const TRule_json_variable& node, TVector& children) { +TSQLStatus TSqlExpression::AddJsonVariables(const TRule_json_variables& node, TVector& children) { /* json_variables: json_variable (COMMA json_variable)*; */ - AddJsonVariable(node.GetRule_json_variable1(), children); + if (auto status = AddJsonVariable(node.GetRule_json_variable1(), children); !IsUnwrappable(status)) { + return std::unexpected(status.error()); + } + for (size_t i = 0; i < node.Block2Size(); i++) { - AddJsonVariable(node.GetBlock2(i).GetRule_json_variable2(), children); + if (auto status = AddJsonVariable(node.GetBlock2(i).GetRule_json_variable2(), children); !IsUnwrappable(status)) { + return std::unexpected(status.error()); + } } + + return std::monostate(); } -TNodePtr TSqlExpression::JsonVariables(const TRule_json_common_args& node) { +TNodeResult TSqlExpression::JsonVariables(const TRule_json_common_args& node) { /* json_common_args: expr COMMA jsonpath_spec (PASSING json_variables)?; */ @@ -609,22 +635,32 @@ TNodePtr TSqlExpression::JsonVariables(const TRule_json_common_args& node) { if (node.HasBlock4()) { const auto& block = node.GetBlock4(); pos = GetPos(block.GetToken1()); - AddJsonVariables(block.GetRule_json_variables2(), variables); + if (auto status = AddJsonVariables(block.GetRule_json_variables2(), variables); !IsUnwrappable(status)) { + return std::unexpected(status.error()); + } } - return new TCallNodeImpl(pos, "JsonVariables", variables); + return TNonNull(TNodePtr(new TCallNodeImpl(pos, "JsonVariables", variables))); } -void TSqlExpression::AddJsonCommonArgs(const TRule_json_common_args& node, TVector& children) { +TSQLStatus TSqlExpression::AddJsonCommonArgs(const TRule_json_common_args& node, TVector& children) { /* json_common_args: expr COMMA jsonpath_spec (PASSING json_variables)?; */ - TNodePtr jsonExpr = JsonInputArg(node); + TNodeResult jsonExpr = JsonInputArg(node); TNodePtr jsonPath = JsonPathSpecification(node.GetRule_jsonpath_spec3()); - TNodePtr variables = JsonVariables(node); + TNodeResult variables = JsonVariables(node); - children.push_back(jsonExpr); + if (!IsUnwrappable(jsonExpr)) { + return std::unexpected(jsonExpr.error()); + } + if (!IsUnwrappable(variables)) { + return std::unexpected(variables.error()); + } + + children.push_back(Unwrap(jsonExpr)); children.push_back(jsonPath); - children.push_back(variables); + children.push_back(Unwrap(variables)); + return std::monostate(); } TNodePtr TSqlExpression::JsonValueCaseHandler(const TRule_json_case_handler& node, EJsonValueHandlerMode& mode) { @@ -645,7 +681,7 @@ TNodePtr TSqlExpression::JsonValueCaseHandler(const TRule_json_case_handler& nod } case TRule_json_case_handler::kAltJsonCaseHandler3: mode = EJsonValueHandlerMode::DefaultValue; - return Build(node.GetAlt_json_case_handler3().GetRule_expr2()); + return Unwrap(Build(node.GetAlt_json_case_handler3().GetRule_expr2())); // FIXME(YQL-20436): Use TSQLV1Result! case TRule_json_case_handler::ALT_NOT_SET: Y_UNREACHABLE(); } @@ -713,7 +749,7 @@ void TSqlExpression::AddJsonValueCaseHandlers(const TRule_json_value& node, TVec children.push_back(onError); } -TNodePtr TSqlExpression::JsonValueExpr(const TRule_json_value& node) { +TNodeResult TSqlExpression::JsonValueExpr(const TRule_json_value& node) { /* json_value: JSON_VALUE LPAREN json_common_args @@ -722,18 +758,22 @@ TNodePtr TSqlExpression::JsonValueExpr(const TRule_json_value& node) { RPAREN; */ TVector children; - AddJsonCommonArgs(node.GetRule_json_common_args3(), children); + if (auto status = AddJsonCommonArgs(node.GetRule_json_common_args3(), children); !IsUnwrappable(status)) { + return std::unexpected(status.error()); + } + AddJsonValueCaseHandlers(node, children); if (node.HasBlock4()) { auto returningType = JsonReturningTypeRule(node.GetBlock4().GetRule_type_name_simple2()); if (!returningType) { - return {}; + return std::unexpected(ESQLError::Basic); } + children.push_back(returningType); } - return new TCallNodeImpl(GetPos(node.GetToken1()), "JsonValue", children); + return TNonNull(TNodePtr(new TCallNodeImpl(GetPos(node.GetToken1()), "JsonValue", children))); } void TSqlExpression::AddJsonExistsHandler(const TRule_json_exists& node, TVector& children) { @@ -764,7 +804,7 @@ void TSqlExpression::AddJsonExistsHandler(const TRule_json_exists& node, TVector } } -TNodePtr TSqlExpression::JsonExistsExpr(const TRule_json_exists& node) { +TNodeResult TSqlExpression::JsonExistsExpr(const TRule_json_exists& node) { /* json_exists: JSON_EXISTS LPAREN json_common_args @@ -772,11 +812,13 @@ TNodePtr TSqlExpression::JsonExistsExpr(const TRule_json_exists& node) { RPAREN; */ TVector children; - AddJsonCommonArgs(node.GetRule_json_common_args3(), children); + if (auto status = AddJsonCommonArgs(node.GetRule_json_common_args3(), children); !IsUnwrappable(status)) { + return std::unexpected(status.error()); + } AddJsonExistsHandler(node, children); - return new TCallNodeImpl(GetPos(node.GetToken1()), "JsonExists", children); + return TNonNull(TNodePtr(new TCallNodeImpl(GetPos(node.GetToken1()), "JsonExists", children))); } EJsonQueryWrap TSqlExpression::JsonQueryWrapper(const TRule_json_query& node) { @@ -831,7 +873,7 @@ EJsonQueryHandler TSqlExpression::JsonQueryHandler(const TRule_json_query_handle } } -TNodePtr TSqlExpression::JsonQueryExpr(const TRule_json_query& node) { +TNodeResult TSqlExpression::JsonQueryExpr(const TRule_json_query& node) { /* json_query: JSON_QUERY LPAREN json_common_args @@ -842,7 +884,9 @@ TNodePtr TSqlExpression::JsonQueryExpr(const TRule_json_query& node) { */ TVector children; - AddJsonCommonArgs(node.GetRule_json_common_args3(), children); + if (auto status = AddJsonCommonArgs(node.GetRule_json_common_args3(), children); !IsUnwrappable(status)) { + return std::unexpected(status.error()); + } auto addChild = [&](TPosition pos, const TString& content) { children.push_back(BuildQuotedAtom(pos, content, TNodeFlags::Default)); @@ -856,7 +900,7 @@ TNodePtr TSqlExpression::JsonQueryExpr(const TRule_json_query& node) { if (wrapMode != EJsonQueryWrap::NoWrap) { Ctx_.Error() << "ON EMPTY is prohibited because WRAPPER clause is specified"; Ctx_.IncrementMonCounter("sql_errors", "JsonQueryOnEmptyWithWrapper"); - return nullptr; + return std::unexpected(ESQLError::Basic); } onEmpty = JsonQueryHandler(node.GetBlock5().GetRule_json_query_handler1()); } @@ -868,15 +912,15 @@ TNodePtr TSqlExpression::JsonQueryExpr(const TRule_json_query& node) { } addChild(Ctx_.Pos(), ToString(onError)); - return new TCallNodeImpl(GetPos(node.GetToken1()), "JsonQuery", children); + return TNonNull(TNodePtr(new TCallNodeImpl(GetPos(node.GetToken1()), "JsonQuery", children))); } -TNodePtr TSqlExpression::JsonApiExpr(const TRule_json_api_expr& node) { +TNodeResult TSqlExpression::JsonApiExpr(const TRule_json_api_expr& node) { /* json_api_expr: json_value | json_exists | json_query; */ TPosition pos = Ctx_.Pos(); - TNodePtr result = nullptr; + TNodeResult result = std::unexpected(ESQLError::Basic); switch (node.GetAltCase()) { case TRule_json_api_expr::kAltJsonApiExpr1: { const auto& jsonValue = node.GetAlt_json_api_expr1().GetRule_json_value1(); @@ -938,7 +982,7 @@ TNodePtr TSqlExpression::RowPatternVarAccess(TString var, const TRule_unary_sube } template -TNodePtr TSqlExpression::UnaryCasualExpr(const TUnaryCasualExprRule& node, const TTrailingQuestions& tail) { +TNodeResult TSqlExpression::UnaryCasualExpr(const TUnaryCasualExprRule& node, const TTrailingQuestions& tail) { // unary_casual_subexpr: (id_expr | atom_expr) unary_subexpr_suffix; // OR // in_unary_casual_subexpr: (id_expr_in | in_atom_expr) unary_subexpr_suffix; @@ -967,7 +1011,7 @@ TNodePtr TSqlExpression::UnaryCasualExpr(const TUnaryCasualExprRule& node, const } case TUnaryCasualExprRule::TBlock1::kAlt2: { auto& alt = block.GetAlt2(); - TMaybe exprOrId; + TSQLResult exprOrId; if constexpr (std::is_same_v) { exprOrId = AtomExpr(alt.GetRule_atom_expr1(), suffixIsEmpty ? tail : TTrailingQuestions{}); } else { @@ -976,8 +1020,12 @@ TNodePtr TSqlExpression::UnaryCasualExpr(const TUnaryCasualExprRule& node, const } if (!exprOrId) { - Ctx_.IncrementMonCounter("sql_errors", "BadAtomExpr"); - return nullptr; + if (exprOrId.error() == ESQLError::Basic) { + Ctx_.IncrementMonCounter("sql_errors", "BadAtomExpr"); + return std::unexpected(ESQLError::Basic); + } else { + return std::unexpected(exprOrId.error()); + } } if (!exprOrId->Expr) { name = exprOrId->Ident; @@ -1019,9 +1067,9 @@ TNodePtr TSqlExpression::UnaryCasualExpr(const TUnaryCasualExprRule& node, const EColumnRefState::MatchRecognizeDefineAggregate == Ctx_.GetColumnReferenceState())) { if (suffix.GetBlock1().size() != 1) { Ctx_.Error() << "Expected Var.Column, but got chain of " << suffix.GetBlock1().size() << " column accesses"; - return nullptr; + return std::unexpected(ESQLError::Basic); } - return RowPatternVarAccess(std::move(name), b.GetAlt3().GetBlock2()); + return Wrap(RowPatternVarAccess(std::move(name), b.GetAlt3().GetBlock2())); } break; } @@ -1046,24 +1094,24 @@ TNodePtr TSqlExpression::UnaryCasualExpr(const TUnaryCasualExprRule& node, const auto pgType = BuildSimpleType(Ctx_, Ctx_.Pos(), name, false); if (pgType && tail.Count) { Ctx_.Error() << "Optional types are not supported in this context"; - return {}; + return std::unexpected(ESQLError::Basic); } - return pgType; + return Wrap(std::move(pgType)); } if (auto simpleType = LookupSimpleType(name, flexibleTypes, false); simpleType && typePossible && suffixIsEmpty) { if (tail.Count > 0 || columnRefsState == EColumnRefState::Deny || !flexibleTypes) { // a type - return AddOptionals(BuildSimpleType(Ctx_, Ctx_.Pos(), name, false), tail.Count); + return Wrap(AddOptionals(BuildSimpleType(Ctx_, Ctx_.Pos(), name, false), tail.Count)); } // type or column: ambiguity will be resolved on type annotation stage columnOrType = columnRefsState == EColumnRefState::Allow; } if (tail.Count) { UnexpectedQuestionToken(tail); - return {}; + return std::unexpected(ESQLError::Basic); } if (!Ctx_.CheckColumnReference(Ctx_.Pos(), name)) { - return nullptr; + return std::unexpected(ESQLError::Basic); } TNodePtr id; @@ -1085,10 +1133,10 @@ TNodePtr TSqlExpression::UnaryCasualExpr(const TUnaryCasualExprRule& node, const switch (b.Alt_case()) { case TRule_unary_subexpr_suffix::TBlock1::TBlock1::kAlt1: { // key_expr - auto keyExpr = KeyExpr(b.GetAlt1().GetRule_key_expr1()); + TNodePtr keyExpr = KeyExpr(b.GetAlt1().GetRule_key_expr1()); if (!keyExpr) { Ctx_.IncrementMonCounter("sql_errors", "BadKeyExpr"); - return nullptr; + return std::unexpected(ESQLError::Basic); } if (!lastExpr) { @@ -1118,12 +1166,12 @@ TNodePtr TSqlExpression::UnaryCasualExpr(const TUnaryCasualExprRule& node, const } if (!initRet) { - return nullptr; + return std::unexpected(ESQLError::Basic); } lastExpr = call.BuildCall(); if (!lastExpr) { - return nullptr; + return std::unexpected(ESQLError::Basic); } break; @@ -1139,11 +1187,11 @@ TNodePtr TSqlExpression::UnaryCasualExpr(const TUnaryCasualExprRule& node, const case TRule_unary_subexpr_suffix_TBlock1_TBlock1_TAlt3_TBlock2::kAlt1: { TString named; if (!NamedNodeImpl(bb.GetAlt1().GetRule_bind_parameter1(), named, *this)) { - return nullptr; + return std::unexpected(ESQLError::Basic); } auto namedNode = GetNamedNode(named); if (!namedNode) { - return nullptr; + return std::unexpected(ESQLError::Basic); } ids.push_back(named); @@ -1185,9 +1233,10 @@ TNodePtr TSqlExpression::UnaryCasualExpr(const TUnaryCasualExprRule& node, const if (suffix.HasBlock2()) { Ctx_.IncrementMonCounter("sql_errors", "CollateUnarySubexpr"); Error() << "unary_subexpr: COLLATE is not implemented yet"; + // FIXME(vityaman): return an error } - return lastExpr; + return Wrap(std::move(lastExpr)); } TNodePtr TSqlExpression::BindParameterRule(const TRule_bind_parameter& rule, const TTrailingQuestions& tail) { @@ -1216,7 +1265,7 @@ TNodePtr TSqlExpression::BindParameterRule(const TRule_bind_parameter& rule, con return ret; } -TNodePtr TSqlExpression::LambdaRule(const TRule_lambda& rule) { +TNodeResult TSqlExpression::LambdaRule(const TRule_lambda& rule) { const auto& alt = rule; const bool isSqlLambda = alt.HasBlock2(); if (!isSqlLambda) { @@ -1230,16 +1279,16 @@ TNodePtr TSqlExpression::LambdaRule(const TRule_lambda& rule) { TColumnRefScope scope(Ctx_, EColumnRefState::Allow); TSqlExpression expr(Ctx_, Mode_); expr.SetSmartParenthesisMode(ESmartParenthesis::SqlLambdaParams); - parenthesis = expr.SmartParenthesis(alt.GetRule_smart_parenthesis1()); + parenthesis = Unwrap(expr.SmartParenthesis(alt.GetRule_smart_parenthesis1())); } if (!parenthesis) { - return {}; + return std::unexpected(ESQLError::Basic); } ui32 optionalArgumentsCount = 0; TVector args; if (!SqlLambdaParams(parenthesis, args, optionalArgumentsCount)) { - return {}; + return std::unexpected(ESQLError::Basic); } auto bodyBlock = alt.GetBlock2(); Token(bodyBlock.GetToken1()); @@ -1261,11 +1310,11 @@ TNodePtr TSqlExpression::LambdaRule(const TRule_lambda& rule) { for (const auto& arg : args) { argNames.push_back(arg.Name); if (!PopNamedNode(arg.Name)) { - return {}; + return std::unexpected(ESQLError::Basic); } } if (!ret) { - return {}; + return std::unexpected(ESQLError::Basic); } auto lambdaNode = BuildSqlLambda(pos, std::move(argNames), std::move(exprSeq)); @@ -1274,7 +1323,7 @@ TNodePtr TSqlExpression::LambdaRule(const TRule_lambda& rule) { BuildQuotedAtom(pos, ToString(optionalArgumentsCount), TNodeFlags::Default)}); } - return lambdaNode; + return Wrap(lambdaNode); } TNodePtr TSqlExpression::CastRule(const TRule_cast_expr& rule) { @@ -1283,7 +1332,7 @@ TNodePtr TSqlExpression::CastRule(const TRule_cast_expr& rule) { Token(alt.GetToken1()); TPosition pos(Ctx_.Pos()); TSqlExpression expr(Ctx_, Mode_); - auto exprNode = expr.Build(rule.GetRule_expr3()); + auto exprNode = Unwrap(expr.Build(rule.GetRule_expr3())); if (!exprNode) { return {}; } @@ -1300,7 +1349,7 @@ TNodePtr TSqlExpression::BitCastRule(const TRule_bitcast_expr& rule) { Token(alt.GetToken1()); TPosition pos(Ctx_.Pos()); TSqlExpression expr(Ctx_, Mode_); - auto exprNode = expr.Build(rule.GetRule_expr3()); + auto exprNode = Unwrap(expr.Build(rule.GetRule_expr3())); if (!exprNode) { return {}; } @@ -1353,7 +1402,7 @@ TNodePtr TSqlExpression::CaseRule(const TRule_case_expr& rule) { if (alt.HasBlock4()) { Token(alt.GetBlock4().GetToken1()); TSqlExpression expr(Ctx_, Mode_); - elseExpr = expr.Build(alt.GetBlock4().GetRule_expr2()); + elseExpr = Unwrap(expr.Build(alt.GetBlock4().GetRule_expr2())); } else { Ctx_.IncrementMonCounter("sql_errors", "ElseIsRequired"); Error() << "ELSE is required"; @@ -1363,7 +1412,7 @@ TNodePtr TSqlExpression::CaseRule(const TRule_case_expr& rule) { TNodePtr caseExpr; if (alt.HasBlock2()) { TSqlExpression expr(Ctx_, Mode_); - caseExpr = expr.Build(alt.GetBlock2().GetRule_expr1()); + caseExpr = Unwrap(expr.Build(alt.GetBlock2().GetRule_expr1())); if (!caseExpr) { return {}; } @@ -1375,7 +1424,7 @@ TNodePtr TSqlExpression::CaseRule(const TRule_case_expr& rule) { const auto& block = alt.GetBlock3(i).GetRule_when_expr1(); Token(block.GetToken1()); TSqlExpression condExpr(Ctx_, Mode_); - branches.back().Pred = condExpr.Build(block.GetRule_expr2()); + branches.back().Pred = Unwrap(condExpr.Build(block.GetRule_expr2())); if (caseExpr) { branches.back().Pred = BuildBinaryOp(Ctx_, Ctx_.Pos(), "==", caseExpr->Clone(), branches.back().Pred); } @@ -1384,7 +1433,7 @@ TNodePtr TSqlExpression::CaseRule(const TRule_case_expr& rule) { } Token(block.GetToken3()); TSqlExpression thenExpr(Ctx_, Mode_); - branches.back().Value = thenExpr.Build(block.GetRule_expr4()); + branches.back().Value = Unwrap(thenExpr.Build(block.GetRule_expr4())); if (!branches.back().Value) { return {}; } @@ -1393,7 +1442,7 @@ TNodePtr TSqlExpression::CaseRule(const TRule_case_expr& rule) { return BuildBuiltinFunc(Ctx_, Ctx_.Pos(), "If", {final.Pred, final.Value, elseExpr}); } -TMaybe TSqlExpression::AtomExpr(const TRule_atom_expr& node, const TTrailingQuestions& tail) { +TSQLResult TSqlExpression::AtomExpr(const TRule_atom_expr& node, const TTrailingQuestions& tail) { // atom_expr: // literal_value // | bind_parameter @@ -1410,19 +1459,27 @@ TMaybe TSqlExpression::AtomExpr(const TRule_atom_expr& node, const // ; if (node.Alt_case() != TRule_atom_expr::kAltAtomExpr2 && tail.Count) { UnexpectedQuestionToken(tail); - return {}; + return std::unexpected(ESQLError::Basic); } MaybeUnnamedSmartParenOnTop_ = MaybeUnnamedSmartParenOnTop_ && (node.Alt_case() == TRule_atom_expr::kAltAtomExpr3); TExprOrIdent result; switch (node.Alt_case()) { case TRule_atom_expr::kAltAtomExpr1: Ctx_.IncrementMonCounter("sql_features", "LiteralExpr"); - return LiteralExpr(node.GetAlt_atom_expr1().GetRule_literal_value1()); + if (auto result = LiteralExpr(node.GetAlt_atom_expr1().GetRule_literal_value1())) { + return std::move(*result); + } else { + return std::unexpected(ESQLError::Basic); + } case TRule_atom_expr::kAltAtomExpr2: result.Expr = BindParameterRule(node.GetAlt_atom_expr2().GetRule_bind_parameter1(), tail); break; case TRule_atom_expr::kAltAtomExpr3: - result.Expr = LambdaRule(node.GetAlt_atom_expr3().GetRule_lambda1()); + if (auto expected = LambdaRule(node.GetAlt_atom_expr3().GetRule_lambda1())) { + result.Expr = std::move(*expected); + } else { + return std::unexpected(expected.error()); + } break; case TRule_atom_expr::kAltAtomExpr4: result.Expr = CastRule(node.GetAlt_atom_expr4().GetRule_cast_expr1()); @@ -1478,12 +1535,12 @@ TMaybe TSqlExpression::AtomExpr(const TRule_atom_expr& node, const Y_UNREACHABLE(); } if (!result.Expr) { - return {}; + return std::unexpected(ESQLError::Basic); } return result; } -TMaybe TSqlExpression::InAtomExpr(const TRule_in_atom_expr& node, const TTrailingQuestions& tail) { +TSQLResult TSqlExpression::InAtomExpr(const TRule_in_atom_expr& node, const TTrailingQuestions& tail) { // in_atom_expr: // literal_value // | bind_parameter @@ -1500,18 +1557,26 @@ TMaybe TSqlExpression::InAtomExpr(const TRule_in_atom_expr& node, // ; if (node.Alt_case() != TRule_in_atom_expr::kAltInAtomExpr2 && tail.Count) { UnexpectedQuestionToken(tail); - return {}; + return std::unexpected(ESQLError::Basic); } TExprOrIdent result; switch (node.Alt_case()) { case TRule_in_atom_expr::kAltInAtomExpr1: Ctx_.IncrementMonCounter("sql_features", "LiteralExpr"); - return LiteralExpr(node.GetAlt_in_atom_expr1().GetRule_literal_value1()); + if (auto result = LiteralExpr(node.GetAlt_in_atom_expr1().GetRule_literal_value1())) { + return *result; + } else { + return std::unexpected(ESQLError::Basic); + } case TRule_in_atom_expr::kAltInAtomExpr2: result.Expr = BindParameterRule(node.GetAlt_in_atom_expr2().GetRule_bind_parameter1(), tail); break; case TRule_in_atom_expr::kAltInAtomExpr3: - result.Expr = LambdaRule(node.GetAlt_in_atom_expr3().GetRule_lambda1()); + if (auto expected = LambdaRule(node.GetAlt_in_atom_expr3().GetRule_lambda1())) { + result.Expr = std::move(*expected); + } else { + return std::unexpected(expected.error()); + } break; case TRule_in_atom_expr::kAltInAtomExpr4: result.Expr = CastRule(node.GetAlt_in_atom_expr4().GetRule_cast_expr1()); @@ -1564,7 +1629,7 @@ TMaybe TSqlExpression::InAtomExpr(const TRule_in_atom_expr& node, Y_UNREACHABLE(); } if (!result.Expr) { - return {}; + return std::unexpected(ESQLError::Basic); } return result; } @@ -1604,7 +1669,7 @@ bool TSqlExpression::SqlLambdaParams(const TNodePtr& node, TVector& exprSeq) { TSqlExpression expr(ctx, ctx.Settings.Mode); - TNodePtr nodeExpr = expr.Build(node); + TNodePtr nodeExpr = Unwrap(expr.Build(node)); if (!nodeExpr) { return false; } @@ -1663,7 +1728,7 @@ bool TSqlExpression::SqlLambdaExprBody(TContext& ctx, const TRule_lambda_body& n TNodePtr nodeExpr; if (!hasError) { - nodeExpr = expr.Build(node.GetRule_expr4()); + nodeExpr = Unwrap(expr.Build(node.GetRule_expr4())); } for (const auto& name : localNames) { @@ -1679,7 +1744,7 @@ bool TSqlExpression::SqlLambdaExprBody(TContext& ctx, const TRule_lambda_body& n return true; } -TNodePtr TSqlExpression::SubExpr(const TRule_con_subexpr& node, const TTrailingQuestions& tail) { +TNodeResult TSqlExpression::SubExpr(const TRule_con_subexpr& node, const TTrailingQuestions& tail) { // con_subexpr: unary_subexpr | unary_op unary_subexpr; switch (node.Alt_case()) { case TRule_con_subexpr::kAltConSubexpr1: @@ -1703,24 +1768,27 @@ TNodePtr TSqlExpression::SubExpr(const TRule_con_subexpr& node, const TTrailingQ } else { Ctx_.IncrementMonCounter("sql_errors", "UnsupportedUnaryOperation"); Error() << "Unsupported unary operation: " << token.GetValue(); - return nullptr; + return std::unexpected(ESQLError::Basic); } Ctx_.IncrementMonCounter("sql_unary_operations", opName); - auto expr = UnaryExpr(node.GetAlt_con_subexpr2().GetRule_unary_subexpr2(), tail); - return expr ? expr->ApplyUnaryOp(Ctx_, pos, opName) : expr; + if (auto result = UnaryExpr(node.GetAlt_con_subexpr2().GetRule_unary_subexpr2(), tail)) { + return Wrap((*result)->ApplyUnaryOp(Ctx_, pos, opName)); + } else { + return std::unexpected(result.error()); + } } case TRule_con_subexpr::ALT_NOT_SET: Y_UNREACHABLE(); } - return nullptr; + return std::unexpected(ESQLError::Basic); } -TNodePtr TSqlExpression::SubExpr(const TRule_xor_subexpr& node, const TTrailingQuestions& tail) { +TNodeResult TSqlExpression::SubExpr(const TRule_xor_subexpr& node, const TTrailingQuestions& tail) { // xor_subexpr: eq_subexpr cond_expr?; MaybeUnnamedSmartParenOnTop_ = MaybeUnnamedSmartParenOnTop_ && !node.HasBlock2(); - TNodePtr res(SubExpr(node.GetRule_eq_subexpr1(), node.HasBlock2() ? TTrailingQuestions{} : tail)); + TNodeResult res(SubExpr(node.GetRule_eq_subexpr1(), node.HasBlock2() ? TTrailingQuestions{} : tail)); if (!res) { - return {}; + return std::unexpected(res.error()); } TPosition pos(Ctx_.Pos()); if (node.HasBlock2()) { @@ -1730,49 +1798,49 @@ TNodePtr TSqlExpression::SubExpr(const TRule_xor_subexpr& node, const TTrailingQ const auto& matchOp = cond.GetAlt_cond_expr1(); const bool notMatch = matchOp.HasBlock1(); const TCiString& opName = Token(matchOp.GetRule_match_op2().GetToken1()); - const auto& pattern = SubExpr(cond.GetAlt_cond_expr1().GetRule_eq_subexpr3(), matchOp.HasBlock4() ? TTrailingQuestions{} : tail); + TNodeResult pattern = SubExpr(cond.GetAlt_cond_expr1().GetRule_eq_subexpr3(), matchOp.HasBlock4() ? TTrailingQuestions{} : tail); if (!pattern) { - return {}; + return std::unexpected(pattern.error()); } TNodePtr isMatch; if (opName == "like" || opName == "ilike") { const TString* escapeLiteral = nullptr; TNodePtr escapeNode; const auto& escaper = BuildUdf(Ctx_, pos, "Re2", "PatternFromLike", {}); - TVector escaperArgs({escaper, pattern}); + TVector escaperArgs({escaper, *pattern}); if (matchOp.HasBlock4()) { const auto& escapeBlock = matchOp.GetBlock4(); - TNodePtr escapeExpr = SubExpr(escapeBlock.GetRule_eq_subexpr2(), tail); + TNodeResult escapeExpr = SubExpr(escapeBlock.GetRule_eq_subexpr2(), tail); if (!escapeExpr) { - return {}; + return std::unexpected(escapeExpr.error()); } - escapeLiteral = escapeExpr->GetLiteral("String"); - escapeNode = escapeExpr; + escapeLiteral = (*escapeExpr)->GetLiteral("String"); + escapeNode = (*escapeExpr); if (escapeLiteral) { Ctx_.IncrementMonCounter("sql_features", "LikeEscape"); if (escapeLiteral->size() != 1) { Ctx_.IncrementMonCounter("sql_errors", "LikeMultiCharEscape"); Error() << "ESCAPE clause requires single character argument"; - return nullptr; + return std::unexpected(ESQLError::Basic); } if (escapeLiteral[0] == "%" || escapeLiteral[0] == "_" || escapeLiteral[0] == "\\") { Ctx_.IncrementMonCounter("sql_errors", "LikeUnsupportedEscapeChar"); Error() << "'%', '_' and '\\' are currently not supported in ESCAPE clause, "; Error() << "please choose any other character"; - return nullptr; + return std::unexpected(ESQLError::Basic); } if (!IsAscii(escapeLiteral->front())) { Ctx_.IncrementMonCounter("sql_errors", "LikeUnsupportedEscapeChar"); Error() << "Non-ASCII symbols are not supported in ESCAPE clause, "; Error() << "please choose ASCII character"; - return nullptr; + return std::unexpected(ESQLError::Basic); } escaperArgs.push_back(BuildLiteralRawString(pos, *escapeLiteral)); } else { Ctx_.IncrementMonCounter("sql_errors", "LikeNotLiteralEscape"); Error() << "ESCAPE clause requires String literal argument"; - return nullptr; + return std::unexpected(ESQLError::Basic); } } @@ -1790,12 +1858,12 @@ TNodePtr TSqlExpression::SubExpr(const TRule_xor_subexpr& node, const TTrailingQ auto runConfig = new TAstListNodeImpl(pos, {new TAstAtomNodeImpl(pos, "quote", 0), list}); const TNodePtr matcher = new TCallNodeImpl(pos, "AssumeStrict", {BuildUdf(Ctx_, pos, "Re2", "Match", {runConfig})}); - isMatch = new TCallNodeImpl(pos, "Apply", {matcher, res}); + isMatch = new TCallNodeImpl(pos, "Apply", {matcher, *res}); bool isUtf8 = false; - const TString* literalPattern = pattern->GetLiteral("String"); + const TString* literalPattern = (*pattern)->GetLiteral("String"); if (!literalPattern) { - literalPattern = pattern->GetLiteral("Utf8"); + literalPattern = (*pattern)->GetLiteral("Utf8"); isUtf8 = literalPattern != nullptr; } @@ -1826,7 +1894,7 @@ TNodePtr TSqlExpression::SubExpr(const TRule_xor_subexpr& node, const TTrailingQ if (inEscape) { Ctx_.IncrementMonCounter("sql_errors", "LikeEscapeSymbolEnd"); Error() << "LIKE pattern should not end with escape symbol"; - return nullptr; + return std::unexpected(ESQLError::Basic); } if ((opName == "like") || mayIgnoreCase || Ctx_.OptimizeSimpleIlike) { @@ -1842,14 +1910,14 @@ TNodePtr TSqlExpression::SubExpr(const TRule_xor_subexpr& node, const TTrailingQ if (components.size() == 1 && first.IsSimple) { // no '%'s and '_'s in pattern YQL_ENSURE(first.Prefix == first.Suffix); - isMatch = BuildBinaryOp(Ctx_, pos, equalOp, res, BuildLiteralRawString(pos, first.Suffix, isUtf8)); + isMatch = BuildBinaryOp(Ctx_, pos, equalOp, *res, BuildLiteralRawString(pos, first.Suffix, isUtf8)); } else if (!first.Prefix.empty()) { const TString& prefix = first.Prefix; TNodePtr prefixMatch; if (Ctx_.EmitStartsWith) { - prefixMatch = BuildBinaryOp(Ctx_, pos, startsWithOp, res, BuildLiteralRawString(pos, prefix, isUtf8)); + prefixMatch = BuildBinaryOp(Ctx_, pos, startsWithOp, *res, BuildLiteralRawString(pos, prefix, isUtf8)); } else { - prefixMatch = BuildBinaryOp(Ctx_, pos, ">=", res, BuildLiteralRawString(pos, prefix, isUtf8)); + prefixMatch = BuildBinaryOp(Ctx_, pos, ">=", *res, BuildLiteralRawString(pos, prefix, isUtf8)); auto upperBound = isUtf8 ? NextValidUtf8(prefix) : NextLexicographicString(prefix); if (upperBound) { prefixMatch = BuildBinaryOp( @@ -1857,7 +1925,7 @@ TNodePtr TSqlExpression::SubExpr(const TRule_xor_subexpr& node, const TTrailingQ pos, "And", prefixMatch, - BuildBinaryOp(Ctx_, pos, "<", res, BuildLiteralRawString(pos, TString(*upperBound), isUtf8))); + BuildBinaryOp(Ctx_, pos, "<", *res, BuildLiteralRawString(pos, TString(*upperBound), isUtf8))); } } @@ -1869,9 +1937,9 @@ TNodePtr TSqlExpression::SubExpr(const TRule_xor_subexpr& node, const TTrailingQ } else { // len(str) >= len(prefix) + len(suffix) && StartsWith(str, prefix) && EndsWith(str, suffix) TNodePtr sizePred = BuildBinaryOp(Ctx_, pos, ">=", - TNodePtr(new TCallNodeImpl(pos, "Size", {res})), + TNodePtr(new TCallNodeImpl(pos, "Size", {*res})), TNodePtr(new TLiteralNumberNode(pos, "Uint32", ToString(prefix.size() + suffix.size())))); - TNodePtr suffixMatch = BuildBinaryOp(Ctx_, pos, endsWithOp, res, BuildLiteralRawString(pos, suffix, isUtf8)); + TNodePtr suffixMatch = BuildBinaryOp(Ctx_, pos, endsWithOp, *res, BuildLiteralRawString(pos, suffix, isUtf8)); isMatch = new TCallNodeImpl(pos, "And", {sizePred, prefixMatch, suffixMatch}); @@ -1884,14 +1952,14 @@ TNodePtr TSqlExpression::SubExpr(const TRule_xor_subexpr& node, const TTrailingQ if (components.size() == 3 && components.back().Prefix.empty()) { // '%foo%' YQL_ENSURE(!components[1].Prefix.empty()); - isMatch = BuildBinaryOp(Ctx_, pos, containsOp, res, BuildLiteralRawString(pos, components[1].Prefix, isUtf8)); + isMatch = BuildBinaryOp(Ctx_, pos, containsOp, *res, BuildLiteralRawString(pos, components[1].Prefix, isUtf8)); } else if (components.size() == 2) { // '%foo' - isMatch = BuildBinaryOp(Ctx_, pos, endsWithOp, res, BuildLiteralRawString(pos, components[1].Prefix, isUtf8)); + isMatch = BuildBinaryOp(Ctx_, pos, endsWithOp, *res, BuildLiteralRawString(pos, components[1].Prefix, isUtf8)); } } else if (Ctx_.AnsiLike && !components.back().Suffix.empty()) { const TString& suffix = components.back().Suffix; - TNodePtr suffixMatch = BuildBinaryOp(Ctx_, pos, endsWithOp, res, BuildLiteralRawString(pos, suffix, isUtf8)); + TNodePtr suffixMatch = BuildBinaryOp(Ctx_, pos, endsWithOp, *res, BuildLiteralRawString(pos, suffix, isUtf8)); isMatch = BuildBinaryOp(Ctx_, pos, "And", suffixMatch, isMatch); } // TODO: more StringContains/StartsWith/EndsWith cases? @@ -1906,7 +1974,7 @@ TNodePtr TSqlExpression::SubExpr(const TRule_xor_subexpr& node, const TTrailingQ TString opNameUpper(opName); opNameUpper.to_upper(); Error() << opName << " and ESCAPE clauses should not be used together"; - return nullptr; + return std::unexpected(ESQLError::Basic); } if (!Ctx_.PragmaRegexUseRe2) { @@ -1914,12 +1982,14 @@ TNodePtr TSqlExpression::SubExpr(const TRule_xor_subexpr& node, const TTrailingQ out << "Legacy regex engine works incorrectly with unicode. " << "Use PRAGMA RegexUseRe2='true';"; })) { - return nullptr; + return std::unexpected(ESQLError::Basic); } } - const auto& matcher = Ctx_.PragmaRegexUseRe2 ? BuildUdf(Ctx_, pos, "Re2", opName == "match" ? "Match" : "Grep", {BuildTuple(pos, {pattern, BuildLiteralNull(pos)})}) : BuildUdf(Ctx_, pos, "Pcre", opName == "match" ? "BacktrackingMatch" : "BacktrackingGrep", {pattern}); - isMatch = new TCallNodeImpl(pos, "Apply", {matcher, res}); + const auto& matcher = Ctx_.PragmaRegexUseRe2 + ? BuildUdf(Ctx_, pos, "Re2", opName == "match" ? "Match" : "Grep", {BuildTuple(pos, {*pattern, BuildLiteralNull(pos)})}) + : BuildUdf(Ctx_, pos, "Pcre", opName == "match" ? "BacktrackingMatch" : "BacktrackingGrep", {*pattern}); + isMatch = new TCallNodeImpl(pos, "Apply", {matcher, *res}); if (opName != "match") { Ctx_.IncrementMonCounter("sql_features", notMatch ? "NotRegexp" : "Regexp"); } else { @@ -1928,9 +1998,9 @@ TNodePtr TSqlExpression::SubExpr(const TRule_xor_subexpr& node, const TTrailingQ } else { Ctx_.IncrementMonCounter("sql_errors", "UnknownMatchOp"); AltNotImplemented("match_op", cond); - return nullptr; + return std::unexpected(ESQLError::Basic); } - return (notMatch && isMatch) ? isMatch->ApplyUnaryOp(Ctx_, pos, "Not") : isMatch; + return Wrap((notMatch && isMatch) ? isMatch->ApplyUnaryOp(Ctx_, pos, "Not") : isMatch); } case TRule_cond_expr::kAltCondExpr2: { // | NOT? IN COMPACT? in_expr @@ -1949,14 +2019,14 @@ TNodePtr TSqlExpression::SubExpr(const TRule_xor_subexpr& node, const TTrailingQ } TSqlExpression inSubexpr(Ctx_, Mode_); auto inRight = inSubexpr.SqlInExpr(altInExpr.GetRule_in_expr4(), tail); - auto isIn = BuildBuiltinFunc(Ctx_, pos, "In", {res, inRight, hints}); + auto isIn = BuildBuiltinFunc(Ctx_, pos, "In", {*res, inRight, hints}); Ctx_.IncrementMonCounter("sql_features", notIn ? "NotIn" : "In"); - return (notIn && isIn) ? isIn->ApplyUnaryOp(Ctx_, pos, "Not") : isIn; + return Wrap((notIn && isIn) ? isIn->ApplyUnaryOp(Ctx_, pos, "Not") : isIn); } case TRule_cond_expr::kAltCondExpr3: { if (tail.Count) { UnexpectedQuestionToken(tail); - return {}; + return std::unexpected(ESQLError::Basic); } auto altCase = cond.GetAlt_cond_expr3().GetBlock1().Alt_case(); const bool notNoll = @@ -1969,32 +2039,41 @@ TNodePtr TSqlExpression::SubExpr(const TRule_xor_subexpr& node, const TTrailingQ if (!Ctx_.Warning(Ctx_.Pos(), TIssuesIds::YQL_MISSING_IS_BEFORE_NOT_NULL, [](auto& out) { out << "Missing IS keyword before NOT NULL"; }, Ctx_.DisableLegacyNotNull)) { - return {}; + return std::unexpected(ESQLError::Basic); } } - auto isNull = BuildIsNullOp(pos, res); + auto isNull = BuildIsNullOp(pos, *res); Ctx_.IncrementMonCounter("sql_features", notNoll ? "NotNull" : "Null"); - return (notNoll && isNull) ? isNull->ApplyUnaryOp(Ctx_, pos, "Not") : isNull; + return Wrap((notNoll && isNull) ? isNull->ApplyUnaryOp(Ctx_, pos, "Not") : isNull); } case TRule_cond_expr::kAltCondExpr4: { auto alt = cond.GetAlt_cond_expr4(); const bool symmetric = alt.HasBlock3() && IS_TOKEN(Ctx_.Settings.Antlr4Parser, alt.GetBlock3().GetToken1().GetId(), SYMMETRIC); const bool negation = alt.HasBlock1(); - TNodePtr left = SubExpr(alt.GetRule_eq_subexpr4(), {}); - TNodePtr right = SubExpr(alt.GetRule_eq_subexpr6(), tail); + + TNodeResult left = SubExpr(alt.GetRule_eq_subexpr4(), {}); + if (!left && left.error() != ESQLError::Basic) { + return std::unexpected(left.error()); + } + + TNodeResult right = SubExpr(alt.GetRule_eq_subexpr6(), tail); + if (!right && right.error() != ESQLError::Basic) { + return std::unexpected(right.error()); + } + if (!left || !right) { - return {}; + return std::unexpected(ESQLError::Basic); } - const bool bothArgNull = left->IsNull() && right->IsNull(); - const bool oneArgNull = left->IsNull() || right->IsNull(); + const bool bothArgNull = (*left)->IsNull() && (*right)->IsNull(); + const bool oneArgNull = (*left)->IsNull() || (*right)->IsNull(); - if (res->IsNull() || bothArgNull || (symmetric && oneArgNull)) { + if ((*res)->IsNull() || bothArgNull || (symmetric && oneArgNull)) { if (!Ctx_.Warning(pos, TIssuesIds::YQL_OPERATION_WILL_RETURN_NULL, [](auto& out) { out << "BETWEEN operation will return NULL here"; })) { - return {}; + return std::unexpected(ESQLError::Basic); } } @@ -2003,27 +2082,27 @@ TNodePtr TSqlExpression::SubExpr(const TRule_xor_subexpr& node, const TTrailingQ return BuildBinaryOpRaw( pos, "Or", - BuildBinaryOpRaw(pos, "<", res, left), - BuildBinaryOpRaw(pos, ">", res, right)); + BuildBinaryOpRaw(pos, "<", *res, left), + BuildBinaryOpRaw(pos, ">", *res, right)); } else { return BuildBinaryOpRaw( pos, "And", - BuildBinaryOpRaw(pos, ">=", res, left), - BuildBinaryOpRaw(pos, "<=", res, right)); + BuildBinaryOpRaw(pos, ">=", *res, left), + BuildBinaryOpRaw(pos, "<=", *res, right)); } }; if (symmetric) { Ctx_.IncrementMonCounter("sql_features", negation ? "NotBetweenSymmetric" : "BetweenSymmetric"); - return BuildBinaryOpRaw( + return Wrap(BuildBinaryOpRaw( pos, negation ? "And" : "Or", - buildSubexpr(left, right), - buildSubexpr(right, left)); + buildSubexpr(*left, *right), + buildSubexpr(*right, *left))); } else { Ctx_.IncrementMonCounter("sql_features", negation ? "NotBetween" : "Between"); - return buildSubexpr(left, right); + return Wrap(buildSubexpr(*left, *right)); } } case TRule_cond_expr::kAltCondExpr5: { @@ -2077,7 +2156,7 @@ TSqlExpression::TCaseBranch TSqlExpression::ReduceCaseBranches(TVector -TNodePtr TSqlExpression::BinOper(const TString& opName, const TNode& node, TGetNode getNode, TIter begin, TIter end, const TTrailingQuestions& tail) { +TNodeResult TSqlExpression::BinOper(const TString& opName, const TNode& node, TGetNode getNode, TIter begin, TIter end, const TTrailingQuestions& tail) { if (begin == end) { return SubExpr(node, tail); } @@ -2087,17 +2166,30 @@ TNodePtr TSqlExpression::BinOper(const TString& opName, const TNode& node, TGetN const size_t listSize = end - begin; TVector nodes; nodes.reserve(1 + listSize); - nodes.push_back(SubExpr(node, {})); + + if (auto result = SubExpr(node, {}); + result || result.error() == ESQLError::Basic) { + nodes.push_back(Unwrap(std::move(result))); + } else { + return std::unexpected(result.error()); + } + for (; begin != end; ++begin) { - nodes.push_back(SubExpr(getNode(*begin), (begin + 1 == end) ? tail : TTrailingQuestions{})); + if (auto result = SubExpr(getNode(*begin), (begin + 1 == end) ? tail : TTrailingQuestions{}); + result || result.error() == ESQLError::Basic) + { + nodes.push_back(Unwrap(std::move(result))); + } else { + return std::unexpected(result.error()); + } } - return BinOperList(opName, nodes.begin(), nodes.end()); + return Wrap(BinOperList(opName, nodes.begin(), nodes.end())); } template -TNodePtr TSqlExpression::BinOpList(const TNode& node, TGetNode getNode, TIter begin, TIter end, const TTrailingQuestions& tail) { +TNodeResult TSqlExpression::BinOpList(const TNode& node, TGetNode getNode, TIter begin, TIter end, const TTrailingQuestions& tail) { MaybeUnnamedSmartParenOnTop_ = MaybeUnnamedSmartParenOnTop_ && (begin == end); - TNodePtr partialResult = SubExpr(node, (begin == end) ? tail : TTrailingQuestions{}); + TNodeResult partialResult = SubExpr(node, (begin == end) ? tail : TTrailingQuestions{}); while (begin != end) { Ctx_.IncrementMonCounter("sql_features", "BinaryOperation"); Token(begin->GetToken1()); @@ -2129,7 +2221,7 @@ TNodePtr TSqlExpression::BinOpList(const TNode& node, TGetNode getNode, TIter be opName = "/MayWarn"; Ctx_.IncrementMonCounter("sql_binary_operations", "Divide"); if (!Ctx_.Scoped->PragmaClassicDivision && partialResult) { - partialResult = new TCallNodeImpl(pos, "SafeCast", {std::move(partialResult), BuildDataType(pos, "Double")}); + partialResult = TNonNull(TNodePtr(new TCallNodeImpl(pos, "SafeCast", {std::move(*partialResult), BuildDataType(pos, "Double")}))); } else if (Ctx_.Scoped->PragmaCheckedOps) { opName = "CheckedDiv"; } @@ -2139,10 +2231,20 @@ TNodePtr TSqlExpression::BinOpList(const TNode& node, TGetNode getNode, TIter be } else { Ctx_.IncrementMonCounter("sql_errors", "UnsupportedBinaryOperation"); Error() << "Unsupported binary operation token: " << tokenId; - return nullptr; + return std::unexpected(ESQLError::Basic); + } + + TNodeResult lhs = std::move(partialResult); + TNodeResult rhs = SubExpr(getNode(*begin), (begin + 1 == end) ? tail : TTrailingQuestions{}); + + if (!lhs && lhs.error() != ESQLError::Basic) { + return std::unexpected(lhs.error()); + } + if (!rhs && rhs.error() != ESQLError::Basic) { + return std::unexpected(rhs.error()); } - partialResult = BuildBinaryOp(Ctx_, pos, opName, partialResult, SubExpr(getNode(*begin), (begin + 1 == end) ? tail : TTrailingQuestions{})); + partialResult = Wrap(BuildBinaryOp(Ctx_, pos, opName, Unwrap(std::move(lhs)), Unwrap(std::move(rhs)))); ++begin; } @@ -2150,9 +2252,9 @@ TNodePtr TSqlExpression::BinOpList(const TNode& node, TGetNode getNode, TIter be } template -TNodePtr TSqlExpression::BinOpList(const TRule_bit_subexpr& node, TGetNode getNode, TIter begin, TIter end, const TTrailingQuestions& tail) { +TNodeResult TSqlExpression::BinOpList(const TRule_bit_subexpr& node, TGetNode getNode, TIter begin, TIter end, const TTrailingQuestions& tail) { MaybeUnnamedSmartParenOnTop_ = MaybeUnnamedSmartParenOnTop_ && (begin == end); - TNodePtr partialResult = SubExpr(node, (begin == end) ? tail : TTrailingQuestions{}); + TNodeResult partialResult = SubExpr(node, (begin == end) ? tail : TTrailingQuestions{}); while (begin != end) { Ctx_.IncrementMonCounter("sql_features", "BinaryOperation"); TString opName; @@ -2162,7 +2264,7 @@ TNodePtr TSqlExpression::BinOpList(const TRule_bit_subexpr& node, TGetNode getNo auto tokenId = begin->GetBlock1().GetAlt1().GetToken1().GetId(); if (!IS_TOKEN(Ctx_.Settings.Antlr4Parser, tokenId, SHIFT_LEFT)) { Error() << "Unsupported binary operation token: " << tokenId; - return {}; + return std::unexpected(ESQLError::Basic); } opName = "ShiftLeft"; Ctx_.IncrementMonCounter("sql_binary_operations", "ShiftLeft"); @@ -2178,7 +2280,7 @@ TNodePtr TSqlExpression::BinOpList(const TRule_bit_subexpr& node, TGetNode getNo auto tokenId = begin->GetBlock1().GetAlt3().GetToken1().GetId(); if (!IS_TOKEN(Ctx_.Settings.Antlr4Parser, tokenId, ROT_LEFT)) { Error() << "Unsupported binary operation token: " << tokenId; - return {}; + return std::unexpected(ESQLError::Basic); } opName = "RotLeft"; Ctx_.IncrementMonCounter("sql_binary_operations", "RotLeft"); @@ -2194,7 +2296,7 @@ TNodePtr TSqlExpression::BinOpList(const TRule_bit_subexpr& node, TGetNode getNo auto tokenId = begin->GetBlock1().GetAlt5().GetToken1().GetId(); if (!IS_TOKEN(Ctx_.Settings.Antlr4Parser, tokenId, AMPERSAND)) { Error() << "Unsupported binary operation token: " << tokenId; - return {}; + return std::unexpected(ESQLError::Basic); } opName = "BitAnd"; Ctx_.IncrementMonCounter("sql_binary_operations", "BitAnd"); @@ -2205,7 +2307,7 @@ TNodePtr TSqlExpression::BinOpList(const TRule_bit_subexpr& node, TGetNode getNo auto tokenId = begin->GetBlock1().GetAlt6().GetToken1().GetId(); if (!IS_TOKEN(Ctx_.Settings.Antlr4Parser, tokenId, PIPE)) { Error() << "Unsupported binary operation token: " << tokenId; - return {}; + return std::unexpected(ESQLError::Basic); } opName = "BitOr"; Ctx_.IncrementMonCounter("sql_binary_operations", "BitOr"); @@ -2216,7 +2318,7 @@ TNodePtr TSqlExpression::BinOpList(const TRule_bit_subexpr& node, TGetNode getNo auto tokenId = begin->GetBlock1().GetAlt7().GetToken1().GetId(); if (!IS_TOKEN(Ctx_.Settings.Antlr4Parser, tokenId, CARET)) { Error() << "Unsupported binary operation token: " << tokenId; - return {}; + return std::unexpected(ESQLError::Basic); } opName = "BitXor"; Ctx_.IncrementMonCounter("sql_binary_operations", "BitXor"); @@ -2226,7 +2328,19 @@ TNodePtr TSqlExpression::BinOpList(const TRule_bit_subexpr& node, TGetNode getNo Y_UNREACHABLE(); } - partialResult = BuildBinaryOp(Ctx_, Ctx_.Pos(), opName, partialResult, SubExpr(getNode(*begin), (begin + 1 == end) ? tail : TTrailingQuestions{})); + TPosition pos = Ctx_.Pos(); + + TNodeResult lhs = std::move(partialResult); + TNodeResult rhs = SubExpr(getNode(*begin), (begin + 1 == end) ? tail : TTrailingQuestions{}); + + if (!lhs && lhs.error() != ESQLError::Basic) { + return std::unexpected(lhs.error()); + } + if (!rhs && rhs.error() != ESQLError::Basic) { + return std::unexpected(rhs.error()); + } + + partialResult = Wrap(BuildBinaryOp(Ctx_, pos, opName, Unwrap(std::move(lhs)), Unwrap(std::move(rhs)))); ++begin; } @@ -2234,9 +2348,9 @@ TNodePtr TSqlExpression::BinOpList(const TRule_bit_subexpr& node, TGetNode getNo } template -TNodePtr TSqlExpression::BinOpList(const TRule_eq_subexpr& node, TGetNode getNode, TIter begin, TIter end, const TTrailingQuestions& tail) { +TNodeResult TSqlExpression::BinOpList(const TRule_eq_subexpr& node, TGetNode getNode, TIter begin, TIter end, const TTrailingQuestions& tail) { MaybeUnnamedSmartParenOnTop_ = MaybeUnnamedSmartParenOnTop_ && (begin == end); - TNodePtr partialResult = SubExpr(node, (begin == end) ? tail : TTrailingQuestions{}); + TNodeResult partialResult = SubExpr(node, (begin == end) ? tail : TTrailingQuestions{}); while (begin != end) { Ctx_.IncrementMonCounter("sql_features", "BinaryOperation"); TString opName; @@ -2246,7 +2360,7 @@ TNodePtr TSqlExpression::BinOpList(const TRule_eq_subexpr& node, TGetNode getNod auto tokenId = begin->GetBlock1().GetAlt1().GetToken1().GetId(); if (!IS_TOKEN(Ctx_.Settings.Antlr4Parser, tokenId, EQUALS)) { Error() << "Unsupported binary operation token: " << tokenId; - return {}; + return std::unexpected(ESQLError::Basic); } Ctx_.IncrementMonCounter("sql_binary_operations", "Equals"); opName = "=="; @@ -2257,7 +2371,7 @@ TNodePtr TSqlExpression::BinOpList(const TRule_eq_subexpr& node, TGetNode getNod auto tokenId = begin->GetBlock1().GetAlt2().GetToken1().GetId(); if (!IS_TOKEN(Ctx_.Settings.Antlr4Parser, tokenId, EQUALS2)) { Error() << "Unsupported binary operation token: " << tokenId; - return {}; + return std::unexpected(ESQLError::Basic); } Ctx_.IncrementMonCounter("sql_binary_operations", "Equals2"); opName = "=="; @@ -2268,7 +2382,7 @@ TNodePtr TSqlExpression::BinOpList(const TRule_eq_subexpr& node, TGetNode getNod auto tokenId = begin->GetBlock1().GetAlt3().GetToken1().GetId(); if (!IS_TOKEN(Ctx_.Settings.Antlr4Parser, tokenId, NOT_EQUALS)) { Error() << "Unsupported binary operation token: " << tokenId; - return {}; + return std::unexpected(ESQLError::Basic); } Ctx_.IncrementMonCounter("sql_binary_operations", "NotEquals"); opName = "!="; @@ -2279,7 +2393,7 @@ TNodePtr TSqlExpression::BinOpList(const TRule_eq_subexpr& node, TGetNode getNod auto tokenId = begin->GetBlock1().GetAlt4().GetToken1().GetId(); if (!IS_TOKEN(Ctx_.Settings.Antlr4Parser, tokenId, NOT_EQUALS2)) { Error() << "Unsupported binary operation token: " << tokenId; - return {}; + return std::unexpected(ESQLError::Basic); } Ctx_.IncrementMonCounter("sql_binary_operations", "NotEquals2"); opName = "!="; @@ -2295,7 +2409,19 @@ TNodePtr TSqlExpression::BinOpList(const TRule_eq_subexpr& node, TGetNode getNod Y_UNREACHABLE(); } - partialResult = BuildBinaryOp(Ctx_, Ctx_.Pos(), opName, partialResult, SubExpr(getNode(*begin), (begin + 1 == end) ? tail : TTrailingQuestions{})); + TPosition pos = Ctx_.Pos(); + + TNodeResult lhs = std::move(partialResult); + TNodeResult rhs = SubExpr(getNode(*begin), (begin + 1 == end) ? tail : TTrailingQuestions{}); + + if (!lhs && lhs.error() != ESQLError::Basic) { + return std::unexpected(lhs.error()); + } + if (!rhs && rhs.error() != ESQLError::Basic) { + return std::unexpected(rhs.error()); + } + + partialResult = Wrap(BuildBinaryOp(Ctx_, pos, opName, Unwrap(std::move(lhs)), Unwrap(std::move(rhs)))); ++begin; } @@ -2305,7 +2431,7 @@ TNodePtr TSqlExpression::BinOpList(const TRule_eq_subexpr& node, TGetNode getNod TNodePtr TSqlExpression::SqlInExpr(const TRule_in_expr& node, const TTrailingQuestions& tail) { TSqlExpression expr(Ctx_, Mode_); expr.SetSmartParenthesisMode(TSqlExpression::ESmartParenthesis::InStatement); - auto result = expr.UnaryExpr(node.GetRule_in_unary_subexpr1(), tail); + TNodePtr result = Unwrap(expr.UnaryExpr(node.GetRule_in_unary_subexpr1(), tail)); if (TSourcePtr source = MoveOutIfSource(result)) { if (IsSubqueryRef(source)) { // Prevent redundant ref to ref @@ -2350,33 +2476,39 @@ TSourcePtr TSqlExpression::LangVersionedSubSelect(TSourcePtr source) { return source; } -TNodePtr TSqlExpression::SelectSubExpr(const TRule_select_subexpr& node) { - TNodePtr result; +TNodeResult TSqlExpression::SelectSubExpr(const TRule_select_subexpr& node) { + // TODO(YQL-20436): emit YqlSubLink here + + TNodeResult result = std::unexpected(ESQLError::Basic); if (IsOnlySubExpr(node)) { result = SelectOrExpr(node.GetRule_select_subexpr_intersect1() .GetRule_select_or_expr1()); } else { - result = LangVersionedSubSelect(TSqlSelect(Ctx_, Mode_).BuildSubSelect(node)); + result = Wrap(LangVersionedSubSelect(TSqlSelect(Ctx_, Mode_).BuildSubSelect(node))); } - if (TSourcePtr source = MoveOutIfSource(result)) { + if (!result) { + return std::unexpected(result.error()); + } + + if (TSourcePtr source = MoveOutIfSource(*result)) { if (IsSourceAllowed_ || IsSubqueryRef(source)) { - return source; + return TNonNull(TNodePtr(std::move(source))); } source->UseAsInner(); - result = BuildSourceNode(source->GetPos(), std::move(source)); + result = Wrap(BuildSourceNode(source->GetPos(), std::move(source))); } return result; } -TNodePtr TSqlExpression::SelectOrExpr(const TRule_select_or_expr& node) { +TNodeResult TSqlExpression::SelectOrExpr(const TRule_select_or_expr& node) { switch (node.Alt_case()) { case NSQLv1Generated::TRule_select_or_expr::kAltSelectOrExpr1: { const auto& select_kind = node.GetAlt_select_or_expr1().GetRule_select_kind_partial1(); TSourcePtr source = TSqlSelect(Ctx_, Mode_).BuildSubSelect(select_kind); - return LangVersionedSubSelect(std::move(source)); + return Wrap(LangVersionedSubSelect(std::move(source))); } case NSQLv1Generated::TRule_select_or_expr::kAltSelectOrExpr2: return TupleOrExpr(node.GetAlt_select_or_expr2().GetRule_tuple_or_expr1()); @@ -2385,7 +2517,7 @@ TNodePtr TSqlExpression::SelectOrExpr(const TRule_select_or_expr& node) { } } -TNodePtr TSqlExpression::TupleOrExpr(const TRule_tuple_or_expr& node) { +TNodeResult TSqlExpression::TupleOrExpr(const TRule_tuple_or_expr& node) { TVector exprs; const TPosition pos(Ctx_.Pos()); @@ -2409,13 +2541,13 @@ TNodePtr TSqlExpression::TupleOrExpr(const TRule_tuple_or_expr& node) { exprs.emplace_back(NamedExpr(head, headName, mode)); if (!exprs.back()) { - return nullptr; + return std::unexpected(ESQLError::Basic); } for (const auto& item : node.GetBlock3()) { exprs.emplace_back(NamedExpr(item.GetRule_named_expr2(), mode)); if (!exprs.back()) { - return nullptr; + return std::unexpected(ESQLError::Basic); } } } @@ -2431,7 +2563,7 @@ TNodePtr TSqlExpression::TupleOrExpr(const TRule_tuple_or_expr& node) { if (hasAliases && hasUnnamed && !IsTopLevelGroupBy()) { Ctx_.IncrementMonCounter("sql_errors", "AnonymousStructMembers"); Ctx_.Error(pos) << "Structure does not allow anonymous members"; - return nullptr; + return std::unexpected(ESQLError::Basic); } } if (IsTopLevelGroupBy()) { @@ -2439,13 +2571,15 @@ TNodePtr TSqlExpression::TupleOrExpr(const TRule_tuple_or_expr& node) { Ctx_.IncrementMonCounter("sql_errors", "SimpleTupleInGroupBy"); Token(node.GetBlock4().GetToken1()); Ctx_.Error() << "Unexpected trailing comma in grouping elements list"; - return nullptr; + return std::unexpected(ESQLError::Basic); } Ctx_.IncrementMonCounter("sql_features", "ListOfNamedNode"); - return BuildListOfNamedNodes(pos, std::move(exprs)); + return Wrap(BuildListOfNamedNodes(pos, std::move(exprs))); } Ctx_.IncrementMonCounter("sql_features", hasUnnamed ? "SimpleTuple" : "SimpleStruct"); - return (hasUnnamed || expectTuple || exprs.size() == 0) ? BuildTuple(pos, exprs) : BuildStructure(pos, exprs); + return (hasUnnamed || expectTuple || exprs.size() == 0) + ? Wrap(BuildTuple(pos, exprs)) + : Wrap(BuildStructure(pos, exprs)); } TNodePtr TSqlExpression::EmptyTuple() { @@ -2456,13 +2590,13 @@ TNodePtr TSqlExpression::EmptyTuple() { return BuildTuple(Ctx_.Pos(), TVector{}); } -TNodePtr TSqlExpression::SmartParenthesis(const TRule_smart_parenthesis& node) { +TNodeResult TSqlExpression::SmartParenthesis(const TRule_smart_parenthesis& node) { Token(node.GetToken1()); switch (node.GetBlock2().GetAltCase()) { case NSQLv1Generated::TRule_smart_parenthesis_TBlock2::kAlt1: return SelectSubExpr(node.GetBlock2().GetAlt1().GetRule_select_subexpr1()); case NSQLv1Generated::TRule_smart_parenthesis_TBlock2::kAlt2: - return EmptyTuple(); + return TNonNull(EmptyTuple()); case NSQLv1Generated::TRule_smart_parenthesis_TBlock2::ALT_NOT_SET: Y_UNREACHABLE(); } diff --git a/yql/essentials/sql/v1/sql_expression.h b/yql/essentials/sql/v1/sql_expression.h index bd4e5e5409df..c21b4ac50a96 100644 --- a/yql/essentials/sql/v1/sql_expression.h +++ b/yql/essentials/sql/v1/sql_expression.h @@ -1,6 +1,9 @@ #pragma once +#include "result.h" + #include "sql_translation.h" + #include namespace NSQLTranslationV1 { @@ -21,9 +24,9 @@ class TSqlExpression: public TSqlTranslation { { } - TNodePtr BuildSourceOrNode(const TRule_expr& node); - TNodePtr Build(const TRule_expr& node); - TNodePtr Build(const TRule_lambda_or_parameter& node); + TNodeResult BuildSourceOrNode(const TRule_expr& node); + TNodeResult Build(const TRule_expr& node); + TNodeResult Build(const TRule_lambda_or_parameter& node); TSourcePtr BuildSource(const TRule_select_or_expr& node); TNodePtr BuildSourceOrNode(const TRule_smart_parenthesis& node); @@ -48,37 +51,37 @@ class TSqlExpression: public TSqlTranslation { }; TNodePtr BindParameterRule(const TRule_bind_parameter& rule, const TTrailingQuestions& tail); - TNodePtr LambdaRule(const TRule_lambda& rule); + TNodeResult LambdaRule(const TRule_lambda& rule); TNodePtr CastRule(const TRule_cast_expr& rule); TNodePtr BitCastRule(const TRule_bitcast_expr& rule); TNodePtr ExistsRule(const TRule_exists_expr& rule); TNodePtr CaseRule(const TRule_case_expr& rule); - TMaybe AtomExpr(const TRule_atom_expr& node, const TTrailingQuestions& tail); - TMaybe InAtomExpr(const TRule_in_atom_expr& node, const TTrailingQuestions& tail); + TSQLResult AtomExpr(const TRule_atom_expr& node, const TTrailingQuestions& tail); + TSQLResult InAtomExpr(const TRule_in_atom_expr& node, const TTrailingQuestions& tail); - TNodePtr JsonInputArg(const TRule_json_common_args& node); + TNodeResult JsonInputArg(const TRule_json_common_args& node); TNodePtr JsonPathSpecification(const TRule_jsonpath_spec& node); TNodePtr JsonReturningTypeRule(const TRule_type_name_simple& node); TNodePtr JsonValueCaseHandler(const TRule_json_case_handler& node, EJsonValueHandlerMode& mode); void AddJsonValueCaseHandlers(const TRule_json_value& node, TVector& children); - void AddJsonVariable(const TRule_json_variable& node, TVector& children); - void AddJsonVariables(const TRule_json_variables& node, TVector& children); - TNodePtr JsonVariables(const TRule_json_common_args& node); - void AddJsonCommonArgs(const TRule_json_common_args& node, TVector& children); - TNodePtr JsonValueExpr(const TRule_json_value& node); + [[nodiscard]] TSQLStatus AddJsonVariable(const TRule_json_variable& node, TVector& children); + [[nodiscard]] TSQLStatus AddJsonVariables(const TRule_json_variables& node, TVector& children); + TNodeResult JsonVariables(const TRule_json_common_args& node); + [[nodiscard]] TSQLStatus AddJsonCommonArgs(const TRule_json_common_args& node, TVector& children); + TNodeResult JsonValueExpr(const TRule_json_value& node); void AddJsonExistsHandler(const TRule_json_exists& node, TVector& children); - TNodePtr JsonExistsExpr(const TRule_json_exists& node); + TNodeResult JsonExistsExpr(const TRule_json_exists& node); EJsonQueryWrap JsonQueryWrapper(const TRule_json_query& node); EJsonQueryHandler JsonQueryHandler(const TRule_json_query_handler& node); - TNodePtr JsonQueryExpr(const TRule_json_query& node); - TNodePtr JsonApiExpr(const TRule_json_api_expr& node); + TNodeResult JsonQueryExpr(const TRule_json_query& node); + TNodeResult JsonApiExpr(const TRule_json_api_expr& node); template - TNodePtr UnaryCasualExpr(const TUnaryCasualExprRule& node, const TTrailingQuestions& tail); + TNodeResult UnaryCasualExpr(const TUnaryCasualExprRule& node, const TTrailingQuestions& tail); template - TNodePtr UnaryExpr(const TUnarySubExprRule& node, const TTrailingQuestions& tail); + TNodeResult UnaryExpr(const TUnarySubExprRule& node, const TTrailingQuestions& tail); bool SqlLambdaParams(const TNodePtr& node, TVector& args, ui32& optionalArgumentsCount); bool SqlLambdaExprBody(TContext& ctx, const TRule_lambda_body& node, TVector& exprSeq); @@ -86,34 +89,35 @@ class TSqlExpression: public TSqlTranslation { TNodePtr KeyExpr(const TRule_key_expr& node) { TSqlExpression expr(Ctx_, Mode_); - return expr.Build(node.GetRule_expr2()); + return Unwrap(expr.Build(node.GetRule_expr2())); } - TNodePtr SubExpr(const TRule_con_subexpr& node, const TTrailingQuestions& tail); - TNodePtr SubExpr(const TRule_xor_subexpr& node, const TTrailingQuestions& tail); + TNodeResult SubExpr(const TRule_con_subexpr& node, const TTrailingQuestions& tail); + + TNodeResult SubExpr(const TRule_xor_subexpr& node, const TTrailingQuestions& tail); - TNodePtr SubExpr(const TRule_mul_subexpr& node, const TTrailingQuestions& tail); + TNodeResult SubExpr(const TRule_mul_subexpr& node, const TTrailingQuestions& tail); - TNodePtr SubExpr(const TRule_add_subexpr& node, const TTrailingQuestions& tail); + TNodeResult SubExpr(const TRule_add_subexpr& node, const TTrailingQuestions& tail); - TNodePtr SubExpr(const TRule_bit_subexpr& node, const TTrailingQuestions& tail); + TNodeResult SubExpr(const TRule_bit_subexpr& node, const TTrailingQuestions& tail); - TNodePtr SubExpr(const TRule_neq_subexpr& node, const TTrailingQuestions& tailExternal); + TNodeResult SubExpr(const TRule_neq_subexpr& node, const TTrailingQuestions& tailExternal); - TNodePtr SubExpr(const TRule_eq_subexpr& node, const TTrailingQuestions& tail); + TNodeResult SubExpr(const TRule_eq_subexpr& node, const TTrailingQuestions& tail); - TNodePtr SubExpr(const TRule_or_subexpr& node, const TTrailingQuestions& tail); + TNodeResult SubExpr(const TRule_or_subexpr& node, const TTrailingQuestions& tail); - TNodePtr SubExpr(const TRule_and_subexpr& node, const TTrailingQuestions& tail); + TNodeResult SubExpr(const TRule_and_subexpr& node, const TTrailingQuestions& tail); template - TNodePtr BinOpList(const TNode& node, TGetNode getNode, TIter begin, TIter end, const TTrailingQuestions& tail); + TNodeResult BinOpList(const TNode& node, TGetNode getNode, TIter begin, TIter end, const TTrailingQuestions& tail); template - TNodePtr BinOpList(const TRule_bit_subexpr& node, TGetNode getNode, TIter begin, TIter end, const TTrailingQuestions& tail); + TNodeResult BinOpList(const TRule_bit_subexpr& node, TGetNode getNode, TIter begin, TIter end, const TTrailingQuestions& tail); template - TNodePtr BinOpList(const TRule_eq_subexpr& node, TGetNode getNode, TIter begin, TIter end, const TTrailingQuestions& tail); + TNodeResult BinOpList(const TRule_eq_subexpr& node, TGetNode getNode, TIter begin, TIter end, const TTrailingQuestions& tail); TNodePtr BinOperList(const TString& opName, TVector::const_iterator begin, TVector::const_iterator end) const; @@ -126,7 +130,7 @@ class TSqlExpression: public TSqlTranslation { TCaseBranch ReduceCaseBranches(TVector::const_iterator begin, TVector::const_iterator end) const; template - TNodePtr BinOper(const TString& operName, const TNode& node, TGetNode getNode, TIter begin, TIter end, const TTrailingQuestions& tail); + TNodeResult BinOper(const TString& operName, const TNode& node, TGetNode getNode, TIter begin, TIter end, const TTrailingQuestions& tail); TNodePtr SqlInExpr(const TRule_in_expr& node, const TTrailingQuestions& tail); @@ -137,11 +141,11 @@ class TSqlExpression: public TSqlTranslation { bool IsTopLevelGroupBy() const; TSourcePtr LangVersionedSubSelect(TSourcePtr source); - TNodePtr SelectSubExpr(const TRule_select_subexpr& node); - TNodePtr SelectOrExpr(const TRule_select_or_expr& node); - TNodePtr TupleOrExpr(const TRule_tuple_or_expr& node); + TNodeResult SelectSubExpr(const TRule_select_subexpr& node); + TNodeResult SelectOrExpr(const TRule_select_or_expr& node); + TNodeResult TupleOrExpr(const TRule_tuple_or_expr& node); TNodePtr EmptyTuple(); - TNodePtr SmartParenthesis(const TRule_smart_parenthesis& node); + TNodeResult SmartParenthesis(const TRule_smart_parenthesis& node); ESmartParenthesis SmartParenthesisMode_ = ESmartParenthesis::Default; bool MaybeUnnamedSmartParenOnTop_ = true; @@ -157,8 +161,8 @@ bool ChangefeedSettings(const TRule_changefeed_settings& node, TSqlExpression& c bool CreateChangefeed(const TRule_changefeed& node, TSqlExpression& ctx, TVector& changefeeds); -bool Expr(TSqlExpression& sqlExpr, TVector& exprNodes, const TRule_expr& node); +TSQLStatus Expr(TSqlExpression& sqlExpr, TVector& exprNodes, const TRule_expr& node); -bool ExprList(TSqlExpression& sqlExpr, TVector& exprNodes, const TRule_expr_list& node); +TSQLStatus ExprList(TSqlExpression& sqlExpr, TVector& exprNodes, const TRule_expr_list& node); } // namespace NSQLTranslationV1 diff --git a/yql/essentials/sql/v1/sql_group_by.cpp b/yql/essentials/sql/v1/sql_group_by.cpp index cce460d97465..c78b7c738251 100644 --- a/yql/essentials/sql/v1/sql_group_by.cpp +++ b/yql/essentials/sql/v1/sql_group_by.cpp @@ -370,14 +370,14 @@ bool TGroupByClause::HoppingWindow(const TRule_hopping_window_specification& nod { TColumnRefScope scope(Ctx_, EColumnRefState::Allow); TSqlExpression expr(Ctx_, Mode_); - LegacyHoppingWindowSpec_->TimeExtractor = expr.Build(node.GetRule_expr3()); + LegacyHoppingWindowSpec_->TimeExtractor = Unwrap(expr.Build(node.GetRule_expr3())); if (!LegacyHoppingWindowSpec_->TimeExtractor) { return false; } } auto processIntervalParam = [&](const TRule_expr& rule) -> TNodePtr { TSqlExpression expr(Ctx_, Mode_); - auto node = expr.Build(rule); + auto node = Unwrap(expr.Build(rule)); if (!node) { return nullptr; } diff --git a/yql/essentials/sql/v1/sql_match_recognize.cpp b/yql/essentials/sql/v1/sql_match_recognize.cpp index 7a05223350ef..35e9dc2db543 100644 --- a/yql/essentials/sql/v1/sql_match_recognize.cpp +++ b/yql/essentials/sql/v1/sql_match_recognize.cpp @@ -142,7 +142,7 @@ TMaybe> TSqlMatchRecognizeClause::ParseOrderBy(co TNamedFunction TSqlMatchRecognizeClause::ParseOneMeasure(const TRule_row_pattern_measure_definition& node) { TColumnRefScope scope(Ctx_, EColumnRefState::MatchRecognizeMeasures); - auto callable = TSqlExpression(Ctx_, Mode_).Build(node.GetRule_expr1()); + auto callable = Unwrap(TSqlExpression(Ctx_, Mode_).Build(node.GetRule_expr1())); auto measureName = Id(node.GetRule_an_id3(), *this); // Each measure must be a lambda, that accepts 2 args: // - List @@ -439,7 +439,7 @@ TNamedFunction TSqlMatchRecognizeClause::ParseOneDefinition(const TRule_row_patt auto defineName = Id(identifier, *this); TColumnRefScope scope(Ctx_, EColumnRefState::MatchRecognizeDefine, true, defineName); const auto& searchCondition = node.GetRule_row_pattern_definition_search_condition3().GetRule_search_condition1().GetRule_expr1(); - auto callable = TSqlExpression(Ctx_, Mode_).Build(searchCondition); + auto callable = Unwrap(TSqlExpression(Ctx_, Mode_).Build(searchCondition)); // Each define must be a predicate lambda, that accepts 3 args: // - List // - A struct that maps row pattern variables to ranges in the queue diff --git a/yql/essentials/sql/v1/sql_query.cpp b/yql/essentials/sql/v1/sql_query.cpp index e9ebc2ce74fc..13c8d2f43489 100644 --- a/yql/essentials/sql/v1/sql_query.cpp +++ b/yql/essentials/sql/v1/sql_query.cpp @@ -48,7 +48,7 @@ static bool AsyncReplicationSettingsEntry(std::map& out, const TRule_replication_settings_entry& in, TSqlExpression& ctx, bool create) { auto key = IdEx(in.GetRule_an_id1(), ctx); - auto value = ctx.Build(in.GetRule_expr3()); + TNodePtr value = Unwrap(ctx.Build(in.GetRule_expr3())); if (!value) { ctx.Context().Error() << "Invalid replication setting: " << key.Name; @@ -152,7 +152,7 @@ static bool TransferSettingsEntry(std::map& out, const TRule_transfer_settings_entry& in, TSqlExpression& ctx, bool create) { auto key = IdEx(in.GetRule_an_id1(), ctx); - auto value = ctx.Build(in.GetRule_expr3()); + TNodePtr value = Unwrap(ctx.Build(in.GetRule_expr3())); if (!value) { ctx.Context().Error() << "Invalid transfer setting: " << key.Name; @@ -277,7 +277,7 @@ bool TSqlQuery::Statement(TVector& blocks, const TRule_sql_stmt_core& blocks.emplace_back(std::move(*result)); break; } else if ( - result.error() == EYqlSelectError::Unsupported && + result.error() == ESQLError::UnsupportedYqlSelect && Ctx_.GetYqlSelectMode() == EYqlSelectMode::Force) { Error() << "Translation of the statement " @@ -685,7 +685,7 @@ bool TSqlQuery::Statement(TVector& blocks, const TRule_sql_stmt_core& blocks.emplace_back(std::move(*result)); break; } else if ( - result.error() == EYqlSelectError::Unsupported && + result.error() == ESQLError::UnsupportedYqlSelect && Ctx_.GetYqlSelectMode() == EYqlSelectMode::Force) { Error() << "Translation of the statement " @@ -3923,7 +3923,7 @@ TNodePtr TSqlQuery::Build(const TRule_delete_stmt& stmt) { TColumnRefScope scope(Ctx_, EColumnRefState::Allow); TSqlExpression sqlExpr(Ctx_, Mode_); - auto whereExpr = sqlExpr.Build(alt.GetRule_expr2()); + auto whereExpr = Unwrap(sqlExpr.Build(alt.GetRule_expr2())); if (!whereExpr) { return nullptr; } @@ -3995,7 +3995,7 @@ TNodePtr TSqlQuery::Build(const TRule_update_stmt& stmt) { if (alt.HasBlock3()) { TColumnRefScope scope(Ctx_, EColumnRefState::Allow); TSqlExpression sqlExpr(Ctx_, Mode_); - auto whereExpr = sqlExpr.Build(alt.GetBlock3().GetRule_expr2()); + auto whereExpr = Unwrap(sqlExpr.Build(alt.GetBlock3().GetRule_expr2())); if (!whereExpr) { return nullptr; } @@ -4045,7 +4045,7 @@ bool TSqlQuery::FillSetClause(const TRule_set_clause& node, TVector& ta targetList.push_back(ColumnNameAsSingleStr(*this, node.GetRule_set_target1().GetRule_column_name1())); TColumnRefScope scope(Ctx_, EColumnRefState::Allow); TSqlExpression sqlExpr(Ctx_, Mode_); - if (!Expr(sqlExpr, values, node.GetRule_expr3())) { + if (!Unwrap(Expr(sqlExpr, values, node.GetRule_expr3()))) { return false; } return true; diff --git a/yql/essentials/sql/v1/sql_select.cpp b/yql/essentials/sql/v1/sql_select.cpp index 11074e1decba..4feeea0c877c 100644 --- a/yql/essentials/sql/v1/sql_select.cpp +++ b/yql/essentials/sql/v1/sql_select.cpp @@ -205,7 +205,7 @@ TNodePtr TSqlSelect::JoinExpr(ISource* join, const TRule_join_constraint& node) Token(alt.GetToken1()); TColumnRefScope scope(Ctx_, EColumnRefState::Allow); TSqlExpression expr(Ctx_, Mode_); - return expr.Build(alt.GetRule_expr2()); + return Unwrap(expr.Build(alt.GetRule_expr2())); } case TRule_join_constraint::kAltJoinConstraint2: { auto& alt = node.GetAlt_join_constraint2(); @@ -422,7 +422,7 @@ bool TSqlSelect::SelectTerm(TVector& terms, const TRule_result_column& auto alt = node.GetAlt_result_column2(); TColumnRefScope scope(Ctx_, EColumnRefState::Allow); TSqlExpression expr(Ctx_, Mode_); - TNodePtr term(expr.Build(alt.GetRule_expr1())); + TNodePtr term(Unwrap(expr.Build(alt.GetRule_expr1()))); if (!term) { Ctx_.IncrementMonCounter("sql_errors", "NoTerm"); return false; @@ -610,7 +610,7 @@ TSourcePtr TSqlSelect::NamedSingleSource(const TRule_named_single_source& node, sampleClause = ESampleClause::Sample; mode = ESampleMode::Bernoulli; const auto& sampleExpr = sampleBlock.GetAlt1().GetRule_sample_clause1().GetRule_expr2(); - samplingRateNode = expr.Build(sampleExpr); + samplingRateNode = Unwrap(expr.Build(sampleExpr)); if (!samplingRateNode) { return nullptr; } @@ -632,13 +632,13 @@ TSourcePtr TSqlSelect::NamedSingleSource(const TRule_named_single_source& node, return nullptr; } const auto& tableSampleExpr = tableSampleClause.GetRule_expr4(); - samplingRateNode = expr.Build(tableSampleExpr); + samplingRateNode = Unwrap(expr.Build(tableSampleExpr)); if (!samplingRateNode) { return nullptr; } if (tableSampleClause.HasBlock6()) { const auto& repeatableExpr = tableSampleClause.GetBlock6().GetRule_repeatable_clause1().GetRule_expr3(); - samplingSeedNode = expr.Build(repeatableExpr); + samplingSeedNode = Unwrap(expr.Build(repeatableExpr)); if (!samplingSeedNode) { return nullptr; } @@ -776,7 +776,7 @@ TSourcePtr TSqlSelect::ProcessCore(const TRule_process_core& node, const TWriteS if (block5.HasBlock5()) { TSqlExpression expr(Ctx_, Mode_); TColumnRefScope scope(Ctx_, EColumnRefState::Allow); - TNodePtr where = expr.Build(block5.GetBlock5().GetRule_expr2()); + TNodePtr where = Unwrap(expr.Build(block5.GetBlock5().GetRule_expr2())); if (!where || !source->AddFilter(Ctx_, where)) { return nullptr; } @@ -895,7 +895,7 @@ TSourcePtr TSqlSelect::ReduceCore(const TRule_reduce_core& node, const TWriteSet if (node.HasBlock11()) { TColumnRefScope scope(Ctx_, EColumnRefState::Allow); TSqlExpression expr(Ctx_, Mode_); - TNodePtr where = expr.Build(node.GetBlock11().GetRule_expr2()); + TNodePtr where = Unwrap(expr.Build(node.GetBlock11().GetRule_expr2())); if (!where || !source->AddFilter(Ctx_, where)) { return nullptr; } @@ -908,7 +908,7 @@ TSourcePtr TSqlSelect::ReduceCore(const TRule_reduce_core& node, const TWriteSet if (node.HasBlock12()) { TColumnRefScope scope(Ctx_, EColumnRefState::Allow); TSqlExpression expr(Ctx_, Mode_); - having = expr.Build(node.GetBlock12().GetRule_expr2()); + having = Unwrap(expr.Build(node.GetBlock12().GetRule_expr2())); if (!having) { return nullptr; } @@ -1035,7 +1035,7 @@ TSourcePtr TSqlSelect::SelectCore(const TRule_select_core& node, const TWriteSet { TColumnRefScope scope(Ctx_, EColumnRefState::Allow); TSqlExpression expr(Ctx_, Mode_); - where = expr.Build(block.GetRule_expr2()); + where = Unwrap(expr.Build(block.GetRule_expr2())); } if (!where) { Ctx_.IncrementMonCounter("sql_errors", "WhereInvalid"); @@ -1080,7 +1080,7 @@ TSourcePtr TSqlSelect::SelectCore(const TRule_select_core& node, const TWriteSet if (node.HasBlock12()) { TSqlExpression expr(Ctx_, Mode_); TColumnRefScope scope(Ctx_, EColumnRefState::Allow); - having = expr.Build(node.GetBlock12().GetRule_expr2()); + having = Unwrap(expr.Build(node.GetBlock12().GetRule_expr2())); if (!having) { return nullptr; } @@ -1232,7 +1232,7 @@ TSqlSelect::TSelectKindResult TSqlSelect::SelectKind(const TRule_select_kind_par } TSqlExpression takeExpr(Ctx_, Mode_); - auto take = takeExpr.Build(block.GetRule_expr2()); + auto take = Unwrap(takeExpr.Build(block.GetRule_expr2())); if (!take) { return {}; } @@ -1240,7 +1240,7 @@ TSqlSelect::TSelectKindResult TSqlSelect::SelectKind(const TRule_select_kind_par TNodePtr skip; if (block.HasBlock3()) { TSqlExpression skipExpr(Ctx_, Mode_); - skip = skipExpr.Build(block.GetBlock3().GetRule_expr2()); + skip = Unwrap(skipExpr.Build(block.GetBlock3().GetRule_expr2())); if (!skip) { return {}; } diff --git a/yql/essentials/sql/v1/sql_select_yql.cpp b/yql/essentials/sql/v1/sql_select_yql.cpp index 1e7669808540..8bd59c400c77 100644 --- a/yql/essentials/sql/v1/sql_select_yql.cpp +++ b/yql/essentials/sql/v1/sql_select_yql.cpp @@ -11,15 +11,12 @@ using namespace NSQLv1Generated; class TYqlSelect final: public TSqlTranslation { public: - template - using TResult = std::expected; - TYqlSelect(TContext& ctx, NSQLTranslation::ESqlMode mode) : TSqlTranslation(ctx, mode) { } - TResult Build(const TRule_select_stmt& rule) { + TNodeResult Build(const TRule_select_stmt& rule) { const auto& intersect = rule.GetRule_select_stmt_intersect1(); if (!rule.GetBlock2().empty()) { return Unsupported("(union_op select_stmt_intersect)*"); @@ -33,7 +30,7 @@ class TYqlSelect final: public TSqlTranslation { return Build(partial); } - TResult Build(const TRule_values_stmt& rule) { + TNodeResult Build(const TRule_values_stmt& rule) { TYqlValuesArgs values; Token(rule.GetToken1()); @@ -53,11 +50,11 @@ class TYqlSelect final: public TSqlTranslation { } } - return BuildYqlValues(Ctx_.Pos(), std::move(values)); + return TNonNull(BuildYqlValues(Ctx_.Pos(), std::move(values))); } private: - TResult Build(const TRule_select_kind_partial& rule) { + TNodeResult Build(const TRule_select_kind_partial& rule) { TYqlSelectArgs select; if (rule.HasBlock2()) { @@ -67,7 +64,7 @@ class TYqlSelect final: public TSqlTranslation { if (auto result = Build(block.GetRule_expr2(), EColumnRefState::Deny)) { select.Limit = std::move(*result); } else { - return result; + return std::unexpected(result.error()); } } @@ -78,14 +75,14 @@ class TYqlSelect final: public TSqlTranslation { if (auto result = Build(block.GetRule_expr2(), EColumnRefState::Deny)) { select.Offset = std::move(*result); } else { - return result; + return std::unexpected(result.error()); } } return Build(rule.GetRule_select_kind1(), std::move(select)); } - TResult Build(const TRule_select_kind& rule, TYqlSelectArgs&& select) { + TNodeResult Build(const TRule_select_kind& rule, TYqlSelectArgs&& select) { if (rule.HasBlock1()) { return Unsupported("DISCARD"); } @@ -106,7 +103,7 @@ class TYqlSelect final: public TSqlTranslation { } } - TResult Build(const TRule_select_core& rule, TYqlSelectArgs&& select) { + TNodeResult Build(const TRule_select_core& rule, TYqlSelectArgs&& select) { if (rule.HasBlock1()) { Token(rule.GetBlock1().GetToken1()); @@ -153,7 +150,7 @@ class TYqlSelect final: public TSqlTranslation { if (rule.HasBlock1()) { Ctx_.IncrementMonCounter("sql_errors", "DoubleFrom"); Ctx_.Error() << "Only one FROM clause is allowed"; - return std::unexpected(EYqlSelectError::Error); + return std::unexpected(ESQLError::Basic); } if (auto result = Build(rule.GetBlock9().GetRule_join_source2())) { @@ -201,20 +198,20 @@ class TYqlSelect final: public TSqlTranslation { } if (auto node = BuildYqlSelect(Ctx_.Pos(), std::move(select))) { - return node; + return TNonNull(node); } else { - return std::unexpected(EYqlSelectError::Error); + return std::unexpected(ESQLError::Basic); } } - TResult BuildProjection(const TRule_select_core& rule) { + TSQLResult BuildProjection(const TRule_select_core& rule) { TVector terms; if (auto result = Build(rule.GetRule_result_column5())) { if (std::holds_alternative(*result)) { if (!rule.GetBlock6().empty()) { Error() << "Unable to use plain '*' with other projection items"; - return std::unexpected(EYqlSelectError::Error); + return std::unexpected(ESQLError::Basic); } return TPlainAsterisk(); @@ -229,7 +226,7 @@ class TYqlSelect final: public TSqlTranslation { if (auto result = Build(block.GetRule_result_column2())) { if (std::holds_alternative(*result)) { Error() << "Unable to use plain '*' with other projection items"; - return std::unexpected(EYqlSelectError::Error); + return std::unexpected(ESQLError::Basic); } terms.emplace_back(std::move(std::get(*result))); @@ -241,7 +238,7 @@ class TYqlSelect final: public TSqlTranslation { return terms; } - TResult> Build(const TRule_result_column& rule) { + TSQLResult> Build(const TRule_result_column& rule) { switch (rule.GetAltCase()) { case NSQLv1Generated::TRule_result_column::kAltResultColumn1: return Build(rule.GetAlt_result_column1()); @@ -252,7 +249,7 @@ class TYqlSelect final: public TSqlTranslation { } } - TResult> Build(const TRule_result_column::TAlt1& alt) { + TSQLResult> Build(const TRule_result_column::TAlt1& alt) { if (alt.GetRule_opt_id_prefix1().HasBlock1()) { return Unsupported("an_id DOT ASTERISK"); } @@ -260,23 +257,23 @@ class TYqlSelect final: public TSqlTranslation { return TPlainAsterisk(); } - TResult Build(const TRule_result_column::TAlt2& alt) { - TResult expr = Build(alt.GetRule_expr1(), EColumnRefState::Allow); + TNodeResult Build(const TRule_result_column::TAlt2& alt) { + TNodeResult expr = Build(alt.GetRule_expr1(), EColumnRefState::Allow); if (!expr) { - return std::unexpected(EYqlSelectError::Error); + return std::unexpected(ESQLError::Basic); } if (const auto label = Label(alt)) { - expr->GetRef().SetLabel(*label); + (*expr)->SetLabel(*label); } return expr; } - TResult Build(const TRule_join_source& rule) { + TSQLResult Build(const TRule_join_source& rule) { if (rule.HasBlock1()) { Token(rule.GetBlock1().GetToken1()); - return Unsupported("ANY"); + return Unsupported("ANY"); } TYqlJoin join = { @@ -291,27 +288,27 @@ class TYqlSelect final: public TSqlTranslation { } for (const auto& block : rule.GetBlock3()) { - TResult kind = Build(block.GetRule_join_op1()); + TSQLResult kind = Build(block.GetRule_join_op1()); if (!kind) { return std::unexpected(kind.error()); } if (block.HasBlock2()) { Token(block.GetBlock2().GetToken1()); - return Unsupported("ANY"); + return Unsupported("ANY"); } - TResult source = Build(block.GetRule_flatten_source3()); + TSQLResult source = Build(block.GetRule_flatten_source3()); if (!source) { return std::unexpected(source.error()); } if (!block.HasBlock4()) { - return Unsupported("absent join_constraint"); + return Unsupported("absent join_constraint"); } const auto& join_constraint = block.GetBlock4().GetRule_join_constraint1(); - TResult constraint = Build(join_constraint, *kind); + TSQLResult constraint = Build(join_constraint, *kind); if (!constraint) { return std::unexpected(constraint.error()); } @@ -323,10 +320,10 @@ class TYqlSelect final: public TSqlTranslation { return join; } - TResult Build(const TRule_join_op& rule) { + TSQLResult Build(const TRule_join_op& rule) { switch (rule.GetAltCase()) { case TRule_join_op::kAltJoinOp1: - return Unsupported("COMMA"); + return Unsupported("COMMA"); case TRule_join_op::kAltJoinOp2: break; case TRule_join_op::ALT_NOT_SET: @@ -338,37 +335,37 @@ class TYqlSelect final: public TSqlTranslation { Token(alt.GetToken3()); if (alt.HasBlock1()) { - return Unsupported("NATURAL"); + return Unsupported("NATURAL"); } const auto& block = alt.GetBlock2(); if (!block.HasAlt1()) { - return Unsupported("INNER | CROSS"); + return Unsupported("INNER | CROSS"); } const auto& alt1 = block.GetAlt1(); if (alt1.HasBlock1()) { - return Unsupported("(LEFT | RIGHT | EXCLUSION | FULL)"); + return Unsupported("(LEFT | RIGHT | EXCLUSION | FULL)"); } if (alt1.HasBlock2()) { - return Unsupported("OUTER"); + return Unsupported("OUTER"); } return EYqlJoinKind::Inner; } - TResult Build(const TRule_join_constraint& rule, EYqlJoinKind kind) { + TSQLResult Build(const TRule_join_constraint& rule, EYqlJoinKind kind) { switch (rule.GetAltCase()) { case TRule_join_constraint::kAltJoinConstraint1: return Build(rule.GetAlt_join_constraint1(), kind); case TRule_join_constraint::kAltJoinConstraint2: - return Unsupported("USING pure_column_or_named_list"); + return Unsupported("USING pure_column_or_named_list"); case TRule_join_constraint::ALT_NOT_SET: Y_UNREACHABLE(); } } - TResult Build(const TRule_join_constraint::TAlt1& alt, EYqlJoinKind kind) { + TSQLResult Build(const TRule_join_constraint::TAlt1& alt, EYqlJoinKind kind) { Token(alt.GetToken1()); if (auto result = Build(alt.GetRule_expr2(), EColumnRefState::Allow)) { return TYqlJoinConstraint{ @@ -380,16 +377,16 @@ class TYqlSelect final: public TSqlTranslation { } } - TResult Build(const TRule_flatten_source& rule) { + TSQLResult Build(const TRule_flatten_source& rule) { if (rule.HasBlock2()) { Token(rule.GetBlock2().GetToken1()); - return Unsupported("FLATTEN ((OPTIONAL|LIST|DICT)? BY flatten_by_arg | COLUMNS)"); + return Unsupported("FLATTEN ((OPTIONAL|LIST|DICT)? BY flatten_by_arg | COLUMNS)"); } return Build(rule.GetRule_named_single_source1()); } - TResult Build(const TRule_named_single_source& rule) { + TSQLResult Build(const TRule_named_single_source& rule) { TYqlSource source; if (auto result = Build(rule.GetRule_single_source1())) { @@ -399,7 +396,7 @@ class TYqlSelect final: public TSqlTranslation { } if (rule.HasBlock2()) { - return Unsupported("row_pattern_recognition_clause"); + return Unsupported("row_pattern_recognition_clause"); } if (rule.HasBlock3()) { @@ -413,13 +410,13 @@ class TYqlSelect final: public TSqlTranslation { } if (rule.HasBlock4()) { - return Unsupported("sample_clause | tablesample_clause"); + return Unsupported("sample_clause | tablesample_clause"); } return source; } - TResult Build(const TRule_single_source& rule) { + TNodeResult Build(const TRule_single_source& rule) { switch (rule.GetAltCase()) { case NSQLv1Generated::TRule_single_source::kAltSingleSource1: return Build(rule.GetAlt_single_source1().GetRule_table_ref1()); @@ -432,14 +429,14 @@ class TYqlSelect final: public TSqlTranslation { } } - TResult Build(const TRule_table_ref& rule) { + TNodeResult Build(const TRule_table_ref& rule) { TString service = Ctx_.Scoped->CurrService; TDeferredAtom cluster = Ctx_.Scoped->CurrCluster; if (rule.HasBlock1()) { const auto& expr = rule.GetBlock1().GetRule_cluster_expr1(); if (!ClusterExpr(expr, /* allowWildcard = */ false, service, cluster)) { - return std::unexpected(EYqlSelectError::Error); + return std::unexpected(ESQLError::Basic); } } @@ -455,7 +452,7 @@ class TYqlSelect final: public TSqlTranslation { return Build(rule.GetBlock3(), std::move(service), std::move(cluster)); } - TResult Build(const TRule_table_ref::TBlock3& block, TString service, TDeferredAtom cluster) { + TNodeResult Build(const TRule_table_ref::TBlock3& block, TString service, TDeferredAtom cluster) { switch (block.GetAltCase()) { case TRule_table_ref_TBlock3::kAlt1: return Build(block.GetAlt1().GetRule_table_key1(), std::move(service), std::move(cluster)); @@ -468,10 +465,10 @@ class TYqlSelect final: public TSqlTranslation { } } - TResult Build(const TRule_table_key& rule, TString service, TDeferredAtom cluster) { + TNodeResult Build(const TRule_table_key& rule, TString service, TDeferredAtom cluster) { if (cluster.Empty()) { Ctx_.Error() << "No cluster name given and no default cluster is selected"; - return std::unexpected(EYqlSelectError::Error); + return std::unexpected(ESQLError::Basic); } if (cluster.GetLiteral() == nullptr) { @@ -490,26 +487,26 @@ class TYqlSelect final: public TSqlTranslation { .Key = std::move(key), }; - return BuildYqlTableRef(Ctx_.Pos(), std::move(args)); + return TNonNull(BuildYqlTableRef(Ctx_.Pos(), std::move(args))); } - TResult> Build(const TRule_values_source_row& rule) { + TSQLResult> Build(const TRule_values_source_row& rule) { TVector columns; TSqlExpression sqlExpr(Ctx_, Mode_); - if (!ExprList(sqlExpr, columns, rule.GetRule_expr_list2())) { - return std::unexpected(EYqlSelectError::Error); + if (!Unwrap(ExprList(sqlExpr, columns, rule.GetRule_expr_list2()))) { + return std::unexpected(ESQLError::Basic); } return columns; } - TResult Build(const TRule_ext_order_by_clause& rule) { + TSQLResult Build(const TRule_ext_order_by_clause& rule) { TOrderBy orderBy; if (rule.HasBlock1()) { Token(rule.GetBlock1().GetToken1()); - return Unsupported("ASSUME ORDER BY"); + return Unsupported("ASSUME ORDER BY"); } const auto& clause = rule.GetRule_order_by_clause2(); @@ -534,8 +531,8 @@ class TYqlSelect final: public TSqlTranslation { return orderBy; } - TResult Build(const TRule_sort_specification& rule) { - TResult expr = Build(rule.GetRule_expr1(), EColumnRefState::Allow); + TSQLResult Build(const TRule_sort_specification& rule) { + TNodeResult expr = Build(rule.GetRule_expr1(), EColumnRefState::Allow); if (!expr) { return std::unexpected(expr.error()); } @@ -559,17 +556,17 @@ class TYqlSelect final: public TSqlTranslation { return new TSortSpecification(std::move(*expr), isAscending); } - TResult Build(const TRule_expr& rule, EColumnRefState state) { + TNodeResult Build(const TRule_expr& rule, EColumnRefState state) { TColumnRefScope scope(Ctx_, state); TSqlExpression sqlExpr(Ctx_, Mode_); sqlExpr.ProduceYqlColumnRef(); - TNodePtr expr = sqlExpr.BuildSourceOrNode(rule); + TNodeResult expr = sqlExpr.BuildSourceOrNode(rule); if (!expr) { - return std::unexpected(EYqlSelectError::Error); + return std::unexpected(expr.error()); } - if (TSourcePtr source = MoveOutIfSource(expr)) { + if (TSourcePtr source = MoveOutIfSource(*expr)) { return Unsupported("select_subexpr"); } @@ -623,37 +620,36 @@ class TYqlSelect final: public TSqlTranslation { return columns; } - template - TResult Unsupported(TStringBuf message) { + std::unexpected Unsupported(TStringBuf message) { if (Ctx_.GetYqlSelectMode() == EYqlSelectMode::Force) { Error() << "YqlSelect unsupported: " << message; } - return std::unexpected(EYqlSelectError::Error); + return std::unexpected(ESQLError::Basic); } }; -TYqlSelectResult BuildYqlSelect( +TNodeResult BuildYqlSelect( TContext& ctx, NSQLTranslation::ESqlMode mode, const NSQLv1Generated::TRule_select_stmt& rule) { if (auto result = TYqlSelect(ctx, mode).Build(rule)) { - return BuildYqlStatement(std::move(*result)); + return TNonNull(BuildYqlStatement(std::move(*result))); } else { - return result; + return std::unexpected(result.error()); } } -TYqlSelectResult BuildYqlSelect( +TNodeResult BuildYqlSelect( TContext& ctx, NSQLTranslation::ESqlMode mode, const NSQLv1Generated::TRule_values_stmt& rule) { if (auto result = TYqlSelect(ctx, mode).Build(rule)) { - return BuildYqlStatement(std::move(*result)); + return TNonNull(BuildYqlStatement(std::move(*result))); } else { - return result; + return std::unexpected(result.error()); } } diff --git a/yql/essentials/sql/v1/sql_select_yql.h b/yql/essentials/sql/v1/sql_select_yql.h index bdce3e71d5be..79caca7cad73 100644 --- a/yql/essentials/sql/v1/sql_select_yql.h +++ b/yql/essentials/sql/v1/sql_select_yql.h @@ -6,23 +6,14 @@ #include -#include - namespace NSQLTranslationV1 { -enum class EYqlSelectError { - Error, - Unsupported, -}; - -using TYqlSelectResult = std::expected; - -TYqlSelectResult BuildYqlSelect( +TNodeResult BuildYqlSelect( TContext& ctx, NSQLTranslation::ESqlMode mode, const NSQLv1Generated::TRule_select_stmt& rule); -TYqlSelectResult BuildYqlSelect( +TNodeResult BuildYqlSelect( TContext& ctx, NSQLTranslation::ESqlMode mode, const NSQLv1Generated::TRule_values_stmt& rule); diff --git a/yql/essentials/sql/v1/sql_translation.cpp b/yql/essentials/sql/v1/sql_translation.cpp index 934d1d80a3ba..ce4868da492c 100644 --- a/yql/essentials/sql/v1/sql_translation.cpp +++ b/yql/essentials/sql/v1/sql_translation.cpp @@ -953,7 +953,7 @@ TNodePtr TSqlTranslation::NamedExpr( if (nameTree) { expr.MarkAsNamed(); } - TNodePtr exprNode = expr.Build(exprTree); + TNodePtr exprNode = Unwrap(expr.Build(exprTree)); if (!exprNode) { Ctx_.IncrementMonCounter("sql_errors", "NamedExprInvalid"); return nullptr; @@ -1385,7 +1385,7 @@ bool TSqlTranslation::TableRefImpl(const TRule_table_ref& node, TTableRef& resul values.push_back(new TAstAtomNodeImpl(Ctx_.Pos(), "world", TNodeFlags::Default)); TSqlExpression sqlExpr(Ctx_, Mode_); - if (alt.GetBlock2().HasBlock2() && !ExprList(sqlExpr, values, alt.GetBlock2().GetBlock2().GetRule_expr_list1())) { + if (alt.GetBlock2().HasBlock2() && !Unwrap(ExprList(sqlExpr, values, alt.GetBlock2().GetBlock2().GetRule_expr_list1()))) { return false; } @@ -1666,7 +1666,7 @@ TMaybe ColumnOptions(const TRule_column_schema& node, TTranslati ctx.Context().DisableLegacyNotNull = true; - defaultExpr = expr.Build(opt.GetRule_expr2()); + defaultExpr = Unwrap(expr.Build(opt.GetRule_expr2())); if (AnyOf(ctx.Context().Issues.begin(), ctx.Context().Issues.end(), [](const auto& issue) { return issue.GetCode() == TIssuesIds::YQL_MISSING_IS_BEFORE_NOT_NULL; @@ -2171,7 +2171,7 @@ bool StoreSplitBoundaries(const TRule_table_setting_value& from, TVectorGetRule_expr1()); + valueExprNode = Unwrap(ctx.Build(value->GetRule_expr1())); if (!valueExprNode) { ctx.Error() << "invalid value for setting: " << id.Name; return false; @@ -2748,7 +2748,7 @@ static bool StoreTopicSettingsEntry( YQL_ENSURE(value || reset); TNodePtr valueExprNode; if (value) { - valueExprNode = ctx.Build(value->GetRule_expr1()); + valueExprNode = Unwrap(ctx.Build(value->GetRule_expr1())); if (!valueExprNode) { ctx.Error() << "invalid value for setting: " << id.Name; return false; @@ -3499,7 +3499,7 @@ TNodePtr TSqlTranslation::ListLiteral(const TRule_list_literal& node) { values.push_back(new TAstAtomNodeImpl(Ctx_.Pos(), "AsListMayWarn", TNodeFlags::Default)); TSqlExpression sqlExpr(Ctx_, Mode_); - if (node.HasBlock2() && !ExprList(sqlExpr, values, node.GetBlock2().GetRule_expr_list1())) { + if (node.HasBlock2() && !Unwrap(ExprList(sqlExpr, values, node.GetBlock2().GetRule_expr_list1()))) { return nullptr; } @@ -3514,16 +3514,16 @@ TNodePtr TSqlTranslation::DictLiteral(const TRule_dict_literal& node) { values.push_back(new TAstAtomNodeImpl(Ctx_.Pos(), isSet ? "AsSet" : "AsDict", TNodeFlags::Default)); TSqlExpression sqlExpr(Ctx_, Mode_); if (isSet) { - if (!Expr(sqlExpr, values, list.GetRule_expr1())) { + if (!Unwrap(Expr(sqlExpr, values, list.GetRule_expr1()))) { return nullptr; } } else { TVector tupleItems; - if (!Expr(sqlExpr, tupleItems, list.GetRule_expr1())) { + if (!Unwrap(Expr(sqlExpr, tupleItems, list.GetRule_expr1()))) { return nullptr; } - if (!Expr(sqlExpr, tupleItems, list.GetBlock2().GetRule_expr2())) { + if (!Unwrap(Expr(sqlExpr, tupleItems, list.GetBlock2().GetRule_expr2()))) { return nullptr; } @@ -3539,16 +3539,16 @@ TNodePtr TSqlTranslation::DictLiteral(const TRule_dict_literal& node) { } if (isSet) { - if (!Expr(sqlExpr, values, b.GetRule_expr2())) { + if (!Unwrap(Expr(sqlExpr, values, b.GetRule_expr2()))) { return nullptr; } } else { TVector tupleItems; - if (!Expr(sqlExpr, tupleItems, b.GetRule_expr2())) { + if (!Unwrap(Expr(sqlExpr, tupleItems, b.GetRule_expr2()))) { return nullptr; } - if (!Expr(sqlExpr, tupleItems, b.GetBlock3().GetRule_expr2())) { + if (!Unwrap(Expr(sqlExpr, tupleItems, b.GetBlock3().GetRule_expr2()))) { return nullptr; } @@ -3567,7 +3567,7 @@ bool TSqlTranslation::StructLiteralItem(TVector& labels, const TRule_e { TColumnRefScope scope(Ctx_, EColumnRefState::AsStringLiteral, /* topLevel */ false); TSqlExpression sqlExpr(Ctx_, Mode_); - if (!Expr(sqlExpr, labels, label)) { + if (!Unwrap(Expr(sqlExpr, labels, label))) { return false; } @@ -3582,7 +3582,7 @@ bool TSqlTranslation::StructLiteralItem(TVector& labels, const TRule_e // value expr { TSqlExpression sqlExpr(Ctx_, Mode_); - if (!Expr(sqlExpr, values, value)) { + if (!Unwrap(Expr(sqlExpr, values, value))) { return false; } } @@ -3734,7 +3734,7 @@ bool TSqlTranslation::TableHintImpl(const TRule_table_hint& rule, TTableHints& h const auto& alt = rule.GetAlt_table_hint4(); const auto pos = Ctx_.TokenPosition(alt.GetToken1()); TColumnRefScope scope(Ctx_, EColumnRefState::Allow); - auto expr = TSqlExpression(Ctx_, Mode_).Build(alt.GetRule_expr4()); + auto expr = Unwrap(TSqlExpression(Ctx_, Mode_).Build(alt.GetRule_expr4())); if (!expr) { return false; } @@ -3908,7 +3908,7 @@ TNodePtr TSqlTranslation::NamedNode(const TRule_named_nodes_stmt& rule, TVector< switch (rule.GetBlock3().Alt_case()) { case TRule_named_nodes_stmt::TBlock3::kAlt1: { TSqlExpression expr(Ctx_, Mode_); - auto result = expr.BuildSourceOrNode(rule.GetBlock3().GetAlt1().GetRule_expr1()); + TNodePtr result = Unwrap(expr.BuildSourceOrNode(rule.GetBlock3().GetAlt1().GetRule_expr1())); if (TSourcePtr source = MoveOutIfSource(result)) { result = BuildSourceNode(Ctx_.Pos(), std::move(source)); } @@ -3978,7 +3978,7 @@ bool TSqlTranslation::SortSpecification(const TRule_sort_specification& node, TV bool asc = true; TSqlExpression expr(Ctx_, Mode_); TColumnRefScope scope(Ctx_, EColumnRefState::Allow); - TNodePtr exprNode = expr.Build(node.GetRule_expr1()); + TNodePtr exprNode = Unwrap(expr.Build(node.GetRule_expr1())); if (!exprNode) { return false; } @@ -4617,7 +4617,7 @@ bool TSqlTranslation::FrameBound(const TRule_window_frame_bound& rule, TFrameBou switch (block.Alt_case()) { case TRule_window_frame_bound_TAlt2_TBlock1::kAlt1: { TSqlExpression boundExpr(Ctx_, Mode_); - bound->Bound = boundExpr.Build(block.GetAlt1().GetRule_expr1()); + bound->Bound = Unwrap(boundExpr.Build(block.GetAlt1().GetRule_expr1())); if (!bound->Bound) { return false; } @@ -4866,7 +4866,7 @@ TNodePtr TSqlTranslation::DoStatement(const TRule_do_stmt& stmt, bool makeLambda values.push_back(new TAstAtomNodeImpl(Ctx_.Pos(), "world", TNodeFlags::Default)); TSqlExpression sqlExpr(Ctx_, Mode_); - if (callAction.HasBlock3() && !ExprList(sqlExpr, values, callAction.GetBlock3().GetRule_expr_list1())) { + if (callAction.HasBlock3() && !Unwrap(ExprList(sqlExpr, values, callAction.GetBlock3().GetRule_expr_list1()))) { return nullptr; } @@ -5035,7 +5035,7 @@ bool TSqlTranslation::DefineActionOrSubqueryStatement(const TRule_define_action_ TNodePtr TSqlTranslation::IfStatement(const TRule_if_stmt& stmt) { bool isEvaluate = stmt.HasBlock1(); TSqlExpression expr(Ctx_, Mode_); - auto exprNode = expr.Build(stmt.GetRule_expr3()); + auto exprNode = Unwrap(expr.Build(stmt.GetRule_expr3())); if (!exprNode) { return {}; } @@ -5066,7 +5066,7 @@ TNodePtr TSqlTranslation::ForStatement(const TRule_for_stmt& stmt) { } TPosition itemArgNamePos = Ctx_.Pos(); - auto exprNode = expr.Build(stmt.GetRule_expr6()); + auto exprNode = Unwrap(expr.Build(stmt.GetRule_expr6())); if (!exprNode) { return {}; } diff --git a/yql/essentials/sql/v1/sql_ut_common.h b/yql/essentials/sql/v1/sql_ut_common.h index 6d5829c345cc..9e4e4874e2c7 100644 --- a/yql/essentials/sql/v1/sql_ut_common.h +++ b/yql/essentials/sql/v1/sql_ut_common.h @@ -2794,7 +2794,8 @@ Y_UNIT_TEST(JoinByUdf) { "from T1 as a\n" "join T2 as b\n" "on Yson::SerializeJsonEncodeUtf8(a.align)=b.align;"; - UNIT_ASSERT(SqlToYql(req).IsOk()); + auto res = SqlToYql(req); + UNIT_ASSERT_C(res.IsOk(), res.Issues.ToOneLineString()); } Y_UNIT_TEST(EscapedIdentifierAsLambdaArg) { diff --git a/yql/essentials/sql/v1/sql_values.cpp b/yql/essentials/sql/v1/sql_values.cpp index 1572c2314eb3..1f46c15a06db 100644 --- a/yql/essentials/sql/v1/sql_values.cpp +++ b/yql/essentials/sql/v1/sql_values.cpp @@ -84,7 +84,7 @@ bool TSqlValues::BuildRows(const TRule_values_source_row_list& node, TVector& outRow) { TSqlExpression sqlExpr(Ctx_, Mode_); - return ExprList(sqlExpr, outRow, inRow.GetRule_expr_list2()); + return Unwrap(ExprList(sqlExpr, outRow, inRow.GetRule_expr_list2())); } TSourcePtr TSqlValues::ValuesSource(const TRule_values_source& node, const TVector& columnsHint, diff --git a/yql/essentials/sql/v1/ya.make b/yql/essentials/sql/v1/ya.make index db84752407ce..1830f39854a3 100644 --- a/yql/essentials/sql/v1/ya.make +++ b/yql/essentials/sql/v1/ya.make @@ -30,6 +30,7 @@ SRCS( list_builtin.cpp match_recognize.cpp node.cpp + result.cpp select_yql.cpp select.cpp source.cpp From c432a332099df20de0b768e060888f264a7b1d67 Mon Sep 17 00:00:00 2001 From: robot-piglet Date: Fri, 21 Nov 2025 18:30:01 +0300 Subject: [PATCH 14/16] Intermediate changes commit_hash:fada69f286415a564c32c3358d8a83d3f06f37c5 --- yt/yt/core/rpc/grpc/dispatcher.cpp | 3 +++ 1 file changed, 3 insertions(+) diff --git a/yt/yt/core/rpc/grpc/dispatcher.cpp b/yt/yt/core/rpc/grpc/dispatcher.cpp index aee589e13661..15c2e4993948 100644 --- a/yt/yt/core/rpc/grpc/dispatcher.cpp +++ b/yt/yt/core/rpc/grpc/dispatcher.cpp @@ -62,6 +62,9 @@ class TDispatcher::TImpl auto guard = Guard(ConfigLock_); if (IsInitialized()) { + if (AreNodesEqual(ConvertToNode(config), ConvertToNode(Config_))) { + return; + } THROW_ERROR_EXCEPTION("GRPC dispatcher is already initialized and cannot be reconfigured"); } From a34e81a11c2b3580e750b9995bedd7160b5ac8bc Mon Sep 17 00:00:00 2001 From: Aleksei Pozdniakov Date: Fri, 21 Nov 2025 21:52:48 +0000 Subject: [PATCH 15/16] YQL-20666: Fix failed sql/v1 build --- yql/essentials/sql/v1/sql_translation.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yql/essentials/sql/v1/sql_translation.cpp b/yql/essentials/sql/v1/sql_translation.cpp index ce4868da492c..66df4841ecf6 100644 --- a/yql/essentials/sql/v1/sql_translation.cpp +++ b/yql/essentials/sql/v1/sql_translation.cpp @@ -3734,7 +3734,7 @@ bool TSqlTranslation::TableHintImpl(const TRule_table_hint& rule, TTableHints& h const auto& alt = rule.GetAlt_table_hint4(); const auto pos = Ctx_.TokenPosition(alt.GetToken1()); TColumnRefScope scope(Ctx_, EColumnRefState::Allow); - auto expr = Unwrap(TSqlExpression(Ctx_, Mode_).Build(alt.GetRule_expr4())); + TNodePtr expr = Unwrap(TSqlExpression(Ctx_, Mode_).Build(alt.GetRule_expr4())); if (!expr) { return false; } @@ -3746,7 +3746,7 @@ bool TSqlTranslation::TableHintImpl(const TRule_table_hint& rule, TTableHints& h const auto& alt = rule.GetAlt_table_hint5(); const auto pos = Ctx_.TokenPosition(alt.GetToken1()); TColumnRefScope scope(Ctx_, EColumnRefState::Allow); - auto expr = TSqlExpression(Ctx_, Mode_).Build(alt.GetRule_expr3()); + TNodePtr expr = Unwrap(TSqlExpression(Ctx_, Mode_).Build(alt.GetRule_expr3())); if (!expr) { return false; } From dbbe4fe4ff32676e70a476bc1a588a69f9f65f3a Mon Sep 17 00:00:00 2001 From: Aleksei Pozdniakov Date: Sun, 23 Nov 2025 18:09:21 +0000 Subject: [PATCH 16/16] fix antlr4 error messages --- .../libs/row_dispatcher/format_handler/ut/topic_filter_ut.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ydb/core/fq/libs/row_dispatcher/format_handler/ut/topic_filter_ut.cpp b/ydb/core/fq/libs/row_dispatcher/format_handler/ut/topic_filter_ut.cpp index 27afe993c543..38371ee03ef5 100644 --- a/ydb/core/fq/libs/row_dispatcher/format_handler/ut/topic_filter_ut.cpp +++ b/ydb/core/fq/libs/row_dispatcher/format_handler/ut/topic_filter_ut.cpp @@ -479,7 +479,7 @@ Y_UNIT_TEST_SUITE(TestPurecalcFilter) { } Y_UNIT_TEST_F(CompilationValidation, TFilterFixture) { - CompileError = {EStatusId::INTERNAL_ERROR, "Error: mismatched input '.'"}; + CompileError = {EStatusId::INTERNAL_ERROR, "Error: extraneous input '(' expecting {, ';'}"}; auto consumer = MakeConsumer( {{"a1", "[DataType; String]"}}, "", @@ -767,7 +767,7 @@ Y_UNIT_TEST_SUITE(TestFilterSet) { } Y_UNIT_TEST_F(CompilationValidation, TFilterSetFixture) { - CompileError = {EStatusId::INTERNAL_ERROR, "Error: mismatched input '.'"}; + CompileError = {EStatusId::INTERNAL_ERROR, "Error: extraneous input '(' expecting {, ';'}"}; auto consumer = MakeConsumer( {{"a1", "[DataType; String]"}},