[CARBONDATA-2989] Upgrade spark integration version to 2.3.2 #2779
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
File renamed without changes.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,58 @@ | ||
| /* | ||
|
Contributor
There was a problem hiding this comment. Why need to move CarbonDataSourceScan.scala?
Contributor
Author
There was a problem hiding this comment. move original class 'CarbonDataSourceScan' to src path 'commonTo2.1And2.2', and add a new class 'CarbonDataSourceScan' in src path 'spark2.3' which is added some lazy parameters.
Contributor
There was a problem hiding this comment. My comment : only for 4 parameters , copy the whole file(CarbonDataSourceScan.scala) for spark 2.3 integration, may not require. see if can add the judgement for different spark version with different code/parameters.
Contributor
Author
There was a problem hiding this comment. @chenliang613 , it's not about the different code/parameters, it changes common val parameters to lazy val parameters. I think it's difficult to add lazy keyword on val parameters according to spark version. |
||
| * 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.execution.strategy | ||
|
|
||
| import org.apache.spark.rdd.RDD | ||
| import org.apache.spark.sql.catalyst.{InternalRow, TableIdentifier} | ||
| import org.apache.spark.sql.catalyst.expressions.{Attribute, SortOrder} | ||
| import org.apache.spark.sql.catalyst.plans.physical.Partitioning | ||
| import org.apache.spark.sql.execution.FileSourceScanExec | ||
| import org.apache.spark.sql.execution.datasources.{HadoopFsRelation, LogicalRelation} | ||
|
|
||
| /** | ||
| * Physical plan node for scanning data. It is applied for both tables | ||
| * USING carbondata and STORED AS CARBONDATA. | ||
| */ | ||
| class CarbonDataSourceScan( | ||
| override val output: Seq[Attribute], | ||
| val rdd: RDD[InternalRow], | ||
| @transient override val relation: HadoopFsRelation, | ||
| val partitioning: Partitioning, | ||
| val md: Map[String, String], | ||
| identifier: Option[TableIdentifier], | ||
| @transient private val logicalRelation: LogicalRelation) | ||
| extends FileSourceScanExec( | ||
| relation, | ||
| output, | ||
| relation.dataSchema, | ||
| Seq.empty, | ||
| Seq.empty, | ||
| identifier) { | ||
|
|
||
| // added lazy since spark 2.3.2 version (SPARK-PR#21815) | ||
| override lazy val supportsBatch: Boolean = true | ||
|
|
||
| // added lazy since spark 2.3.2 version (SPARK-PR#21815) | ||
| override lazy val (outputPartitioning, outputOrdering): (Partitioning, Seq[SortOrder]) = | ||
| (partitioning, Nil) | ||
|
|
||
| // added lazy since spark 2.3.2 version (SPARK-PR#21815) | ||
| override lazy val metadata: Map[String, String] = md | ||
|
Contributor
Author
There was a problem hiding this comment. The parameters (supportsBatch, outputPartitioning, outputOrdering, metadata) had been added keyword 'lazy', please see: SPARK-PR#21815
Contributor
There was a problem hiding this comment. nit: made lazy since spark 2.3.2 version (SPARK-PR#21815) |
||
|
|
||
| override def inputRDDs(): Seq[RDD[InternalRow]] = rdd :: Nil | ||
|
|
||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The parameters of 'writeAndRead' method had been changed, please see: SPARK-PR#22346
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
added some comments too