odp support new hbase protocol

Author: JackShi148

src/main/java/com/alipay/oceanbase/rpc/ObGlobal.java

@@ -125,6 +125,8 @@ public static boolean isHBasePutPerfSupport() {
         return OB_VERSION >= OB_VERSION_4_4_1_0;
     }
 
+    /*-------------------------------------------- OB_VERSION --------------------------------------------*/
+
     public static final long OB_VERSION_4_2_3_0 = calcVersion(4, (short) 2, (byte) 3, (byte) 0);
 
     public static final long OB_VERSION_4_2_5_2 = calcVersion(4, (short) 2, (byte) 5, (byte) 2);
@@ -146,4 +148,12 @@ public static boolean isHBasePutPerfSupport() {
     public static final long OB_VERSION_4_4_1_0 = calcVersion(4, (short) 4, (byte) 1, (byte) 0);
 
     public static long       OB_VERSION         = calcVersion(0, (short) 0, (byte) 0, (byte) 0);
+
+    /*-------------------------------------------- OB_PROXY_VERSION --------------------------------------------*/
+
+    public static final long OB_PROXY_VERSION_4_3_5_0 = calcVersion(4, (short) 3, (byte) 5, (byte) 0);
+
+    public static final long OB_PROXY_VERSION_4_3_6_0 = calcVersion(4, (short) 3, (byte) 6, (byte) 0);
+
+    public static long       OB_PROXY_VERSION   = calcVersion(0, (short) 0, (byte) 0, (byte) 0);
 }

src/main/java/com/alipay/oceanbase/rpc/location/LocationUtil.java

@@ -2507,18 +2507,24 @@ public static void parseObVerionFromLogin(String serverVersion)
                                                                    throws FeatureNotSupportedException {
         Pattern pattern;
         if (serverVersion.startsWith("OceanBase_CE")) {
-            // serverVersion in CE is like "OceanBase_CE 4.0.0.0"
-            pattern = Pattern.compile("OceanBase_CE\\s+(\\d+)\\.(\\d+)\\.(\\d+)\\.(\\d+)");
+            // serverVersion in CE is like "OceanBase_CE 4.0.0.0 (+ Obproxy 4.3.6.0), content in () is optional and valid after Obproxy 4.3.5"
+            pattern = Pattern.compile("OceanBase_CE\\s+(\\d+)\\.(\\d+)\\.(\\d+)\\.(\\d+)(\\s+\\+\\s+(Obproxy)\\s+(\\d+)\\.(\\d+)\\.(\\d+)\\.(\\d+))?");
         } else {
-            // serverVersion is like "OceanBase 4.0.0.0"
-            pattern = Pattern.compile("OceanBase\\s+(\\d+)\\.(\\d+)\\.(\\d+)\\.(\\d+)");
+            // serverVersion is like "OceanBase 4.0.0.0 (+ Obproxy 4.3.6.0), content in () is optional and valid after Obproxy 4.3.5"
+            pattern = Pattern.compile("OceanBase\\s+(\\d+)\\.(\\d+)\\.(\\d+)\\.(\\d+)(\\s+\\+\\s+(Obproxy)\\s+(\\d+)\\.(\\d+)\\.(\\d+)\\.(\\d+))?");
         }
         Matcher matcher = pattern.matcher(serverVersion);
         if (matcher.find() && ObGlobal.OB_VERSION == 0) {
             ObGlobal.OB_VERSION = ObGlobal.calcVersion(Integer.parseInt(matcher.group(1)),
                 (short) Integer.parseInt(matcher.group(2)),
                 (byte) Integer.parseInt(matcher.group(3)),
                 (byte) Integer.parseInt(matcher.group(4)));
+            if (matcher.group(5) != null && matcher.group(6) != null) { // Obproxy part
+                ObGlobal.OB_PROXY_VERSION = ObGlobal.calcVersion(Integer.parseInt(matcher.group(7)),
+                        (short) Integer.parseInt(matcher.group(8)),
+                        (byte) Integer.parseInt(matcher.group(9)),
+                        (byte) Integer.parseInt(matcher.group(10)));
+            }
             if (ObGlobal.obVsnMajor() < 4) {
                 throw new FeatureNotSupportedException(
                         "The current client version supports only server version greater than or equal to 4.0.0.0");