11488

Build # 11488

Build Type

push

jenkins

Committed by GitHub

Commit Message

<a href="https://github.com/apache/carbondata/commit/<a class=hub.com/apache/carbondata/commit/93557ca2549f788fb1aae105785cea776e769e4c">93557ca25<a href="https://github.com/apache/carbondata/commit/93557ca2549f788fb1aae105785cea776e769e4c">">Merge </a><a class="double-link" href="https://github.com/apache/carbondata/commit/<a class="double-link" href="https://github.com/apache/carbondata/commit/5e42386176cd32221fbf1a43cd70197176a9d793">5e4238617</a>">5e4238617</a><a href="https://github.com/apache/carbondata/commit/93557ca2549f788fb1aae105785cea776e769e4c"> into ed17abbff">ed17abbff</a>

Run Details

56 of 56 new or added lines in 5 files covered. (100.0%)

63815 of 80433 relevant lines covered (79.34%)

1.05 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

82.14

/integration/spark2/src/main/scala/org/apache/spark/sql/optimizer/CarbonUDFTransformRule.scala

/*
 * 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.optimizer

import org.apache.spark.sql.catalyst.expressions.{Alias, AttributeReference, PredicateHelper,
ScalaUDF}
import org.apache.spark.sql.catalyst.plans.logical.{Filter, Join, LogicalPlan, Project}
import org.apache.spark.sql.catalyst.rules.Rule
import org.apache.spark.sql.execution.datasources.LogicalRelation
import org.apache.spark.sql.types.StringType

import org.apache.carbondata.core.constants.CarbonCommonConstants

class CarbonUDFTransformRule extends Rule[LogicalPlan] with PredicateHelper {
  override def apply(plan: LogicalPlan): LogicalPlan = {
      pushDownUDFToJoinLeftRelation(plan)
  }

  private def pushDownUDFToJoinLeftRelation(plan: LogicalPlan): LogicalPlan = {
    val output = plan.transform {
      case proj@Project(cols, Join(
      left, right, jointype: org.apache.spark.sql.catalyst.plans.JoinType, condition)) =>
        var projectionToBeAdded: Seq[org.apache.spark.sql.catalyst.expressions.Alias] = Seq.empty
        var udfExists = false
        val newCols = cols.map {
          case a@Alias(s: ScalaUDF, name)
            if name.equalsIgnoreCase(CarbonCommonConstants.POSITION_ID) ||
               name.equalsIgnoreCase(CarbonCommonConstants.CARBON_IMPLICIT_COLUMN_TUPLEID) =>
            udfExists = true
            projectionToBeAdded :+= a
            AttributeReference(name, StringType, nullable = true)().withExprId(a.exprId)
          case other => other
        }
        if (udfExists) {
          val newLeft = left match {
            case Project(columns, logicalPlan) =>
              Project(columns ++ projectionToBeAdded, logicalPlan)
            case filter: Filter =>
              Project(filter.output ++ projectionToBeAdded, filter)
            case relation: LogicalRelation =>
              Project(relation.output ++ projectionToBeAdded, relation)
            case other => other
          }
          Project(newCols, Join(newLeft, right, jointype, condition))
        } else {
          proj
        }
      case other => other
    }
    output
  }

}

1	/*
2	* Licensed to the Apache Software Foundation (ASF) under one or more
3	* contributor license agreements. See the NOTICE file distributed with
4	* this work for additional information regarding copyright ownership.
5	* The ASF licenses this file to You under the Apache License, Version 2.0
6	* (the "License"); you may not use this file except in compliance with
7	* the License. You may obtain a copy of the License at
8	*
9	* http://www.apache.org/licenses/LICENSE-2.0
10	*
11	* Unless required by applicable law or agreed to in writing, software
12	* distributed under the License is distributed on an "AS IS" BASIS,
13	* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
14	* See the License for the specific language governing permissions and
15	* limitations under the License.
16	*/
17
18	package org.apache.spark.sql.optimizer
19
20	import org.apache.spark.sql.catalyst.expressions.{Alias, AttributeReference, PredicateHelper,
21	ScalaUDF}
22	import org.apache.spark.sql.catalyst.plans.logical.{Filter, Join, LogicalPlan, Project}
23	import org.apache.spark.sql.catalyst.rules.Rule
24	import org.apache.spark.sql.execution.datasources.LogicalRelation
25	import org.apache.spark.sql.types.StringType
26
27	import org.apache.carbondata.core.constants.CarbonCommonConstants
28
29	class CarbonUDFTransformRule extends Rule[LogicalPlan] with PredicateHelper {	2✔
30	override def apply(plan: LogicalPlan): LogicalPlan = {
31	pushDownUDFToJoinLeftRelation(plan)	2✔
32	}
33
34	private def pushDownUDFToJoinLeftRelation(plan: LogicalPlan): LogicalPlan = {
35	val output = plan.transform {	2✔
36	case proj@Project(cols, Join(	2✔
37	left, right, jointype: org.apache.spark.sql.catalyst.plans.JoinType, condition)) =>	2✔
38	var projectionToBeAdded: Seq[org.apache.spark.sql.catalyst.expressions.Alias] = Seq.empty	2✔
39	var udfExists = false	2✔
40	val newCols = cols.map {	2✔
41	case a@Alias(s: ScalaUDF, name)	2✔
42	if name.equalsIgnoreCase(CarbonCommonConstants.POSITION_ID) \|\|	2✔
43	name.equalsIgnoreCase(CarbonCommonConstants.CARBON_IMPLICIT_COLUMN_TUPLEID) =>	2✔
44	udfExists = true	2✔
45	projectionToBeAdded :+= a	2✔
46	AttributeReference(name, StringType, nullable = true)().withExprId(a.exprId)	2✔
47	case other => other	2✔
48	}
49	if (udfExists) {	2✔
50	val newLeft = left match {	2✔
51	case Project(columns, logicalPlan) =>	2✔
52	Project(columns ++ projectionToBeAdded, logicalPlan)	2✔
53	case filter: Filter =>	×
54	Project(filter.output ++ projectionToBeAdded, filter)	×
55	case relation: LogicalRelation =>	×
56	Project(relation.output ++ projectionToBeAdded, relation)	×
57	case other => other	×
58	}
59	Project(newCols, Join(newLeft, right, jointype, condition))	2✔
60	} else {
61	proj	2✔
62	}
63	case other => other	2✔
64	}
65	output	2✔
66	}
67
68	}

apache / carbondata / 11488

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous