[flink] branch master updated: [FLINK-25162][hive] Fix Java 17 compile issue

[chesnay]

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

chesnay 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 686bc00fd48 [FLINK-25162][hive] Fix Java 17 compile issue
686bc00fd48 is described below

commit 686bc00fd48f09b35a81a1588a2f2bc094f47c40
Author: Chesnay Schepler <ches...@apache.org>
AuthorDate: Tue Nov 16 11:56:35 2021 +0100

    [FLINK-25162][hive] Fix Java 17 compile issue
    
    Java 17 apparently does more things with the signatures of called methods, 
requiring compile-time access to all returned types.
    Since orc-nohive isn't on the compile classpath of connector-hive the 
compilation would usually fail.
    Removing the orc-nohive classes from the signatures is an easier fix than 
changing the dependency setup.
---
 .../org/apache/flink/orc/nohive/OrcNoHiveColumnarRowInputFormat.java    | 2 +-
 .../main/java/org/apache/flink/orc/nohive/OrcNoHiveSplitReaderUtil.java | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/flink-formats/flink-orc-nohive/src/main/java/org/apache/flink/orc/nohive/OrcNoHiveColumnarRowInputFormat.java
 
b/flink-formats/flink-orc-nohive/src/main/java/org/apache/flink/orc/nohive/OrcNoHiveColumnarRowInputFormat.java
index a55fc04ce40..27c5b10b0d7 100644
--- 
a/flink-formats/flink-orc-nohive/src/main/java/org/apache/flink/orc/nohive/OrcNoHiveColumnarRowInputFormat.java
+++ 
b/flink-formats/flink-orc-nohive/src/main/java/org/apache/flink/orc/nohive/OrcNoHiveColumnarRowInputFormat.java
@@ -54,7 +54,7 @@ public class OrcNoHiveColumnarRowInputFormat {
      * generated by split.
      */
     public static <SplitT extends FileSourceSplit>
-            OrcColumnarRowInputFormat<VectorizedRowBatch, SplitT> 
createPartitionedFormat(
+            OrcColumnarRowInputFormat<?, SplitT> createPartitionedFormat(
                     Configuration hadoopConfig,
                     RowType tableType,
                     List<String> partitionKeys,
diff --git 
a/flink-formats/flink-orc-nohive/src/main/java/org/apache/flink/orc/nohive/OrcNoHiveSplitReaderUtil.java
 
b/flink-formats/flink-orc-nohive/src/main/java/org/apache/flink/orc/nohive/OrcNoHiveSplitReaderUtil.java
index 8bfad4227da..e1db797450b 100644
--- 
a/flink-formats/flink-orc-nohive/src/main/java/org/apache/flink/orc/nohive/OrcNoHiveSplitReaderUtil.java
+++ 
b/flink-formats/flink-orc-nohive/src/main/java/org/apache/flink/orc/nohive/OrcNoHiveSplitReaderUtil.java
@@ -45,7 +45,7 @@ import static 
org.apache.flink.orc.nohive.vector.AbstractOrcNoHiveVector.createF
 public class OrcNoHiveSplitReaderUtil {
 
     /** Util for generating partitioned {@link OrcColumnarRowSplitReader}. */
-    public static OrcColumnarRowSplitReader<VectorizedRowBatch> 
genPartColumnarRowReader(
+    public static OrcColumnarRowSplitReader<?> genPartColumnarRowReader(
             Configuration conf,
             String[] fullFieldNames,
             DataType[] fullFieldTypes,