You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ab...@apache.org on 2017/04/25 04:10:44 UTC
geode-native git commit: GEODE-2763: Remove of nonSingleHopsCount
stat in client from 1. source 2. cpp and csharp unit tests 3. documentation.
This closes #90 Signed-off-by: Amey Barve
Repository: geode-native
Updated Branches:
refs/heads/develop 32bd9e1e0 -> 6af505317
GEODE-2763: Remove of nonSingleHopsCount stat in client from 1. source 2. cpp and csharp unit tests 3. documentation.
This closes #90
Signed-off-by: Amey Barve <am...@ampool.io>
Project: http://git-wip-us.apache.org/repos/asf/geode-native/repo
Commit: http://git-wip-us.apache.org/repos/asf/geode-native/commit/6af50531
Tree: http://git-wip-us.apache.org/repos/asf/geode-native/tree/6af50531
Diff: http://git-wip-us.apache.org/repos/asf/geode-native/diff/6af50531
Branch: refs/heads/develop
Commit: 6af505317cacedad57e2fd3c75dc08f9be7c34d4
Parents: 32bd9e1
Author: Amey Barve <am...@ampool.io>
Authored: Tue Apr 11 15:20:02 2017 +0530
Committer: Amey Barve <am...@ampool.io>
Committed: Mon Apr 24 19:04:03 2017 +0530
----------------------------------------------------------------------
.../region-statistics.html.md.erb | 16 +++-----
src/clicache/integration-test/PutGetTestsN.cs | 39 ++++++------------
.../testThinClientPRSingleHop.cpp | 22 +++-------
.../testThinClientPRSingleHopServerGroup.cpp | 24 +++++------
.../testThinClientPutAllPRSingleHop.cpp | 9 ++---
src/cppcache/src/ClientMetadataService.cpp | 2 -
src/cppcache/src/RegionStats.cpp | 42 ++++++++------------
src/cppcache/src/RegionStats.hpp | 10 +----
8 files changed, 54 insertions(+), 110 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/geode-native/blob/6af50531/docs/geode-native-docs/system-statistics/region-statistics.html.md.erb
----------------------------------------------------------------------
diff --git a/docs/geode-native-docs/system-statistics/region-statistics.html.md.erb b/docs/geode-native-docs/system-statistics/region-statistics.html.md.erb
index be9a343..70ee27b 100644
--- a/docs/geode-native-docs/system-statistics/region-statistics.html.md.erb
+++ b/docs/geode-native-docs/system-statistics/region-statistics.html.md.erb
@@ -93,34 +93,30 @@ These methods help to get the statistics of a region.
<td>Total number of cache entries fetched from disk into the cache region.</td>
</tr>
<tr class="odd">
-<td><code class="ph codeph">nonSingleHopCount</code></td>
-<td>Total number of times client request required multiple hops.</td>
-</tr>
-<tr class="even">
<td><code class="ph codeph">metaDataRefreshCount</code></td>
<td>Total number of times metadata was refreshed due to the observation of multiple hops.</td>
</tr>
-<tr class="odd">
+<tr class="even">
<td><code class="ph codeph">cacheLoaderCallCompleted</code></td>
<td>Total number of times a load has completed for this region.</td>
</tr>
-<tr class="even">
+<tr class="odd">
<td><code class="ph codeph">cacheLoaderCallTime</code></td>
<td>Total time spent invoking the loaders for this region.</td>
</tr>
-<tr class="odd">
+<tr class="even">
<td><code class="ph codeph">CacheWriterCallsCompleted</code></td>
<td>Total number of times a cache writer call has completed for this region.</td>
</tr>
-<tr class="even">
+<tr class="odd">
<td><code class="ph codeph">CacheWriterCallTime</code></td>
<td>Total time spent doing cache writer calls.</td>
</tr>
-<tr class="odd">
+<tr class="even">
<td><code class="ph codeph">CacheListenerCallsCompleted</code></td>
<td>Total number of times a cache listener call has completed for this region.</td>
</tr>
-<tr class="even">
+<tr class="odd">
<td><code class="ph codeph">CacheListenerCallTime</code></td>
<td>Total time spent doing cache listener calls for this region.</td>
</tr>
http://git-wip-us.apache.org/repos/asf/geode-native/blob/6af50531/src/clicache/integration-test/PutGetTestsN.cs
----------------------------------------------------------------------
diff --git a/src/clicache/integration-test/PutGetTestsN.cs b/src/clicache/integration-test/PutGetTestsN.cs
index 58b6dd7..d38e045 100644
--- a/src/clicache/integration-test/PutGetTestsN.cs
+++ b/src/clicache/integration-test/PutGetTestsN.cs
@@ -209,8 +209,8 @@ namespace Apache.Geode.Client.UnitTests
public void DoPRSHPartitionResolverPuts(string rname)
{
IRegion<object, object> region = CacheHelper.GetRegion<object, object>(rname);
- int nonSingleHopCount = 0, metadatarefreshCount = 0;
- int nonSingleHopCount1 = 0, metadatarefreshCount1 = 0;
+ int metadatarefreshCount = 0;
+ int metadatarefreshCount1 = 0;
Assert.IsNotNull(region, "DoPRSHPartitionResolverPuts: null region.");
if (rname.CompareTo("DistRegionNoAck") == 0)
{
@@ -247,7 +247,6 @@ namespace Apache.Geode.Client.UnitTests
Statistics rStats = factory.FindFirstStatisticsByType(type);
if (rStats != null)
{
- nonSingleHopCount = rStats.GetInt((string)"nonSingleHopCount");
metadatarefreshCount = rStats.GetInt((string)"metaDataRefreshCount");
}
}
@@ -333,15 +332,13 @@ namespace Apache.Geode.Client.UnitTests
Statistics rStats = factory.FindFirstStatisticsByType(type);
if (rStats != null)
{
- nonSingleHopCount1 = rStats.GetInt((string)"nonSingleHopCount");
metadatarefreshCount1 = rStats.GetInt((string)"metaDataRefreshCount");
- Assert.AreEqual(nonSingleHopCount1, nonSingleHopCount, "nonSingleHopCount1 should be equal to nonSingleHopCount");
Assert.AreEqual(metadatarefreshCount1, metadatarefreshCount, "metadatarefreshCount1 should be equal to metadatarefreshCount");
}
}
}
- nonSingleHopCount = metadatarefreshCount = 0;
+ metadatarefreshCount = 0;
if (rname.CompareTo("DistRegionAck") == 0)
{
Util.Log("Inside DoPRSHPartitionResolverPuts region name is {0} ", region.Name.ToString());
@@ -377,11 +374,9 @@ namespace Apache.Geode.Client.UnitTests
Statistics rStats = factory.FindFirstStatisticsByType(type);
if (rStats != null)
{
- nonSingleHopCount = rStats.GetInt((string)"nonSingleHopCount");
metadatarefreshCount = rStats.GetInt((string)"metaDataRefreshCount");
}
}
- //Assert.AreEqual(1, nonSingleHopCount, "nonSingleHopCount should be equal to 1");
//Assert.AreEqual(1, metadatarefreshCount, "metadatarefreshCount should be equal to 1");
Util.Log("DoPRSHPartitionResolverPuts WarmUp Task completed.");
@@ -463,9 +458,7 @@ namespace Apache.Geode.Client.UnitTests
Statistics rStats = factory.FindFirstStatisticsByType(type);
if (rStats != null)
{
- nonSingleHopCount1 = rStats.GetInt((string)"nonSingleHopCount");
metadatarefreshCount1 = rStats.GetInt((string)"metaDataRefreshCount");
- Assert.AreEqual(nonSingleHopCount1, nonSingleHopCount, "nonSingleHopCount1 should be equal to nonSingleHopCount");
Assert.AreEqual(metadatarefreshCount1, metadatarefreshCount, "metadatarefreshCount1 should be equal to metadatarefreshCount");
}
}
@@ -476,8 +469,8 @@ namespace Apache.Geode.Client.UnitTests
{
Util.Log("DoPRSHTradeResolverTasks rname = {0} ", rname);
IRegion<TradeKey, Object> region = CacheHelper.GetRegion<TradeKey, Object>(rname);
- int nonSingleHopCount = 0, metadatarefreshCount = 0;
- int nonSingleHopCount1 = 0, metadatarefreshCount1 = 0;
+ int metadatarefreshCount = 0;
+ int metadatarefreshCount1 = 0;
Assert.IsNotNull(region, "DoPRSHTradeResolverTasks: null region.");
for (int i = 0; i < 1000; i++)
{
@@ -509,12 +502,10 @@ namespace Apache.Geode.Client.UnitTests
Statistics rStats = factory.FindFirstStatisticsByType(type);
if (rStats != null)
{
- nonSingleHopCount = rStats.GetInt((string)"nonSingleHopCount");
metadatarefreshCount = rStats.GetInt((string)"metaDataRefreshCount");
}
}
- Util.Log("nonSingleHopCount = {0} & metadatarefreshCount = {1} ", nonSingleHopCount, metadatarefreshCount);
- Assert.GreaterOrEqual(nonSingleHopCount, 1, "nonSingleHopCount should be GreaterOrEqual to 1");
+ Util.Log("metadatarefreshCount = {0} ", metadatarefreshCount);
Assert.GreaterOrEqual(metadatarefreshCount, 1, "metadatarefreshCount should be equal to 1");
Util.Log("DoPRSHTradeResolverTasks WarmUp Task completed.");
@@ -589,10 +580,8 @@ namespace Apache.Geode.Client.UnitTests
Statistics rStats = factory.FindFirstStatisticsByType(type);
if (rStats != null)
{
- nonSingleHopCount1 = rStats.GetInt((string)"nonSingleHopCount");
metadatarefreshCount1 = rStats.GetInt((string)"metaDataRefreshCount");
- Util.Log("nonSingleHopCount1 = {0} & metadatarefreshCount1 = {1} ", nonSingleHopCount1, metadatarefreshCount1);
- //Assert.AreEqual(nonSingleHopCount1, nonSingleHopCount, "nonSingleHopCount1 should be equal to nonSingleHopCount");
+ Util.Log("metadatarefreshCount1 = {0} ", metadatarefreshCount1);
Assert.AreEqual(metadatarefreshCount1, metadatarefreshCount, "metadatarefreshCount1 should be equal to metadatarefreshCount");
}
}
@@ -661,8 +650,8 @@ namespace Apache.Geode.Client.UnitTests
public void DoPRSHFixedPartitionResolverTests(string rname)
{
IRegion<object, object> region = CacheHelper.GetRegion<object, object>(rname);
- int nonSingleHopCount = 0, metadatarefreshCount = 0;
- int nonSingleHopCount1 = 0, metadatarefreshCount1 = 0;
+ int metadatarefreshCount = 0;
+ int metadatarefreshCount1 = 0;
Assert.IsNotNull(region, "DoPRSHPartitionResolverPuts: null region.");
Util.Log("Inside DoPRSHFixedPartitionResolverTests region name is {0} ", region.Name.ToString());
for (int i = 0; i < 2000; i++)
@@ -698,13 +687,11 @@ namespace Apache.Geode.Client.UnitTests
Statistics rStats = factory.FindFirstStatisticsByType(type);
if (rStats != null)
{
- nonSingleHopCount = rStats.GetInt((string)"nonSingleHopCount");
metadatarefreshCount = rStats.GetInt((string)"metaDataRefreshCount");
}
}
- Util.Log("DoPRSHFixedPartitionResolverTests Put Task completed nonSingleHopCount = {0} metadatarefreshCount = {1}.", nonSingleHopCount, metadatarefreshCount);
- Assert.Greater(nonSingleHopCount, 1, "nonSingleHopCount should be Greater than 1");
+ Util.Log("DoPRSHFixedPartitionResolverTests Put Task completed metadatarefreshCount = {0}.", metadatarefreshCount);
Assert.Greater(metadatarefreshCount, 1, "metadatarefreshCount should be Greater than 1");
for (int i = 0; i < 1000; i++)
@@ -757,14 +744,12 @@ namespace Apache.Geode.Client.UnitTests
Statistics rStats = factory.FindFirstStatisticsByType(type);
if (rStats != null)
{
- nonSingleHopCount1 = rStats.GetInt((string)"nonSingleHopCount");
metadatarefreshCount1 = rStats.GetInt((string)"metaDataRefreshCount");
}
}
Util.Log("DoPRSHFixedPartitionResolverTests All Task completed ");
- Util.Log("nonSingleHopCount = {0} metadatarefreshCount = {1} .", nonSingleHopCount, metadatarefreshCount);
- Util.Log("nonSingleHopCount1 = {0} metadatarefreshCount1 = {1} .", nonSingleHopCount1, metadatarefreshCount1);
- Assert.AreEqual(nonSingleHopCount, nonSingleHopCount1, "nonSingleHopCount should be equal to {0}", nonSingleHopCount);
+ Util.Log("metadatarefreshCount = {0} .", metadatarefreshCount);
+ Util.Log("metadatarefreshCount1 = {0} .", metadatarefreshCount1);
Assert.AreEqual(metadatarefreshCount, metadatarefreshCount1, "metadatarefreshCount should be equal to {0}", metadatarefreshCount);
}
http://git-wip-us.apache.org/repos/asf/geode-native/blob/6af50531/src/cppcache/integration-test/testThinClientPRSingleHop.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPRSingleHop.cpp b/src/cppcache/integration-test/testThinClientPRSingleHop.cpp
index 9b41d45..43e6966 100644
--- a/src/cppcache/integration-test/testThinClientPRSingleHop.cpp
+++ b/src/cppcache/integration-test/testThinClientPRSingleHop.cpp
@@ -284,7 +284,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, WarmUpTask)
{
LOG("WarmUpTask started.");
int failureCount = 0;
- int nonSingleHopCount = 0, metadatarefreshCount = 0;
+ int metadatarefreshCount = 0;
RegionPtr dataReg = getHelper()->getRegion(regionNames[0]);
// This is to get MetaDataService going.
@@ -305,15 +305,14 @@ DUNIT_TASK_DEFINITION(CLIENT1, WarmUpTask)
if (type) {
Statistics* rStats = factory->findFirstStatisticsByType(type);
if (rStats) {
- nonSingleHopCount = rStats->getInt((char*)"nonSingleHopCount");
metadatarefreshCount =
rStats->getInt((char*)"metaDataRefreshCount");
}
}
LOGINFO(
- "WarmUpTask: nonSingleHopCount is %d & metadatarefreshCount is %d "
+ "WarmUpTask: & metadatarefreshCount is %d "
"failureCount = %d",
- nonSingleHopCount, metadatarefreshCount, failureCount);
+ metadatarefreshCount, failureCount);
LOGINFO("CPPTEST: put success ");
} catch (CacheServerException&) {
// This is actually a success situation!
@@ -353,10 +352,6 @@ DUNIT_TASK_DEFINITION(CLIENT1, WarmUpTask)
->getPoolSize("__TEST_POOL1__");
LOGINFO("poolconn = %d and endpoints size = %d ", poolconn,
endpointNames.size());
- if (poolconn >= endpointNames.size()) {
- ASSERT(nonSingleHopCount < 100,
- "nonSingleHopCount should be less than 100");
- }
ASSERT(metadatarefreshCount < 100,
"metadatarefreshCount should be less than 1000");
@@ -370,7 +365,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, WarmUpTask3)
{
LOG("WarmUpTask3 started.");
int failureCount = 0;
- int nonSingleHopCount = 0, metadatarefreshCount = 0;
+ int metadatarefreshCount = 0;
RegionPtr dataReg = getHelper()->getRegion(regionNames[0]);
// This is to get MetaDataService going.
@@ -391,15 +386,14 @@ DUNIT_TASK_DEFINITION(CLIENT1, WarmUpTask3)
if (type) {
Statistics* rStats = factory->findFirstStatisticsByType(type);
if (rStats) {
- nonSingleHopCount = rStats->getInt((char*)"nonSingleHopCount");
metadatarefreshCount =
rStats->getInt((char*)"metaDataRefreshCount");
}
}
LOGINFO(
- "WarmUpTask3: nonSingleHopCount is %d & metadatarefreshCount is %d "
+ "WarmUpTask3: & metadatarefreshCount is %d "
"failureCount = %d",
- nonSingleHopCount, metadatarefreshCount, failureCount);
+ metadatarefreshCount, failureCount);
LOGINFO("CPPTEST: put success ");
} catch (CacheServerException&) {
// This is actually a success situation!
@@ -441,10 +435,6 @@ DUNIT_TASK_DEFINITION(CLIENT1, WarmUpTask3)
->getPoolSize("__TEST_POOL1__");
LOGINFO("poolconn = %d and endpoints size = %d ", poolconn,
endpointNames.size());
- if (poolconn >= endpointNames.size()) {
- ASSERT(nonSingleHopCount < expectedFailCount,
- "nonSingleHopCount should be less than expectedFailCount");
- }
ASSERT(metadatarefreshCount < expectedFailCount,
"metadatarefreshCount should be less than expectedFailCount");
http://git-wip-us.apache.org/repos/asf/geode-native/blob/6af50531/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp b/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp
index ac5cc4e..8dbcc89 100644
--- a/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp
+++ b/src/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp
@@ -92,7 +92,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, CheckPrSingleHopForIntKeysTask_CLIENT1)
{
LOG("CheckPrSingleHopForIntKeysTask_CLIENT1 started.");
int failureCount = 0;
- int nonSingleHopCount = 0, metadatarefreshCount = 0;
+ int metadatarefreshCount = 0;
RegionPtr dataReg = getHelper()->getRegion(regionNames[0]);
@@ -124,15 +124,14 @@ DUNIT_TASK_DEFINITION(CLIENT1, CheckPrSingleHopForIntKeysTask_CLIENT1)
if (type) {
Statistics* rStats = factory->findFirstStatisticsByType(type);
if (rStats) {
- nonSingleHopCount = rStats->getInt((char*)"nonSingleHopCount");
metadatarefreshCount =
rStats->getInt((char*)"metaDataRefreshCount");
}
}
LOGINFO(
- "CheckPrSingleHopForIntKeysTask_CLIENT1: nonSingleHopCount is %d & "
+ "CheckPrSingleHopForIntKeysTask_CLIENT1: "
"metadatarefreshCount is %d failureCount = %d",
- nonSingleHopCount, metadatarefreshCount, failureCount);
+ metadatarefreshCount, failureCount);
} catch (CacheServerException&) {
LOGERROR("CPPTEST: Put caused extra hop.");
FAIL("Put caused extra hop.");
@@ -156,7 +155,6 @@ DUNIT_TASK_DEFINITION(CLIENT1, CheckPrSingleHopForIntKeysTask_CLIENT1)
}
// relaxed this limit as it takes time
ASSERT(failureCount < 70, "Count should be less then 70");
- ASSERT(nonSingleHopCount < 70, "nonSingleHopCount should be less than 70");
ASSERT(metadatarefreshCount < 70,
"metadatarefreshCount should be less than 70");
LOG("CheckPrSingleHopForIntKeysTask_CLIENT1 put completed.");
@@ -299,7 +297,7 @@ DUNIT_TASK_DEFINITION(CLIENT2, CheckPrSingleHopForIntKeysTask_CLIENT2)
{
LOG("CheckPrSingleHopForIntKeysTask_CLIENT2 started.");
int failureCount = 0;
- int nonSingleHopCount = 0, metadatarefreshCount = 0;
+ int metadatarefreshCount = 0;
RegionPtr dataReg = getHelper()->getRegion(regionNames[0]);
@@ -331,15 +329,14 @@ DUNIT_TASK_DEFINITION(CLIENT2, CheckPrSingleHopForIntKeysTask_CLIENT2)
if (type) {
Statistics* rStats = factory->findFirstStatisticsByType(type);
if (rStats) {
- nonSingleHopCount = rStats->getInt((char*)"nonSingleHopCount");
metadatarefreshCount =
rStats->getInt((char*)"metaDataRefreshCount");
}
}
LOGINFO(
- "CheckPrSingleHopForIntKeysTask_CLIENT2: nonSingleHopCount is %d & "
+ "CheckPrSingleHopForIntKeysTask_CLIENT2: "
"metadatarefreshCount is %d ",
- nonSingleHopCount, metadatarefreshCount);
+ metadatarefreshCount);
} catch (CacheServerException&) {
LOGERROR("CPPTEST: Put caused extra hop.");
FAIL("Put caused extra hop.");
@@ -362,7 +359,6 @@ DUNIT_TASK_DEFINITION(CLIENT2, CheckPrSingleHopForIntKeysTask_CLIENT2)
}
}
ASSERT(failureCount > 0, "Count should be greater than 1");
- ASSERT(nonSingleHopCount > 0, "nonSingleHopCount should be greater than 1");
ASSERT(metadatarefreshCount > 0,
"metadatarefreshCount should be greater than 1");
LOG("CheckPrSingleHopForIntKeysTask_CLIENT2 put completed.");
@@ -493,7 +489,7 @@ DUNIT_TASK_DEFINITION(CLIENT3, CheckPrSingleHopForIntKeysTask_CLIENT3)
{
LOG("CheckPrSingleHopForIntKeysTask_CLIENT3 started.");
int failureCount = 0;
- int nonSingleHopCount = 0, metadatarefreshCount = 0;
+ int metadatarefreshCount = 0;
RegionPtr dataReg = getHelper()->getRegion(regionNames[0]);
@@ -525,15 +521,14 @@ DUNIT_TASK_DEFINITION(CLIENT3, CheckPrSingleHopForIntKeysTask_CLIENT3)
if (type) {
Statistics* rStats = factory->findFirstStatisticsByType(type);
if (rStats) {
- nonSingleHopCount = rStats->getInt((char*)"nonSingleHopCount");
metadatarefreshCount =
rStats->getInt((char*)"metaDataRefreshCount");
}
}
LOGINFO(
- "CheckPrSingleHopForIntKeysTask_CLIENT3: nonSingleHopCount is %d & "
+ "CheckPrSingleHopForIntKeysTask_CLIENT3: "
"metadatarefreshCount is %d ",
- nonSingleHopCount, metadatarefreshCount);
+ metadatarefreshCount);
} catch (CacheServerException&) {
LOGERROR("CPPTEST: Put caused extra hop.");
FAIL("Put caused extra hop.");
@@ -556,7 +551,6 @@ DUNIT_TASK_DEFINITION(CLIENT3, CheckPrSingleHopForIntKeysTask_CLIENT3)
}
}
ASSERT(failureCount > 0, "Count should be greater than 1");
- ASSERT(nonSingleHopCount > 0, "nonSingleHopCount should be greater than 1");
ASSERT(metadatarefreshCount > 0,
"metadatarefreshCount should be greater than 1");
LOG("CheckPrSingleHopForIntKeysTask_CLIENT3 put completed.");
http://git-wip-us.apache.org/repos/asf/geode-native/blob/6af50531/src/cppcache/integration-test/testThinClientPutAllPRSingleHop.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/integration-test/testThinClientPutAllPRSingleHop.cpp b/src/cppcache/integration-test/testThinClientPutAllPRSingleHop.cpp
index 0ae248b..a47c7b2 100644
--- a/src/cppcache/integration-test/testThinClientPutAllPRSingleHop.cpp
+++ b/src/cppcache/integration-test/testThinClientPutAllPRSingleHop.cpp
@@ -121,7 +121,7 @@ DUNIT_TASK_DEFINITION(CLIENT1, WarmUpTask)
{
LOG("WarmUpTask started.");
int failureCount = 0;
- int nonSingleHopCount = 0, metadatarefreshCount = 0;
+ int metadatarefreshCount = 0;
RegionPtr dataReg = getHelper()->getRegion(regionNames[0]);
// This is to get MetaDataService going.
@@ -142,15 +142,14 @@ DUNIT_TASK_DEFINITION(CLIENT1, WarmUpTask)
if (type) {
Statistics* rStats = factory->findFirstStatisticsByType(type);
if (rStats) {
- nonSingleHopCount = rStats->getInt((char*)"nonSingleHopCount");
metadatarefreshCount =
rStats->getInt((char*)"metaDataRefreshCount");
}
}
LOGINFO(
- "WarmUpTask: nonSingleHopCount is %d & metadatarefreshCount is %d "
+ "WarmUpTask: metadatarefreshCount is %d "
"failureCount = %d",
- nonSingleHopCount, metadatarefreshCount, failureCount);
+ metadatarefreshCount, failureCount);
LOGINFO("CPPTEST: put success ");
} catch (CacheServerException&) {
// This is actually a success situation!
@@ -186,8 +185,6 @@ DUNIT_TASK_DEFINITION(CLIENT1, WarmUpTask)
}
// it takes time to fetch prmetadata so relaxing this limit
ASSERT(failureCount < 100, "Count should be less than 100");
- ASSERT(nonSingleHopCount < 100,
- "nonSingleHopCount should be less than 100");
ASSERT(metadatarefreshCount < 100,
"metadatarefreshCount should be less than 100");
http://git-wip-us.apache.org/repos/asf/geode-native/blob/6af50531/src/cppcache/src/ClientMetadataService.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/ClientMetadataService.cpp b/src/cppcache/src/ClientMetadataService.cpp
index dd756e1..310dcc0 100644
--- a/src/cppcache/src/ClientMetadataService.cpp
+++ b/src/cppcache/src/ClientMetadataService.cpp
@@ -351,8 +351,6 @@ void ClientMetadataService::enqueueForMetadataRefresh(
tcrdm->getConnectionManager().getCacheImpl()->getRegion(regionFullPath,
region);
LocalRegion* lregion = dynamic_cast<LocalRegion*>(region.ptr());
- lregion->getRegionStats()
- ->incNonSingleHopCount(); // we are here means nonSinglehop
std::string serverGroup = tcrdm->getServerGroup();
if (serverGroup.length() != 0) {
http://git-wip-us.apache.org/repos/asf/geode-native/blob/6af50531/src/cppcache/src/RegionStats.cpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionStats.cpp b/src/cppcache/src/RegionStats.cpp
index 930fe92..19e0d56 100644
--- a/src/cppcache/src/RegionStats.cpp
+++ b/src/cppcache/src/RegionStats.cpp
@@ -88,75 +88,70 @@ StatisticsType* RegionStatType::getStatType() {
"The total number of cache entries fetched "
"from persistence backup into the cache",
"entries", largerIsBetter);
-
- m_stats[9] = factory->createIntCounter(
- "nonSingleHopCount",
- "The total number of times client request observed multiple hops",
- "entries", !largerIsBetter);
- m_stats[10] =
+ m_stats[9] =
factory->createIntCounter("metaDataRefreshCount",
"The total number of times matadata is "
"refreshed due to hoping observed",
"entries", !largerIsBetter);
- m_stats[11] = factory->createIntCounter(
+ m_stats[10] = factory->createIntCounter(
"getAll", "The total number of cache getAll for this region", "entries",
largerIsBetter);
- m_stats[12] = factory->createIntCounter(
+ m_stats[11] = factory->createIntCounter(
"putAll", "The total number of cache putAll for this region", "entries",
largerIsBetter);
- m_stats[13] = factory->createLongCounter(
+ m_stats[12] = factory->createLongCounter(
"getTime", "Total time spent doing get operations for this region",
"Nanoseconds", !largerIsBetter);
- m_stats[14] = factory->createLongCounter(
+ m_stats[13] = factory->createLongCounter(
"putTime", "Total time spent doing puts operations for this region",
"Nanoseconds", !largerIsBetter);
- m_stats[15] = factory->createLongCounter(
+ m_stats[14] = factory->createLongCounter(
"putAllTime",
"Total time spent doing putAlls operations for this region",
"Nanoseconds", !largerIsBetter);
- m_stats[16] = factory->createLongCounter(
+ m_stats[15] = factory->createLongCounter(
"getAllTime",
"Total time spent doing the getAlls operations for this region",
"Nanoseconds", !largerIsBetter);
- m_stats[17] = factory->createIntCounter(
+ m_stats[16] = factory->createIntCounter(
"cacheLoaderCallsCompleted",
"Total number of times a load has completed for this region", "entries",
largerIsBetter);
- m_stats[18] = factory->createLongCounter(
+ m_stats[17] = factory->createLongCounter(
"cacheLoaderCallTIme",
"Total time spent invoking the loaders for this region", "Nanoseconds",
!largerIsBetter);
- m_stats[19] =
+ m_stats[18] =
factory->createIntCounter("cacheWriterCallsCompleted",
"Total number of times a cache writer call "
"has completed for this region",
"entries", largerIsBetter);
- m_stats[20] = factory->createLongCounter(
+ m_stats[19] = factory->createLongCounter(
"cacheWriterCallTime", "Total time spent doing cache writer calls",
"Nanoseconds", !largerIsBetter);
- m_stats[21] =
+ m_stats[20] =
factory->createIntCounter("cacheListenerCallsCompleted",
"Total number of times a cache listener call "
"has completed for this region",
"entries", largerIsBetter);
- m_stats[22] = factory->createLongCounter(
+ m_stats[21] = factory->createLongCounter(
"cacheListenerCallTime",
"Total time spent doing cache listener calls for this region",
"Nanoseconds", !largerIsBetter);
- m_stats[23] =
+ m_stats[22] =
factory->createIntCounter("clears",
"The total number of times a clear has been "
"done on this cache for this region",
"entries", !largerIsBetter);
- m_stats[24] = factory->createIntCounter(
+ m_stats[23] = factory->createIntCounter(
"removeAll", "The total number of cache removeAll for this region",
"entries", largerIsBetter);
- m_stats[25] = factory->createLongCounter(
+ m_stats[24] = factory->createLongCounter(
"removeAllTime",
"Total time spent doing removeAlls operations for this region",
"Nanoseconds", !largerIsBetter);
- statsType = factory->createType(statsName, statsDesc, m_stats, 26);
+ statsType = factory->createType(statsName, statsDesc, m_stats, 25);
}
m_destroysId = statsType->nameToId("destroys");
@@ -176,7 +171,6 @@ StatisticsType* RegionStatType::getStatType() {
m_entriesId = statsType->nameToId("entries");
m_overflowsId = statsType->nameToId("overflows");
m_retrievesId = statsType->nameToId("retrieves");
- m_nonSingleHopId = statsType->nameToId("nonSingleHopCount");
m_metaDataRefreshId = statsType->nameToId("metaDataRefreshCount");
m_LoaderCallsCompletedId = statsType->nameToId("cacheLoaderCallsCompleted");
m_LoaderCallTimeId = statsType->nameToId("cacheLoaderCallTIme");
@@ -235,7 +229,6 @@ RegionStats::RegionStats(const char* regionName) {
m_entriesId = regStatType->getEntriesId();
m_overflowsId = regStatType->getOverflowsId();
m_retrievesId = regStatType->getRetrievesId();
- m_nonSingleHopId = regStatType->getNonSingleHopCount();
m_metaDataRefreshId = regStatType->getMetaDataRefreshCount();
m_LoaderCallsCompletedId = regStatType->getLoaderCallsCompletedId();
m_LoaderCallTimeId = regStatType->getLoaderCallTimeId();
@@ -262,7 +255,6 @@ RegionStats::RegionStats(const char* regionName) {
m_regionStats->setInt(m_entriesId, 0);
m_regionStats->setInt(m_overflowsId, 0);
m_regionStats->setInt(m_retrievesId, 0);
- m_regionStats->setInt(m_nonSingleHopId, 0);
m_regionStats->setInt(m_metaDataRefreshId, 0);
m_regionStats->setInt(m_LoaderCallsCompletedId, 0);
m_regionStats->setInt(m_LoaderCallTimeId, 0);
http://git-wip-us.apache.org/repos/asf/geode-native/blob/6af50531/src/cppcache/src/RegionStats.hpp
----------------------------------------------------------------------
diff --git a/src/cppcache/src/RegionStats.hpp b/src/cppcache/src/RegionStats.hpp
index c077b5f..d7aba22 100644
--- a/src/cppcache/src/RegionStats.hpp
+++ b/src/cppcache/src/RegionStats.hpp
@@ -66,10 +66,6 @@ class CPPCACHE_EXPORT RegionStats {
inline void incRetrieves() { m_regionStats->incInt(m_retrievesId, 1); }
- inline void incNonSingleHopCount() {
- m_regionStats->incInt(m_nonSingleHopId, 1);
- }
-
inline void incMetaDataRefreshCount() {
m_regionStats->incInt(m_metaDataRefreshId, 1);
}
@@ -116,7 +112,6 @@ class CPPCACHE_EXPORT RegionStats {
int32_t m_entriesId;
int32_t m_overflowsId;
int32_t m_retrievesId;
- int32_t m_nonSingleHopId;
int32_t m_metaDataRefreshId;
int32_t m_LoaderCallsCompletedId;
int32_t m_LoaderCallTimeId;
@@ -142,7 +137,7 @@ class RegionStatType {
private:
RegionStatType();
- statistics::StatisticDescriptor* m_stats[26];
+ statistics::StatisticDescriptor* m_stats[25];
int32_t m_destroysId;
int32_t m_createsId;
@@ -161,7 +156,6 @@ class RegionStatType {
int32_t m_entriesId;
int32_t m_overflowsId;
int32_t m_retrievesId;
- int32_t m_nonSingleHopId;
int32_t m_metaDataRefreshId;
int32_t m_LoaderCallsCompletedId;
int32_t m_LoaderCallTimeId;
@@ -206,8 +200,6 @@ class RegionStatType {
inline int32_t getRetrievesId() { return m_retrievesId; }
- inline int32_t getNonSingleHopCount() { return m_nonSingleHopId; }
-
inline int32_t getMetaDataRefreshCount() { return m_metaDataRefreshId; }
inline int32_t getLoaderCallsCompletedId() {