fix protocol version compatibility (apache#6153)

larryDltake · May 14, 2020 · cb2f6af · cb2f6af
1 parent 91ad5e2
commit cb2f6af
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 18 deletions.
diff --git a/dubbo-common/src/main/java/org/apache/dubbo/common/Version.java b/dubbo-common/src/main/java/org/apache/dubbo/common/Version.java
@@ -52,7 +52,8 @@ public final class Version {
      * Because {@link #isSupportResponseAttachment} is checked for every call, int compare expect to has higher
      * performance than string.
      */
-    private static final int LOWEST_VERSION_FOR_RESPONSE_ATTACHMENT = 2000200; // 2.0.2
+    public static final int LOWEST_VERSION_FOR_RESPONSE_ATTACHMENT = 2000200; // 2.0.2
+    public static final int HIGHEST_PROTOCOL_VERSION = 2009900; // 2.0.99
     private static final Map<String, Integer> VERSION2INT = new HashMap<String, Integer>();
 
     static {
@@ -87,31 +88,29 @@ public static boolean isRelease270OrHigher(String version) {
     /**
      * Check the framework release version number to decide if it's 2.6.3 or higher
      *
-     * Because response attachments feature is firstly introduced in 2.6.3
-     * and moreover we have no other approach to know the framework's version, so we use
-     * isSupportResponseAttachment to decide if it's v2.6.3.
+     * @param version, the sdk version
      */
     public static boolean isRelease263OrHigher(String version) {
-        return isSupportResponseAttachment(version);
+        return getIntVersion(version) >= 2060300;
     }
 
+    /**
+     * Dubbo 2.x protocol version numbers are limited to 2.0.2/2000200 ~ 2.0.99/2009900, other versions are consider as
+     * invalid or not from official release.
+     *
+     * @param version, the protocol version.
+     * @return
+     */
     public static boolean isSupportResponseAttachment(String version) {
         if (StringUtils.isEmpty(version)) {
             return false;
         }
-        // for previous dubbo version(2.0.10/020010~2.6.2/020602), this version is the jar's version, so they need to
-        // be ignore
         int iVersion = getIntVersion(version);
-        if (iVersion >= 2001000 && iVersion < 2060300) {
-            return false;
-        }
-
-        // 2.8.x is reserved for dubbox
-        if (iVersion >= 2080000 && iVersion < 2090000) {
-            return false;
+        if (iVersion >= LOWEST_VERSION_FOR_RESPONSE_ATTACHMENT && iVersion <= HIGHEST_PROTOCOL_VERSION) {
+            return true;
         }
 
-        return iVersion >= LOWEST_VERSION_FOR_RESPONSE_ATTACHMENT;
+        return false;
     }
 
     public static int getIntVersion(String version) {
@@ -139,7 +138,10 @@ private static int parseInt(String version) {
         String[] vArr = version.split("\\.");
         int len = vArr.length;
         for (int i = 0; i < len; i++) {
-            v += Integer.parseInt(getPrefixDigits(vArr[i])) * Math.pow(10, (len - i - 1) * 2);
+            String subV = getPrefixDigits(vArr[i]);
+            if (StringUtils.isNotEmpty(subV)) {
+                v += Integer.parseInt(subV) * Math.pow(10, (len - i - 1) * 2);
+            }
         }
         return v;
     }

diff --git a/dubbo-common/src/test/java/org/apache/dubbo/common/version/VersionTest.java b/dubbo-common/src/test/java/org/apache/dubbo/common/version/VersionTest.java
@@ -33,10 +33,14 @@ public void testGetProtocolVersion() {
     public void testSupportResponseAttachment() {
         Assertions.assertTrue(Version.isSupportResponseAttachment("2.0.2"));
         Assertions.assertTrue(Version.isSupportResponseAttachment("2.0.3"));
+        Assertions.assertTrue(Version.isSupportResponseAttachment("2.0.99"));
+
+        Assertions.assertFalse(Version.isSupportResponseAttachment("2.1.0"));
         Assertions.assertFalse(Version.isSupportResponseAttachment("2.0.0"));
         Assertions.assertFalse(Version.isSupportResponseAttachment("1.0.0"));
-        Assertions.assertTrue(Version.isSupportResponseAttachment("2.6.6-stable"));
-
+        Assertions.assertFalse(Version.isSupportResponseAttachment("3.0.0"));
+        Assertions.assertFalse(Version.isSupportResponseAttachment("2.6.6-stable"));
+        Assertions.assertFalse(Version.isSupportResponseAttachment("2.6.6.RC1"));
         Assertions.assertFalse(Version.isSupportResponseAttachment("2.0.contains"));
         Assertions.assertFalse(Version.isSupportResponseAttachment("version.string"));
         Assertions.assertFalse(Version.isSupportResponseAttachment("prefix2.0"));
@@ -48,6 +52,9 @@ public void testGetIntVersion() {
         Assertions.assertEquals(2060101, Version.getIntVersion("2.6.1.1"));
         Assertions.assertEquals(2070001, Version.getIntVersion("2.7.0.1"));
         Assertions.assertEquals(2070000, Version.getIntVersion("2.7.0"));
+        Assertions.assertEquals(Version.HIGHEST_PROTOCOL_VERSION, Version.getIntVersion("2.0.99"));
+        Assertions.assertEquals(2070000, Version.getIntVersion("2.7.0.RC1"));
+        Assertions.assertEquals(2070000, Version.getIntVersion("2.7.0-SNAPSHOT"));
     }
 
     @Test
@@ -69,5 +76,6 @@ public void testIsFramework263OrHigher() {
         Assertions.assertFalse(Version.isRelease263OrHigher("2.6.2.1"));
         Assertions.assertFalse(Version.isRelease263OrHigher("2.6.1.1"));
         Assertions.assertTrue(Version.isRelease263OrHigher("2.6.3"));
+        Assertions.assertTrue(Version.isRelease263OrHigher("2.6.3.0"));
     }
 }