parquet-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From b...@apache.org
Subject parquet-mr git commit: PARQUET-253: Fixes Javadoc of AvroSchemaConverter
Date Fri, 15 May 2015 19:41:39 GMT
Repository: parquet-mr
Updated Branches:
  refs/heads/master 7680fae14 -> 136c5ffe8


PARQUET-253: Fixes Javadoc of AvroSchemaConverter

Got confused by the original Javadoc at first and didn't realize `AvroSchemaConverter` is
also capable to convert a Parquet schema to an Avro schema.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/apache/incubator-parquet-mr/173)
<!-- Reviewable:end -->

Author: Cheng Lian <lian@databricks.com>

Closes #173 from liancheng/avro-schema-converter-comment-fix and squashes the following commits:

47b11ce [Cheng Lian] Fixes Javadoc of AvroSchemaConverter


Project: http://git-wip-us.apache.org/repos/asf/parquet-mr/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-mr/commit/136c5ffe
Tree: http://git-wip-us.apache.org/repos/asf/parquet-mr/tree/136c5ffe
Diff: http://git-wip-us.apache.org/repos/asf/parquet-mr/diff/136c5ffe

Branch: refs/heads/master
Commit: 136c5ffe80e558a87cde01baebf823b06e3cbe75
Parents: 7680fae
Author: Cheng Lian <lian@databricks.com>
Authored: Fri May 15 12:41:15 2015 -0700
Committer: Ryan Blue <blue@apache.org>
Committed: Fri May 15 12:41:15 2015 -0700

----------------------------------------------------------------------
 .../apache/parquet/avro/AvroSchemaConverter.java  | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/136c5ffe/parquet-avro/src/main/java/org/apache/parquet/avro/AvroSchemaConverter.java
----------------------------------------------------------------------
diff --git a/parquet-avro/src/main/java/org/apache/parquet/avro/AvroSchemaConverter.java b/parquet-avro/src/main/java/org/apache/parquet/avro/AvroSchemaConverter.java
index 29f8b17..67924b5 100644
--- a/parquet-avro/src/main/java/org/apache/parquet/avro/AvroSchemaConverter.java
+++ b/parquet-avro/src/main/java/org/apache/parquet/avro/AvroSchemaConverter.java
@@ -1,4 +1,4 @@
-/* 
+/*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
  * distributed with this work for additional information
@@ -6,9 +6,9 @@
  * to you under the Apache License, Version 2.0 (the
  * "License"); you may not use this file except in compliance
  * with the License.  You may obtain a copy of the License at
- * 
+ *
  *   http://www.apache.org/licenses/LICENSE-2.0
- * 
+ *
  * Unless required by applicable law or agreed to in writing,
  * software distributed under the License is distributed on an
  * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
@@ -37,8 +37,8 @@ import static org.apache.parquet.schema.PrimitiveType.PrimitiveTypeName.*;
 
 /**
  * <p>
- * Converts an Avro schema into a Parquet schema. See package documentation for details
- * of the mapping.
+ * Converts an Avro schema into a Parquet schema, or vice versa. See package
+ * documentation for details of the mapping.
  * </p>
  */
 public class AvroSchemaConverter {
@@ -61,7 +61,7 @@ public class AvroSchemaConverter {
   /**
    * Given a schema, check to see if it is a union of a null type and a regular schema,
    * and then return the non-null sub-schema. Otherwise, return the given schema.
-   * 
+   *
    * @param schema The schema to check
    * @return The non-null portion of a union schema, or the given schema
    */
@@ -176,7 +176,7 @@ public class AvroSchemaConverter {
     return convertField(field.name(), field.schema());
   }
 
-  private PrimitiveType primitive(String name, 
+  private PrimitiveType primitive(String name,
       PrimitiveType.PrimitiveTypeName primitive, Type.Repetition repetition,
       int typeLength, OriginalType originalType) {
     return new PrimitiveType(repetition, primitive, typeLength, name,
@@ -184,12 +184,12 @@ public class AvroSchemaConverter {
   }
 
   private PrimitiveType primitive(String name,
-      PrimitiveType.PrimitiveTypeName primitive, Type.Repetition repetition, 
+      PrimitiveType.PrimitiveTypeName primitive, Type.Repetition repetition,
       OriginalType originalType) {
     return new PrimitiveType(repetition, primitive, name, originalType);
   }
 
-  private PrimitiveType primitive(String name, 
+  private PrimitiveType primitive(String name,
       PrimitiveType.PrimitiveTypeName primitive, Type.Repetition repetition) {
     return new PrimitiveType(repetition, primitive, name, null);
   }


Mime
View raw message