You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ec...@apache.org on 2017/08/10 15:20:25 UTC
[17/27] geode-native git commit: GEODE-2729: Remove global variables
http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/cppcache/integration-test/testThinClientNotificationWithDeltaWithoutcache.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientNotificationWithDeltaWithoutcache.cpp b/src/cppcache/integration-test/testThinClientNotificationWithDeltaWithoutcache.cpp
index a206a29..5dfc70b 100644
--- a/src/cppcache/integration-test/testThinClientNotificationWithDeltaWithoutcache.cpp
+++ b/src/cppcache/integration-test/testThinClientNotificationWithDeltaWithoutcache.cpp
@@ -26,6 +26,11 @@
#include "DeltaEx.hpp"
#include "fw_dunit.hpp"
#include <string>
+#include "SerializationRegistry.hpp"
+#include "CacheRegionHelper.hpp"
+#include "CacheImpl.hpp"
+
+
using namespace apache::geode::client;
using namespace test;
@@ -105,7 +110,8 @@ DUNIT_TASK_DEFINITION(CLIENT1, CreateClient1)
createPooledRegion(regionNames[0], USE_ACK, locatorsG, "__TESTPOOL1_", true,
false); // without LRU
try {
- Serializable::registerType(DeltaEx::create);
+ SerializationRegistryPtr serializationRegistry = CacheRegionHelper::getCacheImpl(cacheHelper->getCache().get())->getSerializationRegistry();
+ serializationRegistry->addType(DeltaEx::create);
} catch (IllegalStateException&) {
// ignore exception caused by type reregistration.
}
@@ -117,7 +123,8 @@ DUNIT_TASK_DEFINITION(CLIENT1, CreateClient1_NoPools)
initClientNoPools();
createRegionCachingDisabled(regionNames[0], USE_ACK, true); // without LRU
try {
- Serializable::registerType(DeltaEx::create);
+ SerializationRegistryPtr serializationRegistry = CacheRegionHelper::getCacheImpl(cacheHelper->getCache().get())->getSerializationRegistry();
+ serializationRegistry->addType(DeltaEx::create);
} catch (IllegalStateException&) {
// ignore exception caused by type reregistration.
}
@@ -130,7 +137,8 @@ DUNIT_TASK_DEFINITION(CLIENT2, CreateClient2)
createPooledRegion(regionNames[0], USE_ACK, locatorsG, "__TESTPOOL1_", true,
false);
try {
- Serializable::registerType(DeltaEx::create);
+ SerializationRegistryPtr serializationRegistry = CacheRegionHelper::getCacheImpl(cacheHelper->getCache().get())->getSerializationRegistry();
+ serializationRegistry->addType(DeltaEx::create);
} catch (IllegalStateException&) {
// ignore exception caused by type reregistration.
}
@@ -144,7 +152,8 @@ DUNIT_TASK_DEFINITION(CLIENT2, CreateClient2_NoPools)
initClientNoPools();
createRegionCachingDisabled(regionNames[0], USE_ACK, true); // without LRU
try {
- Serializable::registerType(DeltaEx::create);
+ SerializationRegistryPtr serializationRegistry = CacheRegionHelper::getCacheImpl(cacheHelper->getCache().get())->getSerializationRegistry();
+ serializationRegistry->addType(DeltaEx::create);
} catch (IllegalStateException&) {
// ignore exception caused by type reregistration.
}
http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/cppcache/integration-test/testThinClientPRSingleHop.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPRSingleHop.cpp b/src/cppcache/integration-test/testThinClientPRSingleHop.cpp
index afcec63..da68451 100644
--- a/src/cppcache/integration-test/testThinClientPRSingleHop.cpp
+++ b/src/cppcache/integration-test/testThinClientPRSingleHop.cpp
@@ -14,17 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "fw_dunit.hpp"
-#include <geode/GeodeCppCache.hpp>
-#include "BuiltinCacheableWrappers.hpp"
-#include <Utils.hpp>
-#include <geode/statistics/StatisticsFactory.hpp>
+#include <string>
+
#include <ace/OS.h>
#include <ace/High_Res_Timer.h>
-
#include <ace/ACE.h>
-#include <string>
+#include <geode/GeodeCppCache.hpp>
+#include <geode/statistics/StatisticsFactory.hpp>
+
+#include "fw_dunit.hpp"
+#include "BuiltinCacheableWrappers.hpp"
+#include "Utils.hpp"
#define ROOT_NAME "testThinClientPRSingleHop"
#define ROOT_SCOPE DISTRIBUTED_ACK
@@ -172,7 +173,8 @@ class putThread : public ACE_Task_Base {
}
}
LOG("releaseThreadLocalConnection PutThread");
- PoolPtr pool = PoolManager::find("__TEST_POOL1__");
+ PoolPtr pool =
+ getHelper()->getCache()->getPoolManager().find("__TEST_POOL1__");
pool->releaseThreadLocalConnection();
LOG("releaseThreadLocalConnection PutThread done");
return 0;
@@ -302,10 +304,10 @@ DUNIT_TASK_DEFINITION(CLIENT1, WarmUpTask)
if (networkhop) {
failureCount++;
}
- StatisticsFactory* factory = StatisticsFactory::getExistingInstance();
- StatisticsType* type = factory->findType("RegionStatistics");
+ auto factory = cacheHelper->getCache()->getStatisticsFactory();
+ auto type = factory->findType("RegionStatistics");
if (type) {
- Statistics* rStats = factory->findFirstStatisticsByType(type);
+ auto rStats = factory->findFirstStatisticsByType(type);
if (rStats) {
metadatarefreshCount =
rStats->getInt((char*)"metaDataRefreshCount");
@@ -383,10 +385,10 @@ DUNIT_TASK_DEFINITION(CLIENT1, WarmUpTask3)
if (networkhop) {
failureCount++;
}
- StatisticsFactory* factory = StatisticsFactory::getExistingInstance();
- StatisticsType* type = factory->findType("RegionStatistics");
+ auto factory = cacheHelper->getCache()->getStatisticsFactory();
+ auto type = factory->findType("RegionStatistics");
if (type) {
- Statistics* rStats = factory->findFirstStatisticsByType(type);
+ auto rStats = factory->findFirstStatisticsByType(type);
if (rStats) {
metadatarefreshCount =
rStats->getInt((char*)"metaDataRefreshCount");
@@ -1158,7 +1160,8 @@ END_TASK_DEFINITION
DUNIT_TASK_DEFINITION(CLIENT1, CloseCache1)
{
- PoolPtr pool = PoolManager::find("__TEST_POOL1__");
+ PoolPtr pool =
+ getHelper()->getCache()->getPoolManager().find("__TEST_POOL1__");
if (pool->getThreadLocalConnections()) {
LOG("releaseThreadLocalConnection1 doing...");
pool->releaseThreadLocalConnection();
http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp b/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp
index 8e21576..8fa2232 100644
--- a/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp
+++ b/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp
@@ -14,17 +14,18 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include "fw_dunit.hpp"
-#include <geode/GeodeCppCache.hpp>
-#include "BuiltinCacheableWrappers.hpp"
-#include <Utils.hpp>
-#include <geode/statistics/StatisticsFactory.hpp>
+#include <string>
+
#include <ace/OS.h>
#include <ace/High_Res_Timer.h>
-
#include <ace/ACE.h>
-#include <string>
+#include <geode/GeodeCppCache.hpp>
+#include <geode/statistics/StatisticsFactory.hpp>
+
+#include "fw_dunit.hpp"
+#include "BuiltinCacheableWrappers.hpp"
+#include "Utils.hpp"
#define ROOT_NAME "testThinClientPRSingleHopServerGroup"
#define ROOT_SCOPE DISTRIBUTED_ACK
@@ -112,8 +113,8 @@ DUNIT_TASK_DEFINITION(CLIENT1, CheckPrSingleHopForIntKeysTask_CLIENT1)
ASSERT(serverGroupFlag != 2,
"serverGroupFlag should not be equal to 2");
- StatisticsFactory* factory = StatisticsFactory::getExistingInstance();
- StatisticsType* type = factory->findType("RegionStatistics");
+ auto factory = cacheHelper->getCache()->getStatisticsFactory();
+ auto type = factory->findType("RegionStatistics");
if (type) {
Statistics* rStats = factory->findFirstStatisticsByType(type);
if (rStats) {
@@ -287,8 +288,8 @@ DUNIT_TASK_DEFINITION(CLIENT2, CheckPrSingleHopForIntKeysTask_CLIENT2)
ASSERT(serverGroupFlag != 2,
"serverGroupFlag should not be equal to 2");
- StatisticsFactory* factory = StatisticsFactory::getExistingInstance();
- StatisticsType* type = factory->findType("RegionStatistics");
+ auto factory = cacheHelper->getCache()->getStatisticsFactory();
+ auto type = factory->findType("RegionStatistics");
if (type) {
Statistics* rStats = factory->findFirstStatisticsByType(type);
if (rStats) {
@@ -453,8 +454,8 @@ DUNIT_TASK_DEFINITION(CLIENT3, CheckPrSingleHopForIntKeysTask_CLIENT3)
ASSERT(serverGroupFlag != 2,
"serverGroupFlag should not be equal to 2");
- StatisticsFactory* factory = StatisticsFactory::getExistingInstance();
- StatisticsType* type = factory->findType("RegionStatistics");
+ auto factory = cacheHelper->getCache()->getStatisticsFactory();
+ auto type = factory->findType("RegionStatistics");
if (type) {
Statistics* rStats = factory->findFirstStatisticsByType(type);
if (rStats) {
http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/cppcache/integration-test/testThinClientPdxDeltaWithNotification.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPdxDeltaWithNotification.cpp b/src/cppcache/integration-test/testThinClientPdxDeltaWithNotification.cpp
index c498e5f..2dc2dd5 100644
--- a/src/cppcache/integration-test/testThinClientPdxDeltaWithNotification.cpp
+++ b/src/cppcache/integration-test/testThinClientPdxDeltaWithNotification.cpp
@@ -26,6 +26,9 @@
#include "DeltaEx.hpp"
#include "fw_dunit.hpp"
#include <string>
+#include "SerializationRegistry.hpp"
+#include "CacheRegionHelper.hpp"
+#include "CacheImpl.hpp"
using namespace apache::geode::client;
using namespace test;
@@ -189,7 +192,8 @@ END_TASK_DEFINITION
DUNIT_TASK_DEFINITION(CLIENT1, Client1_PdxInit)
{
try {
- Serializable::registerPdxType(PdxDeltaEx::createDeserializable);
+ SerializationRegistryPtr serializationRegistry = CacheRegionHelper::getCacheImpl(cacheHelper->getCache().get())->getSerializationRegistry();
+ serializationRegistry->addPdxType(PdxDeltaEx::createDeserializable);
} catch (IllegalStateException&) {
// ignore type reregistration exception.
}
@@ -199,7 +203,8 @@ END_TASK_DEFINITION
DUNIT_TASK_DEFINITION(CLIENT2, Client2_PdxInit)
{
try {
- Serializable::registerPdxType(PdxDeltaEx::createDeserializable);
+ SerializationRegistryPtr serializationRegistry = CacheRegionHelper::getCacheImpl(cacheHelper->getCache().get())->getSerializationRegistry();
+ serializationRegistry->addPdxType(PdxDeltaEx::createDeserializable);
} catch (IllegalStateException&) {
// ignore type reregistration exception.
}
http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/cppcache/integration-test/testThinClientPdxEnum.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPdxEnum.cpp b/src/cppcache/integration-test/testThinClientPdxEnum.cpp
index 17ecb1d..8d8ea75 100644
--- a/src/cppcache/integration-test/testThinClientPdxEnum.cpp
+++ b/src/cppcache/integration-test/testThinClientPdxEnum.cpp
@@ -105,7 +105,8 @@ DUNIT_TASK_DEFINITION(CLIENT1, pdxEnumQuery)
LOG("pdxEnumQuery started ");
try {
- Serializable::registerPdxType(PdxEnumTestClass::createDeserializable);
+ SerializationRegistryPtr serializationRegistry = CacheRegionHelper::getCacheImpl(cacheHelper->getCache().get())->getSerializationRegistry();
+ serializationRegistry->addPdxType(PdxEnumTestClass::createDeserializable);
LOG("PdxEnumTestClass Registered Successfully....");
} catch (apache::geode::client::IllegalStateException& /* ex*/) {
LOG("PdxEnumTestClass IllegalStateException");
http://git-wip-us.apache.org/repos/asf/geode-native/blob/da389793/src/cppcache/integration-test/testThinClientPdxInstance.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPdxInstance.cpp b/src/cppcache/integration-test/testThinClientPdxInstance.cpp
index d832d7d..2899b1f 100644
--- a/src/cppcache/integration-test/testThinClientPdxInstance.cpp
+++ b/src/cppcache/integration-test/testThinClientPdxInstance.cpp
@@ -28,9 +28,10 @@
#define ROOT_SCOPE DISTRIBUTED_ACK
#include "CacheHelper.hpp"
-
+#include "CacheImpl.hpp"
#include <ace/Date_Time.h>
-
+#include "SerializationRegistry.hpp"
+#include "CacheRegionHelper.hpp"
using namespace apache::geode::client;
using namespace test;
using namespace testobject;
@@ -228,7 +229,8 @@ DUNIT_TASK_DEFINITION(CLIENT1, putPdxWithIdentityField)
LOG("putPdxWithIdentityField started ");
try {
- Serializable::registerPdxType(SerializePdx::createDeserializable);
+ SerializationRegistryPtr serializationRegistry = CacheRegionHelper::getCacheImpl(cacheHelper->getCache().get())->getSerializationRegistry();
+ serializationRegistry->addPdxType(SerializePdx::createDeserializable);
LOG("SerializePdx Registered Successfully....");
} catch (apache::geode::client::IllegalStateException& /* ex*/) {
LOG("SerializePdx IllegalStateException");
@@ -251,7 +253,8 @@ DUNIT_TASK_DEFINITION(CLIENT1, putCacheableObjectArrayWithPdxFields)
LOG("putCacheableObjectArrayWithPdxFields started ");
try {
- Serializable::registerPdxType(Address::createDeserializable);
+ SerializationRegistryPtr serializationRegistry = CacheRegionHelper::getCacheImpl(cacheHelper->getCache().get())->getSerializationRegistry();
+ serializationRegistry->addPdxType(Address::createDeserializable);
LOG("Address Registered Successfully....");
} catch (apache::geode::client::IllegalStateException& /* ex*/) {
LOG("Address IllegalStateException");
@@ -285,7 +288,8 @@ DUNIT_TASK_DEFINITION(CLIENT2, verifyPdxIdentityField)
LOG("verifyPdxIdentityField started ");
try {
- Serializable::registerPdxType(SerializePdx::createDeserializable);
+ SerializationRegistryPtr serializationRegistry = CacheRegionHelper::getCacheImpl(cacheHelper->getCache().get())->getSerializationRegistry();
+ serializationRegistry->addPdxType(SerializePdx::createDeserializable);
LOG("SerializePdx Registered Successfully....");
} catch (apache::geode::client::IllegalStateException& /* ex*/) {
LOG("SerializePdx IllegalStateException");
@@ -303,23 +307,29 @@ DUNIT_TASK_DEFINITION(CLIENT2, verifyPdxIdentityField)
LOGINFO(
"pdxInstanceDeserializations for (PdxTests.PdxType) PdxInstance = %d ",
lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializations());
- LOGINFO("pdxInstanceCreations for (PdxTests.PdxType) PdxInstance = %d ",
- lregPtr->getCacheImpl()->m_cacheStats->getPdxInstanceCreations());
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializations());
+ LOGINFO(
+ "pdxInstanceCreations for (PdxTests.PdxType) PdxInstance = %d ",
+ lregPtr->getCacheImpl()->getCachePerfStats().getPdxInstanceCreations());
LOGINFO(
"pdxInstanceDeserializationTime for(PdxTests.PdxType) PdxInstance = "
"%d ",
lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializationTime());
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializationTime());
ASSERT(lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializations() == 0,
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializations() == 0,
"pdxInstanceDeserialization should be equal to 0.");
- ASSERT(
- lregPtr->getCacheImpl()->m_cacheStats->getPdxInstanceCreations() == 1,
- "pdxInstanceCreations should be equal to 1.");
ASSERT(lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializationTime() > 0,
+ ->getCachePerfStats()
+ .getPdxInstanceCreations() == 1,
+ "pdxInstanceCreations should be equal to 1.");
+ ASSERT(lregPtr->getCacheImpl()
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializationTime() > 0,
"pdxInstanceDeserializationTime should be greater than equal to 0.");
ASSERT(pi->getFieldNames()->length() == 4,
@@ -358,23 +368,29 @@ DUNIT_TASK_DEFINITION(CLIENT2, verifyPdxIdentityField)
LOGINFO(
"pdxInstanceDeserializations for (PdxTests.PdxType) PdxInstance = %d ",
lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializations());
- LOGINFO("pdxInstanceCreations for (PdxTests.PdxType) PdxInstance = %d ",
- lregPtr->getCacheImpl()->m_cacheStats->getPdxInstanceCreations());
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializations());
+ LOGINFO(
+ "pdxInstanceCreations for (PdxTests.PdxType) PdxInstance = %d ",
+ lregPtr->getCacheImpl()->getCachePerfStats().getPdxInstanceCreations());
LOGINFO(
"pdxInstanceDeserializationTime for(PdxTests.PdxType) PdxInstance = "
"%d ",
lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializationTime());
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializationTime());
ASSERT(lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializations() == 0,
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializations() == 0,
"pdxInstanceDeserialization should be equal to 0.");
- ASSERT(
- lregPtr->getCacheImpl()->m_cacheStats->getPdxInstanceCreations() == 2,
- "pdxInstanceCreations should be equal to 2.");
ASSERT(lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializationTime() > 0,
+ ->getCachePerfStats()
+ .getPdxInstanceCreations() == 2,
+ "pdxInstanceCreations should be equal to 2.");
+ ASSERT(lregPtr->getCacheImpl()
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializationTime() > 0,
"pdxInstanceDeserializationTime should be greater than 0.");
bool ret = false;
@@ -391,7 +407,8 @@ DUNIT_TASK_DEFINITION(CLIENT2, verifyCacheableObjectArrayWithPdxField)
LOG("verifyCacheableObjectArrayWithPdxField started ");
try {
- Serializable::registerPdxType(Address::createDeserializable);
+ SerializationRegistryPtr serializationRegistry = CacheRegionHelper::getCacheImpl(cacheHelper->getCache().get())->getSerializationRegistry();
+ serializationRegistry->addPdxType(Address::createDeserializable);
LOG("Address Registered Successfully....");
} catch (apache::geode::client::IllegalStateException& /* ex*/) {
LOG("Address IllegalStateException");
@@ -505,9 +522,9 @@ END_TASK_DEFINITION
DUNIT_TASK_DEFINITION(CLIENT1, pdxPut)
{
LOG("pdxPut started ");
-
+ SerializationRegistryPtr serializationRegistry = CacheRegionHelper::getCacheImpl(cacheHelper->getCache().get())->getSerializationRegistry();
try {
- Serializable::registerPdxType(PdxTests::PdxType::createDeserializable);
+ serializationRegistry->addPdxType(PdxTests::PdxType::createDeserializable);
LOG("PdxObject Registered Successfully....");
} catch (apache::geode::client::IllegalStateException& /* ex*/) {
LOG("PdxObject IllegalStateException");
@@ -532,23 +549,29 @@ DUNIT_TASK_DEFINITION(CLIENT1, pdxPut)
LOGINFO(
"pdxInstanceDeserializations for (PdxTests.PdxType) PdxInstance = %d ",
lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializations());
- LOGINFO("pdxInstanceCreations for (PdxTests.PdxType) PdxInstance = %d ",
- lregPtr->getCacheImpl()->m_cacheStats->getPdxInstanceCreations());
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializations());
+ LOGINFO(
+ "pdxInstanceCreations for (PdxTests.PdxType) PdxInstance = %d ",
+ lregPtr->getCacheImpl()->getCachePerfStats().getPdxInstanceCreations());
LOGINFO(
"pdxInstanceDeserializationTime for(PdxTests.PdxType) PdxInstance = "
"%d ",
lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializationTime());
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializationTime());
ASSERT(lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializations() == 0,
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializations() == 0,
"pdxInstanceDeserialization should be equal to 0.");
- ASSERT(
- lregPtr->getCacheImpl()->m_cacheStats->getPdxInstanceCreations() == 1,
- "pdxInstanceCreations should be equal to 1.");
ASSERT(lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializationTime() > 0,
+ ->getCachePerfStats()
+ .getPdxInstanceCreations() == 1,
+ "pdxInstanceCreations should be equal to 1.");
+ ASSERT(lregPtr->getCacheImpl()
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializationTime() > 0,
"pdxInstanceDeserializationTime should be greater than 0.");
CacheableStringPtr toString = pIPtr1->toString();
@@ -582,23 +605,23 @@ END_TASK_DEFINITION
DUNIT_TASK_DEFINITION(CLIENT2, getObject)
{
LOG("getObject started ");
-
+ SerializationRegistryPtr serializationRegistry = CacheRegionHelper::getCacheImpl(cacheHelper->getCache().get())->getSerializationRegistry();
try {
- Serializable::registerPdxType(PdxTests::PdxType::createDeserializable);
+ serializationRegistry->addPdxType(PdxTests::PdxType::createDeserializable);
LOG("PdxObject Registered Successfully....");
} catch (apache::geode::client::IllegalStateException& /* ex*/) {
LOG("PdxObject IllegalStateException");
}
try {
- Serializable::registerPdxType(ChildPdx::createDeserializable);
+ serializationRegistry->addPdxType(ChildPdx::createDeserializable);
LOG("ChildPdx Registered Successfully....");
} catch (apache::geode::client::IllegalStateException& /* ex*/) {
LOG("ChildPdx IllegalStateException");
}
try {
- Serializable::registerPdxType(ParentPdx::createDeserializable);
+ serializationRegistry->addPdxType(ParentPdx::createDeserializable);
LOG("ParentPdx Registered Successfully....");
} catch (apache::geode::client::IllegalStateException& /* ex*/) {
LOG("ParentPdx IllegalStateException");
@@ -625,22 +648,29 @@ DUNIT_TASK_DEFINITION(CLIENT2, getObject)
LOGINFO(
"pdxInstanceDeserializations for (PdxTests.PdxType) PdxInstance = %d ",
lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializations());
- LOGINFO("pdxInstanceCreations for (PdxTests.PdxType) PdxInstance = %d ",
- lregPtr->getCacheImpl()->m_cacheStats->getPdxInstanceCreations());
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializations());
+ LOGINFO(
+ "pdxInstanceCreations for (PdxTests.PdxType) PdxInstance = %d ",
+ lregPtr->getCacheImpl()->getCachePerfStats().getPdxInstanceCreations());
LOGINFO(
"pdxInstanceDeserializationTime for(PdxTests.PdxType) PdxInstance = "
"%d ",
lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializationTime());
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializationTime());
ASSERT(lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializations() == 1,
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializations() == 1,
"pdxInstanceDeserialization should be equal to 1.");
- ASSERT(lregPtr->getCacheImpl()->m_cacheStats->getPdxInstanceCreations() > 1,
- "pdxInstanceCreations should be greater than 1.");
+ ASSERT(
+ lregPtr->getCacheImpl()->getCachePerfStats().getPdxInstanceCreations() >
+ 1,
+ "pdxInstanceCreations should be greater than 1.");
ASSERT(lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializationTime() > 0,
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializationTime() > 0,
"pdxInstanceDeserializationTime should be greater than 0.");
auto ptorig = std::make_shared<PdxTests::PdxType>();
@@ -663,22 +693,29 @@ DUNIT_TASK_DEFINITION(CLIENT2, getObject)
LOGINFO(
"pdxInstanceDeserializations for (PdxTests.PdxType) PdxInstance = %d ",
lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializations());
- LOGINFO("pdxInstanceCreations for (PdxTests.PdxType) PdxInstance = %d ",
- lregPtr->getCacheImpl()->m_cacheStats->getPdxInstanceCreations());
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializations());
+ LOGINFO(
+ "pdxInstanceCreations for (PdxTests.PdxType) PdxInstance = %d ",
+ lregPtr->getCacheImpl()->getCachePerfStats().getPdxInstanceCreations());
LOGINFO(
"pdxInstanceDeserializationTime for(PdxTests.PdxType) PdxInstance = "
"%d ",
lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializationTime());
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializationTime());
ASSERT(lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializations() == 2,
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializations() == 2,
"pdxInstanceDeserialization should be equal to 2.");
- ASSERT(lregPtr->getCacheImpl()->m_cacheStats->getPdxInstanceCreations() > 1,
- "pdxInstanceCreations should be greater than 1.");
+ ASSERT(
+ lregPtr->getCacheImpl()->getCachePerfStats().getPdxInstanceCreations() >
+ 1,
+ "pdxInstanceCreations should be greater than 1.");
ASSERT(lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializationTime() > 0,
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializationTime() > 0,
"pdxInstanceDeserializationTime should be greater than 0.");
auto parentPdxObj = std::make_shared<ParentPdx>(1);
@@ -700,7 +737,8 @@ DUNIT_TASK_DEFINITION(CLIENT2, verifyPdxInstanceEquals)
LOG("Task verifyPdxInstanceEquals started.");
try {
- Serializable::registerPdxType(PdxTests::PdxType::createDeserializable);
+ SerializationRegistryPtr serializationRegistry = CacheRegionHelper::getCacheImpl(cacheHelper->getCache().get())->getSerializationRegistry();
+ serializationRegistry->addPdxType(PdxTests::PdxType::createDeserializable);
LOG("PdxObject Registered Successfully....");
} catch (apache::geode::client::IllegalStateException& /* ex*/) {
LOG("PdxObject IllegalStateException");
@@ -762,16 +800,16 @@ END_TASK_DEFINITION
DUNIT_TASK_DEFINITION(CLIENT2, accessPdxInstance)
{
LOG("accessPdxInstance started ");
-
+ SerializationRegistryPtr serializationRegistry = CacheRegionHelper::getCacheImpl(cacheHelper->getCache().get())->getSerializationRegistry();
try {
- Serializable::registerPdxType(PdxTests::PdxType::createDeserializable);
+ serializationRegistry->addPdxType(PdxTests::PdxType::createDeserializable);
LOG("PdxObject Registered Successfully....");
} catch (apache::geode::client::IllegalStateException& /* ex*/) {
LOG("PdxObject IllegalStateException");
}
try {
- Serializable::registerPdxType(Address::createDeserializable);
+ serializationRegistry->addPdxType(Address::createDeserializable);
LOG("Address Registered Successfully....");
} catch (apache::geode::client::IllegalStateException& /* ex*/) {
LOG("Address IllegalStateException");
@@ -1998,23 +2036,29 @@ DUNIT_TASK_DEFINITION(CLIENT2, modifyPdxInstanceAndCheckLocally)
LOGINFO(
"pdxInstanceDeserializations for (PdxTests.PdxType) PdxInstance = %d ",
lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializations());
- LOGINFO("pdxInstanceCreations for (PdxTests.PdxType) PdxInstance = %d ",
- lregPtr->getCacheImpl()->m_cacheStats->getPdxInstanceCreations());
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializations());
+ LOGINFO(
+ "pdxInstanceCreations for (PdxTests.PdxType) PdxInstance = %d ",
+ lregPtr->getCacheImpl()->getCachePerfStats().getPdxInstanceCreations());
LOGINFO(
"pdxInstanceDeserializationTime for(PdxTests.PdxType) PdxInstance = "
"%d ",
lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializationTime());
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializationTime());
ASSERT(lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializations() == 0,
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializations() == 0,
"pdxInstanceDeserialization should be equal to 0.");
- ASSERT(
- lregPtr->getCacheImpl()->m_cacheStats->getPdxInstanceCreations() == 1,
- "pdxInstanceCreations should be equal to 1.");
ASSERT(lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializationTime() > 0,
+ ->getCachePerfStats()
+ .getPdxInstanceCreations() == 1,
+ "pdxInstanceCreations should be equal to 1.");
+ ASSERT(lregPtr->getCacheImpl()
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializationTime() > 0,
"pdxInstanceDeserializationTime should be greater than 0.");
WritablePdxInstancePtr wpiPtr(pIPtr->createWriter());
@@ -2328,30 +2372,30 @@ END_TASK_DEFINITION
DUNIT_TASK_DEFINITION(CLIENT1, pdxIFPutGetTest)
{
LOG("pdxIFPutGetTest started ");
-
+ SerializationRegistryPtr serializationRegistry = CacheRegionHelper::getCacheImpl(cacheHelper->getCache().get())->getSerializationRegistry();
try {
- Serializable::registerPdxType(Address::createDeserializable);
+ serializationRegistry->addPdxType(Address::createDeserializable);
LOG("Address Registered Successfully....");
} catch (apache::geode::client::IllegalStateException& /* ex*/) {
LOG("Address IllegalStateException");
}
try {
- Serializable::registerPdxType(PdxTests::PdxType::createDeserializable);
+ serializationRegistry->addPdxType(PdxTests::PdxType::createDeserializable);
LOG("PdxObject Registered Successfully....");
} catch (apache::geode::client::IllegalStateException& /* ex*/) {
LOG("PdxObject IllegalStateException");
}
try {
- Serializable::registerPdxType(ChildPdx::createDeserializable);
+ serializationRegistry->addPdxType(ChildPdx::createDeserializable);
LOG("ChildPdx Registered Successfully....");
} catch (apache::geode::client::IllegalStateException& /* ex*/) {
LOG("ChildPdx IllegalStateException");
}
try {
- Serializable::registerPdxType(ParentPdx::createDeserializable);
+ serializationRegistry->addPdxType(ParentPdx::createDeserializable);
LOG("ParentPdx Registered Successfully....");
} catch (apache::geode::client::IllegalStateException& /* ex*/) {
LOG("ParentPdx IllegalStateException");
@@ -2483,23 +2527,29 @@ DUNIT_TASK_DEFINITION(CLIENT1, pdxIFPutGetTest)
LOGINFO(
"pdxInstanceDeserializations for (PdxTests.PdxType) PdxInstance = %d ",
lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializations());
- LOGINFO("pdxInstanceCreations for (PdxTests.PdxType) PdxInstance = %d ",
- lregPtr->getCacheImpl()->m_cacheStats->getPdxInstanceCreations());
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializations());
+ LOGINFO(
+ "pdxInstanceCreations for (PdxTests.PdxType) PdxInstance = %d ",
+ lregPtr->getCacheImpl()->getCachePerfStats().getPdxInstanceCreations());
LOGINFO(
"pdxInstanceDeserializationTime for(PdxTests.PdxType) PdxInstance = "
"%d ",
lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializationTime());
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializationTime());
ASSERT(lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializations() == 1,
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializations() == 1,
"pdxInstanceDeserialization should be equal to 1.");
- ASSERT(
- lregPtr->getCacheImpl()->m_cacheStats->getPdxInstanceCreations() == 0,
- "pdxInstanceCreations should be equal to 0.");
ASSERT(lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializationTime() == 0,
+ ->getCachePerfStats()
+ .getPdxInstanceCreations() == 0,
+ "pdxInstanceCreations should be equal to 0.");
+ ASSERT(lregPtr->getCacheImpl()
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializationTime() == 0,
"pdxInstanceDeserializationTime should be equal to 0.");
PdxTests::PdxType* obj2 = pdxobj.get();
@@ -2519,23 +2569,29 @@ DUNIT_TASK_DEFINITION(CLIENT1, pdxIFPutGetTest)
LOGINFO(
"pdxInstanceDeserializations for (PdxTests.PdxType) PdxInstance = %d ",
lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializations());
- LOGINFO("pdxInstanceCreations for (PdxTests.PdxType) PdxInstance = %d ",
- lregPtr->getCacheImpl()->m_cacheStats->getPdxInstanceCreations());
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializations());
+ LOGINFO(
+ "pdxInstanceCreations for (PdxTests.PdxType) PdxInstance = %d ",
+ lregPtr->getCacheImpl()->getCachePerfStats().getPdxInstanceCreations());
LOGINFO(
"pdxInstanceDeserializationTime for(PdxTests.PdxType) PdxInstance = "
"%d ",
lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializationTime());
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializationTime());
ASSERT(lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializations() == 1,
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializations() == 1,
"pdxInstanceDeserialization should be equal to 1.");
- ASSERT(
- lregPtr->getCacheImpl()->m_cacheStats->getPdxInstanceCreations() == 0,
- "pdxInstanceCreations should be equal to 0.");
ASSERT(lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializationTime() > 0,
+ ->getCachePerfStats()
+ .getPdxInstanceCreations() == 0,
+ "pdxInstanceCreations should be equal to 0.");
+ ASSERT(lregPtr->getCacheImpl()
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializationTime() > 0,
"pdxInstanceDeserializationTime should be greater than 0.");
PdxTests::PdxType* obj3 = dynamic_cast<PdxTests::PdxType*>(newPiPtr.get());
@@ -2592,25 +2648,30 @@ DUNIT_TASK_DEFINITION(CLIENT1, pdxIFPutGetTest)
"= "
"%d ",
lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializations());
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializations());
LOGINFO(
"pdxInstanceCreations for (testobject::ParentPdx) PdxInstance = %d ",
- lregPtr->getCacheImpl()->m_cacheStats->getPdxInstanceCreations());
+ lregPtr->getCacheImpl()->getCachePerfStats().getPdxInstanceCreations());
LOGINFO(
"pdxInstanceDeserializationTime for(testobject::ParentPdx) PdxInstance "
" "
"= %d ",
lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializationTime());
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializationTime());
ASSERT(lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializations() == 1,
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializations() == 1,
"pdxInstanceDeserialization should be equal to 1.");
- ASSERT(
- lregPtr->getCacheImpl()->m_cacheStats->getPdxInstanceCreations() == 0,
- "pdxInstanceCreations should be equal to 0.");
ASSERT(lregPtr->getCacheImpl()
- ->m_cacheStats->getPdxInstanceDeserializationTime() > 0,
+ ->getCachePerfStats()
+ .getPdxInstanceCreations() == 0,
+ "pdxInstanceCreations should be equal to 0.");
+ ASSERT(lregPtr->getCacheImpl()
+ ->getCachePerfStats()
+ .getPdxInstanceDeserializationTime() > 0,
"pdxInstanceDeserializationTime should be greater than 0.");
auto pp1 = std::dynamic_pointer_cast<ParentPdx>(newPiPtr);