Commit 65aef050 authored by Andrea Valassi's avatar Andrea Valassi
Browse files

Upgrade to COOL 3.1.0. The port to cmake desrves this!


git-svn-id: file:///git/lcgcool.svndb/cool/trunk@19639 4525493e-7705-40b1-a816-d608a930855b
parent 4e13cb5e
......@@ -5,13 +5,11 @@
#undef COOL400 // COOL 2.x or COOL 3.x
#undef COOL400CPP11ENUM // API changes for c++11 enum class (bug #103344)
// These switches are now hardcoded in the three branches of the code
// tagged as COOL-preview, COOL_2_8-patches, COOL_3_0-preview (bug #92204).
// These switches are now hardcoded in all branches of the code (bug #92204).
#define COOL300 1 // COOL 3.x
//#undef COOL300 // COOL 2.x
// These switches are now hardcoded in the three branches of the code
// tagged as COOL-preview, COOL_2_8-patches, COOL_3_0-preview (bug #92204).
// These switches are now hardcoded in all branches of the code (bug #92204).
#define COOL290 1 // COOL 2.9.x or higher (COOL 2.8.x is no longer supported)
// COOL_VERSIONINFO_RELEASE is #defined in API as of COOL 2.8.4 (sr #111706)
......@@ -19,9 +17,9 @@
// Note that the former is defined within quotes, the latter are not!
#ifdef COOL300
#define COOL_VERSIONINFO_RELEASE_MAJOR 3
#define COOL_VERSIONINFO_RELEASE_MINOR 0
#define COOL_VERSIONINFO_RELEASE_PATCH 5
#define COOL_VERSIONINFO_RELEASE "3.0.5"
#define COOL_VERSIONINFO_RELEASE_MINOR 1
#define COOL_VERSIONINFO_RELEASE_PATCH 0
#define COOL_VERSIONINFO_RELEASE "3.1.0"
#else
#define COOL_VERSIONINFO_RELEASE_MAJOR 2
#define COOL_VERSIONINFO_RELEASE_MINOR 9
......
......@@ -155,7 +155,7 @@ class ReferenceDbMgr:
self.svcVersion == "3.0.2" or \
self.svcVersion == "3.0.3" or \
self.svcVersion == "3.0.4" or \
self.svcVersion == "3.0.5" ):
self.svcVersion == "3.1.0" ):
self.svcVersion2xx = True
self.svcVersion22x = True
self.svcVersion28x = True
......
......@@ -273,8 +273,10 @@ RelationalDatabase::areReleaseAndSchemaCompatible
{
if (
#if defined(COOL300)
// This release (3.0.5) can read 3.0.x
( db_rel_version >= "3.0.0" && db_rel_version <= "3.0.5" ) ||
// This release (3.1.0) can read 3.1.x
( db_rel_version == "3.1.0" ) ||
// This release (3.1.0) can read 3.0.x
( db_rel_version >= "3.0.0" && db_rel_version <= "3.0.4" ) ||
#endif
// This release (2.9.7) can read 2.9.x
( db_rel_version >= "2.9.0" && db_rel_version <= "2.9.7" ) ||
......
......@@ -1239,7 +1239,7 @@ public:
openable.push_back( "3.0.2" );
openable.push_back( "3.0.3" );
openable.push_back( "3.0.4" );
openable.push_back( "3.0.5" );
openable.push_back( "3.1.0" );
#endif
// Check for failure - too old even for schema evolution
std::vector<std::string> ::iterator rel;
......
......@@ -144,7 +144,7 @@ elif ( svcVersion == "3.0.1" ): svcVersion290 = True
elif ( svcVersion == "3.0.2" ): svcVersion290 = True
elif ( svcVersion == "3.0.3" ): svcVersion290 = True
elif ( svcVersion == "3.0.4" ): svcVersion290 = True
elif ( svcVersion == "3.0.5" ): svcVersion290 = True
elif ( svcVersion == "3.1.0" ): svcVersion290 = True
if ( vectorPayload and not svcVersion290 ):
print 'ERROR! Vector payload performance test not supported for service version:', svcVersion
sys.exit(-1)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment