Rename class

Author: maropu

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

@@ -112,7 +112,7 @@ abstract class Optimizer(sessionCatalog: SessionCatalog, conf: SQLConf)
       SimplifyCreateStructOps,
       SimplifyCreateArrayOps,
       SimplifyCreateMapOps,
-      CombineConcat) ++
+      CombineConcats) ++
       extendedOperatorOptimizationRules: _*) ::
     Batch("Check Cartesian Products", Once,
       CheckCartesianProducts(conf)) ::

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

@@ -548,9 +548,9 @@ object SimplifyCaseConversionExpressions extends Rule[LogicalPlan] {
 /**
  * Combine nested [[Concat]] expressions.
  */
-object CombineConcat extends Rule[LogicalPlan] {
+object CombineConcats extends Rule[LogicalPlan] {
 
-  private def flattenConcat(concat: Concat): Concat = {
+  private def flattenConcats(concat: Concat): Concat = {
     val stack = Stack[Expression](concat)
     val flattened = ArrayBuffer.empty[Expression]
     while (stack.nonEmpty) {
@@ -566,6 +566,6 @@ object CombineConcat extends Rule[LogicalPlan] {
 
   def apply(plan: LogicalPlan): LogicalPlan = plan.transformExpressionsDown {
     case concat: Concat if concat.children.exists(_.isInstanceOf[Concat]) =>
-      flattenConcat(concat)
+      flattenConcats(concat)
   }
 }

…alyst/optimizer/CombineConcatSuite.scala …lyst/optimizer/CombineConcatsSuite.scalasql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/CombineConcatSuite.scala renamed to sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/CombineConcatsSuite.scala sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/CombineConcatSuite.scala renamed to sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/optimizer/CombineConcatsSuite.scala

@@ -25,10 +25,10 @@ import org.apache.spark.sql.catalyst.rules._
 import org.apache.spark.sql.types.StringType
 
 
-class CombineConcatSuite extends PlanTest with PredicateHelper {
+class CombineConcatsSuite extends PlanTest with PredicateHelper {
 
   object Optimize extends RuleExecutor[LogicalPlan] {
-    val batches = Batch("CombineConcatSuite", FixedPoint(50), CombineConcat) :: Nil
+    val batches = Batch("CombineConcatsSuite", FixedPoint(50), CombineConcats) :: Nil
   }
 
   protected def assertEquivalent(e1: Expression, e2: Expression): Unit = {