Formatting

Author: cashmand

parquet-avro/src/test/java/org/apache/parquet/avro/TestReadVariant.java

@@ -100,7 +100,9 @@ private static class PrimitiveCase {
     }
   }
 
-  // Convert a string to a Decimal that can be written using Avro.
+  /**
+   * Convert a string to a Decimal that can be written using Avro.
+   */
   private static Object avroDecimalValue(String s) {
     BigDecimal v = new BigDecimal(s);
     int precision = v.precision();
@@ -1847,8 +1849,7 @@ public void testArrayWithElementValueTypedValueConflict() {
    * This is a custom Parquet writer builder that injects a specific Parquet schema and then uses
    * the Avro object model. This ensures that the Parquet file's schema is exactly what was passed.
    */
-  private static class TestWriterBuilder
-      extends ParquetWriter.Builder<GenericRecord, TestWriterBuilder> {
+  private static class TestWriterBuilder extends ParquetWriter.Builder<GenericRecord, TestWriterBuilder> {
     private TestSchema schema = null;
 
     protected TestWriterBuilder(Path path) {
@@ -1867,20 +1868,21 @@ protected TestWriterBuilder self() {
 
     @Override
     protected WriteSupport<GenericRecord> getWriteSupport(Configuration conf) {
-      return new AvroWriteSupport<>(schema.parquetSchema, avroSchema(schema.unannotatedParquetSchema), GenericData.get());
+      return new AvroWriteSupport<>(
+          schema.parquetSchema,
+          avroSchema(schema.unannotatedParquetSchema),
+          GenericData.get());
     }
   }
 
-  GenericRecord writeAndRead(TestSchema testSchema, GenericRecord record)
-      throws IOException {
+  GenericRecord writeAndRead(TestSchema testSchema, GenericRecord record) throws IOException {
     List<GenericRecord> result = writeAndRead(testSchema, Arrays.asList(record));
     assert(result.size() == 1);
     return result.get(0);
   }
 
-  List<GenericRecord> writeAndRead(TestSchema testSchema, List<GenericRecord> records)
-      throws IOException {
-    // Copied from TestSpecificReadWrite.java. Why does it do these weird things?
+  List<GenericRecord> writeAndRead(TestSchema testSchema, List<GenericRecord> records) throws IOException {
+    // Create a temporary file for testing
     File tmp = File.createTempFile(getClass().getSimpleName(), ".tmp");
     tmp.deleteOnExit();
     tmp.delete();
@@ -1894,9 +1896,9 @@ List<GenericRecord> writeAndRead(TestSchema testSchema, List<GenericRecord> reco
     }
 
     Configuration conf = new Configuration();
-    // We need to set an explicit read schema, because Avro wrote the shredding schema as the Avro schema in the
-    // write, and it will use that by default. If we write using a proper shredding writer, the Avro schema
-    // should just contain a <metadata, value> record, and we won't need this.
+    // We need to set an explicit read schema because Avro wrote the shredding schema as the Avro
+    // schema in the write, and it will use that by default. If we write using a proper shredding
+    // writer, the Avro schema should just contain a <metadata, value> record, and we won't need this.
     AvroReadSupport.setAvroReadSchema(conf, avroSchema(testSchema.parquetSchema));
     AvroParquetReader<GenericRecord> reader = new AvroParquetReader(conf, path);
 
@@ -2124,7 +2126,9 @@ private static void checkShreddedType(Type shreddedType) {
         shreddedType.getRepetition());
   }
 
-  // Check for the given excpetion with message, possibly wrapped by a ParquetDecodingException
+  /**
+   * Check for the given exception with message, possibly wrapped by a ParquetDecodingException.
+   */
   void assertThrows(Callable callable, Class<? extends Exception> exception, String msg) {
     try {
       callable.call();
@@ -2145,12 +2149,15 @@ void assertThrows(Callable callable, Class<? extends Exception> exception, Strin
     }
   }
 
-  // Assert that metadata contains identical bytes to expected, and value is logically equivalent.
-  // E.g. object fields may be ordered differently in the binary.
+  /**
+   * Assert that metadata contains identical bytes to expected, and value is logically equivalent.
+   * E.g. object fields may be ordered differently in the binary.
+   */
   void assertEquivalent(ByteBuffer expectedMetadata, ByteBuffer expectedValue, GenericRecord actual) {
     assertEquals(expectedMetadata, (ByteBuffer) actual.get("metadata"));
     assertEquals(expectedMetadata, (ByteBuffer) actual.get("metadata"));
-    assertEquivalent(new Variant(expectedValue, expectedMetadata),
+    assertEquivalent(
+        new Variant(expectedValue, expectedMetadata),
         new Variant(((ByteBuffer) actual.get("value")), expectedMetadata));
   }
 

parquet-variant/src/main/java/org/apache/parquet/variant/VariantColumnConverter.java

@@ -61,7 +61,7 @@ public VariantColumnConverter(GroupType variantSchema) {
   public abstract void addVariant(Binary value, Binary metadata);
 
   /**
-   * called at the beginning of the group managed by this converter
+   * Called at the beginning of the group managed by this converter.
    */
   @Override
   public void start() {
@@ -70,7 +70,7 @@ public void start() {
   }
 
   /**
-   * call at the end of the group
+   * Called at the end of the group.
    */
   @Override
   public void end() {

parquet-variant/src/main/java/org/apache/parquet/variant/VariantElementConverter.java

@@ -328,8 +328,7 @@ static VariantScalarConverter create(PrimitiveType primitive) {
         LogicalTypeAnnotation.IntLogicalTypeAnnotation intAnnotation =
             (LogicalTypeAnnotation.IntLogicalTypeAnnotation) annotation;
         if (!intAnnotation.isSigned()) {
-          throw new UnsupportedOperationException("Unsupported shredded value type: " +
-              intAnnotation);
+          throw new UnsupportedOperationException("Unsupported shredded value type: " + intAnnotation);
         }
         int width = intAnnotation.getBitWidth();
         if (width == 8) {
@@ -341,8 +340,7 @@ static VariantScalarConverter create(PrimitiveType primitive) {
         } else if (width == 64) {
           typedConverter = new VariantLongConverter();
         } else {
-          throw new UnsupportedOperationException("Unsupported shredded value type: " +
-              intAnnotation);
+          throw new UnsupportedOperationException("Unsupported shredded value type: " + intAnnotation);
         }
       } else if (annotation == null && primitiveType == INT32) {
         typedConverter = new VariantIntConverter();
@@ -429,8 +427,7 @@ static class VariantDecimalConverter extends VariantScalarConverter {
 
     @Override
     public void addBinary(Binary value) {
-      builder.builder.appendDecimal(
-          new BigDecimal(new BigInteger(value.getBytes()), scale));
+      builder.builder.appendDecimal(new BigDecimal(new BigInteger(value.getBytes()), scale));
     }
 
     @Override
@@ -556,8 +553,7 @@ public VariantArrayConverter(GroupType listType) {
         throw new IllegalArgumentException("LIST must have one field");
       }
       Type middleLevel = listType.getType(0);
-      if (!middleLevel.isRepetition(REPEATED)
-          || middleLevel.isPrimitive()
+      if (!middleLevel.isRepetition(REPEATED) || middleLevel.isPrimitive()
           || middleLevel.asGroupType().getFieldCount() != 1) {
         throw new IllegalArgumentException("LIST must have one repeated field");
       }
@@ -626,7 +622,7 @@ public VariantObjectConverter(GroupType typed_value) {
         String name = fields.get(i).getName();
         converters[i] = new VariantElementConverter(field, name, this);
       }
-    };
+    }
 
     /**
      * This method must be called after each call to end() to ensure that the object builder is
@@ -644,7 +640,7 @@ VariantObjectBuilder getObjectBuilder() {
     public void init(VariantBuilderHolder builderHolder) {
       // Create a new builder for the object.
       builder = new VariantBuilderHolder(builderHolder);
-      for (VariantElementConverter c: converters) {
+      for (VariantElementConverter c : converters) {
         c.init(builder);
       }
     }
@@ -665,6 +661,4 @@ public void end() {
       // parent's value column. The parent converter calls getObjectBuilder to finalize the object.
     }
   }
-
-}
-
+}