Skip to content

Add DeleteFamilyVersion function and corresponding test cases #85

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 14 commits into from
Oct 23, 2024
Merged

Add DeleteFamilyVersion function and corresponding test cases #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
03c8e71
add DepentdentFilter and SingleColumnValueExcludeFilter
JackShi148 Oct 11, 2024
2aaf7c4
add singleColumnValueExcludeFilter and DependentColumnFilter; add tes…
JackShi148 Oct 16, 2024
fe21f09
merge into branch-1.3
JackShi148 Oct 17, 2024
78df6d8
add single cf timerange setting in Get
JackShi148 Oct 18, 2024
256fe9a
single cf setColumnFamilyTimeRange in Get and Scan
JackShi148 Oct 18, 2024
a5ec9f6
optimize code
JackShi148 Oct 18, 2024
3123df4
add DeleteFamilyVersion and test cases
JackShi148 Oct 22, 2024
3830246
Merge remote-tracking branch 'obkv/branch-1.3' into JackShi148/branch…
JackShi148 Oct 22, 2024
74b2b9f
merge into branch-1.3
JackShi148 Oct 22, 2024
e108fa9
add DeleteFamilyVersion; optimize test cases
JackShi148 Oct 22, 2024
00e9568
merge into branch-1.3
JackShi148 Oct 22, 2024
56e83f5
add DeleteFamilyVersion test case and pass
JackShi148 Oct 23, 2024
b51c991
format code
JackShi148 Oct 23, 2024
da0efac
delete useless self-defined table
JackShi148 Oct 23, 2024
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
17 changes: 11 additions & 6 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 @@ -1656,9 +1656,9 @@ private com.alipay.oceanbase.rpc.mutation.Mutation buildMutation(KeyValue kv,
switch (kvType) {
case Delete:
return com.alipay.oceanbase.rpc.mutation.Mutation.getInstance(DEL,
ROW_KEY_COLUMNS,
new Object[] { kv.getRow(), kv.getQualifier(), kv.getTimestamp() },
null, null);
ROW_KEY_COLUMNS,
new Object[] { kv.getRow(), kv.getQualifier(), kv.getTimestamp() },
null, null);
case Maximum:
return com.alipay.oceanbase.rpc.mutation.Mutation.getInstance(DEL,
ROW_KEY_COLUMNS,
Expand All @@ -1671,9 +1671,14 @@ private com.alipay.oceanbase.rpc.mutation.Mutation buildMutation(KeyValue kv,
null, null);
case DeleteFamily:
return com.alipay.oceanbase.rpc.mutation.Mutation.getInstance(DEL,
ROW_KEY_COLUMNS,
new Object[] { kv.getRow(), isTableGroup?kv.getQualifier():null, -kv.getTimestamp() },
null, null);
ROW_KEY_COLUMNS,
new Object[] { kv.getRow(), isTableGroup ? kv.getQualifier() : null, -kv.getTimestamp() },
null, null);
case DeleteFamilyVersion:
return com.alipay.oceanbase.rpc.mutation.Mutation.getInstance(DEL,
ROW_KEY_COLUMNS,
new Object[] { kv.getRow(), isTableGroup ? kv.getQualifier() : null, kv.getTimestamp() },
null, null);
default:
throw new IllegalArgumentException("illegal mutation type " + kvType);
}
Expand Down
19 changes: 12 additions & 7 deletions src/main/java/com/alipay/oceanbase/hbase/filter/HBaseFilterUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,8 @@ private static void toParseableByteArray(ByteArrayOutputStream byteStream,

// SingleColumnValueExcludeFilter('cf1','col1',=,'binary:123',true,true)
private static void toParseableByteArray(ByteArrayOutputStream byteStream,
SingleColumnValueExcludeFilter filter) throws IOException {
SingleColumnValueExcludeFilter filter)
throws IOException {
byteStream.write(filter.getClass().getSimpleName().getBytes());
byteStream.write("('".getBytes());
writeBytesWithEscape(byteStream, filter.getFamily());
Expand Down Expand Up @@ -329,12 +330,13 @@ private static void toParseableByteArray(ByteArrayOutputStream byteStream, Times
}

// MultiRowRangeFilter('a',true,'b',false,'c',true,'d',false);
private static void toParseableByteArray(ByteArrayOutputStream byteStream, MultiRowRangeFilter filter) throws IOException {
private static void toParseableByteArray(ByteArrayOutputStream byteStream,
MultiRowRangeFilter filter) throws IOException {
byteStream.write(filter.getClass().getSimpleName().getBytes());
byteStream.write('(');

List<MultiRowRangeFilter.RowRange> ranges = filter.getRowRanges();
for (int i = 0; i < ranges.size(); i ++) {
for (int i = 0; i < ranges.size(); i++) {
MultiRowRangeFilter.RowRange range = ranges.get(i);
byteStream.write("'".getBytes());
byteStream.write(range.getStartRow());
Expand All @@ -354,7 +356,8 @@ private static void toParseableByteArray(ByteArrayOutputStream byteStream, Multi
}

// InclusiveStopFilter('aaa');
private static void toParseableByteArray(ByteArrayOutputStream byteStream, InclusiveStopFilter filter) throws IOException {
private static void toParseableByteArray(ByteArrayOutputStream byteStream,
InclusiveStopFilter filter) throws IOException {
byteStream.write(filter.getClass().getSimpleName().getBytes());
byteStream.write('(');
byteStream.write('\'');
Expand All @@ -364,7 +367,8 @@ private static void toParseableByteArray(ByteArrayOutputStream byteStream, Inclu
}

// ColumnRangeFilter('a',true,'b',false);
private static void toParseableByteArray(ByteArrayOutputStream byteStream, ColumnRangeFilter filter) throws IOException {
private static void toParseableByteArray(ByteArrayOutputStream byteStream,
ColumnRangeFilter filter) throws IOException {
byteStream.write(filter.getClass().getSimpleName().getBytes());
byteStream.write('(');

Expand All @@ -382,12 +386,13 @@ private static void toParseableByteArray(ByteArrayOutputStream byteStream, Colum
}

// MultipleColumnPrefixFilter('a','b','d');
private static void toParseableByteArray(ByteArrayOutputStream byteStream, MultipleColumnPrefixFilter filter) throws IOException {
private static void toParseableByteArray(ByteArrayOutputStream byteStream,
MultipleColumnPrefixFilter filter) throws IOException {
byteStream.write(filter.getClass().getSimpleName().getBytes());
byteStream.write('(');

byte[][] ranges = filter.getPrefix();
for (int i = 0; i < ranges.length; i ++) {
for (int i = 0; i < ranges.length; i++) {
byte[] range = ranges[i];
byteStream.write("'".getBytes());
byteStream.write(range);
Expand Down
11 changes: 5 additions & 6 deletions src/main/java/com/alipay/oceanbase/hbase/util/BatchError.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,11 @@

public class BatchError {
private final List<Throwable> throwables = new ArrayList<Throwable>();
private final List<Row> actions = new ArrayList<Row>();
private final List<String> addresses = new ArrayList<String>();
private final List<Row> actions = new ArrayList<Row>();
private final List<String> addresses = new ArrayList<String>();

public synchronized void add(Throwable ex, Row row, ServerName serverName) {
if (row == null){
if (row == null) {
throw new IllegalArgumentException("row cannot be null. location=" + serverName);
}

Expand All @@ -27,9 +27,8 @@ public boolean hasErrors() {
}

public synchronized RetriesExhaustedWithDetailsException makeException() {
return new RetriesExhaustedWithDetailsException(
new ArrayList<Throwable>(throwables),
new ArrayList<Row>(actions), new ArrayList<String>(addresses));
return new RetriesExhaustedWithDetailsException(new ArrayList<Throwable>(throwables),
new ArrayList<Row>(actions), new ArrayList<String>(addresses));
}

public synchronized void clear() {
Expand Down
Loading