This is an automated email from the ASF dual-hosted git repository.
ptupitsyn pushed a commit to branch ignite-12458
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/ignite-12458 by this push:
new 11bd1f5 Rename in .NET
11bd1f5 is described below
commit 11bd1f5c12ea351356d6b1fd5bde07f3e1f44d87
Author: Pavel <[email protected]>
AuthorDate: Wed Dec 25 13:05:03 2019 +0300
Rename in .NET
---
.../Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj | 2 +-
.../{AffinityAwarenessTest.cs => PartitionAwarenessTest.cs} | 12 ++++++------
.../Client/ClientProtocolCompatibilityTest.cs | 6 +++---
.../Client/ClientReconnectCompatibilityTest.cs | 6 +++---
.../Client/ClientServerCompatibilityTest.cs | 4 ++--
.../Client/IgniteClientConfigurationTest.cs | 4 ++--
.../Config/Client/IgniteClientConfiguration.xml | 2 +-
.../dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj | 2 +-
.../Apache.Ignite.Core/Client/IgniteClientConfiguration.cs | 4 ++--
.../Apache.Ignite.Core/IgniteClientConfigurationSection.xsd | 2 +-
...arenessGroup.cs => ClientCachePartitionAwarenessGroup.cs} | 4 ++--
.../Apache.Ignite.Core/Impl/Client/ClientFailoverSocket.cs | 10 +++++-----
12 files changed, 29 insertions(+), 29 deletions(-)
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
index ea11f57..14a1776 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
+++
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Apache.Ignite.Core.Tests.csproj
@@ -132,7 +132,7 @@
<Compile Include="Cache\Query\Linq\CacheLinqTest.Contains.cs" />
<Compile Include="Cache\Store\CacheStoreSessionTestCodeConfig.cs" />
<Compile Include="Cache\Store\CacheStoreSessionTestSharedFactory.cs" />
- <Compile Include="Client\Cache\AffinityAwarenessTest.cs" />
+ <Compile Include="Client\Cache\PartitionAwarenessTest.cs" />
<Compile Include="Client\Cache\BinaryBuilderTest.cs" />
<Compile Include="Client\Cache\CacheClientAsyncWrapper.cs" />
<Compile Include="Client\Cache\CacheTest.cs" />
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/Cache/AffinityAwarenessTest.cs
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/Cache/PartitionAwarenessTest.cs
similarity index 98%
rename from
modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/Cache/AffinityAwarenessTest.cs
rename to
modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/Cache/PartitionAwarenessTest.cs
index 9d5a100..2ea8245 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/Cache/AffinityAwarenessTest.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/Cache/PartitionAwarenessTest.cs
@@ -35,7 +35,7 @@ namespace Apache.Ignite.Core.Tests.Client.Cache
/// <summary>
/// Tests affinity awareness functionality.
/// </summary>
- public class AffinityAwarenessTest : ClientTestBase
+ public class PartitionAwarenessTest : ClientTestBase
{
/** */
private const string NodeIndexAttr = "test-node-idx";
@@ -47,9 +47,9 @@ namespace Apache.Ignite.Core.Tests.Client.Cache
private ICacheClient<int, int> _cache;
/// <summary>
- /// Initializes a new instance of the <see
cref="AffinityAwarenessTest"/> class.
+ /// Initializes a new instance of the <see
cref="PartitionAwarenessTest"/> class.
/// </summary>
- public AffinityAwarenessTest() : base(3)
+ public PartitionAwarenessTest() : base(3)
{
// No-op.
}
@@ -308,10 +308,10 @@ namespace Apache.Ignite.Core.Tests.Client.Cache
}
[Test]
- public void
CacheGet_AffinityAwarenessDisabled_RequestIsRoutedToDefaultNode()
+ public void
CacheGet_PartitionAwarenessDisabled_RequestIsRoutedToDefaultNode()
{
var cfg = GetClientConfiguration();
- cfg.EnableAffinityAwareness = false;
+ cfg.EnablePartitionAwareness = false;
using (var client = Ignition.StartClient(cfg))
{
@@ -446,7 +446,7 @@ namespace Apache.Ignite.Core.Tests.Client.Cache
{
var cfg = base.GetClientConfiguration();
- cfg.EnableAffinityAwareness = true;
+ cfg.EnablePartitionAwareness = true;
cfg.Endpoints.Add(string.Format("{0}:{1}", IPAddress.Loopback,
IgniteClientConfiguration.DefaultPort + 1));
cfg.Endpoints.Add(string.Format("{0}:{1}", IPAddress.Loopback,
IgniteClientConfiguration.DefaultPort + 2));
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientProtocolCompatibilityTest.cs
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientProtocolCompatibilityTest.cs
index 4e2b747..4052e23 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientProtocolCompatibilityTest.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientProtocolCompatibilityTest.cs
@@ -77,7 +77,7 @@ namespace Apache.Ignite.Core.Tests.Client
using (var client = GetClient(version, true))
{
-
Assert.IsFalse(client.GetConfiguration().EnableAffinityAwareness);
+
Assert.IsFalse(client.GetConfiguration().EnablePartitionAwareness);
var cache = client.GetOrCreateCache<int,
int>(TestContext.CurrentContext.Test.Name);
cache.Put(1, 2);
@@ -175,12 +175,12 @@ namespace Apache.Ignite.Core.Tests.Client
/// <summary>
/// Gets the client with specified protocol version.
/// </summary>
- private IgniteClient GetClient(ClientProtocolVersion version, bool
enableAffinityAwareness = false)
+ private IgniteClient GetClient(ClientProtocolVersion version, bool
enablePartitionAwareness = false)
{
var cfg = new IgniteClientConfiguration(GetClientConfiguration())
{
ProtocolVersion = version,
- EnableAffinityAwareness = enableAffinityAwareness
+ EnablePartitionAwareness = enablePartitionAwareness
};
return (IgniteClient) Ignition.StartClient(cfg);
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientReconnectCompatibilityTest.cs
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientReconnectCompatibilityTest.cs
index 40580de..13e17ec 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientReconnectCompatibilityTest.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientReconnectCompatibilityTest.cs
@@ -40,7 +40,7 @@ namespace Apache.Ignite.Core.Tests.Client
IIgniteClient client = null;
var clientConfiguration = new
IgniteClientConfiguration(JavaServer.GetClientConfiguration())
{
- EnableAffinityAwareness = true,
+ EnablePartitionAwareness = true,
Logger = new ListLogger(new ConsoleLogger {MinLevel =
LogLevel.Trace})
};
@@ -52,7 +52,7 @@ namespace Apache.Ignite.Core.Tests.Client
var cache = client.GetOrCreateCache<int,
int>(TestContext.CurrentContext.Test.Name);
cache.Put(1, 42);
Assert.AreEqual(42, cache.Get(1));
-
Assert.IsTrue(client.GetConfiguration().EnableAffinityAwareness);
+
Assert.IsTrue(client.GetConfiguration().EnablePartitionAwareness);
}
Assert.Catch(() => client.GetCacheNames());
@@ -62,7 +62,7 @@ namespace Apache.Ignite.Core.Tests.Client
var cache = client.GetOrCreateCache<int,
int>(TestContext.CurrentContext.Test.Name);
cache.Put(1, 42);
Assert.AreEqual(42, cache.Get(1));
-
Assert.IsFalse(client.GetConfiguration().EnableAffinityAwareness);
+
Assert.IsFalse(client.GetConfiguration().EnablePartitionAwareness);
var log = ((ListLogger)
client.GetConfiguration().Logger).Entries.Last();
Assert.AreEqual("Partition awareness has been disabled: " +
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientServerCompatibilityTest.cs
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientServerCompatibilityTest.cs
index 0619ed2..d8caa3a 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientServerCompatibilityTest.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientServerCompatibilityTest.cs
@@ -108,7 +108,7 @@ namespace Apache.Ignite.Core.Tests.Client
{
using (var client = StartClient())
{
-
Assert.IsFalse(client.GetConfiguration().EnableAffinityAwareness);
+
Assert.IsFalse(client.GetConfiguration().EnablePartitionAwareness);
var cache = client.GetOrCreateCache<int,
int>(TestContext.CurrentContext.Test.Name);
cache.Put(1, 2);
Assert.AreEqual(2, cache.Get(1));
@@ -123,7 +123,7 @@ namespace Apache.Ignite.Core.Tests.Client
var cfg = new
IgniteClientConfiguration(JavaServer.GetClientConfiguration())
{
Logger = new ListLogger(new ConsoleLogger {MinLevel =
LogLevel.Trace}),
- EnableAffinityAwareness = true
+ EnablePartitionAwareness = true
};
return Ignition.StartClient(cfg);
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/IgniteClientConfigurationTest.cs
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/IgniteClientConfigurationTest.cs
index 7cf20ad..9802489 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/IgniteClientConfigurationTest.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/IgniteClientConfigurationTest.cs
@@ -96,7 +96,7 @@ namespace Apache.Ignite.Core.Tests.Client
"bar:123",
"baz:100..103"
},
- EnableAffinityAwareness = true,
+ EnablePartitionAwareness = true,
Logger = new ConsoleLogger
{
MinLevel = LogLevel.Debug
@@ -220,7 +220,7 @@ namespace Apache.Ignite.Core.Tests.Client
var cfg = new IgniteClientConfiguration("127.0.0.1")
{
ProtocolVersion = new ClientProtocolVersion(1, 0, 0),
- EnableAffinityAwareness = true,
+ EnablePartitionAwareness = true,
};
configAction(cfg);
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Client/IgniteClientConfiguration.xml
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Client/IgniteClientConfiguration.xml
index 71a9e3c..cfe9a8b 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Client/IgniteClientConfiguration.xml
+++
b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Config/Client/IgniteClientConfiguration.xml
@@ -18,7 +18,7 @@
-->
<igniteClientConfiguration host="test1" port="345"
socketReceiveBufferSize="222" socketSendBufferSize="333"
- tcpNoDelay="false" socketTimeout="0:0:15"
enableAffinityAwareness="true">
+ tcpNoDelay="false" socketTimeout="0:0:15"
enablePartitionAwareness="true">
<binaryConfiguration compactFooter="false" keepDeserialized="false">
<types>
<string>foo</string>
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
index 862ced0..6c56fa4 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Apache.Ignite.Core.csproj
@@ -85,7 +85,7 @@
<Compile Include="Impl\Cache\QueryMetricsImpl.cs" />
<Compile Include="Impl\Client\ClientOpExtensions.cs" />
<Compile Include="Impl\Client\Cluster\ClientCluster.cs" />
- <Compile Include="Impl\Client\Cache\ClientCacheAffinityAwarenessGroup.cs"
/>
+ <Compile Include="Impl\Client\Cache\ClientCachePartitionAwarenessGroup.cs"
/>
<Compile Include="Impl\Client\Cache\ClientCachePartitionMap.cs" />
<Compile Include="Impl\Client\Cache\ClientCacheTopologyPartitionMap.cs" />
<Compile Include="Impl\Client\Cache\ClientRendezvousAffinityFunction.cs" />
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Client/IgniteClientConfiguration.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Client/IgniteClientConfiguration.cs
index c3fc405..8024187 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core/Client/IgniteClientConfiguration.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core/Client/IgniteClientConfiguration.cs
@@ -116,7 +116,7 @@ namespace Apache.Ignite.Core.Client
Password = cfg.Password;
Endpoints = cfg.Endpoints == null ? null : cfg.Endpoints.ToList();
ReconnectDisabled = cfg.ReconnectDisabled;
- EnableAffinityAwareness = cfg.EnableAffinityAwareness;
+ EnablePartitionAwareness = cfg.EnablePartitionAwareness;
Logger = cfg.Logger;
ProtocolVersion = cfg.ProtocolVersion;
}
@@ -216,7 +216,7 @@ namespace Apache.Ignite.Core.Client
/// the primary node for the given cache key.
/// To do so, connection is established to every known server node at
all times.
/// </summary>
- public bool EnableAffinityAwareness { get; set; }
+ public bool EnablePartitionAwareness { get; set; }
/// <summary>
/// Gets or sets the logger.
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteClientConfigurationSection.xsd
b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteClientConfigurationSection.xsd
index 91bada8..ba64aca 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core/IgniteClientConfigurationSection.xsd
+++
b/modules/platforms/dotnet/Apache.Ignite.Core/IgniteClientConfigurationSection.xsd
@@ -264,7 +264,7 @@
<xs:documentation>Disables automatic reconnect on network
or server failure.</xs:documentation>
</xs:annotation>
</xs:attribute>
- <xs:attribute name="enableAffinityAwareness" type="xs:boolean">
+ <xs:attribute name="enablePartitionAwareness" type="xs:boolean">
<xs:annotation>
<xs:documentation>Enables affinity-aware connection:
client will establish connection to every known server and route requests to
primary nodes for cache operations.</xs:documentation>
</xs:annotation>
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/Cache/ClientCacheAffinityAwarenessGroup.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/Cache/ClientCachePartitionAwarenessGroup.cs
similarity index 96%
rename from
modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/Cache/ClientCacheAffinityAwarenessGroup.cs
rename to
modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/Cache/ClientCachePartitionAwarenessGroup.cs
index f245f9c..a78f387 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/Cache/ClientCacheAffinityAwarenessGroup.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/Cache/ClientCachePartitionAwarenessGroup.cs
@@ -27,7 +27,7 @@ namespace Apache.Ignite.Core.Impl.Client.Cache
/// Partition mapping associated with the group of caches.
/// Mirrors corresponding Java class.
/// </summary>
- internal class ClientCacheAffinityAwarenessGroup
+ internal class ClientCachePartitionAwarenessGroup
{
/** */
private readonly List<KeyValuePair<Guid, List<int>>> _partitionMap;
@@ -35,7 +35,7 @@ namespace Apache.Ignite.Core.Impl.Client.Cache
/** */
private readonly List<KeyValuePair<int, Dictionary<int, int>>> _caches;
- public ClientCacheAffinityAwarenessGroup(IBinaryStream stream)
+ public ClientCachePartitionAwarenessGroup(IBinaryStream stream)
{
// Whether this group is eligible for client-side partition
awareness.
var applicable = stream.ReadBool();
diff --git
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/ClientFailoverSocket.cs
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/ClientFailoverSocket.cs
index 578a14e..9cc3cac 100644
---
a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/ClientFailoverSocket.cs
+++
b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/ClientFailoverSocket.cs
@@ -203,7 +203,7 @@ namespace Apache.Ignite.Core.Impl.Client
private ClientSocket GetAffinitySocket<TKey>(int cacheId, TKey key)
{
- if (!_config.EnableAffinityAwareness)
+ if (!_config.EnablePartitionAwareness)
{
return null;
}
@@ -322,10 +322,10 @@ namespace Apache.Ignite.Core.Impl.Client
}
if (_socket != null &&
- _config.EnableAffinityAwareness &&
+ _config.EnablePartitionAwareness &&
_socket.ServerVersion <
ClientOp.CachePartitions.GetMinVersion())
{
- _config.EnableAffinityAwareness = false;
+ _config.EnablePartitionAwareness = false;
_logger.Warn("Partition awareness has been disabled: server
protocol version {0} " +
"is lower than required {1}",
@@ -342,7 +342,7 @@ namespace Apache.Ignite.Core.Impl.Client
{
_affinityTopologyVersion = affinityTopologyVersion;
- if (_config.EnableAffinityAwareness)
+ if (_config.EnablePartitionAwareness)
{
InitSocketMap();
}
@@ -425,7 +425,7 @@ namespace Apache.Ignite.Core.Impl.Client
for (int i = 0; i < size; i++)
{
- var grp = new ClientCacheAffinityAwarenessGroup(s);
+ var grp = new ClientCachePartitionAwarenessGroup(s);
if (grp.PartitionMap == null)
{
