Repository: parquet-mr
Updated Branches:
refs/heads/master 57694790f -> 63d5ae78a
PARQUET-495: Fix mismatches in Types class comments
To produce
> required group User {
required int64 id;
**optional** binary email (UTF8);
}
we should do:
>
Types.requiredGroup()
.required(INT64).named("id")
.~~**required** (BINARY).as(UTF8).named("email")~~
.**optional** (BINARY).as(UTF8).named("email")
.named("User")
@rdblue @liancheng would you mind taking a look at it when you have time?
Thanks!
Author: Liwei Lin <[email protected]>
Author: proflin <[email protected]>
Closes #317 from proflin/PARQUET-495--Fix-mismatches-in-Types-class-comments
and squashes the following commits:
f26d57d [Liwei Lin] PARQUET-495: Fix mismatches in Types class comments
839b458 [proflin] Merge remote-tracking branch 'refs/remotes/apache/master'
Project: http://git-wip-us.apache.org/repos/asf/parquet-mr/repo
Commit: http://git-wip-us.apache.org/repos/asf/parquet-mr/commit/63d5ae78
Tree: http://git-wip-us.apache.org/repos/asf/parquet-mr/tree/63d5ae78
Diff: http://git-wip-us.apache.org/repos/asf/parquet-mr/diff/63d5ae78
Branch: refs/heads/master
Commit: 63d5ae78ac00d710c9bf631f8cb9ed6d07e6a2c9
Parents: 5769479
Author: Liwei Lin <[email protected]>
Authored: Mon Feb 1 10:09:20 2016 -0800
Committer: Cheng Lian <[email protected]>
Committed: Mon Feb 1 10:09:20 2016 -0800
----------------------------------------------------------------------
.../src/main/java/org/apache/parquet/schema/Types.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/parquet-mr/blob/63d5ae78/parquet-column/src/main/java/org/apache/parquet/schema/Types.java
----------------------------------------------------------------------
diff --git a/parquet-column/src/main/java/org/apache/parquet/schema/Types.java
b/parquet-column/src/main/java/org/apache/parquet/schema/Types.java
index 4e7e881..6d61b50 100644
--- a/parquet-column/src/main/java/org/apache/parquet/schema/Types.java
+++ b/parquet-column/src/main/java/org/apache/parquet/schema/Types.java
@@ -59,7 +59,7 @@ import org.apache.parquet.schema.Type.ID;
* // }
* Types.requiredGroup()
* .required(INT64).named("id")
- * .required(BINARY).as(UTF8).named("email")
+ * .optional(BINARY).as(UTF8).named("email")
* .named("User")
* </pre>
* <p>
@@ -82,7 +82,7 @@ import org.apache.parquet.schema.Type.ID;
* // }
* Types.requiredGroup()
* .required(INT64).named("id")
- * .required(BINARY).as(UTF8).named("email")
+ * .optional(BINARY).as(UTF8).named("email")
* .optionalGroup()
* .required(BINARY).as(UTF8).named("street")
* .required(INT32).named("zipcode")
@@ -161,7 +161,7 @@ import org.apache.parquet.schema.Type.ID;
* // }
* Types.buildMessage()
* .required(INT64).named("id")
- * .required(BINARY).as(UTF8).named("email")
+ * .optional(BINARY).as(UTF8).named("email")
* .optionalGroup()
* .required(BINARY).as(UTF8).named("street")
* .required(INT32).named("zipcode")