Skip to content

Commit 0786488

Browse files
danny0405yuzhaojing
danny0405
authored and
yuzhaojing
committed
[HUDI-4698] Rename the package 'org.apache.flink.table.data' to avoid conflicts with flink table core (#6481)
1 parent 0f6851e commit 0786488

12 files changed

Lines changed: 57 additions & 21 deletions

File tree

hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/ColumnarArrayData.java renamed to hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/data/ColumnarArrayData.java

Lines changed: 12 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,18 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.flink.table.data;
19-
18+
package org.apache.hudi.table.data;
19+
20+
import org.apache.hudi.table.data.vector.MapColumnVector;
21+
import org.apache.hudi.table.data.vector.RowColumnVector;
22+
23+
import org.apache.flink.table.data.ArrayData;
24+
import org.apache.flink.table.data.DecimalData;
25+
import org.apache.flink.table.data.MapData;
26+
import org.apache.flink.table.data.RawValueData;
27+
import org.apache.flink.table.data.RowData;
28+
import org.apache.flink.table.data.StringData;
29+
import org.apache.flink.table.data.TimestampData;
2030
import org.apache.flink.table.data.binary.TypedSetters;
2131
import org.apache.flink.table.data.vector.ArrayColumnVector;
2232
import org.apache.flink.table.data.vector.BooleanColumnVector;
@@ -28,8 +38,6 @@
2838
import org.apache.flink.table.data.vector.FloatColumnVector;
2939
import org.apache.flink.table.data.vector.IntColumnVector;
3040
import org.apache.flink.table.data.vector.LongColumnVector;
31-
import org.apache.flink.table.data.vector.MapColumnVector;
32-
import org.apache.flink.table.data.vector.RowColumnVector;
3341
import org.apache.flink.table.data.vector.ShortColumnVector;
3442
import org.apache.flink.table.data.vector.TimestampColumnVector;
3543

hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/ColumnarMapData.java renamed to hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/data/ColumnarMapData.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,10 @@
1515
* limitations under the License.
1616
*/
1717

18-
package org.apache.flink.table.data;
18+
package org.apache.hudi.table.data;
1919

20+
import org.apache.flink.table.data.ArrayData;
21+
import org.apache.flink.table.data.MapData;
2022
import org.apache.flink.table.data.vector.ColumnVector;
2123

2224
/**

hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/ColumnarRowData.java renamed to hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/data/ColumnarRowData.java

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,19 @@
1616
* limitations under the License.
1717
*/
1818

19-
package org.apache.flink.table.data;
19+
package org.apache.hudi.table.data;
2020

21+
import org.apache.hudi.table.data.vector.VectorizedColumnBatch;
22+
23+
import org.apache.flink.table.data.ArrayData;
24+
import org.apache.flink.table.data.DecimalData;
25+
import org.apache.flink.table.data.MapData;
26+
import org.apache.flink.table.data.RawValueData;
27+
import org.apache.flink.table.data.RowData;
28+
import org.apache.flink.table.data.StringData;
29+
import org.apache.flink.table.data.TimestampData;
2130
import org.apache.flink.table.data.binary.TypedSetters;
2231
import org.apache.flink.table.data.vector.BytesColumnVector.Bytes;
23-
import org.apache.flink.table.data.vector.VectorizedColumnBatch;
2432
import org.apache.flink.types.RowKind;
2533

2634
/**

hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/vector/MapColumnVector.java renamed to hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/data/vector/MapColumnVector.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
* limitations under the License.
1717
*/
1818

19-
package org.apache.flink.table.data.vector;
19+
package org.apache.hudi.table.data.vector;
2020

2121
import org.apache.flink.table.data.MapData;
22+
import org.apache.flink.table.data.vector.ColumnVector;
2223

2324
/**
2425
* Map column vector.

hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/vector/RowColumnVector.java renamed to hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/data/vector/RowColumnVector.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,11 @@
1616
* limitations under the License.
1717
*/
1818

19-
package org.apache.flink.table.data.vector;
19+
package org.apache.hudi.table.data.vector;
2020

21-
import org.apache.flink.table.data.ColumnarRowData;
21+
import org.apache.hudi.table.data.ColumnarRowData;
22+
23+
import org.apache.flink.table.data.vector.ColumnVector;
2224

2325
/**
2426
* Row column vector.

hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/flink/table/data/vector/VectorizedColumnBatch.java renamed to hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/data/vector/VectorizedColumnBatch.java

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,26 @@
1616
* limitations under the License.
1717
*/
1818

19-
package org.apache.flink.table.data.vector;
19+
package org.apache.hudi.table.data.vector;
2020

2121
import org.apache.flink.table.data.ArrayData;
2222
import org.apache.flink.table.data.DecimalData;
2323
import org.apache.flink.table.data.MapData;
2424
import org.apache.flink.table.data.RowData;
2525
import org.apache.flink.table.data.TimestampData;
26+
import org.apache.flink.table.data.vector.ArrayColumnVector;
27+
import org.apache.flink.table.data.vector.BooleanColumnVector;
28+
import org.apache.flink.table.data.vector.ByteColumnVector;
29+
import org.apache.flink.table.data.vector.BytesColumnVector;
2630
import org.apache.flink.table.data.vector.BytesColumnVector.Bytes;
31+
import org.apache.flink.table.data.vector.ColumnVector;
32+
import org.apache.flink.table.data.vector.DecimalColumnVector;
33+
import org.apache.flink.table.data.vector.DoubleColumnVector;
34+
import org.apache.flink.table.data.vector.FloatColumnVector;
35+
import org.apache.flink.table.data.vector.IntColumnVector;
36+
import org.apache.flink.table.data.vector.LongColumnVector;
37+
import org.apache.flink.table.data.vector.ShortColumnVector;
38+
import org.apache.flink.table.data.vector.TimestampColumnVector;
2739

2840
import java.io.Serializable;
2941
import java.nio.charset.StandardCharsets;

‎hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/ParquetSplitReaderUtil.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@
1919
package org.apache.hudi.table.format.cow;
2020

2121
import org.apache.hudi.common.util.ValidationUtils;
22+
import org.apache.hudi.table.data.vector.VectorizedColumnBatch;
2223
import org.apache.hudi.table.format.cow.vector.HeapArrayVector;
2324
import org.apache.hudi.table.format.cow.vector.HeapMapColumnVector;
2425
import org.apache.hudi.table.format.cow.vector.HeapRowColumnVector;
@@ -44,7 +45,6 @@
4445
import org.apache.flink.table.data.DecimalData;
4546
import org.apache.flink.table.data.TimestampData;
4647
import org.apache.flink.table.data.vector.ColumnVector;
47-
import org.apache.flink.table.data.vector.VectorizedColumnBatch;
4848
import org.apache.flink.table.data.vector.heap.HeapBooleanVector;
4949
import org.apache.flink.table.data.vector.heap.HeapByteVector;
5050
import org.apache.flink.table.data.vector.heap.HeapBytesVector;

‎hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapArrayVector.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,9 @@
1818

1919
package org.apache.hudi.table.format.cow.vector;
2020

21+
import org.apache.hudi.table.data.ColumnarArrayData;
22+
2123
import org.apache.flink.table.data.ArrayData;
22-
import org.apache.flink.table.data.ColumnarArrayData;
2324
import org.apache.flink.table.data.vector.ArrayColumnVector;
2425
import org.apache.flink.table.data.vector.ColumnVector;
2526
import org.apache.flink.table.data.vector.heap.AbstractHeapVector;

‎hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapMapColumnVector.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,11 @@
1818

1919
package org.apache.hudi.table.format.cow.vector;
2020

21-
import org.apache.flink.table.data.ColumnarMapData;
21+
import org.apache.hudi.table.data.ColumnarMapData;
22+
import org.apache.hudi.table.data.vector.MapColumnVector;
23+
2224
import org.apache.flink.table.data.MapData;
2325
import org.apache.flink.table.data.vector.ColumnVector;
24-
import org.apache.flink.table.data.vector.MapColumnVector;
2526
import org.apache.flink.table.data.vector.heap.AbstractHeapVector;
2627
import org.apache.flink.table.data.vector.writable.WritableColumnVector;
2728

‎hudi-flink-datasource/hudi-flink1.13.x/src/main/java/org/apache/hudi/table/format/cow/vector/HeapRowColumnVector.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,10 @@
1818

1919
package org.apache.hudi.table.format.cow.vector;
2020

21-
import org.apache.flink.table.data.ColumnarRowData;
22-
import org.apache.flink.table.data.vector.RowColumnVector;
23-
import org.apache.flink.table.data.vector.VectorizedColumnBatch;
21+
import org.apache.hudi.table.data.ColumnarRowData;
22+
import org.apache.hudi.table.data.vector.RowColumnVector;
23+
import org.apache.hudi.table.data.vector.VectorizedColumnBatch;
24+
2425
import org.apache.flink.table.data.vector.heap.AbstractHeapVector;
2526
import org.apache.flink.table.data.vector.writable.WritableColumnVector;
2627

0 commit comments

Comments
 (0)