Skip to content

[KYLIN-5401]Optimize code logic for pushdown queries #2077

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 3 commits into
base: kylin4
Choose a base branch
from
Open

[KYLIN-5401]Optimize code logic for pushdown queries #2077

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ffdcdf9
Enhancement: refine push down query
Jan 12, 2023
e122bd9
KYLIN-5401 Optimize code logic for pushdown queries
Jan 12, 2023
e4c2c02
Merge remote-tracking branch 'origin/kylin4.x-pushdown' into kylin4.x…
Jan 12, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions ...ect/kylin-spark-query/src/main/scala/org/apache/kylin/query/pushdown/SparkSqlClient.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ import org.apache.kylin.common.{KylinConfig, QueryContextFacade}
import org.apache.kylin.engine.spark.metadata.cube.StructField
import org.apache.kylin.query.runtime.plans.QueryToExecutionIDCache
import org.apache.spark.network.util.JavaUtils
import org.apache.spark.sql.functions._
import org.apache.spark.sql.hive.utils.{QueryMetricUtils, ResourceDetectUtils}
import org.apache.spark.sql.types.StringType
import org.apache.spark.sql.utils.SparkTypeUtil
import org.apache.spark.sql.{DataFrame, SparkSession}
import org.slf4j.{Logger, LoggerFactory}
Expand Down Expand Up @@ -75,15 +73,9 @@ object SparkSqlClient {
ss.sparkContext.setJobGroup(jobGroup,
"Pushdown Query Id: " + QueryContextFacade.current().getQueryId, interruptOnCancel = true)
try {
val temporarySchema = df.schema.fields.zipWithIndex.map {
case (_, index) => s"temporary_$index"
}
val tempDF = df.toDF(temporarySchema: _*)
val columns = tempDF.schema.map(tp => col(s"`${tp.name}`").cast(StringType))
val frame = tempDF.select(columns: _*)
val rowList = frame.collect().map(_.toSeq.map(_.asInstanceOf[String]).asJava).toSeq.asJava
val rowList = df.collect().map(_.toSeq.map(col => if (col == null) "" else col.toString).asJava).toSeq.asJava
val fieldList = df.schema.map(field => SparkTypeUtil.convertSparkFieldToJavaField(field)).asJava
val (scanRows, scanFiles, metadataTime, scanTime, scanBytes) = QueryMetricUtils.collectScanMetrics(frame.queryExecution.executedPlan)
val (scanRows, scanFiles, metadataTime, scanTime, scanBytes) = QueryMetricUtils.collectScanMetrics(df.queryExecution.executedPlan)
QueryContextFacade.current().addAndGetScannedRows(scanRows.asScala.map(Long2long(_)).sum)
QueryContextFacade.current().addAndGetScanFiles(scanFiles.asScala.map(Long2long(_)).sum)
QueryContextFacade.current().addAndGetScannedBytes(scanBytes.asScala.map(Long2long(_)).sum)
Expand Down