[SPARK-21255][SQL] fixed ser/de for EnumBean and BeanWithEnum, minor …

…fixes
apache · Aug 9, 2017 · 8ca168f · 8ca168f
1 parent 611e32e
commit 8ca168f
Show file tree

Hide file tree

Showing 2 changed files with 135 additions and 134 deletions.
diff --git a/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/ExpressionInfo.java b/sql/catalyst/src/main/java/org/apache/spark/sql/catalyst/expressions/ExpressionInfo.java
@@ -1,122 +1,122 @@
-/*
- * 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 regarding copyright ownership.
- * The ASF licenses this file 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 KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.spark.sql.catalyst.expressions;
-
-/**
- * Expression information, will be used to describe a expression.
- */
-public class ExpressionInfo {
-    private String className;
-    private String usage;
-    private String name;
-    private String extended;
-    private String db;
-    private String arguments;
-    private String examples;
-    private String note;
-    private String since;
-
-    public String getClassName() {
-        return className;
-    }
-
-    public String getUsage() {
-        return usage;
-    }
-
-    public String getName() {
-        return name;
-    }
-
-    public String getExtended() {
-        return extended;
-    }
-
-    public String getSince() {
-        return since;
-    }
-
-    public String getArguments() {
-        return arguments;
-    }
-
-    public String getExamples() {
-        return examples;
-    }
-
-    public String getNote() {
-        return note;
-    }
-
-    public String getDb() {
-        return db;
-    }
-
-    public ExpressionInfo(
-            String className,
-            String db,
-            String name,
-            String usage,
-            String arguments,
-            String examples,
-            String note,
-            String since) {
-        assert name != null;
-        assert arguments != null;
-        assert examples != null;
-        assert examples.isEmpty() || examples.startsWith(System.lineSeparator() + "    Examples:");
-        assert note != null;
-        assert since != null;
-
-        this.className = className;
-        this.db = db;
-        this.name = name;
-        this.usage = usage;
-        this.arguments = arguments;
-        this.examples = examples;
-        this.note = note;
-        this.since = since;
-
-        // Make the extended description.
-        this.extended = arguments + examples;
-        if (this.extended.isEmpty()) {
-            this.extended = "\n    No example/argument for _FUNC_.\n";
-        }
-        if (!note.isEmpty()) {
-            this.extended += "\n    Note:\n      " + note.trim() + "\n";
-        }
-        if (!since.isEmpty()) {
-            this.extended += "\n    Since: " + since + "\n";
-        }
-    }
-
-    public ExpressionInfo(String className, String name) {
-        this(className, null, name, null, "", "", "", "");
-    }
-
-    public ExpressionInfo(String className, String db, String name) {
-        this(className, db, name, null, "", "", "", "");
-    }
-
-    // This is to keep the original constructor just in case.
-    public ExpressionInfo(String className, String db, String name, String usage, String extended) {
-        // `arguments` and `examples` are concatenated for the extended description. So, here
-        // simply pass the `extended` as `arguments` and an empty string for `examples`.
-        this(className, db, name, usage, extended, "", "", "");
-    }
-}
+/*
+ * 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 regarding copyright ownership.
+ * The ASF licenses this file 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 KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.spark.sql.catalyst.expressions;
+
+/**
+ * Expression information, will be used to describe a expression.
+ */
+public class ExpressionInfo {
+    private String className;
+    private String usage;
+    private String name;
+    private String extended;
+    private String db;
+    private String arguments;
+    private String examples;
+    private String note;
+    private String since;
+
+    public String getClassName() {
+        return className;
+    }
+
+    public String getUsage() {
+        return usage;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getExtended() {
+        return extended;
+    }
+
+    public String getSince() {
+        return since;
+    }
+
+    public String getArguments() {
+        return arguments;
+    }
+
+    public String getExamples() {
+        return examples;
+    }
+
+    public String getNote() {
+        return note;
+    }
+
+    public String getDb() {
+        return db;
+    }
+
+    public ExpressionInfo(
+            String className,
+            String db,
+            String name,
+            String usage,
+            String arguments,
+            String examples,
+            String note,
+            String since) {
+        assert name != null;
+        assert arguments != null;
+        assert examples != null;
+        assert examples.isEmpty() || examples.startsWith(System.lineSeparator() + "    Examples:");
+        assert note != null;
+        assert since != null;
+
+        this.className = className;
+        this.db = db;
+        this.name = name;
+        this.usage = usage;
+        this.arguments = arguments;
+        this.examples = examples;
+        this.note = note;
+        this.since = since;
+
+        // Make the extended description.
+        this.extended = arguments + examples;
+        if (this.extended.isEmpty()) {
+            this.extended = "\n    No example/argument for _FUNC_.\n";
+        }
+        if (!note.isEmpty()) {
+            this.extended += "\n    Note:\n      " + note.trim() + "\n";
+        }
+        if (!since.isEmpty()) {
+            this.extended += "\n    Since: " + since + "\n";
+        }
+    }
+
+    public ExpressionInfo(String className, String name) {
+        this(className, null, name, null, "", "", "", "");
+    }
+
+    public ExpressionInfo(String className, String db, String name) {
+        this(className, db, name, null, "", "", "", "");
+    }
+
+    // This is to keep the original constructor just in case.
+    public ExpressionInfo(String className, String db, String name, String usage, String extended) {
+        // `arguments` and `examples` are concatenated for the extended description. So, here
+        // simply pass the `extended` as `arguments` and an empty string for `examples`.
+        this(className, db, name, usage, extended, "", "", "");
+    }
+}
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/JavaTypeInference.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/JavaTypeInference.scala
@@ -119,6 +119,10 @@ object JavaTypeInference {
         val (valueDataType, nullable) = inferDataType(valueType, seenTypeSet)
         (MapType(keyDataType, valueDataType, nullable), true)
 
+      case other if other.isEnum =>
+        (StructType(Seq(StructField(typeToken.getRawType.getSimpleName,
+          StringType, nullable = false))), true)
+
       case other =>
         if (seenTypeSet.contains(other)) {
           throw new UnsupportedOperationException(
@@ -128,18 +132,13 @@ object JavaTypeInference {
 
         // TODO: we should only collect properties that have getter and setter. However, some tests
         // pass in scala case class as java bean class which doesn't have getter and setter.
-        if (typeToken.getRawType.isEnum) {
-          (StructType(Seq(new StructField(typeToken.getRawType.getSimpleName,
-            StringType, false))), true)
-        } else {
-          val properties = getJavaBeanReadableProperties(other)
-          val fields = properties.map { property =>
-            val returnType = typeToken.method(property.getReadMethod).getReturnType
-            val (dataType, nullable) = inferDataType(returnType, seenTypeSet + other)
-            new StructField(property.getName, dataType, nullable)
-          }
-          (new StructType(fields), true)
+        val properties = getJavaBeanReadableProperties(other)
+        val fields = properties.map { property =>
+          val returnType = typeToken.method(property.getReadMethod).getReturnType
+          val (dataType, nullable) = inferDataType(returnType, seenTypeSet + other)
+          new StructField(property.getName, dataType, nullable)
         }
+        (new StructType(fields), true)
     }
   }
 
@@ -345,7 +344,9 @@ object JavaTypeInference {
     }
   }
 
-  /** Returns an expression for serializing an object of the given type to an internal row. */
+  /**
+    * Returns an expression for serializing an object of the given type to an internal row.
+    */
   def serializerFor(beanClass: Class[_]): CreateNamedStruct = {
     val inputObject = BoundReference(0, ObjectType(beanClass), nullable = true)
     val nullSafeInput = AssertNotNull(inputObject, Seq("top level input bean"))