This is an automated email from the ASF dual-hosted git repository.
ptupitsyn pushed a commit to branch ignite-12458
in repository https://gitbox.apache.org/repos/asf/ignite.git
The following commit(s) were added to refs/heads/ignite-12458 by this push:
new 7e13bed Rename in comments
7e13bed is described below
commit 7e13bede70c8a426f8e3fc58f7e60a4fd83413bf
Author: Pavel <[email protected]>
AuthorDate: Wed Dec 25 20:14:02 2019 +0300
Rename in comments
---
...eJdbcThinDriverPartitionAwarenessTestSuite.java | 4 ++--
.../jdbc/thin/JdbcThinConnectionSelfTest.java | 12 ++++++------
...onAwarenessReconnectionAndFailoverSelfTest.java | 8 ++++----
.../thin/JdbcThinPartitionAwarenessSelfTest.java | 8 ++++----
...ThinPartitionAwarenessTransactionsSelfTest.java | 2 +-
.../ignite/configuration/ClientConfiguration.java | 4 ++--
.../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 | 6 +++---
.../internal/jdbc/thin/ConnectionProperties.java | 12 ++++++------
.../jdbc/thin/ConnectionPropertiesImpl.java | 2 +-
.../internal/jdbc/thin/JdbcThinConnection.java | 2 +-
.../odbc/jdbc/JdbcConnectionContext.java | 2 +-
.../platform/client/ClientConnectionContext.java | 2 +-
.../client/cache/ClientCachePartitionsRequest.java | 8 ++++----
.../sql/optimizer/affinity/PartitionResult.java | 6 +++---
.../ThinClientAbstractPartitionAwarenessTest.java | 2 +-
...ClientPartitionAwarenessStableTopologyTest.java | 14 +++++++-------
...ientPartitionAwarenessUnstableTopologyTest.java | 22 +++++++++++-----------
23 files changed, 68 insertions(+), 68 deletions(-)
diff --git
a/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcThinDriverPartitionAwarenessTestSuite.java
b/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcThinDriverPartitionAwarenessTestSuite.java
index 87cd79b..1e7fdb5 100644
---
a/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcThinDriverPartitionAwarenessTestSuite.java
+++
b/modules/clients/src/test/java/org/apache/ignite/jdbc/suite/IgniteJdbcThinDriverPartitionAwarenessTestSuite.java
@@ -30,7 +30,7 @@ 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({
@@ -43,7 +43,7 @@ import org.junit.runners.Suite;
})
public class IgniteJdbcThinDriverPartitionAwarenessTestSuite {
/**
- * Setup affinity awareness mode.
+ * Setup partition awareness mode.
*/
@BeforeClass
public static void setupPartitionAwareness() {
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 57b0cd0..7eaf0ec 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
@@ -93,10 +93,10 @@ public class JdbcThinConnectionSelfTest extends
JdbcThinAbstractSelfTest {
"jdbc:ignite:thin://127.0.0.1:10800..10802" :
"jdbc:ignite:thin://127.0.0.1";
- /** URL with affinity awareness property. */
+ /** URL with partition awareness property. */
private String urlWithPartitionAwarenessProp = url +
"?partitionAwareness=" + partitionAwareness;
- /** URL with affinity awareness property and semicolon as delimiter. */
+ /** URL with partition awareness property and semicolon as delimiter. */
private String urlWithPartitionAwarenessPropSemicolon = url +
";partitionAwareness=" + partitionAwareness;
/** Nodes count. */
@@ -280,7 +280,7 @@ public class JdbcThinConnectionSelfTest extends
JdbcThinAbstractSelfTest {
}
/**
- * Test affinity awareness Sql cache size property.
+ * Test partition awareness Sql cache size property.
*
* @throws Exception If failed.
*/
@@ -302,7 +302,7 @@ public class JdbcThinConnectionSelfTest extends
JdbcThinAbstractSelfTest {
}
/**
- * Test affinity awareness Sql cache size property with semicolon.
+ * Test partition awareness Sql cache size property with semicolon.
*
* @throws Exception If failed.
*/
@@ -324,7 +324,7 @@ public class JdbcThinConnectionSelfTest extends
JdbcThinAbstractSelfTest {
}
/**
- * Test affinity awareness partition distributions cache size property.
+ * Test partition awareness partition distributions cache size property.
*
* @throws Exception If failed.
*/
@@ -348,7 +348,7 @@ public class JdbcThinConnectionSelfTest extends
JdbcThinAbstractSelfTest {
}
/**
- * Test affinity awareness partition distributions cache size property
with semicolon.
+ * Test partition awareness partition distributions cache size property
with semicolon.
*
* @throws Exception If failed.
*/
diff --git
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPartitionAwarenessReconnectionAndFailoverSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPartitionAwarenessReconnectionAndFailoverSelfTest.java
index e9fe3b0..748a1c1 100644
---
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPartitionAwarenessReconnectionAndFailoverSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPartitionAwarenessReconnectionAndFailoverSelfTest.java
@@ -52,7 +52,7 @@ import org.junit.Test;
import static org.apache.ignite.cache.CacheMode.PARTITIONED;
/**
- * Jdbc thin affinity awareness reconnection and query failover test.
+ * Jdbc thin partition awareness reconnection and query failover test.
*/
public class JdbcThinPartitionAwarenessReconnectionAndFailoverSelfTest extends
JdbcThinAbstractSelfTest {
/** Rows count. */
@@ -87,7 +87,7 @@ public class
JdbcThinPartitionAwarenessReconnectionAndFailoverSelfTest extends J
/**
* Check that background connection establishment works as expected.
* <p>
- * Within new reconnection logic in affinity awareness mode when {@code
JdbcThinConnection} is created it eagerly
+ * Within new reconnection logic in partition awareness mode when {@code
JdbcThinConnection} is created it eagerly
* establishes a connection to one and only one ignite node. All other
connections to nodes specified in connection
* properties are established by background thread.
* <p>
@@ -392,11 +392,11 @@ public class
JdbcThinPartitionAwarenessReconnectionAndFailoverSelfTest extends J
* <li>Create {@code JdbcThinConnection} to all existing nodes.</li>
* <li>Create a cache and populate it with some data.</li>
* <li>Submit some failover-applicable sql query with specific condition
within where clause,
- * that assumes affinity awareness. Submit same query one more time. It's
necessary in order to warm up affinity
+ * that assumes partition awareness. Submit same query one more time. It's
necessary in order to warm up affinity
* awareness cache.</li>
* <li>From within affinity cache calculate node that was used to process
query. Stop it.</li>
* <li>Submit sql query, that is equal to initial one, one more time.
- * Because of affinity awareness, given query will be routed to previously
stopped node, so an Exception will be
+ * Because of partition awareness, given query will be routed to
previously stopped node, so an Exception will be
* received. Here query failover goes and resents query to an alive node
using another {@code JdbcThinTcpIo}</li>
* <li>Because of failover, no exceptions are expected on Jdbc thin client
side.
* However within the {@code JdbcThinConnection}, in case of {@code
Level.FINE} log level, corresponding log record
diff --git
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPartitionAwarenessSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPartitionAwarenessSelfTest.java
index 0f0abb6..9edfb8d 100644
---
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPartitionAwarenessSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPartitionAwarenessSelfTest.java
@@ -297,7 +297,7 @@ public class JdbcThinPartitionAwarenessSelfTest 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 JdbcThinPartitionAwarenessSelfTest 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 JdbcThinPartitionAwarenessSelfTest 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.
*/
@@ -557,7 +557,7 @@ public class JdbcThinPartitionAwarenessSelfTest extends
JdbcThinAbstractSelfTest
/**
* Check that partitionAwarenessSQLCacheSize and
partitionAwarenessPartitionDistributionsCacheSize
- * actually limit corresponding caches within affinity awareness cache.
+ * actually limit corresponding caches within partition awareness cache.
*
* @throws Exception If failed.
*/
diff --git
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPartitionAwarenessTransactionsSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPartitionAwarenessTransactionsSelfTest.java
index 1ab9359..2941c0a 100644
---
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPartitionAwarenessTransactionsSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinPartitionAwarenessTransactionsSelfTest.java
@@ -37,7 +37,7 @@ import org.jetbrains.annotations.NotNull;
import org.junit.Test;
/**
- * Jdbc thin transactional affinity awareness test.
+ * Jdbc thin transactional partition awareness test.
*/
public class JdbcThinPartitionAwarenessTransactionsSelfTest extends
JdbcThinAbstractSelfTest {
/** */
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 7dff7c7..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,7 +93,7 @@ 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.
@@ -436,7 +436,7 @@ public final class ClientConfiguration implements
Serializable {
}
/**
- * @return Whether affinity awareness should be enabled.
+ * @return Whether partition awareness should be enabled.
*/
public boolean isPartitionAwarenessEnabled() {
return partitionAwarenessEnabled;
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 3227532..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. */
+ /** Partition awareness enabled. */
private final boolean partitionAwarenessEnabled;
- /** Cache affinity awareness context. */
+ /** Cache partition awareness context. */
private final ClientCacheAffinityContext affinityCtx;
/** Node channels. */
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 3cd3cc5..8e567ee 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,13 +407,13 @@ 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 isPartitionAwareness();
/**
- * @param partitionAwareness {@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 setPartitionAwareness(boolean partitionAwareness);
@@ -434,12 +434,12 @@ public interface ConnectionProperties {
public void setUpdateBatchSize(@Nullable Integer updateBatchSize) throws
SQLException;
/**
- * @return SQL cache size that is used within affinity awareness
optimizations.
+ * @return SQL cache size that is used within partition awareness
optimizations.
*/
public int getPartitionAwarenessSqlCacheSize();
/**
- * Sets SQL cache size that is used within affinity awareness
optimizations.
+ * Sets SQL cache size that is used within partition awareness
optimizations.
*
* @param partitionAwarenessSqlCacheSize SQL cache size.
* @throws SQLException On error.
@@ -447,12 +447,12 @@ public interface ConnectionProperties {
public void setPartitionAwarenessSqlCacheSize(int
partitionAwarenessSqlCacheSize) throws SQLException;
/**
- * @return Partition distributions cache size that is used within affinity
awareness optimizations.
+ * @return Partition distributions cache size that is used within
partition awareness optimizations.
*/
public int getPartitionAwarenessPartitionDistributionsCacheSize();
/**
- * Sets partition distributions cache size that is used within affinity
awareness optimizations.
+ * Sets partition distributions cache size that is used within partition
awareness optimizations.
*
* @param partitionAwarenessPartDistributionsCacheSize Partition
distributions cache size.
* @throws SQLException On error.
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 c171cb7..bde0c2b 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,7 +189,7 @@ 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. */
+ /** Partition awareness flag. */
private BooleanProperty partitionAwareness = new BooleanProperty(
"partitionAwareness",
"Whether jdbc thin partition awareness is enabled.",
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 74850bd..1ce1f7b 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
@@ -1669,7 +1669,7 @@ public class JdbcThinConnection implements Connection {
throw new SQLException("Failed to connect to
Ignite node [url=" +
connProps.getUrl() + "]. address = [" +
addr + ':' + port + "]." +
- "Node doesn't support affinity awareness
mode.",
+ "Node doesn't support partition awareness
mode.",
INTERNAL_ERROR);
}
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/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/ClientCachePartitionsRequest.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/platform/client/cache/ClientCachePartitionsRequest.java
index 23aec77..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
@@ -108,7 +108,7 @@ 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 ClientCachePartitionAwarenessGroup processCache(
@@ -154,10 +154,10 @@ public class ClientCachePartitionsRequest extends
ClientRequest {
}
/**
- * 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 ClientCachePartitionAwarenessGroup
getCompatibleGroup(
List<ClientCachePartitionAwarenessGroup> groups,
@@ -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/sql/optimizer/affinity/PartitionResult.java
b/modules/core/src/main/java/org/apache/ignite/internal/sql/optimizer/affinity/PartitionResult.java
index e5fe10d..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;
/**
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientAbstractPartitionAwarenessTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientAbstractPartitionAwarenessTest.java
index 36486f0..04c961c 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientAbstractPartitionAwarenessTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientAbstractPartitionAwarenessTest.java
@@ -43,7 +43,7 @@ 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 ThinClientAbstractPartitionAwarenessTest extends
GridCommonAbstractTest {
/** Wait timeout. */
diff --git
a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientPartitionAwarenessStableTopologyTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientPartitionAwarenessStableTopologyTest.java
index 6046397..f501647 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientPartitionAwarenessStableTopologyTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientPartitionAwarenessStableTopologyTest.java
@@ -24,7 +24,7 @@ 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 ThinClientPartitionAwarenessStableTopologyTest extends
ThinClientAbstractPartitionAwarenessTest {
/** {@inheritDoc} */
@@ -45,7 +45,7 @@ public class ThinClientPartitionAwarenessStableTopologyTest
extends ThinClientAb
}
/**
- * 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 ThinClientPartitionAwarenessStableTopologyTest
extends ThinClientAb
}
/**
- * 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 ThinClientPartitionAwarenessStableTopologyTest
extends ThinClientAb
}
/**
- * 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 ThinClientPartitionAwarenessStableTopologyTest
extends ThinClientAb
}
/**
- * 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 ThinClientPartitionAwarenessStableTopologyTest
extends ThinClientAb
}
/**
- * 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 ThinClientPartitionAwarenessStableTopologyTest
extends ThinClientAb
}
/**
- * 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/ThinClientPartitionAwarenessUnstableTopologyTest.java
b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientPartitionAwarenessUnstableTopologyTest.java
index 26d5f47..bcb7c37 100644
---
a/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientPartitionAwarenessUnstableTopologyTest.java
+++
b/modules/core/src/test/java/org/apache/ignite/internal/client/thin/ThinClientPartitionAwarenessUnstableTopologyTest.java
@@ -28,7 +28,7 @@ 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 ThinClientPartitionAwarenessUnstableTopologyTest extends
ThinClientAbstractPartitionAwarenessTest {
/** {@inheritDoc} */
@@ -39,7 +39,7 @@ public class ThinClientPartitionAwarenessUnstableTopologyTest
extends ThinClient
}
/**
- * 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 testPartitionAwarenessOnNodeJoin() throws Exception {
@@ -49,7 +49,7 @@ public class ThinClientPartitionAwarenessUnstableTopologyTest
extends ThinClient
initClient(getClientConfiguration(1, 2, 3), 1, 2);
- // Test affinity awareness before node join.
+ // Test partition awareness before node join.
testPartitionAwareness(true);
assertNull(channels[3]);
@@ -77,12 +77,12 @@ public class
ThinClientPartitionAwarenessUnstableTopologyTest extends ThinClient
assertOpOnChannel(channels[3], ClientOperation.CACHE_PUT);
- // Test affinity awareness after node join.
+ // 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 testPartitionAwarenessOnNodeLeft() throws Exception {
@@ -92,7 +92,7 @@ public class ThinClientPartitionAwarenessUnstableTopologyTest
extends ThinClient
initClient(getClientConfiguration(1, 2, 3), 1, 2, 3);
- // Test affinity awareness before node left.
+ // Test partition awareness before node left.
testPartitionAwareness(true);
stopGrid(3);
@@ -104,7 +104,7 @@ public class
ThinClientPartitionAwarenessUnstableTopologyTest extends ThinClient
// Next request will also detect topology change.
initDefaultChannel();
- // Test affinity awareness after node join.
+ // Test partition awareness after node join.
testPartitionAwareness(true);
}
@@ -119,7 +119,7 @@ public class
ThinClientPartitionAwarenessUnstableTopologyTest extends ThinClient
initClient(getClientConfiguration(0, 1), 0, 1);
- // Test affinity awareness before connection to node lost.
+ // Test partition awareness before connection to node lost.
testPartitionAwareness(true);
// Choose node to disconnect (not default node).
@@ -151,12 +151,12 @@ public class
ThinClientPartitionAwarenessUnstableTopologyTest extends ThinClient
// Connection to disconnected node should be restored after retry.
assertOpOnChannel(channels[disconnectNodeIdx],
ClientOperation.CACHE_PUT);
- // Test affinity awareness.
+ // 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 testPartitionAwarenessOnClusterRestart() throws Exception {
@@ -166,7 +166,7 @@ public class
ThinClientPartitionAwarenessUnstableTopologyTest extends ThinClient
initClient(getClientConfiguration(0, 1, 2), 0, 1, 2);
- // Test affinity awareness before cluster restart.
+ // Test partition awareness before cluster restart.
testPartitionAwareness(true);
stopAllGrids();
