[5/5] CQL 3.0 beta

[sl...@apache.org]

http://git-wip-us.apache.org/repos/asf/cassandra/blob/655ccc3a/src/java/org/apache/cassandra/utils/SemanticVersion.java
----------------------------------------------------------------------
diff --git a/src/java/org/apache/cassandra/utils/SemanticVersion.java b/src/java/org/apache/cassandra/utils/SemanticVersion.java
new file mode 100644
index 0000000..99b2aca
--- /dev/null
+++ b/src/java/org/apache/cassandra/utils/SemanticVersion.java
@@ -0,0 +1,231 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cassandra.utils;
+
+import java.util.regex.Pattern;
+import java.util.regex.Matcher;
+import java.util.Arrays;
+
+import org.apache.commons.lang.StringUtils;
+import com.google.common.base.Objects;
+
+/**
+ * Implements semantic versioning as defined at http://semver.org/.
+ *
+ * Note: The following code uses a slight variation from the document above in
+ * that it doesn't allow dashes in pre-release and build identifier.
+ */
+public class SemanticVersion implements Comparable<SemanticVersion>
+{
+    private static final String VERSION_REGEXP = "(\\d+)\\.(\\d+)\\.(\\d+)(\\-[.\\w]+)?(\\+[.\\w]+)?";
+    private static final Pattern pattern = Pattern.compile(VERSION_REGEXP);
+
+    public final int major;
+    public final int minor;
+    public final int patch;
+
+    private final String[] preRelease;
+    private final String[] build;
+
+    private SemanticVersion(int major, int minor, int patch, String[] preRelease, String[] build)
+    {
+        this.major = major;
+        this.minor = minor;
+        this.patch = patch;
+        this.preRelease = preRelease;
+        this.build = build;
+    }
+
+    /**
+     * Parse a semantic version from a string.
+     *
+     * @param version the string to parse
+     * @throws IllegalArgumentException if the provided string does not
+     * represent a semantic version
+     */
+    public SemanticVersion(String version)
+    {
+        Matcher matcher = pattern.matcher(version);
+        if (!matcher.matches())
+            throw new IllegalArgumentException("Invalid version value: " + version + " (see http://semver.org/ for details)");
+
+        try
+        {
+            this.major = Integer.valueOf(matcher.group(1));
+            this.minor = Integer.valueOf(matcher.group(2));
+            this.patch = Integer.valueOf(matcher.group(3));
+
+            String pr = matcher.group(4);
+            String bld = matcher.group(5);
+
+            this.preRelease = pr == null || pr.isEmpty() ? null : parseIdentifiers(version, pr);
+            this.build = bld == null || bld.isEmpty() ? null : parseIdentifiers(version, bld);
+
+        }
+        catch (NumberFormatException e)
+        {
+            throw new IllegalArgumentException("Invalid version value: " + version + " (see http://semver.org/ for details)");
+        }
+    }
+
+    private static String[] parseIdentifiers(String version, String str)
+    {
+        // Drop initial - or +
+        str = str.substring(1);
+        String[] parts = str.split("\\.");
+        for (String part : parts)
+        {
+            if (!part.matches("\\w+"))
+                throw new IllegalArgumentException("Invalid version value: " + version + " (see http://semver.org/ for details)");
+        }
+        return parts;
+    }
+
+    public int compareTo(SemanticVersion other)
+    {
+        if (major < other.major)
+            return -1;
+        if (major > other.major)
+            return 1;
+
+        if (minor < other.minor)
+            return -1;
+        if (minor > other.minor)
+            return 1;
+
+        if (patch < other.patch)
+            return -1;
+        if (patch > other.patch)
+            return 1;
+
+        int c = compareIdentifiers(preRelease, other.preRelease, 1);
+        if (c != 0)
+            return c;
+
+        return compareIdentifiers(build, other.build, -1);
+    }
+
+    /**
+     * Returns a version that is backward compatible with this version amongst a list
+     * of provided version, or null if none can be found.
+     *
+     * For instance:
+     *   "2.0.0".findSupportingVersion("2.0.0", "3.0.0") == "2.0.0"
+     *   "2.0.0".findSupportingVersion("2.1.3", "3.0.0") == "2.1.3"
+     *   "2.0.0".findSupportingVersion("3.0.0") == null
+     *   "2.0.3".findSupportingVersion("2.0.0") == "2.0.0"
+     *   "2.1.0".findSupportingVersion("2.0.0") == null
+     */
+    public SemanticVersion findSupportingVersion(SemanticVersion... versions)
+    {
+        for (SemanticVersion version : versions)
+        {
+            if (isSupportedBy(version))
+                return version;
+        }
+        return null;
+    }
+
+    public boolean isSupportedBy(SemanticVersion version)
+    {
+        return major == version.major && minor <= version.minor;
+    }
+
+    private static int compareIdentifiers(String[] ids1, String[] ids2, int defaultPred)
+    {
+        if (ids1 == null)
+            return ids2 == null ? 0 : defaultPred;
+        else if (ids2 == null)
+            return -defaultPred;
+
+        int min = Math.min(ids1.length, ids2.length);
+        for (int i = 0; i < min; i++)
+        {
+            Integer i1 = tryParseInt(ids1[i]);
+            Integer i2 = tryParseInt(ids2[i]);
+
+            if (i1 != null)
+            {
+                // integer have precedence
+                if (i2 == null || i1 < i2)
+                    return -1;
+                else if (i1 > i2)
+                    return 1;
+            }
+            else
+            {
+                // integer have precedence
+                if (i2 != null)
+                    return 1;
+
+                int c = ids1[i].compareTo(ids2[i]);
+                if (c != 0)
+                    return c;
+            }
+        }
+
+        if (ids1.length < ids2.length)
+            return -1;
+        if (ids1.length > ids2.length)
+            return 1;
+        return 0;
+    }
+
+    private static Integer tryParseInt(String str)
+    {
+        try
+        {
+            return Integer.valueOf(str);
+        }
+        catch (NumberFormatException e)
+        {
+            return null;
+        }
+    }
+
+    @Override
+    public boolean equals(Object o)
+    {
+        if(!(o instanceof SemanticVersion))
+            return false;
+        SemanticVersion that = (SemanticVersion)o;
+        return major == that.major
+            && minor == that.minor
+            && patch == that.patch
+            && Arrays.equals(preRelease, that.preRelease)
+            && Arrays.equals(build, that.build);
+    }
+
+    @Override
+    public int hashCode()
+    {
+        return Objects.hashCode(major, minor, patch, preRelease, build);
+    }
+
+    @Override
+    public String toString()
+    {
+        StringBuilder sb = new StringBuilder();
+        sb.append(major).append('.').append(minor).append('.').append(patch);
+        if (preRelease != null)
+            sb.append('-').append(StringUtils.join(preRelease, "."));
+        if (build != null)
+            sb.append('+').append(StringUtils.join(build, "."));
+        return sb.toString();
+    }
+}

