[HUDI-4698] Rename the package 'org.apache.flink.table.data' to avoid…

… conflicts with flink table core (apache#6481) (cherry picked from commit 822c139)
neverdizzy · Dec 1, 2022 · aec9a68 · aec9a68
1 parent 47a0e80
commit aec9a68
Show file tree

Hide file tree

Showing 12 changed files with 57 additions and 21 deletions.
diff --git a/...e/flink/table/data/ColumnarArrayData.java → ...he/hudi/table/data/ColumnarArrayData.java b/...e/flink/table/data/ColumnarArrayData.java → ...he/hudi/table/data/ColumnarArrayData.java
@@ -15,8 +15,18 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.data;
-
+package org.apache.hudi.table.data;
+
+import org.apache.hudi.table.data.vector.MapColumnVector;
+import org.apache.hudi.table.data.vector.RowColumnVector;
+
+import org.apache.flink.table.data.ArrayData;
+import org.apache.flink.table.data.DecimalData;
+import org.apache.flink.table.data.MapData;
+import org.apache.flink.table.data.RawValueData;
+import org.apache.flink.table.data.RowData;
+import org.apache.flink.table.data.StringData;
+import org.apache.flink.table.data.TimestampData;
 import org.apache.flink.table.data.binary.TypedSetters;
 import org.apache.flink.table.data.vector.ArrayColumnVector;
 import org.apache.flink.table.data.vector.BooleanColumnVector;
@@ -28,8 +38,6 @@
 import org.apache.flink.table.data.vector.FloatColumnVector;
 import org.apache.flink.table.data.vector.IntColumnVector;
 import org.apache.flink.table.data.vector.LongColumnVector;
-import org.apache.flink.table.data.vector.MapColumnVector;
-import org.apache.flink.table.data.vector.RowColumnVector;
 import org.apache.flink.table.data.vector.ShortColumnVector;
 import org.apache.flink.table.data.vector.TimestampColumnVector;
 

diff --git a/...che/flink/table/data/ColumnarMapData.java → ...ache/hudi/table/data/ColumnarMapData.java b/...che/flink/table/data/ColumnarMapData.java → ...ache/hudi/table/data/ColumnarMapData.java
@@ -15,8 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.data;
+package org.apache.hudi.table.data;
 
+import org.apache.flink.table.data.ArrayData;
+import org.apache.flink.table.data.MapData;
 import org.apache.flink.table.data.vector.ColumnVector;
 
 /**

diff --git a/...che/flink/table/data/ColumnarRowData.java → ...ache/hudi/table/data/ColumnarRowData.java b/...che/flink/table/data/ColumnarRowData.java → ...ache/hudi/table/data/ColumnarRowData.java
@@ -16,11 +16,19 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.data;
+package org.apache.hudi.table.data;
 
+import org.apache.hudi.table.data.vector.VectorizedColumnBatch;
+
+import org.apache.flink.table.data.ArrayData;
+import org.apache.flink.table.data.DecimalData;
+import org.apache.flink.table.data.MapData;
+import org.apache.flink.table.data.RawValueData;
+import org.apache.flink.table.data.RowData;
+import org.apache.flink.table.data.StringData;
+import org.apache.flink.table.data.TimestampData;
 import org.apache.flink.table.data.binary.TypedSetters;
 import org.apache.flink.table.data.vector.BytesColumnVector.Bytes;
-import org.apache.flink.table.data.vector.VectorizedColumnBatch;
 import org.apache.flink.types.RowKind;
 
 /**

diff --git a/...nk/table/data/vector/MapColumnVector.java → ...di/table/data/vector/MapColumnVector.java b/...nk/table/data/vector/MapColumnVector.java → ...di/table/data/vector/MapColumnVector.java
@@ -16,9 +16,10 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.data.vector;
+package org.apache.hudi.table.data.vector;
 
 import org.apache.flink.table.data.MapData;
+import org.apache.flink.table.data.vector.ColumnVector;
 
 /**
  * Map column vector.

diff --git a/...nk/table/data/vector/RowColumnVector.java → ...di/table/data/vector/RowColumnVector.java b/...nk/table/data/vector/RowColumnVector.java → ...di/table/data/vector/RowColumnVector.java
@@ -16,9 +16,11 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.data.vector;
+package org.apache.hudi.table.data.vector;
 
-import org.apache.flink.table.data.ColumnarRowData;
+import org.apache.hudi.table.data.ColumnarRowData;
+
+import org.apache.flink.table.data.vector.ColumnVector;
 
 /**
  * Row column vector.

diff --git a/...le/data/vector/VectorizedColumnBatch.java → ...le/data/vector/VectorizedColumnBatch.java b/...le/data/vector/VectorizedColumnBatch.java → ...le/data/vector/VectorizedColumnBatch.java
@@ -16,14 +16,26 @@
  * limitations under the License.
  */
 
-package org.apache.flink.table.data.vector;
+package org.apache.hudi.table.data.vector;
 
 import org.apache.flink.table.data.ArrayData;
 import org.apache.flink.table.data.DecimalData;
 import org.apache.flink.table.data.MapData;
 import org.apache.flink.table.data.RowData;
 import org.apache.flink.table.data.TimestampData;
+import org.apache.flink.table.data.vector.ArrayColumnVector;
+import org.apache.flink.table.data.vector.BooleanColumnVector;
+import org.apache.flink.table.data.vector.ByteColumnVector;
+import org.apache.flink.table.data.vector.BytesColumnVector;
 import org.apache.flink.table.data.vector.BytesColumnVector.Bytes;
+import org.apache.flink.table.data.vector.ColumnVector;
+import org.apache.flink.table.data.vector.DecimalColumnVector;
+import org.apache.flink.table.data.vector.DoubleColumnVector;
+import org.apache.flink.table.data.vector.FloatColumnVector;
+import org.apache.flink.table.data.vector.IntColumnVector;
+import org.apache.flink.table.data.vector.LongColumnVector;
+import org.apache.flink.table.data.vector.ShortColumnVector;
+import org.apache.flink.table.data.vector.TimestampColumnVector;
 
 import java.io.Serializable;
 import java.nio.charset.StandardCharsets;

diff --git a/...di-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/ParquetSplitReaderUtil.java b/...di-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/ParquetSplitReaderUtil.java
@@ -19,6 +19,7 @@
 package org.apache.hudi.table.format.cow;
 
 import org.apache.hudi.common.util.ValidationUtils;
+import org.apache.hudi.table.data.vector.VectorizedColumnBatch;
 import org.apache.hudi.table.format.cow.vector.HeapArrayVector;
 import org.apache.hudi.table.format.cow.vector.HeapMapColumnVector;
 import org.apache.hudi.table.format.cow.vector.HeapRowColumnVector;
@@ -44,7 +45,6 @@
 import org.apache.flink.table.data.DecimalData;
 import org.apache.flink.table.data.TimestampData;
 import org.apache.flink.table.data.vector.ColumnVector;
-import org.apache.flink.table.data.vector.VectorizedColumnBatch;
 import org.apache.flink.table.data.vector.heap.HeapBooleanVector;
 import org.apache.flink.table.data.vector.heap.HeapByteVector;
 import org.apache.flink.table.data.vector.heap.HeapBytesVector;

diff --git a/...di-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapArrayVector.java b/...di-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapArrayVector.java
@@ -18,8 +18,9 @@
 
 package org.apache.hudi.table.format.cow.vector;
 
+import org.apache.hudi.table.data.ColumnarArrayData;
+
 import org.apache.flink.table.data.ArrayData;
-import org.apache.flink.table.data.ColumnarArrayData;
 import org.apache.flink.table.data.vector.ArrayColumnVector;
 import org.apache.flink.table.data.vector.ColumnVector;
 import org.apache.flink.table.data.vector.heap.AbstractHeapVector;

diff --git a/...link1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapMapColumnVector.java b/...link1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapMapColumnVector.java
@@ -18,10 +18,11 @@
 
 package org.apache.hudi.table.format.cow.vector;
 
-import org.apache.flink.table.data.ColumnarMapData;
+import org.apache.hudi.table.data.ColumnarMapData;
+import org.apache.hudi.table.data.vector.MapColumnVector;
+
 import org.apache.flink.table.data.MapData;
 import org.apache.flink.table.data.vector.ColumnVector;
-import org.apache.flink.table.data.vector.MapColumnVector;
 import org.apache.flink.table.data.vector.heap.AbstractHeapVector;
 import org.apache.flink.table.data.vector.writable.WritableColumnVector;
 

diff --git a/...link1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapRowColumnVector.java b/...link1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapRowColumnVector.java
@@ -18,9 +18,10 @@
 
 package org.apache.hudi.table.format.cow.vector;
 
-import org.apache.flink.table.data.ColumnarRowData;
-import org.apache.flink.table.data.vector.RowColumnVector;
-import org.apache.flink.table.data.vector.VectorizedColumnBatch;
+import org.apache.hudi.table.data.ColumnarRowData;
+import org.apache.hudi.table.data.vector.RowColumnVector;
+import org.apache.hudi.table.data.vector.VectorizedColumnBatch;
+
 import org.apache.flink.table.data.vector.heap.AbstractHeapVector;
 import org.apache.flink.table.data.vector.writable.WritableColumnVector;
 

diff --git a/....13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ArrayColumnReader.java b/....13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ArrayColumnReader.java
@@ -18,12 +18,12 @@
 
 package org.apache.hudi.table.format.cow.vector.reader;
 
+import org.apache.hudi.table.data.vector.VectorizedColumnBatch;
 import org.apache.hudi.table.format.cow.vector.HeapArrayVector;
 import org.apache.hudi.table.format.cow.vector.ParquetDecimalVector;
 
 import org.apache.flink.formats.parquet.vector.reader.ColumnReader;
 import org.apache.flink.table.data.TimestampData;
-import org.apache.flink.table.data.vector.VectorizedColumnBatch;
 import org.apache.flink.table.data.vector.heap.HeapBooleanVector;
 import org.apache.flink.table.data.vector.heap.HeapByteVector;
 import org.apache.flink.table.data.vector.heap.HeapBytesVector;

diff --git a/...in/java/org/apache/hudi/table/format/cow/vector/reader/ParquetColumnarRowSplitReader.java b/...in/java/org/apache/hudi/table/format/cow/vector/reader/ParquetColumnarRowSplitReader.java
@@ -18,12 +18,12 @@
 
 package org.apache.hudi.table.format.cow.vector.reader;
 
+import org.apache.hudi.table.data.ColumnarRowData;
+import org.apache.hudi.table.data.vector.VectorizedColumnBatch;
 import org.apache.hudi.table.format.cow.vector.ParquetDecimalVector;
 
 import org.apache.flink.formats.parquet.vector.reader.ColumnReader;
-import org.apache.flink.table.data.ColumnarRowData;
 import org.apache.flink.table.data.vector.ColumnVector;
-import org.apache.flink.table.data.vector.VectorizedColumnBatch;
 import org.apache.flink.table.data.vector.writable.WritableColumnVector;
 import org.apache.flink.table.types.logical.LogicalType;
 import org.apache.flink.table.types.logical.LogicalTypeRoot;