Skip to content

Fix multi-cf Get checkExistenceOnly #156

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
JackShi148 merged 2 commits into from
Feb 26, 2025
Merged

Fix multi-cf Get checkExistenceOnly #156

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
ef2f4bc
fix multi-cf checkExistenceOnly
JackShi148 Feb 17, 2025
5586417
refactor code
JackShi148 Feb 18, 2025
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
10 changes: 5 additions & 5 deletions src/main/java/com/alipay/oceanbase/hbase/OHTable.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -809,16 +809,16 @@ public static int compareByteArray(byte[] bt1, byte[] bt2) {

private void getMaxRowFromResult(AbstractQueryStreamResult clientQueryStreamResult,
List<KeyValue> keyValueList, boolean isTableGroup,
byte[] family) throws Exception {
byte[] family, boolean checkExistenceOnly) throws Exception {
byte[][] familyAndQualifier = new byte[2][];
KeyValue kv = null;
while (clientQueryStreamResult.next()) {
List<ObObj> row = clientQueryStreamResult.getRow();
if (row.isEmpty()) {
if (checkExistenceOnly) {
// Currently, checkExistOnly is set, and if the row exists, it returns an empty row.
keyValueList.add(new KeyValue());
return;
} else {
List<ObObj> row = clientQueryStreamResult.getRow();
if (kv == null
|| compareByteArray(kv.getRow(), (byte[]) row.get(0).getValue()) <= 0) {
if (kv != null
Expand Down Expand Up @@ -904,7 +904,7 @@ public Result call() throws IOException {

ObTableClientQueryAsyncStreamResult clientQueryStreamResult = (ObTableClientQueryAsyncStreamResult) obTableClient
.execute(request);
getMaxRowFromResult(clientQueryStreamResult, keyValueList, true, family);
getMaxRowFromResult(clientQueryStreamResult, keyValueList, true, family, get.isCheckExistenceOnly());
} else {
for (Map.Entry<byte[], NavigableSet<byte[]>> entry : get.getFamilyMap()
.entrySet()) {
Expand All @@ -927,7 +927,7 @@ public Result call() throws IOException {
ObTableClientQueryStreamResult clientQueryStreamResult = (ObTableClientQueryStreamResult) obTableClient
.execute(request);
getMaxRowFromResult(clientQueryStreamResult, keyValueList, false,
family);
family, get.isCheckExistenceOnly());
}
}
} catch (Exception e) {
Expand Down
32 changes: 32 additions & 0 deletions src/test/java/com/alipay/oceanbase/hbase/HTableMultiCFTestBase.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1522,6 +1522,38 @@ public void testMultiColumnFamilyGet() throws Exception {
}
}
assertEquals(5, keyValues.length);

// test multi-cf get checkExistenceOnly
Delete delKey1 = new Delete(toBytes("Key1"));
multiCfHTable.delete(delKey1);
get = new Get(toBytes("Key1"));
Result allKey1Result = multiCfHTable.get(get);
Assert.assertEquals(0, allKey1Result.size());

boolean exist = multiCfHTable.exists(get);
assertFalse(exist);
Put put = new Put(toBytes("Key1"));
put.add(family1, family1_column1, family1_value);
multiCfHTable.put(put);
exist = multiCfHTable.exists(get);
assertTrue(exist);

// test existsAll
multiCfHTable.delete(delKey1);
allKey1Result = multiCfHTable.get(get);
Assert.assertEquals(0, allKey1Result.size());

get = new Get(toBytes("Key0"));
get2 = new Get(toBytes("Key1"));
get3 = new Get(toBytes("Key2"));
ArrayList<Get> gets = new ArrayList<>();
gets.add(get);
gets.add(get2);
gets.add(get3);
boolean[] exists = multiCfHTable.existsAll(gets);
Assert.assertTrue(exists[0]);
Assert.assertFalse(exists[1]);
Assert.assertTrue(exists[2]);
}

@Test
Expand Down