From fb7ca724f0e8823add3e8283229b4d60fc941cfe Mon Sep 17 00:00:00 2001
From: Andrea Valassi <avalassi@cern.ch>
Date: Thu, 26 Nov 2015 21:45:54 +0000
Subject: [PATCH] Upgrade to COOL 3.1.1
git-svn-id: file:///git/lcgcool.svndb/cool/trunk@19797 4525493e-7705-40b1-a816-d608a930855b
---
src/CoolKernel/CoolKernel/VersionInfo.h | 4 ++--
src/PyCoolUtilities/python/PyCoolReferenceDb/__init__.py | 3 ++-
src/RelationalCool/src/RelationalDatabase.cpp | 6 +++---
src/RelationalCool/tests/RalDatabase/test_RalDatabase.cpp | 1 +
src/Utilities/PerformanceReport/runTest.py | 1 +
5 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/CoolKernel/CoolKernel/VersionInfo.h b/src/CoolKernel/CoolKernel/VersionInfo.h
index d76617505..4c471932b 100644
--- a/src/CoolKernel/CoolKernel/VersionInfo.h
+++ b/src/CoolKernel/CoolKernel/VersionInfo.h
@@ -24,8 +24,8 @@
#ifdef COOL300
#define COOL_VERSIONINFO_RELEASE_MAJOR 3
#define COOL_VERSIONINFO_RELEASE_MINOR 1
-#define COOL_VERSIONINFO_RELEASE_PATCH 0
-#define COOL_VERSIONINFO_RELEASE "3.1.0"
+#define COOL_VERSIONINFO_RELEASE_PATCH 1
+#define COOL_VERSIONINFO_RELEASE "3.1.1"
#else
#define COOL_VERSIONINFO_RELEASE_MAJOR 2
#define COOL_VERSIONINFO_RELEASE_MINOR 9
diff --git a/src/PyCoolUtilities/python/PyCoolReferenceDb/__init__.py b/src/PyCoolUtilities/python/PyCoolReferenceDb/__init__.py
index a2af6c9bd..abe1ce08a 100644
--- a/src/PyCoolUtilities/python/PyCoolReferenceDb/__init__.py
+++ b/src/PyCoolUtilities/python/PyCoolReferenceDb/__init__.py
@@ -155,7 +155,8 @@ class ReferenceDbMgr:
self.svcVersion == "3.0.2" or \
self.svcVersion == "3.0.3" or \
self.svcVersion == "3.0.4" or \
- self.svcVersion == "3.1.0" ):
+ self.svcVersion == "3.1.0" or \
+ self.svcVersion == "3.1.1" ):
self.svcVersion2xx = True
self.svcVersion22x = True
self.svcVersion28x = True
diff --git a/src/RelationalCool/src/RelationalDatabase.cpp b/src/RelationalCool/src/RelationalDatabase.cpp
index 4570a5072..3964ac179 100644
--- a/src/RelationalCool/src/RelationalDatabase.cpp
+++ b/src/RelationalCool/src/RelationalDatabase.cpp
@@ -273,9 +273,9 @@ RelationalDatabase::areReleaseAndSchemaCompatible
{
if (
#if defined(COOL300)
- // 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
+ // This release (3.1.1) can read 3.1.x
+ ( db_rel_version >= "3.1.0" && db_rel_version <= "3.1.1" ) ||
+ // This release (3.1.1) 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
diff --git a/src/RelationalCool/tests/RalDatabase/test_RalDatabase.cpp b/src/RelationalCool/tests/RalDatabase/test_RalDatabase.cpp
index 8d4839cf5..571fdb5b7 100644
--- a/src/RelationalCool/tests/RalDatabase/test_RalDatabase.cpp
+++ b/src/RelationalCool/tests/RalDatabase/test_RalDatabase.cpp
@@ -1240,6 +1240,7 @@ public:
openable.push_back( "3.0.3" );
openable.push_back( "3.0.4" );
openable.push_back( "3.1.0" );
+ openable.push_back( "3.1.1" );
#endif
// Check for failure - too old even for schema evolution
std::vector<std::string> ::iterator rel;
diff --git a/src/Utilities/PerformanceReport/runTest.py b/src/Utilities/PerformanceReport/runTest.py
index 27a67c460..c9ab9897f 100644
--- a/src/Utilities/PerformanceReport/runTest.py
+++ b/src/Utilities/PerformanceReport/runTest.py
@@ -145,6 +145,7 @@ elif ( svcVersion == "3.0.2" ): svcVersion290 = True
elif ( svcVersion == "3.0.3" ): svcVersion290 = True
elif ( svcVersion == "3.0.4" ): svcVersion290 = True
elif ( svcVersion == "3.1.0" ): svcVersion290 = True
+elif ( svcVersion == "3.1.1" ): svcVersion290 = True
if ( vectorPayload and not svcVersion290 ):
print 'ERROR! Vector payload performance test not supported for service version:', svcVersion
sys.exit(-1)
--
GitLab