Skip to content

Commit 3cb5969

Browse files
committed
update
1 parent 093e1e9 commit 3cb5969

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
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
@@ -315,8 +315,12 @@ std::pair<DataTypePtr, bool> FieldDescriptor::convert_to_doris_type(
315315
} else if (logicalType.__isset.JSON) {
316316
ans.first = DataTypeFactory::instance().create_data_type(TYPE_STRING, nullable);
317317
} else if (logicalType.__isset.UUID) {
318-
ans.first =
319-
DataTypeFactory::instance().create_data_type(TYPE_VARBINARY, nullable, -1, -1, 16);
318+
if (_enable_mapping_varbinary) {
319+
ans.first = DataTypeFactory::instance().create_data_type(TYPE_VARBINARY, nullable, -1,
320+
-1, 16);
321+
} else {
322+
ans.first = DataTypeFactory::instance().create_data_type(TYPE_STRING, nullable);
323+
}
320324
} else if (logicalType.__isset.FLOAT16) {
321325
ans.first = DataTypeFactory::instance().create_data_type(TYPE_FLOAT, nullable);
322326
} else {

regression-test/data/external_table_p0/jdbc/test_pg_jdbc_catalog.out

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2303,6 +2303,7 @@ information_schema
23032303
mysql
23042304
pg_catalog
23052305
public
2306+
test_timestamp_tz_db
23062307

23072308
-- !specified_database_4 --
23082309
information_schema

regression-test/data/external_table_p0/jdbc/type_test/select/test_oracle_all_types_select.out

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,4 +71,3 @@ TS_LTZ timestamptz(6) Yes true \N
7171
\N \N
7272
1 2025-01-01 04:00:00.000000+00:00
7373

74-

0 commit comments

Comments
 (0)