Address code review comments

parquet-column/src/main/java/org/apache/parquet/schema/GroupType.java

@@ -404,7 +404,7 @@ List<Type> mergeFields(GroupType toMerge, boolean strict) {
           throw new IncompatibleSchemaModificationException("repetition constraint is more restrictive: can not merge type " + fieldToMerge + " into " + type);
         }
         if (type.getLogicalTypeAnnotation() != null && !type.getLogicalTypeAnnotation().equals(fieldToMerge.getLogicalTypeAnnotation())) {
-          throw new IncompatibleSchemaModificationException("cannot merge original type " + fieldToMerge.getLogicalTypeAnnotation() + " into " + type.getLogicalTypeAnnotation());
+          throw new IncompatibleSchemaModificationException("cannot merge logical type " + fieldToMerge.getLogicalTypeAnnotation() + " into " + type.getLogicalTypeAnnotation());
         }
         merged = type.union(fieldToMerge, strict);
       } else {

parquet-column/src/main/java/org/apache/parquet/schema/PrimitiveType.java

@@ -99,9 +99,6 @@ PrimitiveComparator<?> comparator(LogicalTypeAnnotation logicalType) {
         return logicalType.accept(new LogicalTypeAnnotation.LogicalTypeAnnotationVisitor<PrimitiveComparator>() {
           @Override
           public Optional<PrimitiveComparator> visit(LogicalTypeAnnotation.IntLogicalTypeAnnotation intLogicalType) {
-            if (intLogicalType.getBitWidth() != 64) {
-              return empty();
-            }
             return intLogicalType.isSigned() ?
               of(PrimitiveComparator.SIGNED_INT64_COMPARATOR) : of(PrimitiveComparator.UNSIGNED_INT64_COMPARATOR);
           }
@@ -113,18 +110,12 @@ public Optional<PrimitiveComparator> visit(LogicalTypeAnnotation.DecimalLogicalT
 
           @Override
           public Optional<PrimitiveComparator> visit(LogicalTypeAnnotation.TimeLogicalTypeAnnotation timeLogicalType) {
-            if (timeLogicalType.getUnit() == MICROS) {
-              return of(PrimitiveComparator.SIGNED_INT64_COMPARATOR);
-            }
-            return empty();
+            return of(PrimitiveComparator.SIGNED_INT64_COMPARATOR);
           }
 
           @Override
           public Optional<PrimitiveComparator> visit(LogicalTypeAnnotation.TimestampLogicalTypeAnnotation timestampLogicalType) {
-            if (timestampLogicalType.getUnit() == MICROS || timestampLogicalType.getUnit() == MILLIS) {
-              return of(PrimitiveComparator.SIGNED_INT64_COMPARATOR);
-            }
-            return empty();
+            return of(PrimitiveComparator.SIGNED_INT64_COMPARATOR);
           }
         }).orElseThrow(() -> new ShouldNeverHappenException("No comparator logic implemented for INT64 logical type: " + logicalType));
       }

parquet-column/src/test/java/org/apache/parquet/schema/TestMessageType.java

@@ -148,7 +148,7 @@ public void testMergeSchema() {
       t9.union(t10);
       fail("moving from BINARY (UTF8) to BINARY");
     } catch (IncompatibleSchemaModificationException e) {
-      assertEquals("cannot merge original type null into STRING", e.getMessage());
+      assertEquals("cannot merge logical type null into STRING", e.getMessage());
     }
 
     MessageType t11 = Types.buildMessage()

parquet-pig/src/main/java/org/apache/parquet/pig/PigSchemaConverter.java

@@ -263,7 +263,7 @@ public FieldSchema convertBOOLEAN(PrimitiveTypeName primitiveTypeName)
       @Override
       public FieldSchema convertBINARY(PrimitiveTypeName primitiveTypeName)
           throws FrontendException {
-        if (logicalTypeAnnotation != null && logicalTypeAnnotation instanceof LogicalTypeAnnotation.StringLogicalTypeAnnotation) {
+        if (logicalTypeAnnotation instanceof LogicalTypeAnnotation.StringLogicalTypeAnnotation) {
           return new FieldSchema(fieldName, null, DataType.CHARARRAY);
         } else {
           return new FieldSchema(fieldName, null, DataType.BYTEARRAY);

parquet-tools/src/main/java/org/apache/parquet/tools/read/SimpleRecordConverter.java

@@ -54,11 +54,11 @@ public SimpleRecordConverter(GroupType schema, String name, SimpleRecordConverte
   }
 
   private Converter createConverter(Type field) {
-    LogicalTypeAnnotation otype = field.getLogicalTypeAnnotation();
+    LogicalTypeAnnotation ltype = field.getLogicalTypeAnnotation();
 
     if (field.isPrimitive()) {
-      if (otype != null) {
-        return otype.accept(new LogicalTypeAnnotation.LogicalTypeAnnotationVisitor<Converter>() {
+      if (ltype != null) {
+        return ltype.accept(new LogicalTypeAnnotation.LogicalTypeAnnotationVisitor<Converter>() {
           @Override
           public Optional<Converter> visit(LogicalTypeAnnotation.StringLogicalTypeAnnotation stringLogicalType) {
             return of(new StringConverter(field.getName()));
@@ -74,8 +74,8 @@ public Optional<Converter> visit(LogicalTypeAnnotation.DecimalLogicalTypeAnnotat
     }
 
     GroupType groupType = field.asGroupType();
-    if (otype != null) {
-      return otype.accept(new LogicalTypeAnnotation.LogicalTypeAnnotationVisitor<Converter>() {
+    if (ltype != null) {
+      return ltype.accept(new LogicalTypeAnnotation.LogicalTypeAnnotationVisitor<Converter>() {
         @Override
         public Optional<Converter> visit(LogicalTypeAnnotation.MapLogicalTypeAnnotation mapLogicalType) {
           return of(new SimpleMapRecordConverter(groupType, field.getName(), SimpleRecordConverter.this));