http://git-wip-us.apache.org/repos/asf/cassandra/blob/655ccc3a/test/unit/org/apache/cassandra/utils/SemanticVersionTest.java
----------------------------------------------------------------------
diff --git a/test/unit/org/apache/cassandra/utils/SemanticVersionTest.java b/test/unit/org/apache/cassandra/utils/SemanticVersionTest.java
new file mode 100644
index 0000000..6d03d3f
--- /dev/null
+++ b/test/unit/org/apache/cassandra/utils/SemanticVersionTest.java
@@ -0,0 +1,105 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.cassandra.utils;
+
+import org.junit.Test;
+
+public class SemanticVersionTest
+{
+    @Test
+    public void testParsing()
+    {
+        SemanticVersion version;
+
+        version = new SemanticVersion("1.2.3");
+        assert version.major == 1 && version.minor == 2 && version.patch == 3;
+
+        version = new SemanticVersion("1.2.3-foo.2+Bar");
+        assert version.major == 1 && version.minor == 2 && version.patch == 3;
+    }
+
+    @Test
+    public void testComparison()
+    {
+        SemanticVersion v1, v2;
+
+        v1 = new SemanticVersion("1.2.3");
+        v2 = new SemanticVersion("1.2.4");
+        assert v1.compareTo(v2) == -1;
+
+        v1 = new SemanticVersion("1.2.3");
+        v2 = new SemanticVersion("1.2.3");
+        assert v1.compareTo(v2) == 0;
+
+        v1 = new SemanticVersion("1.2.3");
+        v2 = new SemanticVersion("2.0.0");
+        assert v1.compareTo(v2) == -1;
+
+        v1 = new SemanticVersion("1.2.3");
+        v2 = new SemanticVersion("1.2.3-alpha");
+        assert v1.compareTo(v2) == 1;
+
+        v1 = new SemanticVersion("1.2.3");
+        v2 = new SemanticVersion("1.2.3+foo");
+        assert v1.compareTo(v2) == -1;
+
+        v1 = new SemanticVersion("1.2.3");
+        v2 = new SemanticVersion("1.2.3-alpha+foo");
+        assert v1.compareTo(v2) == 1;
+    }
+
+    @Test
+    public void testIsSupportedBy()
+    {
+        SemanticVersion v1, v2;
+
+        v1 = new SemanticVersion("1.2.3");
+        v2 = new SemanticVersion("1.2.4");
+        assert v1.isSupportedBy(v2);
+        assert v2.isSupportedBy(v1);
+
+        v1 = new SemanticVersion("1.2.3");
+        v2 = new SemanticVersion("1.3.3");
+        assert v1.isSupportedBy(v2);
+        assert !v2.isSupportedBy(v1);
+
+        v1 = new SemanticVersion("2.2.3");
+        v2 = new SemanticVersion("1.3.3");
+        assert !v1.isSupportedBy(v2);
+        assert !v2.isSupportedBy(v1);
+    }
+
+    @Test
+    public void testInvalid()
+    {
+        assertThrows("1.0");
+        assertThrows("1.0.0a");
+        assertThrows("1.a.4");
+        assertThrows("1.0.0-foo&");
+    }
+
+    private static void assertThrows(String str)
+    {
+        try
+        {
+            new SemanticVersion(str);
+            assert false;
+        }
+        catch (IllegalArgumentException e) {}
+    }
+}