Skip to content

GitLab

Commit 851b8ecc authored by Andrea Valassi's avatar Andrea Valassi
Browse files

Remove a first bunch of COOL290 tags (CORALCOOL-2943), builds ok 


git-svn-id: file:///git/lcgcool.svndb/cool/trunk@20129 4525493e-7705-40b1-a816-d608a930855b
parent a6027452
Hide whitespace changes
Inline Side-by-side
src/CoolApplication/CoolApplication/Application.h
View file @ 851b8ecc
#ifndef COOLAPPLICATION_APPLICATION_H
#define COOLAPPLICATION_APPLICATION_H 1
// First of all, enable or disable the COOL290 API extensions (see bug #92204)
#include "CoolKernel/VersionInfo.h"
// Include files
#include "CoolKernel/VersionInfo.h" // kept but no longer needed
#include "CoolApplication/IApplication.h"
namespace cool
......@@ -82,7 +80,6 @@ namespace cool
return m_application->connectionSvc();
}
#ifdef COOL290CO
private:
/// Copy constructor is private (fix Coverity MISSING_COPY bug #95363)
......@@ -90,7 +87,6 @@ namespace cool
/// Assignment operator is private (fix Coverity MISSING_ASSIGN bug #95363)
Application& operator=( const Application& rhs );
#endif
private:
......
src/CoolKernel/CoolKernel/ChannelSelection.h
View file @ 851b8ecc
#ifndef COOLKERNEL_CHANNELSELECTION_H
#define COOLKERNEL_CHANNELSELECTION_H 1
// First of all, set/unset CORAL290, COOL300, COOL400 and COOL_HAS_CPP11 macros
// First of all, set/unset CORAL290, COOL400 and COOL_HAS_CPP11 macros
#include "CoolKernel/VersionInfo.h"
// Include files
......
src/CoolKernel/CoolKernel/FolderSpecification.h
View file @ 851b8ecc
#ifndef COOLKERNEL_FOLDERSPECIFICATION_H
#define COOLKERNEL_FOLDERSPECIFICATION_H 1
// First of all, set/unset CORAL290, COOL300, COOL400 and COOL_HAS_CPP11 macros
// First of all, set/unset COOL400 macros
#include "CoolKernel/VersionInfo.h"
// Include files
......@@ -34,27 +34,9 @@ namespace cool
/// Destructor.
virtual ~FolderSpecification();
#ifndef COOL290VP
/// Constructor from versioning mode.
/// The payload specification does not have any fields (yet).
/// Throws InvalidFolderSpecification if versioning mode is invalid.
/// DEPRECATED and immediately REMOVED in COOL290
FolderSpecification( FolderVersioning::Mode mode = FolderVersioning::SINGLE_VERSION );
#endif
#ifdef COOL290VP
/// Constructor from payload specification (assuming SINGLE_VERSION versioning mode)
FolderSpecification( const IRecordSpecification& payloadSpecification );
#endif
#ifndef COOL290VP
/// Constructor from versioning mode and payload specification.
/// Throws InvalidFolderSpecification if versioning mode is invalid.
/// DEPRECATED and immediately REMOVED in COOL290
FolderSpecification( FolderVersioning::Mode mode,
const IRecordSpecification& payloadSpecification,
bool hasPayloadTable = false );
#else
/// Constructor from versioning mode and payload specification.
/// [PayloadMode values are chosen for backward compatibility - bug #103351]
/// Throws InvalidFolderSpecification if versioning mode is invalid.
......@@ -67,7 +49,6 @@ namespace cool
PayloadMode::Mode payloadMode = PayloadMode::Mode::INLINEPAYLOAD
#endif
);
#endif
/*
/// Constructor from versioning mode and payload and channel specs.
......@@ -77,32 +58,18 @@ namespace cool
const IRecordSpecification& channelSpecification );
*///
#ifdef COOL290VP
/// Copy constructor
FolderSpecification( const FolderSpecification& rhs );
/// Assignment operator
FolderSpecification& operator=( const FolderSpecification& rhs );
#endif
/// Get the versioning mode (const).
const FolderVersioning::Mode& versioningMode() const;
#ifndef COOL290VP
/// Get the versioning mode (to modify it).
/// DEPRECATED and immediately REMOVED in COOL290
FolderVersioning::Mode& versioningMode();
#endif
/// Get the payload specification (const).
const IRecordSpecification& payloadSpecification() const;
#ifndef COOL290VP
/// Get the payload specification (to modify it).
/// DEPRECATED and immediately REMOVED in COOL290
RecordSpecification& payloadSpecification();
#endif
/*
/// Get the channel specification (const).
const IRecordSpecification& channelSpecification() const;
......@@ -111,26 +78,14 @@ namespace cool
RecordSpecification& channelSpecification();
*///
#ifndef COOL290VP
/// Get the payload table flag (const).
/// DEPRECATED and immediately REMOVED in COOL290
const bool& hasPayloadTable() const;
/// Get the payload table flag (to modify it).
/// DEPRECATED and immediately REMOVED in COOL290
bool& hasPayloadTable();
#else
/// Get the payload mode (const).
const PayloadMode::Mode& payloadMode() const;
#endif
#ifdef COOL290VP
private:
// The default constructor is private (a payload specification is needed)
FolderSpecification();
#endif
private:
/// The folder versioning mode.
......@@ -142,14 +97,8 @@ namespace cool
/// The folder channel specification.
//RecordSpecification m_channelSpec;
#ifndef COOL290VP
/// The separate payload table flag.
/// DEPRECATED and immediately REMOVED in COOL290
bool m_hasPayloadTable;
#else
/// The payload mode.
PayloadMode::Mode m_payloadMode;
#endif
};
......
src/CoolKernel/CoolKernel/IDatabase.h
View file @ 851b8ecc
#ifndef COOLKERNEL_IDATABASE_H
#define COOLKERNEL_IDATABASE_H 1
// First of all, set/unset CORAL290, COOL300, COOL400 and COOL_HAS_CPP11 macros
// First of all, set/unset CORAL290, COOL400 and COOL_HAS_CPP11 macros
#include "CoolKernel/VersionInfo.h"
// Include files
......
src/CoolKernel/CoolKernel/IFolder.h
View file @ 851b8ecc
#ifndef COOLKERNEL_IFOLDER_H
#define COOLKERNEL_IFOLDER_H 1
// First of all, enable or disable the COOL290 API extensions (bug #92204)
// First of all, enable or disable API extensions (bug #92204)
#include "CoolKernel/VersionInfo.h"
// Include files
......@@ -122,7 +122,6 @@ namespace cool
const std::string& userTagName = "",
bool userTagOnly = false ) = 0;
#ifdef COOL290VP
/// Store an object in a given channel with a given IOV and vector payload.
virtual void storeObject( const ValidityKey& since,
const ValidityKey& until,
......@@ -130,7 +129,6 @@ namespace cool
const ChannelId& channelId,
const std::string& userTagName = "",
bool userTagOnly = false ) = 0;
#endif
/// Set a new finite end-of-validity value for all SV objects in a given
/// channel selection whose end-of-validity is currently infinite.
......@@ -348,12 +346,10 @@ namespace cool
virtual const std::string
channelDescription( const ChannelId& channelId ) const = 0;
#ifdef COOL290CO
private:
/// Assignment operator is private (see bug #95823)
IFolder& operator=( const IFolder& rhs );
#endif
};
......
src/CoolKernel/CoolKernel/IFolderSpecification.h
View file @ 851b8ecc
#ifndef COOLKERNEL_IFOLDERSPECIFICATION_H
#define COOLKERNEL_IFOLDERSPECIFICATION_H 1
// First of all, enable or disable the COOL290 API extensions (see bug #92204)
// First of all, enable or disable API extensions (see bug #92204)
#include "CoolKernel/VersionInfo.h"
// Include files
#include "CoolKernel/IRecordSpecification.h"
#include "CoolKernel/FolderVersioning.h"
#ifdef COOL290VP
#include "CoolKernel/PayloadMode.h"
#endif
namespace cool
{
......@@ -49,17 +47,8 @@ namespace cool
virtual const IRecordSpecification& channelSpecification() const = 0;
*///
#ifndef COOL290VP
/// Get the payload table flag (const).
/// DEPRECATED and immediately REMOVED in COOL290
COOL_DEPRECATED
( virtual const bool & hasPayloadTable() const ) = 0;
#endif
#ifdef COOL290VP
/// Get the payload mode (const).
virtual const PayloadMode::Mode& payloadMode() const = 0;
#endif
/// Comparison operator.
bool operator==( const IFolderSpecification& rhs ) const;
......@@ -67,12 +56,10 @@ namespace cool
/// Comparison operator.
bool operator!=( const IFolderSpecification& rhs ) const;
#ifdef COOL290CO
private:
/// Assignment operator is private (see bug #95823)
IFolderSpecification& operator=( const IFolderSpecification& rhs );
#endif
};
......@@ -84,11 +71,7 @@ namespace cool
if ( versioningMode() != rhs.versioningMode() ) return false;
if ( payloadSpecification() != rhs.payloadSpecification() ) return false;
//if ( channelSpecification() != rhs.channelSpecification() ) return false;
#ifdef COOL290VP
if ( payloadMode() != rhs.payloadMode() ) return false;
#else
if ( hasPayloadTable() != rhs.hasPayloadTable() ) return false;
#endif
return true;
}
......
src/CoolKernel/CoolKernel/IHvsNode.h
View file @ 851b8ecc
#ifndef COOLKERNEL_IHVSNODE_H
#define COOLKERNEL_IHVSNODE_H 1
// First of all, set/unset CORAL290, COOL300, COOL400 and COOL_HAS_CPP11 macros
// First of all, set/unset CORAL290, COOL400 and COOL_HAS_CPP11 macros
#include "CoolKernel/VersionInfo.h"
// Include files
......
src/CoolKernel/CoolKernel/IObject.h
View file @ 851b8ecc
#ifndef COOLKERNEL_IOBJECT_H
#define COOLKERNEL_IOBJECT_H 1
// First of all, enable or disable the COOL290 API extensions (bug #92204)
// First of all, enable or disable the API extensions (bug #92204)
#include "CoolKernel/VersionInfo.h"
// Include files
......@@ -58,12 +58,10 @@ namespace cool
/// Data payload
virtual const IRecord& payload() const = 0;
#ifdef COOL290VP
/// Vector data payload
/// There is only one iterator, payloadIterator() returns the same
/// iterator every time it is called.
virtual IRecordIterator& payloadIterator() const = 0;
#endif
/// Data value of a specific payload field (as a string).
/// Return "NULL" if the payload field is null.
......@@ -99,7 +97,6 @@ namespace cool
/// WARNING! This is only for COOL developers. USE AT YOUR OWN RISK!
virtual UInt32 payloadId() const = 0;
#ifdef COOL290VP
/// System-assigned payload set ID
/// Throws an exception if the object has not been stored yet
/// Returns 0 if the payload is not stored in a separate table
......@@ -109,7 +106,6 @@ namespace cool
/// Payload vector size (vector folder)
/// WARNING! This is only for COOL developers. USE AT YOUR OWN RISK!
virtual UInt32 payloadSize() const = 0;
#endif
/// Insertion time into the database
/// Throws an exception if the object has not been stored yet
......@@ -136,12 +132,10 @@ namespace cool
/// \endcode
virtual std::ostream& print( std::ostream& s ) const = 0;
#ifdef COOL290CO
private:
/// Assignment operator is private (see bug #95823)
IObject& operator=( const IObject& rhs );
#endif
};
......
src/CoolKernel/CoolKernel/IRecordIterator.h
View file @ 851b8ecc
......@@ -4,8 +4,6 @@
// First of all, enable or disable the COOL290 API extensions (bug #92204)
#include "CoolKernel/VersionInfo.h"
#ifdef COOL290VP
// Include files
#include "CoolKernel/pointers.h"
......@@ -93,6 +91,5 @@ namespace cool
};
}
#endif // COOL290VP
#endif // COOLKERNEL_IRECORDITERATOR_H
src/CoolKernel/CoolKernel/PayloadMode.h
View file @ 851b8ecc
#ifndef COOLKERNEL_PAYLOADMODE_H
#define COOLKERNEL_PAYLOADMODE_H 1
// First of all, set/unset CORAL290, COOL300, COOL400 and COOL_HAS_CPP11 macros
// First of all, set/unset COOL400 macros
#include "CoolKernel/VersionInfo.h"
#ifdef COOL290VP
// Include files
#ifdef COOL400CPP11ENUM
#include <ostream>
......@@ -50,6 +48,5 @@ namespace cool
}
}
#endif
#endif // COOLKERNEL_PAYLOADMODE_H
src/CoolKernel/src/FolderSpecification.cpp
View file @ 851b8ecc
// First of all, enable or disable the COOL290 API extensions (bug #92204)
#include "CoolKernel/VersionInfo.h"
// Include files
#include <sstream>
#include <iostream> // Debug ROOT-7864
......@@ -20,58 +17,15 @@ FolderSpecification::~FolderSpecification()
//-----------------------------------------------------------------------------
#ifndef COOL290VP
FolderSpecification::FolderSpecification( FolderVersioning::Mode mode )
: m_versioningMode( mode )
, m_payloadSpec()
, m_hasPayloadTable( false )
{
// Throw if an invalid versioning mode is specified (fix bug #103343)
if ( mode != FolderVersioning::Mode::SINGLE_VERSION &&
mode != FolderVersioning::Mode::MULTI_VERSION )
{
std::stringstream s;
s << "Invalid versioning mode specified: " << mode;
throw InvalidFolderSpecification( s.str(), "FolderSpecification" );
}
}
#endif
//-----------------------------------------------------------------------------
#ifdef COOL290VP
FolderSpecification::FolderSpecification( const IRecordSpecification& payloadSpecification )
: m_versioningMode( FolderVersioning::Mode::SINGLE_VERSION )
, m_payloadSpec( payloadSpecification )
, m_payloadMode( PayloadMode::Mode::INLINEPAYLOAD )
{
}
#endif
//-----------------------------------------------------------------------------
#ifndef COOL290VP
FolderSpecification::FolderSpecification( FolderVersioning::Mode mode,
const IRecordSpecification& pSpec,
bool hasPayloadTable )
: m_versioningMode( mode )
, m_payloadSpec( pSpec )
, m_hasPayloadTable( hasPayloadTable )
{
// Throw if an invalid versioning mode is specified (fix bug #103343)
if ( mode != FolderVersioning::Mode::SINGLE_VERSION &&
mode != FolderVersioning::Mode::MULTI_VERSION )
{
std::stringstream s;
s << "Invalid versioning mode specified: " << mode;
throw InvalidFolderSpecification( s.str(), "FolderSpecification" );
}
}
#endif
//-----------------------------------------------------------------------------
#ifdef COOL290VP
FolderSpecification::FolderSpecification( FolderVersioning::Mode mode,
const IRecordSpecification& pSpec,
PayloadMode::Mode payloadMode )
......@@ -104,7 +58,6 @@ FolderSpecification::FolderSpecification( FolderVersioning::Mode mode,
// << (payloadMode != PayloadMode::Mode::VECTORPAYLOAD)
// << std::endl;
}
#endif
//-----------------------------------------------------------------------------
......@@ -129,18 +82,15 @@ FolderSpecification::FolderSpecification( FolderVersioning::Mode mode,
//-----------------------------------------------------------------------------
#ifdef COOL290VP
FolderSpecification::FolderSpecification( const FolderSpecification& rhs )
: m_versioningMode( rhs.m_versioningMode )
, m_payloadSpec( rhs.m_payloadSpec )
, m_payloadMode( rhs.m_payloadMode )
{
}
#endif
//-----------------------------------------------------------------------------
#ifdef COOL290VP
FolderSpecification& FolderSpecification::operator=( const FolderSpecification& rhs )
{
m_versioningMode = rhs.m_versioningMode;
......@@ -148,7 +98,6 @@ FolderSpecification& FolderSpecification::operator=( const FolderSpecification&
m_payloadMode = rhs.m_payloadMode;
return *this;
}
#endif
//-----------------------------------------------------------------------------
......@@ -159,15 +108,6 @@ const FolderVersioning::Mode& FolderSpecification::versioningMode() const
//-----------------------------------------------------------------------------
#ifndef COOL290VP
FolderVersioning::Mode& FolderSpecification::versioningMode()
{
return m_versioningMode;
}
#endif
//-----------------------------------------------------------------------------
const IRecordSpecification& FolderSpecification::payloadSpecification() const
{
return m_payloadSpec;
......@@ -175,15 +115,6 @@ const IRecordSpecification& FolderSpecification::payloadSpecification() const
//-----------------------------------------------------------------------------
#ifndef COOL290VP
RecordSpecification& FolderSpecification::payloadSpecification()
{
return m_payloadSpec;
}
#endif
//-----------------------------------------------------------------------------
/*
const IRecordSpecification& FolderSpecification::channelSpecification() const
{
......@@ -202,29 +133,9 @@ RecordSpecification& FolderSpecification::channelSpecification()
//-----------------------------------------------------------------------------
#ifndef COOL290VP
const bool& FolderSpecification::hasPayloadTable() const
{
return m_hasPayloadTable;
}
#endif
//-----------------------------------------------------------------------------
#ifndef COOL290VP
bool& FolderSpecification::hasPayloadTable()
{
return m_hasPayloadTable;
}
#endif
//-----------------------------------------------------------------------------
#ifdef COOL290VP
const PayloadMode::Mode& FolderSpecification::payloadMode() const
{
return m_payloadMode;
}
#endif
//-----------------------------------------------------------------------------
src/CoolKernel/src/Time.cpp
View file @ 851b8ecc
// First of all, set/unset CORAL290, COOL300, COOL400 and COOL_HAS_CPP11 macros
#include "CoolKernel/VersionInfo.h"
// Include files
#include <cstdio> // For sprintf on gcc45
#include "CoralBase/TimeStamp.h"
......
src/CoolKernel/tests/FolderSpec/test_FolderSpec.cpp
View file @ 851b8ecc
......@@ -67,14 +67,9 @@ public:
// But we would need our own AttributeList to do that...
aList[name].setValue( std::string("aaaaa") );
std::cout << "DATA: " << attributeListToString( aList ) << std::endl;
#ifdef COOL290VP
RecordSpecification spec1;
spec1.extend( "A_Bool", StorageType::TypeId::Bool );
FolderSpecification fSpec( spec1 );
#else
FolderSpecification fSpec;
fSpec.payloadSpecification().extend( "A_Bool", StorageType::TypeId::Bool );
#endif
const IRecordSpecification& payloadSpec = fSpec.payloadSpecification();
std::cout << "FSize=" << payloadSpec.size() << std::endl;
for ( unsigned i=0; i<payloadSpec.size(); i++ ) {
......@@ -117,63 +112,9 @@ public:
( "fSpec3none vMode", FolderVersioning::Mode::SINGLE_VERSION, fSpec3none.versioningMode() );
CPPUNIT_ASSERT_MESSAGE
( "fSpec3none pSpec", spec == fSpec3none.payloadSpecification() );
#ifdef COOL290VP
CPPUNIT_ASSERT_EQUAL_MESSAGE
( "fSpec3none pMode", PayloadMode::Mode::INLINEPAYLOAD, fSpec3none.payloadMode() );
#else
CPPUNIT_ASSERT_EQUAL_MESSAGE
( "fSpec3none hasPT", false, fSpec3none.hasPayloadTable() );
#endif
#ifndef COOL290VP
// Test the two-parameter ctor with third parameter == false
bool hasPT = false;
FolderSpecification fSpec3false( FolderVersioning::Mode::SINGLE_VERSION, spec, hasPT ); // does not compile on COOL290
CPPUNIT_ASSERT_EQUAL_MESSAGE
( "fSpec3false vMode", FolderVersioning::Mode::SINGLE_VERSION, fSpec3false.versioningMode() );
CPPUNIT_ASSERT_MESSAGE
( "fSpec3false pSpec", spec == fSpec3false.payloadSpecification() );
CPPUNIT_ASSERT_EQUAL_MESSAGE
( "fSpec3false hasPT", false, fSpec3false.hasPayloadTable() );
// Test the two-parameter ctor with third parameter == true
hasPT = true;
FolderSpecification fSpec3true( FolderVersioning::Mode::SINGLE_VERSION, spec, hasPT ); // does not compile on COOL290
CPPUNIT_ASSERT_EQUAL_MESSAGE
( "fSpec3true vMode", FolderVersioning::Mode::SINGLE_VERSION, fSpec3true.versioningMode() );
CPPUNIT_ASSERT_MESSAGE
( "fSpec3true pSpec", spec == fSpec3true.payloadSpecification() );
CPPUNIT_ASSERT_EQUAL_MESSAGE
( "fSpec3true hasPT", true, fSpec3true.hasPayloadTable() );
#endif
#ifndef COOL290VP
// Test the two-parameter ctor with third parameter == (int)0
FolderSpecification fSpec3_0( FolderVersioning::Mode::SINGLE_VERSION, spec, (int)0 ); // does not compile on COOL290
CPPUNIT_ASSERT_EQUAL_MESSAGE
( "fSpec3_0 vMode", FolderVersioning::Mode::SINGLE_VERSION, fSpec3_0.versioningMode() );
CPPUNIT_ASSERT_MESSAGE
( "fSpec3_0 pSpec", spec == fSpec3_0.payloadSpecification() );
CPPUNIT_ASSERT_EQUAL_MESSAGE
( "fSpec3_0 hasPT", false, fSpec3_0.hasPayloadTable() );
// Test the two-parameter ctor with third parameter == (int)1
FolderSpecification fSpec3_1( FolderVersioning::Mode::SINGLE_VERSION, spec, (int)1 ); // does not compile on COOL290
CPPUNIT_ASSERT_EQUAL_MESSAGE
( "fSpec3_1 vMode", FolderVersioning::Mode::SINGLE_VERSION, fSpec3_1.versioningMode() );
CPPUNIT_ASSERT_MESSAGE
( "fSpec3_1 pSpec", spec == fSpec3_1.payloadSpecification() );
CPPUNIT_ASSERT_EQUAL_MESSAGE
( "fSpec3_1 hasPT", true, fSpec3_1.hasPayloadTable() );
// Test the two-parameter ctor with third parameter == (int)2
FolderSpecification fSpec3_2( FolderVersioning::Mode::SINGLE_VERSION, spec, (int)2 ); // does not compile on COOL290
CPPUNIT_ASSERT_EQUAL_MESSAGE
( "fSpec3_2 vMode", FolderVersioning::Mode::SINGLE_VERSION, fSpec3_2.versioningMode() );
CPPUNIT_ASSERT_MESSAGE
( "fSpec3_2 pSpec", spec == fSpec3_2.payloadSpecification() );
CPPUNIT_ASSERT_EQUAL_MESSAGE
( "fSpec3_2 hasPT", true, fSpec3_2.hasPayloadTable() ); // OK: REMOVED IN COOL290!
#endif
#ifdef COOL290VP
// Test the two-parameter ctor with third parameter == (PayloadMode::Mode)0
FolderSpecification fSpec3e0( FolderVersioning::Mode::SINGLE_VERSION, spec, (PayloadMode::Mode)0 );
CPPUNIT_ASSERT_EQUAL_MESSAGE
......@@ -198,7 +139,6 @@ public:
( "fSpec3e2 pSpec", spec == fSpec3e2.payloadSpecification() );
CPPUNIT_ASSERT_EQUAL_MESSAGE
( "fSpec3e2 pMode", PayloadMode::Mode::VECTORPAYLOAD, fSpec3e2.payloadMode() ); // OK!
#endif
}
#if defined(__GNUC__) && defined (__GNUC_MINOR__) && ( (__GNUC__==4 && __GNUC_MINOR__ >=6 ) || __GNUC__>4 )
......
src/PyCool/dict/PyCool_headers.h
View file @ 851b8ecc
#ifndef PYCOOL_PYCOOLHEADERS_H
#define PYCOOL_PYCOOLHEADERS_H 1
// First of all, set/unset COOL290, COOL300, COOL_HAS_CPP11 and COOL400 macros
// First of all, set/unset COOL400 macros
#include "CoolKernel/VersionInfo.h"
//#undef COOL400CPP11ENUM
......@@ -118,18 +118,14 @@
#include "CoolKernel/IObject.h"
#include "CoolKernel/IObjectIterator.h"
#include "CoolKernel/IRecord.h"
#ifdef COOL290VP