Skip to content

fix [multi cf] get/put/delete random binary column, qualifier unexpec… #213

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
shenyunlong merged 2 commits into from
May 15, 2025
Merged

fix [multi cf] get/put/delete random binary column, qualifier unexpec… #213

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
fcd9b33
fix [multi cf] get/put/delete random binary column, qualifier unexpec…
Zhou-jw Apr 30, 2025
9c12314
add constructing new_kv if-clause
Zhou-jw Apr 30, 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
29 changes: 22 additions & 7 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 @@ -908,15 +908,20 @@ private String getTargetTableName(String tableNameString) {
private void processColumnFilters(NavigableSet<byte[]> columnFilters,
Map<byte[], NavigableSet<byte[]>> familyMap) {
for (Map.Entry<byte[], NavigableSet<byte[]>> entry : familyMap.entrySet()) {
byte[] family = entry.getKey();
if (entry.getValue() != null) {
for (byte[] columnName : entry.getValue()) {
String columnNameStr = Bytes.toString(columnName);
columnNameStr = Bytes.toString(entry.getKey()) + "." + columnNameStr;
columnFilters.add(columnNameStr.getBytes());
byte[] newQualifier = new byte[family.length + 1/* length of "." */ + columnName.length];
System.arraycopy(family, 0, newQualifier, 0, family.length);
newQualifier[family.length] = 0x2E; // 0x2E in utf-8 is "."
System.arraycopy(columnName, 0, newQualifier, family.length + 1, columnName.length);
columnFilters.add(newQualifier);
}
} else {
String columnNameStr = Bytes.toString(entry.getKey()) + ".";
columnFilters.add(columnNameStr.getBytes());
byte[] newQualifier = new byte[family.length + 1/* length of "."*/];
System.arraycopy(family, 0, newQualifier, 0, family.length);
newQualifier[family.length] = 0x2E; // 0x2E in utf-8 is "."
columnFilters.add(newQualifier);
}
}
}
Expand Down Expand Up @@ -1874,7 +1879,7 @@ private ObHTableFilter buildObHTableFilter(byte[] filterString, TimeRange timeRa
if (columnQualifier == null) {
obHTableFilter.addSelectColumnQualifier(new byte[0]);
} else {
obHTableFilter.addSelectColumnQualifier(columnQualifier);
obHTableFilter.addSelectColumnQualifier(columnQualifier);
}
}
}
Expand Down Expand Up @@ -2012,6 +2017,15 @@ private QueryAndMutate buildDeleteQueryAndMutate(KeyValue kv,
KeyValue.Type kvType = KeyValue.Type.codeToType(kv.getType().getCode());
com.alipay.oceanbase.rpc.mutation.Mutation tableMutation = buildMutation(kv, operationType,
isTableGroup, family, TTL);
if(isTableGroup) {
// construct new_kv otherwise filter will fail to match targeted columns
byte[] oldQualifier = CellUtil.cloneQualifier(kv);
byte[] newQualifier = new byte[family.length + 1/* length of "." */ + oldQualifier.length];
System.arraycopy(family, 0, newQualifier, 0, family.length);
newQualifier[family.length] = 0x2E; // 0x2E in utf-8 is "."
System.arraycopy(oldQualifier, 0, newQualifier, family.length + 1, oldQualifier.length);
kv = modifyQualifier(kv, newQualifier);
}
ObNewRange range = new ObNewRange();
ObTableQuery tableQuery = new ObTableQuery();
tableQuery.setObKVParams(buildOBKVParams((Scan) null));
Expand Down Expand Up @@ -2270,8 +2284,9 @@ private BatchOperation buildBatchOperation(String tableName, List<? extends Row>
List<Cell> keyValueList = entry.getValue();
for (Cell kv : keyValueList) {
singleOpResultNum++;

if (disExec) {
batch.addOperation(buildDeleteQueryAndMutate((KeyValue) kv, DEL, false, family, Long.MAX_VALUE));
batch.addOperation(buildDeleteQueryAndMutate((KeyValue) kv, DEL, isTableGroup, family, Long.MAX_VALUE));
} else {
batch.addOperation(buildMutation(kv, DEL, isTableGroup, family, Long.MAX_VALUE));
}
Expand Down