6565import org .apache .parquet .format .BloomFilterHash ;
6666import org .apache .parquet .format .BloomFilterHeader ;
6767import org .apache .parquet .format .BoundaryOrder ;
68- import org .apache .parquet .format .BsonType ;
6968import org .apache .parquet .format .ColumnChunk ;
7069import org .apache .parquet .format .ColumnCryptoMetaData ;
7170import org .apache .parquet .format .ColumnIndex ;
7574import org .apache .parquet .format .ConvertedType ;
7675import org .apache .parquet .format .DataPageHeader ;
7776import org .apache .parquet .format .DataPageHeaderV2 ;
78- import org .apache .parquet .format .DateType ;
7977import org .apache .parquet .format .DecimalType ;
8078import org .apache .parquet .format .DictionaryPageHeader ;
8179import org .apache .parquet .format .Encoding ;
8280import org .apache .parquet .format .EncryptionWithColumnKey ;
83- import org .apache .parquet .format .EnumType ;
8481import org .apache .parquet .format .FieldRepetitionType ;
8582import org .apache .parquet .format .FileMetaData ;
86- import org .apache .parquet .format .Float16Type ;
8783import org .apache .parquet .format .IntType ;
88- import org .apache .parquet .format .JsonType ;
8984import org .apache .parquet .format .KeyValue ;
90- import org .apache .parquet .format .ListType ;
9185import org .apache .parquet .format .LogicalType ;
92- import org .apache .parquet .format .MapType ;
86+ import org .apache .parquet .format .LogicalTypes ;
9387import org .apache .parquet .format .MicroSeconds ;
9488import org .apache .parquet .format .MilliSeconds ;
9589import org .apache .parquet .format .NanoSeconds ;
96- import org .apache .parquet .format .NullType ;
9790import org .apache .parquet .format .OffsetIndex ;
9891import org .apache .parquet .format .PageEncodingStats ;
9992import org .apache .parquet .format .PageHeader ;
10497import org .apache .parquet .format .SizeStatistics ;
10598import org .apache .parquet .format .SplitBlockAlgorithm ;
10699import org .apache .parquet .format .Statistics ;
107- import org .apache .parquet .format .StringType ;
108100import org .apache .parquet .format .TimeType ;
109101import org .apache .parquet .format .TimeUnit ;
110102import org .apache .parquet .format .TimestampType ;
111103import org .apache .parquet .format .Type ;
112104import org .apache .parquet .format .TypeDefinedOrder ;
113- import org .apache .parquet .format .UUIDType ;
114105import org .apache .parquet .format .Uncompressed ;
115106import org .apache .parquet .format .XxHash ;
116107import org .apache .parquet .hadoop .metadata .BlockMetaData ;
@@ -449,33 +440,32 @@ private static class LogicalTypeConverterVisitor
449440 implements LogicalTypeAnnotation .LogicalTypeAnnotationVisitor <LogicalType > {
450441 @ Override
451442 public Optional <LogicalType > visit (LogicalTypeAnnotation .StringLogicalTypeAnnotation stringLogicalType ) {
452- return of (LogicalType . STRING ( new StringType ()) );
443+ return of (LogicalTypes . UTF8 );
453444 }
454445
455446 @ Override
456447 public Optional <LogicalType > visit (LogicalTypeAnnotation .MapLogicalTypeAnnotation mapLogicalType ) {
457- return of (LogicalType .MAP ( new MapType ()) );
448+ return of (LogicalTypes .MAP );
458449 }
459450
460451 @ Override
461452 public Optional <LogicalType > visit (LogicalTypeAnnotation .ListLogicalTypeAnnotation listLogicalType ) {
462- return of (LogicalType .LIST ( new ListType ()) );
453+ return of (LogicalTypes .LIST );
463454 }
464455
465456 @ Override
466457 public Optional <LogicalType > visit (LogicalTypeAnnotation .EnumLogicalTypeAnnotation enumLogicalType ) {
467- return of (LogicalType .ENUM ( new EnumType ()) );
458+ return of (LogicalTypes .ENUM );
468459 }
469460
470461 @ Override
471462 public Optional <LogicalType > visit (LogicalTypeAnnotation .DecimalLogicalTypeAnnotation decimalLogicalType ) {
472- return of (LogicalType .DECIMAL (
473- new DecimalType (decimalLogicalType .getScale (), decimalLogicalType .getPrecision ())));
463+ return of (LogicalTypes .DECIMAL (decimalLogicalType .getScale (), decimalLogicalType .getPrecision ()));
474464 }
475465
476466 @ Override
477467 public Optional <LogicalType > visit (LogicalTypeAnnotation .DateLogicalTypeAnnotation dateLogicalType ) {
478- return of (LogicalType .DATE ( new DateType ()) );
468+ return of (LogicalTypes .DATE );
479469 }
480470
481471 @ Override
@@ -497,32 +487,32 @@ public Optional<LogicalType> visit(LogicalTypeAnnotation.IntLogicalTypeAnnotatio
497487
498488 @ Override
499489 public Optional <LogicalType > visit (LogicalTypeAnnotation .JsonLogicalTypeAnnotation jsonLogicalType ) {
500- return of (LogicalType .JSON ( new JsonType ()) );
490+ return of (LogicalTypes .JSON );
501491 }
502492
503493 @ Override
504494 public Optional <LogicalType > visit (LogicalTypeAnnotation .BsonLogicalTypeAnnotation bsonLogicalType ) {
505- return of (LogicalType .BSON ( new BsonType ()) );
495+ return of (LogicalTypes .BSON );
506496 }
507497
508498 @ Override
509499 public Optional <LogicalType > visit (UUIDLogicalTypeAnnotation uuidLogicalType ) {
510- return of (LogicalType .UUID ( new UUIDType ()) );
500+ return of (LogicalTypes .UUID );
511501 }
512502
513503 @ Override
514504 public Optional <LogicalType > visit (LogicalTypeAnnotation .Float16LogicalTypeAnnotation float16LogicalType ) {
515- return of (LogicalType .FLOAT16 ( new Float16Type ()) );
505+ return of (LogicalTypes .FLOAT16 );
516506 }
517507
518508 @ Override
519- public Optional <LogicalType > visit (LogicalTypeAnnotation .UnknownLogicalTypeAnnotation intervalLogicalType ) {
520- return of (LogicalType .UNKNOWN ( new NullType ()) );
509+ public Optional <LogicalType > visit (LogicalTypeAnnotation .UnknownLogicalTypeAnnotation unknownLogicalType ) {
510+ return of (LogicalTypes .UNKNOWN );
521511 }
522512
523513 @ Override
524514 public Optional <LogicalType > visit (LogicalTypeAnnotation .IntervalLogicalTypeAnnotation intervalLogicalType ) {
525- return of (LogicalType .UNKNOWN ( new NullType ()) );
515+ return of (LogicalTypes .UNKNOWN );
526516 }
527517 }
528518
0 commit comments