Skip to content

Fix flaky build #1559

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
vitstn merged 1 commit into from
Feb 2, 2024
Merged

Fix flaky build #1559

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ydb/library/yql/minikql/comp_nodes/mkql_block_agg.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include <ydb/library/yql/minikql/computation/mkql_block_reader.h>
#include <ydb/library/yql/minikql/computation/mkql_block_builder.h>
#include <ydb/library/yql/minikql/computation/mkql_block_impl.h>
#include <ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h>
#include <ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h> // Y_IGNORE
#include <ydb/library/yql/minikql/computation/mkql_computation_node_impl.h>
#include <ydb/library/yql/minikql/computation/mkql_computation_node_holders.h>
#include <ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h> // Y_IGNORE
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/minikql/comp_nodes/mkql_block_compress.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

#include <ydb/library/yql/minikql/computation/mkql_block_builder.h>
#include <ydb/library/yql/minikql/computation/mkql_block_impl.h>
#include <ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h>
#include <ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h> // Y_IGNORE
#include <ydb/library/yql/minikql/arrow/arrow_util.h>
#include <ydb/library/yql/minikql/arrow/mkql_bit_utils.h>
#include <ydb/library/yql/minikql/mkql_type_builder.h>
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/minikql/comp_nodes/mkql_block_top.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <ydb/library/yql/minikql/computation/mkql_block_reader.h>
#include <ydb/library/yql/minikql/computation/mkql_block_builder.h>
#include <ydb/library/yql/minikql/computation/mkql_block_impl.h>
#include <ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h>
#include <ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h> // Y_IGNORE

#include <ydb/library/yql/public/udf/arrow/block_item_comparator.h>

Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/minikql/comp_nodes/mkql_blocks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <ydb/library/yql/minikql/computation/mkql_block_reader.h>
#include <ydb/library/yql/minikql/computation/mkql_block_builder.h>
#include <ydb/library/yql/minikql/computation/mkql_block_impl.h>
#include <ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h>
#include <ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h> // Y_IGNORE

#include <ydb/library/yql/minikql/arrow/arrow_defs.h>
#include <ydb/library/yql/minikql/arrow/arrow_util.h>
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/minikql/comp_nodes/mkql_combine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "mkql_combine.h"

#include <ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h> // Y_IGNORE
#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>
#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h> // Y_IGNORE
#include <ydb/library/yql/minikql/mkql_node_cast.h>
#include <ydb/library/yql/minikql/mkql_stats_registry.h>
#include <ydb/library/yql/minikql/defs.h>
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/minikql/comp_nodes/mkql_extend.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "mkql_extend.h"
#include <ydb/library/yql/minikql/computation/mkql_computation_node_holders.h>
#include <ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h> // Y_IGNORE
#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>
#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h> // Y_IGNORE
#include <ydb/library/yql/minikql/computation/mkql_custom_list.h>
#include <ydb/library/yql/minikql/mkql_node_cast.h>

Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/minikql/comp_nodes/mkql_grace_join.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
#include <ydb/library/yql/minikql/invoke_builtins/mkql_builtins.h>
#include <ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h> // Y_IGNORE
#include <ydb/library/yql/minikql/computation/mkql_computation_node_pack.h>
#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>
#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h> // Y_IGNORE

#include <ydb/library/yql/minikql/mkql_node_cast.h>
#include <ydb/library/yql/minikql/mkql_program_builder.h>
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/minikql/comp_nodes/mkql_join.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h> // Y_IGNORE
#include <ydb/library/yql/minikql/computation/mkql_computation_node_holders_codegen.h>
#include <ydb/library/yql/minikql/computation/mkql_computation_node_pack.h>
#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>
#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h> // Y_IGNORE
#include <ydb/library/yql/minikql/mkql_node_cast.h>
#include <ydb/library/yql/minikql/mkql_program_builder.h>

Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/minikql/comp_nodes/mkql_squeeze_to_list.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
#include <ydb/library/yql/minikql/mkql_node_cast.h>
#include <ydb/library/yql/minikql/computation/mkql_computation_node_holders.h>
#include <ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h> // Y_IGNORE
#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>
#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h> // Y_IGNORE

