cloud-fan commented on code in PR #45549:
URL: https://github.com/apache/spark/pull/45549#discussion_r1537809292
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala:
##########
@@ -722,12 +702,76 @@ class CodegenContext extends Logging {
}
"""
s"${addNewFunction(compareFunc, funcCode)}($c1, $c2)"
+ case map: MapType =>
+ val compareFunc = freshName("compareMapData")
+ val funcCode = genCompMapData(map.keyType, map.valueType, compareFunc)
+ s"${addNewFunction(compareFunc, funcCode)}($c1, $c2)"
case other if other.isInstanceOf[AtomicType] => s"$c1.compare($c2)"
case udt: UserDefinedType[_] => genComp(udt.sqlType, c1, c2)
case _ =>
throw
QueryExecutionErrors.cannotGenerateCodeForIncomparableTypeError("compare",
dataType)
}
+ private def genCompMapData(
+ keyType: DataType,
+ valueType: DataType,
+ compareFunc : String): String = {
+ val keyArrayA = freshName("keyArrayA")
+ val keyArrayB = freshName("keyArrayB")
+ val valueArrayA = freshName("valueArrayA")
+ val valueArrayB = freshName("valueArrayB")
+ val minLength = freshName("minLength")
+ s"""
+ |public int $compareFunc(MapData a, MapData b) {
+ | int lengthA = a.numElements();
+ | int lengthB = b.numElements();
+ | ArrayData $keyArrayA = a.keyArray();
+ | ArrayData $valueArrayA = a.valueArray();
+ | ArrayData $keyArrayB = b.keyArray();
+ | ArrayData $valueArrayB = b.valueArray();
Review Comment:
do the above 4 variables need to use `freshName`? They are just local
variables in this method.
##########
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/expressions/codegen/CodeGenerator.scala:
##########
@@ -722,12 +702,76 @@ class CodegenContext extends Logging {
}
"""
s"${addNewFunction(compareFunc, funcCode)}($c1, $c2)"
+ case map: MapType =>
+ val compareFunc = freshName("compareMapData")
+ val funcCode = genCompMapData(map.keyType, map.valueType, compareFunc)
+ s"${addNewFunction(compareFunc, funcCode)}($c1, $c2)"
case other if other.isInstanceOf[AtomicType] => s"$c1.compare($c2)"
case udt: UserDefinedType[_] => genComp(udt.sqlType, c1, c2)
case _ =>
throw
QueryExecutionErrors.cannotGenerateCodeForIncomparableTypeError("compare",
dataType)
}
+ private def genCompMapData(
+ keyType: DataType,
+ valueType: DataType,
+ compareFunc : String): String = {
+ val keyArrayA = freshName("keyArrayA")
+ val keyArrayB = freshName("keyArrayB")
+ val valueArrayA = freshName("valueArrayA")
+ val valueArrayB = freshName("valueArrayB")
+ val minLength = freshName("minLength")
+ s"""
+ |public int $compareFunc(MapData a, MapData b) {
+ | int lengthA = a.numElements();
+ | int lengthB = b.numElements();
+ | ArrayData $keyArrayA = a.keyArray();
+ | ArrayData $valueArrayA = a.valueArray();
+ | ArrayData $keyArrayB = b.keyArray();
+ | ArrayData $valueArrayB = b.valueArray();
+ | int $minLength = (lengthA > lengthB) ? lengthB : lengthA;
Review Comment:
ditto
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
