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 028d5c3 Rename in Java
028d5c3 is described below
commit 028d5c3b0b603a25f25402896924bf32d872b591
Author: Pavel <[email protected]>
AuthorDate: Wed Dec 25 18:35:23 2019 +0300
Rename in Java
---
.../ignite/configuration/ClientConfiguration.java | 12 +++++-----
.../internal/client/thin/ReliableChannel.java | 10 ++++-----
.../processors/odbc/jdbc/JdbcRequestHandler.java | 2 +-
.../sql/optimizer/affinity/PartitionResult.java | 4 ++--
... ThinClientAbstractPartitionAwarenessTest.java} | 4 ++--
...lientPartitionAwarenessStableTopologyTest.java} | 2 +-
...entPartitionAwarenessUnstableTopologyTest.java} | 26 +++++++++++-----------
.../org/apache/ignite/client/ClientTestSuite.java | 8 +++----
8 files changed, 34 insertions(+), 34 deletions(-)
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..7dff7c7 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
@@ -99,7 +99,7 @@ public final class ClientConfiguration implements
Serializable {
* 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}
@@ -438,17 +438,17 @@ public final class ClientConfiguration implements
Serializable {
/**
* @return Whether affinity 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/thin/ReliableChannel.java
b/modules/core/src/main/java/org/apache/ignite/internal/client/thin/ReliableChannel.java
index abcf484..3227532 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
@@ -58,7 +58,7 @@ final class ReliableChannel implements AutoCloseable {
private int curChIdx;
/** Affinity awareness enabled. */
- private final boolean affinityAwarenessEnabled;
+ private final boolean partitionAwarenessEnabled;
/** Cache affinity awareness context. */
private final ClientCacheAffinityContext affinityCtx;
@@ -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/processors/odbc/jdbc/JdbcRequestHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java
index 0bb89d3..d465b5d 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
@@ -1485,7 +1485,7 @@ public class JdbcRequestHandler implements
ClientListenerRequestHandler {
* b. Partition result tree neither PartitoinAllNode nor
PartitionNoneNode;
*/
private static boolean isClientAffinityAwarenessApplicable(boolean
partResRequested, PartitionResult partRes) {
- return partResRequested && (partRes == null ||
partRes.isClientAffinityAwarenessApplicable());
+ return partResRequested && (partRes == null ||
partRes.isClientPartitionAwarenessApplicable());
}
/** {@inheritDoc} */
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..0fdbf8e 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
@@ -158,11 +158,11 @@ 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() {
+ public boolean isClientPartitionAwarenessApplicable() {
return aff != null && aff.isClientAffinityAwarenessApplicable() &&
!(tree instanceof PartitionNoneNode) && !(tree instanceof
PartitionAllNode);
}
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..36486f0 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
@@ -45,7 +45,7 @@ import static
org.apache.ignite.configuration.ClientConnectorConfiguration.DFLT_
/**
* Abstract thin client affinity 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 98%
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..6046397 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
@@ -26,7 +26,7 @@ import org.junit.Test;
/**
* Test affinity 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();
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 90%
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..26d5f47 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
@@ -30,7 +30,7 @@ import org.junit.Test;
/**
* Test affinity 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();
@@ -42,7 +42,7 @@ public class ThinClientAffinityAwarenessUnstableTopologyTest
extends ThinClientA
* Test that join of the new node is detected by the client and affects
affinity awareness.
*/
@Test
- public void testAffinityAwarenessOnNodeJoin() throws Exception {
+ public void testPartitionAwarenessOnNodeJoin() throws Exception {
startGrids(3);
awaitPartitionMapExchange();
@@ -50,7 +50,7 @@ public class ThinClientAffinityAwarenessUnstableTopologyTest
extends ThinClientA
initClient(getClientConfiguration(1, 2, 3), 1, 2);
// Test affinity awareness before node join.
- testAffinityAwareness(true);
+ testPartitionAwareness(true);
assertNull(channels[3]);
@@ -78,14 +78,14 @@ public class
ThinClientAffinityAwarenessUnstableTopologyTest extends ThinClientA
assertOpOnChannel(channels[3], ClientOperation.CACHE_PUT);
// Test affinity awareness after node join.
- testAffinityAwareness(false);
+ testPartitionAwareness(false);
}
/**
* Test that node left event affects affinity awareness.
*/
@Test
- public void testAffinityAwarenessOnNodeLeft() throws Exception {
+ public void testPartitionAwarenessOnNodeLeft() throws Exception {
startGrids(4);
awaitPartitionMapExchange();
@@ -93,7 +93,7 @@ public class ThinClientAffinityAwarenessUnstableTopologyTest
extends ThinClientA
initClient(getClientConfiguration(1, 2, 3), 1, 2, 3);
// Test affinity awareness before node left.
- testAffinityAwareness(true);
+ testPartitionAwareness(true);
stopGrid(3);
@@ -105,7 +105,7 @@ public class
ThinClientAffinityAwarenessUnstableTopologyTest extends ThinClientA
initDefaultChannel();
// Test affinity awareness after node join.
- testAffinityAwareness(true);
+ testPartitionAwareness(true);
}
/**
@@ -120,7 +120,7 @@ public class
ThinClientAffinityAwarenessUnstableTopologyTest extends ThinClientA
initClient(getClientConfiguration(0, 1), 0, 1);
// Test affinity awareness before connection to node lost.
- testAffinityAwareness(true);
+ testPartitionAwareness(true);
// Choose node to disconnect (not default node).
int disconnectNodeIdx = dfltCh == channels[0] ? 1 : 0;
@@ -152,14 +152,14 @@ public class
ThinClientAffinityAwarenessUnstableTopologyTest extends ThinClientA
assertOpOnChannel(channels[disconnectNodeIdx],
ClientOperation.CACHE_PUT);
// Test affinity awareness.
- testAffinityAwareness(false);
+ testPartitionAwareness(false);
}
/**
* Test that affinity 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();
@@ -167,7 +167,7 @@ public class
ThinClientAffinityAwarenessUnstableTopologyTest extends ThinClientA
initClient(getClientConfiguration(0, 1, 2), 0, 1, 2);
// Test affinity awareness before cluster restart.
- testAffinityAwareness(true);
+ 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.
