diff --git a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/ColumnarArrayData.java b/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/data/ColumnarArrayData.java similarity index 93% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/ColumnarArrayData.java rename to hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/data/ColumnarArrayData.java index 09da6180d9c63..20c63d26f7492 100644 --- a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/ColumnarArrayData.java +++ b/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/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/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/ColumnarMapData.java b/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/data/ColumnarMapData.java similarity index 94% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/ColumnarMapData.java rename to hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/data/ColumnarMapData.java index 86f4db3954a2c..bba462f404b35 100644 --- a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/ColumnarMapData.java +++ b/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/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/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/ColumnarRowData.java b/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/data/ColumnarRowData.java similarity index 93% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/ColumnarRowData.java rename to hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/data/ColumnarRowData.java index fbe225878dfc4..9a95035b27038 100644 --- a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/ColumnarRowData.java +++ b/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/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/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/vector/MapColumnVector.java b/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/data/vector/MapColumnVector.java similarity index 90% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/vector/MapColumnVector.java rename to hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/data/vector/MapColumnVector.java index 9cb28b8610a15..6bdf8782f4d3e 100644 --- a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/vector/MapColumnVector.java +++ b/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/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/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/vector/RowColumnVector.java b/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/data/vector/RowColumnVector.java similarity index 85% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/vector/RowColumnVector.java rename to hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/data/vector/RowColumnVector.java index 5fa3031e5174f..bd0e9bbe7de72 100644 --- a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/vector/RowColumnVector.java +++ b/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/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/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/vector/VectorizedColumnBatch.java b/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/data/vector/VectorizedColumnBatch.java similarity index 84% rename from hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/vector/VectorizedColumnBatch.java rename to hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/data/vector/VectorizedColumnBatch.java index a0224705bd9f4..bccaec8fdcadf 100644 --- a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/vector/VectorizedColumnBatch.java +++ b/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/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/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/ParquetSplitReaderUtil.java b/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/ParquetSplitReaderUtil.java index c636b36100fea..aa63856040e01 100644 --- a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/ParquetSplitReaderUtil.java +++ b/hudi-flink-datasource/hudi-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/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapArrayVector.java b/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapArrayVector.java index edd90714c87a7..6d31d26b8d978 100644 --- a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapArrayVector.java +++ b/hudi-flink-datasource/hudi-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/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapMapColumnVector.java b/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapMapColumnVector.java index 2b34a02f116b3..cf39fc981624a 100644 --- a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapMapColumnVector.java +++ b/hudi-flink-datasource/hudi-flink1.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/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapRowColumnVector.java b/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapRowColumnVector.java index 0193e6cbb1d22..132b48f139c22 100644 --- a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapRowColumnVector.java +++ b/hudi-flink-datasource/hudi-flink1.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/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ArrayColumnReader.java b/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ArrayColumnReader.java index d94c1e1da4bb6..67dbb74902605 100644 --- a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ArrayColumnReader.java +++ b/hudi-flink-datasource/hudi-flink1.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/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetColumnarRowSplitReader.java b/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetColumnarRowSplitReader.java index 92f5d1e191771..e47fb6036210c 100644 --- a/hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/reader/ParquetColumnarRowSplitReader.java +++ b/hudi-flink-datasource/hudi-flink1.13.x/src/main/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;