[orc] branch master updated (34be44d -> 5480502)

[om...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

omalley pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/orc.git.


    from 34be44d  ORC-548. Fix Java InStream to work with BufferChunks that don't start at the stream.
     add 5480502  ORC-520: Fix file merging for column encryption.

No new revisions were added by this update.

Summary of changes:
 java/core/src/java/org/apache/orc/DataReader.java  |  14 +-
 .../src/java/org/apache/orc/EncryptionKey.java     |   6 +
 .../src/java/org/apache/orc/EncryptionVariant.java |  11 +-
 .../core/src/java/org/apache/orc/FileMetadata.java |   1 +
 java/core/src/java/org/apache/orc/OrcFile.java     | 219 ++++++++---
 java/core/src/java/org/apache/orc/OrcUtils.java    |   2 +-
 .../src/java/org/apache/orc/PhysicalWriter.java    |   1 -
 java/core/src/java/org/apache/orc/Reader.java      |  36 +-
 .../src/java/org/apache/orc/StripeInformation.java |   8 +-
 .../src/java/org/apache/orc/StripeStatistics.java  |  28 +-
 .../src/java/org/apache/orc/TypeDescription.java   |  60 +--
 java/core/src/java/org/apache/orc/Writer.java      |  36 +-
 .../core/src/java/org/apache/orc/impl/OrcTail.java | 122 ++++--
 .../java/org/apache/orc/impl/PhysicalFsWriter.java |  15 +-
 .../src/java/org/apache/orc/impl/ReaderImpl.java   | 417 ++++++++++++---------
 .../java/org/apache/orc/impl/RecordReaderImpl.java |  22 +-
 .../org/apache/orc/impl/RecordReaderUtils.java     |  12 +-
 .../org/apache/orc/impl/StripeStatisticsImpl.java  |  55 +++
 .../src/java/org/apache/orc/impl/TypeUtils.java    | 105 ++++++
 .../src/java/org/apache/orc/impl/WriterImpl.java   | 171 +++++----
 .../apache/orc/impl/mask/SHA256MaskFactory.java    |  33 +-
 .../apache/orc/impl/reader/ReaderEncryption.java   |  46 +--
 .../orc/impl/reader/ReaderEncryptionKey.java       |  19 +-
 .../orc/impl/reader/ReaderEncryptionVariant.java   | 115 +++++-
 .../org/apache/orc/impl/reader/StripePlanner.java  |  28 +-
 .../orc/impl/writer/EncryptionTreeWriter.java      |  34 +-
 .../org/apache/orc/impl/writer/ListTreeWriter.java |   8 +-
 .../org/apache/orc/impl/writer/MapTreeWriter.java  |  10 +-
 .../apache/orc/impl/writer/StructTreeWriter.java   |   8 +-
 .../org/apache/orc/impl/writer/TreeWriter.java     |   9 +-
 .../org/apache/orc/impl/writer/TreeWriterBase.java |  23 +-
 .../apache/orc/impl/writer/UnionTreeWriter.java    |   8 +-
 .../orc/impl/writer/WriterEncryptionKey.java       |   6 +-
 .../orc/impl/writer/WriterEncryptionVariant.java   |   4 -
 .../test/org/apache/orc/TestTypeDescription.java   |   6 +-
 .../src/test/org/apache/orc/TestVectorOrcFile.java | 309 ++++++++++++++-
 .../test/org/apache/orc/impl/MockDataReader.java   |  11 +-
 .../src/test/org/apache/orc/impl/MockStripe.java   |   5 +
 .../org/apache/orc/impl/TestRecordReaderImpl.java  |  33 +-
 .../org/apache/orc/impl/TestSchemaEvolution.java   |   3 +-
 proto/orc_proto.proto                              |   6 +-
 41 files changed, 1477 insertions(+), 588 deletions(-)
 create mode 100644 java/core/src/java/org/apache/orc/impl/StripeStatisticsImpl.java
 create mode 100644 java/core/src/java/org/apache/orc/impl/TypeUtils.java