CASSPYTHON-10 Update cassandra.util.Version to better support Cassandra version strings #1273
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1692,57 +1692,50 @@ def __repr__(self): | |
| self.lower_bound, self.upper_bound, self.value | ||
| ) | ||
|
|
||
| VERSION_REGEX = re.compile("^(\\d+)\\.(\\d+)(\\.\\d+)?(\\.\\d+)?([~\\-]\\w[.\\w]*(?:-\\w[.\\w]*)*)?(\\+[.\\w]+)?$") | ||
|
|
||
| @total_ordering | ||
| class Version(object): | ||
| """ | ||
| Representation of a Cassandra version. Mostly follows the implementation of the same logic in the Java driver; | ||
| see https://github.com/apache/cassandra-java-driver/blob/4.19.2/core/src/main/java/com/datastax/oss/driver/api/core/Version.java | ||
| """ | ||
|
|
||
| def __init__(self, version): | ||
| self._version = version | ||
|
|
||
| match = VERSION_REGEX.match(version) | ||
| if not match: | ||
| raise ValueError("Version string {0} did not match expected format".format(version)) | ||
|
|
||
| self.major = int(match[1]) | ||
| self.minor = int(match[2]) | ||
|
|
||
| try: | ||
| self.patch = self._cleanup_int(match[3]) | ||
| except: | ||
| self.patch = 0 | ||
|
|
||
| try: | ||
| self.build = self._cleanup_int(match[4]) | ||
| except: | ||
| self.build = 0 | ||
|
|
||
| try: | ||
| self.prerelease = self._cleanup_str(match[5]) | ||
| except: | ||
| self.prerelease = 0 | ||
|
Comment on lines
1714
to
+1727
There was a problem hiding this comment. Avoid bare
Contributor
Author
There was a problem hiding this comment. I'm inclined to leave these in. The seq manipulation ops in _cleanup_int and _cleanup_str can throw and I don't want that to wreck the version parsing logic. |
||
|
|
||
| # Trim off the leading '.' characters and convert the discovered value to an integer | ||
| def _cleanup_int(self, instr): | ||
| return int(instr[1:]) if instr else 0 | ||
|
|
||
| # Trim off the leading '.' or '~' characters and just return the string directly | ||
| def _cleanup_str(self, instr): | ||
| return instr[1:] if instr else 0 | ||
|
|
||
| def __hash__(self): | ||
| return hash((self.major, self.minor, self.patch, self.build, self.prerelease)) | ||
|
|
||
| def __repr__(self): | ||
| version_string = "Version({0}, {1}, {2}".format(self.major, self.minor, self.patch) | ||
|
|
@@ -1757,48 +1750,32 @@ def __repr__(self): | |
| def __str__(self): | ||
| return self._version | ||
|
|
||
| def __eq__(self, other): | ||
| if not isinstance(other, Version): | ||
| return NotImplemented | ||
|
|
||
| return (self.major == other.major and | ||
| self.minor == other.minor and | ||
| self.patch == other.patch and | ||
| self.build == other.build and | ||
| self.prerelease == other.prerelease | ||
| ) | ||
|
|
||
| def __gt__(self, other): | ||
| if not isinstance(other, Version): | ||
| return NotImplemented | ||
|
|
||
| if self.major != other.major: | ||
| return self.major > other.major | ||
| elif self.minor != other.minor: | ||
| return self.minor > other.minor | ||
| elif self.patch != other.patch: | ||
| return self.patch > other.patch | ||
| elif self.build != other.build: | ||
| return self.build > other.build | ||
| elif self.prerelease and not other.prerelease: | ||
| return False | ||
|
Contributor
There was a problem hiding this comment. Python tuples can be compared directly, so something like this should work
Contributor
Author
There was a problem hiding this comment. I honestly didn't realize that would work @bschoening, thanks for mentioning that! After looking at it for a bit, though, I'm kind of inclined to leave it as a sequence if/else strings. My only rationale is that it reads much more clearly to a casual reader. That might be a personal bias on my part because the tuple comparison syntax you reference was unfamiliar to me (and I'm open to reconsideration if that's the case) but the current version immediately conveys the intent behind the code on even a surface reading... which is probably beneficial. |
||
| elif other.prerelease and not self.prerelease: | ||
| return True | ||
| else: | ||
| return self.prerelease > other.prerelease | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The new
Versionimplementation removed the class docstring entirely. Sincecassandra.util.Versionis used outside this module (e.g. incassandra.metadataand unit tests), it should keep an up-to-date docstring describing the supported version formats and comparison semantics.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It's a fair point; I'll add an updated doc string back in.