Skip to content

Commit 9efe793

Browse files
authored
branch-4.0: [opt](varbinary) add conf control mapping iceberg uuid (#59726) (#59764)
bp #59726
1 parent d41fe6b commit 9efe793

File tree

3 files changed

+37
-6
lines changed

3 files changed

+37
-6
lines changed

be/src/vec/exec/format/parquet/schema_desc.cpp

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -306,8 +306,12 @@ std::pair<DataTypePtr, bool> FieldDescriptor::convert_to_doris_type(
306306
} else if (logicalType.__isset.JSON) {
307307
ans.first = DataTypeFactory::instance().create_data_type(TYPE_STRING, nullable);
308308
} else if (logicalType.__isset.UUID) {
309-
ans.first =
310-
DataTypeFactory::instance().create_data_type(TYPE_VARBINARY, nullable, -1, -1, 16);
309+
if (_enable_mapping_varbinary) {
310+
ans.first = DataTypeFactory::instance().create_data_type(TYPE_VARBINARY, nullable, -1,
311+
-1, 16);
312+
} else {
313+
ans.first = DataTypeFactory::instance().create_data_type(TYPE_STRING, nullable);
314+
}
311315
} else if (logicalType.__isset.FLOAT16) {
312316
ans.first = DataTypeFactory::instance().create_data_type(TYPE_FLOAT, nullable);
313317
} else {

regression-test/data/external_table_p0/tvf/test_hdfs_parquet_group6.out

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -795,10 +795,10 @@ true
795795

796796
-- !test_98 --
797797
\N \N \N
798-
0x6162634465464768696A6B4C6D6E4F70 682.56 1212
799-
0x6162634465464768696A6B4C6D6E4F70 682.56 1212
800-
0x6162634465464768696A6B4C6D6E4F70 682.56 1212
801-
0x6162634465464768696A6B4C6D6E4F70 682.56 1212
798+
abcDeFGhijkLmnOp 682.56 1212
799+
abcDeFGhijkLmnOp 682.56 1212
800+
abcDeFGhijkLmnOp 682.56 1212
801+
abcDeFGhijkLmnOp 682.56 1212
802802

803803
-- !test_100 --
804804
1317017856 1 18752152 809291 1089176 19951117 3-MEDIUM 0 40 4801000 16034243 9 4368910 72015 3 19951228 RAIL Customer#018752152 q4gN2btSpiKXdN,6 ALGERIA 1 ALGERIA AFRICA 10-753-996-8708 MACHINERY Supplier#001089176 ROidEL1L6yeFsJqnUjD EGYPT 5 EGYPT MIDDLE EAST 14-807-108-7869 blanched gainsboro MFGR#4 MFGR#43 MFGR#433 brown MEDIUM BRUSHED STEEL 42 MED BAG
@@ -851,3 +851,15 @@ true
851851
1172064 32655 5159 1 19.000000000 30165.350000000 0.060000000 0.060000000 R F 1994-12-08 1995-02-10 1994-12-12 TAKE BACK RETURN RAIL s are carefully express, final packag
852852
1172064 77399 9907 3 49.000000000 67443.110000000 0.060000000 0.010000000 A F 1995-03-22 1995-02-14 1995-04-18 TAKE BACK RETURN RAIL gle. even dependencies a
853853

854+
-- !test_107 --
855+
\N \N \N
856+
0x6162634465464768696A6B4C6D6E4F70 682.56 1212
857+
0x6162634465464768696A6B4C6D6E4F70 682.56 1212
858+
0x6162634465464768696A6B4C6D6E4F70 682.56 1212
859+
0x6162634465464768696A6B4C6D6E4F70 682.56 1212
860+
861+
-- !test_107_desc --
862+
decimal_flba decimal(5,2) Yes false \N NONE
863+
interval text Yes false \N NONE
864+
uuid varbinary(16) Yes false \N NONE
865+

regression-test/suites/external_table_p0/tvf/test_hdfs_parquet_group6.groovy

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -795,6 +795,21 @@ suite("test_hdfs_parquet_group6","external,hive,tvf,external_docker") {
795795
"uri" = "${uri}",
796796
"hadoop.username" = "${hdfsUserName}",
797797
"format" = "parquet") limit 10; """
798+
799+
800+
uri = "${defaultFS}" + "/user/doris/tvf_data/test_hdfs_parquet/group6/fixed_len_byte_array.parquet"
801+
order_qt_test_107 """ select * from HDFS(
802+
"uri" = "${uri}",
803+
"hadoop.username" = "${hdfsUserName}",
804+
"enable_mapping_varbinary"="true",
805+
"format" = "parquet") limit 10; """
806+
807+
order_qt_test_107_desc """ desc function HDFS(
808+
"uri" = "${uri}",
809+
"hadoop.username" = "${hdfsUserName}",
810+
"enable_mapping_varbinary"="true",
811+
"format" = "parquet"); """
812+
798813
} finally {
799814
}
800815
}

0 commit comments

Comments
 (0)