diff options
author | thegeorg <thegeorg@yandex-team.ru> | 2022-02-10 16:45:12 +0300 |
---|---|---|
committer | Daniil Cherednik <dcherednik@yandex-team.ru> | 2022-02-10 16:45:12 +0300 |
commit | 49116032d905455a7b1c994e4a696afc885c1e71 (patch) | |
tree | be835aa92c6248212e705f25388ebafcf84bc7a1 /contrib/libs/apache/orc | |
parent | 4e839db24a3bbc9f1c610c43d6faaaa99824dcca (diff) | |
download | ydb-49116032d905455a7b1c994e4a696afc885c1e71.tar.gz |
Restoring authorship annotation for <thegeorg@yandex-team.ru>. Commit 2 of 2.
Diffstat (limited to 'contrib/libs/apache/orc')
9 files changed, 15 insertions, 15 deletions
diff --git a/contrib/libs/apache/orc/c++/src/Adaptor.hh b/contrib/libs/apache/orc/c++/src/Adaptor.hh index 95d6fccec1..a91b9c894d 100644 --- a/contrib/libs/apache/orc/c++/src/Adaptor.hh +++ b/contrib/libs/apache/orc/c++/src/Adaptor.hh @@ -21,9 +21,9 @@ /* #undef INT64_IS_LL */ #define HAS_CONSTEXPR -#ifndef _MSC_VER +#ifndef _MSC_VER #define HAS_PREAD -#endif +#endif #define HAS_STRPTIME #define HAS_STOLL #define HAS_DIAGNOSTIC_PUSH diff --git a/contrib/libs/apache/orc/c++/src/io/InputStream.cc b/contrib/libs/apache/orc/c++/src/io/InputStream.cc index dd1fadfa0a..6e54b1412f 100644 --- a/contrib/libs/apache/orc/c++/src/io/InputStream.cc +++ b/contrib/libs/apache/orc/c++/src/io/InputStream.cc @@ -115,7 +115,7 @@ namespace orc { return false; } - int64_t SeekableArrayInputStream::ByteCount() const { + int64_t SeekableArrayInputStream::ByteCount() const { return static_cast<google::protobuf::int64>(position); } diff --git a/contrib/libs/apache/orc/c++/src/io/InputStream.hh b/contrib/libs/apache/orc/c++/src/io/InputStream.hh index 68506a5a01..d8bd3d4d8c 100644 --- a/contrib/libs/apache/orc/c++/src/io/InputStream.hh +++ b/contrib/libs/apache/orc/c++/src/io/InputStream.hh @@ -76,7 +76,7 @@ namespace orc { virtual bool Next(const void** data, int*size) override; virtual void BackUp(int count) override; virtual bool Skip(int count) override; - virtual int64_t ByteCount() const override; + virtual int64_t ByteCount() const override; virtual void seek(PositionProvider& position) override; virtual std::string getName() const override; }; diff --git a/contrib/libs/apache/orc/c++/src/io/OutputStream.cc b/contrib/libs/apache/orc/c++/src/io/OutputStream.cc index db894f38d3..11a21c0bd3 100644 --- a/contrib/libs/apache/orc/c++/src/io/OutputStream.cc +++ b/contrib/libs/apache/orc/c++/src/io/OutputStream.cc @@ -67,7 +67,7 @@ namespace orc { } } - int64_t BufferedOutputStream::ByteCount() const { + int64_t BufferedOutputStream::ByteCount() const { return static_cast<google::protobuf::int64>(dataBuffer->size()); } diff --git a/contrib/libs/apache/orc/c++/src/io/OutputStream.hh b/contrib/libs/apache/orc/c++/src/io/OutputStream.hh index f3c5e6332a..7ce9fafa24 100644 --- a/contrib/libs/apache/orc/c++/src/io/OutputStream.hh +++ b/contrib/libs/apache/orc/c++/src/io/OutputStream.hh @@ -55,7 +55,7 @@ namespace orc { virtual bool Next(void** data, int*size) override; virtual void BackUp(int count) override; - virtual int64_t ByteCount() const override; + virtual int64_t ByteCount() const override; virtual bool WriteAliasedRaw(const void * data, int size) override; virtual bool AllowsAliasing() const override; diff --git a/contrib/libs/apache/orc/c++/src/wrap/coded-stream-wrapper.h b/contrib/libs/apache/orc/c++/src/wrap/coded-stream-wrapper.h index 19d2761263..605fbf826c 100644 --- a/contrib/libs/apache/orc/c++/src/wrap/coded-stream-wrapper.h +++ b/contrib/libs/apache/orc/c++/src/wrap/coded-stream-wrapper.h @@ -28,7 +28,7 @@ DIAGNOSTIC_PUSH DIAGNOSTIC_IGNORE("-Wconversion") #endif -#include <google/protobuf/io/coded_stream.h> +#include <google/protobuf/io/coded_stream.h> DIAGNOSTIC_POP diff --git a/contrib/libs/apache/orc/c++/src/wrap/orc-proto-wrapper.hh b/contrib/libs/apache/orc/c++/src/wrap/orc-proto-wrapper.hh index d545e73d77..5c161660cc 100644 --- a/contrib/libs/apache/orc/c++/src/wrap/orc-proto-wrapper.hh +++ b/contrib/libs/apache/orc/c++/src/wrap/orc-proto-wrapper.hh @@ -40,7 +40,7 @@ DIAGNOSTIC_PUSH DIAGNOSTIC_IGNORE(4800) // forcing value to bool 'true' or 'false' #endif -#include "contrib/libs/apache/orc/proto/orc_proto.pb.h" +#include "contrib/libs/apache/orc/proto/orc_proto.pb.h" DIAGNOSTIC_POP diff --git a/contrib/libs/apache/orc/c++/src/wrap/zero-copy-stream-wrapper.h b/contrib/libs/apache/orc/c++/src/wrap/zero-copy-stream-wrapper.h index 52af9dfa40..1af0bd002d 100644 --- a/contrib/libs/apache/orc/c++/src/wrap/zero-copy-stream-wrapper.h +++ b/contrib/libs/apache/orc/c++/src/wrap/zero-copy-stream-wrapper.h @@ -29,7 +29,7 @@ DIAGNOSTIC_PUSH DIAGNOSTIC_IGNORE("-Wreserved-id-macro") #endif -#include <google/protobuf/io/zero_copy_stream.h> +#include <google/protobuf/io/zero_copy_stream.h> DIAGNOSTIC_POP diff --git a/contrib/libs/apache/orc/ya.make b/contrib/libs/apache/orc/ya.make index 050fd90f1c..5672ba95db 100644 --- a/contrib/libs/apache/orc/ya.make +++ b/contrib/libs/apache/orc/ya.make @@ -1,4 +1,4 @@ -# Generated by devtools/yamaker from nixpkgs e392df43c9f302d4a0892caaadcad3cd693edf9e. +# Generated by devtools/yamaker from nixpkgs e392df43c9f302d4a0892caaadcad3cd693edf9e. LIBRARY() @@ -12,7 +12,7 @@ VERSION(1.6.12) ORIGINAL_SOURCE(https://github.com/apache/orc/archive/rel/release-1.6.12.tar.gz) LICENSE(Apache-2.0) - + LICENSE_TEXTS(.yandex_meta/licenses.list.txt) PEERDIR( @@ -23,11 +23,11 @@ PEERDIR( ) ADDINCL( - contrib/libs/apache/orc/c++/include - contrib/libs/apache/orc/c++/src - contrib/libs/apache/orc/proto + contrib/libs/apache/orc/c++/include + contrib/libs/apache/orc/c++/src + contrib/libs/apache/orc/proto contrib/libs/lz4 - contrib/libs/zstd/include + contrib/libs/zstd/include ) NO_COMPILER_WARNINGS() |