From 9bbdd39efcc346ea8c4a44df2c9faeb6f3008ba4 Mon Sep 17 00:00:00 2001 From: Vitaly Stoyan Date: Wed, 15 Sep 2021 18:07:18 +0300 Subject: [PATCH] initial commit --- src/Formats/registerFormats.cpp | 3 +-- src/Processors/Formats/Impl/ORCBlockInputFormat.h | 4 +++- src/Processors/Formats/Impl/ParquetBlockInputFormat.h | 5 +++-- src/Processors/Formats/Impl/ParquetBlockOutputFormat.h | 4 +++- src/Processors/ya.make | 8 +++++++- src/Processors/ya.make.in | 4 +++- 6 files changed, 20 insertions(+), 8 deletions(-) diff --git a/src/Formats/registerFormats.cpp b/src/Formats/registerFormats.cpp index 2cb524f2d9b..de479c07bae 100644 --- a/src/Formats/registerFormats.cpp +++ b/src/Formats/registerFormats.cpp @@ -121,15 +121,14 @@ void registerFormats() registerInputFormatProcessorRawBLOB(factory); registerOutputFormatProcessorRawBLOB(factory); -#if !defined(ARCADIA_BUILD) registerInputFormatProcessorORC(factory); registerOutputFormatProcessorORC(factory); registerInputFormatProcessorParquet(factory); registerOutputFormatProcessorParquet(factory); +#if !defined(ARCADIA_BUILD) registerInputFormatProcessorAvro(factory); registerOutputFormatProcessorAvro(factory); #endif - registerInputFormatProcessorArrow(factory); registerOutputFormatProcessorArrow(factory); diff --git a/src/Processors/Formats/Impl/ORCBlockInputFormat.h b/src/Processors/Formats/Impl/ORCBlockInputFormat.h index 254d0554cb2..60ce963a6a1 100644 --- a/src/Processors/Formats/Impl/ORCBlockInputFormat.h +++ b/src/Processors/Formats/Impl/ORCBlockInputFormat.h @@ -1,5 +1,7 @@ #pragma once -#include "config_formats.h" +#if !defined(ARCADIA_BUILD) +# include "config_formats.h" +#endif #if USE_ORC #include diff --git a/src/Processors/Formats/Impl/ParquetBlockInputFormat.h b/src/Processors/Formats/Impl/ParquetBlockInputFormat.h index c2ed1552423..a38db0b3a02 100644 --- a/src/Processors/Formats/Impl/ParquetBlockInputFormat.h +++ b/src/Processors/Formats/Impl/ParquetBlockInputFormat.h @@ -1,6 +1,7 @@ #pragma once - -#include "config_formats.h" +#if !defined(ARCADIA_BUILD) +# include "config_formats.h" +#endif #if USE_PARQUET #include diff --git a/src/Processors/Formats/Impl/ParquetBlockOutputFormat.h b/src/Processors/Formats/Impl/ParquetBlockOutputFormat.h index 8114d1ab494..ba82000e463 100644 --- a/src/Processors/Formats/Impl/ParquetBlockOutputFormat.h +++ b/src/Processors/Formats/Impl/ParquetBlockOutputFormat.h @@ -1,6 +1,8 @@ #pragma once +#if !defined(ARCADIA_BUILD) +# include "config_formats.h" +#endif -#include "config_formats.h" #if USE_PARQUET # include # include diff --git a/src/Processors/ya.make b/src/Processors/ya.make index ffca7a2e8af..82687683f2d 100644 --- a/src/Processors/ya.make +++ b/src/Processors/ya.make @@ -8,13 +8,15 @@ PEERDIR( contrib/libs/msgpack contrib/libs/protobuf contrib/libs/apache/arrow + contrib/libs/apache/orc ) ADDINCL( contrib/libs/apache/arrow/src + contrib/libs/apache/orc/c++/include ) -CFLAGS(-DUSE_ARROW=1) +CFLAGS(-DUSE_ARROW=1 -DUSE_PARQUET=1 -DUSE_ORC=1) SRCS( Chunk.cpp @@ -56,8 +58,12 @@ SRCS( Formats/Impl/MySQLOutputFormat.cpp Formats/Impl/NullFormat.cpp Formats/Impl/ODBCDriver2BlockOutputFormat.cpp + Formats/Impl/ORCBlockInputFormat.cpp + Formats/Impl/ORCBlockOutputFormat.cpp Formats/Impl/ParallelFormattingOutputFormat.cpp Formats/Impl/ParallelParsingInputFormat.cpp + Formats/Impl/ParquetBlockInputFormat.cpp + Formats/Impl/ParquetBlockOutputFormat.cpp Formats/Impl/PostgreSQLOutputFormat.cpp Formats/Impl/PrettyBlockOutputFormat.cpp Formats/Impl/PrettyCompactBlockOutputFormat.cpp diff --git a/src/Processors/ya.make.in b/src/Processors/ya.make.in index ee87d25eafc..8105d8b1940 100644 --- a/src/Processors/ya.make.in +++ b/src/Processors/ya.make.in @@ -7,13 +7,15 @@ PEERDIR( contrib/libs/msgpack contrib/libs/protobuf contrib/libs/apache/arrow + contrib/libs/apache/orc ) ADDINCL( contrib/libs/apache/arrow/src + contrib/libs/apache/orc/c++/include ) -CFLAGS(-DUSE_ARROW=1) +CFLAGS(-DUSE_ARROW=1 -DUSE_PARQUET=1 -DUSE_ORC=1) SRCS(