Skip to content

Commit 2eb4ba3

Browse files
committed
add native hbase test
1 parent 3411491 commit 2eb4ba3

18 files changed

+854
-733
lines changed

src/main/java/com/alipay/oceanbase/hbase/OHTable.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1558,25 +1558,30 @@ private ObTableQuery buildObTableQuery(ObHTableFilter filter, byte[] start,
15581558
boolean includeStart, byte[] stop, boolean includeStop,
15591559
boolean isReversed) {
15601560
ObNewRange obNewRange = new ObNewRange();
1561-
1561+
ObBorderFlag obBorderFlag = new ObBorderFlag();
15621562
if (Arrays.equals(start, HConstants.EMPTY_BYTE_ARRAY)) {
15631563
obNewRange.setStartKey(ObRowKey.getInstance(ObObj.getMin(), ObObj.getMin(),
15641564
ObObj.getMin()));
15651565
} else if (includeStart) {
15661566
obNewRange.setStartKey(ObRowKey.getInstance(start, ObObj.getMin(), ObObj.getMin()));
1567+
obBorderFlag.setInclusiveStart();
15671568
} else {
15681569
obNewRange.setStartKey(ObRowKey.getInstance(start, ObObj.getMax(), ObObj.getMax()));
1570+
obBorderFlag.unsetInclusiveStart();
15691571
}
15701572

15711573
if (Arrays.equals(stop, HConstants.EMPTY_BYTE_ARRAY)) {
15721574
obNewRange.setEndKey(ObRowKey.getInstance(ObObj.getMax(), ObObj.getMax(),
15731575
ObObj.getMax()));
15741576
} else if (includeStop) {
15751577
obNewRange.setEndKey(ObRowKey.getInstance(stop, ObObj.getMax(), ObObj.getMax()));
1578+
obBorderFlag.setInclusiveEnd();
15761579
} else {
15771580
obNewRange.setEndKey(ObRowKey.getInstance(stop, ObObj.getMin(), ObObj.getMin()));
1581+
obBorderFlag.unsetInclusiveEnd();
15781582
}
15791583
ObTableQuery obTableQuery = new ObTableQuery();
1584+
obNewRange.setBorderFlag(obBorderFlag);
15801585
if (isReversed) {
15811586
obTableQuery.setScanOrder(ObScanOrder.Reverse);
15821587
}
@@ -1601,8 +1606,8 @@ private ObTableQuery buildObTableQuery(ObHTableFilter filter, final Scan scan) {
16011606
obTableQuery = buildObTableQuery(filter, scan.getStopRow(), false, scan.getStartRow(),
16021607
true, true);
16031608
} else {
1604-
obTableQuery = buildObTableQuery(filter, scan.getStartRow(), true, scan.getStopRow(),
1605-
false, false);
1609+
obTableQuery = buildObTableQuery(filter, scan.getStartRow(), false, scan.getStopRow(),
1610+
true, false);
16061611
}
16071612
if (scan.getBatch() > 0) {
16081613
obTableQuery.setBatchSize(scan.getBatch());

0 commit comments

Comments
 (0)