diff --git a/AtlasTest/ControlTest/share/ProxyProviderSvc_test.ref b/AtlasTest/ControlTest/share/ProxyProviderSvc_test.ref
index e552efdb1e624ee78919a9633bb2a63a91055aed..92f89bb90ef8ef1ee2b0bd5def805d4038bba5c7 100644
--- a/AtlasTest/ControlTest/share/ProxyProviderSvc_test.ref
+++ b/AtlasTest/ControlTest/share/ProxyProviderSvc_test.ref
@@ -1,51 +1,50 @@
-Initializing Gaudi ApplicationMgr using job opts /build/GMR/577.3/athena/AtlasTest/ControlTest/share/ProxyProviderSvc_test.txt
-JobOptionsSvc INFO # =======> /build/GMR/577.3/build/build/Athena/x86_64-centos7-gcc8-opt/jobOptions/ControlTest/StoreGateTestCommon.txt
-JobOptionsSvc INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore", "StoreGateSvc/ConditionStore"]
-JobOptionsSvc INFO # (6,1): AuditorSvc.Auditors += ["AlgContextAuditor"]
-JobOptionsSvc INFO # (7,1): StoreGateSvc.OutputLevel = 1
-JobOptionsSvc INFO # (8,1): StoreGateSvc.ActivateHistory = 0
-JobOptionsSvc INFO # (9,1): CLIDSvc.OutputLevel = 2
-JobOptionsSvc INFO # (10,1): MessageSvc.useColors = 1
-JobOptionsSvc INFO # =======> /build/GMR/577.3/build/build/Athena/x86_64-centos7-gcc8-opt/jobOptions/ToyConversion/ToyConversionOpts.txt
+Initializing Gaudi ApplicationMgr using job opts ../share/ProxyProviderSvc_test.txt
+JobOptionsSvc INFO # =======> /home/sss/atlas/dvtest/build/joboptions/ControlTest/StoreGateTestCommon.txt
+JobOptionsSvc INFO # (3,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore", "StoreGateSvc/ConditionStore"]
+JobOptionsSvc INFO # (4,1): AuditorSvc.Auditors += ["AlgContextAuditor"]
+JobOptionsSvc INFO # (5,1): StoreGateSvc.OutputLevel = 1
+JobOptionsSvc INFO # (6,1): StoreGateSvc.ActivateHistory = 0
+JobOptionsSvc INFO # (7,1): ClassIDSvc.CLIDDBFiles = {}
+JobOptionsSvc INFO # (8,1): MessageSvc.useColors = 1
+JobOptionsSvc INFO # =======> /home/sss/atlas/dvtest/build/joboptions/ToyConversion/ToyConversionOpts.txt
JobOptionsSvc INFO # (5,1): EventPersistencySvc.CnvServices += ["ToyConversionSvc"]
-JobOptionsSvc INFO # =======> /build/GMR/577.3/athena/AtlasTest/ControlTest/share/ProxyProviderSvc_test.txt
+JobOptionsSvc INFO # =======> /home/sss/nobackup/atlas/build-dvtest/../tests/../share/ProxyProviderSvc_test.txt
JobOptionsSvc INFO # (7,1): ProxyProviderSvc.OutputLevel = 1
JobOptionsSvc INFO # (9,1): ClassIDSvc.OutputLevel = 2
JobOptionsSvc INFO # (10,1): MessageSvc.setVerbose = ["DataProxy", "EventPersistencySvc", "ToyConversionSvc", "StoreGateSvc", "EventDataSvc", "HistogramDataSvc", "ServiceManager", "HistogramPersistencySvc", "HistoryStore", "DetectorStore", "ApplicationMgr", "ProxyProviderSvc"]
JobOptionsSvc INFO # (11,1): MessageSvc.setDebug = ["ClassIDSvc"]
-JobOptionsSvc INFO Job options successfully read in from /build/GMR/577.3/athena/AtlasTest/ControlTest/share/ProxyProviderSvc_test.txt
+JobOptionsSvc INFO Job options successfully read in from ../share/ProxyProviderSvc_test.txt
ApplicationMgr DEBUG Getting my own properties[m
ApplicationMgr SUCCESS
====================================================================================================================================
- Welcome to ApplicationMgr (GaudiCoreSvc v33r2)
- running on zeus on Tue Jul 28 09:01:40 2020
+ Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
+ running on karma on Wed Jan 18 16:14:34 2023
====================================================================================================================================[m
ApplicationMgr INFO Application Manager Configured successfully[m
ServiceManager DEBUG Initializing service DetectorStore[m
DetectorStore DEBUG Service base class initialized successfully[m
-DetectorStore VERBOSE Initializing DetectorStore
+DetectorStore VERBOSE Initializing DetectorStore[m
DetectorStore DEBUG trying to create store SGImplSvc/DetectorStore_Impl[m
DetectorStore_Impl DEBUG Property update for OutputLevel : new value = 1[m
-DetectorStore_ImplVERBOSE Initializing DetectorStore_Impl
+DetectorStore_ImplVERBOSE Initializing DetectorStore_Impl[m
DetectorStore_Impl DEBUG Service base class initialized successfully[m
EventPersistenc... DEBUG 'CnvServices':[ 'ToyConversionSvc' ][m
EventPersistenc... DEBUG Service base class initialized successfully[m
DetectorStore_ImplVERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc[m
ClassIDSvc DEBUG Service base class initialized successfully[m
-ClassIDSvc INFO getRegistryEntries: read 808 CLIDRegistry entries for module ALL[m
-ClassIDSvc DEBUG processCLIDDB: read 1747 entries from CLIDDB file: /build/GMR/577.3/build/build/Athena/x86_64-centos7-gcc8-opt/share/clid.db[m
+ClassIDSvc INFO getRegistryEntries: read 816 CLIDRegistry entries for module ALL[m
DetectorStore_ImplVERBOSE ServiceLocatorHelper::service: found service ClassIDSvc[m
-ProxyProviderSvc VERBOSE Initializing ProxyProviderSvc
+ProxyProviderSvc VERBOSE Initializing ProxyProviderSvc[m
ProxyProviderSvc VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc[m
ProxyProviderSvc DEBUG Service base class initialized successfully[m
ServiceManager DEBUG Initializing service HistoryStore[m
HistoryStore DEBUG Service base class initialized successfully[m
-HistoryStore VERBOSE Initializing HistoryStore
+HistoryStore VERBOSE Initializing HistoryStore[m
HistoryStore DEBUG trying to create store SGImplSvc/HistoryStore_Impl[m
HistoryStore_Impl DEBUG Property update for OutputLevel : new value = 1[m
-HistoryStore_Impl VERBOSE Initializing HistoryStore_Impl
+HistoryStore_Impl VERBOSE Initializing HistoryStore_Impl[m
HistoryStore_Impl DEBUG Service base class initialized successfully[m
HistoryStore_Impl VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc[m
HistoryStore_Impl VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc[m
@@ -64,22 +63,23 @@ HistogramDataSvc VERBOSE ServiceLocatorHelper::service: found service Histogram
ApplicationMgr INFO Application Manager Initialized successfully[m
ApplicationMgr Ready
StoreGateSvc DEBUG Service base class initialized successfully[m
-StoreGateSvc VERBOSE Initializing StoreGateSvc
+StoreGateSvc VERBOSE Initializing StoreGateSvc[m
StoreGateSvc DEBUG trying to create store SGImplSvc/StoreGateSvc_Impl[m
StoreGateSvc_Impl DEBUG Property update for OutputLevel : new value = 1[m
-StoreGateSvc_Impl VERBOSE Initializing StoreGateSvc_Impl
+StoreGateSvc_Impl VERBOSE Initializing StoreGateSvc_Impl[m
StoreGateSvc_Impl DEBUG Service base class initialized successfully[m
StoreGateSvc_Impl VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc[m
StoreGateSvc_Impl VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc[m
-ClassIDSvc INFO getRegistryEntries: read 1019 CLIDRegistry entries for module ALL[m
+ClassIDSvc INFO getRegistryEntries: read 1031 CLIDRegistry entries for module ALL[m
+StoreGateSvc_Impl DEBUG Bound handle 0x7ffd14df99d0 to proxy 0x244dd40[m
ToyConversionSvc DEBUG Service base class initialized successfully[m
EventPersistenc...VERBOSE ServiceLocatorHelper::service: found service ToyConversionSvc[m
EventPersistenc... INFO Added successfully Conversion service:ToyConversionSvc[m
-ClassIDSvc INFO getRegistryEntries: read 2 CLIDRegistry entries for module ALL[m
+ClassIDSvc INFO getRegistryEntries: read 2 CLIDRegistry entries for module ALL[m
<<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>>
SGImplSvc(StoreGateSvc_Impl)::dump():
Found 1 proxy for ClassID 8107 (Bar):
- flags: ( valid, locked, reset) --- data: 0x4bb7d50 --- key: aBar
+ flags: ( valid, locked, reset) --- data: 0x4750630 --- key: aBar
<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>
StoreGateSvc DEBUG Retrieved const pointer to object aFoo of type Foo(CLID 8101)[m
@@ -88,57 +88,35 @@ Now we expect to see an error message:
ToyConversionSvc INFO No converter for object CLID= 8109[m
[93;1mDataProxy WARNING accessData: conversion failed for data object 8109/aFooBar
Returning NULL DataObject pointer [m
-[93;1mSG::DataProxy_castWARNING this proxy 0x512fb80 has a NULL data object ptr[m
+[93;1mSG::DataProxy_castWARNING this proxy 0x42e3920 has a NULL data object ptr[m
<<---Error Message Ends-------
*** ProxyProviderSvc_test OK ***
*** ProxyProviderSvc_test RecordBeforeRead BEGINS ***
StoreGateSvc_Impl DEBUG Clearing store with forceRemove=0[m
+DataProxy VERBOSE requestRelease(): reset object aBar CLID 8107 address 0x4750630[m
+DataProxy VERBOSE requestRelease(): reset object aFoo CLID 8101 address 0x47654a0[m
+DataProxy VERBOSE requestRelease(): reset object aFooBar CLID 8109 address 0[m
[93;1mStoreGateSvc_Impl WARNING record_impl: you are recording an object with key existingFoo, type Foo (CLID 8101)
There is already a persistent version of this object. Recording a duplicate may lead to unreproducible results and it is deprecated.[m
-StoreGateSvc DEBUG Recorded object @0x4e61ac0 with key existingFoo of type Foo(CLID 8101)
- in DataObject @0x4f560f0
+StoreGateSvc DEBUG Recorded object @0x249cbe0 with key existingFoo of type Foo(CLID 8101)
+ in DataObject @0x488d0e0
object modifiable when retrieved[m
StoreGateSvc DEBUG Retrieved const pointer to object existingFoo of type Foo(CLID 8101)[m
6.28
*** ProxyProviderSvc_test RecordBeforeRead OK ***
-*** ProxyProviderSvc_test readPrivate BEGINS ***
-Now we expect to see an error message:
-----Error Message Starts--->>
-[93;1mStoreGateSvc_Impl WARNING SGImplSvc::typeless_readPrivateCopy: did not find object of type Foo with key NotThere[m
-[93;1mSG::fromStorable WARNING null input pointer [m
-<<---Error Message Ends-------
-[93;1mStoreGateSvc_Impl WARNING record_impl: you are recording an object with key privFoo, type Foo (CLID 8101)
- There is already a persistent version of this object. Recording a duplicate may lead to unreproducible results and it is deprecated.[m
-StoreGateSvc DEBUG Recorded object @0x4da0030 with key privFoo of type Foo(CLID 8101)
- in DataObject @0x4ed9a00
- object modifiable when retrieved[m
-StoreGateSvc DEBUG overwrite: Recorded object @0x4dbd370 with key privFoo of type Foo(CLID 8101)
- in DataObject @0x4ff46e0
- object modifiable when retrieved[m
-StoreGateSvc DEBUG Retrieved non-const pointer to object privFoo of type Foo(CLID 8101)[m
-StoreGateSvc DEBUG Recorded object @0x1d4f000 with key silly33 of type Foo(CLID 8101)
- in DataObject @0x509ef70
- object modifiable when retrieved[m
-StoreGateSvc DEBUG Retrieved non-const pointer to object silly33 of type Foo(CLID 8101)[m
-Now we expect to see an error message:
-----Error Message Starts--->>
-[93;1mStoreGateSvc_Impl WARNING SGImplSvc::typeless_readPrivateCopy: did not find object of type Foo with key silly33[m
-[93;1mSG::fromStorable WARNING null input pointer [m
-<<---Error Message Ends-------
-StoreGateSvc DEBUG Retrieved non-const pointer to object silly33 of type Foo(CLID 8101)[m
-Now we expect to see an error message:
-----Error Message Starts--->>
-[93;1mStoreGateSvc WARNING retrieve(non-const): No valid proxy for object silly33 of type Foo(CLID 8101)
- Try to use a const retrieve[m
-<<---Error Message Ends-------
-*** ProxyProviderSvc_test readPrivate OK ***
-
-
*** ProxyProviderSvc_test HLTAutoKeyReset BEGINS ***
StoreGateSvc_Impl DEBUG Clearing store with forceRemove=1[m
+DataProxy VERBOSE requestRelease(): release object aBar CLID 8107 address 0[m
+DataProxy VERBOSE requestRelease(): release object existingFoo CLID 8101 address 0x488d0e0[m
+DataProxy VERBOSE requestRelease(): release object aFooBar CLID 8109 address 0[m
+DataProxy VERBOSE requestRelease(): release object aFoo CLID 8101 address 0[m
StoreGateSvc_Impl DEBUG Clearing store with forceRemove=0[m
+DataProxy VERBOSE requestRelease(): release object HLTAutoKey_1 CLID 8101 address 0[m
+DataProxy VERBOSE requestRelease(): reset object NOT_HLTAutoKey_3 CLID 8101 address 0[m
+DataProxy VERBOSE requestRelease(): release object HLTAutoKey_2 CLID 8101 address 0[m
+DataProxy VERBOSE requestRelease(): release object HLTAutoKey_3 CLID 8101 address 0[m
*** ProxyProviderSvc_test HLTAutoKeyReset OK ***
@@ -146,26 +124,31 @@ StoreGateSvc_Impl DEBUG Clearing store with forceRemove=0[m
StoreGateSvc_Impl DEBUG Clearing store with forceRemove=1[m
+DataProxy VERBOSE requestRelease(): release object NOT_HLTAutoKey_3 CLID 8101 address 0[m
+DataProxy VERBOSE requestRelease(): release object HLTAutoKey_1 CLID 8101 address 0[m
=============Event #0 starts
-StoreGateSvc DEBUG overwrite: Recorded object @0x4dfc8d0 with key toOverwrite of type FooBar(CLID 8109)
- in DataObject @0x4f0e360
+StoreGateSvc DEBUG overwrite: Recorded object @0x457c490 with key toOverwrite of type FooBar(CLID 8109)
+ in DataObject @0x48f6940
object modifiable when retrieved[m
Overwritten FooBar i=0
StoreGateSvc_Impl DEBUG Clearing store with forceRemove=0[m
+DataProxy VERBOSE requestRelease(): release object toOverwrite CLID 8109 address 0x48f6940[m
FooBar i=0 deleted
=============Event #1 starts
-StoreGateSvc DEBUG overwrite: Recorded object @0x4ea01f0 with key toOverwrite of type FooBar(CLID 8109)
- in DataObject @0x4f0e360
+StoreGateSvc DEBUG overwrite: Recorded object @0x457c490 with key toOverwrite of type FooBar(CLID 8109)
+ in DataObject @0x48f6940
object modifiable when retrieved[m
Overwritten FooBar i=1
StoreGateSvc_Impl DEBUG Clearing store with forceRemove=0[m
+DataProxy VERBOSE requestRelease(): release object toOverwrite CLID 8109 address 0x48f6940[m
FooBar i=1 deleted
=============Event #2 starts
-StoreGateSvc DEBUG overwrite: Recorded object @0x4ee38b0 with key toOverwrite of type FooBar(CLID 8109)
- in DataObject @0x4f0e360
+StoreGateSvc DEBUG overwrite: Recorded object @0x457c490 with key toOverwrite of type FooBar(CLID 8109)
+ in DataObject @0x48f6940
object modifiable when retrieved[m
Overwritten FooBar i=2
StoreGateSvc_Impl DEBUG Clearing store with forceRemove=0[m
+DataProxy VERBOSE requestRelease(): release object toOverwrite CLID 8109 address 0x48f6940[m
FooBar i=2 deleted
*** ProxyProviderSvc_test Overwrite OK ***
diff --git a/AtlasTest/ControlTest/share/StoreGateSvcClient_test.ref b/AtlasTest/ControlTest/share/StoreGateSvcClient_test.ref
index 689441683e6afba558e9d9d7af5e889f1f7bd9f4..67295afbca9114db947a0f07513db9db296fa778 100644
--- a/AtlasTest/ControlTest/share/StoreGateSvcClient_test.ref
+++ b/AtlasTest/ControlTest/share/StoreGateSvcClient_test.ref
@@ -2,129 +2,128 @@
Initializing Gaudi ApplicationMgr using job opts ../share/StoreGateSvcClient_test.txt
JobOptionsSvc INFO # =======> /home/sss/atlas/dvtest/build/joboptions/ControlTest/StoreGateTestCommon.txt
-JobOptionsSvc INFO # (5,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore", "StoreGateSvc/ConditionStore"]
-JobOptionsSvc INFO # (6,1): AuditorSvc.Auditors += ["AlgContextAuditor"]
-JobOptionsSvc INFO # (7,1): StoreGateSvc.OutputLevel = 1
-JobOptionsSvc INFO # (8,1): StoreGateSvc.ActivateHistory = 0
-JobOptionsSvc INFO # (9,1): CLIDSvc.OutputLevel = 2
-JobOptionsSvc INFO # (10,1): MessageSvc.useColors = 1
+JobOptionsSvc INFO # (3,1): ApplicationMgr.ExtSvc += ["StoreGateSvc/DetectorStore", "StoreGateSvc/HistoryStore", "StoreGateSvc/ConditionStore"]
+JobOptionsSvc INFO # (4,1): AuditorSvc.Auditors += ["AlgContextAuditor"]
+JobOptionsSvc INFO # (5,1): StoreGateSvc.OutputLevel = 1
+JobOptionsSvc INFO # (6,1): StoreGateSvc.ActivateHistory = 0
+JobOptionsSvc INFO # (7,1): ClassIDSvc.CLIDDBFiles = {}
+JobOptionsSvc INFO # (8,1): MessageSvc.useColors = 1
JobOptionsSvc INFO Job options successfully read in from ../share/StoreGateSvcClient_test.txt
ApplicationMgr SUCCESS
====================================================================================================================================
Welcome to ApplicationMgr (GaudiCoreSvc v27r1p99)
- running on karma on Tue Jul 17 15:37:37 2018
+ running on karma on Wed Jan 18 16:13:57 2023
====================================================================================================================================[m
ApplicationMgr INFO Application Manager Configured successfully[m
-ClassIDSvc INFO getRegistryEntries: read 2474 CLIDRegistry entries for module ALL[m
+ClassIDSvc INFO getRegistryEntries: read 886 CLIDRegistry entries for module ALL[m
[93;1mEventLoopMgr WARNING Unable to locate service "EventSelector" [m
[93;1mEventLoopMgr WARNING No events will be processed from external input.[m
-[93;1mHistogramPersis...WARNING Histograms saving not required.[m
ApplicationMgr INFO Application Manager Initialized successfully[m
ApplicationMgr Ready
-StoreGateSvc DEBUG Property update for OutputLevel : new value = 1
-StoreGateSvc DEBUG Service base class initialized successfully
-StoreGateSvc VERBOSE Initializing StoreGateSvc
-StoreGateSvc DEBUG trying to create store SGImplSvc/StoreGateSvc_Impl
-StoreGateSvc_Impl DEBUG Property update for OutputLevel : new value = 1
-StoreGateSvc_Impl VERBOSE Initializing StoreGateSvc_Impl
-StoreGateSvc_Impl DEBUG Service base class initialized successfully
-StoreGateSvc_Impl VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc
-StoreGateSvc_Impl VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc
+StoreGateSvc DEBUG Property update for OutputLevel : new value = 1[m
+StoreGateSvc DEBUG Service base class initialized successfully[m
+StoreGateSvc VERBOSE Initializing StoreGateSvc[m
+StoreGateSvc DEBUG trying to create store SGImplSvc/StoreGateSvc_Impl[m
+StoreGateSvc_Impl DEBUG Property update for OutputLevel : new value = 1[m
+StoreGateSvc_Impl VERBOSE Initializing StoreGateSvc_Impl[m
+StoreGateSvc_Impl DEBUG Service base class initialized successfully[m
+StoreGateSvc_Impl VERBOSE ServiceLocatorHelper::service: found service EventPersistencySvc[m
+StoreGateSvc_Impl VERBOSE ServiceLocatorHelper::service: found service ClassIDSvc[m
*** StoreGateSvcClient_test record BEGINS ***
-StoreGateSvc DEBUG Recorded object @0xfe9900 with key pFoo1 of type Foo(CLID 8101)
- in DataObject @0xfe9e20
+StoreGateSvc DEBUG Recorded object @0x1ddf9d0 with key pFoo1 of type Foo(CLID 8101)
+ in DataObject @0x1ddffb0
object modifiable when retrieved[m
Now we expect to see an error message:
----Error Message Starts--->>
[93;1mStoreGateSvc_Impl WARNING setupProxy:: error setting up proxy for key pFoo1 and clid 8101
- Pre-existing valid DataProxy @0xfe9f90 found in Store for key pFoo1 with clid 8101[m
-ClassIDSvc INFO getRegistryEntries: read 372 CLIDRegistry entries for module ALL[m
-[93;1mStoreGateSvc_Impl WARNING record_impl: Problem setting up the proxy for object @0xfea620
- recorded with key pFoo1 of type Foo (CLID 8101) in DataObject @0xfea7d0[m
+ Pre-existing valid DataProxy @0x1b898a0 found in Store for key pFoo1 with clid 8101[m
+ClassIDSvc INFO getRegistryEntries: read 1031 CLIDRegistry entries for module ALL[m
+[93;1mStoreGateSvc_Impl WARNING record_impl: Problem setting up the proxy for object @0x1de02d0
+ recorded with key pFoo1 of type Foo (CLID 8101) in DataObject @0x1de06f0[m
<<---Error Message Ends-------
Now we expect to see an error message:
----Error Message Starts--->>
[93;1mStoreGateSvc_Impl WARNING record_impl: failed for key=pFoo2, type Foo (CLID 8101)
- object @0xfe9900 already in store with key=pFoo1. Will not record a duplicate! [m
+ object @0x1ddf9d0 already in store with key=pFoo1. Will not record a duplicate! [m
<<---Error Message Ends-------
-StoreGateSvc DEBUG Recorded object @0xfea840 with key pFoo2 of type Foo(CLID 8101)
- in DataObject @0xff7210
+StoreGateSvc DEBUG Recorded object @0x1e11010 with key pFoo2 of type Foo(CLID 8101)
+ in DataObject @0x1df36b0
object modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0xfc7e80 with key cpFoo of type Foo(CLID 8101)
- in DataObject @0xff70a0
+StoreGateSvc DEBUG Recorded object @0x1df5690 with key cpFoo of type Foo(CLID 8101)
+ in DataObject @0x1df3540
object not modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0xfea820 with key silly of type Foo(CLID 8101)
- in DataObject @0x10030d0
+StoreGateSvc DEBUG Recorded object @0x1e11250 with key silly of type Foo(CLID 8101)
+ in DataObject @0x1df2dd0
object modifiable when retrieved[m
Now we expect to see an error message:
----Error Message Starts--->>
[93;1mStoreGateSvc_Impl WARNING setupProxy:: error setting up proxy for key silly and clid 8101
- Pre-existing valid DataProxy @0xffa2c0 found in Store for key silly with clid 8101[m
-[93;1mStoreGateSvc_Impl WARNING record_impl: Problem setting up the proxy for object @0xfc7ea0
- recorded with key silly of type Foo (CLID 8101) in DataObject @0x1000ee0[m
+ Pre-existing valid DataProxy @0x1df7080 found in Store for key silly with clid 8101[m
+[93;1mStoreGateSvc_Impl WARNING record_impl: Problem setting up the proxy for object @0x1df3cd0
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x1df34c0[m
<<---Error Message Ends-------
Now we expect to see an error message:
----Error Message Starts--->>
[93;1mStoreGateSvc_Impl WARNING setupProxy:: error setting up proxy for key silly and clid 8101
- Pre-existing valid DataProxy @0xffa2c0 found in Store for key silly with clid 8101[m
-[93;1mStoreGateSvc_Impl WARNING record_impl: Problem setting up the proxy for object @0x1003e90
- recorded with key silly of type Foo (CLID 8101) in DataObject @0x1000fd0[m
+ Pre-existing valid DataProxy @0x1df7080 found in Store for key silly with clid 8101[m
+[93;1mStoreGateSvc_Impl WARNING record_impl: Problem setting up the proxy for object @0x1dfa450
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x1df49c0[m
<<---Error Message Ends-------
Now we expect to see an error message:
----Error Message Starts--->>
[93;1mStoreGateSvc_Impl WARNING setupProxy:: error setting up proxy for key silly and clid 8101
- Pre-existing valid DataProxy @0xffa2c0 found in Store for key silly with clid 8101[m
-[93;1mStoreGateSvc_Impl WARNING record_impl: Problem setting up the proxy for object @0x1004bc0
- recorded with key silly of type Foo (CLID 8101) in DataObject @0x1001050[m
+ Pre-existing valid DataProxy @0x1df7080 found in Store for key silly with clid 8101[m
+[93;1mStoreGateSvc_Impl WARNING record_impl: Problem setting up the proxy for object @0x1df4a10
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x1df5710[m
<<---Error Message Ends-------
-StoreGateSvc DEBUG Recorded object @0x1002dd0 with key UnLocked of type Foo(CLID 8101)
- in DataObject @0x1002f60
+StoreGateSvc DEBUG Recorded object @0x1df6f30 with key UnLocked of type Foo(CLID 8101)
+ in DataObject @0x1df5820
object modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0xfc34b0 with key Locked of type Foo(CLID 8101)
- in DataObject @0xffad60
+StoreGateSvc DEBUG Recorded object @0x1df4320 with key Locked of type Foo(CLID 8101)
+ in DataObject @0x1df4080
object not modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0x1003e10 with key LockedReset of type Foo(CLID 8101)
- in DataObject @0xffcde0
+StoreGateSvc DEBUG Recorded object @0x1dfa2c0 with key LockedReset of type Foo(CLID 8101)
+ in DataObject @0x1dfa2e0
object not modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0x1004b80 with key UnLockedReset of type Foo(CLID 8101)
- in DataObject @0x1002e50
+StoreGateSvc DEBUG Recorded object @0x1df8810 with key UnLockedReset of type Foo(CLID 8101)
+ in DataObject @0x1df8830
object modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0xfe9ee0 with key LockedDelete of type Foo(CLID 8101)
- in DataObject @0xff9290
+StoreGateSvc DEBUG Recorded object @0x1df6da0 with key LockedDelete of type Foo(CLID 8101)
+ in DataObject @0x1df6dc0
object not modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0x1004ba0 with key UnLockedDelete of type Foo(CLID 8101)
- in DataObject @0xff9360
+StoreGateSvc DEBUG Recorded object @0x1df2ce0 with key UnLockedDelete of type Foo(CLID 8101)
+ in DataObject @0x1df52c0
object modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0x1002c20 with key Const of type Foo(CLID 8101)
- in DataObject @0xffb1b0
+StoreGateSvc DEBUG Recorded object @0x1df5610 with key Const of type Foo(CLID 8101)
+ in DataObject @0x1df4620
object not modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0x1002c00 with key Const2 of type Foo(CLID 8101)
- in DataObject @0xffb310
+StoreGateSvc DEBUG Recorded object @0x1df4900 with key Const2 of type Foo(CLID 8101)
+ in DataObject @0x1df4920
object not modifiable when retrieved[m
Now we expect to see an error message:
----Error Message Starts--->>
[93;1mStoreGateSvc_Impl WARNING setupProxy:: error setting up proxy for key Const and clid 8101
- Pre-existing valid DataProxy @0x10027d0 found in Store for key Const with clid 8101[m
-[93;1mStoreGateSvc_Impl WARNING record_impl: Problem setting up the proxy for object @0x1002b60
- recorded with key Const of type Foo (CLID 8101) in DataObject @0xffb430[m
+ Pre-existing valid DataProxy @0x1df46c0 found in Store for key Const with clid 8101[m
+[93;1mStoreGateSvc_Impl WARNING record_impl: Problem setting up the proxy for object @0x1df7540
+ recorded with key Const of type Foo (CLID 8101) in DataObject @0x1df7590[m
<<---Error Message Ends-------
-StoreGateSvc DEBUG Recorded object @0x1002b00 with key ow of type Foo(CLID 8101)
- in DataObject @0xffd1e0
+StoreGateSvc DEBUG Recorded object @0x1df7620 with key ow of type Foo(CLID 8101)
+ in DataObject @0x1df2e70
object modifiable when retrieved[m
-StoreGateSvc DEBUG overwrite: Recorded object @0x1002d70 with key ow of type Foo(CLID 8101)
- in DataObject @0xffd300
+StoreGateSvc DEBUG overwrite: Recorded object @0x1df30e0 with key ow of type Foo(CLID 8101)
+ in DataObject @0x1df3130
object modifiable when retrieved[m
-StoreGateSvc DEBUG overwrite: Recorded object @0x1002b00 with key ow of type Foo(CLID 8101)
- in DataObject @0xffd1e0
+StoreGateSvc DEBUG overwrite: Recorded object @0x1df7620 with key ow of type Foo(CLID 8101)
+ in DataObject @0x1df2e70
object modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0x1001e10 with key ow2 of type Foo(CLID 8101)
- in DataObject @0xffd300
+StoreGateSvc DEBUG Recorded object @0x1df30e0 with key ow2 of type Foo(CLID 8101)
+ in DataObject @0x1df3130
object not modifiable when retrieved[m
-StoreGateSvc DEBUG overwrite: Recorded object @0x1000d50 with key ow2 of type Foo(CLID 8101)
- in DataObject @0xffd460
+StoreGateSvc DEBUG overwrite: Recorded object @0x1df39f0 with key ow2 of type Foo(CLID 8101)
+ in DataObject @0x1df8b10
object not modifiable when retrieved[m
-StoreGateSvc DEBUG overwrite: Recorded object @0x1000ca0 with key ow2 of type Foo(CLID 8101)
- in DataObject @0xffd300
+StoreGateSvc DEBUG overwrite: Recorded object @0x1df30e0 with key ow2 of type Foo(CLID 8101)
+ in DataObject @0x1df3130
object not modifiable when retrieved[m
*** StoreGateSvcClient_test records OK ***
@@ -201,12 +200,6 @@ Now we expect to see an error message:
*** StoreGateSvcClient_test symlinks OK ***
-*** StoreGateSvcClient_test readPrivateCopy BEGINS ***
-StoreGateSvc DEBUG Retrieved const pointer to object silly of type Foo(CLID 8101)[m
-[93;1mStoreGateSvc_Impl WARNING SGImplSvc::typeless_readPrivateCopy: did not find object of type Foo with key silly[m
-[93;1mSG::fromStorable WARNING null input pointer [m
-StoreGateSvc DEBUG Retrieved const pointer to object silly of type Foo(CLID 8101)[m
-*** StoreGateSvcClient_test readPrivateCopy OK ***
*** StoreGateSvcClient_test retrievePrivateCopy BEGINS ***
StoreGateSvc DEBUG Retrieved const pointer to object silly of type Foo(CLID 8101)[m
Now we expect to see an error message:
@@ -225,47 +218,47 @@ Now we expect to see an error message:
[93;1mStoreGateSvc WARNING retrieve(non-const): No valid proxy for object of type Foo(CLID 8101)
Try to use a const retrieve[m
<<---Error Message Ends-------
-StoreGateSvc DEBUG Recorded object @0x1000db0 with key pFooKey of type Foo(CLID 8101)
- in DataObject @0x10030d0
+StoreGateSvc DEBUG Recorded object @0x1df32d0 with key pFooKey of type Foo(CLID 8101)
+ in DataObject @0x1df8ee0
object modifiable when retrieved[m
Now we expect to see an error for invalid proxy >>>
[93;1mStoreGateSvc WARNING retrieve(non-const): No valid proxy for object pFooKey of type Foo(CLID 8101)
Try to use a const retrieve[m
end of error >>>>>>>>>>>>>
-StoreGateSvc DEBUG Recorded object @0x1000cf0 with key pFooKey of type Foo(CLID 8101)
- in DataObject @0x10030d0
+StoreGateSvc DEBUG Recorded object @0x1df39d0 with key pFooKey of type Foo(CLID 8101)
+ in DataObject @0x1df8ee0
object modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0x1003d90 with key pFooKey of type Foo(CLID 8101)
- in DataObject @0x10030d0
+StoreGateSvc DEBUG Recorded object @0x1df3460 with key pFooKey of type Foo(CLID 8101)
+ in DataObject @0x1df8ee0
object modifiable when retrieved[m
*** StoreGateSvcClient_test removes OK ***
*** StoreGateSvcClient_test testCreate BEGINS ***
-StoreGateSvc DEBUG Recorded object @0x1000db0 with key pCreateFooDefault of type Foo(CLID 8101)
- in DataObject @0x10030d0
+StoreGateSvc DEBUG Recorded object @0x1df32f0 with key pCreateFooDefault of type Foo(CLID 8101)
+ in DataObject @0x1df8ee0
object modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0x1000d50 with key pCreateFoo1 of type Foo(CLID 8101)
- in DataObject @0x10013b0
+StoreGateSvc DEBUG Recorded object @0x1df39d0 with key pCreateFoo1 of type Foo(CLID 8101)
+ in DataObject @0x1dfa5a0
object modifiable when retrieved[m
Now we expect to see an error message:
----Error Message Starts--->>
[93;1mStoreGateSvc_Impl WARNING setupProxy:: error setting up proxy for key pCreateFoo1 and clid 8101
- Pre-existing valid DataProxy @0xffe3c0 found in Store for key pCreateFoo1 with clid 8101[m
-[93;1mStoreGateSvc_Impl WARNING record_impl: Problem setting up the proxy for object @0x1002ae0
- recorded with key pCreateFoo1 of type Foo (CLID 8101) in DataObject @0x10014e0[m
-[97;101;1mStoreGateSvc ERROR create: problem recording created object @0x1002ae0 using key pCreateFoo1[m
+ Pre-existing valid DataProxy @0x1dfa640 found in Store for key pCreateFoo1 with clid 8101[m
+[93;1mStoreGateSvc_Impl WARNING record_impl: Problem setting up the proxy for object @0x1dfa800
+ recorded with key pCreateFoo1 of type Foo (CLID 8101) in DataObject @0x1dfa850[m
+[97;101;1mStoreGateSvc ERROR create: problem recording created object @0x1dfa800 using key pCreateFoo1[m
<<---Error Message Ends-------
StoreGateSvc DEBUG Retrieved non-const pointer to object pCreateFoo1 of type Foo(CLID 8101)[m
*** StoreGateSvcClient_test testCreate OK ***
*** StoreGateSvcClient_test bind BEGINS ***
-StoreGateSvc DEBUG Recorded object @0x1000a60 with key fooKey of type Foo(CLID 8101)
- in DataObject @0x1001560
+StoreGateSvc DEBUG Recorded object @0x1dfa900 with key fooKey of type Foo(CLID 8101)
+ in DataObject @0x1dfa920
object modifiable when retrieved[m
-StoreGateSvc_Impl DEBUG Bound handle 0x7ffdc6567200 to proxy 0x1004850[m
+StoreGateSvc_Impl DEBUG Bound handle 0x7ffed8106ea0 to proxy 0x1dfa9c0[m
*** StoreGateSvcClient_test bind OK ***
@@ -274,39 +267,39 @@ Testing dump:
<<<<<<<<<<<<<<<<< Data Store Dump >>>>>>>>>>>>>>>
SGImplSvc(StoreGateSvc_Impl)::dump():
Found 1 proxy for ClassID 8100 (Base):
- flags: ( valid, UNLOCKED, reset) --- data: 0x1002f60 --- key: UnLocked
+ flags: ( valid, UNLOCKED, reset) --- data: 0x1df5820 --- key: UnLocked
Found 17 proxies for ClassID 8101 (Foo):
- flags: ( valid, locked, reset) --- data: 0xffb1b0 --- key: Const
- flags: ( valid, locked, reset) --- data: 0xffb310 --- key: Const2
- flags: ( valid, locked, reset) --- data: 0xffad60 --- key: Locked
- flags: ( valid, locked, DELETE) --- data: 0xff9290 --- key: LockedDelete
- flags: ( valid, locked, reset) --- data: 0xffcde0 --- key: LockedReset
- flags: ( valid, UNLOCKED, reset) --- data: 0x1002f60 --- key: UnLocked
- flags: ( valid, UNLOCKED, DELETE) --- data: 0xff9360 --- key: UnLockedDelete
- flags: ( valid, UNLOCKED, reset) --- data: 0x1002e50 --- key: UnLockedReset
- flags: ( valid, locked, reset) --- data: 0xff70a0 --- key: cpFoo
- flags: ( valid, UNLOCKED, reset) --- data: 0x1001560 --- key: fooKey
- flags: ( valid, UNLOCKED, DELETE) --- data: 0xffd1e0 --- key: ow
- flags: ( valid, locked, DELETE) --- data: 0xffd300 --- key: ow2
- flags: ( valid, UNLOCKED, reset) --- data: 0x10013b0 --- key: pCreateFoo1
- flags: ( valid, UNLOCKED, reset) --- data: 0x10030d0 --- key: pCreateFooDefault
- flags: ( valid, UNLOCKED, reset) --- data: 0xfe9e20 --- key: pFoo1
- flags: ( valid, UNLOCKED, reset) --- data: 0xff7210 --- key: pFoo2
+ flags: ( valid, locked, reset) --- data: 0x1df4620 --- key: Const
+ flags: ( valid, locked, reset) --- data: 0x1df4920 --- key: Const2
+ flags: ( valid, locked, reset) --- data: 0x1df4080 --- key: Locked
+ flags: ( valid, locked, DELETE) --- data: 0x1df6dc0 --- key: LockedDelete
+ flags: ( valid, locked, reset) --- data: 0x1dfa2e0 --- key: LockedReset
+ flags: ( valid, UNLOCKED, reset) --- data: 0x1df5820 --- key: UnLocked
+ flags: ( valid, UNLOCKED, DELETE) --- data: 0x1df52c0 --- key: UnLockedDelete
+ flags: ( valid, UNLOCKED, reset) --- data: 0x1df8830 --- key: UnLockedReset
+ flags: ( valid, locked, reset) --- data: 0x1df3540 --- key: cpFoo
+ flags: ( valid, UNLOCKED, reset) --- data: 0x1dfa920 --- key: fooKey
+ flags: ( valid, UNLOCKED, DELETE) --- data: 0x1df2e70 --- key: ow
+ flags: ( valid, locked, DELETE) --- data: 0x1df3130 --- key: ow2
+ flags: ( valid, UNLOCKED, reset) --- data: 0x1dfa5a0 --- key: pCreateFoo1
+ flags: ( valid, UNLOCKED, reset) --- data: 0x1df8ee0 --- key: pCreateFooDefault
+ flags: ( valid, UNLOCKED, reset) --- data: 0x1ddffb0 --- key: pFoo1
+ flags: ( valid, UNLOCKED, reset) --- data: 0x1df36b0 --- key: pFoo2
flags: (INVALID, UNLOCKED, reset) --- data: 0 --- key: silly
<<<<<<<<<<<<<<<<<<<<<<<<<>>>>>>>>>>>>>>>>>>>>>>>>
<<--------
StoreGateSvc_Impl DEBUG Clearing store with forceRemove=1[m
-StoreGateSvc DEBUG Recorded object @0xff6f00 with key d1 of type D1(CLID 8112)
- in DataObject @0x10014e0
+StoreGateSvc DEBUG Recorded object @0x1df90b0 with key d1 of type D1(CLID 8112)
+ in DataObject @0x1dfa850
object modifiable when retrieved[m
StoreGateSvc DEBUG Retrieved non-const pointer to object d1 of type B1(CLID 8111)[m
-0xfe9330
-0xfe81b0StoreGateSvc
+0x1ddf280
+0x1ddc2c0StoreGateSvc
StoreGateSvc DEBUG Retrieved non-const pointer to object d1Alias of type D1(CLID 8112)[m
StoreGateSvc DEBUG Retrieved non-const pointer to object d1AnotherAlias of type D1(CLID 8112)[m
-StoreGateSvc DEBUG Recorded object @0x1003a70 with key d2 of type D1(CLID 8112)
- in DataObject @0xff8e50
+StoreGateSvc DEBUG Recorded object @0x1df54b0 with key d2 of type D1(CLID 8112)
+ in DataObject @0x1df4080
object modifiable when retrieved[m
StoreGateSvc DEBUG Retrieved non-const pointer to object d2 of type D1(CLID 8112)[m
StoreGateSvc DEBUG Retrieved non-const pointer to object d1Alias of type D1(CLID 8112)[m
@@ -320,11 +313,11 @@ StoreGateSvc DEBUG Retrieved non-const pointer to object dd of type B1(C
StoreGateSvc_Impl DEBUG Clearing store with forceRemove=1[m
*** StoreGateSvcClient_test transientSwap BEGINS ***
-StoreGateSvc DEBUG Recorded object @0x1002f40 with key pSwapFoo1 of type Foo(CLID 8101)
- in DataObject @0xff7210
+StoreGateSvc DEBUG Recorded object @0x1df6f30 with key pSwapFoo1 of type Foo(CLID 8101)
+ in DataObject @0x1df36b0
object modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0xfe9920 with key pSwapFoo2 of type Foo(CLID 8101)
- in DataObject @0xffb160
+StoreGateSvc DEBUG Recorded object @0x1de0760 with key pSwapFoo2 of type Foo(CLID 8101)
+ in DataObject @0x1df4620
object modifiable when retrieved[m
StoreGateSvc DEBUG Retrieved non-const pointer to object pSwapFoo1 of type Foo(CLID 8101)[m
StoreGateSvc DEBUG Retrieved non-const pointer to object pSwapFoo2 of type Foo(CLID 8101)[m
@@ -333,29 +326,29 @@ StoreGateSvc DEBUG Retrieved non-const pointer to object pSwapFoo2 of ty
*** StoreGateSvcClient_test VersionedKey BEGINS ***
-StoreGateSvc DEBUG Recorded object @0xec4d50 with key aVersObj of type Foo(CLID 8101)
- in DataObject @0xff8dd0
+StoreGateSvc DEBUG Recorded object @0x1e11270 with key aVersObj of type Foo(CLID 8101)
+ in DataObject @0x1df4a60
object modifiable when retrieved[m
StoreGateSvc DEBUG Retrieved non-const pointer to object aVersObj of type Foo(CLID 8101)[m
-StoreGateSvc DEBUG Recorded object @0x1000a80 with key ;77;aVersObj of type Foo(CLID 8101)
- in DataObject @0xffb310
+StoreGateSvc DEBUG Recorded object @0x1ddf780 with key ;77;aVersObj of type Foo(CLID 8101)
+ in DataObject @0x1df7480
object modifiable when retrieved[m
StoreGateSvc DEBUG Retrieved non-const pointer to object ;77;aVersObj of type Foo(CLID 8101)[m
StoreGateSvc DEBUG Retrieved non-const pointer to object aVersObj of type Foo(CLID 8101)[m
StoreGateSvc DEBUG Retrieved non-const pointer to object ;00;aVersObj of type Foo(CLID 8101)[m
-StoreGateSvc DEBUG Recorded object @0xfc34b0 with key ;88;aVersObj of type Foo(CLID 8101)
- in DataObject @0xffcde0
+StoreGateSvc DEBUG Recorded object @0x1df4320 with key ;88;aVersObj of type Foo(CLID 8101)
+ in DataObject @0x1df87a0
object modifiable when retrieved[m
StoreGateSvc DEBUG Retrieved non-const pointer to object ;88;aVersObj of type Foo(CLID 8101)[m
Now we expect to see an error message:
----Error Message Starts--->>
[93;1mStoreGateSvc_Impl WARNING setupProxy:: error setting up proxy for key ;88;aVersObj and clid 8101
- Pre-existing valid DataProxy @0xffe3c0 found in Store for key ;88;aVersObj with clid 8101[m
-[93;1mStoreGateSvc_Impl WARNING record_impl: Problem setting up the proxy for object @0x1001d90
- recorded with key ;88;aVersObj of type Foo (CLID 8101) in DataObject @0xffcf50[m
+ Pre-existing valid DataProxy @0x1dfa640 found in Store for key ;88;aVersObj with clid 8101[m
+[93;1mStoreGateSvc_Impl WARNING record_impl: Problem setting up the proxy for object @0x1df3ea0
+ recorded with key ;88;aVersObj of type Foo (CLID 8101) in DataObject @0x1df8830[m
<<---Error Message Ends-------
-StoreGateSvc DEBUG Recorded object @0x1002c70 with key ;66;aVersObj of type Foo(CLID 8101)
- in DataObject @0xffb280
+StoreGateSvc DEBUG Recorded object @0x1df87f0 with key ;66;aVersObj of type Foo(CLID 8101)
+ in DataObject @0x1df4920
object modifiable when retrieved[m
StoreGateSvc DEBUG Retrieved non-const pointer to object aVersObj of type Foo(CLID 8101)[m
*** StoreGateSvcClient_test VersionedKey OK ***
@@ -363,27 +356,27 @@ StoreGateSvc DEBUG Retrieved non-const pointer to object aVersObj of typ
StoreGateSvc_Impl DEBUG Clearing store with forceRemove=1[m
*** test_DVL_conversions
-StoreGateSvc DEBUG Recorded object @0xff9960 with key contd of type CV(CLID 82734625)
- in DataObject @0xff77e0
+StoreGateSvc DEBUG Recorded object @0x1df5d10 with key contd of type CV(CLID 82734625)
+ in DataObject @0x1dc2c10
object modifiable when retrieved[m
StoreGateSvc DEBUG Retrieved non-const pointer to object contd of type DataVector<C>(CLID 82734623)[m
StoreGateSvc DEBUG Retrieved non-const pointer to object contd of type DataVector<B>(CLID 82734621)[m
StoreGateSvc DEBUG Retrieved non-const pointer to object contd of type DataVector<A>(CLID 82734619)[m
StoreGateSvc DEBUG Retrieved non-const pointer to object contd of type DataVector<A>(CLID 82734619)[m
*** test_const_DVL
-StoreGateSvc DEBUG Recorded object @0x1005870 with key dvl of type CV(CLID 82734625)
- in DataObject @0xff7730
+StoreGateSvc DEBUG Recorded object @0x1df4560 with key dvl of type CV(CLID 82734625)
+ in DataObject @0x1dc2b60
object not modifiable when retrieved[m
[93;1mStoreGateSvc WARNING retrieve(non-const): No valid proxy for object dvl of type CV(CLID 82734625)
Try to use a const retrieve[m
StoreGateSvc DEBUG Retrieved const pointer to object dvl of type CV(CLID 82734625)[m
-StoreGateSvc DEBUG Recorded object @0xfd4150 with key dvl2 of type CV(CLID 82734625)
- in DataObject @0xff7370
+StoreGateSvc DEBUG Recorded object @0x1df4460 with key dvl2 of type CV(CLID 82734625)
+ in DataObject @0x1dc3070
object not modifiable when retrieved[m
StoreGateSvc DEBUG Retrieved const pointer to object dvl2 of type CV(CLID 82734625)[m
*** test_copy_conversions
-StoreGateSvc DEBUG Recorded object @0x1002b20 with key x of type Athena_test::X(CLID 82734627)
- in DataObject @0xffb1b0
+StoreGateSvc DEBUG Recorded object @0x1df6f50 with key x of type Athena_test::X(CLID 82734627)
+ in DataObject @0x1de0390
object modifiable when retrieved[m
[93;1mSG::DataProxy_castWARNING Request for a non-const object via copying conversion; requested CLID = 82734628, proxy primary ID is 82734627[m
StoreGateSvc DEBUG Retrieved const pointer to object x of type Athena_test::Y(CLID 82734628)[m
@@ -391,31 +384,31 @@ StoreGateSvc DEBUG Retrieved const pointer to object x of type Athena_te
*** StoreGateSvcClient_test Keys BEGINS ***
StoreGateSvc_Impl DEBUG Clearing store with forceRemove=0[m
-StoreGateSvc DEBUG Recorded object @0x1000ca0 with key LockReset of type Foo(CLID 8101)
- in DataObject @0xffb1b0
+StoreGateSvc DEBUG Recorded object @0x1df7220 with key LockReset of type Foo(CLID 8101)
+ in DataObject @0x1de0390
object not modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0xf23730 with key UnLockReset of type Foo(CLID 8101)
- in DataObject @0xffb6b0
+StoreGateSvc DEBUG Recorded object @0x1e11010 with key UnLockReset of type Foo(CLID 8101)
+ in DataObject @0x1dfa1e0
object modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0xec4d50 with key LockDelete of type Foo(CLID 8101)
- in DataObject @0xfface0
+StoreGateSvc DEBUG Recorded object @0x1df3f20 with key LockDelete of type Foo(CLID 8101)
+ in DataObject @0x1df86f0
object not modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0x1002c00 with key UnLockDelete of type Foo(CLID 8101)
- in DataObject @0x1003200
+StoreGateSvc DEBUG Recorded object @0x1df6f50 with key UnLockDelete of type Foo(CLID 8101)
+ in DataObject @0x1df6c10
object modifiable when retrieved[m
StoreGateSvc_Impl DEBUG Clearing store with forceRemove=0[m
StoreGateSvc_Impl DEBUG Clearing store with forceRemove=1[m
-StoreGateSvc DEBUG Recorded object @0x1002bb0 with key LockReset of type Foo(CLID 8101)
- in DataObject @0x10010d0
+StoreGateSvc DEBUG Recorded object @0x1df5cd0 with key LockReset of type Foo(CLID 8101)
+ in DataObject @0x1df8c00
object not modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0xfc7e80 with key UnLockReset of type Foo(CLID 8101)
- in DataObject @0x10017e0
+StoreGateSvc DEBUG Recorded object @0x1df5690 with key UnLockReset of type Foo(CLID 8101)
+ in DataObject @0x1df8b60
object modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0x1002b20 with key LockDelete of type Foo(CLID 8101)
- in DataObject @0x10032b0
+StoreGateSvc DEBUG Recorded object @0x1df3ea0 with key LockDelete of type Foo(CLID 8101)
+ in DataObject @0x1dfa1e0
object not modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0x1004c80 with key UnLockDelete of type Foo(CLID 8101)
- in DataObject @0xff73f0
+StoreGateSvc DEBUG Recorded object @0x1df4a10 with key UnLockDelete of type Foo(CLID 8101)
+ in DataObject @0x1df8c50
object modifiable when retrieved[m
StoreGateSvc_Impl DEBUG Clearing store with forceRemove=0[m
StoreGateSvc_Impl DEBUG Clearing store with forceRemove=1[m
@@ -423,26 +416,26 @@ StoreGateSvc_Impl DEBUG Clearing store with forceRemove=1[m
*** StoreGateSvcClient_test Keys ENDS ***
*** StoreGateSvcClient_test retrieveAux BEGINS ***
-StoreGateSvc DEBUG Recorded object @0xfd4150 with key BVec of type TestVector<BX>(CLID 82735621)
- in DataObject @0xfea0d0
+StoreGateSvc DEBUG Recorded object @0x1dfa030 with key BVec of type TestVector<BX>(CLID 82735621)
+ in DataObject @0x1df4810
object modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0x1000dd0 with key BVecAux. of type TestAuxStore(CLID 125030194)
- in DataObject @0xffb3e0
+StoreGateSvc DEBUG Recorded object @0x1dc31c0 with key BVecAux. of type TestAuxStore(CLID 125030194)
+ in DataObject @0x1df6d80
object modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0x1005870 with key CVec of type TestVector<BX>(CLID 82735621)
- in DataObject @0x1002f60
+StoreGateSvc DEBUG Recorded object @0x1df85a0 with key CVec of type TestVector<BX>(CLID 82735621)
+ in DataObject @0x1dfa5a0
object not modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0xfff410 with key CVecAux. of type TestAuxStore(CLID 125030194)
- in DataObject @0x10010d0
+StoreGateSvc DEBUG Recorded object @0x1df5900 with key CVecAux. of type TestAuxStore(CLID 125030194)
+ in DataObject @0x1df8c00
object not modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0xff9960 with key ErrorVec of type TestVector<BX>(CLID 82735621)
- in DataObject @0xffb1b0
+StoreGateSvc DEBUG Recorded object @0x1df6b10 with key ErrorVec of type TestVector<BX>(CLID 82735621)
+ in DataObject @0x1de0390
object modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0xff7b60 with key BBVec of type TestVector<BBX>(CLID 125040193)
- in DataObject @0xffcd60
+StoreGateSvc DEBUG Recorded object @0x1df5180 with key BBVec of type TestVector<BBX>(CLID 125040193)
+ in DataObject @0x1de0510
object modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0xff7000 with key BBVecAux. of type TestAuxStore(CLID 125030194)
- in DataObject @0xff7210
+StoreGateSvc DEBUG Recorded object @0x1df57b0 with key BBVecAux. of type TestAuxStore(CLID 125030194)
+ in DataObject @0x1df8ee0
object modifiable when retrieved[m
StoreGateSvc_Impl VERBOSE called associateAux_impl for key BVec[m
StoreGateSvc DEBUG Retrieved non-const pointer to object BVec of type TestVector<BX>(CLID 82735621)[m
@@ -452,11 +445,11 @@ StoreGateSvc_Impl VERBOSE called associateAux_impl for key CVec[m
StoreGateSvc DEBUG Retrieved const pointer to object CVec of type TestVector<BX>(CLID 82735621)[m
StoreGateSvc_Impl VERBOSE called associateAux_impl for key ErrorVec[m
StoreGateSvc DEBUG Retrieved const pointer to object ErrorVec of type TestVector<BX>(CLID 82735621)[m
-StoreGateSvc DEBUG Recorded object @0xfea120 with key BStand of type BX(CLID 82835621)
- in DataObject @0xffadb0
+StoreGateSvc DEBUG Recorded object @0x1e10ca0 with key BStand of type BX(CLID 82835621)
+ in DataObject @0x1df86f0
object modifiable when retrieved[m
-StoreGateSvc DEBUG Recorded object @0xffeeb0 with key BStandAux. of type TestAuxStore(CLID 125030194)
- in DataObject @0x1001e80
+StoreGateSvc DEBUG Recorded object @0x1df4110 with key BStandAux. of type TestAuxStore(CLID 125030194)
+ in DataObject @0x1df2c90
object modifiable when retrieved[m
StoreGateSvc_Impl VERBOSE called associateAux_impl for key BStand[m
StoreGateSvc DEBUG Retrieved non-const pointer to object BStand of type BX(CLID 82835621)[m
@@ -465,8 +458,8 @@ StoreGateSvc DEBUG Retrieved non-const pointer to object BStand of type
*** StoreGateSvcClient_test testBoundReset BEGINS ***
-StoreGateSvc DEBUG overwrite: Recorded object @0x1000cf0 with key testBoundReset of type int(CLID 244260744)
- in DataObject @0xff9630
+StoreGateSvc DEBUG overwrite: Recorded object @0x1df6900 with key testBoundReset of type int(CLID 244260744)
+ in DataObject @0x1df6920
object modifiable when retrieved[m
*** StoreGateSvcClient_test testBoundReset OK ***
@@ -476,13 +469,13 @@ StoreGateSvc DEBUG overwrite: Recorded object @0x1000cf0 with key testBou
*** StoreGateSvcClient_test testRecordObject BEGINS ***
>>> test duplicate record1
[93;1mStoreGateSvc_Impl WARNING setupProxy:: error setting up proxy for key obj101 and clid 8101
- Pre-existing valid DataProxy @0xff94f0 found in Store for key obj101 with clid 8101[m
-[93;1mStoreGateSvc_Impl WARNING record_impl: Problem setting up the proxy for object @0xfe9f20
- recorded with key obj101 of type Foo (CLID 8101) in DataObject @0x1004170[m
+ Pre-existing valid DataProxy @0x1df6760 found in Store for key obj101 with clid 8101[m
+[93;1mStoreGateSvc_Impl WARNING record_impl: Problem setting up the proxy for object @0x1df7900
+ recorded with key obj101 of type Foo (CLID 8101) in DataObject @0x1df7920[m
<<< test duplicate record1
>>> test duplicate record2
[93;1mStoreGateSvc_Impl WARNING record_impl: failed for key=obj999, type Foo (CLID 8101)
- object @0x1000c50 already in store with key=obj101. Will not record a duplicate! [m
+ object @0x1df3110 already in store with key=obj101. Will not record a duplicate! [m
<<< test duplicate record2
>>> test duplicate error
[97;101;1mStoreGateSvc_Impl ERROR SGImplSvc::recordObject: existing object found with 8101[Foo] obj101 but neither clid 543543[] nor key obj101xxx match.[m
@@ -496,60 +489,59 @@ StoreGateSvc_Impl DEBUG Clearing store with forceRemove=0[m
*** StoreGateSvcClient_test testWriteAux OK ***
*** test_lock
-StoreGateSvc DEBUG Recorded object @0xfea840 with key lockable1 of type Lockable(CLID 82734636)
- in DataObject @0x1003fe0
+StoreGateSvc DEBUG Recorded object @0x1df5790 with key lockable1 of type Lockable(CLID 82734636)
+ in DataObject @0x1df7ca0
object modifiable when retrieved[m
StoreGateSvc_Impl DEBUG Clearing store with forceRemove=0[m
-StoreGateSvc DEBUG Recorded object @0xfea840 with key lockable1 of type Lockable(CLID 82734636)
- in DataObject @0x1002f60
+StoreGateSvc DEBUG Recorded object @0x1df6900 with key lockable1 of type Lockable(CLID 82734636)
+ in DataObject @0x1df7ca0
object modifiable when retrieved[m
-StoreGateSvc VERBOSE Finalizing StoreGateSvc
-StoreGateSvc_Impl VERBOSE Finalizing StoreGateSvc_Impl
+StoreGateSvc VERBOSE Finalizing StoreGateSvc[m
+StoreGateSvc_Impl VERBOSE Finalizing StoreGateSvc_Impl[m
StoreGateSvc_Impl DEBUG Clearing store with forceRemove=1[m
*** StoreGateSvcClient_test record BEGINS ***
Now we expect to see an error message:
----Error Message Starts--->>
[93;1mDetectorStore_ImplWARNING setupProxy:: error setting up proxy for key pFoo1 and clid 8101
- Pre-existing valid DataProxy @0xffb570 found in Store for key pFoo1 with clid 8101[m
-[93;1mDetectorStore_ImplWARNING record_impl: Problem setting up the proxy for object @0xff7db0
- recorded with key pFoo1 of type Foo (CLID 8101) in DataObject @0x1001e80[m
+ Pre-existing valid DataProxy @0x1dfa9c0 found in Store for key pFoo1 with clid 8101[m
+[93;1mDetectorStore_ImplWARNING record_impl: Problem setting up the proxy for object @0x1df2d80
+ recorded with key pFoo1 of type Foo (CLID 8101) in DataObject @0x1df6570[m
<<---Error Message Ends-------
Now we expect to see an error message:
----Error Message Starts--->>
[93;1mDetectorStore_ImplWARNING record_impl: failed for key=pFoo2, type Foo (CLID 8101)
- object @0x1002c00 already in store with key=pFoo1. Will not record a duplicate! [m
+ object @0x1e11010 already in store with key=pFoo1. Will not record a duplicate! [m
<<---Error Message Ends-------
Now we expect to see an error message:
----Error Message Starts--->>
[93;1mDetectorStore_ImplWARNING setupProxy:: error setting up proxy for key silly and clid 8101
- Pre-existing valid DataProxy @0xffa590 found in Store for key silly with clid 8101[m
-[93;1mDetectorStore_ImplWARNING record_impl: Problem setting up the proxy for object @0x1000a80
- recorded with key silly of type Foo (CLID 8101) in DataObject @0x1003eb0[m
+ Pre-existing valid DataProxy @0x1df7d50 found in Store for key silly with clid 8101[m
+[93;1mDetectorStore_ImplWARNING record_impl: Problem setting up the proxy for object @0x1df79b0
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x1df2e50[m
<<---Error Message Ends-------
Now we expect to see an error message:
----Error Message Starts--->>
[93;1mDetectorStore_ImplWARNING setupProxy:: error setting up proxy for key silly and clid 8101
- Pre-existing valid DataProxy @0xffa590 found in Store for key silly with clid 8101[m
-[93;1mDetectorStore_ImplWARNING record_impl: Problem setting up the proxy for object @0x1002cd0
- recorded with key silly of type Foo (CLID 8101) in DataObject @0xffb280[m
+ Pre-existing valid DataProxy @0x1df7d50 found in Store for key silly with clid 8101[m
+[93;1mDetectorStore_ImplWARNING record_impl: Problem setting up the proxy for object @0x1df5790
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x1df8df0[m
<<---Error Message Ends-------
Now we expect to see an error message:
----Error Message Starts--->>
[93;1mDetectorStore_ImplWARNING setupProxy:: error setting up proxy for key silly and clid 8101
- Pre-existing valid DataProxy @0xffa590 found in Store for key silly with clid 8101[m
-[93;1mDetectorStore_ImplWARNING record_impl: Problem setting up the proxy for object @0x1002c70
- recorded with key silly of type Foo (CLID 8101) in DataObject @0x1002440[m
+ Pre-existing valid DataProxy @0x1df7d50 found in Store for key silly with clid 8101[m
+[93;1mDetectorStore_ImplWARNING record_impl: Problem setting up the proxy for object @0x1df2ea0
+ recorded with key silly of type Foo (CLID 8101) in DataObject @0x1df4920[m
<<---Error Message Ends-------
Now we expect to see an error message:
----Error Message Starts--->>
[93;1mDetectorStore_ImplWARNING setupProxy:: error setting up proxy for key Const and clid 8101
- Pre-existing valid DataProxy @0x1004380 found in Store for key Const with clid 8101[m
-[93;1mDetectorStore_ImplWARNING record_impl: Problem setting up the proxy for object @0xffad30
- recorded with key Const of type Foo (CLID 8101) in DataObject @0xffd390[m
+ Pre-existing valid DataProxy @0x1df4c70 found in Store for key Const with clid 8101[m
+[93;1mDetectorStore_ImplWARNING record_impl: Problem setting up the proxy for object @0x1df55f0
+ recorded with key Const of type Foo (CLID 8101) in DataObject @0x1df3b60[m
<<---Error Message Ends-------
IOVSvc INFO No IOVSvcTool associated with store "StoreGateSvc"[m
IOVSvc.IOVSvcTool INFO [92;1mIOVRanges will be checked at every [96;1mEvent[m
-ClassIDSvc INFO getRegistryEntries: read 325 CLIDRegistry entries for module ALL[m
*** StoreGateSvcClient_test records OK ***
diff --git a/AtlasTest/ControlTest/test/ProxyProviderSvc_test.cxx b/AtlasTest/ControlTest/test/ProxyProviderSvc_test.cxx
index b9514bf9a52b7eaedc8a8908cbe05e4aea6f5dab..81d33c49f427ec6a8e512f65b58a2478ed7875d4 100644
--- a/AtlasTest/ControlTest/test/ProxyProviderSvc_test.cxx
+++ b/AtlasTest/ControlTest/test/ProxyProviderSvc_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
*/
/** @file ProxyProviderSvc_test.cxx
@@ -118,61 +118,6 @@ void testRecordBeforeRead(StoreGateSvc& rSG, IProxyProviderSvc& rPPS) {
cout << "*** ProxyProviderSvc_test RecordBeforeRead OK ***\n\n" <<endl;
}
-void testReadPrivate(StoreGateSvc& rSG) {
- cout << "*** ProxyProviderSvc_test readPrivate BEGINS ***" <<endl;
-
- std::unique_ptr<Foo> apFoo;
- SGASSERTERROR((rSG.readUniquePrivateCopy<Foo>("NotThere")).get() != nullptr);
-
- apFoo=rSG.readUniquePrivateCopy<Foo>("diskFoo");
- assert(nullptr != apFoo.get());
- assert(floatEQ(0, static_cast<float>(apFoo->a()))); //check that our Foo is the def constr one
-
- //now test the situation in which we have a transient obj in the way
- //record must fail because we already have a provider
- //not yet SGASSERTERROR(rSG.record(new Foo(6.28), "privFoo").isSuccess());
- assert(rSG.record(new Foo(6.28), "privFoo").isSuccess());
- assert(rSG.overwrite(std::make_unique<Foo>(6.28), "privFoo").isSuccess());
-
- apFoo=rSG.readUniquePrivateCopy<Foo>("privFoo");
- assert(nullptr != apFoo.get());
- assert(floatNEQ(6.28f, static_cast<float>(apFoo->a()))); //check that our Foo is a different one
- apFoo->setA(3.14);
- std::unique_ptr<Foo> bpFoo(rSG.readUniquePrivateCopy<Foo>("privFoo"));
- assert(nullptr != bpFoo.get());
- assert(&*bpFoo != &*apFoo); //two independent instances
- assert(floatNEQ(6.28f, static_cast<float>(bpFoo->a())));
- assert(floatNEQ(3.14f, static_cast<float>(bpFoo->a())));
- assert(floatEQ(3.14f, static_cast<float>(apFoo->a())));
- const Foo* plainFoo(nullptr);
- assert(plainFoo = rSG.retrieve<Foo>("privFoo"));
- assert(floatEQ(6.28f, static_cast<float>(plainFoo->a()))); //this is the old guy!
- assert(plainFoo != &*apFoo); //yet another instance
- assert(plainFoo != &*bpFoo); //yet another instance
- // cout << "---------ap " << &*apFoo << " bp " << &*bpFoo <<endl;
- //cout << " pFoo33 " << pFoo33 << endl;
-
- const Foo* pFoo33Orig = apFoo.get();
- assert(rSG.record(std::move(apFoo), "silly33").isSuccess());
- const Foo *pFoo33(rSG.retrieve<Foo>("silly33"));
- assert(nullptr != pFoo33);
- assert(floatEQ(3.14f, static_cast<float>(pFoo33->a())));
- assert(pFoo33 == pFoo33Orig); //the private copy we recorded.
- assert(pFoo33 != &*bpFoo); //not one of the private copies
- SGASSERTERROR((rSG.readUniquePrivateCopy<Foo>("silly33")).get() != nullptr);
- assert(rSG.retrieve<Foo>("silly33"));
- std::unique_ptr<Foo> aptrFoo33(rSG.retrieveUniquePrivateCopy<Foo>("silly33"));
- assert(aptrFoo33.get() == pFoo33);
- assert(floatEQ(3.14f, static_cast<float>(aptrFoo33->a())));
- SGASSERTERROR((pFoo33 = rSG.retrieve<Foo>("silly33")) != nullptr);
-
-
- cout << "*** ProxyProviderSvc_test readPrivate OK ***\n\n" <<endl;
-}
-
-
-
-
void testHLTAutoKeyReset(StoreGateSvc& rSG, IProxyProviderSvc& rPPS) {
cout << "*** ProxyProviderSvc_test HLTAutoKeyReset BEGINS ***" <<endl;
assert(rSG.clearStore(true).isSuccess());
@@ -275,7 +220,6 @@ int main ATLAS_NOT_THREAD_SAFE () {
testRecordBeforeRead(*pStore, *pIPPSvc);
- testReadPrivate(*pStore);
testHLTAutoKeyReset(*pStore, *pIPPSvc);
testOverwrite(*pStore, *pIPPSvc);
assert(pStore->clearStore(true).isSuccess());
diff --git a/AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx b/AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx
index 80a3b27a44aeb3ade38d1e85e563c19eaa8e088a..c7c3c12788411f93d4493c22756589b9f9e31df7 100644
--- a/AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx
+++ b/AtlasTest/ControlTest/test/StoreGateSvcClient_test.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
@@ -294,7 +294,6 @@ int main ATLAS_NOT_THREAD_SAFE () {
testRetrieve(*pStore);
testTryRetrieve(*pStore);
testSymLink(*pStore);
- testReadPrivateCopy(*pStore);
testRetrievePrivateCopy(*pStore);
testRemove(*pStore);
testCreate(*pStore);
diff --git a/Control/StoreGate/StoreGate/StoreGateSvc.h b/Control/StoreGate/StoreGate/StoreGateSvc.h
index 8e3f3a8cfdd0ae2907ec361f786442c43f32c15a..9f49787f49bdd1294d6fe2b51834092c2723871f 100644
--- a/Control/StoreGate/StoreGate/StoreGateSvc.h
+++ b/Control/StoreGate/StoreGate/StoreGateSvc.h
@@ -1,7 +1,7 @@
/* -*- C++ -*- */
/*
- Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
*/
#ifndef STOREGATE_STOREGATESVC_H
@@ -393,22 +393,6 @@ public:
- /// EXPERTS ONLY: reads from disk your very own private copy of a StoreGate
- /// object of type T and given key, if available and locked.
- /// readPrivateCopy does not look up the object in SG transient memory
- /// so it will fail to return a newly recorded object.
- /// You are responsible for managing the returned object and for keeping it
- /// in sync with the "main" copy in transient memory, if any.
- /// @param key The key to use for the lookup.
- /// @return null unique_ptr if the object isn't found or if it is unlocked.
- template <typename T>
- std::unique_ptr<T> readUniquePrivateCopy (const std::string& key);
-
- /// readPrivateCopy implementation (possibly useful from python hence public)
- DataObject*
- typeless_readPrivateCopy(const CLID& clid, const std::string& key);
-
-
/// EXPERTS ONLY: like readPrivateCopy this method returns your own private
/// copy of a data object of type T and given key, if available and locked.
/// The difference is that it will return you also an object in SG transient
diff --git a/Control/StoreGate/StoreGate/StoreGateSvc.icc b/Control/StoreGate/StoreGate/StoreGateSvc.icc
index 06e0d543261fcdd909b7fc154aabc487aa34b2a0..a061a6015418dfd8d533b8d6791392b8972ac131 100644
--- a/Control/StoreGate/StoreGate/StoreGateSvc.icc
+++ b/Control/StoreGate/StoreGate/StoreGateSvc.icc
@@ -1,7 +1,7 @@
/* -*- C++ -*- */
/*
- Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
*/
/** @file StoreGateSvc.icc
@@ -820,14 +820,6 @@ StoreGateSvc::retrieveAllVersions(std::list< SG::ObjectWithVersion<T> >& allVers
}
-template <typename T>
-std::unique_ptr<T>
-StoreGateSvc::readUniquePrivateCopy (const std::string& key) {
- return std::unique_ptr<T>(SG::Storable_cast<T>(
- this->typeless_readPrivateCopy(ClassID_traits<T>::ID(), key)));
-}
-
-
template <typename T>
std::unique_ptr<T>
StoreGateSvc::retrieveUniquePrivateCopy (const std::string& key)
diff --git a/Control/StoreGate/StoreGate/tools/SGImplSvc.h b/Control/StoreGate/StoreGate/tools/SGImplSvc.h
index ebfae7c358ad718ea13adf13811472631a72fa7d..4033266b034fcb66fc773e58405b6f7b46ca9f32 100644
--- a/Control/StoreGate/StoreGate/tools/SGImplSvc.h
+++ b/Control/StoreGate/StoreGate/tools/SGImplSvc.h
@@ -1,7 +1,7 @@
/* -*- C++ -*- */
/*
- Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
*/
#ifndef STOREGATE_SGIMPLSVC_H
@@ -180,11 +180,6 @@ public:
/// \name Advanced Client Interface: data object access
//@{
- /// readPrivateCopy implementation (possibly useful from python hence public)
- DataObject*
- typeless_readPrivateCopy(const CLID& clid, const std::string& key);
-
-
DataObject*
typeless_retrievePrivateCopy (const CLID clid, const std::string& key);
diff --git a/Control/StoreGate/src/SGImplSvc.cxx b/Control/StoreGate/src/SGImplSvc.cxx
index 5bf4ab19838f69f7dd8a95708ab35c703216fade..378160fc84c4af5db4f7c0c51c14ebc192ad17a9 100644
--- a/Control/StoreGate/src/SGImplSvc.cxx
+++ b/Control/StoreGate/src/SGImplSvc.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
*/
#include <algorithm>
@@ -1655,53 +1655,6 @@ bool SGImplSvc::tryELRemap (sgkey_t sgkey_in, size_t index_in,
}
-DataObject* SGImplSvc::typeless_readPrivateCopy(const CLID& clid,
- const std::string& key) {
- lock_t lock (m_mutex);
- DataObject *pObj(0);
- DataProxy *p(this->proxy(clid, key));
- if (p) {
- if (p->object()) { //this looks in transient mem only
- //if there is a dobj in transient memory we take ownership with addRef
- p->addRef();
- //and make the store forget about the proxy for a moment
- const bool FORCEREMOVE(true);
- bool hard_reset = (m_numSlots > 1);
- store()->removeProxy(p, FORCEREMOVE, hard_reset).ignore();
- //now we try to read the object from disk. Relies on PPS to reload proxy
- DataProxy *pDisk(this->proxy(clid, key));
- if (pDisk) {
- //We are managing the pObj so we addRef it
- if ( (pObj = pDisk->accessData()) ) pObj->addRef();
- //don't need this guy anymore, notice we use the SGImplSvc version
- //to remove the t2p entry as well
- removeProxy(pDisk, SG::DataProxy_cast(pDisk,clid), FORCEREMOVE).ignore();
- }
- //replace the "transient" proxy where it was
- if (store()->addToStore(clid, p).isFailure()) {
- error() << "SGImplSvc::typeless_readPrivateCopy: "
- << "could not re-record proxy in store: "
- << clid << "/" << key << endmsg;
- }
- } else if ( (pObj = p->accessData()) ) { //try reading from disk
- //We are managing the pObj so we addRef it
- pObj->addRef();
- //and make the proxy forget about it
- bool hard_reset = (m_numSlots > 1);
- p->reset (hard_reset);
- }
- }
- if (0 == pObj) {
- string errType;
- m_pCLIDSvc->getTypeNameOfID(clid, errType).ignore();
- warning() << "SGImplSvc::typeless_readPrivateCopy: "
- << "did not find object of type "
- << errType << " with key " << key << endmsg;
- }
- return pObj;
-}
-
-
DataObject* SGImplSvc::typeless_retrievePrivateCopy (const CLID clid,
const std::string& key)
{
diff --git a/Control/StoreGate/src/StoreGateSvc.cxx b/Control/StoreGate/src/StoreGateSvc.cxx
index f42a1a47af588a1b25d571d9407921db5a9abd42..50ee72fc015ee35245e0095fa93e1fc0f296c356 100644
--- a/Control/StoreGate/src/StoreGateSvc.cxx
+++ b/Control/StoreGate/src/StoreGateSvc.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
*/
#include "GaudiKernel/IIncidentSvc.h"
@@ -352,10 +352,6 @@ StoreGateSvc::transientSwap( const CLID& id,
_SGXCALL(transientSwap, (id, keyA, keyB), false);
}
-DataObject*
-StoreGateSvc::typeless_readPrivateCopy(const CLID& clid, const std::string& key) {
- _SGXCALL(typeless_readPrivateCopy, (clid, key), 0);
-}
/// type-less recording of an object with a key, allow possibility of
/// specifying const-access and history record
StatusCode
diff --git a/Control/StoreGate/test/SGtests.cxx b/Control/StoreGate/test/SGtests.cxx
index 9ef0e962ecedaa1e588724f7fad10ca3aed87429..e4b1e84b7c7b34c93f80969c067cd266e2c6e8d2 100644
--- a/Control/StoreGate/test/SGtests.cxx
+++ b/Control/StoreGate/test/SGtests.cxx
@@ -1,5 +1,5 @@
/*
- Copyright (C) 2002-2022 CERN for the benefit of the ATLAS collaboration
+ Copyright (C) 2002-2023 CERN for the benefit of the ATLAS collaboration
*/
/***************************************************************************
@@ -707,17 +707,6 @@ namespace Athena_test {
}
- void testReadPrivateCopy(::StoreGateSvc& rSG) {
- cout << "*** StoreGateSvcClient_test readPrivateCopy BEGINS ***" <<endl;
- const Foo *cFoo(0);
- assert(rSG.retrieve<Foo>(cFoo,"silly").isSuccess());
- std::unique_ptr<Foo> apFoo(rSG.readUniquePrivateCopy<Foo>("silly"));
- assert(cFoo != apFoo.get());
- assert(rSG.retrieve(cFoo, "silly").isSuccess());
- cout << "*** StoreGateSvcClient_test readPrivateCopy OK ***" <<endl;
- }
-
-
void testRetrievePrivateCopy(::StoreGateSvc& rSG) {
cout << "*** StoreGateSvcClient_test retrievePrivateCopy BEGINS ***" <<endl;
const Foo *cFoo(0);