This is an automated email from the ASF dual-hosted git repository.
pvary pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg.git
The following commit(s) were added to refs/heads/main by this push:
new e1705f4956 Core, Flink: Add UUID to DataTestBase SUPPORTED_PRIMITIVES
(#16364)
e1705f4956 is described below
commit e1705f4956f4b92bb6f00b593c8287bdbf61aa6c
Author: Joy Haldar <[email protected]>
AuthorDate: Mon May 18 13:43:27 2026 +0530
Core, Flink: Add UUID to DataTestBase SUPPORTED_PRIMITIVES (#16364)
---
.../java/org/apache/iceberg/data/DataTestBase.java | 1 +
.../iceberg/flink/data/TestFlinkParquetReader.java | 19 +++++++++++++------
.../iceberg/flink/data/TestFlinkParquetReader.java | 19 +++++++++++++------
.../iceberg/flink/data/TestFlinkParquetReader.java | 19 +++++++++++++------
4 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/core/src/test/java/org/apache/iceberg/data/DataTestBase.java
b/core/src/test/java/org/apache/iceberg/data/DataTestBase.java
index 5a433fe0be..01a7aa1da7 100644
--- a/core/src/test/java/org/apache/iceberg/data/DataTestBase.java
+++ b/core/src/test/java/org/apache/iceberg/data/DataTestBase.java
@@ -96,6 +96,7 @@ public abstract class DataTestBase {
required(108, "ts_tz", Types.TimestampType.withZone()),
required(109, "ts", Types.TimestampType.withoutZone()),
required(110, "s", Types.StringType.get()),
+ required(111, "uuid", Types.UUIDType.get()),
required(112, "fixed", Types.FixedType.ofLength(7)),
optional(113, "bytes", Types.BinaryType.get()),
required(114, "dec_9_0", Types.DecimalType.of(9, 0)),
diff --git
a/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkParquetReader.java
b/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkParquetReader.java
index 4e8c9f03f8..cb3b3c5034 100644
---
a/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkParquetReader.java
+++
b/flink/v1.20/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkParquetReader.java
@@ -138,34 +138,41 @@ public class TestFlinkParquetReader extends DataTestBase {
.id(110)
.as(LogicalTypeAnnotation.stringType())
.named("s"),
- // 11: required(112, "fixed", Types.FixedType.ofLength(7))
+ // 11: required(111, "uuid", Types.UUIDType.get())
+ primitive(
+ PrimitiveType.PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY,
Type.Repetition.REQUIRED)
+ .id(111)
+ .length(16)
+ .as(LogicalTypeAnnotation.uuidType())
+ .named("uuid"),
+ // 12: required(112, "fixed", Types.FixedType.ofLength(7))
primitive(
PrimitiveType.PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY,
Type.Repetition.REQUIRED)
.id(112)
.length(7)
.named("f"),
- // 12: optional(113, "bytes", Types.BinaryType.get())
+ // 13: optional(113, "bytes", Types.BinaryType.get())
primitive(PrimitiveType.PrimitiveTypeName.BINARY,
Type.Repetition.OPTIONAL)
.id(113)
.named("bytes"),
- // 13: required(114, "dec_9_0", Types.DecimalType.of(9, 0))
+ // 14: required(114, "dec_9_0", Types.DecimalType.of(9, 0))
primitive(PrimitiveType.PrimitiveTypeName.INT64,
Type.Repetition.REQUIRED)
.id(114)
.as(LogicalTypeAnnotation.decimalType(0, 9))
.named("dec_9_0"),
- // 14: required(115, "dec_11_2", Types.DecimalType.of(11, 2))
+ // 15: required(115, "dec_11_2", Types.DecimalType.of(11, 2))
primitive(PrimitiveType.PrimitiveTypeName.INT64,
Type.Repetition.REQUIRED)
.id(115)
.as(LogicalTypeAnnotation.decimalType(2, 11))
.named("dec_11_2"),
- // 15: required(116, "dec_38_10", Types.DecimalType.of(38, 10)) //
maximum precision
+ // 16: required(116, "dec_38_10", Types.DecimalType.of(38, 10)) //
maximum precision
primitive(
PrimitiveType.PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY,
Type.Repetition.REQUIRED)
.id(116)
.length(16)
.as(LogicalTypeAnnotation.decimalType(10, 38))
.named("dec_38_10"),
- // 16: required(117, "time", Types.TimeType.get())
+ // 17: required(117, "time", Types.TimeType.get())
primitive(PrimitiveType.PrimitiveTypeName.INT64,
Type.Repetition.OPTIONAL)
.id(117)
.as(LogicalTypeAnnotation.timeType(true,
LogicalTypeAnnotation.TimeUnit.MICROS))
diff --git
a/flink/v2.0/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkParquetReader.java
b/flink/v2.0/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkParquetReader.java
index 4e8c9f03f8..cb3b3c5034 100644
---
a/flink/v2.0/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkParquetReader.java
+++
b/flink/v2.0/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkParquetReader.java
@@ -138,34 +138,41 @@ public class TestFlinkParquetReader extends DataTestBase {
.id(110)
.as(LogicalTypeAnnotation.stringType())
.named("s"),
- // 11: required(112, "fixed", Types.FixedType.ofLength(7))
+ // 11: required(111, "uuid", Types.UUIDType.get())
+ primitive(
+ PrimitiveType.PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY,
Type.Repetition.REQUIRED)
+ .id(111)
+ .length(16)
+ .as(LogicalTypeAnnotation.uuidType())
+ .named("uuid"),
+ // 12: required(112, "fixed", Types.FixedType.ofLength(7))
primitive(
PrimitiveType.PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY,
Type.Repetition.REQUIRED)
.id(112)
.length(7)
.named("f"),
- // 12: optional(113, "bytes", Types.BinaryType.get())
+ // 13: optional(113, "bytes", Types.BinaryType.get())
primitive(PrimitiveType.PrimitiveTypeName.BINARY,
Type.Repetition.OPTIONAL)
.id(113)
.named("bytes"),
- // 13: required(114, "dec_9_0", Types.DecimalType.of(9, 0))
+ // 14: required(114, "dec_9_0", Types.DecimalType.of(9, 0))
primitive(PrimitiveType.PrimitiveTypeName.INT64,
Type.Repetition.REQUIRED)
.id(114)
.as(LogicalTypeAnnotation.decimalType(0, 9))
.named("dec_9_0"),
- // 14: required(115, "dec_11_2", Types.DecimalType.of(11, 2))
+ // 15: required(115, "dec_11_2", Types.DecimalType.of(11, 2))
primitive(PrimitiveType.PrimitiveTypeName.INT64,
Type.Repetition.REQUIRED)
.id(115)
.as(LogicalTypeAnnotation.decimalType(2, 11))
.named("dec_11_2"),
- // 15: required(116, "dec_38_10", Types.DecimalType.of(38, 10)) //
maximum precision
+ // 16: required(116, "dec_38_10", Types.DecimalType.of(38, 10)) //
maximum precision
primitive(
PrimitiveType.PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY,
Type.Repetition.REQUIRED)
.id(116)
.length(16)
.as(LogicalTypeAnnotation.decimalType(10, 38))
.named("dec_38_10"),
- // 16: required(117, "time", Types.TimeType.get())
+ // 17: required(117, "time", Types.TimeType.get())
primitive(PrimitiveType.PrimitiveTypeName.INT64,
Type.Repetition.OPTIONAL)
.id(117)
.as(LogicalTypeAnnotation.timeType(true,
LogicalTypeAnnotation.TimeUnit.MICROS))
diff --git
a/flink/v2.1/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkParquetReader.java
b/flink/v2.1/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkParquetReader.java
index 006c55d1b8..c75b40f0b2 100644
---
a/flink/v2.1/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkParquetReader.java
+++
b/flink/v2.1/flink/src/test/java/org/apache/iceberg/flink/data/TestFlinkParquetReader.java
@@ -138,34 +138,41 @@ public class TestFlinkParquetReader extends DataTestBase {
.id(110)
.as(LogicalTypeAnnotation.stringType())
.named("s"),
- // 11: required(112, "fixed", Types.FixedType.ofLength(7))
+ // 11: required(111, "uuid", Types.UUIDType.get())
+ primitive(
+ PrimitiveType.PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY,
Type.Repetition.REQUIRED)
+ .id(111)
+ .length(16)
+ .as(LogicalTypeAnnotation.uuidType())
+ .named("uuid"),
+ // 12: required(112, "fixed", Types.FixedType.ofLength(7))
primitive(
PrimitiveType.PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY,
Type.Repetition.REQUIRED)
.id(112)
.length(7)
.named("f"),
- // 12: optional(113, "bytes", Types.BinaryType.get())
+ // 13: optional(113, "bytes", Types.BinaryType.get())
primitive(PrimitiveType.PrimitiveTypeName.BINARY,
Type.Repetition.OPTIONAL)
.id(113)
.named("bytes"),
- // 13: required(114, "dec_9_0", Types.DecimalType.of(9, 0))
+ // 14: required(114, "dec_9_0", Types.DecimalType.of(9, 0))
primitive(PrimitiveType.PrimitiveTypeName.INT64,
Type.Repetition.REQUIRED)
.id(114)
.as(LogicalTypeAnnotation.decimalType(0, 9))
.named("dec_9_0"),
- // 14: required(115, "dec_11_2", Types.DecimalType.of(11, 2))
+ // 15: required(115, "dec_11_2", Types.DecimalType.of(11, 2))
primitive(PrimitiveType.PrimitiveTypeName.INT64,
Type.Repetition.REQUIRED)
.id(115)
.as(LogicalTypeAnnotation.decimalType(2, 11))
.named("dec_11_2"),
- // 15: required(116, "dec_38_10", Types.DecimalType.of(38, 10)) //
maximum precision
+ // 16: required(116, "dec_38_10", Types.DecimalType.of(38, 10)) //
maximum precision
primitive(
PrimitiveType.PrimitiveTypeName.FIXED_LEN_BYTE_ARRAY,
Type.Repetition.REQUIRED)
.id(116)
.length(16)
.as(LogicalTypeAnnotation.decimalType(10, 38))
.named("dec_38_10"),
- // 16: required(117, "time", Types.TimeType.get())
+ // 17: required(117, "time", Types.TimeType.get())
primitive(PrimitiveType.PrimitiveTypeName.INT64,
Type.Repetition.OPTIONAL)
.id(117)
.as(LogicalTypeAnnotation.timeType(true,
LogicalTypeAnnotation.TimeUnit.MICROS))
