Skip to content

Commit

Permalink
resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
wbo4958 committed Sep 14, 2021
1 parent 0a49903 commit 583e8c5
Show file tree
Hide file tree
Showing 4 changed files with 14 additions and 12 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package com.nvidia.spark.rapids.shims.v2

import scala.collection.mutable.ListBuffer

import com.nvidia.spark.rapids.{ExecChecks, ExecRule, GpuExec, SparkPlanMeta, SparkShims, TypeSig}
import com.nvidia.spark.rapids.{ExecChecks, ExecRule, GpuExec, SparkPlanMeta, SparkShims, TypeSig, TypeSigUtil, TypeSigUtilUntil320}
import com.nvidia.spark.rapids.GpuOverrides.exec
import org.apache.hadoop.fs.FileStatus

Expand Down Expand Up @@ -116,4 +116,6 @@ trait Spark30XShims extends SparkShims {
override def skipAssertIsOnTheGpu(plan: SparkPlan): Boolean = false

override def shouldFailDivOverflow(): Boolean = false

override def getTypeSigUtil(): TypeSigUtil = TypeSigUtilUntil320
}
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ package com.nvidia.spark.rapids.shims.v2

import scala.collection.mutable.ListBuffer

import com.nvidia.spark.rapids.{ExecChecks, ExecRule, GpuExec, SparkPlanMeta, SparkShims, TypeSig, TypeSigUtil}
import com.nvidia.spark.rapids.{ExecChecks, ExecRule, GpuExec, SparkPlanMeta, SparkShims, TypeSig, TypeSigUtil, TypeSigUtilUntil320}
import com.nvidia.spark.rapids.GpuOverrides.exec
import org.apache.hadoop.fs.FileStatus

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

package com.nvidia.spark.rapids.shims.v2

import com.nvidia.spark.rapids.{ExecChecks, ExecRule, GpuExec, SparkPlanMeta, SparkShims, TypeSig}
import com.nvidia.spark.rapids.{ExecChecks, ExecRule, GpuExec, SparkPlanMeta, SparkShims, TypeSig, TypeSigUtil, TypeSigUtilUntil320}
import com.nvidia.spark.rapids.GpuOverrides.exec
import org.apache.hadoop.fs.FileStatus

Expand Down Expand Up @@ -93,4 +93,6 @@ trait Spark30XShims extends SparkShims {
}

override def shouldFailDivOverflow(): Boolean = false

override def getTypeSigUtil(): TypeSigUtil = TypeSigUtilUntil320
}
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,7 @@
* limitations under the License.
*/

package com.nvidia.spark.rapids.shims.v2

import com.nvidia.spark.rapids.{TypeEnum, TypeSig, TypeSigUtil}
package com.nvidia.spark.rapids

import org.apache.spark.sql.types.DataType

Expand Down Expand Up @@ -55,9 +53,9 @@ object TypeSigUtilUntil320 extends TypeSigUtil {
* @return the reason
*/
override def reasonNotSupported(
check: TypeEnum.ValueSet,
dataType: DataType,
allowDecimal: Boolean, notSupportedReason: Seq[String]): Seq[String] = notSupportedReason
check: TypeEnum.ValueSet,
dataType: DataType,
allowDecimal: Boolean, notSupportedReason: Seq[String]): Seq[String] = notSupportedReason

/**
* Get checks from TypeEnum
Expand All @@ -77,7 +75,7 @@ object TypeSigUtilUntil320 extends TypeSigUtil {
* @return the TypeSigs
*/
override def getCastChecksAndSigs(
from: DataType,
default: TypeSig,
sparkDefault: TypeSig): (TypeSig, TypeSig) = (default, sparkDefault)
from: DataType,
default: TypeSig,
sparkDefault: TypeSig): (TypeSig, TypeSig) = (default, sparkDefault)
}

0 comments on commit 583e8c5

Please sign in to comment.