Commit Graph

6 Commits

Author SHA1 Message Date
Glauber Costa
ae2ce78ee6 version: change all fields to uint16_t
Ok, shame on me: the version string was so obviously correct that I only
verified that the comparisons were working as expected.

Turns out it isn't: http://lists.boost.org/boost-users/2006/12/24194.php

boost::format will treat uint8_t arguments as char, and therefore we will end
up with the version string misprinted.

We can just cast it to uint16_t before we print, but since this is not exactly
a struct that we will be using all the time, let's favor readability over
saving a few bytes, and change all fields to uint16_t.

Signed-off-by: Glauber Costa <glommer@cloudius-systems.com>
2015-08-07 20:25:20 +03:00
Glauber Costa
5d3c7165d2 version: use a tuple internally.
As Avi suggested, we can use a tuple to make some comparisons more natural.
However, instead of doing a make_tuple on the comparison only, we can go
further and store the tuple internally.

I am still keeping the outer type, so it can host convenience functions like
to_sstring() and current().

Signed-off-by: Glauber Costa <glommer@cloudius-systems.com>
2015-08-07 18:24:54 +03:00
Glauber Costa
d122b98c08 version: do not store current version as a string
The class I am presenting will make it easier for us to compare it with desired
versions so we can control proper behavior when needed.

Signed-off-by: Glauber Costa <glommer@cloudius-systems.com>
2015-08-07 09:30:54 -05:00
Pekka Enberg
804f5d98f1 version.hh: Pretend to be Cassandra 2.1.8
We are targeting the 2.1.x series so advertise that we're Cassandra
2.1.8 which is the latest stable release.

Signed-off-by: Pekka Enberg <penberg@cloudius-systems.com>
2015-07-28 16:58:46 +03:00
Pekka Enberg
d3eb9f9b57 version.hh: Fix release version to be "2.2.0"
Fix release version to be compatible with origin to avoid confusing
clients.

Before:

  [penberg@nero apache-cassandra-2.1.7]$ ./bin/cqlsh --no-color 127.0.0.1
  Connected to Test Cluster at 127.0.0.1:9042.
  [cqlsh 5.0.1 | Cassandra SeastarDB v0.1 | CQL spec 3.2.0 | Native protocol v3]
  Use HELP for help.
  cqlsh>

After:

  [penberg@nero apache-cassandra-2.1.7]$ ./bin/cqlsh --no-color 127.0.0.1
  Connected to Test Cluster at 127.0.0.1:9042.
  [cqlsh 5.0.1 | Cassandra 2.2.0 | CQL spec 3.2.0 | Native protocol v3]
  Use HELP for help.
  cqlsh>

Signed-off-by: Pekka Enberg <penberg@cloudius-systems.com>
2015-07-08 19:21:14 +03:00
Glauber Costa
90b9de9939 add file with some version strings that don't really belong anywhere
This should really be generated by the build scripts, but since we haven't
even discussed any versioning scheme, I'm introducing the functions here - they
are needed to populate some system tables, and later on we can make them return
the right thing.

Signed-off-by: Glauber Costa <glommer@cloudius-systems.com>
2015-07-07 11:38:22 -04:00