Skip to content

Commit 8751fdc

Browse files
authored
Client 2 1 0 (#94)
* add native hbase test (#90) * merge native hbase test
1 parent 29c93a2 commit 8751fdc

21 files changed

+838
-706
lines changed
Binary file not shown.

pom.xml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,17 @@
105105
</exclusion>
106106
</exclusions>
107107
</dependency>
108+
<!-- <dependency>-->
109+
<!-- <groupId>com.oceanbase</groupId>-->
110+
<!-- <artifactId>obkv-table-client</artifactId>-->
111+
<!-- <version>${table.client.version}</version>-->
112+
<!-- </dependency>-->
108113
<dependency>
109114
<groupId>com.oceanbase</groupId>
110115
<artifactId>obkv-table-client</artifactId>
111-
<version>${table.client.version}</version>
116+
<version>1.2.114-SNAPSHOT</version>
117+
<scope>system</scope>
118+
<systemPath>${project.basedir}/obkv-table-client-1.2.114-SNAPSHOT-jar-with-dependencies.jar</systemPath>
112119
</dependency>
113120
<dependency>
114121
<groupId>org.apache.hbase</groupId>

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

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1445,25 +1445,30 @@ private ObTableQuery buildObTableQuery(ObHTableFilter filter, byte[] start,
14451445
boolean includeStart, byte[] stop, boolean includeStop,
14461446
boolean isReversed) {
14471447
ObNewRange obNewRange = new ObNewRange();
1448-
1448+
ObBorderFlag obBorderFlag = new ObBorderFlag();
14491449
if (Arrays.equals(start, HConstants.EMPTY_BYTE_ARRAY)) {
14501450
obNewRange.setStartKey(ObRowKey.getInstance(ObObj.getMin(), ObObj.getMin(),
14511451
ObObj.getMin()));
14521452
} else if (includeStart) {
14531453
obNewRange.setStartKey(ObRowKey.getInstance(start, ObObj.getMin(), ObObj.getMin()));
1454+
obBorderFlag.setInclusiveStart();
14541455
} else {
14551456
obNewRange.setStartKey(ObRowKey.getInstance(start, ObObj.getMax(), ObObj.getMax()));
1457+
obBorderFlag.unsetInclusiveStart();
14561458
}
14571459

14581460
if (Arrays.equals(stop, HConstants.EMPTY_BYTE_ARRAY)) {
14591461
obNewRange.setEndKey(ObRowKey.getInstance(ObObj.getMax(), ObObj.getMax(),
14601462
ObObj.getMax()));
14611463
} else if (includeStop) {
14621464
obNewRange.setEndKey(ObRowKey.getInstance(stop, ObObj.getMax(), ObObj.getMax()));
1465+
obBorderFlag.setInclusiveEnd();
14631466
} else {
14641467
obNewRange.setEndKey(ObRowKey.getInstance(stop, ObObj.getMin(), ObObj.getMin()));
1468+
obBorderFlag.unsetInclusiveEnd();
14651469
}
14661470
ObTableQuery obTableQuery = new ObTableQuery();
1471+
obNewRange.setBorderFlag(obBorderFlag);
14671472
if (isReversed) {
14681473
obTableQuery.setScanOrder(ObScanOrder.Reverse);
14691474
}

src/main/java/com/alipay/oceanbase/hbase/result/ClientStreamScanner.java

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,6 @@ public class ClientStreamScanner extends AbstractClientScanner {
5050

5151
private boolean closed = false;
5252

53-
private boolean streamNext = true;
54-
5553
private boolean isTableGroup = false;
5654

5755
public ClientStreamScanner(ObTableClientQueryStreamResult streamResult, String tableName,
@@ -145,7 +143,12 @@ public Result[] next(int nbRows) throws IOException {
145143

146144
@Override
147145
public boolean renewLease() {
148-
throw new FeatureNotSupportedException("not supported yet'");
146+
try {
147+
streamResult.renewLease();
148+
return true;
149+
} catch (Exception e) {
150+
return false;
151+
}
149152
}
150153

151154
private void checkStatus() throws IllegalStateException {

0 commit comments

Comments
 (0)