[SPARK-12293][SQL] Support UnsafeRow in LocalTableScan #10283
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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -61,6 +61,7 @@ object ScalaReflection extends ScalaReflection { | |
| case t if t <:< definitions.ByteTpe => ByteType | ||
| case t if t <:< definitions.BooleanTpe => BooleanType | ||
| case t if t <:< localTypeOf[Array[Byte]] => BinaryType | ||
| case t if t <:< localTypeOf[Decimal] => DecimalType.SYSTEM_DEFAULT | ||
| case _ => | ||
| val className = getClassNameFromType(tpe) | ||
| className match { | ||
|
|
@@ -177,6 +178,7 @@ object ScalaReflection extends ScalaReflection { | |
| case _ => UpCast(expr, expected, walkedTypePath) | ||
| } | ||
|
|
||
| val className = getClassNameFromType(tpe) | ||
| tpe match { | ||
| case t if !dataTypeFor(t).isInstanceOf[ObjectType] => getPath | ||
|
|
||
|
|
@@ -372,6 +374,17 @@ object ScalaReflection extends ScalaReflection { | |
| } else { | ||
| newInstance | ||
| } | ||
|
|
||
| case t if Utils.classIsLoadable(className) && | ||
| Utils.classForName(className).isAnnotationPresent(classOf[SQLUserDefinedType]) => | ||
| val udt = Utils.classForName(className) | ||
| .getAnnotation(classOf[SQLUserDefinedType]).udt().newInstance() | ||
| val obj = NewInstance( | ||
| udt.userClass.getAnnotation(classOf[SQLUserDefinedType]).udt(), | ||
| Nil, | ||
| false, | ||
| dataType = ObjectType(udt.userClass.getAnnotation(classOf[SQLUserDefinedType]).udt())) | ||
| Invoke(obj, "deserialize", ObjectType(udt.userClass), getPath :: Nil) | ||
| } | ||
| } | ||
|
|
||
|
|
@@ -406,11 +419,16 @@ object ScalaReflection extends ScalaReflection { | |
| def toCatalystArray(input: Expression, elementType: `Type`): Expression = { | ||
| val externalDataType = dataTypeFor(elementType) | ||
| val Schema(catalystType, nullable) = silentSchemaFor(elementType) | ||
|
|
||
| if (isNativeType(catalystType) && !(elementType <:< localTypeOf[Option[_]])) { | ||
|
Contributor
There was a problem hiding this comment. good catch!
Member
Author
There was a problem hiding this comment. Yes. Thanks. I propose this fixing as another pr #10391. |
||
| val array = NewInstance( | ||
| classOf[GenericArrayData], | ||
| input :: Nil, | ||
| dataType = ArrayType(catalystType, nullable)) | ||
| expressions.If( | ||
| IsNull(input), | ||
| expressions.Literal.create(null, ArrayType(catalystType, nullable)), | ||
| array) | ||
| } else { | ||
| val clsName = getClassNameFromType(elementType) | ||
| val newPath = s"""- array element class: "$clsName"""" +: walkedTypePath | ||
|
|
@@ -421,46 +439,75 @@ object ScalaReflection extends ScalaReflection { | |
| if (!inputObject.dataType.isInstanceOf[ObjectType]) { | ||
| inputObject | ||
| } else { | ||
| val className = getClassNameFromType(tpe) | ||
| tpe match { | ||
| case t if t <:< localTypeOf[Option[_]] => | ||
| val TypeRef(_, _, Seq(optType)) = t | ||
| optType match { | ||
| // For primitive types we must manually unbox the value of the object. | ||
| case t if t <:< definitions.IntTpe => | ||
| val unwrapped = UnwrapOption(ObjectType(classOf[java.lang.Integer]), inputObject) | ||
| expressions.If( | ||
| IsNull(unwrapped), | ||
| expressions.Literal.create(null, silentSchemaFor(optType).dataType), | ||
| Invoke( | ||
| unwrapped, | ||
|
Contributor
There was a problem hiding this comment. If the I think we don't need this extra
Member
Author
There was a problem hiding this comment. I think you are right. I add this to make sure it is not possibly creating wrong values when I debug. I will remove these |
||
| "intValue", | ||
| IntegerType)) | ||
| case t if t <:< definitions.LongTpe => | ||
| val unwrapped = UnwrapOption(ObjectType(classOf[java.lang.Long]), inputObject) | ||
| expressions.If( | ||
| IsNull(unwrapped), | ||
| expressions.Literal.create(null, silentSchemaFor(optType).dataType), | ||
| Invoke( | ||
| unwrapped, | ||
| "longValue", | ||
| LongType)) | ||
| case t if t <:< definitions.DoubleTpe => | ||
| val unwrapped = UnwrapOption(ObjectType(classOf[java.lang.Double]), inputObject) | ||
| expressions.If( | ||
| IsNull(unwrapped), | ||
| expressions.Literal.create(null, silentSchemaFor(optType).dataType), | ||
| Invoke( | ||
| unwrapped, | ||
| "doubleValue", | ||
| DoubleType)) | ||
| case t if t <:< definitions.FloatTpe => | ||
| val unwrapped = UnwrapOption(ObjectType(classOf[java.lang.Float]), inputObject) | ||
| expressions.If( | ||
| IsNull(unwrapped), | ||
| expressions.Literal.create(null, silentSchemaFor(optType).dataType), | ||
| Invoke( | ||
| unwrapped, | ||
| "floatValue", | ||
| FloatType)) | ||
| case t if t <:< definitions.ShortTpe => | ||
| val unwrapped = UnwrapOption(ObjectType(classOf[java.lang.Short]), inputObject) | ||
| expressions.If( | ||
| IsNull(unwrapped), | ||
| expressions.Literal.create(null, silentSchemaFor(optType).dataType), | ||
| Invoke( | ||
| unwrapped, | ||
| "shortValue", | ||
| ShortType)) | ||
| case t if t <:< definitions.ByteTpe => | ||
| val unwrapped = UnwrapOption(ObjectType(classOf[java.lang.Byte]), inputObject) | ||
| expressions.If( | ||
| IsNull(unwrapped), | ||
| expressions.Literal.create(null, silentSchemaFor(optType).dataType), | ||
| Invoke( | ||
| unwrapped, | ||
| "byteValue", | ||
| ByteType)) | ||
| case t if t <:< definitions.BooleanTpe => | ||
| val unwrapped = UnwrapOption(ObjectType(classOf[java.lang.Boolean]), inputObject) | ||
| expressions.If( | ||
| IsNull(unwrapped), | ||
| expressions.Literal.create(null, silentSchemaFor(optType).dataType), | ||
| Invoke( | ||
| unwrapped, | ||
| "booleanValue", | ||
| BooleanType)) | ||
|
|
||
| // For non-primitives, we can just extract the object from the Option and then recurse. | ||
| case other => | ||
|
|
@@ -589,6 +636,17 @@ object ScalaReflection extends ScalaReflection { | |
| case t if t <:< localTypeOf[java.lang.Boolean] => | ||
| Invoke(inputObject, "booleanValue", BooleanType) | ||
|
|
||
| case t if Utils.classIsLoadable(className) && | ||
| Utils.classForName(className).isAnnotationPresent(classOf[SQLUserDefinedType]) => | ||
| val udt = Utils.classForName(className) | ||
| .getAnnotation(classOf[SQLUserDefinedType]).udt().newInstance() | ||
| val obj = NewInstance( | ||
| udt.userClass.getAnnotation(classOf[SQLUserDefinedType]).udt(), | ||
| Nil, | ||
| false, | ||
| dataType = ObjectType(udt.userClass.getAnnotation(classOf[SQLUserDefinedType]).udt())) | ||
| Invoke(obj, "serialize", udt.sqlType, inputObject :: Nil) | ||
|
|
||
| case other => | ||
| throw new UnsupportedOperationException( | ||
| s"No Encoder found for $tpe\n" + walkedTypePath.mkString("\n")) | ||
|
|
||
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
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
Oops, something went wrong.
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.
Normally
Decimalshould only be used inside spark SQL as the internal representation of decimal type, and we don't need to catch it here. Do we break it in tests?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.
Yes.
constructorForwill calldataTypeForto determine if a type isObjectTypeor not. If there is not case forDecimal, it will be recognized asObjectTypeand causes bug.