You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by pt...@apache.org on 2019/12/31 09:28:42 UTC
[ignite] branch ignite-12458-2.8 updated: IGNITE-12458 Rename
Affinity Awareness to Partition Awareness
This is an automated email from the ASF dual-hosted git repository.
ptupitsyn pushed a commit to branch ignite-12458-2.8
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/ignite-12458-2.8 by this push:
new 9289caa IGNITE-12458 Rename Affinity Awareness to Partition Awareness
9289caa is described below
commit 9289caae3fcc62c83b2687be22ced19e9a62fa12
Author: Pavel Tupitsyn <pt...@apache.org>
AuthorDate: Tue Dec 31 11:54:12 2019 +0300
IGNITE-12458 Rename Affinity Awareness to Partition Awareness
(cherry picked from commit 5ce68bc4bbb042e61c7d520a8b2d01a723f69632)
# Conflicts:
# modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcThinDriverPartitionAwarenessTestSuite.java
# modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
# modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
# modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPartitionAwarenessReconnectionAndFailoverSelfTest.java
# modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPartitionAwarenessSelfTest.java
# modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/AffinityCache.java
# modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionProperties.java
# modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionPropertiesImpl.java
# modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinConnection.java
# modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinPartitionAwarenessMappingGroup.java
---
...JdbcThinDriverPartitionAwarenessTestSuite.java} | 14 +-
.../ignite/jdbc/thin/JdbcThinAbstractSelfTest.java | 4 +-
.../JdbcThinConnectionMultipleAddressesTest.java | 2 +-
.../jdbc/thin/JdbcThinConnectionSelfTest.java | 243 +++++++++++----------
.../jdbc/thin/JdbcThinDataSourceSelfTest.java | 2 +-
...ava => JdbcThinPartitionAwarenessSelfTest.java} | 63 +++---
...hinPartitionAwarenessTransactionsSelfTest.java} | 6 +-
.../jdbc/thin/JdbcThinStatementSelfTest.java | 8 +-
.../ignite/configuration/ClientConfiguration.java | 16 +-
.../apache/ignite/internal/client/GridClient.java | 2 +-
.../ignite/internal/client/GridClientCompute.java | 2 +-
.../ignite/internal/client/GridClientData.java | 2 +-
.../client/thin/ClientCacheAffinityContext.java | 2 +-
.../client/thin/ClientCacheAffinityMapping.java | 10 +-
.../internal/client/thin/ProtocolVersion.java | 2 +-
.../internal/client/thin/ReliableChannel.java | 16 +-
.../internal/jdbc/thin/ConnectionProperties.java | 8 +-
.../jdbc/thin/ConnectionPropertiesImpl.java | 18 +-
.../internal/jdbc/thin/JdbcThinConnection.java | 34 +--
...=> JdbcThinPartitionAwarenessMappingGroup.java} | 16 +-
.../ignite/internal/jdbc/thin/JdbcThinTcpIo.java | 4 +-
.../odbc/jdbc/JdbcCachePartitionsResult.java | 14 +-
.../odbc/jdbc/JdbcConnectionContext.java | 2 +-
.../processors/odbc/jdbc/JdbcRequestHandler.java | 16 +-
.../platform/client/ClientConnectionContext.java | 2 +-
...ava => ClientCachePartitionAwarenessGroup.java} | 6 +-
.../client/cache/ClientCachePartitionsRequest.java | 30 +--
.../cache/ClientCachePartitionsResponse.java | 6 +-
.../sql/optimizer/affinity/PartitionResult.java | 12 +-
.../affinity/PartitionTableAffinityDescriptor.java | 4 +-
... ThinClientAbstractPartitionAwarenessTest.java} | 6 +-
...lientPartitionAwarenessStableTopologyTest.java} | 16 +-
...entPartitionAwarenessUnstableTopologyTest.java} | 48 ++--
.../org/apache/ignite/client/ClientTestSuite.java | 8 +-
.../cpp/thin-client-test/src/cache_client_test.cpp | 18 +-
.../ignite/thin/ignite_client_configuration.h | 24 +-
.../cpp/thin-client/project/vs/thin-client.vcxproj | 2 +-
.../project/vs/thin-client.vcxproj.filters | 6 +-
.../src/impl/affinity/affinity_manager.cpp | 4 +-
.../src/impl/affinity/affinity_manager.h | 6 +-
...areness_group.h => partition_awareness_group.h} | 12 +-
.../src/impl/cache/cache_client_impl.cpp | 2 +-
.../cpp/thin-client/src/impl/data_channel.h | 2 +-
.../cpp/thin-client/src/impl/data_router.cpp | 2 +-
.../cpp/thin-client/src/impl/data_router.h | 10 +-
.../platforms/cpp/thin-client/src/impl/message.cpp | 2 +-
.../platforms/cpp/thin-client/src/impl/message.h | 16 +-
.../Apache.Ignite.Core.Tests.DotNetCore.csproj | 4 +-
.../Apache.Ignite.Core.Tests.csproj | 2 +-
...yAwarenessTest.cs => PartitionAwarenessTest.cs} | 34 +--
.../Client/ClientProtocolCompatibilityTest.cs | 6 +-
.../Client/ClientReconnectCompatibilityTest.cs | 8 +-
.../Client/ClientServerCompatibilityTest.cs | 4 +-
.../Client/IgniteClientConfigurationTest.cs | 4 +-
.../Config/Client/IgniteClientConfiguration.xml | 2 +-
.../Apache.Ignite.Core/Apache.Ignite.Core.csproj | 2 +-
.../Client/IgniteClientConfiguration.cs | 6 +-
.../IgniteClientConfigurationSection.xsd | 2 +-
.../Impl/Client/Cache/CacheClient.cs | 20 +-
...up.cs => ClientCachePartitionAwarenessGroup.cs} | 4 +-
.../Impl/Client/ClientFailoverSocket.cs | 14 +-
61 files changed, 434 insertions(+), 428 deletions(-)
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcThinDriverAffinityAwarenessTestSuite.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcThinDriverPartitionAwarenessTestSuite.java
similarity index 82%
rename from modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcThinDriverAffinityAwarenessTestSuite.java
rename to modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcThinDriverPartitionAwarenessTestSuite.java
index 888d65e..58eb11e 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcThinDriverAffinityAwarenessTestSuite.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcThinDriverPartitionAwarenessTestSuite.java
@@ -29,22 +29,22 @@ import org.junit.runner.RunWith;
import org.junit.runners.Suite;
/**
- * JDBC Thin driver test suite to run in affinity awareness mode.
+ * JDBC Thin driver test suite to run in partition awareness mode.
*/
@RunWith(Suite.class)
@Suite.SuiteClasses({
JdbcThinConnectionSelfTest.class,
JdbcThinTcpIoTest.class,
JdbcThinStatementSelfTest.class,
- JdbcThinAffinityAwarenessSelfTest.class,
- JdbcThinAffinityAwarenessTransactionsSelfTest.class,
+ JdbcThinPartitionAwarenessSelfTest.class,
+ JdbcThinPartitionAwarenessTransactionsSelfTest.class,
})
-public class IgniteJdbcThinDriverAffinityAwarenessTestSuite {
+public class IgniteJdbcThinDriverPartitionAwarenessTestSuite {
/**
- * Setup affinity awareness mode.
+ * Setup partition awareness mode.
*/
@BeforeClass
- public static void setupAffinityAwareness() {
- GridTestUtils.setFieldValue(JdbcThinAbstractSelfTest.class, "affinityAwareness", true);
+ public static void setupPartitionAwareness() {
+ GridTestUtils.setFieldValue(JdbcThinAbstractSelfTest.class, "partitionAwareness", true);
}
}
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractSelfTest.java
index fe4b9dd..b3a4ef7 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAbstractSelfTest.java
@@ -42,8 +42,8 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
@SuppressWarnings("ThrowableNotThrown")
public class JdbcThinAbstractSelfTest extends GridCommonAbstractTest {
- /** Signals that tests should start in affinity awareness mode. */
- public static boolean affinityAwareness;
+ /** Signals that tests should start in partition awareness mode. */
+ public static boolean partitionAwareness;
/**
* @param r Runnable to check support.
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionMultipleAddressesTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionMultipleAddressesTest.java
index 2019cc1..35ee81a 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionMultipleAddressesTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionMultipleAddressesTest.java
@@ -537,7 +537,7 @@ public class JdbcThinConnectionMultipleAddressesTest extends JdbcThinAbstractSel
stopAllGrids();
else {
- if (affinityAwareness) {
+ if (partitionAwareness) {
for (int i = 0; i < NODES_CNT - 1; i++)
stopGrid(i);
}
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
index 243f5c4..c634b03 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinConnectionSelfTest.java
@@ -89,18 +89,18 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
private static final String LOCALHOST = "127.0.0.1";
/** URL. */
- private String url = affinityAwareness ?
+ private String url = partitionAwareness ?
"jdbc:ignite:thin://127.0.0.1:10800..10802" :
"jdbc:ignite:thin://127.0.0.1";
- /** URL with affinity awareness flag. */
- private String urlWithAffinityAwarenessFlag = url + "?affinityAwareness=" + affinityAwareness;
+ /** URL with partition awareness property. */
+ private String urlWithPartitionAwarenessProp = url + "?partitionAwareness=" + partitionAwareness;
- /** URL with affinity awareness flag and semicolon as delimeter. */
- private String urlWithAffinityAwarenessFlagSemicolon = url + ";affinityAwareness=" + affinityAwareness;
+ /** URL with partition awareness property and semicolon as delimiter. */
+ private String urlWithPartitionAwarenessPropSemicolon = url + ";partitionAwareness=" + partitionAwareness;
/** Nodes count. */
- private int nodesCnt = affinityAwareness ? 4 : 2;
+ private int nodesCnt = partitionAwareness ? 4 : 2;
/** {@inheritDoc} */
@SuppressWarnings("deprecation")
@@ -175,13 +175,13 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
public void testSocketBuffers() throws Exception {
final int dfltDufSize = 64 * 1024;
- assertInvalid(urlWithAffinityAwarenessFlag + "&socketSendBuffer=-1",
+ assertInvalid(urlWithPartitionAwarenessProp + "&socketSendBuffer=-1",
"Property cannot be lower than 0 [name=socketSendBuffer, value=-1]");
- assertInvalid(urlWithAffinityAwarenessFlag + "&socketReceiveBuffer=-1",
+ assertInvalid(urlWithPartitionAwarenessProp + "&socketReceiveBuffer=-1",
"Property cannot be lower than 0 [name=socketReceiveBuffer, value=-1]");
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
for (JdbcThinTcpIo io: ios(conn)) {
assertEquals(dfltDufSize, io.connectionProperties().getSocketSendBuffer());
assertEquals(dfltDufSize, io.connectionProperties().getSocketReceiveBuffer());
@@ -189,21 +189,21 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
}
// Note that SO_* options are hints, so we check that value is equals to either what we set or to default.
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag + "&socketSendBuffer=1024")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp + "&socketSendBuffer=1024")) {
for (JdbcThinTcpIo io: ios(conn)) {
assertEquals(1024, io.connectionProperties().getSocketSendBuffer());
assertEquals(dfltDufSize, io.connectionProperties().getSocketReceiveBuffer());
}
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag + "&socketReceiveBuffer=1024")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp + "&socketReceiveBuffer=1024")) {
for (JdbcThinTcpIo io: ios(conn)) {
assertEquals(dfltDufSize, io.connectionProperties().getSocketSendBuffer());
assertEquals(1024, io.connectionProperties().getSocketReceiveBuffer());
}
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag + "&" +
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp + "&" +
"socketSendBuffer=1024&socketReceiveBuffer=2048")) {
for (JdbcThinTcpIo io: ios(conn)) {
assertEquals(1024, io.connectionProperties().getSocketSendBuffer());
@@ -221,28 +221,28 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
public void testSocketBuffersSemicolon() throws Exception {
final int dfltDufSize = 64 * 1024;
- assertInvalid(urlWithAffinityAwarenessFlagSemicolon + ";socketSendBuffer=-1",
+ assertInvalid(urlWithPartitionAwarenessPropSemicolon + ";socketSendBuffer=-1",
"Property cannot be lower than 0 [name=socketSendBuffer, value=-1]");
- assertInvalid(urlWithAffinityAwarenessFlagSemicolon + ";socketReceiveBuffer=-1",
+ assertInvalid(urlWithPartitionAwarenessPropSemicolon + ";socketReceiveBuffer=-1",
"Property cannot be lower than 0 [name=socketReceiveBuffer, value=-1]");
// Note that SO_* options are hints, so we check that value is equals to either what we set or to default.
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlagSemicolon + ";socketSendBuffer=1024")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon + ";socketSendBuffer=1024")) {
for (JdbcThinTcpIo io: ios(conn)) {
assertEquals(1024, io.connectionProperties().getSocketSendBuffer());
assertEquals(dfltDufSize, io.connectionProperties().getSocketReceiveBuffer());
}
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlagSemicolon + ";socketReceiveBuffer=1024")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon + ";socketReceiveBuffer=1024")) {
for (JdbcThinTcpIo io: ios(conn)) {
assertEquals(dfltDufSize, io.connectionProperties().getSocketSendBuffer());
assertEquals(1024, io.connectionProperties().getSocketReceiveBuffer());
}
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlagSemicolon + ";" +
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon + ";" +
"socketSendBuffer=1024;socketReceiveBuffer=2048")) {
for (JdbcThinTcpIo io: ios(conn)) {
assertEquals(1024, io.connectionProperties().getSocketSendBuffer());
@@ -258,21 +258,21 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testUpdateBatchSize() throws Exception {
- assertInvalid(urlWithAffinityAwarenessFlagSemicolon + ";updateBatchSize=-1",
+ assertInvalid(urlWithPartitionAwarenessPropSemicolon + ";updateBatchSize=-1",
"Property cannot be lower than 1 [name=updateBatchSize, value=-1]");
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlagSemicolon)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon)) {
for (JdbcThinTcpIo io: ios(conn))
assertNull(io.connectionProperties().getUpdateBatchSize());
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlagSemicolon
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon
+ ";updateBatchSize=1024")) {
for (JdbcThinTcpIo io: ios(conn))
assertEquals(1024, (int)io.connectionProperties().getUpdateBatchSize());
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag +
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp +
"&updateBatchSize=1024")) {
for (JdbcThinTcpIo io: ios(conn))
assertEquals(1024, (int)io.connectionProperties().getUpdateBatchSize());
@@ -286,44 +286,45 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testSqlHints() throws Exception {
- try (Connection conn = DriverManager.getConnection("jdbc:ignite:thin://127.0.0.1")) {
- assertHints(conn, false, false, false, false, false, false, affinityAwareness);
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
+ assertHints(conn, false, false, false, false, false,
+ false, partitionAwareness);
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag + "&distributedJoins=true")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp + "&distributedJoins=true")) {
assertHints(conn, true, false, false, false, false,
- false, affinityAwareness);
+ false, partitionAwareness);
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag + "&enforceJoinOrder=true")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp + "&enforceJoinOrder=true")) {
assertHints(conn, false, true, false, false, false,
- false, affinityAwareness);
+ false, partitionAwareness);
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag + "&collocated=true")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp + "&collocated=true")) {
assertHints(conn, false, false, true, false, false,
- false, affinityAwareness);
+ false, partitionAwareness);
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag + "&replicatedOnly=true")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp + "&replicatedOnly=true")) {
assertHints(conn, false, false, false, true, false,
- false, affinityAwareness);
+ false, partitionAwareness);
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag + "&lazy=true")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp + "&lazy=true")) {
assertHints(conn, false, false, false, false, true,
- false, affinityAwareness);
+ false, partitionAwareness);
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag + "&skipReducerOnUpdate=true")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp + "&skipReducerOnUpdate=true")) {
assertHints(conn, false, false, false, false, false,
- true, affinityAwareness);
+ true, partitionAwareness);
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag + "&distributedJoins=true&" +
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp + "&distributedJoins=true&" +
"enforceJoinOrder=true&collocated=true&replicatedOnly=true&lazy=true&skipReducerOnUpdate=true")) {
assertHints(conn, true, true, true, true, true,
- true, affinityAwareness);
+ true, partitionAwareness);
}
}
@@ -334,40 +335,40 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testSqlHintsSemicolon() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlagSemicolon + ";distributedJoins=true")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon + ";distributedJoins=true")) {
assertHints(conn, true, false, false, false, false,
- false, affinityAwareness);
+ false, partitionAwareness);
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlagSemicolon + ";enforceJoinOrder=true")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon + ";enforceJoinOrder=true")) {
assertHints(conn, false, true, false, false, false,
- false, affinityAwareness);
+ false, partitionAwareness);
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlagSemicolon + ";collocated=true")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon + ";collocated=true")) {
assertHints(conn, false, false, true, false, false,
- false, affinityAwareness);
+ false, partitionAwareness);
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlagSemicolon + ";replicatedOnly=true")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon + ";replicatedOnly=true")) {
assertHints(conn, false, false, false, true, false,
- false, affinityAwareness);
+ false, partitionAwareness);
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlagSemicolon + ";lazy=true")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon + ";lazy=true")) {
assertHints(conn, false, false, false, false, true,
- false, affinityAwareness);
+ false, partitionAwareness);
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlagSemicolon + ";skipReducerOnUpdate=true")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon + ";skipReducerOnUpdate=true")) {
assertHints(conn, false, false, false, false, false,
- true, affinityAwareness);
+ true, partitionAwareness);
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlagSemicolon + ";distributedJoins=true;" +
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon + ";distributedJoins=true;" +
"enforceJoinOrder=true;collocated=true;replicatedOnly=true;lazy=true;skipReducerOnUpdate=true")) {
assertHints(conn, true, true, true, true, true,
- true, affinityAwareness);
+ true, partitionAwareness);
}
}
@@ -384,7 +385,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
* @throws Exception If failed.
*/
private void assertHints(Connection conn, boolean distributedJoins, boolean enforceJoinOrder, boolean collocated,
- boolean replicatedOnly, boolean lazy, boolean skipReducerOnUpdate, boolean affinityAwarenessEnabled)throws Exception {
+ boolean replicatedOnly, boolean lazy, boolean skipReducerOnUpdate, boolean partitionAwarenessEnabled)throws Exception {
for (JdbcThinTcpIo io: ios(conn)) {
assertEquals(distributedJoins, io.connectionProperties().isDistributedJoins());
assertEquals(enforceJoinOrder, io.connectionProperties().isEnforceJoinOrder());
@@ -392,7 +393,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
assertEquals(replicatedOnly, io.connectionProperties().isReplicatedOnly());
assertEquals(lazy, io.connectionProperties().isLazy());
assertEquals(skipReducerOnUpdate, io.connectionProperties().isSkipReducerOnUpdate());
- assertEquals(affinityAwarenessEnabled, io.connectionProperties().isAffinityAwareness());
+ assertEquals(partitionAwarenessEnabled, io.connectionProperties().isPartitionAwareness());
}
}
@@ -403,39 +404,39 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testTcpNoDelay() throws Exception {
- assertInvalid(urlWithAffinityAwarenessFlag + "&tcpNoDelay=0",
+ assertInvalid(urlWithPartitionAwarenessProp + "&tcpNoDelay=0",
"Invalid property value. [name=tcpNoDelay, val=0, choices=[true, false]]");
- assertInvalid(urlWithAffinityAwarenessFlag + "&tcpNoDelay=1",
+ assertInvalid(urlWithPartitionAwarenessProp + "&tcpNoDelay=1",
"Invalid property value. [name=tcpNoDelay, val=1, choices=[true, false]]");
- assertInvalid(urlWithAffinityAwarenessFlag + "&tcpNoDelay=false1",
+ assertInvalid(urlWithPartitionAwarenessProp + "&tcpNoDelay=false1",
"Invalid property value. [name=tcpNoDelay, val=false1, choices=[true, false]]");
- assertInvalid(urlWithAffinityAwarenessFlag + "&tcpNoDelay=true1",
+ assertInvalid(urlWithPartitionAwarenessProp + "&tcpNoDelay=true1",
"Invalid property value. [name=tcpNoDelay, val=true1, choices=[true, false]]");
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
for (JdbcThinTcpIo io: ios(conn))
assertTrue(io.connectionProperties().isTcpNoDelay());
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag + "&tcpNoDelay=true")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp + "&tcpNoDelay=true")) {
for (JdbcThinTcpIo io: ios(conn))
assertTrue(io.connectionProperties().isTcpNoDelay());
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag + "&tcpNoDelay=True")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp + "&tcpNoDelay=True")) {
for (JdbcThinTcpIo io: ios(conn))
assertTrue(io.connectionProperties().isTcpNoDelay());
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag + "&tcpNoDelay=false")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp + "&tcpNoDelay=false")) {
for (JdbcThinTcpIo io: ios(conn))
assertFalse(io.connectionProperties().isTcpNoDelay());
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag + "&tcpNoDelay=False")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp + "&tcpNoDelay=False")) {
for (JdbcThinTcpIo io: ios(conn))
assertFalse(io.connectionProperties().isTcpNoDelay());
}
@@ -448,34 +449,34 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testTcpNoDelaySemicolon() throws Exception {
- assertInvalid(urlWithAffinityAwarenessFlagSemicolon + ";tcpNoDelay=0",
+ assertInvalid(urlWithPartitionAwarenessPropSemicolon + ";tcpNoDelay=0",
"Invalid property value. [name=tcpNoDelay, val=0, choices=[true, false]]");
- assertInvalid(urlWithAffinityAwarenessFlagSemicolon + ";tcpNoDelay=1",
+ assertInvalid(urlWithPartitionAwarenessPropSemicolon + ";tcpNoDelay=1",
"Invalid property value. [name=tcpNoDelay, val=1, choices=[true, false]]");
- assertInvalid(urlWithAffinityAwarenessFlagSemicolon + ";tcpNoDelay=false1",
+ assertInvalid(urlWithPartitionAwarenessPropSemicolon + ";tcpNoDelay=false1",
"Invalid property value. [name=tcpNoDelay, val=false1, choices=[true, false]]");
- assertInvalid(urlWithAffinityAwarenessFlagSemicolon + ";tcpNoDelay=true1",
+ assertInvalid(urlWithPartitionAwarenessPropSemicolon + ";tcpNoDelay=true1",
"Invalid property value. [name=tcpNoDelay, val=true1, choices=[true, false]]");
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlagSemicolon + ";tcpNoDelay=true")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon + ";tcpNoDelay=true")) {
for (JdbcThinTcpIo io: ios(conn))
assertTrue(io.connectionProperties().isTcpNoDelay());
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlagSemicolon + ";tcpNoDelay=True")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon + ";tcpNoDelay=True")) {
for (JdbcThinTcpIo io: ios(conn))
assertTrue(io.connectionProperties().isTcpNoDelay());
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlagSemicolon + ";tcpNoDelay=false")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon + ";tcpNoDelay=false")) {
for (JdbcThinTcpIo io: ios(conn))
assertFalse(io.connectionProperties().isTcpNoDelay());
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlagSemicolon + ";tcpNoDelay=False")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon + ";tcpNoDelay=False")) {
for (JdbcThinTcpIo io: ios(conn))
assertFalse(io.connectionProperties().isTcpNoDelay());
}
@@ -488,7 +489,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testAutoCloseServerCursorProperty() throws Exception {
- String url = urlWithAffinityAwarenessFlag + "&autoCloseServerCursor";
+ String url = urlWithPartitionAwarenessProp + "&autoCloseServerCursor";
String err = "Invalid property value. [name=autoCloseServerCursor";
@@ -497,7 +498,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
assertInvalid(url + "=false1", err);
assertInvalid(url + "=true1", err);
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
for (JdbcThinTcpIo io: ios(conn))
assertFalse(io.connectionProperties().isAutoCloseServerCursor());
}
@@ -530,7 +531,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testAutoCloseServerCursorPropertySemicolon() throws Exception {
- String url = urlWithAffinityAwarenessFlagSemicolon + ";autoCloseServerCursor";
+ String url = urlWithPartitionAwarenessPropSemicolon + ";autoCloseServerCursor";
String err = "Invalid property value. [name=autoCloseServerCursor";
@@ -590,15 +591,15 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testSchemaSemicolon() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlagSemicolon + ";schema=public")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon + ";schema=public")) {
assertEquals("Invalid schema", "PUBLIC", conn.getSchema());
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlagSemicolon + ";schema=\"" + DEFAULT_CACHE_NAME + '"')) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon + ";schema=\"" + DEFAULT_CACHE_NAME + '"')) {
assertEquals("Invalid schema", DEFAULT_CACHE_NAME, conn.getSchema());
}
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlagSemicolon + ";schema=_not_exist_schema_")) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessPropSemicolon + ";schema=_not_exist_schema_")) {
assertEquals("Invalid schema", "_NOT_EXIST_SCHEMA_", conn.getSchema());
}
}
@@ -613,7 +614,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
private static Collection<JdbcThinTcpIo> ios(Connection conn) throws Exception {
JdbcThinConnection conn0 = conn.unwrap(JdbcThinConnection.class);
- Collection<JdbcThinTcpIo> ios = affinityAwareness ? ((Map<UUID, JdbcThinTcpIo>)
+ Collection<JdbcThinTcpIo> ios = partitionAwareness ? ((Map<UUID, JdbcThinTcpIo>)
getFieldValue(conn0, JdbcThinConnection.class, "ios")).values() :
Collections.singleton(getFieldValue(conn0, JdbcThinConnection.class, "singleIo"));
@@ -647,7 +648,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
public void testClose() throws Exception {
final Connection conn;
- try (Connection conn0 = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn0 = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
conn = conn0;
assert conn != null;
@@ -672,7 +673,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testCreateStatement() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
try (Statement stmt = conn.createStatement()) {
assertNotNull(stmt);
@@ -695,7 +696,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testCreateStatement2() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
int [] rsTypes = new int[]
{TYPE_FORWARD_ONLY, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.TYPE_SCROLL_SENSITIVE};
@@ -749,7 +750,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testCreateStatement3() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
int [] rsTypes = new int[]
{TYPE_FORWARD_ONLY, ResultSet.TYPE_SCROLL_INSENSITIVE, ResultSet.TYPE_SCROLL_SENSITIVE};
@@ -809,7 +810,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testPrepareStatement() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
// null query text
assertThrows(log,
new Callable<Object>() {
@@ -843,7 +844,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testPrepareStatement3() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
final String sqlText = "select * from test where param = ?";
int [] rsTypes = new int[]
@@ -904,7 +905,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testPrepareStatement4() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
final String sqlText = "select * from test where param = ?";
int [] rsTypes = new int[]
@@ -970,7 +971,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testPrepareStatementAutoGeneratedKeysUnsupported() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
final String sqlText = "insert into test (val) values (?)";
assertThrows(log,
@@ -1020,7 +1021,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testPrepareCallUnsupported() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
final String sqlText = "exec test()";
assertThrows(log,
@@ -1061,7 +1062,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testNativeSql() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
// null query text
assertThrows(log,
new Callable<Object>() {
@@ -1093,7 +1094,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testGetSetAutoCommit() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
boolean ac0 = conn.getAutoCommit();
conn.setAutoCommit(!ac0);
@@ -1118,7 +1119,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testCommit() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
// Should not be called in auto-commit mode
assertThrows(log,
new Callable<Object>() {
@@ -1163,7 +1164,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testRollback() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
// Should not be called in auto-commit mode
assertThrows(log,
new Callable<Object>() {
@@ -1193,7 +1194,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testBeginFailsWhenMvccIsDisabled() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
conn.createStatement().execute("BEGIN");
fail("Exception is expected");
@@ -1208,7 +1209,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testCommitIgnoredWhenMvccIsDisabled() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
conn.setAutoCommit(false);
conn.createStatement().execute("COMMIT");
@@ -1222,7 +1223,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testRollbackIgnoredWhenMvccIsDisabled() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
conn.setAutoCommit(false);
conn.createStatement().execute("ROLLBACK");
@@ -1237,7 +1238,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testGetMetaData() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
DatabaseMetaData meta = conn.getMetaData();
assertNotNull(meta);
@@ -1258,7 +1259,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testGetSetReadOnly() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
conn.close();
// Exception when called on closed connection
@@ -1282,7 +1283,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testGetSetCatalog() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
assert !conn.getMetaData().supportsCatalogsInDataManipulation();
assertNull(conn.getCatalog());
@@ -1314,7 +1315,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testGetSetTransactionIsolation() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
// Invalid parameter value
assertThrows(log,
new Callable<Object>() {
@@ -1365,7 +1366,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testClearGetWarnings() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
SQLWarning warn = conn.getWarnings();
assertNull(warn);
@@ -1399,7 +1400,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testGetSetTypeMap() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
assertThrows(log,
new Callable<Object>() {
@Override public Object call() throws Exception {
@@ -1455,7 +1456,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testGetSetHoldability() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
// default value
assertEquals(conn.getMetaData().getResultSetHoldability(), conn.getHoldability());
@@ -1509,7 +1510,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testSetSavepoint() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
assert !conn.getMetaData().supportsSavepoints();
// Disallowed in auto-commit mode
@@ -1540,7 +1541,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testSetSavepointName() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
assert !conn.getMetaData().supportsSavepoints();
// Invalid arg
@@ -1586,7 +1587,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testRollbackSavePoint() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
assert !conn.getMetaData().supportsSavepoints();
// Invalid arg
@@ -1632,7 +1633,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testReleaseSavepoint() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
assert !conn.getMetaData().supportsSavepoints();
// Invalid arg
@@ -1671,7 +1672,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testCreateClob() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
// Unsupported
assertThrows(log,
new Callable<Object>() {
@@ -1702,7 +1703,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testCreateBlob() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
// Unsupported
assertThrows(log,
new Callable<Object>() {
@@ -1733,7 +1734,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testCreateNClob() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
// Unsupported
assertThrows(log,
new Callable<Object>() {
@@ -1764,7 +1765,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testCreateSQLXML() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
// Unsupported
assertThrows(log,
new Callable<Object>() {
@@ -1797,7 +1798,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
public void testGetSetClientInfoPair() throws Exception {
// fail("https://issues.apache.org/jira/browse/IGNITE-5425");
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
final String name = "ApplicationName";
final String val = "SelfTest";
@@ -1831,7 +1832,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testGetSetClientInfoProperties() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
final String name = "ApplicationName";
final String val = "SelfTest";
@@ -1870,7 +1871,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testCreateArrayOf() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
final String typeName = "varchar";
final String[] elements = new String[] {"apple", "pear"};
@@ -1911,7 +1912,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testCreateStruct() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
// Invalid typename
assertThrows(log,
new Callable<Object>() {
@@ -1948,7 +1949,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testGetSetSchema() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
assertEquals("PUBLIC", conn.getSchema());
final String schema = "test";
@@ -1982,7 +1983,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testAbort() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
//Invalid executor
assertThrows(log,
new Callable<Object>() {
@@ -2009,7 +2010,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
*/
@Test
public void testGetSetNetworkTimeout() throws Exception {
- try (Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
// default
assertEquals(0, conn.getNetworkTimeout());
@@ -2057,7 +2058,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
public void testInvalidNestedTxMode() {
assertThrows(null, new Callable<Object>() {
@Override public Object call() throws Exception {
- DriverManager.getConnection(urlWithAffinityAwarenessFlag + "&nestedTransactionsMode=invalid");
+ DriverManager.getConnection(urlWithPartitionAwarenessProp + "&nestedTransactionsMode=invalid");
return null;
}
@@ -2077,7 +2078,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
connProps.nestedTxMode("invalid");
- connProps.setAffinityAwareness(affinityAwareness);
+ connProps.setPartitionAwareness(partitionAwareness);
assertThrows(null, new Callable<Object>() {
@SuppressWarnings("ResultOfObjectAllocationIgnored")
@@ -2095,7 +2096,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
public void testSslClientAndPlainServer() {
Throwable e = assertThrows(log, new Callable<Object>() {
@Override public Object call() throws Exception {
- DriverManager.getConnection(urlWithAffinityAwarenessFlag + "&sslMode=require" +
+ DriverManager.getConnection(urlWithPartitionAwarenessProp + "&sslMode=require" +
"&sslClientCertificateKeyStoreUrl=" + CLI_KEY_STORE_PATH +
"&sslClientCertificateKeyStorePassword=123456" +
"&sslTrustCertificateKeyStoreUrl=" + SRV_KEY_STORE_PATH +
@@ -2103,9 +2104,9 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
return null;
}
- }, SQLException.class, affinityAwareness ? "Failed to connect to server" : "Failed to SSL connect to server");
+ }, SQLException.class, partitionAwareness ? "Failed to connect to server" : "Failed to SSL connect to server");
- if (affinityAwareness) {
+ if (partitionAwareness) {
for (Throwable t: e.getSuppressed()) {
assertEquals(SQLException.class, t.getClass());
assertTrue(t.getMessage().contains("Failed to SSL connect to server"));
@@ -2126,7 +2127,7 @@ public class JdbcThinConnectionSelfTest extends JdbcThinAbstractSelfTest {
final AtomicInteger exCnt = new AtomicInteger(0);
- try (final Connection conn = DriverManager.getConnection(urlWithAffinityAwarenessFlag)) {
+ try (final Connection conn = DriverManager.getConnection(urlWithPartitionAwarenessProp)) {
final IgniteInternalFuture f = runMultiThreadedAsync(new Runnable() {
@Override public void run() {
try {
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinDataSourceSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinDataSourceSelfTest.java
index b2de045..51545e5 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinDataSourceSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinDataSourceSelfTest.java
@@ -283,7 +283,7 @@ public class JdbcThinDataSourceSelfTest extends JdbcThinAbstractSelfTest {
private static Collection<JdbcThinTcpIo> ios(Connection conn) throws Exception {
JdbcThinConnection conn0 = conn.unwrap(JdbcThinConnection.class);
- Collection<JdbcThinTcpIo> ios = affinityAwareness ? ((Map<UUID, JdbcThinTcpIo>)
+ Collection<JdbcThinTcpIo> ios = partitionAwareness ? ((Map<UUID, JdbcThinTcpIo>)
GridTestUtils.getFieldValue(conn0, JdbcThinConnection.class, "ios")).values() :
Collections.singleton(GridTestUtils.getFieldValue(conn0, JdbcThinConnection.class, "singleIo"));
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAffinityAwarenessSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPartitionAwarenessSelfTest.java
similarity index 92%
rename from modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAffinityAwarenessSelfTest.java
rename to modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPartitionAwarenessSelfTest.java
index 22e5d0d..f87f020 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAffinityAwarenessSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPartitionAwarenessSelfTest.java
@@ -56,12 +56,12 @@ import org.junit.Test;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
- * Jdbc thin affinity awareness test.
+ * Jdbc thin partition awareness test.
*/
@SuppressWarnings({"ThrowableNotThrown"})
-public class JdbcThinAffinityAwarenessSelfTest extends JdbcThinAbstractSelfTest {
+public class JdbcThinPartitionAwarenessSelfTest extends JdbcThinAbstractSelfTest {
/** URL. */
- private static final String URL = "jdbc:ignite:thin://127.0.0.1:10800..10802?affinityAwareness=true";
+ private static final String URL = "jdbc:ignite:thin://127.0.0.1:10800..10802?partitionAwareness=true";
/** Nodes count. */
private static final int NODES_CNT = 3;
@@ -297,7 +297,7 @@ public class JdbcThinAffinityAwarenessSelfTest extends JdbcThinAbstractSelfTest
/**
- * Check that in case of non-rendezvous affinity function, client side affinity awareness is skipped.
+ * Check that in case of non-rendezvous affinity function, client side partition awareness is skipped.
*
* @throws Exception If failed.
*/
@@ -317,7 +317,7 @@ public class JdbcThinAffinityAwarenessSelfTest extends JdbcThinAbstractSelfTest
}
/**
- * Check that in case of custom filters, client side affinity awareness is skipped.
+ * Check that in case of custom filters, client side partition awareness is skipped.
*
* @throws Exception If failed.
*/
@@ -337,7 +337,7 @@ public class JdbcThinAffinityAwarenessSelfTest extends JdbcThinAbstractSelfTest
}
/**
- * Check that affinity awareness functionality works fine for custom partitions count.
+ * Check that partition awareness functionality works fine for custom partitions count.
*
* @throws Exception If failed.
*/
@@ -411,7 +411,7 @@ public class JdbcThinAffinityAwarenessSelfTest extends JdbcThinAbstractSelfTest
* @throws Exception If failed.
*/
@Test
- public void testChangeTopologyDetectionWithinAffinityAwarenessUnrelatedQuery() throws Exception {
+ public void testChangeTopologyDetectionWithinPartitionAwarenessUnrelatedQuery() throws Exception {
final String sqlQry = "select * from Person where _key = 1";
ResultSet rs = stmt.executeQuery(sqlQry);
@@ -428,53 +428,54 @@ public class JdbcThinAffinityAwarenessSelfTest extends JdbcThinAbstractSelfTest
}
/**
- * Check that client side affinity awareness optimizations are skipped if affinityAwareness is switched off.
+ * Check that client side partition awareness optimizations are skipped if partitionAwareness is switched off.
*
* @throws Exception If failed.
*/
@Test
- public void testAffinityAwarenessIsSkippedIfItIsSwitchedOff() throws Exception {
- Connection conn = DriverManager.getConnection(
- "jdbc:ignite:thin://127.0.0.1:10800..10802?affinityAwareness=false");
+ public void testPartitionAwarenessIsSkippedIfItIsSwitchedOff() throws Exception {
+ try (Connection conn = DriverManager.getConnection(
+ "jdbc:ignite:thin://127.0.0.1:10800..10802?partitionAwareness=false");
+ Statement stmt = conn.createStatement()) {
- Statement stmt = conn.createStatement();
+ final String cacheName = "yac";
- final String cacheName = "yac";
+ CacheConfiguration<Object, Object> cache = prepareCacheConfig(cacheName);
- CacheConfiguration<Object, Object> cache = prepareCacheConfig(cacheName);
+ ignite(0).createCache(cache);
- ignite(0).createCache(cache);
+ stmt.executeQuery("select * from \"" + cacheName + "\".Person where _key = 1");
- stmt.executeQuery("select * from \"" + cacheName + "\".Person where _key = 1");
+ AffinityCache affinityCache = GridTestUtils.getFieldValue(conn, "affinityCache");
- AffinityCache affinityCache = GridTestUtils.getFieldValue(conn, "affinityCache");
-
- assertNull("Affinity cache is not null.", affinityCache);
+ assertNull("Affinity cache is not null.", affinityCache);
+ }
}
/**
- * Check that client side affinity awareness optimizations are skipped by default.
+ * Check that client side partition awareness optimizations are skipped by default.
*
* @throws Exception If failed.
*/
@Test
- public void testAffinityAwarenessIsSkippedByDefault() throws Exception {
- Connection conn = DriverManager.getConnection(
- "jdbc:ignite:thin://127.0.0.1:10800..10802");
+ public void testPartitionAwarenessIsSkippedByDefault() throws Exception {
+ try (Connection conn = DriverManager.getConnection(
+ "jdbc:ignite:thin://127.0.0.1:10800..10802")) {
- Statement stmt = conn.createStatement();
+ Statement stmt = conn.createStatement();
- final String cacheName = "yacccc";
+ final String cacheName = "yacccc";
- CacheConfiguration<Object, Object> cache = prepareCacheConfig(cacheName);
+ CacheConfiguration<Object, Object> cache = prepareCacheConfig(cacheName);
- ignite(0).createCache(cache);
+ ignite(0).createCache(cache);
- stmt.executeQuery("select * from \"" + cacheName + "\".Person where _key = 1");
+ stmt.executeQuery("select * from \"" + cacheName + "\".Person where _key = 1");
- AffinityCache affinityCache = GridTestUtils.getFieldValue(conn, "affinityCache");
+ AffinityCache affinityCache = GridTestUtils.getFieldValue(conn, "affinityCache");
- assertNull("Affinity cache is not null.", affinityCache);
+ assertNull("Affinity cache is not null.", affinityCache);
+ }
}
/**
@@ -556,7 +557,7 @@ public class JdbcThinAffinityAwarenessSelfTest extends JdbcThinAbstractSelfTest
}
/**
- * Check that affinity awareness works fine after reconnection.
+ * Check that partition awareness works fine after reconnection.
*
* @throws Exception If failed.
*/
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAffinityAwarenessTransactionsSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPartitionAwarenessTransactionsSelfTest.java
similarity index 98%
rename from modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAffinityAwarenessTransactionsSelfTest.java
rename to modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPartitionAwarenessTransactionsSelfTest.java
index dae87ed..2941c0a 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinAffinityAwarenessTransactionsSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPartitionAwarenessTransactionsSelfTest.java
@@ -37,11 +37,11 @@ import org.jetbrains.annotations.NotNull;
import org.junit.Test;
/**
- * Jdbc thin transactional affinity awareness test.
+ * Jdbc thin transactional partition awareness test.
*/
-public class JdbcThinAffinityAwarenessTransactionsSelfTest extends JdbcThinAbstractSelfTest {
+public class JdbcThinPartitionAwarenessTransactionsSelfTest extends JdbcThinAbstractSelfTest {
/** */
- private static final String URL = "jdbc:ignite:thin://127.0.0.1:10800..10802?affinityAwareness=true";
+ private static final String URL = "jdbc:ignite:thin://127.0.0.1:10800..10802?partitionAwareness=true";
/** Nodes count. */
private static final int NODES_CNT = 3;
diff --git a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementSelfTest.java
index e4ed1e38..e41bfa2 100644
--- a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinStatementSelfTest.java
@@ -44,12 +44,12 @@ import static org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
@SuppressWarnings({"ThrowableNotThrown"})
public class JdbcThinStatementSelfTest extends JdbcThinAbstractSelfTest {
/** URL. */
- private String url = affinityAwareness ?
- "jdbc:ignite:thin://127.0.0.1:10800..10802?affinityAwareness=true" :
- "jdbc:ignite:thin://127.0.0.1?affinityAwareness=false";
+ private String url = partitionAwareness ?
+ "jdbc:ignite:thin://127.0.0.1:10800..10802?partitionAwareness=true" :
+ "jdbc:ignite:thin://127.0.0.1?partitionAwareness=false";
/** Nodes count. */
- private int nodesCnt = affinityAwareness ? 4 : 3;
+ private int nodesCnt = partitionAwareness ? 4 : 3;
/** SQL query. */
private static final String SQL = "select * from Person where age > 30";
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/ClientConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/ClientConfiguration.java
index a4fe74c..0d11011 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/ClientConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/ClientConfiguration.java
@@ -93,13 +93,13 @@ public final class ClientConfiguration implements Serializable {
private ClientTransactionConfiguration txCfg = new ClientTransactionConfiguration();
/**
- * Whether affinity awareness should be enabled.
+ * Whether partition awareness should be enabled.
*
* When {@code true} client attempts to send the request directly to the primary node for the given cache key.
* To do so, connection is established to every known server node.
* By default {@code false} only one connection is established at a given moment to a random server node.
*/
- private boolean affinityAwarenessEnabled;
+ private boolean partitionAwarenessEnabled;
/**
* Reconnect throttling period (in milliseconds). There are no more than {@code reconnectThrottlingRetries}
@@ -436,19 +436,19 @@ public final class ClientConfiguration implements Serializable {
}
/**
- * @return Whether affinity awareness should be enabled.
+ * @return Whether partition awareness should be enabled.
*/
- public boolean isAffinityAwarenessEnabled() {
- return affinityAwarenessEnabled;
+ public boolean isPartitionAwarenessEnabled() {
+ return partitionAwarenessEnabled;
}
/**
- * Enable or disable affinity awareness.
+ * Enable or disable partition awareness.
*
* @return {@code this} for chaining.
*/
- public ClientConfiguration setAffinityAwarenessEnabled(boolean affinityAwarenessEnabled) {
- this.affinityAwarenessEnabled = affinityAwarenessEnabled;
+ public ClientConfiguration setPartitionAwarenessEnabled(boolean partitionAwarenessEnabled) {
+ this.partitionAwarenessEnabled = partitionAwarenessEnabled;
return this;
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClient.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClient.java
index f84c3f1..1d8b4c7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClient.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClient.java
@@ -39,7 +39,7 @@ import java.util.UUID;
* <ul>
* <li>{@link #compute()}</li>
* </ul>
- * <h1 class="header">Affinity Awareness</h1>
+ * <h1 class="header">Partition awareness</h1>
* One of the unique properties of the Ignite remote clients is that they are
* affinity aware. In other words, both compute and data APIs will optionally
* contact exactly the node where the data is cached based on some affinity key.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
index c0e31c7..fb72f69 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientCompute.java
@@ -47,7 +47,7 @@ import org.jetbrains.annotations.Nullable;
* <p>
* Compute client also allows fetching contents of remote log files (including backwards mode) via any of
* the provided {@code log(...)} methods.
- * <h1 class="header">Affinity Awareness</h1>
+ * <h1 class="header">Partition awareness</h1>
* One of the unique properties of the Ignite remote clients is that they are
* affinity aware. In other words, both compute and data APIs will optionally
* contact exactly the node where the data is cached based on some affinity key.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientData.java b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientData.java
index 2c702a8..64b2623 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientData.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/GridClientData.java
@@ -26,7 +26,7 @@ import java.util.UUID;
* A data projection of grid client. Contains various methods for cache operations and metrics retrieval.
* An instance of data projection over some remote cache is provided via
* {@link GridClient#data(String)} method.
- * <h1 class="header">Affinity Awareness</h1>
+ * <h1 class="header">Partition awareness</h1>
* One of the unique properties of the Ignite remote clients is that they are
* affinity aware. In other words, both compute and data APIs will optionally
* contact exactly the node where the data is cached based on some affinity key.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityContext.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityContext.java
index 29bff6e..6eea7aa 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityContext.java
@@ -28,7 +28,7 @@ import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.util.GridConcurrentHashSet;
/**
- * Client cache affinity awareness context.
+ * Client cache partition awareness context.
*/
public class ClientCacheAffinityContext {
/** Binary data processor. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityMapping.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityMapping.java
index 84e4074..eae323a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityMapping.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ClientCacheAffinityMapping.java
@@ -37,7 +37,7 @@ import org.apache.ignite.internal.util.typedef.internal.U;
* Affinity mapping (partition to nodes) for each cache.
*/
public class ClientCacheAffinityMapping {
- /** CacheAffinityInfo for caches with not applicable affinity awareness. */
+ /** CacheAffinityInfo for caches with not applicable partition awareness. */
private static final CacheAffinityInfo NOT_APPLICABLE_CACHE_AFFINITY_INFO =
new CacheAffinityInfo(null, null);
@@ -158,7 +158,7 @@ public class ClientCacheAffinityMapping {
int cachesCnt = in.readInt();
- if (applicable) { // Affinity awareness is applicable for this caches.
+ if (applicable) { // Partition awareness is applicable for this caches.
Map<Integer, Map<Integer, Integer>> cacheKeyCfg = U.newHashMap(cachesCnt);
for (int j = 0; j < cachesCnt; j++)
@@ -169,7 +169,7 @@ public class ClientCacheAffinityMapping {
for (Map.Entry<Integer, Map<Integer, Integer>> keyCfg : cacheKeyCfg.entrySet())
aff.cacheAffinity.put(keyCfg.getKey(), new CacheAffinityInfo(keyCfg.getValue(), partToNode));
}
- else { // Affinity awareness is not applicable for this caches.
+ else { // Partition awareness is not applicable for this caches.
for (int j = 0; j < cachesCnt; j++)
aff.cacheAffinity.put(in.readInt(), NOT_APPLICABLE_CACHE_AFFINITY_INFO);
}
@@ -243,8 +243,8 @@ public class ClientCacheAffinityMapping {
private final int affinityMask;
/**
- * @param keyCfg Cache key configuration or {@code null} if affinity awareness is not applicable for this cache.
- * @param partMapping Partition to node mapping or {@code null} if affinity awareness is not applicable for
+ * @param keyCfg Cache key configuration or {@code null} if partition awareness is not applicable for this cache.
+ * @param partMapping Partition to node mapping or {@code null} if partition awareness is not applicable for
* this cache.
*/
private CacheAffinityInfo(Map<Integer, Integer> keyCfg, UUID[] partMapping) {
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ProtocolVersion.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ProtocolVersion.java
index 397b400..df689a3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ProtocolVersion.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ProtocolVersion.java
@@ -25,7 +25,7 @@ public final class ProtocolVersion implements Comparable<ProtocolVersion> {
/** Protocol version: 1.5.0. Transactions support. */
public static final ProtocolVersion V1_5_0 = new ProtocolVersion((short)1, (short)5, (short)0);
- /** Protocol version: 1.4.0. Affinity awareness. */
+ /** Protocol version: 1.4.0. Partition awareness. */
public static final ProtocolVersion V1_4_0 = new ProtocolVersion((short)1, (short)4, (short)0);
/** Protocol version: 1.2.0. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ReliableChannel.java b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ReliableChannel.java
index abcf484..e09587b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ReliableChannel.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ReliableChannel.java
@@ -45,7 +45,7 @@ import org.apache.ignite.internal.util.typedef.internal.U;
import org.jetbrains.annotations.NotNull;
/**
- * Communication channel with failover and affinity awareness.
+ * Communication channel with failover and partition awareness.
*/
final class ReliableChannel implements AutoCloseable {
/** Channel factory. */
@@ -57,10 +57,10 @@ final class ReliableChannel implements AutoCloseable {
/** Index of the current channel. */
private int curChIdx;
- /** Affinity awareness enabled. */
- private final boolean affinityAwarenessEnabled;
+ /** Partition awareness enabled. */
+ private final boolean partitionAwarenessEnabled;
- /** Cache affinity awareness context. */
+ /** Cache partition awareness context. */
private final ClientCacheAffinityContext affinityCtx;
/** Node channels. */
@@ -109,7 +109,7 @@ final class ReliableChannel implements AutoCloseable {
curChIdx = new Random().nextInt(channels.length); // We already verified there is at least one address.
- affinityAwarenessEnabled = clientCfg.isAffinityAwarenessEnabled() && channels.length > 1;
+ partitionAwarenessEnabled = clientCfg.isPartitionAwarenessEnabled() && channels.length > 1;
affinityCtx = new ClientCacheAffinityContext(binary);
@@ -119,7 +119,7 @@ final class ReliableChannel implements AutoCloseable {
try {
channels[curChIdx].getOrCreateChannel();
- if (affinityAwarenessEnabled)
+ if (partitionAwarenessEnabled)
initAllChannelsAsync();
return;
@@ -197,7 +197,7 @@ final class ReliableChannel implements AutoCloseable {
Consumer<PayloadOutputChannel> payloadWriter,
Function<PayloadInputChannel, T> payloadReader
) throws ClientException {
- if (affinityAwarenessEnabled && !nodeChannels.isEmpty() && affinityInfoIsUpToDate(cacheId)) {
+ if (partitionAwarenessEnabled && !nodeChannels.isEmpty() && affinityInfoIsUpToDate(cacheId)) {
UUID affinityNodeId = affinityCtx.affinityNode(cacheId, key);
if (affinityNodeId != null) {
@@ -384,7 +384,7 @@ final class ReliableChannel implements AutoCloseable {
* @param ch Channel.
*/
private void onTopologyChanged(ClientChannel ch) {
- if (affinityAwarenessEnabled && affinityCtx.updateLastTopologyVersion(ch.serverTopologyVersion(),
+ if (partitionAwarenessEnabled && affinityCtx.updateLastTopologyVersion(ch.serverTopologyVersion(),
ch.serverNodeId()))
initAllChannelsAsync();
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionProperties.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionProperties.java
index 038098e..94baaa9 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionProperties.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionProperties.java
@@ -407,16 +407,16 @@ public interface ConnectionProperties {
public void setDataPageScanEnabled(@Nullable Boolean dataPageScanEnabled);
/**
- * @return {@code true} if jdbc thin affinity awareness is enabled for this connection,
+ * @return {@code true} if jdbc thin partition awareness is enabled for this connection,
* {@code false} if it's disabled.
*/
- public boolean isAffinityAwareness();
+ public boolean isPartitionAwareness();
/**
- * @param affinityAwareness {@code true} if jdbc thin affinity awareness is enabled
+ * @param partitionAwareness {@code true} if jdbc thin partition awareness is enabled
* for this connection, if {@code false} then it's disabled.
*/
- public void setAffinityAwareness(boolean affinityAwareness);
+ public void setPartitionAwareness(boolean partitionAwareness);
/**
* Note: Batch size of 1 prevents deadlock on update where keys sequence are different in several concurrent updates.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionPropertiesImpl.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionPropertiesImpl.java
index c90a278..bbe1b9d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionPropertiesImpl.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/ConnectionPropertiesImpl.java
@@ -189,10 +189,10 @@ public class ConnectionPropertiesImpl implements ConnectionProperties, Serializa
"Whether data page scan for queries is allowed. If not specified, server defines the default behaviour.",
null, false);
- /** affinity awareness flag. */
- private BooleanProperty affinityAwareness = new BooleanProperty(
- "affinityAwareness",
- "Whether jdbc thin affinity awareness is enabled.",
+ /** Partition awareness flag. */
+ private BooleanProperty partitionAwareness = new BooleanProperty(
+ "partitionAwareness",
+ "Whether jdbc thin partition awareness is enabled.",
false, false);
/** Update batch size (the size of internal batches are used for INSERT/UPDATE/DELETE operation). */
@@ -211,7 +211,7 @@ public class ConnectionPropertiesImpl implements ConnectionProperties, Serializa
sslTrustAll, sslFactory,
user, passwd,
dataPageScanEnabled,
- affinityAwareness,
+ partitionAwareness,
updateBatchSize
};
@@ -519,13 +519,13 @@ public class ConnectionPropertiesImpl implements ConnectionProperties, Serializa
}
/** {@inheritDoc} */
- @Override public boolean isAffinityAwareness() {
- return affinityAwareness.value();
+ @Override public boolean isPartitionAwareness() {
+ return partitionAwareness.value();
}
/** {@inheritDoc} */
- @Override public void setAffinityAwareness(boolean affinityAwareness) {
- this.affinityAwareness.setValue(affinityAwareness);
+ @Override public void setPartitionAwareness(boolean partitionAwareness) {
+ this.partitionAwareness.setValue(partitionAwareness);
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinConnection.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinConnection.java
index 065bac9..c99f5db 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinConnection.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinConnection.java
@@ -116,8 +116,8 @@ public class JdbcThinConnection implements Connection {
/** Index generator. */
private static final AtomicLong IDX_GEN = new AtomicLong();
- /** Affinity awareness enabled flag. */
- private final boolean affinityAwareness;
+ /** Partition awareness enabled flag. */
+ private final boolean partitionAwareness;
/** Statements modification mutex. */
private final Object stmtsMux = new Object();
@@ -205,7 +205,7 @@ public class JdbcThinConnection implements Connection {
timer = new Timer("query-timeout-timer");
- affinityAwareness = connProps.isAffinityAwareness();
+ partitionAwareness = connProps.isPartitionAwareness();
ensureConnected();
}
@@ -225,7 +225,7 @@ public class JdbcThinConnection implements Connection {
HostAndPortRange[] srvs = connProps.getAddresses();
- if (affinityAwareness)
+ if (partitionAwareness)
connectInAffinityAwarenessMode(srvs);
else
connectInCommonMode(srvs);
@@ -459,7 +459,7 @@ public class JdbcThinConnection implements Connection {
closed = true;
- if (affinityAwareness) {
+ if (partitionAwareness) {
for (JdbcThinTcpIo clioIo : ios.values())
clioIo.close();
@@ -794,7 +794,7 @@ public class JdbcThinConnection implements Connection {
netTimeout = ms;
- if (affinityAwareness) {
+ if (partitionAwareness) {
for (JdbcThinTcpIo clioIo : ios.values())
clioIo.timeout(ms);
}
@@ -936,7 +936,7 @@ public class JdbcThinConnection implements Connection {
* @throws SQLException If Failed to calculate derived partitions.
*/
@Nullable private List<UUID> calculateNodeIds(JdbcRequest req) throws IOException, SQLException {
- if (!affinityAwareness || !(req instanceof JdbcQueryExecuteRequest))
+ if (!partitionAwareness || !(req instanceof JdbcQueryExecuteRequest))
return null;
JdbcQueryExecuteRequest qry = (JdbcQueryExecuteRequest)req;
@@ -972,12 +972,12 @@ public class JdbcThinConnection implements Connection {
if (parts.size() == 1)
return Collections.singletonList(cacheDistr[parts.iterator().next()]);
else {
- List<UUID> affinityAwarenessNodeIds = new ArrayList<>();
+ List<UUID> partitionAwarenessNodeIds = new ArrayList<>();
for (int part : parts)
- affinityAwarenessNodeIds.add(cacheDistr[part]);
+ partitionAwarenessNodeIds.add(cacheDistr[part]);
- return affinityAwarenessNodeIds;
+ return partitionAwarenessNodeIds;
}
}
@@ -1012,14 +1012,14 @@ public class JdbcThinConnection implements Connection {
return null;
}
- List<JdbcThinAffinityAwarenessMappingGroup> mappings =
+ List<JdbcThinPartitionAwarenessMappingGroup> mappings =
((JdbcCachePartitionsResult)res.response()).getMappings();
// Despite the fact that, at this moment, we request partition destribution only for one cache,
// we might retrieve multiple caches but exactly with same distribution.
assert mappings.size() == 1;
- JdbcThinAffinityAwarenessMappingGroup mappingGrp = mappings.get(0);
+ JdbcThinPartitionAwarenessMappingGroup mappingGrp = mappings.get(0);
cacheDistr = mappingGrp.revertMappings(partCnt);
@@ -1130,7 +1130,7 @@ public class JdbcThinConnection implements Connection {
if (!connected)
return;
- if (affinityAwareness) {
+ if (partitionAwareness) {
for (JdbcThinTcpIo clioIo : ios.values())
clioIo.close();
@@ -1397,7 +1397,7 @@ public class JdbcThinConnection implements Connection {
*/
@SuppressWarnings("ZeroLengthArrayAllocation")
private JdbcThinTcpIo cliIo(List<UUID> nodeIds) {
- if (!affinityAwareness)
+ if (!partitionAwareness)
return singleIo;
if (txIo != null)
@@ -1562,10 +1562,10 @@ public class JdbcThinConnection implements Connection {
JdbcThinTcpIo cliIo =
new JdbcThinTcpIo(connProps, new InetSocketAddress(addr, port), 0);
- if (!cliIo.isAffinityAwarenessSupported()) {
+ if (!cliIo.isPartitionAwarenessSupported()) {
throw new SQLException("Failed to connect to Ignite node [url=" +
connProps.getUrl() + "]. address = [" + addr + ':' + port + "]." +
- "Node doesn't support best affort affinity mode.",
+ "Node doesn't support partition awareness mode.",
SqlStateCode.INTERNAL_ERROR);
}
@@ -1672,7 +1672,7 @@ public class JdbcThinConnection implements Connection {
* @param res Jdbc Response.
*/
private void updateAffinityCache(JdbcQueryExecuteRequest qryReq, JdbcResponse res) {
- if (affinityAwareness) {
+ if (partitionAwareness) {
AffinityTopologyVersion resAffVer = res.affinityVersion();
if (resAffVer != null && (affinityCache == null || affinityCache.version().compareTo(resAffVer) < 0))
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinAffinityAwarenessMappingGroup.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinPartitionAwarenessMappingGroup.java
similarity index 88%
rename from modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinAffinityAwarenessMappingGroup.java
rename to modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinPartitionAwarenessMappingGroup.java
index 70ce1ae..f0e39ca 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinAffinityAwarenessMappingGroup.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinPartitionAwarenessMappingGroup.java
@@ -33,7 +33,7 @@ import org.jetbrains.annotations.NotNull;
/**
* Contains cache partitions distributions with corresponding set of cache ids.
*/
-public class JdbcThinAffinityAwarenessMappingGroup implements JdbcRawBinarylizable {
+public class JdbcThinPartitionAwarenessMappingGroup implements JdbcRawBinarylizable {
/** Set of cache Ids. */
private final Set<Integer> cacheIds = new HashSet<>();
@@ -44,7 +44,7 @@ public class JdbcThinAffinityAwarenessMappingGroup implements JdbcRawBinarylizab
/**
* Constructor.
*/
- private JdbcThinAffinityAwarenessMappingGroup() {
+ private JdbcThinPartitionAwarenessMappingGroup() {
partitionsMappings = new HashMap<>();
}
@@ -55,7 +55,7 @@ public class JdbcThinAffinityAwarenessMappingGroup implements JdbcRawBinarylizab
* @param partitionsMappings Partitions mappings.
*/
@SuppressWarnings("AssignmentOrReturnOfFieldWithMutableType")
- public JdbcThinAffinityAwarenessMappingGroup(@NotNull Integer cacheId, Map<UUID,
+ public JdbcThinPartitionAwarenessMappingGroup(@NotNull Integer cacheId, Map<UUID,
@NotNull Set<Integer>> partitionsMappings) {
cacheIds.add(cacheId);
this.partitionsMappings = partitionsMappings;
@@ -142,16 +142,16 @@ public class JdbcThinAffinityAwarenessMappingGroup implements JdbcRawBinarylizab
}
/**
- * Reads <code>JdbcThinAffinityAwarenessMappingGroup</code> from provided reader.
+ * Reads <code>JdbcThinPartitionAwarenessMappingGroup</code> from provided reader.
*
* @param reader Binary object reader.
* @param ver Protocol version.
- * @return Desirialized instance of <code>JdbcThinAffinityAwarenessMappingGroup</code>.
+ * @return Deserialized instance of <code>JdbcThinPartitionAwarenessMappingGroup</code>.
* @throws BinaryObjectException In case of error.
*/
- public static JdbcThinAffinityAwarenessMappingGroup readGroup(BinaryReaderExImpl reader,
- ClientListenerProtocolVersion ver) throws BinaryObjectException {
- JdbcThinAffinityAwarenessMappingGroup res = new JdbcThinAffinityAwarenessMappingGroup();
+ public static JdbcThinPartitionAwarenessMappingGroup readGroup(BinaryReaderExImpl reader,
+ ClientListenerProtocolVersion ver) throws BinaryObjectException {
+ JdbcThinPartitionAwarenessMappingGroup res = new JdbcThinPartitionAwarenessMappingGroup();
int cacheIdsSize = reader.readInt();
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java
index 366be79..fd87aab 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinTcpIo.java
@@ -601,9 +601,9 @@ public class JdbcThinTcpIo {
}
/**
- * @return True if affinity awareness supported, false otherwise.
+ * @return True if partition awareness supported, false otherwise.
*/
- boolean isAffinityAwarenessSupported() {
+ boolean isPartitionAwarenessSupported() {
assert srvProtoVer != null;
return srvProtoVer.compareTo(VER_2_8_0) >= 0;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcCachePartitionsResult.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcCachePartitionsResult.java
index 36685aa..5dafbb3 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcCachePartitionsResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcCachePartitionsResult.java
@@ -23,7 +23,7 @@ import java.util.List;
import org.apache.ignite.binary.BinaryObjectException;
import org.apache.ignite.internal.binary.BinaryReaderExImpl;
import org.apache.ignite.internal.binary.BinaryWriterExImpl;
-import org.apache.ignite.internal.jdbc.thin.JdbcThinAffinityAwarenessMappingGroup;
+import org.apache.ignite.internal.jdbc.thin.JdbcThinPartitionAwarenessMappingGroup;
import org.apache.ignite.internal.processors.odbc.ClientListenerProtocolVersion;
import org.apache.ignite.internal.util.typedef.internal.S;
@@ -32,7 +32,7 @@ import org.apache.ignite.internal.util.typedef.internal.S;
*/
public class JdbcCachePartitionsResult extends JdbcResult {
/** Partitions Mappings. */
- private List<JdbcThinAffinityAwarenessMappingGroup> mappings;
+ private List<JdbcThinPartitionAwarenessMappingGroup> mappings;
/**
* Default constructor.
@@ -47,7 +47,7 @@ public class JdbcCachePartitionsResult extends JdbcResult {
* @param mappings Partitions mappings.
*/
@SuppressWarnings("AssignmentOrReturnOfFieldWithMutableType")
- public JdbcCachePartitionsResult(List<JdbcThinAffinityAwarenessMappingGroup> mappings) {
+ public JdbcCachePartitionsResult(List<JdbcThinPartitionAwarenessMappingGroup> mappings) {
super(CACHE_PARTITIONS);
this.mappings = mappings;
@@ -56,7 +56,7 @@ public class JdbcCachePartitionsResult extends JdbcResult {
/**
* @return Partitons mappings.
*/
- public List<JdbcThinAffinityAwarenessMappingGroup> getMappings() {
+ public List<JdbcThinPartitionAwarenessMappingGroup> getMappings() {
return Collections.unmodifiableList(mappings);
}
@@ -69,7 +69,7 @@ public class JdbcCachePartitionsResult extends JdbcResult {
writer.writeInt(mappings.size());
- for (JdbcThinAffinityAwarenessMappingGroup mappingGroup : mappings)
+ for (JdbcThinPartitionAwarenessMappingGroup mappingGroup : mappings)
mappingGroup.writeBinary(writer, ver);
}
@@ -77,12 +77,12 @@ public class JdbcCachePartitionsResult extends JdbcResult {
@Override public void readBinary(BinaryReaderExImpl reader, ClientListenerProtocolVersion ver)
throws BinaryObjectException {
super.readBinary(reader, ver);
- List<JdbcThinAffinityAwarenessMappingGroup> res = new ArrayList<>();
+ List<JdbcThinPartitionAwarenessMappingGroup> res = new ArrayList<>();
int mappingsSize = reader.readInt();
for (int i = 0; i < mappingsSize; i++)
- res.add(JdbcThinAffinityAwarenessMappingGroup.readGroup(reader, ver));
+ res.add(JdbcThinPartitionAwarenessMappingGroup.readGroup(reader, ver));
mappings = res;
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java
index 6f4a757..7ce21ba 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcConnectionContext.java
@@ -61,7 +61,7 @@ public class JdbcConnectionContext extends ClientListenerAbstractConnectionConte
/** Version 2.7.0: adds maximum length for columns feature.*/
static final ClientListenerProtocolVersion VER_2_7_0 = ClientListenerProtocolVersion.create(2, 7, 0);
- /** Version 2.8.0: adds query id in order to implement cancel feature, affinity awareness support: IEP-23.*/
+ /** Version 2.8.0: adds query id in order to implement cancel feature, partition awareness support: IEP-23.*/
static final ClientListenerProtocolVersion VER_2_8_0 = ClientListenerProtocolVersion.create(2, 8, 0);
/** Current version. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java
index 0bb89d3..1510210 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java
@@ -41,7 +41,7 @@ import org.apache.ignite.cluster.ClusterNode;
import org.apache.ignite.internal.IgniteInterruptedCheckedException;
import org.apache.ignite.internal.IgniteVersionUtils;
import org.apache.ignite.internal.binary.BinaryWriterExImpl;
-import org.apache.ignite.internal.jdbc.thin.JdbcThinAffinityAwarenessMappingGroup;
+import org.apache.ignite.internal.jdbc.thin.JdbcThinPartitionAwarenessMappingGroup;
import org.apache.ignite.internal.processors.affinity.AffinityAssignment;
import org.apache.ignite.internal.processors.affinity.AffinityTopologyVersion;
import org.apache.ignite.internal.processors.authentication.AuthorizationContext;
@@ -645,7 +645,7 @@ public class JdbcRequestHandler implements ClientListenerRequestHandler {
if (cur.isQuery())
res = new JdbcQueryExecuteResult(cur.cursorId(), cur.fetchRows(), !cur.hasNext(),
- isClientAffinityAwarenessApplicable(req.partitionResponseRequest(), partRes) ?
+ isClientPartitionAwarenessApplicable(req.partitionResponseRequest(), partRes) ?
partRes :
null);
else {
@@ -657,7 +657,7 @@ public class JdbcRequestHandler implements ClientListenerRequestHandler {
", res=" + S.toString(List.class, items) + ']';
res = new JdbcQueryExecuteResult(cur.cursorId(), (Long)items.get(0).get(0),
- isClientAffinityAwarenessApplicable(req.partitionResponseRequest(), partRes) ?
+ isClientPartitionAwarenessApplicable(req.partitionResponseRequest(), partRes) ?
partRes :
null);
}
@@ -1312,7 +1312,7 @@ public class JdbcRequestHandler implements ClientListenerRequestHandler {
* @return Partitions distributions.
*/
private JdbcResponse getCachePartitions(JdbcCachePartitionsRequest req) {
- List<JdbcThinAffinityAwarenessMappingGroup> mappings = new ArrayList<>();
+ List<JdbcThinPartitionAwarenessMappingGroup> mappings = new ArrayList<>();
AffinityTopologyVersion topVer = connCtx.kernalContext().cache().context().exchange().readyAffinityVersion();
@@ -1321,7 +1321,7 @@ public class JdbcRequestHandler implements ClientListenerRequestHandler {
connCtx.kernalContext().cache().cacheDescriptor(cacheId),
topVer);
- mappings.add(new JdbcThinAffinityAwarenessMappingGroup(cacheId, partitionsMap));
+ mappings.add(new JdbcThinPartitionAwarenessMappingGroup(cacheId, partitionsMap));
}
return new JdbcResponse(new JdbcCachePartitionsResult(mappings), topVer);
@@ -1478,14 +1478,14 @@ public class JdbcRequestHandler implements ClientListenerRequestHandler {
/**
* @param partResRequested Boolean flag that signals whether client requested partiton result.
* @param partRes Direved partition result.
- * @return True if applicable to jdbc thin client side affinity awareness:
+ * @return True if applicable to jdbc thin client side partition awareness:
* 1. Partitoin result was requested;
* 2. Partition result either null or
* a. Rendezvous affinity function without map filters was used;
* b. Partition result tree neither PartitoinAllNode nor PartitionNoneNode;
*/
- private static boolean isClientAffinityAwarenessApplicable(boolean partResRequested, PartitionResult partRes) {
- return partResRequested && (partRes == null || partRes.isClientAffinityAwarenessApplicable());
+ private static boolean isClientPartitionAwarenessApplicable(boolean partResRequested, PartitionResult partRes) {
+ return partResRequested && (partRes == null || partRes.isClientPartitionAwarenessApplicable());
}
/** {@inheritDoc} */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientConnectionContext.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientConnectionContext.java
index 17d8c5c..d21e08d 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientConnectionContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/ClientConnectionContext.java
@@ -53,7 +53,7 @@ public class ClientConnectionContext extends ClientListenerAbstractConnectionCon
/** Version 1.3.0. */
public static final ClientListenerProtocolVersion VER_1_3_0 = ClientListenerProtocolVersion.create(1, 3, 0);
- /** Version 1.4.0. Added: Affinity Awareness, IEP-23. */
+ /** Version 1.4.0. Added: Partition awareness, IEP-23. */
public static final ClientListenerProtocolVersion VER_1_4_0 = ClientListenerProtocolVersion.create(1, 4, 0);
/** Version 1.5.0. Added: Transactions support, IEP-34. */
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheAffinityAwarenessGroup.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePartitionAwarenessGroup.java
similarity index 94%
rename from modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheAffinityAwarenessGroup.java
rename to modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePartitionAwarenessGroup.java
index eb21f3e..273fbe7 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCacheAffinityAwarenessGroup.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePartitionAwarenessGroup.java
@@ -28,7 +28,7 @@ import org.apache.ignite.internal.processors.cache.binary.CacheObjectBinaryProce
/**
* Partition mapping associated with the group of caches.
*/
-class ClientCacheAffinityAwarenessGroup {
+class ClientCachePartitionAwarenessGroup {
/** Binary processor. */
CacheObjectBinaryProcessorImpl proc;
@@ -43,8 +43,8 @@ class ClientCacheAffinityAwarenessGroup {
* @param mapping Partition mapping.
* @param cacheDesc Descriptor of the initial cache.
*/
- public ClientCacheAffinityAwarenessGroup(CacheObjectBinaryProcessorImpl proc, ClientCachePartitionMapping mapping,
- DynamicCacheDescriptor cacheDesc) {
+ public ClientCachePartitionAwarenessGroup(CacheObjectBinaryProcessorImpl proc, ClientCachePartitionMapping mapping,
+ DynamicCacheDescriptor cacheDesc) {
this.proc = proc;
this.mapping = mapping;
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePartitionsRequest.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePartitionsRequest.java
index 5141e26..a10f90c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePartitionsRequest.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePartitionsRequest.java
@@ -63,8 +63,8 @@ public class ClientCachePartitionsRequest extends ClientRequest {
/** {@inheritDoc} */
@Override public ClientResponse process(ClientConnectionContext ctx) {
- ArrayList<ClientCacheAffinityAwarenessGroup> groups = new ArrayList<>(cacheIds.length);
- HashMap<Integer, ClientCacheAffinityAwarenessGroup> cacheGroupIds = new HashMap<>(cacheIds.length);
+ ArrayList<ClientCachePartitionAwarenessGroup> groups = new ArrayList<>(cacheIds.length);
+ HashMap<Integer, ClientCachePartitionAwarenessGroup> cacheGroupIds = new HashMap<>(cacheIds.length);
ClientAffinityTopologyVersion affinityVer = ctx.checkAffinityTopologyVersion();
@@ -77,7 +77,7 @@ public class ClientCachePartitionsRequest extends ClientRequest {
if (cacheDesc == null)
continue;
- ClientCacheAffinityAwarenessGroup grp = processCache(ctx, groups, cacheGroupIds, affinityVer, cacheDesc);
+ ClientCachePartitionAwarenessGroup grp = processCache(ctx, groups, cacheGroupIds, affinityVer, cacheDesc);
// Cache already processed.
if (grp == null)
@@ -108,20 +108,20 @@ public class ClientCachePartitionsRequest extends ClientRequest {
* @param cacheGroupIds Map of known group IDs.
* @param affinityVer Affinity topology version.
* @param cacheDesc Cache descriptor.
- * @return Null if cache was processed and new client cache affinity awareness group if it does not belong to any
+ * @return Null if cache was processed and new client cache partition awareness group if it does not belong to any
* existent.
*/
- private static ClientCacheAffinityAwarenessGroup processCache(
+ private static ClientCachePartitionAwarenessGroup processCache(
ClientConnectionContext ctx,
- List<ClientCacheAffinityAwarenessGroup> groups,
- Map<Integer, ClientCacheAffinityAwarenessGroup> cacheGroupIds,
+ List<ClientCachePartitionAwarenessGroup> groups,
+ Map<Integer, ClientCachePartitionAwarenessGroup> cacheGroupIds,
ClientAffinityTopologyVersion affinityVer,
DynamicCacheDescriptor cacheDesc)
{
int cacheGroupId = cacheDesc.groupId();
int cacheId = cacheDesc.cacheId();
- ClientCacheAffinityAwarenessGroup group = cacheGroupIds.get(cacheGroupId);
+ ClientCachePartitionAwarenessGroup group = cacheGroupIds.get(cacheGroupId);
if (group != null) {
// Cache group is found. It means that cache belongs to one of cache groups with known mapping.
// Just adding our cache to this group here.
@@ -150,19 +150,19 @@ public class ClientCachePartitionsRequest extends ClientRequest {
CacheObjectBinaryProcessorImpl proc = (CacheObjectBinaryProcessorImpl)ctx.kernalContext().cacheObjects();
- return new ClientCacheAffinityAwarenessGroup(proc, mapping, cacheDesc);
+ return new ClientCachePartitionAwarenessGroup(proc, mapping, cacheDesc);
}
/**
- * Get cache affinity awareness group which is compatible with the mapping.
+ * Get cache partition awareness group which is compatible with the mapping.
* @param groups Group list.
* @param mapping Partition mapping.
- * @return Compatible cache affinity awareness group if present, or null.
+ * @return Compatible cache partition awareness group if present, or null.
*/
- @Nullable private static ClientCacheAffinityAwarenessGroup getCompatibleGroup(
- List<ClientCacheAffinityAwarenessGroup> groups,
+ @Nullable private static ClientCachePartitionAwarenessGroup getCompatibleGroup(
+ List<ClientCachePartitionAwarenessGroup> groups,
ClientCachePartitionMapping mapping) {
- for (ClientCacheAffinityAwarenessGroup group : groups) {
+ for (ClientCachePartitionAwarenessGroup group : groups) {
if (group.isCompatible(mapping))
return group;
}
@@ -189,7 +189,7 @@ public class ClientCachePartitionsRequest extends ClientRequest {
/**
* @param ccfg Cache configuration.
- * @return True if cache is applicable for affinity awareness optimisation.
+ * @return True if cache is applicable for partition awareness optimisation.
*/
private static boolean isApplicable(CacheConfiguration ccfg) {
// Partition could be extracted only from PARTITIONED caches.
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePartitionsResponse.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePartitionsResponse.java
index 247f04c..ca48772 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePartitionsResponse.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePartitionsResponse.java
@@ -28,7 +28,7 @@ import org.apache.ignite.internal.processors.platform.client.ClientResponse;
*/
class ClientCachePartitionsResponse extends ClientResponse {
/** Node partitions. */
- private final ArrayList<ClientCacheAffinityAwarenessGroup> mappings;
+ private final ArrayList<ClientCachePartitionAwarenessGroup> mappings;
/** Affinity version. */
private final ClientAffinityTopologyVersion affinityVer;
@@ -38,7 +38,7 @@ class ClientCachePartitionsResponse extends ClientResponse {
* @param mappings Mappings for caches.
* @param affinityVer Affinity version.
*/
- ClientCachePartitionsResponse(long requestId, ArrayList<ClientCacheAffinityAwarenessGroup> mappings,
+ ClientCachePartitionsResponse(long requestId, ArrayList<ClientCachePartitionAwarenessGroup> mappings,
ClientAffinityTopologyVersion affinityVer) {
super(requestId);
@@ -56,7 +56,7 @@ class ClientCachePartitionsResponse extends ClientResponse {
writer.writeInt(mappings.size());
- for (ClientCacheAffinityAwarenessGroup mapping : mappings) {
+ for (ClientCachePartitionAwarenessGroup mapping : mappings) {
mapping.write(writer);
}
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionResult.java b/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionResult.java
index 0b2be15..b9dd18c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionResult.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionResult.java
@@ -37,13 +37,13 @@ public class PartitionResult {
/** Affinity function. */
private final PartitionTableAffinityDescriptor aff;
- /** Affinity topology version. Used within Jdbc thin affinity awareness. */
+ /** Affinity topology version. Used within Jdbc thin partition awareness. */
private final AffinityTopologyVersion topVer;
- /** Cache name. Used within Jdbc thin affinity awareness. */
+ /** Cache name. Used within Jdbc thin partition awareness. */
private final String cacheName;
- /** Partitions count. Used within Jdbc thin affinity awareness. */
+ /** Partitions count. Used within Jdbc thin partition awareness. */
private final int partsCnt;
/**
@@ -158,12 +158,12 @@ public class PartitionResult {
}
/**
- * @return True if applicable to jdbc thin client side affinity awareness:
+ * @return True if applicable to jdbc thin client side partition awareness:
* 1. Rendezvous affinity function without map filters was used;
* 2. Partition result tree neither PartitoinAllNode nor PartitionNoneNode;
*/
- public boolean isClientAffinityAwarenessApplicable() {
- return aff != null && aff.isClientAffinityAwarenessApplicable() &&
+ public boolean isClientPartitionAwarenessApplicable() {
+ return aff != null && aff.isClientPartitionAwarenessApplicable() &&
!(tree instanceof PartitionNoneNode) && !(tree instanceof PartitionAllNode);
}
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionTableAffinityDescriptor.java b/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionTableAffinityDescriptor.java
index 02e957b..d9764f8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionTableAffinityDescriptor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionTableAffinityDescriptor.java
@@ -87,9 +87,9 @@ public class PartitionTableAffinityDescriptor {
/**
*
- * @return True if applicable to jdbc thin client side affinity awareness.
+ * @return True if applicable to jdbc thin client side partition awareness.
*/
- public boolean isClientAffinityAwarenessApplicable() {
+ public boolean isClientPartitionAwarenessApplicable() {
return affFunc == PartitionAffinityFunctionType.RENDEZVOUS && !hasNodeFilter;
}
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientAbstractAffinityAwarenessTest.java b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientAbstractPartitionAwarenessTest.java
similarity index 98%
rename from modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientAbstractAffinityAwarenessTest.java
rename to modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientAbstractPartitionAwarenessTest.java
index d26815d..04c961c 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientAbstractAffinityAwarenessTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientAbstractPartitionAwarenessTest.java
@@ -43,9 +43,9 @@ import org.apache.ignite.testframework.junits.common.GridCommonAbstractTest;
import static org.apache.ignite.configuration.ClientConnectorConfiguration.DFLT_PORT;
/**
- * Abstract thin client affinity awareness test.
+ * Abstract thin client partition awareness test.
*/
-public abstract class ThinClientAbstractAffinityAwarenessTest extends GridCommonAbstractTest {
+public abstract class ThinClientAbstractPartitionAwarenessTest extends GridCommonAbstractTest {
/** Wait timeout. */
private static final long WAIT_TIMEOUT = 5_000L;
@@ -146,7 +146,7 @@ public abstract class ThinClientAbstractAffinityAwarenessTest extends GridCommon
String addrs[] = Arrays.stream(nodeIdxs).mapToObj(nodeIdx -> "127.0.0.1:" + (DFLT_PORT + nodeIdx))
.toArray(String[]::new);
- return new ClientConfiguration().setAddresses(addrs).setAffinityAwarenessEnabled(true);
+ return new ClientConfiguration().setAddresses(addrs).setPartitionAwarenessEnabled(true);
}
/**
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientAffinityAwarenessStableTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientPartitionAwarenessStableTopologyTest.java
similarity index 88%
rename from modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientAffinityAwarenessStableTopologyTest.java
rename to modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientPartitionAwarenessStableTopologyTest.java
index 7854d4b..f501647 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientAffinityAwarenessStableTopologyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientPartitionAwarenessStableTopologyTest.java
@@ -24,9 +24,9 @@ import org.apache.ignite.internal.processors.cache.IgniteInternalCache;
import org.junit.Test;
/**
- * Test affinity awareness of thin client on stable topology.
+ * Test partition awareness of thin client on stable topology.
*/
-public class ThinClientAffinityAwarenessStableTopologyTest extends ThinClientAbstractAffinityAwarenessTest {
+public class ThinClientPartitionAwarenessStableTopologyTest extends ThinClientAbstractPartitionAwarenessTest {
/** {@inheritDoc} */
@Override protected void beforeTestsStarted() throws Exception {
super.beforeTestsStarted();
@@ -45,7 +45,7 @@ public class ThinClientAffinityAwarenessStableTopologyTest extends ThinClientAbs
}
/**
- * Test that affinity awareness is not applicable for replicated cache.
+ * Test that partition awareness is not applicable for replicated cache.
*/
@Test
public void testReplicatedCache() {
@@ -53,7 +53,7 @@ public class ThinClientAffinityAwarenessStableTopologyTest extends ThinClientAbs
}
/**
- * Test that affinity awareness is not applicable for partitioned cache with custom affinity function.
+ * Test that partition awareness is not applicable for partitioned cache with custom affinity function.
*/
@Test
public void testPartitionedCustomAffinityCache() {
@@ -61,7 +61,7 @@ public class ThinClientAffinityAwarenessStableTopologyTest extends ThinClientAbs
}
/**
- * Test affinity awareness for all applicable operation types for partitioned cache with primitive key.
+ * Test partition awareness for all applicable operation types for partitioned cache with primitive key.
*/
@Test
public void testPartitionedCachePrimitiveKey() {
@@ -69,7 +69,7 @@ public class ThinClientAffinityAwarenessStableTopologyTest extends ThinClientAbs
}
/**
- * Test affinity awareness for all applicable operation types for partitioned cache with complex key.
+ * Test partition awareness for all applicable operation types for partitioned cache with complex key.
*/
@Test
public void testPartitionedCacheComplexKey() {
@@ -77,7 +77,7 @@ public class ThinClientAffinityAwarenessStableTopologyTest extends ThinClientAbs
}
/**
- * Test affinity awareness for all applicable operation types for partitioned cache with annotated affinity
+ * Test partition awareness for all applicable operation types for partitioned cache with annotated affinity
* mapped key.
*/
@Test
@@ -86,7 +86,7 @@ public class ThinClientAffinityAwarenessStableTopologyTest extends ThinClientAbs
}
/**
- * Test affinity awareness for all applicable operation types for partitioned cache with not annotated affinity
+ * Test partition awareness for all applicable operation types for partitioned cache with not annotated affinity
* mapped key.
*/
@Test
diff --git a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientAffinityAwarenessUnstableTopologyTest.java b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientPartitionAwarenessUnstableTopologyTest.java
similarity index 80%
rename from modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientAffinityAwarenessUnstableTopologyTest.java
rename to modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientPartitionAwarenessUnstableTopologyTest.java
index fcf64d6..bcb7c37 100644
--- a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientAffinityAwarenessUnstableTopologyTest.java
+++ b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientPartitionAwarenessUnstableTopologyTest.java
@@ -28,9 +28,9 @@ import org.apache.ignite.mxbean.ClientProcessorMXBean;
import org.junit.Test;
/**
- * Test affinity awareness of thin client on unstable topology.
+ * Test partition awareness of thin client on unstable topology.
*/
-public class ThinClientAffinityAwarenessUnstableTopologyTest extends ThinClientAbstractAffinityAwarenessTest {
+public class ThinClientPartitionAwarenessUnstableTopologyTest extends ThinClientAbstractPartitionAwarenessTest {
/** {@inheritDoc} */
@Override protected void afterTest() throws Exception {
super.afterTest();
@@ -39,18 +39,18 @@ public class ThinClientAffinityAwarenessUnstableTopologyTest extends ThinClientA
}
/**
- * Test that join of the new node is detected by the client and affects affinity awareness.
+ * Test that join of the new node is detected by the client and affects partition awareness.
*/
@Test
- public void testAffinityAwarenessOnNodeJoin() throws Exception {
+ public void testPartitionAwarenessOnNodeJoin() throws Exception {
startGrids(3);
awaitPartitionMapExchange();
initClient(getClientConfiguration(1, 2, 3), 1, 2);
- // Test affinity awareness before node join.
- testAffinityAwareness(true);
+ // Test partition awareness before node join.
+ testPartitionAwareness(true);
assertNull(channels[3]);
@@ -77,23 +77,23 @@ public class ThinClientAffinityAwarenessUnstableTopologyTest extends ThinClientA
assertOpOnChannel(channels[3], ClientOperation.CACHE_PUT);
- // Test affinity awareness after node join.
- testAffinityAwareness(false);
+ // Test partition awareness after node join.
+ testPartitionAwareness(false);
}
/**
- * Test that node left event affects affinity awareness.
+ * Test that node left event affects partition awareness.
*/
@Test
- public void testAffinityAwarenessOnNodeLeft() throws Exception {
+ public void testPartitionAwarenessOnNodeLeft() throws Exception {
startGrids(4);
awaitPartitionMapExchange();
initClient(getClientConfiguration(1, 2, 3), 1, 2, 3);
- // Test affinity awareness before node left.
- testAffinityAwareness(true);
+ // Test partition awareness before node left.
+ testPartitionAwareness(true);
stopGrid(3);
@@ -104,8 +104,8 @@ public class ThinClientAffinityAwarenessUnstableTopologyTest extends ThinClientA
// Next request will also detect topology change.
initDefaultChannel();
- // Test affinity awareness after node join.
- testAffinityAwareness(true);
+ // Test partition awareness after node join.
+ testPartitionAwareness(true);
}
/**
@@ -119,8 +119,8 @@ public class ThinClientAffinityAwarenessUnstableTopologyTest extends ThinClientA
initClient(getClientConfiguration(0, 1), 0, 1);
- // Test affinity awareness before connection to node lost.
- testAffinityAwareness(true);
+ // Test partition awareness before connection to node lost.
+ testPartitionAwareness(true);
// Choose node to disconnect (not default node).
int disconnectNodeIdx = dfltCh == channels[0] ? 1 : 0;
@@ -151,23 +151,23 @@ public class ThinClientAffinityAwarenessUnstableTopologyTest extends ThinClientA
// Connection to disconnected node should be restored after retry.
assertOpOnChannel(channels[disconnectNodeIdx], ClientOperation.CACHE_PUT);
- // Test affinity awareness.
- testAffinityAwareness(false);
+ // Test partition awareness.
+ testPartitionAwareness(false);
}
/**
- * Test that affinity awareness works when reconnecting to the new cluster (with lower topology version)
+ * Test that partition awareness works when reconnecting to the new cluster (with lower topology version)
*/
@Test
- public void testAffinityAwarenessOnClusterRestart() throws Exception {
+ public void testPartitionAwarenessOnClusterRestart() throws Exception {
startGrids(3);
awaitPartitionMapExchange();
initClient(getClientConfiguration(0, 1, 2), 0, 1, 2);
- // Test affinity awareness before cluster restart.
- testAffinityAwareness(true);
+ // Test partition awareness before cluster restart.
+ testPartitionAwareness(true);
stopAllGrids();
@@ -191,7 +191,7 @@ public class ThinClientAffinityAwarenessUnstableTopologyTest extends ThinClientA
awaitChannelsInit(0, 1);
- testAffinityAwareness(true);
+ testPartitionAwareness(true);
}
/**
@@ -199,7 +199,7 @@ public class ThinClientAffinityAwarenessUnstableTopologyTest extends ThinClientA
*
* @param partReq Next operation should request partitions map.
*/
- private void testAffinityAwareness(boolean partReq) {
+ private void testPartitionAwareness(boolean partReq) {
ClientCache<Object, Object> clientCache = client.cache(PART_CACHE_NAME);
IgniteInternalCache<Object, Object> igniteCache = grid(0).context().cache().cache(PART_CACHE_NAME);
diff --git a/modules/indexing/src/test/java/org/apache/ignite/client/ClientTestSuite.java b/modules/indexing/src/test/java/org/apache/ignite/client/ClientTestSuite.java
index b27aba9..0c6f92e 100644
--- a/modules/indexing/src/test/java/org/apache/ignite/client/ClientTestSuite.java
+++ b/modules/indexing/src/test/java/org/apache/ignite/client/ClientTestSuite.java
@@ -17,8 +17,8 @@
package org.apache.ignite.client;
-import org.apache.ignite.internal.client.thin.ThinClientAffinityAwarenessStableTopologyTest;
-import org.apache.ignite.internal.client.thin.ThinClientAffinityAwarenessUnstableTopologyTest;
+import org.apache.ignite.internal.client.thin.ThinClientPartitionAwarenessStableTopologyTest;
+import org.apache.ignite.internal.client.thin.ThinClientPartitionAwarenessUnstableTopologyTest;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -40,8 +40,8 @@ import org.junit.runners.Suite;
ConnectionTest.class,
ConnectToStartingNodeTest.class,
AsyncChannelTest.class,
- ThinClientAffinityAwarenessStableTopologyTest.class,
- ThinClientAffinityAwarenessUnstableTopologyTest.class
+ ThinClientPartitionAwarenessStableTopologyTest.class,
+ ThinClientPartitionAwarenessUnstableTopologyTest.class
})
public class ClientTestSuite {
// No-op.
diff --git a/modules/platforms/cpp/thin-client-test/src/cache_client_test.cpp b/modules/platforms/cpp/thin-client-test/src/cache_client_test.cpp
index ffa03f1..9bd4d89 100644
--- a/modules/platforms/cpp/thin-client-test/src/cache_client_test.cpp
+++ b/modules/platforms/cpp/thin-client-test/src/cache_client_test.cpp
@@ -89,7 +89,7 @@ public:
IgniteClientConfiguration cfg;
cfg.SetEndPoints("127.0.0.1:11110,127.0.0.1:11111,127.0.0.1:11112");
- cfg.SetAffinityAwareness(true);
+ cfg.SetPartitionAwareness(true);
IgniteClient client = IgniteClient::Start(cfg);
@@ -469,7 +469,7 @@ BOOST_AUTO_TEST_CASE(CacheClientPartitionsString)
IgniteClientConfiguration cfg;
cfg.SetEndPoints("127.0.0.1:11110,127.0.0.1:11111,127.0.0.1:11112");
- cfg.SetAffinityAwareness(true);
+ cfg.SetPartitionAwareness(true);
IgniteClient client = IgniteClient::Start(cfg);
@@ -499,7 +499,7 @@ BOOST_AUTO_TEST_CASE(CacheClientPartitionsGuid)
IgniteClientConfiguration cfg;
cfg.SetEndPoints("127.0.0.1:11110,127.0.0.1:11111,127.0.0.1:11112");
- cfg.SetAffinityAwareness(true);
+ cfg.SetPartitionAwareness(true);
IgniteClient client = IgniteClient::Start(cfg);
@@ -529,7 +529,7 @@ BOOST_AUTO_TEST_CASE(CacheClientPartitionsComplexType)
IgniteClientConfiguration cfg;
cfg.SetEndPoints("127.0.0.1:11110,127.0.0.1:11111,127.0.0.1:11112");
- cfg.SetAffinityAwareness(true);
+ cfg.SetPartitionAwareness(true);
IgniteClient client = IgniteClient::Start(cfg);
@@ -575,7 +575,7 @@ BOOST_AUTO_TEST_CASE(CacheClientPartitionsDate)
IgniteClientConfiguration cfg;
cfg.SetEndPoints("127.0.0.1:11110,127.0.0.1:11111,127.0.0.1:11112");
- cfg.SetAffinityAwareness(true);
+ cfg.SetPartitionAwareness(true);
IgniteClient client = IgniteClient::Start(cfg);
@@ -619,7 +619,7 @@ BOOST_AUTO_TEST_CASE(CacheClientPartitionsTime)
IgniteClientConfiguration cfg;
cfg.SetEndPoints("127.0.0.1:11110,127.0.0.1:11111,127.0.0.1:11112");
- cfg.SetAffinityAwareness(true);
+ cfg.SetPartitionAwareness(true);
IgniteClient client = IgniteClient::Start(cfg);
@@ -657,7 +657,7 @@ BOOST_AUTO_TEST_CASE(CacheClientPartitionsTimestamp)
IgniteClientConfiguration cfg;
cfg.SetEndPoints("127.0.0.1:11110,127.0.0.1:11111,127.0.0.1:11112");
- cfg.SetAffinityAwareness(true);
+ cfg.SetPartitionAwareness(true);
IgniteClient client = IgniteClient::Start(cfg);
@@ -849,7 +849,7 @@ BOOST_AUTO_TEST_CASE(CacheClientPartitionsDefaultDynamicCacheThreeNodes)
IgniteClientConfiguration cfg;
cfg.SetEndPoints("127.0.0.1:11110,127.0.0.1:11111,127.0.0.1:11112");
- cfg.SetAffinityAwareness(true);
+ cfg.SetPartitionAwareness(true);
IgniteClient client = IgniteClient::Start(cfg);
@@ -881,7 +881,7 @@ BOOST_AUTO_TEST_CASE(CacheClientPartitionsRebalance)
IgniteClientConfiguration cfg;
cfg.SetEndPoints("127.0.0.1:11110,127.0.0.1:11111,127.0.0.1:11112,127.0.0.1:11113");
- cfg.SetAffinityAwareness(true);
+ cfg.SetPartitionAwareness(true);
IgniteClient client = IgniteClient::Start(cfg);
diff --git a/modules/platforms/cpp/thin-client/include/ignite/thin/ignite_client_configuration.h b/modules/platforms/cpp/thin-client/include/ignite/thin/ignite_client_configuration.h
index f888b8d..d14f830 100644
--- a/modules/platforms/cpp/thin-client/include/ignite/thin/ignite_client_configuration.h
+++ b/modules/platforms/cpp/thin-client/include/ignite/thin/ignite_client_configuration.h
@@ -46,7 +46,7 @@ namespace ignite
*/
IgniteClientConfiguration() :
sslMode(SslMode::DISABLE),
- affinityAwareness(false)
+ partitionAwareness(false)
{
// No-op.
}
@@ -203,7 +203,7 @@ namespace ignite
}
/**
- * Set Affinity Awareness.
+ * Set Partition Awareness.
*
* Enable or disable feature that enables thin client to consider data affinity when making requests
* to the cluster. It means, thin client is going to connect to all available cluster servers listed by
@@ -211,23 +211,23 @@ namespace ignite
*
* Disabled by default.
*
- * @param enable Enable affinity awareness.
+ * @param enable Enable partition awareness.
*/
- void SetAffinityAwareness(bool enable)
+ void SetPartitionAwareness(bool enable)
{
- affinityAwareness = enable;
+ partitionAwareness = enable;
}
/**
- * Get Affinity Awareness flag.
+ * Get Partition Awareness flag.
*
- * @see SetAffinityAwareness() for details.
+ * @see SetPartitionAwareness() for details.
*
- * @return @c true if affinity awareness is enabled and @c false otherwise.
+ * @return @c true if partition awareness is enabled and @c false otherwise.
*/
- bool IsAffinityAwareness() const
+ bool IsPartitionAwareness() const
{
- return affinityAwareness;
+ return partitionAwareness;
}
private:
@@ -252,8 +252,8 @@ namespace ignite
/** SSL client certificate authority path */
std::string sslCaFile;
- /** Affinity Awareness. */
- bool affinityAwareness;
+ /** Partition awareness. */
+ bool partitionAwareness;
};
}
}
diff --git a/modules/platforms/cpp/thin-client/project/vs/thin-client.vcxproj b/modules/platforms/cpp/thin-client/project/vs/thin-client.vcxproj
index 99b53ac..629de37 100644
--- a/modules/platforms/cpp/thin-client/project/vs/thin-client.vcxproj
+++ b/modules/platforms/cpp/thin-client/project/vs/thin-client.vcxproj
@@ -179,7 +179,7 @@
<ClInclude Include="..\..\include\ignite\thin\ignite_client_configuration.h" />
<ClInclude Include="..\..\include\ignite\thin\ssl_mode.h" />
<ClInclude Include="..\..\src\impl\affinity\affinity_assignment.h" />
- <ClInclude Include="..\..\src\impl\affinity\affinity_awareness_group.h" />
+ <ClInclude Include="..\..\src\impl\affinity\partition_awareness_group.h" />
<ClInclude Include="..\..\src\impl\affinity\affinity_manager.h" />
<ClInclude Include="..\..\src\impl\affinity\affinity_topology_version.h" />
<ClInclude Include="..\..\src\impl\affinity\cache_affinity_configs.h" />
diff --git a/modules/platforms/cpp/thin-client/project/vs/thin-client.vcxproj.filters b/modules/platforms/cpp/thin-client/project/vs/thin-client.vcxproj.filters
index 6721d94..a8cfbca 100644
--- a/modules/platforms/cpp/thin-client/project/vs/thin-client.vcxproj.filters
+++ b/modules/platforms/cpp/thin-client/project/vs/thin-client.vcxproj.filters
@@ -123,9 +123,6 @@
<ClInclude Include="..\..\src\impl\affinity\affinity_assignment.h">
<Filter>Code\impl\affinity</Filter>
</ClInclude>
- <ClInclude Include="..\..\src\impl\affinity\affinity_awareness_group.h">
- <Filter>Code\impl\affinity</Filter>
- </ClInclude>
<ClInclude Include="..\..\src\impl\affinity\affinity_topology_version.h">
<Filter>Code\impl\affinity</Filter>
</ClInclude>
@@ -138,5 +135,8 @@
<ClInclude Include="..\..\src\impl\affinity\affinity_manager.h">
<Filter>Code\impl\affinity</Filter>
</ClInclude>
+ <ClInclude Include="..\..\src\impl\affinity\partition_awareness_group.h">
+ <Filter>Code\impl\affinity</Filter>
+ </ClInclude>
</ItemGroup>
</Project>
\ No newline at end of file
diff --git a/modules/platforms/cpp/thin-client/src/impl/affinity/affinity_manager.cpp b/modules/platforms/cpp/thin-client/src/impl/affinity/affinity_manager.cpp
index 69f8e2e..6aa6baa 100644
--- a/modules/platforms/cpp/thin-client/src/impl/affinity/affinity_manager.cpp
+++ b/modules/platforms/cpp/thin-client/src/impl/affinity/affinity_manager.cpp
@@ -40,7 +40,7 @@ namespace ignite
ResetAffinity(ver);
}
- void AffinityManager::UpdateAffinity(const std::vector<AffinityAwarenessGroup>& groups,
+ void AffinityManager::UpdateAffinity(const std::vector<PartitionAwarenessGroup>& groups,
const AffinityTopologyVersion& ver)
{
if (topologyVersion > ver)
@@ -57,7 +57,7 @@ namespace ignite
CacheAffinityMap& newAffinity = *newAffinityPtr.Get();
- std::vector<AffinityAwarenessGroup>::const_iterator group;
+ std::vector<PartitionAwarenessGroup>::const_iterator group;
for (group = groups.begin(); group != groups.end(); ++group)
{
SP_AffinityAssignment newMapping(new AffinityAssignment(group->GetNodePartitions()));
diff --git a/modules/platforms/cpp/thin-client/src/impl/affinity/affinity_manager.h b/modules/platforms/cpp/thin-client/src/impl/affinity/affinity_manager.h
index 7429da3..a14ba0e 100644
--- a/modules/platforms/cpp/thin-client/src/impl/affinity/affinity_manager.h
+++ b/modules/platforms/cpp/thin-client/src/impl/affinity/affinity_manager.h
@@ -24,7 +24,7 @@
#include "impl/affinity/affinity_assignment.h"
#include "impl/affinity/affinity_topology_version.h"
-#include "impl/affinity/affinity_awareness_group.h"
+#include "impl/affinity/partition_awareness_group.h"
namespace ignite
{
@@ -55,10 +55,10 @@ namespace ignite
/**
* Update affinity.
*
- * @param groups Affinity awareness groups.
+ * @param groups Partition awareness groups.
* @param ver Affinity topology version.
*/
- void UpdateAffinity(const std::vector<AffinityAwarenessGroup>& groups, const AffinityTopologyVersion& ver);
+ void UpdateAffinity(const std::vector<PartitionAwarenessGroup>& groups, const AffinityTopologyVersion& ver);
/**
* Get affinity mapping for the cache.
diff --git a/modules/platforms/cpp/thin-client/src/impl/affinity/affinity_awareness_group.h b/modules/platforms/cpp/thin-client/src/impl/affinity/partition_awareness_group.h
similarity index 92%
rename from modules/platforms/cpp/thin-client/src/impl/affinity/affinity_awareness_group.h
rename to modules/platforms/cpp/thin-client/src/impl/affinity/partition_awareness_group.h
index 7ffe19f..43be387 100644
--- a/modules/platforms/cpp/thin-client/src/impl/affinity/affinity_awareness_group.h
+++ b/modules/platforms/cpp/thin-client/src/impl/affinity/partition_awareness_group.h
@@ -15,8 +15,8 @@
* limitations under the License.
*/
-#ifndef _IGNITE_IMPL_THIN_AFFINITY_AWARENESS_GROUP
-#define _IGNITE_IMPL_THIN_AFFINITY_AWARENESS_GROUP
+#ifndef _IGNITE_IMPL_THIN_PARTITION_AWARENESS_GROUP
+#define _IGNITE_IMPL_THIN_PARTITION_AWARENESS_GROUP
#include <stdint.h>
#include <vector>
@@ -33,15 +33,15 @@ namespace ignite
namespace thin
{
/**
- * Affinity awareness group.
+ * Partition awareness group.
*/
- class AffinityAwarenessGroup
+ class PartitionAwarenessGroup
{
public:
/**
* Default constructor.
*/
- AffinityAwarenessGroup() :
+ PartitionAwarenessGroup() :
applicable(true)
{
// No-op.
@@ -121,4 +121,4 @@ namespace ignite
}
}
-#endif //_IGNITE_IMPL_THIN_AFFINITY_AWARENESS_GROUP
\ No newline at end of file
+#endif //_IGNITE_IMPL_THIN_PARTITION_AWARENESS_GROUP
\ No newline at end of file
diff --git a/modules/platforms/cpp/thin-client/src/impl/cache/cache_client_impl.cpp b/modules/platforms/cpp/thin-client/src/impl/cache/cache_client_impl.cpp
index 9b43b82..1422707 100644
--- a/modules/platforms/cpp/thin-client/src/impl/cache/cache_client_impl.cpp
+++ b/modules/platforms/cpp/thin-client/src/impl/cache/cache_client_impl.cpp
@@ -51,7 +51,7 @@ namespace ignite
{
DataRouter& router0 = *router.Get();
- if (router0.IsAffinityAwarenessEnabled())
+ if (router0.IsPartitionAwarenessEnabled())
{
affinity::SP_AffinityAssignment affinityInfo = router0.GetAffinityAssignment(id);
diff --git a/modules/platforms/cpp/thin-client/src/impl/data_channel.h b/modules/platforms/cpp/thin-client/src/impl/data_channel.h
index d44c5a5..425071d 100644
--- a/modules/platforms/cpp/thin-client/src/impl/data_channel.h
+++ b/modules/platforms/cpp/thin-client/src/impl/data_channel.h
@@ -60,7 +60,7 @@ namespace ignite
/** Version 1.2.0. */
static const ProtocolVersion VERSION_1_2_0;
- /** Version 1.4.0. Added: Affinity Awareness support, IEP-23. */
+ /** Version 1.4.0. Added: Partition awareness support, IEP-23. */
static const ProtocolVersion VERSION_1_4_0;
/** Current version. */
diff --git a/modules/platforms/cpp/thin-client/src/impl/data_router.cpp b/modules/platforms/cpp/thin-client/src/impl/data_router.cpp
index 3a26519..ea672ad 100644
--- a/modules/platforms/cpp/thin-client/src/impl/data_router.cpp
+++ b/modules/platforms/cpp/thin-client/src/impl/data_router.cpp
@@ -149,7 +149,7 @@ namespace ignite
void DataRouter::RefreshAffinityMapping(const std::vector<int32_t>& cacheIds)
{
- std::vector<AffinityAwarenessGroup> groups;
+ std::vector<PartitionAwarenessGroup> groups;
CachePartitionsRequest req(cacheIds);
CachePartitionsResponse rsp(groups);
diff --git a/modules/platforms/cpp/thin-client/src/impl/data_router.h b/modules/platforms/cpp/thin-client/src/impl/data_router.h
index 4ab2834..2b27ae8 100644
--- a/modules/platforms/cpp/thin-client/src/impl/data_router.h
+++ b/modules/platforms/cpp/thin-client/src/impl/data_router.h
@@ -99,7 +99,7 @@ namespace ignite
{
const AffinityTopologyVersion* ver = rsp.GetAffinityTopologyVersion();
- if (ver != 0 && config.IsAffinityAwareness())
+ if (ver != 0 && config.IsPartitionAwareness())
affinityManager.UpdateAffinity(*ver);
}
@@ -182,13 +182,13 @@ namespace ignite
void RefreshAffinityMapping(const std::vector<int32_t>& cacheIds);
/**
- * Checked whether affinity awareness enabled.
+ * Checked whether partition awareness enabled.
*
- * @return @c true if affinity awareness enabled.
+ * @return @c true if partition awareness enabled.
*/
- bool IsAffinityAwarenessEnabled() const
+ bool IsPartitionAwarenessEnabled() const
{
- return config.IsAffinityAwareness();
+ return config.IsPartitionAwareness();
}
/**
diff --git a/modules/platforms/cpp/thin-client/src/impl/message.cpp b/modules/platforms/cpp/thin-client/src/impl/message.cpp
index 34bc608..39723bf 100644
--- a/modules/platforms/cpp/thin-client/src/impl/message.cpp
+++ b/modules/platforms/cpp/thin-client/src/impl/message.cpp
@@ -155,7 +155,7 @@ namespace ignite
nodeParts[i].Read(reader);
}
- CachePartitionsResponse::CachePartitionsResponse(std::vector<AffinityAwarenessGroup>& groups) :
+ CachePartitionsResponse::CachePartitionsResponse(std::vector<PartitionAwarenessGroup>& groups) :
groups(groups)
{
// No-op.
diff --git a/modules/platforms/cpp/thin-client/src/impl/message.h b/modules/platforms/cpp/thin-client/src/impl/message.h
index 104709c..8fdb867 100644
--- a/modules/platforms/cpp/thin-client/src/impl/message.h
+++ b/modules/platforms/cpp/thin-client/src/impl/message.h
@@ -30,7 +30,7 @@
#include "impl/protocol_version.h"
#include "impl/affinity/affinity_topology_version.h"
-#include "impl/affinity/affinity_awareness_group.h"
+#include "impl/affinity/partition_awareness_group.h"
namespace ignite
{
@@ -773,9 +773,9 @@ namespace ignite
/**
* Constructor.
*
- * @param groups Affinity Awareness Groups.
+ * @param groups Partition awareness Groups.
*/
- CachePartitionsResponse(std::vector<AffinityAwarenessGroup>& groups);
+ CachePartitionsResponse(std::vector<PartitionAwarenessGroup>& groups);
/**
* Destructor.
@@ -800,11 +800,11 @@ namespace ignite
}
/**
- * Get affinity awareness groups.
+ * Get partition awareness groups.
*
- * @return Affinity awareness groups.
+ * @return Partition awareness groups.
*/
- const std::vector<AffinityAwarenessGroup>& GetGroups() const
+ const std::vector<PartitionAwarenessGroup>& GetGroups() const
{
return groups;
}
@@ -813,8 +813,8 @@ namespace ignite
/** Affinity topology version. */
AffinityTopologyVersion topologyVersion;
- /** Affinity awareness groups. */
- std::vector<AffinityAwarenessGroup>& groups;
+ /** Partition awareness groups. */
+ std::vector<PartitionAwarenessGroup>& groups;
};
/**
diff --git a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.DotNetCore/Apache.Ignite.Core.Tests.DotNetCore.csproj b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.DotNetCore/Apache.Ignite.Core.Tests.DotNetCore.csproj
index aa46ef9..119a001 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests.DotNetCore/Apache.Ignite.Core.Tests.DotNetCore.csproj
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests.DotNetCore/Apache.Ignite.Core.Tests.DotNetCore.csproj
@@ -96,8 +96,8 @@
<Compile Include="..\Apache.Ignite.Core.Tests\Cache\Query\Linq\CacheLinqTestSimpleName.cs" Link="Cache\Query\Linq\CacheLinqTestSimpleName.cs" />
<Compile Include="..\Apache.Ignite.Core.Tests\Cache\Query\Linq\CacheLinqTestSqlEscapeAll.cs" Link="Cache\Query\Linq\CacheLinqTestSqlEscapeAll.cs" />
<Compile Include="..\Apache.Ignite.Core.Tests\Cache\TestReferenceObject.cs" Link="Cache\TestReferenceObject.cs" />
- <Compile Include="..\Apache.Ignite.Core.Tests\Client\Cache\AffinityAwarenessTest.cs">
- <Link>ThinClient\Cache\AffinityAwarenessTest.cs</Link>
+ <Compile Include="..\Apache.Ignite.Core.Tests\Client\Cache\PartitionAwarenessTest.cs">
+ <Link>ThinClient\Cache\PartitionAwarenessTest.cs</Link>
</Compile>
<Compile Include="..\Apache.Ignite.Core.Tests\Client\Cache\BinaryBuilderTest.cs" Link="ThinClient\Cache\BinaryBuilderTest.cs" />
<Compile Include="..\Apache.Ignite.Core.Tests\Client\Cache\CacheTest.cs" Link="ThinClient\Cache\CacheTest.cs" />
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 93%
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..f48afe3 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
@@ -33,9 +33,9 @@ namespace Apache.Ignite.Core.Tests.Client.Cache
using NUnit.Framework;
/// <summary>
- /// Tests affinity awareness functionality.
+ /// Tests partition 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.
}
@@ -180,14 +180,19 @@ namespace Apache.Ignite.Core.Tests.Client.Cache
// Warm-up.
Assert.AreEqual(1, _cache.Get(1));
+
+ // Get default node index by performing non-partition-aware operation.
+ _cache.GetAll(Enumerable.Range(1, 10));
+ var defaultNodeIdx = GetClientRequestGridIndex("GetAll");
+ Assert.Greater(defaultNodeIdx, -1);
// Assert: keys 12 and 14 belong to a new node now, but we don't have the new node in the server list.
// Requests are routed to default node.
Assert.AreEqual(12, _cache.Get(12));
- Assert.AreEqual(1, GetClientRequestGridIndex());
+ Assert.AreEqual(defaultNodeIdx, GetClientRequestGridIndex());
Assert.AreEqual(14, _cache.Get(14));
- Assert.AreEqual(1, GetClientRequestGridIndex());
+ Assert.AreEqual(defaultNodeIdx, GetClientRequestGridIndex());
}
}
@@ -257,7 +262,7 @@ namespace Apache.Ignite.Core.Tests.Client.Cache
_cache.Get(1);
_cache.Get(1);
- var requests = GetCacheRequestNames(_loggers[1]).ToArray();
+ var requests = _loggers.SelectMany(GetCacheRequestNames).ToArray();
var expectedRequests = new[]
{
@@ -267,14 +272,13 @@ namespace Apache.Ignite.Core.Tests.Client.Cache
"Get"
};
- Assert.AreEqual(expectedRequests, requests);
+ CollectionAssert.AreEquivalent(expectedRequests, requests);
}
-
[Test]
public void ReplicatedCacheGet_RepeatedCall_DoesNotRequestAffinityMapping()
{
- // Test cache for which affinity awareness is not applicable.
+ // Test cache for which partition awareness is not applicable.
var cfg = new CacheClientConfiguration("replicated_cache") {CacheMode = CacheMode.Replicated};
var cache = Client.CreateCache<int, int>(cfg);
@@ -292,7 +296,7 @@ namespace Apache.Ignite.Core.Tests.Client.Cache
.Where(r => r.Requests.Length > 0)
.ToArray();
- // All requests should go to a single (default) node, because affinity awareness is not applicable.
+ // All requests should go to a single (default) node, because partition awareness is not applicable.
Assert.AreEqual(1, reqs.Length);
// There should be only one partitions request.
@@ -308,10 +312,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))
{
@@ -327,7 +331,7 @@ namespace Apache.Ignite.Core.Tests.Client.Cache
.Distinct()
.ToArray();
- // Affinity awareness disabled - all requests go to same socket, picked with round-robin on connect.
+ // Partition awareness disabled - all requests go to same socket, picked with round-robin on connect.
Assert.AreEqual(1, requestTargets.Length);
}
}
@@ -446,7 +450,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..8135d86 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientReconnectCompatibilityTest.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core.Tests/Client/ClientReconnectCompatibilityTest.cs
@@ -32,7 +32,7 @@ namespace Apache.Ignite.Core.Tests.Client
public class ClientReconnectCompatibilityTest
{
/// <summary>
- /// Tests that client reconnect to an old server node disables affinity awareness.
+ /// Tests that client reconnect to an old server node disables partition awareness.
/// </summary>
[Test]
public void TestReconnectToOldNodeDisablesPartitionAwareness()
@@ -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..c602be5 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;
}
@@ -209,14 +209,14 @@ namespace Apache.Ignite.Core.Client
public string Password { get; set; }
/// <summary>
- /// Gets or sets a value indicating whether affinity awareness should be enabled.
+ /// Gets or sets a value indicating whether partition awareness should be enabled.
/// <para />
/// Default is false: only one connection is established at a given moment to a random server node.
/// When true: for cache operations, Ignite client attempts to send the request directly to
/// 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/CacheClient.cs b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/Cache/CacheClient.cs
index 9f186bb..a4e361d 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/Cache/CacheClient.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/Cache/CacheClient.cs
@@ -605,7 +605,7 @@ namespace Apache.Ignite.Core.Impl.Client.Cache
}
/// <summary>
- /// Does the out op with affinity awareness.
+ /// Does the out op with partition awareness.
/// </summary>
private void DoOutOpAffinity(ClientOp opId, TK key)
{
@@ -613,7 +613,7 @@ namespace Apache.Ignite.Core.Impl.Client.Cache
}
/// <summary>
- /// Does the out op with affinity awareness.
+ /// Does the out op with partition awareness.
/// </summary>
private void DoOutOpAffinity(ClientOp opId, TK key, TV val)
{
@@ -621,7 +621,7 @@ namespace Apache.Ignite.Core.Impl.Client.Cache
}
/// <summary>
- /// Does the out op with affinity awareness.
+ /// Does the out op with partition awareness.
/// </summary>
private Task DoOutOpAsync(ClientOp opId, Action<BinaryWriter> writeAction = null)
{
@@ -629,7 +629,7 @@ namespace Apache.Ignite.Core.Impl.Client.Cache
}
/// <summary>
- /// Does the out op with affinity awareness.
+ /// Does the out op with partition awareness.
/// </summary>
private Task DoOutOpAffinityAsync(ClientOp opId, TK key, Action<BinaryWriter> writeAction = null)
{
@@ -647,7 +647,7 @@ namespace Apache.Ignite.Core.Impl.Client.Cache
}
/// <summary>
- /// Does the out in op with affinity awareness.
+ /// Does the out in op with partition awareness.
/// </summary>
private T DoOutInOpAffinity<T>(ClientOp opId, TK key, Func<IBinaryStream, T> readFunc)
{
@@ -661,7 +661,7 @@ namespace Apache.Ignite.Core.Impl.Client.Cache
}
/// <summary>
- /// Does the out in op with affinity awareness.
+ /// Does the out in op with partition awareness.
/// </summary>
private T DoOutInOpAffinity<T>(ClientOp opId, TK key, Action<BinaryWriter> writeAction,
Func<IBinaryStream, T> readFunc)
@@ -676,7 +676,7 @@ namespace Apache.Ignite.Core.Impl.Client.Cache
}
/// <summary>
- /// Does the out in op with affinity awareness.
+ /// Does the out in op with partition awareness.
/// </summary>
private T DoOutInOpAffinity<T>(ClientOp opId, TK key, TV val, Func<IBinaryStream, T> readFunc)
{
@@ -704,7 +704,7 @@ namespace Apache.Ignite.Core.Impl.Client.Cache
}
/// <summary>
- /// Does the out in op with affinity awareness.
+ /// Does the out in op with partition awareness.
/// </summary>
private Task<T> DoOutInOpAffinityAsync<T>(ClientOp opId, TK key, Action<BinaryWriter> writeAction,
Func<IBinaryStream, T> readFunc)
@@ -714,7 +714,7 @@ namespace Apache.Ignite.Core.Impl.Client.Cache
}
/// <summary>
- /// Does the out in op with affinity awareness.
+ /// Does the out in op with partition awareness.
/// </summary>
private Task<T> DoOutInOpAffinityAsync<T>(ClientOp opId, TK key, TV val, Func<IBinaryStream, T> readFunc)
{
@@ -732,7 +732,7 @@ namespace Apache.Ignite.Core.Impl.Client.Cache
}
/// <summary>
- /// Does the out in op with affinity awareness.
+ /// Does the out in op with partition awareness.
/// </summary>
private Task<T> DoOutInOpAffinityAsync<T>(ClientOp opId, TK key, Func<IBinaryStream, T> readFunc)
{
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..0ed2392 100644
--- a/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/ClientFailoverSocket.cs
+++ b/modules/platforms/dotnet/Apache.Ignite.Core/Impl/Client/ClientFailoverSocket.cs
@@ -116,7 +116,7 @@ namespace Apache.Ignite.Core.Impl.Client
}
/// <summary>
- /// Performs a send-receive operation with affinity awareness.
+ /// Performs a send-receive operation with partition awareness.
/// </summary>
public T DoOutInOpAffinity<T, TKey>(
ClientOp opId,
@@ -132,7 +132,7 @@ namespace Apache.Ignite.Core.Impl.Client
}
/// <summary>
- /// Performs an async send-receive operation with affinity awareness.
+ /// Performs an async send-receive operation with partition awareness.
/// </summary>
public Task<T> DoOutInOpAffinityAsync<T, TKey>(
ClientOp opId,
@@ -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)
{