[hotfix][test] Fix some Architecture Violation errors

dafei1288 · Jan 12, 2024 · 1d45dd0 · 1d45dd0
1 parent b660b06
commit 1d45dd0
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 2 deletions.
diff --git a/...ty/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/wrapper/HadoopInputSplit.java b/...ty/src/main/java/org/apache/flink/api/java/hadoop/mapreduce/wrapper/HadoopInputSplit.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.api.java.hadoop.mapreduce.wrapper;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.core.io.InputSplit;
 import org.apache.flink.core.io.LocatableInputSplit;
 
@@ -33,6 +34,7 @@
  * A wrapper that represents an input split from the Hadoop mapreduce API as a Flink {@link
  * InputSplit}.
  */
+@Internal
 public class HadoopInputSplit extends LocatableInputSplit {
 
     private static final long serialVersionUID = 6119153593707857235L;

diff --git a/...ibility/src/main/java/org/apache/flink/api/java/typeutils/runtime/WritableComparator.java b/...ibility/src/main/java/org/apache/flink/api/java/typeutils/runtime/WritableComparator.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.api.java.typeutils.runtime;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.api.common.typeutils.TypeComparator;
 import org.apache.flink.core.memory.DataInputView;
 import org.apache.flink.core.memory.DataOutputView;
@@ -36,6 +37,7 @@
  *
  * @param <T>
  */
+@Internal
 public class WritableComparator<T extends Writable & Comparable<T>> extends TypeComparator<T> {
 
     private static final long serialVersionUID = 1L;

diff --git a/...ibility/src/main/java/org/apache/flink/api/java/typeutils/runtime/WritableSerializer.java b/...ibility/src/main/java/org/apache/flink/api/java/typeutils/runtime/WritableSerializer.java
@@ -163,6 +163,7 @@ public TypeSerializerSnapshot<T> snapshotConfiguration() {
     }
 
     /** {@link WritableSerializer} snapshot class. */
+    @Internal
     public static final class WritableSerializerSnapshot<T extends Writable>
             extends GenericTypeSerializerSnapshot<T, WritableSerializer> {
 

diff --git a/...pache/flink/streaming/api/functions/sink/filesystem/HadoopPathBasedBulkFormatBuilder.java b/...pache/flink/streaming/api/functions/sink/filesystem/HadoopPathBasedBulkFormatBuilder.java
@@ -18,6 +18,7 @@
 
 package org.apache.flink.streaming.api.functions.sink.filesystem;
 
+import org.apache.flink.annotation.Internal;
 import org.apache.flink.core.fs.Path;
 import org.apache.flink.formats.hadoop.bulk.DefaultHadoopFileCommitterFactory;
 import org.apache.flink.formats.hadoop.bulk.HadoopFileCommitterFactory;
@@ -32,6 +33,7 @@
 import java.io.IOException;
 
 /** Buckets builder to create buckets that use {@link HadoopPathBasedPartFileWriter}. */
+@Internal
 public class HadoopPathBasedBulkFormatBuilder<
                 IN, BucketID, T extends HadoopPathBasedBulkFormatBuilder<IN, BucketID, T>>
         extends StreamingFileSink.BucketsBuilder<IN, BucketID, T> {

diff --git a/...a/org/apache/flink/streaming/api/functions/sink/filesystem/SerializableConfiguration.java b/...a/org/apache/flink/streaming/api/functions/sink/filesystem/SerializableConfiguration.java
@@ -17,6 +17,8 @@
 
 package org.apache.flink.streaming.api.functions.sink.filesystem;
 
+import org.apache.flink.annotation.Internal;
+
 import org.apache.hadoop.conf.Configuration;
 
 import java.io.IOException;
@@ -25,6 +27,7 @@
 import java.io.Serializable;
 
 /** Wrapper of hadoop Configuration to make it serializable. */
+@Internal
 public class SerializableConfiguration implements Serializable {
 
     private static final long serialVersionUID = 1L;

diff --git a/flink-formats/flink-orc/src/main/java/org/apache/flink/orc/shim/OrcShimV200.java b/flink-formats/flink-orc/src/main/java/org/apache/flink/orc/shim/OrcShimV200.java
@@ -18,7 +18,6 @@
 
 package org.apache.flink.orc.shim;
 
-import org.apache.flink.annotation.VisibleForTesting;
 import org.apache.flink.api.java.tuple.Tuple2;
 import org.apache.flink.orc.OrcFilters.Predicate;
 import org.apache.flink.orc.vector.HiveOrcBatchWrapper;
@@ -166,7 +165,6 @@ public boolean nextBatch(RecordReader reader, VectorizedRowBatch rowBatch) throw
         }
     }
 
-    @VisibleForTesting
     public static Tuple2<Long, Long> getOffsetAndLengthForSplit(
             long splitStart, long splitLength, List<StripeInformation> stripes) {
         long splitEnd = splitStart + splitLength;