You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ec...@apache.org on 2018/04/17 22:41:24 UTC
[geode-native] 01/01: Revert "GEODE-4842: Rebase with develop
(#279)"
This is an automated email from the ASF dual-hosted git repository.
echobravo pushed a commit to branch revert-279-feature/GEODE-4842-redo
in repository https://gitbox.apache.org/repos/asf/geode-native.git
commit 6cbb1c0d800463f44411691b6787b5d2dd6c847a
Author: Ernie Burghardt <eb...@pivotal.io>
AuthorDate: Tue Apr 17 16:41:21 2018 -0600
Revert "GEODE-4842: Rebase with develop (#279)"
This reverts commit 805b8b7c5b5baab06ebbb1a6d5587e857e43017c.
---
clicache/integration-test/CacheHelperN.cs | 16 ++++++++--------
clicache/integration-test/ThinClientPoolTestsN.cs | 4 ++--
clicache/integration-test/ThinClientQueryTestsN.cs | 2 +-
.../ThinClientRemoteQueryExclusivenessTests.cs | 2 +-
clicache/src/PoolFactory.cpp | 2 +-
clicache/src/PoolFactory.hpp | 2 +-
examples/dotnet/AuthInitialize/Program.cs | 2 +-
examples/dotnet/PdxAutoSerializer/Program.cs | 2 +-
examples/dotnet/PutGetRemove/Program.cs | 2 +-
tests/cli/NewFwkLib/FwkTest.cs | 4 ++--
10 files changed, 19 insertions(+), 19 deletions(-)
diff --git a/clicache/integration-test/CacheHelperN.cs b/clicache/integration-test/CacheHelperN.cs
index 879106e..926e54b 100644
--- a/clicache/integration-test/CacheHelperN.cs
+++ b/clicache/integration-test/CacheHelperN.cs
@@ -936,7 +936,7 @@ namespace Apache.Geode.Client.UnitTests
}
poolFactory.SetSubscriptionEnabled(clientNotification);
- poolFactory.Create("__TESTPOOL__");
+ poolFactory.Create("__TESTPOOL__", CacheHelper.DCache);
region = regionFactory.SetPoolName("__TESTPOOL__").Create<TradeKey, Object>(name);
Assert.IsNotNull(region, "IRegion<TradeKey, Object> {0} was not created.", name);
@@ -1024,7 +1024,7 @@ namespace Apache.Geode.Client.UnitTests
fact.SetMinConnections(numConnections);
fact.SetMaxConnections(numConnections);
}
- Pool/*<TKey, TValue>*/ pool = fact.Create(name);
+ Pool/*<TKey, TValue>*/ pool = fact.Create(name, CacheHelper.DCache);
if (pool == null)
{
Util.Log("Pool creation failed");
@@ -1088,7 +1088,7 @@ namespace Apache.Geode.Client.UnitTests
{
Util.Log("No locators or servers specified for pool");
}
- Pool/*<TKey, TValue>*/ pool = fact.Create(poolName);
+ Pool/*<TKey, TValue>*/ pool = fact.Create(poolName, CacheHelper.DCache);
if (pool == null)
{
Util.Log("Pool creation failed");
@@ -1170,7 +1170,7 @@ namespace Apache.Geode.Client.UnitTests
{
Util.Log("No locators or servers specified for pool");
}
- Pool/*<TKey, TValue>*/ pool = fact.Create(poolName);
+ Pool/*<TKey, TValue>*/ pool = fact.Create(poolName, CacheHelper.DCache);
if (pool == null)
{
Util.Log("Pool creation failed");
@@ -1240,7 +1240,7 @@ namespace Apache.Geode.Client.UnitTests
{
Util.Log("No locators or servers specified for pool");
}
- Pool/*<TKey, TValue>*/ pool = fact.Create(poolName);
+ Pool/*<TKey, TValue>*/ pool = fact.Create(poolName, CacheHelper.DCache);
if (pool == null)
{
Util.Log("Pool creation failed");
@@ -1306,7 +1306,7 @@ namespace Apache.Geode.Client.UnitTests
{
Util.Log("No locators or servers specified for pool");
}
- Pool/*<TKey, TValue>*/ pool = fact.Create(poolName);
+ Pool/*<TKey, TValue>*/ pool = fact.Create(poolName, CacheHelper.DCache);
if (pool == null)
{
Util.Log("Pool creation failed");
@@ -1378,7 +1378,7 @@ namespace Apache.Geode.Client.UnitTests
{
Util.Log("No locators or servers specified for pool");
}
- Pool/*<TKey, TValue>*/ pool = fact.Create(poolName);
+ Pool/*<TKey, TValue>*/ pool = fact.Create(poolName, CacheHelper.DCache);
if (pool == null)
{
Util.Log("Pool creation failed");
@@ -1448,7 +1448,7 @@ namespace Apache.Geode.Client.UnitTests
{
Util.Log("No locators or servers specified for pool");
}
- Pool pool = fact.Create(poolName);
+ Pool pool = fact.Create(poolName, m_cache);
if (pool == null)
{
Util.Log("Pool creation failed");
diff --git a/clicache/integration-test/ThinClientPoolTestsN.cs b/clicache/integration-test/ThinClientPoolTestsN.cs
index 79ba314..f9ab051 100644
--- a/clicache/integration-test/ThinClientPoolTestsN.cs
+++ b/clicache/integration-test/ThinClientPoolTestsN.cs
@@ -380,7 +380,7 @@ namespace Apache.Geode.Client.UnitTests
factory.AddLocator("localhost", CacheHelper.LOCATOR_PORT_1);
factory.SetPRSingleHopEnabled(false);
- Pool pool = factory.Create(poolName);
+ Pool pool = factory.Create(poolName, CacheHelper.DCache);
Assert.AreEqual(TimeSpan.FromSeconds(10000), pool.FreeConnectionTimeout, "FreeConnectionTimeout");
Assert.AreEqual(TimeSpan.FromSeconds(1), pool.LoadConditioningInterval, "LoadConditioningInterval");
@@ -438,7 +438,7 @@ namespace Apache.Geode.Client.UnitTests
PoolFactory factory = CacheHelper.DCache.GetPoolManager().CreateFactory();
try
{
- factory.Create(poolName);
+ factory.Create(poolName, CacheHelper.DCache);
Assert.Fail("Did not get expected IllegalStateException");
}
catch (IllegalStateException /*excp*/)
diff --git a/clicache/integration-test/ThinClientQueryTestsN.cs b/clicache/integration-test/ThinClientQueryTestsN.cs
index 4c5eeb9..02d9387 100644
--- a/clicache/integration-test/ThinClientQueryTestsN.cs
+++ b/clicache/integration-test/ThinClientQueryTestsN.cs
@@ -91,7 +91,7 @@ namespace Apache.Geode.Client.UnitTests
m_isPdx = isPdx;
try
{
- var poolFail = CacheHelper.DCache.GetPoolManager().CreateFactory().Create("_TESTFAILPOOL_");
+ var poolFail = CacheHelper.DCache.GetPoolManager().CreateFactory().Create("_TESTFAILPOOL_", CacheHelper.DCache);
var qsFail = poolFail.GetQueryService();
var qryFail = qsFail.NewQuery<object>("select distinct * from /" + QERegionName);
var resultsFail = qryFail.Execute();
diff --git a/clicache/integration-test/ThinClientRemoteQueryExclusivenessTests.cs b/clicache/integration-test/ThinClientRemoteQueryExclusivenessTests.cs
index a22e77d..a588bb1 100644
--- a/clicache/integration-test/ThinClientRemoteQueryExclusivenessTests.cs
+++ b/clicache/integration-test/ThinClientRemoteQueryExclusivenessTests.cs
@@ -89,7 +89,7 @@ namespace Apache.Geode.Client.UnitTests
m_isPdx = isPdx;
try
{
- var poolFail = CacheHelper.DCache.GetPoolManager().CreateFactory().Create("_TESTFAILPOOL_");
+ var poolFail = CacheHelper.DCache.GetPoolManager().CreateFactory().Create("_TESTFAILPOOL_", CacheHelper.DCache);
var qsFail = poolFail.GetQueryService();
var qryFail = qsFail.NewQuery<object>("select distinct * from /" + QERegionName);
var resultsFail = qryFail.Execute();
diff --git a/clicache/src/PoolFactory.cpp b/clicache/src/PoolFactory.cpp
index c72da35..0c4b762 100644
--- a/clicache/src/PoolFactory.cpp
+++ b/clicache/src/PoolFactory.cpp
@@ -427,7 +427,7 @@ namespace Apache
}
- Pool^ PoolFactory::Create(String^ name)
+ Pool^ PoolFactory::Create(String^ name, Cache^ cache)
{
_GF_MG_EXCEPTION_TRY2/* due to auto replace */
diff --git a/clicache/src/PoolFactory.hpp b/clicache/src/PoolFactory.hpp
index f16cf54..a9c891e 100644
--- a/clicache/src/PoolFactory.hpp
+++ b/clicache/src/PoolFactory.hpp
@@ -391,7 +391,7 @@ namespace Apache
/// throws IllegalStateException if a pool with name already exists
/// throws IllegalStateException if a locator or server has not been added.
/// </exception>
- Pool^ Create(String^ name);
+ Pool^ Create(String^ name, Cache^ cache);
internal:
diff --git a/examples/dotnet/AuthInitialize/Program.cs b/examples/dotnet/AuthInitialize/Program.cs
index 91ff1c5..200e097 100644
--- a/examples/dotnet/AuthInitialize/Program.cs
+++ b/examples/dotnet/AuthInitialize/Program.cs
@@ -31,7 +31,7 @@ namespace Apache.Geode.Examples.AuthInitialize
var cache = cacheFactory.Create();
var poolFactory = cache.GetPoolFactory()
.AddLocator("localhost", 10334);
- poolFactory.Create("pool");
+ poolFactory.Create("pool", cache);
var regionFactory = cache.CreateRegionFactory(RegionShortcut.PROXY)
.SetPoolName("pool");
var region = regionFactory.Create<string, string>("region");
diff --git a/examples/dotnet/PdxAutoSerializer/Program.cs b/examples/dotnet/PdxAutoSerializer/Program.cs
index 2005ec0..f7f6287 100644
--- a/examples/dotnet/PdxAutoSerializer/Program.cs
+++ b/examples/dotnet/PdxAutoSerializer/Program.cs
@@ -34,7 +34,7 @@ namespace Apache.Geode.Examples.Serializer
var poolFactory = cache.GetPoolFactory()
.AddLocator("localhost", 10334);
- poolFactory.Create("pool");
+ poolFactory.Create("pool", cache);
var regionFactory = cache.CreateRegionFactory(RegionShortcut.PROXY)
.SetPoolName("pool");
diff --git a/examples/dotnet/PutGetRemove/Program.cs b/examples/dotnet/PutGetRemove/Program.cs
index 39f4abf..07dac3d 100644
--- a/examples/dotnet/PutGetRemove/Program.cs
+++ b/examples/dotnet/PutGetRemove/Program.cs
@@ -30,7 +30,7 @@ namespace Apache.Geode.Examples.PutGetRemove
var poolFactory = cache.GetPoolFactory()
.AddLocator("localhost", 10334);
- poolFactory.Create("pool");
+ poolFactory.Create("pool", cache);
var regionFactory = cache.CreateRegionFactory(RegionShortcut.PROXY)
.SetPoolName("pool");
diff --git a/tests/cli/NewFwkLib/FwkTest.cs b/tests/cli/NewFwkLib/FwkTest.cs
index 4ab34ce..8d31059 100644
--- a/tests/cli/NewFwkLib/FwkTest.cs
+++ b/tests/cli/NewFwkLib/FwkTest.cs
@@ -617,7 +617,7 @@ namespace Apache.Geode.Client.FwkLib
if (CacheHelper<TKey, TVal>.DCache.GetPoolManager().Find(poolName) == null)
{
- Pool pool = pf.Create(poolName);
+ Pool pool = pf.Create(poolName, CacheHelper<TKey, TVal>.DCache);
FwkInfo("Pool attributes are {0}:", PoolAttributesToString(pool));
}
}
@@ -1384,7 +1384,7 @@ namespace Apache.Geode.Client.FwkLib
pf.SetSubscriptionRedundancy(redundancyLevel);
if (CacheHelper<TKey, TVal>.DCache.GetPoolManager().Find(poolName) == null)
{
- Pool pool = pf.Create(poolName);
+ Pool pool = pf.Create(poolName, CacheHelper<TKey, TVal>.DCache);
FwkInfo("Pool attributes are {0}:", PoolAttributesToString(pool));
}
FwkInfo("Create Pool complete with poolName= {0}", poolName);
--
To stop receiving notification emails like this one, please contact
echobravo@apache.org.