Repository: orc Updated Branches: refs/heads/master ed772e741 -> 73248622e
ORC-46. Reserve CompressionKind values for LZ4 and ZSTD. (David Phillips via omalley) This fixes #20 Project: http://git-wip-us.apache.org/repos/asf/orc/repo Commit: http://git-wip-us.apache.org/repos/asf/orc/commit/73248622 Tree: http://git-wip-us.apache.org/repos/asf/orc/tree/73248622 Diff: http://git-wip-us.apache.org/repos/asf/orc/diff/73248622 Branch: refs/heads/master Commit: 73248622e68409dbf5b4aead4829d962c9f6fcda Parents: ed772e7 Author: David Phillips <[email protected]> Authored: Wed Apr 6 10:35:52 2016 -0700 Committer: Owen O'Malley <[email protected]> Committed: Fri Apr 8 08:54:17 2016 -0700 ---------------------------------------------------------------------- c++/include/orc/Reader.hh | 4 +++- c++/src/Reader.cc | 4 ++++ proto/orc_proto.proto | 2 ++ site/_docs/file-tail.md | 2 ++ 4 files changed, 11 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/orc/blob/73248622/c++/include/orc/Reader.hh ---------------------------------------------------------------------- diff --git a/c++/include/orc/Reader.hh b/c++/include/orc/Reader.hh index b6c5480..fd2e708 100644 --- a/c++/include/orc/Reader.hh +++ b/c++/include/orc/Reader.hh @@ -36,7 +36,9 @@ namespace orc { CompressionKind_NONE = 0, CompressionKind_ZLIB = 1, CompressionKind_SNAPPY = 2, - CompressionKind_LZO = 3 + CompressionKind_LZO = 3, + CompressionKind_LZ4 = 4, + CompressionKind_ZSTD = 5 }; /** http://git-wip-us.apache.org/repos/asf/orc/blob/73248622/c++/src/Reader.cc ---------------------------------------------------------------------- diff --git a/c++/src/Reader.cc b/c++/src/Reader.cc index 29bd439..b41d470 100644 --- a/c++/src/Reader.cc +++ b/c++/src/Reader.cc @@ -48,6 +48,10 @@ namespace orc { return "snappy"; case CompressionKind_LZO: return "LZO"; + case CompressionKind_LZ4: + return "LZ4"; + case CompressionKind_ZSTD: + return "ZSTD"; } std::stringstream buffer; buffer << "unknown - " << kind; http://git-wip-us.apache.org/repos/asf/orc/blob/73248622/proto/orc_proto.proto ---------------------------------------------------------------------- diff --git a/proto/orc_proto.proto b/proto/orc_proto.proto index 502667f..2e00566 100644 --- a/proto/orc_proto.proto +++ b/proto/orc_proto.proto @@ -198,6 +198,8 @@ enum CompressionKind { ZLIB = 1; SNAPPY = 2; LZO = 3; + LZ4 = 4; + ZSTD = 5; } // Serialized length must be less that 255 bytes http://git-wip-us.apache.org/repos/asf/orc/blob/73248622/site/_docs/file-tail.md ---------------------------------------------------------------------- diff --git a/site/_docs/file-tail.md b/site/_docs/file-tail.md index f636a3a..8bdebfe 100644 --- a/site/_docs/file-tail.md +++ b/site/_docs/file-tail.md @@ -60,6 +60,8 @@ and parsed. ZLIB = 1; SNAPPY = 2; LZO = 3; + LZ4 = 4; + ZSTD = 5; } ```
