Skip to content

[fix] filter param encode with quote #111

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 1 commit into from
Nov 15, 2024
Merged

[fix] filter param encode with quote #111

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
18 changes: 9 additions & 9 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 @@ -295,11 +295,11 @@ private static void toParseableByteArray(ByteArrayOutputStream byteStream, Fuzzy
for (int i = 0; i < fuzzyKeysData.size(); i ++) {
Pair<byte[], byte[]> data = fuzzyKeysData.get(i);
byteStream.write("'".getBytes());
byteStream.write(data.getFirst());
writeBytesWithEscape(byteStream, data.getFirst());
byteStream.write("'".getBytes());
byteStream.write(',');
byteStream.write("'".getBytes());
byteStream.write(data.getSecond());
writeBytesWithEscape(byteStream, data.getSecond());
byteStream.write("'".getBytes());
if (i < fuzzyKeysData.size() - 1) {
byteStream.write(',');
Expand Down Expand Up @@ -339,13 +339,13 @@ private static void toParseableByteArray(ByteArrayOutputStream byteStream,
for (int i = 0; i < ranges.size(); i++) {
MultiRowRangeFilter.RowRange range = ranges.get(i);
byteStream.write("'".getBytes());
byteStream.write(range.getStartRow());
writeBytesWithEscape(byteStream, range.getStartRow());
byteStream.write("',".getBytes());
byteStream.write(Boolean.toString(range.isStartRowInclusive()).getBytes());
byteStream.write(',');

byteStream.write("'".getBytes());
byteStream.write(range.getStopRow());
writeBytesWithEscape(byteStream, range.getStopRow());
byteStream.write("',".getBytes());
byteStream.write(Boolean.toString(range.isStopRowInclusive()).getBytes());
if (i < ranges.size() - 1) {
Expand All @@ -361,7 +361,7 @@ private static void toParseableByteArray(ByteArrayOutputStream byteStream,
byteStream.write(filter.getClass().getSimpleName().getBytes());
byteStream.write('(');
byteStream.write('\'');
byteStream.write(filter.getStopRowKey());
writeBytesWithEscape(byteStream, filter.getStopRowKey());
byteStream.write('\'');
byteStream.write(')');
}
Expand All @@ -373,13 +373,13 @@ private static void toParseableByteArray(ByteArrayOutputStream byteStream,
byteStream.write('(');

byteStream.write("'".getBytes());
byteStream.write(filter.getMinColumn());
writeBytesWithEscape(byteStream, filter.getMinColumn());
byteStream.write("',".getBytes());
byteStream.write(Boolean.toString(filter.getMinColumnInclusive()).getBytes());
byteStream.write(',');

byteStream.write("'".getBytes());
byteStream.write(filter.getMaxColumn());
writeBytesWithEscape(byteStream, filter.getMaxColumn());
byteStream.write("',".getBytes());
byteStream.write(Boolean.toString(filter.getMaxColumnInclusive()).getBytes());
byteStream.write(')');
Expand All @@ -395,7 +395,7 @@ private static void toParseableByteArray(ByteArrayOutputStream byteStream,
for (int i = 0; i < ranges.length; i++) {
byte[] range = ranges[i];
byteStream.write("'".getBytes());
byteStream.write(range);
writeBytesWithEscape(byteStream, range);
byteStream.write("'".getBytes());
if (i < ranges.length - 1) {
byteStream.write(',');
Expand Down Expand Up @@ -429,7 +429,7 @@ private static void toParseableByteArray(ByteArrayOutputStream byteStream,
int i = 0;
for (byte[] qualifier: qualifiers) {
byteStream.write("'".getBytes());
byteStream.write(qualifier);
writeBytesWithEscape(byteStream, qualifier);
byteStream.write("'".getBytes());
if (i < qualifiers.size() - 1) {
byteStream.write(',');
Expand Down