wchevreuil commented on code in PR #162: URL: https://github.com/apache/hbase-connectors/pull/162#discussion_r3969783606
########## spark4/hbase-spark4/src/main/scala/org/apache/hadoop/hbase/spark/datasources/ScanRange.scala: ########## @@ -0,0 +1,225 @@ +/* + * 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.hadoop.hbase.spark.datasources + +import org.apache.hadoop.hbase.util.Bytes +import org.apache.yetus.audience.InterfaceAudience +import scala.collection.mutable.ListBuffer + +/** + * This is a new class in the spark4 module. Wraps ScanRange and RowKeyFilter. + * + * Extracted from DefaultSource.scala in spark3 where it was an inner class. Handles merging scan ranges + * from row key predicates (union/intersect). Same logic, just in its own file now for clarity. + * + * @param upperBound + * @param isUpperBoundEqualTo + * @param lowerBound + * @param isLowerBoundEqualTo + */ + [email protected] +class ScanRange( + var upperBound: Array[Byte], + var isUpperBoundEqualTo: Boolean, + var lowerBound: Array[Byte], + var isLowerBoundEqualTo: Boolean) + extends Serializable { + + def mergeIntersect(other: ScanRange): Unit = { + val upperBoundCompare = compareRange(upperBound, other.upperBound) + val lowerBoundCompare = compareRange(lowerBound, other.lowerBound) + + upperBound = if (upperBoundCompare < 0) upperBound else other.upperBound + lowerBound = if (lowerBoundCompare > 0) lowerBound else other.lowerBound + + isLowerBoundEqualTo = + if (lowerBoundCompare == 0) + isLowerBoundEqualTo && other.isLowerBoundEqualTo + else if (lowerBoundCompare < 0) other.isLowerBoundEqualTo + else isLowerBoundEqualTo + + isUpperBoundEqualTo = + if (upperBoundCompare == 0) + isUpperBoundEqualTo && other.isUpperBoundEqualTo + else if (upperBoundCompare < 0) isUpperBoundEqualTo + else other.isUpperBoundEqualTo + } + + def mergeUnion(other: ScanRange): Unit = { + val upperBoundCompare = compareRange(upperBound, other.upperBound) + val lowerBoundCompare = compareRange(lowerBound, other.lowerBound) + + upperBound = if (upperBoundCompare > 0) upperBound else other.upperBound + lowerBound = if (lowerBoundCompare < 0) lowerBound else other.lowerBound + + isLowerBoundEqualTo = + if (lowerBoundCompare == 0) + isLowerBoundEqualTo || other.isLowerBoundEqualTo + else if (lowerBoundCompare < 0) isLowerBoundEqualTo + else other.isLowerBoundEqualTo + + isUpperBoundEqualTo = + if (upperBoundCompare == 0) + isUpperBoundEqualTo || other.isUpperBoundEqualTo + else if (upperBoundCompare < 0) other.isUpperBoundEqualTo + else isUpperBoundEqualTo + } + + def getOverLapScanRange(other: ScanRange): ScanRange = { + var leftRange: ScanRange = null + var rightRange: ScanRange = null + + if (compareRange(lowerBound, other.lowerBound) < 0 || + compareRange(upperBound, other.upperBound) < 0) { + leftRange = this + rightRange = other + } else { + leftRange = other + rightRange = this + } + + if (hasOverlap(leftRange, rightRange)) { + val result = new ScanRange(upperBound, isUpperBoundEqualTo, lowerBound, isLowerBoundEqualTo) + result.mergeIntersect(other) + result + } else { + null + } + } + + def hasOverlap(left: ScanRange, right: ScanRange): Boolean = { + compareRange(left.upperBound, right.lowerBound) >= 0 + } + + def compareRange(left: Array[Byte], right: Array[Byte]): Int = { + if (left == null && right == null) 0 + else if (left == null && right != null) 1 + else if (left != null && right == null) -1 + else Bytes.compareTo(left, right) + } + + def containsPoint(point: Array[Byte]): Boolean = { + val lowerCompare = compareRange(point, lowerBound) + val upperCompare = compareRange(point, upperBound) + + ((isLowerBoundEqualTo && lowerCompare >= 0) || + (!isLowerBoundEqualTo && lowerCompare > 0)) && + ((isUpperBoundEqualTo && upperCompare <= 0) || + (!isUpperBoundEqualTo && upperCompare < 0)) + } + + override def toString: String = { + "ScanRange:(upperBound:" + Bytes.toString(upperBound) + + ",isUpperBoundEqualTo:" + isUpperBoundEqualTo + ",lowerBound:" + + Bytes.toString(lowerBound) + ",isLowerBoundEqualTo:" + isLowerBoundEqualTo + ")" + } +} + [email protected] +class RowKeyFilter( + currentPoint: Array[Byte] = null, + currentRange: ScanRange = new ScanRange(null, true, new Array[Byte](0), true), + var points: ListBuffer[Array[Byte]] = new ListBuffer[Array[Byte]](), + var ranges: ListBuffer[ScanRange] = new ListBuffer[ScanRange]()) + extends Serializable { + + if (currentRange != null) ranges += currentRange + if (currentPoint != null) points += currentPoint + + def mergeUnion(other: RowKeyFilter): RowKeyFilter = { + other.points.foreach(p => points += p) + + other.ranges.foreach { otherR => + var doesOverLap = false + ranges.foreach { r => + if (r.getOverLapScanRange(otherR) != null) { + r.mergeUnion(otherR) + doesOverLap = true + } + } + if (!doesOverLap) ranges += otherR + } + this + } + + def mergeIntersect(other: RowKeyFilter): RowKeyFilter = { + val survivingPoints = new ListBuffer[Array[Byte]]() + val didntSurviveFirstPassPoints = new ListBuffer[Array[Byte]]() + if (points == null || points.isEmpty) { + other.points.foreach(otherP => didntSurviveFirstPassPoints += otherP) + } else { + points.foreach { p => + if (other.points.isEmpty) { + didntSurviveFirstPassPoints += p + } else { + other.points.foreach { otherP => + if (Bytes.equals(p, otherP)) { + survivingPoints += p + } else { + didntSurviveFirstPassPoints += p + } + } Review Comment: Fixing on next commit. -- 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]
