From a97b91b164381b4fa6274a40c354d7724125aea3 Mon Sep 17 00:00:00 2001 From: miyuan-ljr Date: Mon, 11 Nov 2024 16:35:39 +0800 Subject: [PATCH] fix encode --- .../hbase/filter/HBaseFilterUtils.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/src/main/java/com/alipay/oceanbase/hbase/filter/HBaseFilterUtils.java b/src/main/java/com/alipay/oceanbase/hbase/filter/HBaseFilterUtils.java index ed98d1b3..e06ec11e 100644 --- a/src/main/java/com/alipay/oceanbase/hbase/filter/HBaseFilterUtils.java +++ b/src/main/java/com/alipay/oceanbase/hbase/filter/HBaseFilterUtils.java @@ -295,11 +295,11 @@ private static void toParseableByteArray(ByteArrayOutputStream byteStream, Fuzzy for (int i = 0; i < fuzzyKeysData.size(); i ++) { Pair 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(','); @@ -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) { @@ -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(')'); } @@ -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(')'); @@ -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(','); @@ -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(',');