Skip to content

DependentColumnFilter, singleColumnValueExcludeFilter and single cf setColumnFamilyTimeRange development #82

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 8 commits into from
Oct 22, 2024
Merged

DependentColumnFilter, singleColumnValueExcludeFilter and single cf setColumnFamilyTimeRange development #82

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 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
c53c3e7
report error when setColumnFamilyTimeRange for a column family that i…
JackShi148 Oct 22, 2024
4eb3745
correct name
JackShi148 Oct 22, 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
28 changes: 28 additions & 0 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 @@ -585,6 +585,9 @@ public Result call() throws IOException {
// In a Get operation where the family map is greater than 1 or equal to 0,
// we handle this by appending the column family to the qualifier on the client side.
// The server can then use this information to filter the appropriate column families and qualifiers.
if (!get.getColumnFamilyTimeRange().isEmpty()) {
throw new FeatureNotSupportedException("setColumnFamilyTimeRange is only supported in single column family for now");
}
NavigableSet<byte[]> columnFilters = new TreeSet<>(Bytes.BYTES_COMPARATOR);
processColumnFilters(columnFilters, get.getFamilyMap());
obTableQuery = buildObTableQuery(get, columnFilters);
Expand All @@ -598,6 +601,17 @@ public Result call() throws IOException {
for (Map.Entry<byte[], NavigableSet<byte[]>> entry : get.getFamilyMap()
.entrySet()) {
family = entry.getKey();
if (!get.getColumnFamilyTimeRange().isEmpty()) {
Map<byte[], TimeRange> colFamTimeRangeMap = get.getColumnFamilyTimeRange();
if (colFamTimeRangeMap.size() > 1) {
throw new FeatureNotSupportedException("setColumnFamilyTimeRange is only supported in single column family for now");
} else if (colFamTimeRangeMap.get(family) == null) {
throw new IllegalArgumentException("Get family is not matched in ColumnFamilyTimeRange");
} else {
TimeRange tr = colFamTimeRangeMap.get(family);
get.setTimeRange(tr.getMin(), tr.getMax());
}
}
obTableQuery = buildObTableQuery(get, entry.getValue());
request = buildObTableQueryAsyncRequest(obTableQuery,
getTargetTableName(tableNameString, Bytes.toString(family),
Expand Down Expand Up @@ -668,6 +682,9 @@ public ResultScanner call() throws IOException {
// In a Scan operation where the family map is greater than 1 or equal to 0,
// we handle this by appending the column family to the qualifier on the client side.
// The server can then use this information to filter the appropriate column families and qualifiers.
if (!scan.getColumnFamilyTimeRange().isEmpty()) {
throw new FeatureNotSupportedException("setColumnFamilyTimeRange is only supported in single column family for now");
}
NavigableSet<byte[]> columnFilters = new TreeSet<>(Bytes.BYTES_COMPARATOR);
processColumnFilters(columnFilters, scan.getFamilyMap());
filter = buildObHTableFilter(scan.getFilter(), scan.getTimeRange(),
Expand All @@ -684,6 +701,17 @@ public ResultScanner call() throws IOException {
for (Map.Entry<byte[], NavigableSet<byte[]>> entry : scan.getFamilyMap()
.entrySet()) {
family = entry.getKey();
if (!scan.getColumnFamilyTimeRange().isEmpty()) {
Map<byte[], TimeRange> colFamTimeRangeMap = scan.getColumnFamilyTimeRange();
if (colFamTimeRangeMap.size() > 1) {
throw new FeatureNotSupportedException("setColumnFamilyTimeRange is only supported in single column family for now");
} else if (colFamTimeRangeMap.get(family) == null) {
throw new IllegalArgumentException("Scan family is not matched in ColumnFamilyTimeRange");
} else {
TimeRange tr = colFamTimeRangeMap.get(family);
scan.setTimeRange(tr.getMin(), tr.getMax());
}
}
filter = buildObHTableFilter(scan.getFilter(), scan.getTimeRange(),
scan.getMaxVersions(), entry.getValue());
obTableQuery = buildObTableQuery(filter, scan);
Expand Down
51 changes: 51 additions & 0 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 @@ -41,9 +41,13 @@ private static void toParseableByteArray(ByteArrayOutputStream byteStream, Filte
throws IOException {
if (filter == null) {
throw new IllegalArgumentException("Filter is null");
} else if (filter instanceof DependentColumnFilter) {
toParseableByteArray(byteStream, (DependentColumnFilter) filter);
} else if (filter instanceof CompareFilter) {
// RowFilter, ValueFilter, QualifierFilter
toParseableByteArray(byteStream, (CompareFilter) filter);
} else if (filter instanceof SingleColumnValueExcludeFilter) {
toParseableByteArray(byteStream, (SingleColumnValueExcludeFilter) filter);
} else if (filter instanceof SingleColumnValueFilter) {
toParseableByteArray(byteStream, (SingleColumnValueFilter) filter);
} else if (filter instanceof PageFilter) {
Expand Down Expand Up @@ -160,6 +164,25 @@ private static void toParseableByteArray(ByteArrayOutputStream byteStream,
byteStream.write(')');
}

// SingleColumnValueExcludeFilter('cf1','col1',=,'binary:123',true,true)
private static void toParseableByteArray(ByteArrayOutputStream byteStream,
SingleColumnValueExcludeFilter filter) throws IOException {
byteStream.write(filter.getClass().getSimpleName().getBytes());
byteStream.write("('".getBytes());
writeBytesWithEscape(byteStream, filter.getFamily());
byteStream.write("','".getBytes());
writeBytesWithEscape(byteStream, filter.getQualifier());
byteStream.write("',".getBytes());
byteStream.write(toParseableByteArray(filter.getOperator()));
byteStream.write(',');
toParseableByteArray(byteStream, filter.getComparator());
byteStream.write(',');
byteStream.write(Boolean.toString(filter.getFilterIfMissing()).getBytes());
byteStream.write(',');
byteStream.write(Boolean.toString(filter.getLatestVersionOnly()).getBytes());
byteStream.write(')');
}

// PageFilter(100);
private static void toParseableByteArray(ByteArrayOutputStream byteStream, PageFilter filter)
throws IOException {
Expand All @@ -178,6 +201,34 @@ private static void toParseableByteArray(ByteArrayOutputStream byteStream,
byteStream.write(')');
}

private static void toParseableByteArray(ByteArrayOutputStream byteStream,
DependentColumnFilter filter) throws IOException {
// DependentColumnFilter '(' family ',' qualifier ',' BOOL_VALUE ')'
if (filter.getComparator() == null) {
byteStream.write(filter.getClass().getSimpleName().getBytes());
byteStream.write("('".getBytes());
writeBytesWithEscape(byteStream, filter.getFamily());
byteStream.write("','".getBytes());
writeBytesWithEscape(byteStream, filter.getQualifier());
byteStream.write("',".getBytes());
byteStream.write(Boolean.toString(filter.getDropDependentColumn()).getBytes());
byteStream.write(')');
} else { // DependentColumnFilter '(' family ',' qualifier ',' BOOL_VALUE ',' compare_op ',' comparator ')'
byteStream.write(filter.getClass().getSimpleName().getBytes());
byteStream.write("('".getBytes());
writeBytesWithEscape(byteStream, filter.getFamily());
byteStream.write("','".getBytes());
writeBytesWithEscape(byteStream, filter.getQualifier());
byteStream.write("',".getBytes());
byteStream.write(Boolean.toString(filter.getDropDependentColumn()).getBytes());
byteStream.write(',');
byteStream.write(toParseableByteArray(filter.getOperator()));
byteStream.write(',');
toParseableByteArray(byteStream, filter.getComparator());
byteStream.write(')');
}
}

private static void toParseableByteArray(ByteArrayOutputStream byteStream,
ColumnPaginationFilter filter) throws IOException {
byteStream.write(filter.getClass().getSimpleName().getBytes());
Expand Down
Loading