From b2712aa24224be910811a03e012d8b4ba5f3c16e Mon Sep 17 00:00:00 2001 From: Nikita Mikhaylov Date: Mon, 29 Jun 2020 23:48:18 +0300 Subject: [PATCH] disable orc in arcadia at all --- src/Processors/Formats/Impl/ORCBlockOutputFormat.h | 3 +++ src/Processors/ya.make | 1 - tests/queries/0_stateless/arcadia_skip_list.txt | 6 ++++-- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/Processors/Formats/Impl/ORCBlockOutputFormat.h b/src/Processors/Formats/Impl/ORCBlockOutputFormat.h index 8d2f5d76d5..ce599dabe2 100644 --- a/src/Processors/Formats/Impl/ORCBlockOutputFormat.h +++ b/src/Processors/Formats/Impl/ORCBlockOutputFormat.h @@ -1,5 +1,8 @@ #pragma once + +#if !defined(ARCADIA_BUILD) #include "config_formats.h" +#endif #if USE_ORC #include diff --git a/src/Processors/ya.make b/src/Processors/ya.make index 93caf9b756..4e6ec2372d 100644 --- a/src/Processors/ya.make +++ b/src/Processors/ya.make @@ -38,7 +38,6 @@ SRCS( Formats/Impl/NullFormat.cpp Formats/Impl/ODBCDriver2BlockOutputFormat.cpp Formats/Impl/ODBCDriverBlockOutputFormat.cpp - Formats/Impl/ORCBlockOutputFormat.cpp Formats/Impl/PostgreSQLOutputFormat.cpp Formats/Impl/PrettyBlockOutputFormat.cpp Formats/Impl/PrettyCompactBlockOutputFormat.cpp diff --git a/tests/queries/0_stateless/arcadia_skip_list.txt b/tests/queries/0_stateless/arcadia_skip_list.txt index 2b61d384b0..a4b69391cd 100644 --- a/tests/queries/0_stateless/arcadia_skip_list.txt +++ b/tests/queries/0_stateless/arcadia_skip_list.txt @@ -57,6 +57,7 @@ 01044_h3_edge_angle 01046_materialized_view_with_join_over_distributed 01050_clickhouse_dict_source_with_subquery +01053_ssd_dictionary 01059_storage_file_brotli 01070_h3_get_base_cell 01070_h3_hex_area_m2 @@ -114,6 +115,7 @@ 01273_h3EdgeAngle_range_check 01274_alter_rename_column_distributed 01276_system_licenses +01280_ssd_complex_key_dictionary 01291_distributed_low_cardinality_memory_efficient 01292_create_user 01293_show_clusters @@ -121,7 +123,7 @@ 01294_system_distributed_on_cluster 01297_alter_distributed 01303_aggregate_function_nothing_serde +01307_orc_output_format +01308_orc_output_format_arrays 01319_query_formatting_in_server_log 01326_build_id -01053_ssd_dictionary -01280_ssd_complex_key_dictionary -- GitLab