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 18013df Rename in Java
18013df is described below
commit 18013dfe7ad5b35fb7710a46bb0742009ec7a2b8
Author: Pavel <[email protected]>
AuthorDate: Wed Dec 25 18:42:10 2019 +0300
Rename in Java
---
.../IgniteJdbcThinDriverPartitionAwarenessTestSuite.java | 2 +-
.../apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java | 2 +-
...nPartitionAwarenessReconnectionAndFailoverSelfTest.java | 14 +++++++-------
.../jdbc/thin/JdbcThinPartitionAwarenessSelfTest.java | 12 ++++++------
.../JdbcThinPartitionAwarenessTransactionsSelfTest.java | 2 +-
.../apache/ignite/jdbc/thin/JdbcThinStatementSelfTest.java | 4 ++--
.../apache/ignite/internal/jdbc/thin/AffinityCache.java | 8 ++++----
.../ignite/internal/jdbc/thin/ConnectionProperties.java | 4 ++--
.../internal/jdbc/thin/ConnectionPropertiesImpl.java | 8 ++++----
.../ignite/internal/jdbc/thin/JdbcThinConnection.java | 6 +++---
.../jdbc/thin/JdbcThinPartitionAwarenessMappingGroup.java | 4 ++--
11 files changed, 33 insertions(+), 33 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 0574001..87cd79b 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
@@ -47,6 +47,6 @@ public class IgniteJdbcThinDriverPartitionAwarenessTestSuite {
*/
@BeforeClass
public static void setupPartitionAwareness() {
- GridTestUtils.setFieldValue(JdbcThinAbstractSelfTest.class,
"affinityAwareness", true);
+ GridTestUtils.setFieldValue(JdbcThinAbstractSelfTest.class,
"partitionAwareness", true);
}
}
diff --git
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
index aeae500..e3872a1 100644
---
a/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
+++
b/modules/clients/src/test/java/org/apache/ignite/jdbc/thin/JdbcThinMetadataSelfTest.java
@@ -72,7 +72,7 @@ public class JdbcThinMetadataSelfTest extends
JdbcThinAbstractSelfTest {
/** URL with partition awareness enabled. */
public static final String URL_PARTITION_AWARENESS =
- "jdbc:ignite:thin://127.0.0.1:10800..10801?affinityAwareness=true";
+ "jdbc:ignite:thin://127.0.0.1:10800..10801?partitionAwareness=true";
/** {@inheritDoc} */
@Override protected IgniteConfiguration getConfiguration(String
igniteInstanceName) throws Exception {
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 3c992cd..e9fe3b0 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
@@ -59,10 +59,10 @@ public class
JdbcThinPartitionAwarenessReconnectionAndFailoverSelfTest extends J
private static final int ROWS_COUNT = 100;
/** 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";
/** URL with port. */
- public static final String URL_WITH_ONE_PORT =
"jdbc:ignite:thin://127.0.0.1:10800?affinityAwareness=true";
+ public static final String URL_WITH_ONE_PORT =
"jdbc:ignite:thin://127.0.0.1:10800?partitionAwareness=true";
/** Nodes count. */
private static final int INITIAL_NODES_CNT = 3;
@@ -237,7 +237,7 @@ public class
JdbcThinPartitionAwarenessReconnectionAndFailoverSelfTest extends J
@Test
public void testReconnectionDelayIncreasing() throws Exception {
try (Connection ignored = DriverManager.getConnection(
-
"jdbc:ignite:thin://127.0.0.1:10800,127.0.0.1:10810?affinityAwareness=true")) {
+
"jdbc:ignite:thin://127.0.0.1:10800,127.0.0.1:10810?partitionAwareness=true")) {
logHnd.records.clear();
doSleep(9 * JdbcThinConnection.RECONNECTION_DELAY);
@@ -288,7 +288,7 @@ public class
JdbcThinPartitionAwarenessReconnectionAndFailoverSelfTest extends J
@Test
public void testReconnectionDelaySelectiveIncreasing() throws Exception {
try (Connection conn = DriverManager.getConnection(
-
"jdbc:ignite:thin://127.0.0.1:10800..10801?affinityAwareness=true")) {
+
"jdbc:ignite:thin://127.0.0.1:10800..10801?partitionAwareness=true")) {
// Stop one node and invalidate corresponding connection. Ensure
that only one connection left.
stopGrid(0);
@@ -408,7 +408,7 @@ public class
JdbcThinPartitionAwarenessReconnectionAndFailoverSelfTest extends J
@Test
public void testQueryFailover() throws Exception {
try (Connection conn = DriverManager.getConnection(
-
"jdbc:ignite:thin://127.0.0.1:10800..10802?affinityAwareness=true")) {
+
"jdbc:ignite:thin://127.0.0.1:10800..10802?partitionAwareness=true")) {
final String cacheName = UUID.randomUUID().toString().substring(0,
6);
@@ -470,7 +470,7 @@ public class
JdbcThinPartitionAwarenessReconnectionAndFailoverSelfTest extends J
@Test
public void testFailoverOnAllNodes() throws Exception {
try (Connection conn = DriverManager.getConnection(
-
"jdbc:ignite:thin://127.0.0.1:10800..10802?affinityAwareness=true")) {
+
"jdbc:ignite:thin://127.0.0.1:10800..10802?partitionAwareness=true")) {
Map<UUID, JdbcThinTcpIo> ios = GridTestUtils.getFieldValue(conn,
"ios");
assertConnectionsCount(ios, 3);
@@ -516,7 +516,7 @@ public class
JdbcThinPartitionAwarenessReconnectionAndFailoverSelfTest extends J
startGrid(5);
try (Connection conn = DriverManager.getConnection(
-
"jdbc:ignite:thin://127.0.0.1:10800..10805?affinityAwareness=true")) {
+
"jdbc:ignite:thin://127.0.0.1:10800..10805?partitionAwareness=true")) {
Map<UUID, JdbcThinTcpIo> ios = GridTestUtils.getFieldValue(conn,
"ios");
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 ac1e1ad..0f0abb6 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
@@ -61,7 +61,7 @@ import static org.apache.ignite.cache.CacheMode.PARTITIONED;
@SuppressWarnings({"ThrowableNotThrown"})
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;
@@ -428,14 +428,14 @@ public class JdbcThinPartitionAwarenessSelfTest extends
JdbcThinAbstractSelfTest
}
/**
- * Check that client side partition 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 testPartitionAwarenessIsSkippedIfItIsSwitchedOff() throws
Exception {
try (Connection conn = DriverManager.getConnection(
-
"jdbc:ignite:thin://127.0.0.1:10800..10802?affinityAwareness=false");
+
"jdbc:ignite:thin://127.0.0.1:10800..10802?partitionAwareness=false");
Statement stmt = conn.createStatement()) {
final String cacheName = "yac";
@@ -556,7 +556,7 @@ public class JdbcThinPartitionAwarenessSelfTest extends
JdbcThinAbstractSelfTest
}
/**
- * Check that affinityAwarenessSQLCacheSize and
affinityAwarenessPartitionDistributionsCacheSize
+ * Check that partitionAwarenessSQLCacheSize and
partitionAwarenessPartitionDistributionsCacheSize
* actually limit corresponding caches within affinity awareness cache.
*
* @throws Exception If failed.
@@ -564,8 +564,8 @@ public class JdbcThinPartitionAwarenessSelfTest extends
JdbcThinAbstractSelfTest
@Test
public void testPartitionAwarenessLimitedCacheSize() throws Exception {
try (Connection conn = DriverManager.getConnection(
- "jdbc:ignite:thin://127.0.0.1:10800..10802?affinityAwareness=true"
+
-
"&affinityAwarenessSQLCacheSize=1&affinityAwarenessPartitionDistributionsCacheSize=1");
+
"jdbc:ignite:thin://127.0.0.1:10800..10802?partitionAwareness=true" +
+
"&partitionAwarenessSQLCacheSize=1&partitionAwarenessPartitionDistributionsCacheSize=1");
Statement stmt = conn.createStatement()) {
final String cacheName1 =
UUID.randomUUID().toString().substring(0, 6);
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 cf10bae..1ab9359 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
@@ -41,7 +41,7 @@ import org.junit.Test;
*/
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 8a8e852..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
@@ -45,8 +45,8 @@ import static
org.apache.ignite.cache.CacheWriteSynchronizationMode.FULL_SYNC;
public class JdbcThinStatementSelfTest extends JdbcThinAbstractSelfTest {
/** URL. */
private String url = partitionAwareness ?
- "jdbc:ignite:thin://127.0.0.1:10800..10802?affinityAwareness=true" :
- "jdbc:ignite:thin://127.0.0.1?affinityAwareness=false";
+ "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 = partitionAwareness ? 4 : 3;
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/AffinityCache.java
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/AffinityCache.java
index d13df12..3e45c77 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/AffinityCache.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/AffinityCache.java
@@ -41,13 +41,13 @@ public final class AffinityCache {
*
* @param ver Affinity topology version.
*/
- public AffinityCache(AffinityTopologyVersion ver, int
affinityAwarenessPartDistributionsCacheSize,
- int affinityAwarenessSQLCacheSize) {
+ public AffinityCache(AffinityTopologyVersion ver, int
partitionAwarenessPartDistributionsCacheSize,
+ int partitionAwarenessSQLCacheSize) {
this.ver = ver;
- cachePartitionsDistribution = new
GridBoundedLinkedHashMap<>(affinityAwarenessPartDistributionsCacheSize);
+ cachePartitionsDistribution = new
GridBoundedLinkedHashMap<>(partitionAwarenessPartDistributionsCacheSize);
- sqlCache = new
GridBoundedLinkedHashMap<>(affinityAwarenessSQLCacheSize);
+ sqlCache = new
GridBoundedLinkedHashMap<>(partitionAwarenessSQLCacheSize);
}
/**
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 832e650..3cd3cc5 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
@@ -441,10 +441,10 @@ public interface ConnectionProperties {
/**
* Sets SQL cache size that is used within affinity awareness
optimizations.
*
- * @param affinityAwarenessSqlCacheSize SQL cache size.
+ * @param partitionAwarenessSqlCacheSize SQL cache size.
* @throws SQLException On error.
*/
- public void setPartitionAwarenessSqlCacheSize(int
affinityAwarenessSqlCacheSize) throws SQLException;
+ public void setPartitionAwarenessSqlCacheSize(int
partitionAwarenessSqlCacheSize) throws SQLException;
/**
* @return Partition distributions cache size that is used within affinity
awareness optimizations.
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 a1f38e5..c171cb7 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
@@ -551,8 +551,8 @@ public class ConnectionPropertiesImpl implements
ConnectionProperties, Serializa
}
/** {@inheritDoc} */
- @Override public void setPartitionAwareness(boolean affinityAwareness) {
- this.partitionAwareness.setValue(affinityAwareness);
+ @Override public void setPartitionAwareness(boolean partitionAwareness) {
+ this.partitionAwareness.setValue(partitionAwareness);
}
/** {@inheritDoc} */
@@ -571,9 +571,9 @@ public class ConnectionPropertiesImpl implements
ConnectionProperties, Serializa
}
/** {@inheritDoc} */
- @Override public void setPartitionAwarenessSqlCacheSize(int
affinityAwarenessSQLCacheSize)
+ @Override public void setPartitionAwarenessSqlCacheSize(int
partitionAwarenessSqlCacheSize)
throws SQLException {
-
this.partitionAwarenessSQLCacheSize.setValue(affinityAwarenessSQLCacheSize);
+
this.partitionAwarenessSQLCacheSize.setValue(partitionAwarenessSqlCacheSize);
}
/** {@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 26adc18..74850bd 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
@@ -1040,12 +1040,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;
}
}
diff --git
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinPartitionAwarenessMappingGroup.java
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinPartitionAwarenessMappingGroup.java
index 1335d68..389acb7 100644
---
a/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinPartitionAwarenessMappingGroup.java
+++
b/modules/core/src/main/java/org/apache/ignite/internal/jdbc/thin/JdbcThinPartitionAwarenessMappingGroup.java
@@ -142,11 +142,11 @@ public class JdbcThinPartitionAwarenessMappingGroup
implements JdbcRawBinaryliza
}
/**
- * Reads <code>JdbcThinAffinityAwarenessMappingGroup</code> from provided
reader.
+ * Reads <code>JdbcThinPartitionAwarenessMappingGroup</code> from provided
reader.
*
* @param reader Binary object reader.
* @param ver Protocol version.
- * @return Deserialized instance of
<code>JdbcThinAffinityAwarenessMappingGroup</code>.
+ * @return Deserialized instance of
<code>JdbcThinPartitionAwarenessMappingGroup</code>.
* @throws BinaryObjectException In case of error.
*/
public static JdbcThinPartitionAwarenessMappingGroup
readGroup(BinaryReaderExImpl reader,
