Skip to content

HBASE-26863 fix incorrect rowkey pushdown #95

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 4, 2023
Merged

HBASE-26863 fix incorrect rowkey pushdown #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7008126
HBASE-26863 fix incorrect rowkey pushdown
morokosi Mar 18, 2022
fd5f153
fix style
morokosi Aug 3, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 6 additions & 10 deletions spark/hbase-spark/src/main/scala/org/apache/hadoop/hbase/spark/DefaultSource.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -593,11 +593,13 @@ class ScanRange(var upperBound:Array[Byte], var isUpperBoundEqualTo:Boolean,

isLowerBoundEqualTo = if (lowerBoundCompare == 0)
isLowerBoundEqualTo && other.isLowerBoundEqualTo
else if (lowerBoundCompare < 0) other.isLowerBoundEqualTo
else isLowerBoundEqualTo

isUpperBoundEqualTo = if (upperBoundCompare == 0)
isUpperBoundEqualTo && other.isUpperBoundEqualTo
else isUpperBoundEqualTo
else if (upperBoundCompare < 0) isUpperBoundEqualTo
else other.isUpperBoundEqualTo
}

/**
Expand Down Expand Up @@ -643,7 +645,6 @@ class ScanRange(var upperBound:Array[Byte], var isUpperBoundEqualTo:Boolean,
* @return True is overlap false is not overlap
*/
def getOverLapScanRange(other:ScanRange): ScanRange = {

var leftRange:ScanRange = null
var rightRange:ScanRange = null

Expand All @@ -659,14 +660,9 @@ class ScanRange(var upperBound:Array[Byte], var isUpperBoundEqualTo:Boolean,
}

if (hasOverlap(leftRange, rightRange)) {
// Find the upper bound and lower bound
if (compareRange(leftRange.upperBound, rightRange.upperBound) >= 0) {
new ScanRange(rightRange.upperBound, rightRange.isUpperBoundEqualTo,
rightRange.lowerBound, rightRange.isLowerBoundEqualTo)
} else {
new ScanRange(leftRange.upperBound, leftRange.isUpperBoundEqualTo,
rightRange.lowerBound, rightRange.isLowerBoundEqualTo)
}
val result = new ScanRange(upperBound, isUpperBoundEqualTo, lowerBound, isLowerBoundEqualTo)
result.mergeIntersect(other)
result
} else {
null
}
Expand Down
20 changes: 20 additions & 0 deletions spark/hbase-spark/src/test/scala/org/apache/hadoop/hbase/spark/DefaultSourceSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -611,6 +611,26 @@ BeforeAndAfterEach with BeforeAndAfterAll with Logging {
assert(scanRange1.isUpperBoundEqualTo)
}

test("Test Rowkey And with complex logic (HBASE-26863)") {
val results = sqlContext.sql("SELECT KEY_FIELD, B_FIELD, A_FIELD FROM hbaseTable1 " +
"WHERE " +
"( KEY_FIELD >= 'get1' AND KEY_FIELD <= 'get3' ) AND (A_FIELD = 'foo1' OR B_FIELD = '8')").take(10)
val executionRules = DefaultSourceStaticUtils.lastFiveExecutionRules.poll()
assert(results.length == 2)

assert(executionRules.dynamicLogicExpression.toExpressionString
== "( ( ( KEY_FIELD isNotNull AND KEY_FIELD >= 0 ) AND KEY_FIELD <= 1 ) AND ( A_FIELD == 2 OR B_FIELD == 3 ) )")

assert(executionRules.rowKeyFilter.points.size == 0)
assert(executionRules.rowKeyFilter.ranges.size == 1)

val scanRange1 = executionRules.rowKeyFilter.ranges.get(0).get
assert(Bytes.equals(scanRange1.lowerBound,Bytes.toBytes("get1")))
assert(Bytes.equals(scanRange1.upperBound, Bytes.toBytes("get3")))
assert(scanRange1.isLowerBoundEqualTo)
assert(scanRange1.isUpperBoundEqualTo)
}

test("Test table that doesn't exist") {
val catalog = s"""{
|"table":{"namespace":"default", "name":"t1NotThere"},
Expand Down