Github user ron8hu commented on a diff in the pull request:
https://github.com/apache/spark/pull/17065#discussion_r103090517
--- Diff:
sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/plans/logical/statsEstimation/FilterEstimation.scala
---
@@ -361,57 +343,52 @@ case class FilterEstimation(plan: Filter,
catalystConf: CatalystConf) extends Lo
*/
def evaluateInSet(
- attrRef: AttributeReference,
+ attr: Attribute,
hSet: Set[Any],
- update: Boolean)
- : Option[Double] = {
- if (!mutableColStats.contains(attrRef.exprId)) {
- logDebug("[CBO] No statistics for " + attrRef)
+ update: Boolean): Option[Double] = {
+ if (!colStatsMap.contains(attr)) {
+ logDebug("[CBO] No statistics for " + attr)
return None
}
- val aColStat = mutableColStats(attrRef.exprId)
- val ndv = aColStat.distinctCount
- val aType = attrRef.dataType
- var newNdv: Long = 0
+ val colStat = colStatsMap(attr)
+ val ndv = colStat.distinctCount
+ val dataType = attr.dataType
+ var newNdv = ndv
// use [min, max] to filter the original hSet
- aType match {
- case _: NumericType | DateType | TimestampType =>
- val statsRange =
- Range(aColStat.min, aColStat.max,
aType).asInstanceOf[NumericRange]
-
- // To facilitate finding the min and max values in hSet, we map
hSet values to BigDecimal.
- // Using hSetBigdec, we can find the min and max values quickly in
the ordered hSetBigdec.
- val hSetBigdec = hSet.map(e => BigDecimal(e.toString))
- val validQuerySet = hSetBigdec.filter(e => e >= statsRange.min &&
e <= statsRange.max)
- // We use hSetBigdecToAnyMap to help us find the original hSet
value.
- val hSetBigdecToAnyMap: Map[BigDecimal, Any] =
- hSet.map(e => BigDecimal(e.toString) -> e).toMap
+ dataType match {
+ case _: NumericType | BooleanType | DateType | TimestampType =>
+ val statsRange = Range(colStat.min, colStat.max,
dataType).asInstanceOf[NumericRange]
+ val validQuerySet = hSet.filter { v =>
+ v != null && statsRange.contains(Literal(v, dataType))
--- End diff --
nit: for better readability: (v != null) && statsRange.contains(Literal(v,
dataType))
---
If your project is set up for it, you can reply to this email and have your
reply appear on GitHub as well. If your project does not have this feature
enabled and wishes so, or if the feature is enabled but not working, please
contact infrastructure at infrastruct...@apache.org or file a JIRA ticket
with INFRA.
---
---------------------------------------------------------------------
To unsubscribe, e-mail: reviews-unsubscr...@spark.apache.org
For additional commands, e-mail: reviews-h...@spark.apache.org
