Github user clockfly commented on a diff in the pull request:
https://github.com/apache/spark/pull/13470#discussion_r65600672
--- Diff:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/trees/TreeNode.scala
---
@@ -427,13 +427,21 @@ abstract class TreeNode[BaseType <:
TreeNode[BaseType]] extends Product {
private lazy val allChildren: Set[TreeNode[_]] = (children ++
innerChildren).toSet[TreeNode[_]]
/** Returns a string representing the arguments to this node, minus any
children */
- def argString: String = productIterator.flatMap {
+ def argString: String = stringArgs.flatMap {
case tn: TreeNode[_] if allChildren.contains(tn) => Nil
case Some(tn: TreeNode[_]) if allChildren.contains(tn) => Nil
- case tn: TreeNode[_] => s"${tn.simpleString}" :: Nil
- case seq: Seq[BaseType] if seq.toSet.subsetOf(children.toSet) => Nil
+ case tn: TreeNode[_] => tn.simpleString :: Nil
+ case seq: Seq[Any] if
seq.toSet.subsetOf(allChildren.asInstanceOf[Set[Any]]) => Nil
+ case iter: Iterable[_] if iter.isEmpty => Nil
case seq: Seq[_] => seq.mkString("[", ",", "]") :: Nil
- case set: Set[_] => set.mkString("{", ",", "}") :: Nil
+ case set: Set[_] => set.mkString("{", ", ", "}") :: Nil
+ case array: Array[_] if array.isEmpty => Nil
+ case array: Array[_] => array.mkString("[", ", ", "]") :: Nil
+ case null => Nil
+ case false => Nil
+ case None => Nil
+ case Some(null) => Nil
+ case Some(str: String) => str :: Nil
--- End diff --
You missed this
https://github.com/apache/spark/pull/13470/files#diff-eac5b02bb450a235fef5e902a2671254R435
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
