This is an automated email from the ASF dual-hosted git repository. lzljs3620320 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/flink.git
The following commit(s) were added to refs/heads/master by this push: new f960a2e [FLINK-17142][orc] Bump ORC dependency version to 1.5.6 f960a2e is described below commit f960a2ecdc69575b9f4e0e5ca397708878091a48 Author: Sivaprasanna <sivaprasanna...@gmail.com> AuthorDate: Sat Apr 18 09:52:32 2020 +0530 [FLINK-17142][orc] Bump ORC dependency version to 1.5.6 This closes #11759 --- flink-connectors/flink-connector-hive/pom.xml | 8 ++++---- flink-connectors/flink-sql-connector-hive-1.2.2/pom.xml | 2 +- flink-connectors/flink-sql-connector-hive-2.2.0/pom.xml | 2 +- flink-formats/flink-orc-nohive/pom.xml | 4 ++++ .../apache/flink/orc/nohive/vector/AbstractOrcNoHiveVector.java | 8 +++++--- flink-formats/flink-orc/pom.xml | 4 ++++ pom.xml | 3 ++- 7 files changed, 21 insertions(+), 10 deletions(-) diff --git a/flink-connectors/flink-connector-hive/pom.xml b/flink-connectors/flink-connector-hive/pom.xml index 1a8754a..48ae9edd 100644 --- a/flink-connectors/flink-connector-hive/pom.xml +++ b/flink-connectors/flink-connector-hive/pom.xml @@ -843,7 +843,7 @@ under the License. <dependency> <groupId>org.apache.orc</groupId> <artifactId>orc-core</artifactId> - <version>${orc.version}</version> + <version>${hive.connector.orc.version}</version> <classifier>nohive</classifier> <exclusions> <exclusion> @@ -871,7 +871,7 @@ under the License. <dependency> <groupId>org.apache.orc</groupId> <artifactId>orc-core</artifactId> - <version>${orc.version}</version> + <version>${hive.connector.orc.version}</version> <classifier>nohive</classifier> <exclusions> <exclusion> @@ -897,7 +897,7 @@ under the License. <dependency> <groupId>org.apache.orc</groupId> <artifactId>orc-core</artifactId> - <version>${orc.version}</version> + <version>${hive.connector.orc.version}</version> <classifier>nohive</classifier> <exclusions> <exclusion> @@ -933,7 +933,7 @@ under the License. <dependency> <groupId>org.apache.orc</groupId> <artifactId>orc-core</artifactId> - <version>${orc.version}</version> + <version>${hive.connector.orc.version}</version> <exclusions> <exclusion> <groupId>org.apache.hadoop</groupId> diff --git a/flink-connectors/flink-sql-connector-hive-1.2.2/pom.xml b/flink-connectors/flink-sql-connector-hive-1.2.2/pom.xml index 8824b3d..2bc01ac 100644 --- a/flink-connectors/flink-sql-connector-hive-1.2.2/pom.xml +++ b/flink-connectors/flink-sql-connector-hive-1.2.2/pom.xml @@ -87,7 +87,7 @@ under the License. <dependency> <groupId>org.apache.orc</groupId> <artifactId>orc-core</artifactId> - <version>1.4.3</version> + <version>${hive.connector.orc.version}</version> <classifier>nohive</classifier> <exclusions> <exclusion> diff --git a/flink-connectors/flink-sql-connector-hive-2.2.0/pom.xml b/flink-connectors/flink-sql-connector-hive-2.2.0/pom.xml index 46cd135..79f4e42 100644 --- a/flink-connectors/flink-sql-connector-hive-2.2.0/pom.xml +++ b/flink-connectors/flink-sql-connector-hive-2.2.0/pom.xml @@ -65,7 +65,7 @@ under the License. <dependency> <groupId>org.apache.orc</groupId> <artifactId>orc-core</artifactId> - <version>1.4.3</version> + <version>${hive.connector.orc.version}</version> <exclusions> <exclusion> <groupId>log4j</groupId> diff --git a/flink-formats/flink-orc-nohive/pom.xml b/flink-formats/flink-orc-nohive/pom.xml index 9cbf161..3ef6cec 100644 --- a/flink-formats/flink-orc-nohive/pom.xml +++ b/flink-formats/flink-orc-nohive/pom.xml @@ -69,6 +69,10 @@ under the License. <artifactId>hadoop-common</artifactId> </exclusion> <exclusion> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + </exclusion> + <exclusion> <groupId>org.apache.hive</groupId> <artifactId>hive-storage-api</artifactId> </exclusion> diff --git a/flink-formats/flink-orc-nohive/src/main/java/org/apache/flink/orc/nohive/vector/AbstractOrcNoHiveVector.java b/flink-formats/flink-orc-nohive/src/main/java/org/apache/flink/orc/nohive/vector/AbstractOrcNoHiveVector.java index f55ef5c..ea7d60f 100644 --- a/flink-formats/flink-orc-nohive/src/main/java/org/apache/flink/orc/nohive/vector/AbstractOrcNoHiveVector.java +++ b/flink-formats/flink-orc-nohive/src/main/java/org/apache/flink/orc/nohive/vector/AbstractOrcNoHiveVector.java @@ -138,9 +138,11 @@ public abstract class AbstractOrcNoHiveVector implements bcv.isNull[0] = true; bcv.isRepeating = true; } else { - bcv.fill(value instanceof byte[] ? - (byte[]) value : - value.toString().getBytes(StandardCharsets.UTF_8)); + byte[] bytes = value instanceof byte[] ? + (byte[]) value : + value.toString().getBytes(StandardCharsets.UTF_8); + bcv.initBuffer(bytes.length); + bcv.fill(bytes); bcv.isNull[0] = false; } return bcv; diff --git a/flink-formats/flink-orc/pom.xml b/flink-formats/flink-orc/pom.xml index 81531e1..879c8d3 100644 --- a/flink-formats/flink-orc/pom.xml +++ b/flink-formats/flink-orc/pom.xml @@ -80,6 +80,10 @@ under the License. <groupId>org.apache.hadoop</groupId> <artifactId>hadoop-common</artifactId> </exclusion> + <exclusion> + <groupId>org.apache.hadoop</groupId> + <artifactId>hadoop-hdfs</artifactId> + </exclusion> </exclusions> </dependency> diff --git a/pom.xml b/pom.xml index 46bb972..730841b 100644 --- a/pom.xml +++ b/pom.xml @@ -146,7 +146,8 @@ under the License. <minikdc.version>3.2.0</minikdc.version> <generated.docs.dir>./docs/_includes/generated</generated.docs.dir> <hive.version>2.3.4</hive.version> - <orc.version>1.4.3</orc.version> + <hive.connector.orc.version>1.4.3</hive.connector.orc.version> + <orc.version>1.5.6</orc.version> <!-- Hive 2.3.4 relies on Hadoop 2.7.2 and later versions. For Hadoop 2.7, the minor Hadoop version supported for flink-shaded-hadoop-2-uber is 2.7.5