[
https://issues.apache.org/jira/browse/GEODE-4046?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=16300186#comment-16300186
]
ASF GitHub Bot commented on GEODE-4046:
---------------------------------------
pivotal-jbarrett closed pull request #170: GEODE-4046: Moves statistics
internal.
URL: https://github.com/apache/geode-native/pull/170
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/clicache/integration-test/CMakeLists.txt
b/clicache/integration-test/CMakeLists.txt
index 942b5572..1912a09d 100644
--- a/clicache/integration-test/CMakeLists.txt
+++ b/clicache/integration-test/CMakeLists.txt
@@ -110,7 +110,6 @@ set_property(TEST ThinClientSecurityAuthTestsN PROPERTY
LABELS OMITTED)
set_property(TEST ThinClientSecurityAuthTestsMUN PROPERTY LABELS OMITTED)
set_property(TEST ThinClientSecurityAuthzTestsMUN PROPERTY LABELS OMITTED)
set_property(TEST ThinClientSecurityAuthzTestsN PROPERTY LABELS OMITTED)
-set_property(TEST ThinClientStatisticTestsN PROPERTY LABELS OMITTED)
add_custom_target(run-stable-clicache-integration-tests
COMMAND ctest -C $<CONFIGURATION> -L STABLE
diff --git a/clicache/integration-test/ThinClientStatisticTestsN.cs
b/clicache/integration-test/ThinClientStatisticTestsN.cs
deleted file mode 100644
index 69bc5e9f..00000000
--- a/clicache/integration-test/ThinClientStatisticTestsN.cs
+++ /dev/null
@@ -1,255 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-using System;
-
-namespace Apache.Geode.Client.UnitTests
-{
- using NUnit.Framework;
- using Apache.Geode.DUnitFramework;
- using System.Threading;
-
- using Apache.Geode.Client;
-
- public class TestStatisticsType
- {
- public StatisticsType testStatsType;
- public int statIdIntCounter;
- public int statIdIntGauge;
- public int statIdLongCounter;
- public int statIdLongGauge;
- public int statIdDoubleCounter;
- public int statIdDoubleGauge;
- };
-
- public class IncThread
- {
- private Statistics m_stat;
- private TestStatisticsType m_type;
-
- public IncThread (Statistics stat,TestStatisticsType type)
- {
- this.m_stat = stat;
- this.m_type = type;
- }
-
- public void ThreadOperation()
- {
- /* Just 1000 Inc, Stop after that */
- for ( int incIdx = 0 ; incIdx < 1000 ; incIdx++ ) {
- m_stat.IncInt(m_type.statIdIntCounter, 1 );
- m_stat.IncInt(m_type.statIdIntGauge, 1 );
- m_stat.IncLong(m_type.statIdLongCounter, 1 );
- m_stat.IncLong(m_type.statIdLongGauge, 1 );
- m_stat.IncDouble(m_type.statIdDoubleCounter, 1.0 );
- m_stat.IncDouble(m_type.statIdDoubleGauge, 1.0 );
- }
- }
- };
-
- [TestFixture]
- [Category("group1")]
- [Category("unicast_only")]
- [Category("generics")]
- public class ThinClientStatisticTests : UnitTests
- {
- //#region Private members
- private UnitProcess m_client1;
- //#endregion
-
- protected override ClientBase[] GetClients()
- {
- m_client1 = new UnitProcess();
- return new ClientBase[] { m_client1 };
- }
-
- [TestFixtureTearDown]
- public override void EndTests()
- {
- CacheHelper.StopJavaServers();
- base.EndTests();
- }
-
- [TearDown]
- public override void EndTest()
- {
- try
- {
- CacheHelper.ClearEndpoints();
- CacheHelper.ClearLocators();
- }
- finally
- {
- CacheHelper.StopJavaServers();
- CacheHelper.StopJavaLocators();
- }
- base.EndTest();
- }
-
- [Test]
- public void StatisticsCheckTest()
- {
- CacheHelper.SetupJavaServers(false, "cacheserver.xml");
- CacheHelper.StartJavaServer(1, "GFECS1");
- Util.Log("Cacheserver 1 started.");
-
- m_client1.Call(CacheHelper.InitClient);
-
- m_client1.Call(statisticsTest);
-
- CacheHelper.StopJavaServer(1);
- Util.Log("Cacheserver 1 stopped.");
-
- CacheHelper.ClearEndpoints();
- m_client1.Call(CacheHelper.Close);
- }
-
- #region Functions invoked by the tests
-
- public void Close()
- {
- CacheHelper.Close();
- }
-
- void createType(StatisticsFactory statFactory, TestStatisticsType testType)
- {
- StatisticDescriptor[] statDescriptorArr = new StatisticDescriptor[6];
-
- statDescriptorArr[0] = statFactory.CreateIntCounter("IntCounter",
- "Test Statistic Descriptor int_t Counter.","TestUnit");
-
- statDescriptorArr[1] = statFactory.CreateIntGauge("IntGauge",
- "Test Statistic Descriptor int_t Gauge.","TestUnit");
-
- statDescriptorArr[2] = statFactory.CreateLongCounter("LongCounter",
- "Test Statistic Descriptor Long Counter.","TestUnit");
-
- statDescriptorArr[3] = statFactory.CreateLongGauge("LongGauge",
- "Test Statistic Descriptor Long Gauge.","TestUnit");
-
- statDescriptorArr[4] = statFactory.CreateDoubleCounter("DoubleCounter",
- "Test Statistic Descriptor Double Counter.","TestUnit");
-
- statDescriptorArr[5] = statFactory.CreateDoubleGauge("DoubleGauge",
- "Test Statistic Descriptor Double Gauge.","TestUnit");
-
- StatisticsType statsType = statFactory.CreateType("TestStatsType",
- "Statistics for Unit Test.",statDescriptorArr,
6);
-
- Assert.IsNotNull(statsType, "Error in creating Stats Type");
-
- testType.testStatsType = statsType;
- testType.statIdIntCounter = statsType.NameToId("IntCounter");
- testType.statIdIntGauge = statsType.NameToId("IntGauge");
- testType.statIdLongCounter = statsType.NameToId("LongCounter");
- testType.statIdLongGauge = statsType.NameToId("LongGauge");
- testType.statIdDoubleCounter = statsType.NameToId("DoubleCounter");
- testType.statIdDoubleGauge = statsType.NameToId("DoubleGauge");
-
- StatisticsType statsType1 = statFactory.CreateType("TestStatsType1",
- "Statistics for Unit Test", statDescriptorArr,
6);
- testType.testStatsType = statsType1;
-
- /* Test Find */
- Assert.IsNotNull(statFactory.FindType("TestStatsType"),"stat not found");
- Assert.IsNotNull(statFactory.FindType("TestStatsType1"), "stat not
found");
- Assert.IsNull(statFactory.FindType("TestStatsType2"),"stat not to be
found");
- }
-
- void testGetSetIncFunctions(Statistics stat, TestStatisticsType type )
- {
- /* Set a initial value = 10 */
- stat.SetInt(type.statIdIntCounter, 10);
- stat.SetInt(type.statIdIntGauge, 10);
- stat.SetLong(type.statIdLongCounter, 10);
- stat.SetLong(type.statIdLongGauge, 10);
- stat.SetDouble(type.statIdDoubleCounter, 10.0);
- stat.SetDouble(type.statIdDoubleGauge, 10.0);
- Util.Log(" Setting Initial Value Complete");
-
- /* Check Initial Value = 10*/
- Assert.AreEqual(10, stat.GetInt(type.statIdIntCounter), " Check1 1
Failed ");
- Assert.AreEqual(10, stat.GetInt(type.statIdIntGauge), " Check1 2 Failed
");
- Assert.AreEqual(10, stat.GetLong(type.statIdLongCounter), " Check1 3
Failed ");
- Assert.AreEqual(10, stat.GetLong(type.statIdLongGauge), " Check1 4
Failed ");
- Assert.AreEqual(10.0, stat.GetDouble(type.statIdDoubleCounter), " Check1
5 Failed ");
- Assert.AreEqual(10.0, stat.GetDouble(type.statIdDoubleGauge), " Check1 6
Failed ");
- Util.Log(" All Set() were correct.");
-
- /* Increment single thread for 100 times */
- for ( int incIdx = 0 ; incIdx < 100 ; incIdx++ ) {
- stat.IncInt(type.statIdIntCounter, 1);
- stat.IncInt(type.statIdIntGauge, 1);
- stat.IncLong(type.statIdLongCounter, 1);
- stat.IncLong(type.statIdLongGauge, 1);
- stat.IncDouble(type.statIdDoubleCounter, 1.0);
- stat.IncDouble(type.statIdDoubleGauge, 1.0);
- Thread.Sleep(10);
- }
- Util.Log(" Incremented 100 times by 1.");
-
- /* Check Incremented Value = 110 */
- Assert.AreEqual(110, stat.GetInt(type.statIdIntCounter), " Check2 1
Failed ");
- Assert.AreEqual(110, stat.GetInt(type.statIdIntGauge), " Check2 2 Failed
");
- Assert.AreEqual(110, stat.GetLong(type.statIdLongCounter), " Check2 3
Failed ");
- Assert.AreEqual(110, stat.GetLong(type.statIdLongGauge), " Check2 4
Failed ");
- Assert.AreEqual(110.0, stat.GetDouble(type.statIdDoubleCounter), "
Check2 5 Failed ");
- Assert.AreEqual(110.0, stat.GetDouble(type.statIdDoubleGauge), " Check2
6 Failed ");
- Util.Log(" Single thread Inc() Passed.");
-
- IncThread[] myThreads = new IncThread[10];
- Thread[] thread = new Thread[10];
-
- for (int i = 0; i < 10; i++)
- {
- myThreads[i] = new IncThread(stat, type);
- thread[i] = new Thread(new ThreadStart(myThreads[i].ThreadOperation));
- thread[i].Start();
- }
- Thread.Sleep(1000);
- for (int i = 0; i < 10; i++)
- {
- thread[i].Join();
- }
-
- /* Check Final Value = 10,110 */
- Assert.AreEqual(10110, stat.GetInt(type.statIdIntCounter), " Check2 1
Failed ");
- Assert.AreEqual(10110, stat.GetInt(type.statIdIntGauge), " Check2 2
Failed ");
- Assert.AreEqual(10110, stat.GetLong(type.statIdLongCounter), " Check2 3
Failed ");
- Assert.AreEqual(10110, stat.GetLong(type.statIdLongGauge), " Check2 4
Failed ");
- Assert.AreEqual(10110.0, stat.GetDouble(type.statIdDoubleCounter), "
Check2 5 Failed ");
- Assert.AreEqual(10110.0, stat.GetDouble(type.statIdDoubleGauge), "
Check2 6 Failed ");
- Util.Log(" Parallel Inc() Passed.");
-
- /* Check value of Gauge type */
- stat.SetInt(type.statIdIntGauge, 50);
- stat.SetDouble(type.statIdDoubleGauge, 50.0);
- stat.SetLong(type.statIdLongGauge, 50);
-
- Assert.AreEqual(50, stat.GetInt(type.statIdIntGauge), " Check3 1
Failed");
- Assert.AreEqual(50, stat.GetLong(type.statIdLongGauge), "Check3 2
Failed");
- Assert.AreEqual(50.0, stat.GetDouble(type.statIdDoubleGauge), "Check3 3
Failed");
- }
-
- void statisticsTest()
- {
-
- }
-
- #endregion
- };
-}
diff --git a/clicache/integration-test/UnitTests.csproj.in
b/clicache/integration-test/UnitTests.csproj.in
index a3315003..4e9c743e 100644
--- a/clicache/integration-test/UnitTests.csproj.in
+++ b/clicache/integration-test/UnitTests.csproj.in
@@ -187,7 +187,6 @@
<Compile
Include="$(CMAKE_CURRENT_SOURCE_DIR)\ThinClientRegionInterestFailoverRegexInterestTests.cs"
/>
<Compile
Include="$(CMAKE_CURRENT_SOURCE_DIR)\ThinClientRegionInterestNotifyTests.cs" />
<Compile
Include="$(CMAKE_CURRENT_SOURCE_DIR)\ThinClientSecurityAuthTestsN.cs" />
- <Compile
Include="$(CMAKE_CURRENT_SOURCE_DIR)\ThinClientStatisticTestsN.cs" />
<Compile
Include="$(CMAKE_CURRENT_SOURCE_DIR)\ThinClientSecurityAuthTestsMUN.cs" />
<Compile
Include="$(CMAKE_CURRENT_SOURCE_DIR)\ThinClientSecurityAuthzTestBaseN.cs" />
<Compile
Include="$(CMAKE_CURRENT_SOURCE_DIR)\ThinClientSecurityAuthzTestsMUN.cs" />
diff --git a/clicache/src/StatisticDescriptor.cpp
b/clicache/src/StatisticDescriptor.cpp
deleted file mode 100644
index 0f36ddc2..00000000
--- a/clicache/src/StatisticDescriptor.cpp
+++ /dev/null
@@ -1,63 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#include "StatisticDescriptor.hpp"
-
-
-namespace Apache
-{
- namespace Geode
- {
- namespace Client
- {
- using namespace msclr::interop;
-
- System::Int32 StatisticDescriptor::ID::get( )
- {
- return m_nativeptr->getId();
- }
-
- String^ StatisticDescriptor::Name::get( )
- {
- return marshal_as<String^>( m_nativeptr->getName() );
- }
-
- String^ StatisticDescriptor::Description::get( )
- {
- return marshal_as<String^>( m_nativeptr->getDescription() );
- }
-
- int8_t StatisticDescriptor::IsCounter::get( )
- {
- return m_nativeptr->isCounter();
- }
-
- int8_t StatisticDescriptor::IsLargerBetter::get( )
- {
- return m_nativeptr->isLargerBetter();
- }
-
- String^ StatisticDescriptor::Unit::get()
- {
- return marshal_as<String^>(m_nativeptr->getUnit());
- }
- } // namespace Client
- } // namespace Geode
-} // namespace Apache
-
diff --git a/clicache/src/StatisticDescriptor.hpp
b/clicache/src/StatisticDescriptor.hpp
deleted file mode 100644
index 38fd535a..00000000
--- a/clicache/src/StatisticDescriptor.hpp
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#pragma once
-
-
-#include "geode_defs.hpp"
-#include "begin_native.hpp"
-#include <geode/statistics/StatisticDescriptor.hpp>
-#include "end_native.hpp"
-
-using namespace System;
-
-namespace Apache
-{
- namespace Geode
- {
- namespace Client
- {
-
- /// <summary>
- /// A class that describes an individual statistic whose value is
updated by an
- /// application and may be archived by Geode. These descriptions are
gathered
- /// together in a <see cref="StatisticsType" /> class.
- /// </summary>
- /// <para>
- /// To get an instance of this interface use an instance of
- /// <see cref="StatisticsFactory" /> class.
- /// </para>
- /// <para>
- /// StatisticDescriptors are naturally ordered by their name.
- /// </para>
- public ref class StatisticDescriptor sealed
- {
- public:
- /// <summary>
- /// Returns the id of this statistic in a <see cref="StatisticsType"
/> class.
- /// The id is initialized when its statistics
- /// type is created.
- /// </summary>
- virtual property System::Int32 ID
- {
- virtual System::Int32 get();
- }
-
- /// <summary>
- /// Returns the name of this statistic
- /// </summary>
- virtual property String^ Name
- {
- virtual String^ get();
- }
-
- /// <summary>
- /// Returns the description of this statistic
- /// </summary>
- virtual property String^ Description
- {
- virtual String^ get();
- }
-
- /// <summary>
- /// Returns true if this statistic is a counter; false if its a gauge.
- /// Counter statistics have values that always increase.
- /// Gauge statistics have unconstrained values.
- /// </summary>
- virtual property int8_t IsCounter
- {
- virtual int8_t get();
- }
-
- /// <summary>
- /// Returns true if a larger statistic value indicates better
performance.
- /// </summary>
- virtual property int8_t IsLargerBetter
- {
- virtual int8_t get();
- }
-
- /// <summary>
- /// Returns the unit in which this statistic is measured.
- /// </summary>
- virtual property String^ Unit
- {
- virtual String^ get();
- }
-
- internal:
- /// <summary>
- /// Internal factory function to wrap a native object pointer inside
- /// this managed class, with null pointer check.
- /// </summary>
- /// <param name="nativeptr">native object pointer</param>
- /// <returns>
- /// the managed wrapper object, or null if the native pointer is null.
- /// </returns>
- inline static StatisticDescriptor^ Create(
- apache::geode::statistics::StatisticDescriptor* nativeptr)
- {
- return __nullptr == nativeptr ? nullptr :
- gcnew StatisticDescriptor( nativeptr );
- }
-
- apache::geode::statistics::StatisticDescriptor* GetNative()
- {
- return m_nativeptr;
- }
-
- private:
- /// <summary>
- /// Private constructor to wrap a native object pointer
- /// </summary>
- /// <param name="nativeptr">The native object pointer</param>
- inline
StatisticDescriptor(apache::geode::statistics::StatisticDescriptor* nativeptr)
- : m_nativeptr( nativeptr )
- {
- }
-
- apache::geode::statistics::StatisticDescriptor* m_nativeptr;
- };
- } // namespace Client
- } // namespace Geode
-} // namespace Apache
-
-
diff --git a/clicache/src/Statistics.cpp b/clicache/src/Statistics.cpp
deleted file mode 100644
index 52ce882f..00000000
--- a/clicache/src/Statistics.cpp
+++ /dev/null
@@ -1,288 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-
-
-#include "Statistics.hpp"
-#include "StatisticDescriptor.hpp"
-#include "StatisticsType.hpp"
-
-#include "ExceptionTypes.hpp"
-#include "impl/SafeConvert.hpp"
-
-
-namespace Apache
-{
- namespace Geode
- {
- namespace Client
- {
- using namespace msclr::interop;
-
- void Statistics::Close()
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- m_nativeptr->close();
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- System::Int32 Statistics::NameToId(String^ name)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- return m_nativeptr->nameToId(marshal_as<std::string>(name));
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- StatisticDescriptor^ Statistics::NameToDescriptor(String^ name)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- return
StatisticDescriptor::Create(m_nativeptr->nameToDescriptor(marshal_as<std::string>(name)));
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- System::Int64 Statistics::UniqueId::get( )
- {
- return m_nativeptr->getUniqueId();
- }
-
- StatisticsType^ Statistics::Type::get( )
- {
- return StatisticsType::Create(m_nativeptr->getType());
- }
-
- String^ Statistics::TextId::get()
- {
- return marshal_as<String^>(m_nativeptr->getTextId());
- }
-
- System::Int64 Statistics::NumericId::get()
- {
- return m_nativeptr->getNumericId();
- }
- bool Statistics::IsAtomic::get()
- {
- return m_nativeptr->isAtomic();
- }
- bool Statistics::IsShared::get()
- {
- return m_nativeptr->isShared();
- }
- bool Statistics::IsClosed::get()
- {
- return m_nativeptr->isClosed();
- }
-
- void Statistics::SetInt(System::Int32 id, System::Int32 value)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- m_nativeptr->setInt(id, value);
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- void Statistics::SetInt(String^ name, System::Int32 value)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- m_nativeptr->setInt(marshal_as<std::string>(name), value);
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- void Statistics::SetInt(StatisticDescriptor^ descriptor, System::Int32
value)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- m_nativeptr->setInt(descriptor->GetNative(), value);
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- void Statistics::SetLong(System::Int32 id, System::Int64 value)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- m_nativeptr->setLong(id, value);
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- void Statistics::SetLong(StatisticDescriptor^ descriptor, System::Int64
value)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- m_nativeptr->setLong(descriptor->GetNative(), value);
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- void Statistics::SetLong(String^ name, System::Int64 value)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- m_nativeptr->setLong(marshal_as<std::string>(name), value);
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- void Statistics::SetDouble(System::Int32 id, double value)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- m_nativeptr->setDouble(id, value);
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- void Statistics::SetDouble(String^ name, double value)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- m_nativeptr->setDouble(marshal_as<std::string>(name), value);
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- void Statistics::SetDouble(StatisticDescriptor^ descriptor, double value)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- m_nativeptr->setDouble(descriptor->GetNative(), value);
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- System::Int32 Statistics::GetInt(System::Int32 id)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- return m_nativeptr->getInt(id);
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- System::Int32 Statistics::GetInt(StatisticDescriptor^ descriptor)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- return m_nativeptr->getInt(descriptor->GetNative());
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- System::Int32 Statistics::GetInt(String^ name)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- return m_nativeptr->getInt(marshal_as<std::string>(name));
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- System::Int64 Statistics::GetLong(System::Int32 id)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- return m_nativeptr->getLong(id);
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
- System::Int64 Statistics::GetLong(StatisticDescriptor^ descriptor)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- return m_nativeptr->getLong(descriptor->GetNative());
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- System::Int64 Statistics::GetLong(String^ name)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- return m_nativeptr->getLong(marshal_as<std::string>(name));
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- double Statistics::GetDouble(System::Int32 id)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- return m_nativeptr->getDouble(id);
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- double Statistics::GetDouble(StatisticDescriptor^ descriptor)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- return m_nativeptr->getDouble(descriptor->GetNative());
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- double Statistics::GetDouble(String^ name)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- return m_nativeptr->getDouble(marshal_as<std::string>(name));
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- System::Int64 Statistics::GetRawBits(StatisticDescriptor^ descriptor)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- return m_nativeptr->getRawBits(descriptor->GetNative());
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- System::Int32 Statistics::IncInt(System::Int32 id, System::Int32 delta)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- return m_nativeptr->incInt(id,delta);
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- System::Int32 Statistics::IncInt(StatisticDescriptor^ descriptor,
System::Int32 delta)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- return m_nativeptr->incInt(descriptor->GetNative(),delta);
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- System::Int32 Statistics::IncInt(String^ name, System::Int32 delta)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- return m_nativeptr->incInt(marshal_as<std::string>(name),delta);
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- System::Int64 Statistics::IncLong(System::Int32 id, System::Int64 delta)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- return m_nativeptr->incLong(id,delta);
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- System::Int64 Statistics::IncLong(StatisticDescriptor^ descriptor,
System::Int64 delta)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- return m_nativeptr->incLong(descriptor->GetNative(),delta);
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- System::Int64 Statistics::IncLong(String^ name, System::Int64 delta)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- return m_nativeptr->incLong(marshal_as<std::string>(name),delta);
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- double Statistics::IncDouble(System::Int32 id, double delta)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- return m_nativeptr->incDouble(id,delta);
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- double Statistics::IncDouble(StatisticDescriptor^ descriptor, double
delta)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- return m_nativeptr->incDouble(descriptor->GetNative(),delta);
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- double Statistics::IncDouble(String^ name, double delta)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- return m_nativeptr->incDouble(marshal_as<std::string>(name),delta);
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- } // namespace Client
- } // namespace Geode
-} // namespace Apache
- } //namespace
-
diff --git a/clicache/src/Statistics.hpp b/clicache/src/Statistics.hpp
deleted file mode 100644
index 0bdacdee..00000000
--- a/clicache/src/Statistics.hpp
+++ /dev/null
@@ -1,542 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#pragma once
-
-
-#include "geode_defs.hpp"
-#include "begin_native.hpp"
-#include <geode/statistics/Statistics.hpp>
-#include <geode/statistics/StatisticDescriptor.hpp>
-#include <geode/statistics/StatisticsType.hpp>
-#include "end_native.hpp"
-
-using namespace System;
-
-namespace Apache
-{
- namespace Geode
- {
- namespace Client
- {
-
- ref class StatisticDescriptor;
- ref class StatisticsType;
-
- /// <summary>
- /// An instantiation of an existing <c>StatisticsType</c> object with
methods for
- /// setting, incrementing and getting individual
<c>StatisticDescriptor</c> values.
- /// </summary>
- public ref class Statistics sealed
- {
- public:
-
- /// <summary>
- /// Closes these statistics. After statistics have been closed, they
- /// are no longer archived.
- /// A value access on a closed statistics always results in zero.
- /// A value modification on a closed statistics is ignored.
- /// </summary>
- virtual void Close();
-
- /// <summary>
- /// Returns the id of the statistic with the given name in this
- /// statistics instance.
- /// </summary>
- /// <param name="name">the statistic name</param>
- /// <returns>the id of the statistic with the given name</returns>
- /// <exception cref="IllegalArgumentException">
- /// if no statistic named <c>name</c> exists in this
- /// statistics instance.
- /// </exception>
- /// <see cref="StatisticsType#nameToDescriptor" />
- virtual System::Int32 NameToId(String^ name);
-
- /// <summary>
- /// Returns the descriptor of the statistic with the given name in
this
- /// statistics instance.
- /// </summary>
- /// <param name="name">the statistic name</param>
- /// <returns>the descriptor of the statistic with the given
name</returns>
- /// <exception cref="IllegalArgumentException">
- /// if no statistic named <c>name</c> exists in this
- /// statistics instance.
- /// </exception>
- /// <see cref="StatisticsType#nameToId" />
- virtual StatisticDescriptor^ NameToDescriptor(String^ name);
-
- /// <summary>
- /// Gets a value that uniquely identifies this statistics.
- /// </summary>
- virtual property System::Int64 UniqueId
- {
- virtual System::Int64 get( );
- }
-
- /// <summary>
- /// Gets the <see cref="StatisticsType" /> of this instance.
- /// </summary>
- virtual property StatisticsType^ Type
- {
- virtual StatisticsType^ get( );
- }
-
- /// <summary>
- /// Gets the text associated with this instance that helps identify
it.
- /// </summary>
- virtual property String^ TextId
- {
- virtual String^ get( );
- }
-
- /// <summary>
- /// Gets the number associated with this instance that helps identify
it.
- /// </summary>
- virtual property System::Int64 NumericId
- {
- virtual System::Int64 get( );
- }
-
- /// <summary>
- /// Returns true if modifications are atomic. This means that
multiple threads
- /// can safely modify this instance without additional
synchronization.
- /// </summary>
- /// <para>
- /// Returns false if modifications are not atomic. This means that
modifications
- /// to this instance are cheaper but not thread safe.
- /// </para>
- /// <para>
- /// Note that all instances that are <see cref="#isShared" /> shared
are also atomic.
- /// </para>
- virtual property bool IsAtomic
- {
- virtual bool get( );
- }
-
- /// <summary>
- /// Returns true if the data for this instance is stored in shared
memory.
- /// Returns false if the data is store in local memory.
- /// </summary>
- /// <para>
- /// Note that all instances that are <see cref="#isShared" /> shared
are also atomic.
- /// </para>
- virtual property bool IsShared
- {
- virtual bool get( );
- }
-
- /// <summary>
- /// Returns true if the instance has been <see cref="#close" />
closed.
- /// </summary>
- virtual property bool IsClosed
- {
- virtual bool get( );
- }
-
- /// <summary>
- /// Sets the value of a statistic with the given <c>id</c>
- /// whose type is <c>int</c>.
- /// </summary>
- /// <param name="id">a statistic id obtained with <see
cref="#nameToId" />
- /// or <see cref="#StatisticsType#nameToId" /> </param>
- /// <param name="value">value to set</param>
- /// <exception cref="IllegalArgumentException">
- /// If the id is invalid.
- /// </exception>
- virtual void SetInt(System::Int32 id, System::Int32 value);
-
- /// <summary>
- /// Sets the value of a named statistic of type <c>int</c>
- /// </summary>
- /// <param name="name">statistic name</param>
- /// <param name="value">value to set</param>
- /// <exception cref="IllegalArgumentException">
- /// If no statistic exists named <c>name</c> or
- /// if the statistic with name <c>name</c> is not of
- /// type <c>int</c>.
- /// </exception>
- virtual void SetInt(String^ name, System::Int32 value);
-
- /// <summary>
- /// Sets the value of a described statistic of type <c>int</c>
- /// </summary>
- /// <param name="descriptor">a statistic descriptor obtained with
<see cref="#nameToDescriptor" />
- /// or <see cref="#StatisticsType#nameToDescriptor" /> </param>
- /// <param name="value">value to set</param>
- /// <exception cref="IllegalArgumentException">
- /// If no statistic exists for the given <c>descriptor</c> or
- /// if the described statistic is not of
- /// type <c>int</c>.
- /// </exception>
- virtual void SetInt(StatisticDescriptor^ descriptor, System::Int32
value);
-
- /// <summary>
- /// Sets the value of a statistic with the given <c>id</c>
- /// whose type is <c>long</c>.
- /// </summary>
- /// <param name="id">a statistic id obtained with <see
cref="#nameToId" />
- /// or <see cref="#StatisticsType#nameToId" />. </param>
- /// <param name="value">value to set</param>
- /// <exception cref="IllegalArgumentException">
- /// If the id is invalid.
- /// </exception>
- virtual void SetLong(System::Int32 id, System::Int64 value);
-
- /// <summary>
- /// Sets the value of a described statistic of type <c>long</c>
- /// </summary>
- /// <param name="descriptor">a statistic descriptor obtained with
<see cref="#nameToDescriptor" />
- /// or <see cref="StatisticsType#nameToDescriptor" /> </param>
- /// <param name="value">value to set</param>
- /// <exception cref="IllegalArgumentException">
- /// If no statistic exists for the given <c>descriptor</c> or
- /// if the described statistic is not of
- /// type <c>long</c>.
- /// </exception>
- virtual void SetLong(StatisticDescriptor^ descriptor, System::Int64
value);
-
- /// <summary>
- /// Sets the value of a named statistic of type <c>long</c>.
- /// </summary>
- /// <param name="name">statistic name</param>
- /// <param name="value">value to set</param>
- /// <exception cref="IllegalArgumentException">
- /// If no statistic exists named <c>name</c> or
- /// if the statistic with name <c>name</c> is not of
- /// type <c>long</c>.
- /// </exception>
- virtual void SetLong(String^ name, System::Int64 value);
-
-
- /// <summary>
- /// Sets the value of a statistic with the given <c>id</c>
- /// whose type is <c>double</c>.
- /// </summary>
- /// <param name="id">a statistic id obtained with <see
cref="#nameToId" />
- /// or <see cref="#StatisticsType#nameToId" /> </param>
- /// <param name="value">value to set</param>
- /// <exception cref="IllegalArgumentException">
- /// If the id is invalid.
- /// </exception>
- virtual void SetDouble(System::Int32 id, double value);
-
- /// <summary>
- /// Sets the value of a named statistic of type <c>double</c>
- /// </summary>
- /// <param name="name">statistic name</param>
- /// <param name="value">value to set</param>
- /// <exception cref="IllegalArgumentException">
- /// If no statistic exists named <c>name</c> or
- /// if the statistic with name <c>name</c> is not of
- /// type <c>double</c>.
- /// </exception>
- virtual void SetDouble(String^ name, double value);
-
- /// <summary>
- /// Sets the value of a described statistic of type <c>double</c>
- /// </summary>
- /// <param name="descriptor">a statistic descriptor obtained with
<see cref="#nameToDescriptor" />
- /// or <see cref="StatisticsType#nameToDescriptor" /> </param>
- /// <param name="value">value to set</param>
- /// <exception cref="IllegalArgumentException">
- /// If no statistic exists for the given <c>descriptor</c> or
- /// if the described statistic is not of
- /// type <c>double</c>.
- /// </exception>
- virtual void SetDouble(StatisticDescriptor^ descriptor, double value);
-
- /// <summary>
- /// Returns the value of the identified statistic of type <c>int</c>.
- /// whose type is <c>double</c>.
- /// </summary>
- /// <param name="id">a statistic id obtained with <see
cref="#nameToId" />
- /// or <see cref="#StatisticsType#nameToId" /> </param>
- /// <exception cref="IllegalArgumentException">
- /// If the id is invalid.
- /// </exception>
- virtual System::Int32 GetInt(System::Int32 id);
-
- /// <summary>
- /// Returns the value of the described statistic of type
<code>int</code>.
- /// </summary>
- /// <param name="descriptor">a statistic descriptor obtained with
<see cref="#nameToDescriptor" />
- /// or <see cref="StatisticsType#nameToDescriptor" /> </param>
- /// <exception cref="IllegalArgumentException">
- /// If no statistic exists with the specified <c>descriptor</c> or
- /// if the described statistic is not of
- /// type <c>int</c>.
- /// </exception>
- virtual System::Int32 GetInt(StatisticDescriptor^ descriptor);
-
-
- /// <summary>
- /// Returns the value of the statistic of type <code>int</code> at
- /// the given name.
- /// </summary>
- /// <param name="name">statistic name</param>
- /// <exception cref="IllegalArgumentException">
- /// If no statistic exists named <c>name</c> or
- /// if the statistic with name <c>name</c> is not of
- /// type <c>int</c>.
- /// </exception>
- virtual System::Int32 GetInt(String^ name);
-
- /// <summary>
- /// Returns the value of the identified statistic of type <c>long</c>.
- /// </summary>
- /// <param name="id">a statistic id obtained with <see
cref="#nameToId" />
- /// or <see cref="#StatisticsType#nameToId" /> </param>
- /// <exception cref="IllegalArgumentException">
- /// If the id is invalid.
- /// </exception>
- virtual System::Int64 GetLong(System::Int32 id);
-
-
- /// <summary>
- /// Returns the value of the described statistic of type <c>long</c>.
- /// </summary>
- /// <param name="descriptor">a statistic descriptor obtained with
<see cref="#nameToDescriptor" />
- /// or <see cref="StatisticsType#nameToDescriptor" /> </param>
- /// <exception cref="IllegalArgumentException">
- /// If no statistic exists with the specified <c>descriptor</c> or
- /// if the described statistic is not of
- /// type <c>long</c>.
- /// </exception>
- virtual System::Int64 GetLong(StatisticDescriptor^ descriptor);
-
-
- /// <summary>
- /// Returns the value of the statistic of type <c>long</c> at
- /// the given name.
- /// </summary>
- /// <param name="name">statistic name</param>
- /// <exception cref="IllegalArgumentException">
- /// If no statistic exists named <c>name</c> or
- /// if the statistic with name <c>name</c> is not of
- /// type <c>long</c>.
- /// </exception>
- virtual System::Int64 GetLong(String^ name);
-
-
- /// <summary>
- /// Returns the value of the identified statistic of type
<c>double</c>.
- /// </summary>
- /// <param name="id">a statistic id obtained with <see
cref="#nameToId" />
- /// or <see cref="#StatisticsType#nameToId" /> </param>
- /// <exception cref="IllegalArgumentException">
- /// If the id is invalid.
- /// </exception>
- virtual double GetDouble(System::Int32 id);
-
- /// <summary>
- /// Returns the value of the described statistic of type
<c>double</c>.
- /// </summary>
- /// <param name="descriptor">a statistic descriptor obtained with
<see cref="#nameToDescriptor" />
- /// or <see cref="StatisticsType#nameToDescriptor" /> </param>
- /// <exception cref="IllegalArgumentException">
- /// If no statistic exists with the specified <c>descriptor</c> or
- /// if the described statistic is not of
- /// type <c>double</c>.
- /// </exception>
- virtual double GetDouble(StatisticDescriptor^ descriptor);
-
- /// <summary>
- /// Returns the value of the statistic of type <c>double</c> at
- /// the given name.
- /// </summary>
- /// <param name="name">statistic name</param>
- /// <exception cref="IllegalArgumentException">
- /// If no statistic exists named <c>name</c> or
- /// if the statistic with name <c>name</c> is not of
- /// type <c>double</c>.
- /// </exception>
- virtual double GetDouble(String^ name);
-
- /// <summary>
- /// Returns the bits that represent the raw value of the described
statistic.
- /// </summary>
- /// <param name="descriptor">a statistic descriptor obtained with
<see cref="#nameToDescriptor" />
- /// or <see cref="StatisticsType#nameToDescriptor" /> </param>
- /// <exception cref="IllegalArgumentException">
- /// If the described statistic does not exist
- /// </exception>
- virtual System::Int64 GetRawBits(StatisticDescriptor^ descriptor);
-
- /// <summary>
- /// Increments the value of the identified statistic of type
<c>int</c>
- /// by the given amount.
- /// </summary>
- /// <param name="id">a statistic id obtained with <see
cref="#nameToId" />
- /// or <see cref="#StatisticsType#nameToId" /> </param>
- /// <param name="delta">the value of the statistic after it has been
incremented</param>
- /// <returns>the value of the statistic after it has been
incremented</returns>
- /// <exception cref="IllegalArgumentException">
- /// If the id is invalid.
- /// </exception>
- virtual System::Int32 IncInt(System::Int32 id, System::Int32 delta);
-
- /// <summary>
- /// Increments the value of the described statistic of type <c>int</c>
- /// by the given amount.
- /// </summary>
- /// <param name="descriptor">a statistic descriptor obtained with
<see cref="#nameToDescriptor" />
- /// or <see cref="StatisticsType#nameToDescriptor" /> </param>
- /// <param name="delta">change value to be added</param>
- /// <returns>the value of the statistic after it has been
incremented</returns>
- /// <exception cref="IllegalArgumentException">
- /// If no statistic exists for the given <c>descriptor</c> or
- /// if the described statistic is not of
- /// type <c>int</c>.
- /// </exception>
- virtual System::Int32 IncInt(StatisticDescriptor^ descriptor,
System::Int32 delta);
-
- /// <summary>
- /// Increments the value of the statistic of type <c>int</c> with
- /// the given name by a given amount.
- /// </summary>
- /// <param name="name">statistic name</param>
- /// <param name="delta">change value to be added</param>
- /// <returns>the value of the statistic after it has been
incremented</returns>
- /// <exception cref="IllegalArgumentException">
- /// If no statistic exists named <c>name</c> or
- /// if the statistic with name <c>name</c> is not of
- /// type <c>int</c>.
- /// </exception>
- virtual System::Int32 IncInt(String^ name, System::Int32 delta);
-
- /// <summary>
- /// Increments the value of the identified statistic of type
<c>long</c>
- /// by the given amount.
- /// </summary>
- /// <param name="id">a statistic id obtained with <see
cref="#nameToId" />
- /// or <see cref="#StatisticsType#nameToId" /> </param>
- /// <param name="delta">the value of the statistic after it has been
incremented</param>
- /// <returns>the value of the statistic after it has been
incremented</returns>
- /// <exception cref="IllegalArgumentException">
- /// If the id is invalid.
- /// </exception>
- virtual System::Int64 IncLong(System::Int32 id, System::Int64 delta);
-
-
- /// <summary>
- /// Increments the value of the described statistic of type
<c>long</c>
- /// by the given amount.
- /// </summary>
- /// <param name="descriptor">a statistic descriptor obtained with
<see cref="#nameToDescriptor" />
- /// or <see cref="StatisticsType#nameToDescriptor" /> </param>
- /// <param name="delta">change value to be added</param>
- /// <returns>the value of the statistic after it has been
incremented</returns>
- /// <exception cref="IllegalArgumentException">
- /// If no statistic exists for the given <c>descriptor</c> or
- /// if the described statistic is not of
- /// type <c>long</c>.
- /// </exception>
- virtual System::Int64 IncLong(StatisticDescriptor^ descriptor,
System::Int64 delta);
-
- /// <summary>
- /// Increments the value of the statistic of type <c>long</c> with
- /// the given name by a given amount.
- /// </summary>
- /// <param name="name">statistic name</param>
- /// <param name="delta">change value to be added</param>
- /// <returns>the value of the statistic after it has been
incremented</returns>
- /// <exception cref="IllegalArgumentException">
- /// If no statistic exists named <c>name</c> or
- /// if the statistic with name <c>name</c> is not of
- /// type <c>long</c>.
- /// </exception>
- virtual System::Int64 IncLong(String^ name, System::Int64 delta);
-
-
- /// <summary>
- /// Increments the value of the identified statistic of type
<c>double</c>
- /// by the given amount.
- /// </summary>
- /// <param name="id">a statistic id obtained with <see
cref="#nameToId" />
- /// or <see cref="#StatisticsType#nameToId" /> </param>
- /// <param name="delta">the value of the statistic after it has been
incremented</param>
- /// <returns>the value of the statistic after it has been
incremented</returns>
- /// <exception cref="IllegalArgumentException">
- /// If the id is invalid.
- /// </exception>
- virtual double IncDouble(System::Int32 id, double delta);
-
- /// <summary>
- /// Increments the value of the described statistic of type
<c>double</c>
- /// by the given amount.
- /// </summary>
- /// <param name="descriptor">a statistic descriptor obtained with
<see cref="#nameToDescriptor" />
- /// or <see cref="StatisticsType#nameToDescriptor" /> </param>
- /// <param name="delta">change value to be added</param>
- /// <returns>the value of the statistic after it has been
incremented</returns>
- /// <exception cref="IllegalArgumentException">
- /// If no statistic exists for the given <c>descriptor</c> or
- /// if the described statistic is not of
- /// type <c>double</c>.
- /// </exception>
- virtual double IncDouble(StatisticDescriptor^ descriptor, double
delta);
-
- /// <summary>
- /// Increments the value of the statistic of type <c>double</c> with
- /// the given name by a given amount.
- /// </summary>
- /// <param name="name">statistic name</param>
- /// <param name="delta">change value to be added</param>
- /// <returns>the value of the statistic after it has been
incremented</returns>
- /// <exception cref="IllegalArgumentException">
- /// If no statistic exists named <c>name</c> or
- /// if the statistic with name <c>name</c> is not of
- /// type <c>double</c>.
- /// </exception>
- virtual double IncDouble(String^ name, double delta);
-
- internal:
- /// <summary>
- /// Internal factory function to wrap a native object pointer inside
- /// this managed class, with null pointer check.
- /// </summary>
- /// <param name="nativeptr">native object pointer</param>
- /// <returns>
- /// the managed wrapper object, or null if the native pointer is
null.
- /// </returns>
- inline static Statistics^ Create(
- apache::geode::statistics::Statistics* nativeptr )
- {
- return __nullptr == nativeptr ? nullptr :
- gcnew Statistics( nativeptr );
- }
-
- private:
- /// <summary>
- /// Private constructor to wrap a native object pointer
- /// </summary>
- /// <param name="nativeptr">The native object pointer</param>
- inline Statistics( apache::geode::statistics::Statistics* nativeptr )
- : m_nativeptr( nativeptr )
- {
- }
- private:
- apache::geode::statistics::Statistics* m_nativeptr;
-
- };
- } // namespace Client
- } // namespace Geode
-} // namespace Apache
-
-
diff --git a/clicache/src/StatisticsFactory.cpp
b/clicache/src/StatisticsFactory.cpp
deleted file mode 100644
index ec6a86ce..00000000
--- a/clicache/src/StatisticsFactory.cpp
+++ /dev/null
@@ -1,250 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "begin_native.hpp"
-#include "statistics/StatisticsManager.hpp"
-#include "end_native.hpp"
-
-#include "StatisticsFactory.hpp"
-#include "StatisticsType.hpp"
-#include "StatisticDescriptor.hpp"
-#include "Statistics.hpp"
-#include "ExceptionTypes.hpp"
-#include "impl/SafeConvert.hpp"
-
-
-namespace Apache
-{
- namespace Geode
- {
- namespace Client
- {
- using namespace msclr::interop;
-
- StatisticDescriptor^ StatisticsFactory::CreateIntCounter( String^ name,
String^ description,String^ units )
- {
- return CreateIntCounter(name,description,units,true);
- }
-
- StatisticDescriptor^ StatisticsFactory::CreateIntCounter(String^ name,
String^ description,String^ units, bool largerBetter)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
-
- return StatisticDescriptor::Create(m_nativeptr->createIntCounter(
- marshal_as<std::string>(name),
- marshal_as<std::string>(description),
- marshal_as<std::string>(units),
- largerBetter));
-
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- StatisticDescriptor^ StatisticsFactory::CreateLongCounter( String^ name,
String^ description,String^ units )
- {
- return CreateLongCounter(name,description,units,true);
- }
-
- StatisticDescriptor^ StatisticsFactory::CreateLongCounter( String^ name,
String^ description,String^ units, bool largerBetter )
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
-
- return StatisticDescriptor::Create(m_nativeptr->createLongCounter(
- marshal_as<std::string>(name),
- marshal_as<std::string>(description),
- marshal_as<std::string>(units),
- largerBetter));
-
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- StatisticDescriptor^ StatisticsFactory::CreateDoubleCounter( String^
name, String^ description, String^ units )
- {
- return CreateDoubleCounter(name,description,units,true);
- }
-
- StatisticDescriptor^ StatisticsFactory::CreateDoubleCounter( String^
name, String^ description, String^ units, bool largerBetter )
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
-
- return StatisticDescriptor::Create(m_nativeptr->createDoubleCounter(
- marshal_as<std::string>(name),
- marshal_as<std::string>(description),
- marshal_as<std::string>(units),
- largerBetter));
-
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
-
- StatisticDescriptor^ StatisticsFactory::CreateIntGauge( String^ name,
String^ description, String^ units )
- {
- return CreateIntGauge(name,description,units,false);
- }
-
- StatisticDescriptor^ StatisticsFactory::CreateIntGauge( String^ name,
String^ description, String^ units, bool largerBetter )
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
-
- return StatisticDescriptor::Create(m_nativeptr->createIntGauge(
- marshal_as<std::string>(name),
- marshal_as<std::string>(description),
- marshal_as<std::string>(units),
- largerBetter));
-
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- StatisticDescriptor^ StatisticsFactory::CreateLongGauge( String^ name,
String^ description, String^ units )
- {
- return CreateLongGauge(name,description,units,false);
- }
-
- StatisticDescriptor^ StatisticsFactory::CreateLongGauge( String^ name,
String^ description, String^ units, bool largerBetter )
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
-
- return StatisticDescriptor::Create(m_nativeptr->createLongGauge(
- marshal_as<std::string>(name),
- marshal_as<std::string>(description),
- marshal_as<std::string>(units),
- largerBetter));
-
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- StatisticDescriptor^ StatisticsFactory::CreateDoubleGauge( String^ name,
String^ description, String^ units )
- {
- return CreateDoubleGauge(name,description,units,false);
- }
-
- StatisticDescriptor^ StatisticsFactory::CreateDoubleGauge( String^ name,
String^ description, String^ units, bool largerBetter )
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
-
- return StatisticDescriptor::Create(m_nativeptr->createDoubleGauge(
- marshal_as<std::string>(name),
- marshal_as<std::string>(description),
- marshal_as<std::string>(units),
- largerBetter));
-
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- StatisticsType^ StatisticsFactory::CreateType( String^ name, String^
description,
- array<StatisticDescriptor^>^ stats,
System::Int32 statsLength)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
-
- apache::geode::statistics::StatisticDescriptor ** nativedescriptors
= new apache::geode::statistics::StatisticDescriptor*[statsLength];
- for (System::Int32 index = 0; index < statsLength; index++)
- {
- nativedescriptors[index] = stats[index]->GetNative();
- }
- return StatisticsType::Create(m_nativeptr->createType(
- marshal_as<std::string>(name),
- marshal_as<std::string>(description),
- nativedescriptors,
- statsLength));
-
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- StatisticsType^ StatisticsFactory::FindType(String^ name)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
-
- return
StatisticsType::Create(m_nativeptr->findType(marshal_as<std::string>(name)));
-
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- Statistics^ StatisticsFactory::CreateStatistics(StatisticsType^ type)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
-
- return
Statistics::Create(m_nativeptr->createStatistics(type->GetNative()));
-
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- Statistics^ StatisticsFactory::CreateStatistics(StatisticsType^ type,
String^ textId)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
-
- return
Statistics::Create(m_nativeptr->createStatistics(type->GetNative(),
marshal_as<std::string>(textId)));
-
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- Statistics^ StatisticsFactory::CreateStatistics(StatisticsType^ type,
String^ textId, System::Int64 numericId)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
-
- return
Statistics::Create(m_nativeptr->createStatistics(type->GetNative(),
marshal_as<std::string>(textId), numericId));
-
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- Statistics^ StatisticsFactory::CreateAtomicStatistics(StatisticsType^
type)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
-
- return
Statistics::Create(m_nativeptr->createAtomicStatistics(type->GetNative()));
-
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- Statistics^ StatisticsFactory::CreateAtomicStatistics(StatisticsType^
type, String^ textId)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
-
- return
Statistics::Create(m_nativeptr->createAtomicStatistics(type->GetNative(),
marshal_as<std::string>(textId)));
-
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- Statistics^ StatisticsFactory::CreateAtomicStatistics(StatisticsType^
type, String^ textId, System::Int64 numericId)
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
-
- return
Statistics::Create(m_nativeptr->createAtomicStatistics(type->GetNative(),
marshal_as<std::string>(textId), numericId));
-
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
- Statistics^ StatisticsFactory::FindFirstStatisticsByType(
StatisticsType^ type )
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
-
- return
Statistics::Create(m_nativeptr->findFirstStatisticsByType(type->GetNative()));
-
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- String^ StatisticsFactory::Name::get( )
- {
- return marshal_as<String^>( m_nativeptr->getName() );
- }
-
- System::Int64 StatisticsFactory::ID::get()
- {
- return m_nativeptr->getId();
- }
- } // namespace Client
- } // namespace Geode
-} // namespace Apache
-
diff --git a/clicache/src/StatisticsFactory.hpp
b/clicache/src/StatisticsFactory.hpp
deleted file mode 100644
index 0f9e2276..00000000
--- a/clicache/src/StatisticsFactory.hpp
+++ /dev/null
@@ -1,274 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#pragma once
-
-
-#include "geode_defs.hpp"
-#include "begin_native.hpp"
-#include <geode/statistics/StatisticsFactory.hpp>
-#include <geode/statistics/StatisticsType.hpp>
-#include <geode/statistics/StatisticDescriptor.hpp>
-#include <geode/statistics/Statistics.hpp>
-#include "end_native.hpp"
-
-using namespace System;
-
-namespace Apache
-{
- namespace Geode
- {
- namespace Client
- {
-
- ref class StatisticDescriptor;
- ref class StatisticsType;
- ref class Statistics;
-
- /// <summary>
- /// Instances of this interface provide methods that create instances
- /// of <see cref="StatisticDescriptor" /> and <see cref="StatisticsType"
/>.
- /// Every <see cref="StatisticsFactory" /> is also a type factory.
- /// </summary>
- /// <para>
- /// A <c>StatisticsFactory</c> can create a <see
cref="StatisticDescriptor" />
- /// statistic of three numeric types:
- /// <c>int</c>, <c>long</c>, and <c>double</c>. A
- /// statistic (<c>StatisticDescriptor</c>) can either be a
- /// <I>gauge</I> meaning that its value can increase and decrease or a
- /// <I>counter</I> meaning that its value is strictly increasing.
- /// Marking a statistic as a counter allows the Geode Manager Console
- /// to properly display a statistics whose value "wraps around" (that
- /// is, exceeds its maximum value).
- /// </para>
- public ref class StatisticsFactory sealed
- {
- protected:
- StatisticsFactory(){}
- StatisticsFactory(StatisticsFactory^){}
- public:
- /// <summary>
- /// Return a pre-existing statistics factory. Typically configured
through
- /// creation of a distributed system.
- /// </summary>
- //static StatisticsFactory^ GetExistingInstance();
-
- /// <summary>
- /// Creates and returns an int counter <see
cref="StatisticDescriptor" />
- /// with the given <c>name</c>, <c>description</c>,
- /// <c>units</c>, and with larger values indicating better performance.
- /// </summary>
- virtual StatisticDescriptor^ CreateIntCounter(String^ name, String^
description, String^ units, bool largerBetter);
-
- /// <summary>
- /// Creates and returns an int counter <see
cref="StatisticDescriptor" />
- /// with the given <c>name</c>, <c>description</c>,
- /// <c>units</c>.
- /// </summary>
- virtual StatisticDescriptor^ CreateIntCounter(String^ name, String^
description, String^ units);
-
- /// <summary>
- /// Creates and returns an long counter <see
cref="StatisticDescriptor" />
- /// with the given <c>name</c>, <c>description</c>,
- /// <c>units</c>, and with larger values indicating better performance.
- /// </summary>
- virtual StatisticDescriptor^ CreateLongCounter(String^ name, String^
description, String^ units, bool largerBetter);
-
- /// <summary>
- /// Creates and returns an long counter <see
cref="StatisticDescriptor" />
- /// with the given <c>name</c>, <c>description</c>,
- /// <c>units</c>.
- /// </summary>
- virtual StatisticDescriptor^ CreateLongCounter(String^ name, String^
description, String^ units);
-
- /// <summary>
- /// Creates and returns an double counter <see
cref="StatisticDescriptor" />
- /// with the given <c>name</c>, <c>description</c>,
- /// <c>units</c>, and with larger values indicating better performance.
- /// </summary>
-
- virtual StatisticDescriptor^ CreateDoubleCounter(String^ name, String^
description, String^ units, bool largerBetter);
-
- /// <summary>
- /// Creates and returns an double counter <see
cref="StatisticDescriptor" />
- /// with the given <c>name</c>, <c>description</c>,
- /// <c>units</c>.
- /// </summary>
- virtual StatisticDescriptor^ CreateDoubleCounter(String^ name, String^
description, String^ units);
-
- /// <summary>
- /// Creates and returns an int gauge <see cref="StatisticDescriptor"
/>
- /// with the given <c>name</c>, <c>description</c>,
- /// <c>units</c>, and with smaller values indicating better
performance.
- /// </summary>
- virtual StatisticDescriptor^ CreateIntGauge(String^ name, String^
description, String^ units, bool largerBetter);
-
- /// <summary>
- /// Creates and returns an int gauge <see cref="StatisticDescriptor"
/>
- /// with the given <c>name</c>, <c>description</c>,
- /// <c>units</c>.
- /// </summary>
- virtual StatisticDescriptor^ CreateIntGauge(String^ name, String^
description, String^ units);
-
- /// <summary>
- /// Creates and returns an long gauge <see cref="StatisticDescriptor"
/>
- /// with the given <c>name</c>, <c>description</c>,
- /// <c>units</c>, and with smaller values indicating better
performance.
- /// </summary>
- virtual StatisticDescriptor^ CreateLongGauge(String^ name, String^
description, String^ units, bool largerBetter);
-
- /// <summary>
- /// Creates and returns an long gauge <see cref="StatisticDescriptor"
/>
- /// with the given <c>name</c>, <c>description</c>,
- /// <c>units</c>.
- /// </summary>
- virtual StatisticDescriptor^ CreateLongGauge(String^ name, String^
description, String^ units);
-
- /// <summary>
- /// Creates and returns an double gauge <see
cref="StatisticDescriptor" />
- /// with the given <c>name</c>, <c>description</c>,
- /// <c>units</c>, and with smaller values indicating better
performance.
- /// </summary>
- virtual StatisticDescriptor^ CreateDoubleGauge(String^ name, String^
description, String^ units, bool largerBetter);
-
- /// <summary>
- /// Creates and returns an double gauge <see
cref="StatisticDescriptor" />
- /// with the given <c>name</c>, <c>description</c>,
- /// <c>units</c>.
- /// </summary>
- virtual StatisticDescriptor^ CreateDoubleGauge(String^ name, String^
description, String^ units);
-
- /// <summary>
- /// Creates and returns a <see cref="StatisticsType" />
- /// with the given <c>name</c>, <c>description</c>,and <see
cref="StatisticDescriptor" />
- /// </summary>
- /// <exception cref="IllegalArgumentException">
- /// if a type with the given <c>name</c> already exists.
- /// </exception>
- virtual StatisticsType^ CreateType(String^ name, String^ description,
- array<StatisticDescriptor^>^ stats,
System::Int32 statsLength);
-
- /// <summary>
- /// Finds and returns an already created <see cref="StatisticsType" />
- /// with the given <c>name</c>. Returns <c>null</c> if the type does
not exist.
- /// </summary>
- virtual StatisticsType^ FindType(String^ name);
-
- /// <summary>
- /// Creates and returns a <see cref="Statistics" /> instance of the
given <see cref="StatisticsType" /> type, <c>textId</c>, and with default ids.
- /// </summary>
- /// <para>
- /// The created instance may not be <see cref="Statistics#isAtomic" />
atomic.
- /// </para>
- virtual Statistics^ CreateStatistics(StatisticsType^ type);
-
- /// <summary>
- /// Creates and returns a <see cref="Statistics" /> instance of the
given <see cref="StatisticsType" /> type, <c>textId</c>, and with a default
numeric id.
- /// </summary>
- /// <para>
- /// The created instance may not be <see cref="Statistics#isAtomic" />
atomic.
- /// </para>
- virtual Statistics^ CreateStatistics(StatisticsType^ type, String^
textId);
-
- /// <summary>
- /// Creates and returns a <see cref="Statistics" /> instance of the
given <see cref="StatisticsType" /> type, <c>textId</c>, and <c>numericId</c>.
- /// </summary>
- /// <para>
- /// The created instance may not be <see cref="Statistics#isAtomic" />
atomic.
- /// </para>
- virtual Statistics^ CreateStatistics(StatisticsType^ type, String^
textId, System::Int64 numericId);
-
- /// <summary>
- /// Creates and returns a <see cref="Statistics" /> instance of the
given <see cref="StatisticsType" /> type, <c>textId</c>, and with default ids.
- /// </summary>
- /// <para>
- /// The created instance will be <see cref="Statistics#isAtomic" />
atomic.
- /// </para>
- virtual Statistics^ CreateAtomicStatistics(StatisticsType^ type);
-
- /// <summary>
- /// Creates and returns a <see cref="Statistics" /> instance of the
given <see cref="StatisticsType" /> type, <c>textId</c>, and with a default
numeric id.
- /// </summary>
- /// <para>
- /// The created instance will be <see cref="Statistics#isAtomic" />
atomic.
- /// </para>
- virtual Statistics^ CreateAtomicStatistics(StatisticsType^ type,
String^ textId);
-
- /// <summary>
- /// Creates and returns a <see cref="Statistics" /> instance of the
given <see cref="StatisticsType" /> type, <c>textId</c>, and <c>numericId</c>.
- /// </summary>
- /// <para>
- /// The created instance will be <see cref="Statistics#isAtomic" />
atomic.
- /// </para>
- virtual Statistics^ CreateAtomicStatistics(StatisticsType^ type,
String^ textId, System::Int64 numericId);
-
- /// <summary>
- /// Return the first instance that matches the type, or NULL
- /// </summary>
- virtual Statistics^ FindFirstStatisticsByType(StatisticsType^ type);
-
- /// <summary>
- /// Returns a name that can be used to identify the manager
- /// </summary>
- virtual property String^ Name
- {
- virtual String^ get();
- }
-
- /// <summary>
- /// Returns a numeric id that can be used to identify the manager
- /// </summary>
- virtual property System::Int64 ID
- {
- virtual System::Int64 get();
- }
-
- internal:
- /// <summary>
- /// Internal factory function to wrap a native object pointer inside
- /// this managed class, with null pointer check.
- /// </summary>
- /// <param name="nativeptr">native object pointer</param>
- /// <returns>
- /// the managed wrapper object, or null if the native pointer is null.
- /// </returns>
- inline static StatisticsFactory^ Create(
- apache::geode::statistics::StatisticsFactory* nativeptr)
- {
- return __nullptr == nativeptr ? nullptr :
- gcnew StatisticsFactory( nativeptr );
- }
-
- private:
- /// <summary>
- /// Private constructor to wrap a native object pointer
- /// </summary>
- /// <param name="nativeptr">The native object pointer</param>
- inline StatisticsFactory(apache::geode::statistics::StatisticsFactory*
nativeptr)
- : m_nativeptr( nativeptr )
- {
- }
-
- apache::geode::statistics::StatisticsFactory* m_nativeptr;
- };
- } // namespace Client
- } // namespace Geode
-} // namespace Apache
-
-
diff --git a/clicache/src/StatisticsType.cpp b/clicache/src/StatisticsType.cpp
deleted file mode 100644
index 325a2171..00000000
--- a/clicache/src/StatisticsType.cpp
+++ /dev/null
@@ -1,81 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-#include "StatisticsType.hpp"
-#include "StatisticDescriptor.hpp"
-
-#include "ExceptionTypes.hpp"
-#include "impl/SafeConvert.hpp"
-
-
-namespace Apache
-{
- namespace Geode
- {
- namespace Client
- {
- using namespace msclr::interop;
-
- String^ StatisticsType::Name::get()
- {
- return marshal_as<String^>( m_nativeptr->getName() );
- }
-
- String^ StatisticsType::Description::get()
- {
- return marshal_as<String^>( m_nativeptr->getDescription() );
- }
-
- array<StatisticDescriptor^>^ StatisticsType::Statistics::get()
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
-
- apache::geode::statistics::StatisticDescriptor ** nativedescriptors
= m_nativeptr->getStatistics();
- array<StatisticDescriptor^>^ descriptors = gcnew
array<StatisticDescriptor^>(m_nativeptr->getDescriptorsCount());
- for (int item = 0; item < m_nativeptr->getDescriptorsCount(); item++)
- {
- descriptors[item] =
StatisticDescriptor::Create(nativedescriptors[item]);
- }
- return descriptors;
-
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- System::Int32 StatisticsType::NameToId( String^ name )
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- return m_nativeptr->nameToId(marshal_as<std::string>(name));
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- StatisticDescriptor^ StatisticsType::NameToDescriptor( String^ name )
- {
- _GF_MG_EXCEPTION_TRY2/* due to auto replace */
- return
StatisticDescriptor::Create(m_nativeptr->nameToDescriptor(marshal_as<std::string>(name)));
- _GF_MG_EXCEPTION_CATCH_ALL2/* due to auto replace */
- }
-
- System::Int32 StatisticsType::DescriptorsCount::get()
- {
- return m_nativeptr->getDescriptorsCount();
- } // namespace Client
- } // namespace Geode
-} // namespace Apache
-
- } //namespace
-
diff --git a/clicache/src/StatisticsType.hpp b/clicache/src/StatisticsType.hpp
deleted file mode 100644
index e6f3bb3f..00000000
--- a/clicache/src/StatisticsType.hpp
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-
-
-#pragma once
-
-
-#include "geode_defs.hpp"
-#include "begin_native.hpp"
-#include <geode/statistics/StatisticsType.hpp>
-#include <geode/statistics/StatisticDescriptor.hpp>
-#include "end_native.hpp"
-
-using namespace System;
-
-namespace Apache
-{
- namespace Geode
- {
- namespace Client
- {
- ref class StatisticDescriptor;
-
- /// <summary>
- /// This class is used to describe a logical collection of
StatisticDescriptors.These descriptions
- /// are used to create an instance of <see cref="Statistics" /> class.
- /// </summary>
- /// <para>
- /// To get an instance of this interface use an instance of
- /// <see cref="StatisticsFactory" /> class.
- /// </para>
- public ref class StatisticsType sealed
- {
- public:
- /// <summary>
- /// Returns the name of this statistics type.
- /// </summary>
- virtual property String^ Name
- {
- virtual String^ get( );
- }
-
- /// <summary>
- /// Returns a description of this statistics type.
- /// </summary>
- virtual property String^ Description
- {
- virtual String^ get( );
- }
-
- /// <summary>
- /// Returns descriptions of the statistics that this statistics type
- /// gathers together.
- /// </summary>
- virtual property array<StatisticDescriptor^>^ Statistics
- {
- virtual array<StatisticDescriptor^>^ get( );
- }
-
- /// <summary>
- /// Returns the id of the statistic with the given name in this
- /// statistics instance.
- /// </summary>
- /// <param name="name">the statistic name</param>
- /// <returns>the id of the statistic with the given name</returns>
- /// <exception cref="IllegalArgumentException">
- /// if no statistic named <c>name</c> exists in this
- /// statistic instance.
- /// </exception>
- virtual System::Int32 NameToId(String^ name);
-
- /// <summary>
- /// Returns the descriptor of the statistic with the given name in this
- /// statistics instance.
- /// </summary>
- /// <param name="name">the statistic name</param>
- /// <returns>the descriptor of the statistic with the given
name</returns>
- /// <exception cref="IllegalArgumentException">
- /// if no statistic named <c>name</c> exists in this
- /// statistic instance.
- /// </exception>
- virtual StatisticDescriptor^ NameToDescriptor(String^ name);
-
- /// <summary>
- /// Returns the total number of statistics descriptors in the type.
- /// </summary>
- virtual property System::Int32 DescriptorsCount
- {
- virtual System::Int32 get( );
- }
-
- internal:
- /// <summary>
- /// Internal factory function to wrap a native object pointer inside
- /// this managed class, with null pointer check.
- /// </summary>
- /// <param name="nativeptr">native object pointer</param>
- /// <returns>
- /// the managed wrapper object, or null if the native pointer is null.
- /// </returns>
- inline static StatisticsType^ Create(
- apache::geode::statistics::StatisticsType* nativeptr )
- {
- return __nullptr == nativeptr ? nullptr :
- gcnew StatisticsType( nativeptr );
- }
-
- apache::geode::statistics::StatisticsType* GetNative()
- {
- return m_nativeptr;
- }
-
- private:
- /// <summary>
- /// Private constructor to wrap a native object pointer
- /// </summary>
- /// <param name="nativeptr">The native object pointer</param>
- inline StatisticsType( apache::geode::statistics::StatisticsType*
nativeptr )
- : m_nativeptr( nativeptr )
- {
- }
-
- apache::geode::statistics::StatisticsType* m_nativeptr;
-
- };
- } // namespace Client
- } // namespace Geode
-} // namespace Apache
-
-
diff --git a/cppcache/integration-test/ThinClientRemoveAll.hpp
b/cppcache/integration-test/ThinClientRemoveAll.hpp
index a1376e9e..d2ad4ab2 100644
--- a/cppcache/integration-test/ThinClientRemoveAll.hpp
+++ b/cppcache/integration-test/ThinClientRemoveAll.hpp
@@ -32,7 +32,7 @@
#include "BuiltinCacheableWrappers.hpp"
#include <Utils.hpp>
-#include <geode/statistics/StatisticsFactory.hpp>
+#include <statistics/StatisticsFactory.hpp>
#include "CacheHelper.hpp"
diff --git a/cppcache/integration-test/testThinClientPRSingleHop.cpp
b/cppcache/integration-test/testThinClientPRSingleHop.cpp
index 160971d4..efc97ba3 100644
--- a/cppcache/integration-test/testThinClientPRSingleHop.cpp
+++ b/cppcache/integration-test/testThinClientPRSingleHop.cpp
@@ -24,7 +24,7 @@
#include <ace/High_Res_Timer.h>
#include <ace/ACE.h>
-#include <geode/statistics/StatisticsFactory.hpp>
+#include <statistics/StatisticsFactory.hpp>
#include "fw_dunit.hpp"
#include "BuiltinCacheableWrappers.hpp"
diff --git a/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp
b/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp
index 18450843..e24c7708 100644
--- a/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp
+++ b/cppcache/integration-test/testThinClientPRSingleHopServerGroup.cpp
@@ -24,7 +24,7 @@
#include <ace/High_Res_Timer.h>
#include <ace/ACE.h>
-#include <geode/statistics/StatisticsFactory.hpp>
+#include <statistics/StatisticsFactory.hpp>
#include "fw_dunit.hpp"
#include "BuiltinCacheableWrappers.hpp"
diff --git a/cppcache/integration-test/testThinClientPutAllPRSingleHop.cpp
b/cppcache/integration-test/testThinClientPutAllPRSingleHop.cpp
index b903e4ab..18d215cc 100644
--- a/cppcache/integration-test/testThinClientPutAllPRSingleHop.cpp
+++ b/cppcache/integration-test/testThinClientPutAllPRSingleHop.cpp
@@ -24,7 +24,7 @@
#include <ace/OS.h>
#include <ace/High_Res_Timer.h>
-#include <geode/statistics/StatisticsFactory.hpp>
+#include <statistics/StatisticsFactory.hpp>
#include "fw_dunit.hpp"
#include "BuiltinCacheableWrappers.hpp"
diff --git a/cppcache/integration-test/testThinClientStatistics.cpp
b/cppcache/integration-test/testThinClientStatistics.cpp
index 90837aaf..f5a4fd0e 100644
--- a/cppcache/integration-test/testThinClientStatistics.cpp
+++ b/cppcache/integration-test/testThinClientStatistics.cpp
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-#include <geode/statistics/StatisticsFactory.hpp>
+#include <statistics/StatisticsFactory.hpp>
#include <ace/ACE.h>
#include <ace/Guard_T.h>
diff --git a/cppcache/src/CachePerfStats.hpp b/cppcache/src/CachePerfStats.hpp
index e22d5cd5..8d35c281 100644
--- a/cppcache/src/CachePerfStats.hpp
+++ b/cppcache/src/CachePerfStats.hpp
@@ -21,9 +21,9 @@
#define GEODE_CACHEPERFSTATS_H_
#include <geode/geode_globals.hpp>
-#include <geode/statistics/Statistics.hpp>
-#include <geode/statistics/StatisticsFactory.hpp>
+#include "statistics/Statistics.hpp"
+#include "statistics/StatisticsFactory.hpp"
#include "statistics/StatisticsManager.hpp"
namespace apache {
diff --git a/cppcache/src/CqQueryVsdStats.hpp b/cppcache/src/CqQueryVsdStats.hpp
index 33beb02f..2fbd216c 100644
--- a/cppcache/src/CqQueryVsdStats.hpp
+++ b/cppcache/src/CqQueryVsdStats.hpp
@@ -23,10 +23,10 @@
#include <string>
#include <geode/geode_globals.hpp>
-#include <geode/statistics/Statistics.hpp>
-#include <geode/statistics/StatisticsFactory.hpp>
#include <geode/CqStatistics.hpp>
+#include "statistics/Statistics.hpp"
+#include "statistics/StatisticsFactory.hpp"
#include "util/concurrent/spinlock_mutex.hpp"
namespace apache {
diff --git a/cppcache/src/CqServiceVsdStats.cpp
b/cppcache/src/CqServiceVsdStats.cpp
index c4d5999a..2700f843 100644
--- a/cppcache/src/CqServiceVsdStats.cpp
+++ b/cppcache/src/CqServiceVsdStats.cpp
@@ -19,9 +19,9 @@
#include <ace/Singleton.h>
#include <mutex>
#include <geode/geode_globals.hpp>
-#include <geode/statistics/StatisticsFactory.hpp>
#include "CqServiceVsdStats.hpp"
+#include "statistics/StatisticsFactory.hpp"
namespace apache {
namespace geode {
diff --git a/cppcache/src/CqServiceVsdStats.hpp
b/cppcache/src/CqServiceVsdStats.hpp
index 2d480563..92080b1b 100644
--- a/cppcache/src/CqServiceVsdStats.hpp
+++ b/cppcache/src/CqServiceVsdStats.hpp
@@ -23,10 +23,10 @@
#include <string>
#include <geode/geode_globals.hpp>
-#include <geode/statistics/Statistics.hpp>
-#include <geode/statistics/StatisticsFactory.hpp>
#include <geode/CqServiceStatistics.hpp>
+#include "statistics/Statistics.hpp"
+#include "statistics/StatisticsFactory.hpp"
#include "util/concurrent/spinlock_mutex.hpp"
namespace apache {
diff --git a/cppcache/src/PoolStatistics.hpp b/cppcache/src/PoolStatistics.hpp
index ae16a9d7..51403a0b 100644
--- a/cppcache/src/PoolStatistics.hpp
+++ b/cppcache/src/PoolStatistics.hpp
@@ -22,9 +22,9 @@
#include <string>
#include <geode/geode_globals.hpp>
-#include <geode/statistics/Statistics.hpp>
-#include <geode/statistics/StatisticsFactory.hpp>
+#include "statistics/Statistics.hpp"
+#include "statistics/StatisticsFactory.hpp"
#include "statistics/StatisticsManager.hpp"
namespace apache {
diff --git a/cppcache/src/RegionStats.hpp b/cppcache/src/RegionStats.hpp
index 0bedfde7..b0c8fc38 100644
--- a/cppcache/src/RegionStats.hpp
+++ b/cppcache/src/RegionStats.hpp
@@ -23,8 +23,9 @@
#include <string>
#include <geode/geode_globals.hpp>
-#include <geode/statistics/Statistics.hpp>
-#include <geode/statistics/StatisticsFactory.hpp>
+
+#include "statistics/Statistics.hpp"
+#include "statistics/StatisticsFactory.hpp"
namespace apache {
namespace geode {
diff --git a/cppcache/src/Utils.hpp b/cppcache/src/Utils.hpp
index fa18ff2f..30ab2a5a 100644
--- a/cppcache/src/Utils.hpp
+++ b/cppcache/src/Utils.hpp
@@ -28,20 +28,21 @@
#include <string>
#include <unordered_set>
#include <memory>
+#include <typeinfo>
+#include <string>
+#include <unordered_set>
+#include <memory>
+#include <chrono>
#include <geode/geode_globals.hpp>
#include <geode/geode_base.hpp>
#include <geode/ExceptionTypes.hpp>
#include <geode/CacheableString.hpp>
#include <geode/DataOutput.hpp>
-#include <geode/statistics/Statistics.hpp>
#include <geode/SystemProperties.hpp>
#include <geode/DistributedSystem.hpp>
-#include <typeinfo>
-#include <string>
-#include <unordered_set>
-#include <memory>
-#include <chrono>
+
+#include "statistics/Statistics.hpp"
#ifdef __GNUC__
extern "C" {
diff --git a/cppcache/src/statistics/AtomicStatisticsImpl.hpp
b/cppcache/src/statistics/AtomicStatisticsImpl.hpp
index 5efb9f81..ae304a77 100644
--- a/cppcache/src/statistics/AtomicStatisticsImpl.hpp
+++ b/cppcache/src/statistics/AtomicStatisticsImpl.hpp
@@ -23,11 +23,11 @@
#include <geode/geode_globals.hpp>
#include <atomic>
+#include <string>
-#include <geode/statistics/Statistics.hpp>
+#include "Statistics.hpp"
#include "StatisticsTypeImpl.hpp"
-#include <geode/statistics/StatisticsFactory.hpp>
-#include <string>
+#include "StatisticsFactory.hpp"
#include <NonCopyable.hpp>
diff --git a/cppcache/src/statistics/GeodeStatisticsFactory.hpp
b/cppcache/src/statistics/GeodeStatisticsFactory.hpp
index 9ffa30cd..60448d9e 100644
--- a/cppcache/src/statistics/GeodeStatisticsFactory.hpp
+++ b/cppcache/src/statistics/GeodeStatisticsFactory.hpp
@@ -27,8 +27,8 @@
#include <geode/geode_globals.hpp>
#include <geode/ExceptionTypes.hpp>
-#include <geode/statistics/StatisticsFactory.hpp>
+#include "StatisticsFactory.hpp"
#include "StatisticsTypeImpl.hpp"
#include "StatisticsManager.hpp"
diff --git a/cppcache/src/statistics/HostStatHelper.hpp
b/cppcache/src/statistics/HostStatHelper.hpp
index be26bb2b..2faba494 100644
--- a/cppcache/src/statistics/HostStatHelper.hpp
+++ b/cppcache/src/statistics/HostStatHelper.hpp
@@ -20,14 +20,16 @@
#ifndef GEODE_STATISTICS_HOSTSTATHELPER_H_
#define GEODE_STATISTICS_HOSTSTATHELPER_H_
-#include <geode/geode_globals.hpp>
#include <string>
+
+#include <geode/geode_globals.hpp>
+
#include "StatisticDescriptorImpl.hpp"
-#include <geode/statistics/StatisticsType.hpp>
-#include <geode/statistics/Statistics.hpp>
-#include <geode/statistics/StatisticDescriptor.hpp>
+#include "StatisticsType.hpp"
+#include "Statistics.hpp"
+#include "StatisticDescriptor.hpp"
#include "ProcessStats.hpp"
-#include <geode/statistics/StatisticsFactory.hpp>
+#include "StatisticsFactory.hpp"
#include "OsStatisticsImpl.hpp"
#include "LinuxProcessStats.hpp"
#include "SolarisProcessStats.hpp"
diff --git a/cppcache/src/statistics/HostStatSampler.hpp
b/cppcache/src/statistics/HostStatSampler.hpp
index 3a768e88..48a4de41 100644
--- a/cppcache/src/statistics/HostStatSampler.hpp
+++ b/cppcache/src/statistics/HostStatSampler.hpp
@@ -23,13 +23,16 @@
#include <string>
#include <vector>
#include <chrono>
+
#include <ace/Task.h>
#include <ace/Recursive_Thread_Mutex.h>
+
#include <geode/geode_globals.hpp>
-#include <geode/statistics/Statistics.hpp>
-#include <geode/statistics/StatisticDescriptor.hpp>
+
+#include "Statistics.hpp"
+#include "StatisticDescriptor.hpp"
#include "StatisticsManager.hpp"
-#include <geode/statistics/StatisticsType.hpp>
+#include "StatisticsType.hpp"
#include "StatSamplerStats.hpp"
#include "StatArchiveWriter.hpp"
#include <geode/ExceptionTypes.hpp>
diff --git a/cppcache/src/statistics/LinuxProcessStats.hpp
b/cppcache/src/statistics/LinuxProcessStats.hpp
index 19321ce1..4649b083 100644
--- a/cppcache/src/statistics/LinuxProcessStats.hpp
+++ b/cppcache/src/statistics/LinuxProcessStats.hpp
@@ -21,10 +21,10 @@
#define GEODE_STATISTICS_LINUXPROCESSSTATS_H_
#include <geode/geode_globals.hpp>
-#include <geode/statistics/Statistics.hpp>
-#include <geode/statistics/StatisticsType.hpp>
-#include <geode/statistics/StatisticDescriptor.hpp>
+#include "Statistics.hpp"
+#include "StatisticsType.hpp"
+#include "StatisticDescriptor.hpp"
#include "ProcessStats.hpp"
#include "HostStatHelper.hpp"
#include "GeodeStatisticsFactory.hpp"
diff --git a/cppcache/src/statistics/NullProcessStats.hpp
b/cppcache/src/statistics/NullProcessStats.hpp
index 766b4da8..5e77da75 100644
--- a/cppcache/src/statistics/NullProcessStats.hpp
+++ b/cppcache/src/statistics/NullProcessStats.hpp
@@ -21,9 +21,10 @@
*/
#include <geode/geode_globals.hpp>
-#include <geode/statistics/Statistics.hpp>
-#include <geode/statistics/StatisticsType.hpp>
-#include <geode/statistics/StatisticDescriptor.hpp>
+
+#include "Statistics.hpp"
+#include "StatisticsType.hpp"
+#include "StatisticDescriptor.hpp"
#include "ProcessStats.hpp"
#include "HostStatHelper.hpp"
diff --git a/cppcache/src/statistics/OsStatisticsImpl.hpp
b/cppcache/src/statistics/OsStatisticsImpl.hpp
index 23ad1664..f88dad96 100644
--- a/cppcache/src/statistics/OsStatisticsImpl.hpp
+++ b/cppcache/src/statistics/OsStatisticsImpl.hpp
@@ -20,9 +20,8 @@
#ifndef GEODE_STATISTICS_OSSTATISTICSIMPL_H_
#define GEODE_STATISTICS_OSSTATISTICSIMPL_H_
-#include <geode/statistics/Statistics.hpp>
-#include <geode/statistics/StatisticsFactory.hpp>
-
+#include "Statistics.hpp"
+#include "StatisticsFactory.hpp"
#include "StatisticsTypeImpl.hpp"
#include "NonCopyable.hpp"
diff --git a/cppcache/src/statistics/ProcessStats.hpp
b/cppcache/src/statistics/ProcessStats.hpp
index 1d901144..05a290dc 100644
--- a/cppcache/src/statistics/ProcessStats.hpp
+++ b/cppcache/src/statistics/ProcessStats.hpp
@@ -21,7 +21,9 @@
*/
#include <geode/geode_globals.hpp>
-#include <geode/statistics/Statistics.hpp>
+
+#include "Statistics.hpp"
+
using namespace apache::geode::client;
/** @file
diff --git a/cppcache/src/statistics/SolarisProcessStats.hpp
b/cppcache/src/statistics/SolarisProcessStats.hpp
index 5defe551..ab7778fc 100644
--- a/cppcache/src/statistics/SolarisProcessStats.hpp
+++ b/cppcache/src/statistics/SolarisProcessStats.hpp
@@ -20,9 +20,10 @@
#define GEODE_STATISTICS_SOLARISPROCESSSTATS_H_
#include <geode/geode_globals.hpp>
-#include <geode/statistics/Statistics.hpp>
-#include <geode/statistics/StatisticsType.hpp>
-#include <geode/statistics/StatisticDescriptor.hpp>
+
+#include "Statistics.hpp"
+#include "StatisticsType.hpp"
+#include "StatisticDescriptor.hpp"
#include "ProcessStats.hpp"
#include "HostStatHelper.hpp"
#include "GeodeStatisticsFactory.hpp"
diff --git a/cppcache/src/statistics/StatArchiveWriter.hpp
b/cppcache/src/statistics/StatArchiveWriter.hpp
index b2b6b8d0..13ab3419 100644
--- a/cppcache/src/statistics/StatArchiveWriter.hpp
+++ b/cppcache/src/statistics/StatArchiveWriter.hpp
@@ -22,19 +22,21 @@
#include <map>
#include <list>
+#include <chrono>
+
#include <geode/geode_globals.hpp>
#include <geode/ExceptionTypes.hpp>
#include <geode/Cache.hpp>
+#include <geode/DataOutput.hpp>
+
#include "StatsDef.hpp"
-#include <geode/statistics/Statistics.hpp>
-#include <geode/statistics/StatisticDescriptor.hpp>
+#include "Statistics.hpp"
+#include "StatisticDescriptor.hpp"
#include "StatisticDescriptorImpl.hpp"
-#include <geode/statistics/StatisticsType.hpp>
+#include "StatisticsType.hpp"
#include "HostStatSampler.hpp"
-#include "util/Log.hpp"
-#include <geode/DataOutput.hpp>
-#include <NonCopyable.hpp>
-#include <chrono>
+#include "../util/Log.hpp"
+#include "../NonCopyable.hpp"
#include "SerializationRegistry.hpp"
using namespace apache::geode::client;
diff --git a/cppcache/src/statistics/StatSamplerStats.hpp
b/cppcache/src/statistics/StatSamplerStats.hpp
index aafc8aba..d6b33562 100644
--- a/cppcache/src/statistics/StatSamplerStats.hpp
+++ b/cppcache/src/statistics/StatSamplerStats.hpp
@@ -21,10 +21,11 @@
*/
#include <geode/geode_globals.hpp>
-#include <geode/statistics/StatisticDescriptor.hpp>
-#include <geode/statistics/StatisticsType.hpp>
-#include <geode/statistics/Statistics.hpp>
-#include <geode/statistics/StatisticsFactory.hpp>
+
+#include "StatisticDescriptor.hpp"
+#include "StatisticsType.hpp"
+#include "Statistics.hpp"
+#include "StatisticsFactory.hpp"
using namespace apache::geode::client;
diff --git a/cppcache/include/geode/statistics/StatisticDescriptor.hpp
b/cppcache/src/statistics/StatisticDescriptor.hpp
similarity index 98%
rename from cppcache/include/geode/statistics/StatisticDescriptor.hpp
rename to cppcache/src/statistics/StatisticDescriptor.hpp
index f99f3ee7..e8129e4e 100644
--- a/cppcache/include/geode/statistics/StatisticDescriptor.hpp
+++ b/cppcache/src/statistics/StatisticDescriptor.hpp
@@ -22,7 +22,7 @@
#include <string>
-#include "../geode_globals.hpp"
+#include <geode/geode_globals.hpp>
/** @file
*/
diff --git a/cppcache/src/statistics/StatisticDescriptorImpl.hpp
b/cppcache/src/statistics/StatisticDescriptorImpl.hpp
index 4776a24d..2b052faa 100644
--- a/cppcache/src/statistics/StatisticDescriptorImpl.hpp
+++ b/cppcache/src/statistics/StatisticDescriptorImpl.hpp
@@ -23,7 +23,8 @@
#include <string>
#include <geode/ExceptionTypes.hpp>
-#include <geode/statistics/StatisticDescriptor.hpp>
+
+#include "StatisticDescriptor.hpp"
/** @file
*/
diff --git a/cppcache/src/statistics/Statistics.cpp
b/cppcache/src/statistics/Statistics.cpp
index f4b3607a..3945ebfb 100644
--- a/cppcache/src/statistics/Statistics.cpp
+++ b/cppcache/src/statistics/Statistics.cpp
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-#include <geode/statistics/Statistics.hpp>
+#include "Statistics.hpp"
namespace apache {
namespace geode {
diff --git a/cppcache/include/geode/statistics/Statistics.hpp
b/cppcache/src/statistics/Statistics.hpp
similarity index 99%
rename from cppcache/include/geode/statistics/Statistics.hpp
rename to cppcache/src/statistics/Statistics.hpp
index dced8fcb..efb4d516 100644
--- a/cppcache/include/geode/statistics/Statistics.hpp
+++ b/cppcache/src/statistics/Statistics.hpp
@@ -22,7 +22,8 @@
#include <string>
-#include "../geode_globals.hpp"
+#include <geode/geode_globals.hpp>
+
#include "StatisticsType.hpp"
#include "StatisticDescriptor.hpp"
diff --git a/cppcache/include/geode/statistics/StatisticsFactory.hpp
b/cppcache/src/statistics/StatisticsFactory.hpp
similarity index 99%
rename from cppcache/include/geode/statistics/StatisticsFactory.hpp
rename to cppcache/src/statistics/StatisticsFactory.hpp
index e0596cc8..e94b28d6 100644
--- a/cppcache/include/geode/statistics/StatisticsFactory.hpp
+++ b/cppcache/src/statistics/StatisticsFactory.hpp
@@ -20,11 +20,12 @@
#ifndef GEODE_STATISTICS_STATISTICSFACTORY_H_
#define GEODE_STATISTICS_STATISTICSFACTORY_H_
-#include "../geode_globals.hpp"
+#include <geode/geode_globals.hpp>
+#include <geode/ExceptionTypes.hpp>
+
#include "StatisticDescriptor.hpp"
#include "StatisticsType.hpp"
#include "Statistics.hpp"
-#include "../ExceptionTypes.hpp"
/** @file
*/
diff --git a/cppcache/src/statistics/StatisticsManager.hpp
b/cppcache/src/statistics/StatisticsManager.hpp
index e763b424..4378f027 100644
--- a/cppcache/src/statistics/StatisticsManager.hpp
+++ b/cppcache/src/statistics/StatisticsManager.hpp
@@ -24,9 +24,9 @@
#include <vector>
#include <geode/geode_globals.hpp>
-#include <geode/statistics/Statistics.hpp>
#include <geode/ExceptionTypes.hpp>
+#include "Statistics.hpp"
#include "HostStatSampler.hpp"
#include "StatisticsTypeImpl.hpp"
#include "AdminRegion.hpp"
diff --git a/cppcache/include/geode/statistics/StatisticsType.hpp
b/cppcache/src/statistics/StatisticsType.hpp
similarity index 98%
rename from cppcache/include/geode/statistics/StatisticsType.hpp
rename to cppcache/src/statistics/StatisticsType.hpp
index 6fcf0dc2..c21bc3c1 100644
--- a/cppcache/include/geode/statistics/StatisticsType.hpp
+++ b/cppcache/src/statistics/StatisticsType.hpp
@@ -20,7 +20,8 @@
#ifndef GEODE_STATISTICS_STATISTICSTYPE_H_
#define GEODE_STATISTICS_STATISTICSTYPE_H_
-#include "../geode_globals.hpp"
+#include <geode/geode_globals.hpp>
+
#include "StatisticDescriptor.hpp"
/** @file
diff --git a/cppcache/src/statistics/StatisticsTypeImpl.hpp
b/cppcache/src/statistics/StatisticsTypeImpl.hpp
index 22028a1b..88f65b9f 100644
--- a/cppcache/src/statistics/StatisticsTypeImpl.hpp
+++ b/cppcache/src/statistics/StatisticsTypeImpl.hpp
@@ -23,10 +23,10 @@
#include <map>
#include <string>
-#include <geode/statistics/StatisticsType.hpp>
-#include <geode/statistics/StatisticsFactory.hpp>
#include <geode/ExceptionTypes.hpp>
+#include "StatisticsType.hpp"
+#include "StatisticsFactory.hpp"
#include "StatsDef.hpp"
/** @file
diff --git a/cppcache/src/statistics/WindowsProcessStats.hpp
b/cppcache/src/statistics/WindowsProcessStats.hpp
index 4cb62f46..f4fe2334 100644
--- a/cppcache/src/statistics/WindowsProcessStats.hpp
+++ b/cppcache/src/statistics/WindowsProcessStats.hpp
@@ -21,10 +21,10 @@
#define GEODE_STATISTICS_WINDOWSPROCESSSTATS_H_
#include <geode/geode_globals.hpp>
-#include <geode/statistics/Statistics.hpp>
-#include <geode/statistics/StatisticsType.hpp>
-#include <geode/statistics/StatisticDescriptor.hpp>
-#include <geode/statistics/StatisticsFactory.hpp>
+#include "statistics/Statistics.hpp"
+#include "statistics/StatisticsType.hpp"
+#include "statistics/StatisticDescriptor.hpp"
+#include "statistics/StatisticsFactory.hpp"
#include <geode/ExceptionTypes.hpp>
#include "ProcessStats.hpp"
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
> Remove Statistics from public API
> ---------------------------------
>
> Key: GEODE-4046
> URL: https://issues.apache.org/jira/browse/GEODE-4046
> Project: Geode
> Issue Type: Improvement
> Components: native client
> Reporter: Jacob S. Barrett
> Assignee: Jacob S. Barrett
>
> Rather than modernize the Statistics classes we will move them internal only.
--
This message was sent by Atlassian JIRA
(v6.4.14#64029)
