Address comments.

Author: sun-rui

R/pkg/inst/worker/worker.R

@@ -84,8 +84,6 @@ broadcastElap <- elapsedSecs()
 # as number of partitions to create.
 numPartitions <- SparkR:::readInt(inputCon)
 
-# If true, working for RDD
-# If false, working for DataFrame
 isDataFrame <- as.logical(SparkR:::readInt(inputCon))
 
 # If isDataFrame, then read column names

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/Optimizer.scala

@@ -158,15 +158,15 @@ object EliminateSerialization extends Rule[LogicalPlan] {
   def apply(plan: LogicalPlan): LogicalPlan = plan transform {
     case d @ DeserializeToObject(_, _, s: SerializeFromObject)
         if d.outputObjectType == s.inputObjectType =>
-           // A workaround for SPARK-14803. Remove this after it is fixed.
-        if (d.outputObjectType.isInstanceOf[ObjectType] &&
-            d.outputObjectType.asInstanceOf[ObjectType].cls == classOf[org.apache.spark.sql.Row]) {
-          s.child
-        } else {
-          // Adds an extra Project here, to preserve the output expr id of `DeserializeToObject`.
-          val objAttr = Alias(s.child.output.head, "obj")(exprId = d.output.head.exprId)
-          Project(objAttr :: Nil, s.child)
-        }
+      // A workaround for SPARK-14803. Remove this after it is fixed.
+      if (d.outputObjectType.isInstanceOf[ObjectType] &&
+          d.outputObjectType.asInstanceOf[ObjectType].cls == classOf[org.apache.spark.sql.Row]) {
+        s.child
+      } else {
+        // Adds an extra Project here, to preserve the output expr id of `DeserializeToObject`.
+        val objAttr = Alias(s.child.output.head, "obj")(exprId = d.output.head.exprId)
+        Project(objAttr :: Nil, s.child)
+      }
     case a @ AppendColumns(_, _, _, s: SerializeFromObject)
         if a.deserializer.dataType == s.inputObjectType =>
       AppendColumnsWithObject(a.func, s.serializer, a.serializer, s.child)