Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Set defaults to schemas #1972

Merged
merged 3 commits into from
Jun 12, 2018
Merged

Set defaults to schemas #1972

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f919b9c
Adding defaults to schemas
Mar 27, 2018
1834855
Remove redundant .toSeq
Mar 27, 2018
0ec222d
Switch to case classes
Mar 27, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 7 additions & 11 deletions adam-codegen/src/main/scala/org/bdgenomics/adam/codegen/DumpSchemasToProduct.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,20 +67,20 @@ class DumpSchemasToProduct extends Generator {
val fieldSchema = field.schema
val fieldType = fieldSchema.getType match {
case Schema.Type.ARRAY => {
"Seq[%s]".format(getType(fieldSchema.getElementType()))
"Seq[%s] = Seq()".format(getType(fieldSchema.getElementType()))
}
case Schema.Type.MAP => {
"scala.collection.Map[String,%s]".format(getType(fieldSchema.getValueType()))
"scala.collection.Map[String,%s] = Map()".format(getType(fieldSchema.getValueType()))
}
case Schema.Type.UNION => {
"Option[%s]".format(getType(getUnionType(fieldSchema)))
"Option[%s] = None".format(getType(getUnionType(fieldSchema)))
}
case other => {
throw new IllegalStateException("Unsupported type %s in field %s.".format(other, name))
}
}
(name, fieldType)
}).toSeq
})
}

private def conversion(schema: Schema, mapFn: String): String = schema.getType match {
Expand Down Expand Up @@ -139,10 +139,10 @@ class DumpSchemasToProduct extends Generator {
// get class name without package
val classNameNoPackage = className.split('.').last

"\n%s\n\nclass %s (\n%s) extends Product {\n def productArity: Int = %d\n def productElement(i: Int): Any = i match {\n%s\n }\n def toAvro: %s = {\n%s\n }\n def canEqual(that: Any): Boolean = that match {\n case %s => true\n case _ => false\n }\n}".format(
"\n%s\n\ncase class %s (\n%s) extends Product {\n def productArity: Int = %d\n def productElement(i: Int): Any = i match {\n%s\n }\n def toAvro: %s = {\n%s\n }\n def canEqual(that: Any): Boolean = that match {\n case %s => true\n case _ => false\n }\n}".format(
dumpObject(schema),
classNameNoPackage,
fields(schema).map(p => " val %s: %s".format(p._1, p._2)).mkString(",\n"),
fields(schema).map(p => " %s: %s".format(p._1, p._2)).mkString(",\n"),
schema.getFields().size,
toMatch(fields(schema)),
schema.getFullName,
Expand Down Expand Up @@ -195,12 +195,8 @@ class DumpSchemasToProduct extends Generator {
}

private def dumpObject(schema: Schema): String = {
"object %s extends Serializable {\n def apply(\n%s): %s = {\n new %s(\n%s)\n }\n def fromAvro(record: %s): %s = {\n new %s (\n%s)\n }\n}".format(
schema.getName,
fields(schema).map(p => " %s: %s".format(p._1, p._2)).mkString(",\n"),
schema.getName,
"object %s extends Serializable {\n def fromAvro(record: %s): %s = {\n new %s (\n%s)\n }\n}".format(
schema.getName,
fields(schema).map(_._1).map(s => " %s".format(s)).mkString(",\n"),
schema.getFullName,
schema.getName,
schema.getName,
Expand Down