[Chore] refresh code from master branch and upgrade table client version (#71)

* [Fix] checkAndMutate and get/Scan with filter return -5006 when include special character (#58)

* [Fix] checkAndMutate and get/Scan with filter return -5006 when include special character

* [Chore] fix review

* [Fix] fix review

* [Fix] fix test

* [Fix] fix test testScanSessionClean

Author: shenyunlong

pom.xml

@@ -54,7 +54,7 @@
         <project.build.sourceEncoding>${project.encoding}</project.build.sourceEncoding>
         <project.encoding>UTF-8</project.encoding>
         <slf4j.version>1.7.21</slf4j.version>
-        <table.client.version>1.2.13-SNAPSHOT</table.client.version>
+        <table.client.version>1.2.14.1-SNAPSHOT</table.client.version>
     </properties>
 
     <dependencies>

src/main/java/com/alipay/oceanbase/hbase/OHTable.java

@@ -47,9 +47,6 @@
 import org.apache.hadoop.classification.InterfaceAudience;
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.hbase.*;
-import org.apache.hadoop.hbase.HConstants;
-import org.apache.hadoop.hbase.HTableDescriptor;
-import org.apache.hadoop.hbase.KeyValue;
 import org.apache.hadoop.hbase.client.*;
 import org.apache.hadoop.hbase.client.coprocessor.Batch;
 import org.apache.hadoop.hbase.filter.CompareFilter;
@@ -62,6 +59,7 @@
 import org.apache.hadoop.hbase.util.Pair;
 import org.slf4j.Logger;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
 import java.util.*;
 import java.util.concurrent.*;
@@ -76,6 +74,7 @@
 import static java.util.concurrent.TimeUnit.SECONDS;
 import static org.apache.commons.lang.StringUtils.isBlank;
 import static org.apache.commons.lang.StringUtils.isNotBlank;
+import static com.alipay.oceanbase.hbase.filter.HBaseFilterUtils.writeBytesWithEscape;
 
 public class OHTable implements HTableInterface {
 
@@ -894,7 +893,7 @@ private boolean checkAndMutation(byte[] row, byte[] family, byte[] qualifier, Co
 
             checkArgument(!rowMutations.getMutations().isEmpty(), "mutation is empty");
 
-            String filterString = buildCheckAndMutateFilterString(family, qualifier, compareOp, value);
+            byte[] filterString = buildCheckAndMutateFilterString(family, qualifier, compareOp, value);
 
             ObHTableFilter filter = buildObHTableFilter(filterString, null, 1, qualifier);
             List<Mutation> mutations = rowMutations.getMutations();
@@ -1415,11 +1414,11 @@ private static String getTestLoadTargetTableName(String tableNameString, String
     }
 
     private ObHTableFilter buildObHTableFilter(Filter filter, TimeRange timeRange, int maxVersion,
-                                               Collection<byte[]> columnQualifiers) {
+                                               Collection<byte[]> columnQualifiers) throws IOException {
         ObHTableFilter obHTableFilter = new ObHTableFilter();
 
         if (filter != null) {
-            obHTableFilter.setFilterString(HBaseFilterUtils.toParseableString(filter));
+            obHTableFilter.setFilterString(HBaseFilterUtils.toParseableByteArray(filter));
         }
 
         if (timeRange != null) {
@@ -1441,20 +1440,25 @@ private ObHTableFilter buildObHTableFilter(Filter filter, TimeRange timeRange, i
         return obHTableFilter;
     }
 
-    private String buildCheckAndMutateFilterString(byte[] family, byte[] qualifier,
-                                                   CompareFilter.CompareOp compareOp, byte[] value) {
+    private byte[] buildCheckAndMutateFilterString(byte[] family, byte[] qualifier, CompareFilter.CompareOp compareOp, byte[] value) throws IOException {
+        ByteArrayOutputStream byteStream = new ByteArrayOutputStream();
+        byteStream.write("CheckAndMutateFilter(".getBytes());
+        byteStream.write(HBaseFilterUtils.toParseableByteArray(compareOp));
+        byteStream.write(", 'binary:".getBytes());
+        writeBytesWithEscape(byteStream, value);
+        byteStream.write("', '".getBytes());
+        writeBytesWithEscape(byteStream, family);
+        byteStream.write("', '".getBytes());
+        writeBytesWithEscape(byteStream, qualifier);
         if (value != null) {
-            return ("CheckAndMutateFilter(" + HBaseFilterUtils.toParseableString(compareOp)
-                    + ", 'binary:" + Bytes.toString(value) + "', '" + Bytes.toString(family)
-                    + "', '" + (qualifier == null ? "" : Bytes.toString(qualifier)) + "', false)");
+            byteStream.write("', false)".getBytes());
         } else {
-            return ("CheckAndMutateFilter(" + HBaseFilterUtils.toParseableString(compareOp)
-                    + ", 'binary:', '" + Bytes.toString(family) + "', '"
-                    + (qualifier == null ? "" : Bytes.toString(qualifier)) + "', true)");
+            byteStream.write("', true)".getBytes());
         }
+        return byteStream.toByteArray();
     }
 
-    private ObHTableFilter buildObHTableFilter(String filterString, TimeRange timeRange,
+    private ObHTableFilter buildObHTableFilter(byte[] filterString, TimeRange timeRange,
                                                int maxVersion, byte[]... columnQualifiers) {
         ObHTableFilter obHTableFilter = new ObHTableFilter();
 
@@ -1541,7 +1545,7 @@ private ObTableQuery buildObTableQuery(ObHTableFilter filter, final Scan scan) {
         return obTableQuery;
     }
 
-    private ObTableQuery buildObTableQuery(final Get get, Collection<byte[]> columnQualifiers) {
+    private ObTableQuery buildObTableQuery(final Get get, Collection<byte[]> columnQualifiers) throws IOException {
         ObTableQuery obTableQuery;
         if (get.isClosestRowBefore()) {
             PageFilter pageFilter = new PageFilter(1);