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 3f6c32b Rename in Java
3f6c32b is described below
commit 3f6c32ba83057a8af90538a222b741296750b992
Author: Pavel <[email protected]>
AuthorDate: Wed Dec 25 18:39:17 2019 +0300
Rename in Java
---
.../ignite/jdbc/thin/JdbcThinMetadataSelfTest.java | 6 ++--
.../jdbc/thin/ConnectionPropertiesImpl.java | 38 +++++++++++-----------
.../internal/jdbc/thin/JdbcThinConnection.java | 36 ++++++++++----------
...=> JdbcThinPartitionAwarenessMappingGroup.java} | 12 +++----
.../ignite/internal/jdbc/thin/JdbcThinTcpIo.java | 4 +--
.../odbc/jdbc/JdbcCachePartitionsResult.java | 14 ++++----
.../processors/odbc/jdbc/JdbcRequestHandler.java | 14 ++++----
...ava => ClientCachePartitionAwarenessGroup.java} | 6 ++--
.../client/cache/ClientCachePartitionsRequest.java | 22 ++++++-------
.../cache/ClientCachePartitionsResponse.java | 6 ++--
.../sql/optimizer/affinity/PartitionResult.java | 2 +-
.../affinity/PartitionTableAffinityDescriptor.java | 4 +--
12 files changed, 82 insertions(+), 82 deletions(-)
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 aad627a..aeae500 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
@@ -70,8 +70,8 @@ public class JdbcThinMetadataSelfTest extends
JdbcThinAbstractSelfTest {
/** URL. */
private static final String URL = "jdbc:ignite:thin://127.0.0.1/";
- /** URL with affinity awareness enabled. */
- public static final String URL_AFFINITY_AWARENESS =
+ /** URL with partition awareness enabled. */
+ public static final String URL_PARTITION_AWARENESS =
"jdbc:ignite:thin://127.0.0.1:10800..10801?affinityAwareness=true";
/** {@inheritDoc} */
@@ -1242,7 +1242,7 @@ public class JdbcThinMetadataSelfTest extends
JdbcThinAbstractSelfTest {
conn.getMetaData().getDriverVersion(),
IgniteVersionUtils.VER.toString());
}
- try (Connection conn =
DriverManager.getConnection(URL_AFFINITY_AWARENESS)) {
+ try (Connection conn =
DriverManager.getConnection(URL_PARTITION_AWARENESS)) {
assertEquals("Unexpected ignite database product version.",
conn.getMetaData().getDatabaseProductVersion(),
IgniteVersionUtils.VER.toString());
assertEquals("Unexpected ignite driver version.",
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 6c67416..a1f38e5 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
@@ -190,9 +190,9 @@ public class ConnectionPropertiesImpl implements
ConnectionProperties, Serializa
null, false);
/** Affinity awareness flag. */
- private BooleanProperty affinityAwareness = new BooleanProperty(
- "affinityAwareness",
- "Whether jdbc thin affinity awareness is enabled.",
+ 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). */
@@ -201,15 +201,15 @@ public class ConnectionPropertiesImpl implements
ConnectionProperties, Serializa
"Set to 1 to prevent deadlock on update where keys sequence are
different " +
"in several concurrent updates.", null, false, 1,
Integer.MAX_VALUE);
- /** Affinity awareness SQL cache size. */
- private IntegerProperty affinityAwarenessSQLCacheSize = new
IntegerProperty("affinityAwarenessSQLCacheSize",
- "The size of sql cache that is used within affinity awareness
optimization.",
+ /** Partition awareness SQL cache size. */
+ private IntegerProperty partitionAwarenessSQLCacheSize = new
IntegerProperty("partitionAwarenessSQLCacheSize",
+ "The size of sql cache that is used within partition awareness
optimization.",
1_000, false, 1, Integer.MAX_VALUE);
- /** Affinity awareness partition distributions cache size. */
- private IntegerProperty affinityAwarenessPartDistributionsCacheSize = new
IntegerProperty(
- "affinityAwarenessPartitionDistributionsCacheSize",
- "The size of partition distributions cache that is used within
affinity awareness optimization.",
+ /** Partition awareness partition distributions cache size. */
+ private IntegerProperty partitionAwarenessPartDistributionsCacheSize = new
IntegerProperty(
+ "partitionAwarenessPartitionDistributionsCacheSize",
+ "The size of partition distributions cache that is used within
partition awareness optimization.",
1_000, false, 1, Integer.MAX_VALUE);
/** Query timeout. */
@@ -234,10 +234,10 @@ public class ConnectionPropertiesImpl implements
ConnectionProperties, Serializa
sslTrustAll, sslFactory,
user, passwd,
dataPageScanEnabled,
- affinityAwareness,
+ partitionAwareness,
updateBatchSize,
- affinityAwarenessSQLCacheSize,
- affinityAwarenessPartDistributionsCacheSize,
+ partitionAwarenessSQLCacheSize,
+ partitionAwarenessPartDistributionsCacheSize,
qryTimeout,
connTimeout
};
@@ -547,12 +547,12 @@ public class ConnectionPropertiesImpl implements
ConnectionProperties, Serializa
/** {@inheritDoc} */
@Override public boolean isPartitionAwareness() {
- return affinityAwareness.value();
+ return partitionAwareness.value();
}
/** {@inheritDoc} */
@Override public void setPartitionAwareness(boolean affinityAwareness) {
- this.affinityAwareness.setValue(affinityAwareness);
+ this.partitionAwareness.setValue(affinityAwareness);
}
/** {@inheritDoc} */
@@ -567,24 +567,24 @@ public class ConnectionPropertiesImpl implements
ConnectionProperties, Serializa
/** {@inheritDoc} */
@Override public int getPartitionAwarenessSqlCacheSize() {
- return affinityAwarenessSQLCacheSize.value();
+ return partitionAwarenessSQLCacheSize.value();
}
/** {@inheritDoc} */
@Override public void setPartitionAwarenessSqlCacheSize(int
affinityAwarenessSQLCacheSize)
throws SQLException {
-
this.affinityAwarenessSQLCacheSize.setValue(affinityAwarenessSQLCacheSize);
+
this.partitionAwarenessSQLCacheSize.setValue(affinityAwarenessSQLCacheSize);
}
/** {@inheritDoc} */
@Override public int
getPartitionAwarenessPartitionDistributionsCacheSize() {
- return affinityAwarenessPartDistributionsCacheSize.value();
+ return partitionAwarenessPartDistributionsCacheSize.value();
}
/** {@inheritDoc} */
@Override public void setPartitionAwarenessPartitionDistributionsCacheSize(
int partitionAwarenessPartDistributionsCacheSize) throws SQLException {
- this.affinityAwarenessPartDistributionsCacheSize.setValue(
+ this.partitionAwarenessPartDistributionsCacheSize.setValue(
partitionAwarenessPartDistributionsCacheSize);
}
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 7b24610..26adc18 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
@@ -137,8 +137,8 @@ public class JdbcThinConnection implements Connection {
/** No retries. */
public static final int NO_RETRIES = 0;
- /** 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();
@@ -235,9 +235,9 @@ public class JdbcThinConnection implements Connection {
schema = JdbcUtils.normalizeSchema(connProps.getSchema());
- affinityAwareness = connProps.isPartitionAwareness();
+ partitionAwareness = connProps.isPartitionAwareness();
- if (affinityAwareness) {
+ if (partitionAwareness) {
baseEndpointVer = connectInBestEffortAffinityMode(null);
connectionsHndScheduledFut =
maintenanceExecutor.scheduleWithFixedDelay(new ConnectionHandlerTask(),
@@ -261,7 +261,7 @@ public class JdbcThinConnection implements Connection {
assert ios.isEmpty();
- if (affinityAwareness)
+ if (partitionAwareness)
connectInBestEffortAffinityMode(baseEndpointVer);
else
connectInCommonMode();
@@ -499,7 +499,7 @@ public class JdbcThinConnection implements Connection {
SQLException err = null;
- if (affinityAwareness) {
+ if (partitionAwareness) {
for (JdbcThinTcpIo clioIo : ios.values())
clioIo.close();
@@ -830,7 +830,7 @@ public class JdbcThinConnection implements Connection {
netTimeout = ms;
- if (affinityAwareness) {
+ if (partitionAwareness) {
for (JdbcThinTcpIo clioIo : ios.values())
clioIo.timeout(ms);
}
@@ -859,7 +859,7 @@ public class JdbcThinConnection implements Connection {
* @return Ignite server version.
*/
IgniteProductVersion igniteVersion() {
- if (affinityAwareness) {
+ if (partitionAwareness) {
return
ios.values().stream().map(JdbcThinTcpIo::igniteVersion).min(IgniteProductVersion::compareTo).
orElse(baseEndpointVer);
}
@@ -1004,7 +1004,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;
@@ -1085,14 +1085,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
distribution 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);
@@ -1205,7 +1205,7 @@ public class JdbcThinConnection implements Connection {
private void onDisconnect(JdbcThinTcpIo cliIo) {
assert connCnt.get() > 0;
- if (affinityAwareness) {
+ if (partitionAwareness) {
cliIo.close();
ios.remove(cliIo.nodeId());
@@ -1457,7 +1457,7 @@ public class JdbcThinConnection implements Connection {
* @return True if query cancellation supported, false otherwise.
*/
boolean isQueryCancellationSupported() {
- return affinityAwareness || singleIo.isQueryCancellationSupported();
+ return partitionAwareness || singleIo.isQueryCancellationSupported();
}
/**
@@ -1465,7 +1465,7 @@ public class JdbcThinConnection implements Connection {
* @return Ignite endpoint to use for request/response transferring.
*/
private JdbcThinTcpIo cliIo(List<UUID> nodeIds) {
- if (!affinityAwareness)
+ if (!partitionAwareness)
return singleIo;
if (txIo != null)
@@ -1664,7 +1664,7 @@ public class JdbcThinConnection implements Connection {
JdbcThinTcpIo cliIo =
new JdbcThinTcpIo(connProps, new
InetSocketAddress(addr, port), 0);
- if (!cliIo.isAffinityAwarenessSupported()) {
+ if (!cliIo.isPartitionAwarenessSupported()) {
cliIo.close();
throw new SQLException("Failed to connect to
Ignite node [url=" +
@@ -1727,7 +1727,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)) {
@@ -1770,7 +1770,7 @@ public class JdbcThinConnection implements Connection {
* @return retries count.
*/
private int calculateRetryAttemptsCount(JdbcThinTcpIo stickyIo,
JdbcRequest req) {
- if (!affinityAwareness)
+ if (!partitionAwareness)
return NO_RETRIES;
if (stickyIo != null)
@@ -1911,7 +1911,7 @@ public class JdbcThinConnection implements Connection {
JdbcThinTcpIo cliIo =
new JdbcThinTcpIo(connProps, new
InetSocketAddress(addr, port), 0);
- if (!cliIo.isAffinityAwarenessSupported())
{
+ if
(!cliIo.isPartitionAwarenessSupported()) {
processDelay(sockAddr);
LOG.log(Level.WARNING, "Failed to
connect to Ignite node [url=" +
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 91%
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 55a8b31..1335d68 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;
@@ -149,9 +149,9 @@ public class JdbcThinAffinityAwarenessMappingGroup
implements JdbcRawBinarylizab
* @return Deserialized instance of
<code>JdbcThinAffinityAwarenessMappingGroup</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 7663a80..8711182 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
@@ -600,9 +600,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/JdbcRequestHandler.java
b/modules/core/src/main/java/org/apache/ignite/internal/processors/odbc/jdbc/JdbcRequestHandler.java
index d465b5d..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,13 +1478,13 @@ 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) {
+ private static boolean isClientPartitionAwarenessApplicable(boolean
partResRequested, PartitionResult partRes) {
return partResRequested && (partRes == null ||
partRes.isClientPartitionAwarenessApplicable());
}
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..23aec77 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)
@@ -111,17 +111,17 @@ public class ClientCachePartitionsRequest extends
ClientRequest {
* @return Null if cache was processed and new client cache affinity
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,7 +150,7 @@ public class ClientCachePartitionsRequest extends
ClientRequest {
CacheObjectBinaryProcessorImpl proc =
(CacheObjectBinaryProcessorImpl)ctx.kernalContext().cacheObjects();
- return new ClientCacheAffinityAwarenessGroup(proc, mapping, cacheDesc);
+ return new ClientCachePartitionAwarenessGroup(proc, mapping,
cacheDesc);
}
/**
@@ -159,10 +159,10 @@ public class ClientCachePartitionsRequest extends
ClientRequest {
* @param mapping Partition mapping.
* @return Compatible cache affinity 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;
}
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 0fdbf8e..e5fe10d 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
@@ -163,7 +163,7 @@ public class PartitionResult {
* 2. Partition result tree neither PartitoinAllNode nor
PartitionNoneNode;
*/
public boolean isClientPartitionAwarenessApplicable() {
- return aff != null && aff.isClientAffinityAwarenessApplicable() &&
+ 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;
}
