@@ -1558,25 +1558,30 @@ private ObTableQuery buildObTableQuery(ObHTableFilter filter, byte[] start,
1558
1558
boolean includeStart , byte [] stop , boolean includeStop ,
1559
1559
boolean isReversed ) {
1560
1560
ObNewRange obNewRange = new ObNewRange ();
1561
-
1561
+ ObBorderFlag obBorderFlag = new ObBorderFlag ();
1562
1562
if (Arrays .equals (start , HConstants .EMPTY_BYTE_ARRAY )) {
1563
1563
obNewRange .setStartKey (ObRowKey .getInstance (ObObj .getMin (), ObObj .getMin (),
1564
1564
ObObj .getMin ()));
1565
1565
} else if (includeStart ) {
1566
1566
obNewRange .setStartKey (ObRowKey .getInstance (start , ObObj .getMin (), ObObj .getMin ()));
1567
+ obBorderFlag .setInclusiveStart ();
1567
1568
} else {
1568
1569
obNewRange .setStartKey (ObRowKey .getInstance (start , ObObj .getMax (), ObObj .getMax ()));
1570
+ obBorderFlag .unsetInclusiveStart ();
1569
1571
}
1570
1572
1571
1573
if (Arrays .equals (stop , HConstants .EMPTY_BYTE_ARRAY )) {
1572
1574
obNewRange .setEndKey (ObRowKey .getInstance (ObObj .getMax (), ObObj .getMax (),
1573
1575
ObObj .getMax ()));
1574
1576
} else if (includeStop ) {
1575
1577
obNewRange .setEndKey (ObRowKey .getInstance (stop , ObObj .getMax (), ObObj .getMax ()));
1578
+ obBorderFlag .setInclusiveEnd ();
1576
1579
} else {
1577
1580
obNewRange .setEndKey (ObRowKey .getInstance (stop , ObObj .getMin (), ObObj .getMin ()));
1581
+ obBorderFlag .unsetInclusiveEnd ();
1578
1582
}
1579
1583
ObTableQuery obTableQuery = new ObTableQuery ();
1584
+ obNewRange .setBorderFlag (obBorderFlag );
1580
1585
if (isReversed ) {
1581
1586
obTableQuery .setScanOrder (ObScanOrder .Reverse );
1582
1587
}
@@ -1601,8 +1606,8 @@ private ObTableQuery buildObTableQuery(ObHTableFilter filter, final Scan scan) {
1601
1606
obTableQuery = buildObTableQuery (filter , scan .getStopRow (), false , scan .getStartRow (),
1602
1607
true , true );
1603
1608
} 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 );
1606
1611
}
1607
1612
if (scan .getBatch () > 0 ) {
1608
1613
obTableQuery .setBatchSize (scan .getBatch ());
0 commit comments