Skip to content

Commit

Permalink
minor code clean
Browse files Browse the repository at this point in the history
  • Loading branch information
adrian-wang committed Sep 5, 2014
1 parent 595b417 commit c6241de
Showing 1 changed file with 2 additions and 2 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,10 @@ private[sql] object JsonRDD extends Logging {
* Returns the most general data type for two given data types.
*/
private[json] def compatibleType(t1: DataType, t2: DataType): DataType = {
HiveTypeCoercion.findTightestCommonType(t1,t2) match {
HiveTypeCoercion.findTightestCommonType(t1, t2) match {
case Some(commonType) => commonType
case None =>
// t1 or t2 is a StructType, ArrayType, BooleanType, or an unexpected type.
// t1 or t2 is a StructType, ArrayType, or an unexpected type.
(t1, t2) match {
case (other: DataType, NullType) => other
case (NullType, other: DataType) => other
Expand Down

0 comments on commit c6241de

Please sign in to comment.