namespace NKikimr {
namespace NMiniKQL {
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/minikql/comp_nodes/mkql_switch.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "mkql_switch.h"

#include <ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h> // Y_IGNORE
#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>
#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h> // Y_IGNORE
#include <ydb/library/yql/minikql/mkql_node_cast.h>
#include <ydb/library/yql/minikql/mkql_stats_registry.h>
#include <ydb/library/yql/utils/cast.h>
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/minikql/comp_nodes/mkql_todict.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#include <ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h> // Y_IGNORE
#include <ydb/library/yql/minikql/computation/mkql_computation_node_holders.h>
#include <ydb/library/yql/minikql/computation/mkql_computation_node_pack.h>
#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>
#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h> // Y_IGNORE
#include <ydb/library/yql/minikql/computation/presort.h>
#include <ydb/library/yql/minikql/mkql_node_cast.h>
#include <ydb/library/yql/minikql/mkql_string_util.h>
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/minikql/comp_nodes/mkql_wide_combine.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#include "mkql_rh_hash.h"

#include <ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h> // Y_IGNORE
#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>
#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h> // Y_IGNORE
#include <ydb/library/yql/minikql/mkql_node_builder.h>
#include <ydb/library/yql/minikql/mkql_node_cast.h>
#include <ydb/library/yql/minikql/mkql_runtime_version.h>
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/minikql/comp_nodes/mkql_wide_top_sort.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#include "mkql_wide_top_sort.h"

#include <ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h> // Y_IGNORE
#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h>
#include <ydb/library/yql/minikql/computation/mkql_llvm_base.h> // Y_IGNORE
#include <ydb/library/yql/minikql/computation/presort.h>
#include <ydb/library/yql/minikql/mkql_node_builder.h>
#include <ydb/library/yql/minikql/mkql_node_cast.h>
Expand Down
3 changes: 3 additions & 0 deletions ydb/library/yql/minikql/comp_nodes/ya.make.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -141,8 +141,11 @@ COPY(
${ORIG_SOURCES}
OUTPUT_INCLUDES
${BINDIR}/ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h
${BINDIR}/ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h
${BINDIR}/ydb/library/yql/minikql/computation/mkql_llvm_base.h
${BINDIR}/ydb/library/yql/minikql/invoke_builtins/mkql_builtins_codegen.h
${BINDIR}/ydb/library/yql/minikql/invoke_builtins/mkql_builtins_decimal.h
llvm/Support/raw_ostream.h
)

PEERDIR(
Expand Down
21 changes: 21 additions & 0 deletions ydb/library/yql/minikql/computation/header.ya.make.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,3 +19,24 @@ COPY_FILE(TEXT
llvm/IR/Instructions.h
llvm/IR/Constants.h
)

COPY_FILE(TEXT
ydb/library/yql/minikql/computation/mkql_llvm_base.h.txt
${BINDIR}/ydb/library/yql/minikql/computation/mkql_llvm_base.h
OUTPUT_INCLUDES
${ARCADIA_ROOT}/ydb/library/yql/minikql/computation/mkql_computation_node_impl.h
llvm/IR/LLVMContext.h
llvm/IR/Type.h
llvm/IR/Constant.h
llvm/IR/DerivedTypes.h
llvm/IR/Constants.h
)

COPY_FILE(TEXT
ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h.txt
${BINDIR}/ydb/library/yql/minikql/computation/mkql_block_impl_codegen.h
OUTPUT_INCLUDES
${ARCADIA_ROOT}/ydb/library/yql/minikql/computation/mkql_block_item.h
${ARCADIA_ROOT}/ydb/library/yql/minikql/codegen/codegen.h
mkql_llvm_base.h
)
2 changes: 1 addition & 1 deletion ...kql/computation/mkql_block_impl_codegen.h → ...computation/mkql_block_impl_codegen.h.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#pragma once

#include "mkql_block_item.h"
#include <ydb/library/yql/minikql/computation/mkql_block_item.h>
#include "mkql_llvm_base.h"

#include <ydb/library/yql/minikql/codegen/codegen.h>
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/minikql/computation/mkql_computation_node_graph.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <util/digest/city.h>

#ifndef MKQL_DISABLE_CODEGEN
#include <llvm/Support/raw_ostream.h>
#include <llvm/Support/raw_ostream.h> // Y_IGNORE
#endif

namespace NKikimr {
Expand Down
2 changes: 1 addition & 1 deletion ydb/library/yql/minikql/computation/mkql_llvm_base.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#include "mkql_llvm_base.h"
#include "mkql_llvm_base.h" // Y_IGNORE

namespace NKikimr::NMiniKQL {

Expand Down
0 .../yql/minikql/computation/mkql_llvm_base.h → .../minikql/computation/mkql_llvm_base.h.txt
View file
Open in desktop
File renamed without changes.
4 changes: 3 additions & 1 deletion ydb/library/yql/minikql/computation/ya.make.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,9 @@ COPY(
AUTO
FROM ${ORIG_SRC_DIR}
${ORIG_SOURCES}
OUTPUT_INCLUDES ${BINDIR}/ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h
OUTPUT_INCLUDES
${BINDIR}/ydb/library/yql/minikql/computation/mkql_llvm_base.h
${BINDIR}/ydb/library/yql/minikql/computation/mkql_computation_node_codegen.h
)

PROVIDES(MINIKQL_COMPUTATION)