You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by sh...@apache.org on 2016/11/07 08:05:48 UTC
ignite git commit: IGNITE-3066: Modifications pointed by the 1st
round of reviews.
Repository: ignite
Updated Branches:
refs/heads/ignite-2788 0cd6723d2 -> 091c52b19
IGNITE-3066: Modifications pointed by the 1st round of reviews.
Project: http://git-wip-us.apache.org/repos/asf/ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/ignite/commit/091c52b1
Tree: http://git-wip-us.apache.org/repos/asf/ignite/tree/091c52b1
Diff: http://git-wip-us.apache.org/repos/asf/ignite/diff/091c52b1
Branch: refs/heads/ignite-2788
Commit: 091c52b19e7269a5cfb1a7e2547ee9bd65997d62
Parents: 0cd6723
Author: shtykh_roman <rs...@yahoo.com>
Authored: Mon Nov 7 17:04:44 2016 +0900
Committer: shtykh_roman <rs...@yahoo.com>
Committed: Mon Nov 7 17:04:44 2016 +0900
----------------------------------------------------------------------
modules/clients/pom.xml | 1 +
.../tcp/redis/RedisProtocolSelfTest.java | 6 +-
.../configuration/IgniteConfiguration.java | 122 +++++++++----------
.../ignite/internal/GridKernalContext.java | 10 +-
.../exception/GridRedisGenericException.java | 17 +++
.../redis/exception/GridRedisTypeException.java | 17 +++
.../protocols/tcp/GridClientPacketType.java | 2 +-
.../rest/protocols/tcp/GridTcpRestParser.java | 4 +-
.../protocols/tcp/redis/GridRedisMessage.java | 2 +-
.../tcp/redis/GridRedisProtocolParser.java | 10 +-
10 files changed, 113 insertions(+), 78 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ignite/blob/091c52b1/modules/clients/pom.xml
----------------------------------------------------------------------
diff --git a/modules/clients/pom.xml b/modules/clients/pom.xml
index 16437fe..2e29cc0 100644
--- a/modules/clients/pom.xml
+++ b/modules/clients/pom.xml
@@ -59,6 +59,7 @@
<groupId>redis.clients</groupId>
<artifactId>jedis</artifactId>
<version>2.9.0</version>
+ <scope>test</scope>
</dependency>
<dependency>
http://git-wip-us.apache.org/repos/asf/ignite/blob/091c52b1/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolSelfTest.java
index 0f11967..d686b5c 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/RedisProtocolSelfTest.java
@@ -38,6 +38,9 @@ import redis.clients.jedis.exceptions.JedisDataException;
* Tests for Redis protocol.
*/
public class RedisProtocolSelfTest extends GridCommonAbstractTest {
+ /** Grid count. */
+ private static final int GRID_CNT = 2;
+
/** IP finder. */
private static final TcpDiscoveryIpFinder IP_FINDER = new TcpDiscoveryVmIpFinder(true);
@@ -113,9 +116,6 @@ public class RedisProtocolSelfTest extends GridCommonAbstractTest {
return grid(0).cache(null);
}
- /** Grid count. */
- private static final int GRID_CNT = 1;
-
/** {@inheritDoc} */
protected int gridCount() {
return GRID_CNT;
http://git-wip-us.apache.org/repos/asf/ignite/blob/091c52b1/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
index 949235d..6d35d21 100644
--- a/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
+++ b/modules/core/src/main/java/org/apache/ignite/configuration/IgniteConfiguration.java
@@ -560,7 +560,7 @@ public class IgniteConfiguration {
* provided.
*
* @return Optional grid name. Can be {@code null}, which is default grid name, if
- * non-default grid name was not provided.
+ * non-default grid name was not provided.
*/
public String getGridName() {
return gridName;
@@ -610,7 +610,7 @@ public class IgniteConfiguration {
* Sets grid name. Note that {@code null} is a default grid name.
*
* @param gridName Grid name to set. Can be {@code null}, which is default
- * grid name.
+ * grid name.
* @return {@code this} for chaining.
*/
public IgniteConfiguration setGridName(String gridName) {
@@ -668,8 +668,8 @@ public class IgniteConfiguration {
* Sets user attributes for this node.
*
* @param userAttrs User attributes for this node.
- * @return {@code this} for chaining.
* @see IgniteConfiguration#getUserAttributes()
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setUserAttributes(Map<String, ?> userAttrs) {
this.userAttrs = userAttrs;
@@ -692,8 +692,8 @@ public class IgniteConfiguration {
* Sets logger to use within grid.
*
* @param log Logger to use within grid.
- * @return {@code this} for chaining.
* @see IgniteConfiguration#getGridLogger()
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setGridLogger(IgniteLogger log) {
this.log = log;
@@ -709,7 +709,7 @@ public class IgniteConfiguration {
* If not provided, executor service will have size {@link #DFLT_PUBLIC_THREAD_CNT}.
*
* @return Thread pool size to be used in grid to process job execution
- * requests and user messages sent to the node.
+ * requests and user messages sent to the node.
*/
public int getPublicThreadPoolSize() {
return pubPoolSize;
@@ -747,7 +747,7 @@ public class IgniteConfiguration {
* If not provided, executor service will have size {@link #DFLT_MGMT_THREAD_CNT}
*
* @return Thread pool size to be used in grid for internal and Visor
- * jobs processing.
+ * jobs processing.
*/
public int getManagementThreadPoolSize() {
return mgmtPoolSize;
@@ -761,7 +761,7 @@ public class IgniteConfiguration {
* If not provided, executor service will have size {@link #DFLT_P2P_THREAD_CNT}.
*
* @return Thread pool size to be used for peer class loading
- * requests handling.
+ * requests handling.
*/
public int getPeerClassLoadingThreadPoolSize() {
return p2pPoolSize;
@@ -826,8 +826,8 @@ public class IgniteConfiguration {
* Sets thread pool size to use within grid.
*
* @param poolSize Thread pool size to use within grid.
- * @return {@code this} for chaining.
* @see IgniteConfiguration#getPublicThreadPoolSize()
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setPublicThreadPoolSize(int poolSize) {
pubPoolSize = poolSize;
@@ -839,8 +839,8 @@ public class IgniteConfiguration {
* Sets system thread pool size to use within grid.
*
* @param poolSize Thread pool size to use within grid.
- * @return {@code this} for chaining.
* @see IgniteConfiguration#getSystemThreadPoolSize()
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setSystemThreadPoolSize(int poolSize) {
sysPoolSize = poolSize;
@@ -866,8 +866,8 @@ public class IgniteConfiguration {
* Sets management thread pool size to use within grid.
*
* @param poolSize Thread pool size to use within grid.
- * @return {@code this} for chaining.
* @see IgniteConfiguration#getManagementThreadPoolSize()
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setManagementThreadPoolSize(int poolSize) {
mgmtPoolSize = poolSize;
@@ -879,8 +879,8 @@ public class IgniteConfiguration {
* Sets thread pool size to use for peer class loading.
*
* @param poolSize Thread pool size to use within grid.
- * @return {@code this} for chaining.
* @see IgniteConfiguration#getPeerClassLoadingThreadPoolSize()
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setPeerClassLoadingThreadPoolSize(int poolSize) {
p2pPoolSize = poolSize;
@@ -892,8 +892,8 @@ public class IgniteConfiguration {
* Set thread pool size that will be used to process outgoing IGFS messages.
*
* @param poolSize Executor service to use for outgoing IGFS messages.
- * @return {@code this} for chaining.
* @see IgniteConfiguration#getIgfsThreadPoolSize()
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setIgfsThreadPoolSize(int poolSize) {
igfsPoolSize = poolSize;
@@ -905,9 +905,9 @@ public class IgniteConfiguration {
* Sets default thread pool size that will be used to process utility cache messages.
*
* @param poolSize Default executor service size to use for utility cache messages.
- * @return {@code this} for chaining.
* @see IgniteConfiguration#getUtilityCacheThreadPoolSize()
* @see IgniteConfiguration#getUtilityCacheKeepAliveTime()
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setUtilityCachePoolSize(int poolSize) {
utilityCachePoolSize = poolSize;
@@ -919,9 +919,9 @@ public class IgniteConfiguration {
* Sets keep alive time of thread pool size that will be used to process utility cache messages.
*
* @param keepAliveTime Keep alive time of executor service to use for utility cache messages.
- * @return {@code this} for chaining.
* @see IgniteConfiguration#getUtilityCacheThreadPoolSize()
* @see IgniteConfiguration#getUtilityCacheKeepAliveTime()
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setUtilityCacheKeepAliveTime(long keepAliveTime) {
utilityCacheKeepAliveTime = keepAliveTime;
@@ -933,9 +933,9 @@ public class IgniteConfiguration {
* Sets default thread pool size that will be used to process marshaller messages.
*
* @param poolSize Default executor service size to use for marshaller messages.
- * @return {@code this} for chaining.
* @see IgniteConfiguration#getMarshallerCacheThreadPoolSize()
* @see IgniteConfiguration#getMarshallerCacheKeepAliveTime()
+ * @return {@code this} for chaining.
* @deprecated Use {@link #setMarshallerCacheThreadPoolSize(int)} instead.
*/
@Deprecated
@@ -947,9 +947,9 @@ public class IgniteConfiguration {
* Sets default thread pool size that will be used to process marshaller messages.
*
* @param poolSize Default executor service size to use for marshaller messages.
- * @return {@code this} for chaining.
* @see IgniteConfiguration#getMarshallerCacheThreadPoolSize()
* @see IgniteConfiguration#getMarshallerCacheKeepAliveTime()
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setMarshallerCacheThreadPoolSize(int poolSize) {
marshCachePoolSize = poolSize;
@@ -961,9 +961,9 @@ public class IgniteConfiguration {
* Sets maximum thread pool size that will be used to process marshaller messages.
*
* @param keepAliveTime Keep alive time of executor service to use for marshaller messages.
- * @return {@code this} for chaining.
* @see IgniteConfiguration#getMarshallerCacheThreadPoolSize()
* @see IgniteConfiguration#getMarshallerCacheKeepAliveTime()
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setMarshallerCacheKeepAliveTime(long keepAliveTime) {
marshCacheKeepAliveTime = keepAliveTime;
@@ -978,7 +978,7 @@ public class IgniteConfiguration {
* will be thrown.
*
* @return Ignite installation home or {@code null} to make the system attempt to
- * infer it automatically.
+ * infer it automatically.
* @see IgniteSystemProperties#IGNITE_HOME
*/
public String getIgniteHome() {
@@ -991,6 +991,7 @@ public class IgniteConfiguration {
* @param igniteHome {@code Ignition} installation folder.
* @see IgniteConfiguration#getIgniteHome()
* @see IgniteSystemProperties#IGNITE_HOME
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setIgniteHome(String igniteHome) {
this.igniteHome = igniteHome;
@@ -1019,7 +1020,6 @@ public class IgniteConfiguration {
* @param igniteWorkDir {@code Ignite} work directory.
* @see IgniteConfiguration#getWorkDirectory()
* @return {@code this} for chaining.
- * @see IgniteConfiguration#getWorkDirectory()
*/
public IgniteConfiguration setWorkDirectory(String igniteWorkDir) {
this.igniteWorkDir = igniteWorkDir;
@@ -1064,8 +1064,8 @@ public class IgniteConfiguration {
* Sets unique identifier for local node.
*
* @param nodeId Unique identifier for local node.
- * @return {@code this} for chaining.
* @see IgniteConfiguration#getNodeId()
+ * @return {@code this} for chaining.
* @deprecated Use {@link #setConsistentId(Serializable)} instead.
*/
@Deprecated
@@ -1090,8 +1090,8 @@ public class IgniteConfiguration {
* Sets marshaller to use within grid.
*
* @param marsh Marshaller to use within grid.
- * @return {@code this} for chaining.
* @see IgniteConfiguration#getMarshaller()
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setMarshaller(Marshaller marsh) {
this.marsh = marsh;
@@ -1099,6 +1099,7 @@ public class IgniteConfiguration {
return this;
}
+
/**
* Returns {@code true} if peer class loading is enabled, {@code false}
* otherwise. Default value is {@code false} specified by {@link #DFLT_P2P_ENABLED}.
@@ -1111,7 +1112,7 @@ public class IgniteConfiguration {
* See {@link ComputeTask} documentation for more information about task deployment.
*
* @return {@code true} if peer class loading is enabled, {@code false}
- * otherwise.
+ * otherwise.
*/
public boolean isPeerClassLoadingEnabled() {
return p2pEnabled;
@@ -1145,7 +1146,7 @@ public class IgniteConfiguration {
* Enables/disables peer class loading.
*
* @param p2pEnabled {@code true} if peer class loading is
- * enabled, {@code false} otherwise.
+ * enabled, {@code false} otherwise.
* @return {@code this} for chaining.
*/
public IgniteConfiguration setPeerClassLoadingEnabled(boolean p2pEnabled) {
@@ -1172,7 +1173,7 @@ public class IgniteConfiguration {
* loaded even if they exist locally.
*
* @param p2pLocClsPathExcl List of P2P loaded packages. Package
- * name supports '*' at the end like in package import clause.
+ * name supports '*' at the end like in package import clause.
* @return {@code this} for chaining.
*/
public IgniteConfiguration setPeerClassLoadingLocalClassPathExclude(String... p2pLocClsPathExcl) {
@@ -1198,9 +1199,9 @@ public class IgniteConfiguration {
* If not explicitly set, then default value is {@code 10,000}.
*
* @param metricsHistSize Number of metrics kept in history to use for
- * metric totals and averages calculations.
- * @return {@code this} for chaining.
+ * metric totals and averages calculations.
* @see #DFLT_METRICS_HISTORY_SIZE
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setMetricsHistorySize(int metricsHistSize) {
this.metricsHistSize = metricsHistSize;
@@ -1215,10 +1216,10 @@ public class IgniteConfiguration {
* <p>
* The following values are accepted:
* <ul>
- * <li>{@code -1} job metrics are never updated.</li>
- * <li>{@code 0} job metrics are updated on each job start and finish.</li>
- * <li>Positive value defines the actual update frequency. If not provided, then default value
- * {@link #DFLT_METRICS_UPDATE_FREQ} is used.</li>
+ * <li>{@code -1} job metrics are never updated.</li>
+ * <li>{@code 0} job metrics are updated on each job start and finish.</li>
+ * <li>Positive value defines the actual update frequency. If not provided, then default value
+ * {@link #DFLT_METRICS_UPDATE_FREQ} is used.</li>
* </ul>
* If not provided, then default value {@link #DFLT_METRICS_UPDATE_FREQ} is used.
*
@@ -1264,8 +1265,8 @@ public class IgniteConfiguration {
* If not set explicitly, then default value is {@code 600,000} milliseconds (10 minutes).
*
* @param metricsExpTime The metricsExpTime to set.
- * @return {@code this} for chaining.
* @see #DFLT_METRICS_EXPIRE_TIME
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setMetricsExpireTime(long metricsExpTime) {
this.metricsExpTime = metricsExpTime;
@@ -1293,8 +1294,8 @@ public class IgniteConfiguration {
* {@link #DFLT_NETWORK_TIMEOUT} is used.
*
* @param netTimeout Maximum timeout for network requests.
- * @return {@code this} for chaining.
* @see #DFLT_NETWORK_TIMEOUT
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setNetworkTimeout(long netTimeout) {
this.netTimeout = netTimeout;
@@ -1409,7 +1410,6 @@ public class IgniteConfiguration {
/**
* Gets Max count of threads can be used at rebalancing.
* Minimum is 1.
- *
* @return count.
*/
public int getRebalanceThreadPoolSize() {
@@ -1422,7 +1422,7 @@ public class IgniteConfiguration {
* Default is {@code 1} which has minimal impact on the operation of the grid.
*
* @param rebalanceThreadPoolSize Number of system threads that will be assigned for partition transfer during
- * rebalancing.
+ * rebalancing.
* @return {@code this} for chaining.
*/
public IgniteConfiguration setRebalanceThreadPoolSize(int rebalanceThreadPoolSize) {
@@ -1452,8 +1452,8 @@ public class IgniteConfiguration {
* routines.
*
* @param lifecycleBeans Collection of lifecycle beans.
- * @return {@code this} for chaining.
* @see LifecycleEventType
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setLifecycleBeans(LifecycleBean... lifecycleBeans) {
this.lifecycleBeans = lifecycleBeans;
@@ -1497,8 +1497,8 @@ public class IgniteConfiguration {
* Sets fully configured instance of {@link EventStorageSpi}.
*
* @param evtSpi Fully configured instance of {@link EventStorageSpi}.
- * @return {@code this} for chaining.
* @see IgniteConfiguration#getEventStorageSpi()
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setEventStorageSpi(EventStorageSpi evtSpi) {
this.evtSpi = evtSpi;
@@ -1520,8 +1520,8 @@ public class IgniteConfiguration {
* Sets fully configured instance of {@link DiscoverySpi}.
*
* @param discoSpi Fully configured instance of {@link DiscoverySpi}.
- * @return {@code this} for chaining.
* @see IgniteConfiguration#getDiscoverySpi()
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setDiscoverySpi(DiscoverySpi discoSpi) {
this.discoSpi = discoSpi;
@@ -1588,7 +1588,7 @@ public class IgniteConfiguration {
* Default is {@link #DFLT_ALL_SEG_RESOLVERS_PASS_REQ}.
*
* @return {@code True} if all segmentation resolvers should succeed,
- * {@code false} if only one is enough.
+ * {@code false} if only one is enough.
*/
public boolean isAllSegmentationResolversPassRequired() {
return allResolversPassReq;
@@ -1598,7 +1598,7 @@ public class IgniteConfiguration {
* Sets all segmentation resolvers pass required flag.
*
* @param allResolversPassReq {@code True} if all segmentation resolvers should
- * succeed for node to be in the correct segment.
+ * succeed for node to be in the correct segment.
* @return {@code this} for chaining.
*/
public IgniteConfiguration setAllSegmentationResolversPassRequired(boolean allResolversPassReq) {
@@ -1695,8 +1695,8 @@ public class IgniteConfiguration {
* Sets fully configured instance of {@link CommunicationSpi}.
*
* @param commSpi Fully configured instance of {@link CommunicationSpi}.
- * @return {@code this} for chaining.
* @see IgniteConfiguration#getCommunicationSpi()
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setCommunicationSpi(CommunicationSpi commSpi) {
this.commSpi = commSpi;
@@ -1722,9 +1722,9 @@ public class IgniteConfiguration {
* Sets fully configured instance of {@link CollisionSpi}.
*
* @param colSpi Fully configured instance of {@link CollisionSpi} or
- * {@code null} if no SPI provided.
- * @return {@code this} for chaining.
+ * {@code null} if no SPI provided.
* @see IgniteConfiguration#getCollisionSpi()
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setCollisionSpi(CollisionSpi colSpi) {
this.colSpi = colSpi;
@@ -1746,8 +1746,8 @@ public class IgniteConfiguration {
* Sets fully configured instance of {@link DeploymentSpi}.
*
* @param deploySpi Fully configured instance of {@link DeploymentSpi}.
- * @return {@code this} for chaining.
* @see IgniteConfiguration#getDeploymentSpi()
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setDeploymentSpi(DeploymentSpi deploySpi) {
this.deploySpi = deploySpi;
@@ -1769,8 +1769,8 @@ public class IgniteConfiguration {
* Sets fully configured instance of {@link CheckpointSpi}.
*
* @param cpSpi Fully configured instance of {@link CheckpointSpi}.
- * @return {@code this} for chaining.
* @see IgniteConfiguration#getCheckpointSpi()
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setCheckpointSpi(CheckpointSpi... cpSpi) {
this.cpSpi = cpSpi;
@@ -1792,9 +1792,9 @@ public class IgniteConfiguration {
* Sets fully configured instance of {@link FailoverSpi}.
*
* @param failSpi Fully configured instance of {@link FailoverSpi} or
- * {@code null} if no SPI provided.
- * @return {@code this} for chaining.
+ * {@code null} if no SPI provided.
* @see IgniteConfiguration#getFailoverSpi()
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setFailoverSpi(FailoverSpi... failSpi) {
this.failSpi = failSpi;
@@ -1807,8 +1807,8 @@ public class IgniteConfiguration {
* <p>
* Default is {@link #DFLT_FAILURE_DETECTION_TIMEOUT}.
*
- * @return Failure detection timeout in milliseconds.
* @see #setFailureDetectionTimeout(long)
+ * @return Failure detection timeout in milliseconds.
*/
public Long getFailureDetectionTimeout() {
return failureDetectionTimeout;
@@ -1865,7 +1865,7 @@ public class IgniteConfiguration {
* If not set explicitly, then default value is {@code 600,000} milliseconds (10 minutes).
*
* @param discoStartupDelay Time in milliseconds for when nodes
- * can be out-of-sync during startup.
+ * can be out-of-sync during startup.
* @return {@code this} for chaining.
*/
public IgniteConfiguration setDiscoveryStartupDelay(long discoStartupDelay) {
@@ -1878,9 +1878,9 @@ public class IgniteConfiguration {
* Sets fully configured instance of {@link LoadBalancingSpi}.
*
* @param loadBalancingSpi Fully configured instance of {@link LoadBalancingSpi} or
- * {@code null} if no SPI provided.
- * @return {@code this} for chaining.
+ * {@code null} if no SPI provided.
* @see IgniteConfiguration#getLoadBalancingSpi()
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setLoadBalancingSpi(LoadBalancingSpi... loadBalancingSpi) {
this.loadBalancingSpi = loadBalancingSpi;
@@ -1892,9 +1892,9 @@ public class IgniteConfiguration {
* Sets fully configured instances of {@link SwapSpaceSpi}.
*
* @param swapSpaceSpi Fully configured instances of {@link SwapSpaceSpi} or
- * <tt>null</tt> if no SPI provided.
- * @return {@code this} for chaining.
+ * <tt>null</tt> if no SPI provided.
* @see IgniteConfiguration#getSwapSpaceSpi()
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setSwapSpaceSpi(SwapSpaceSpi swapSpaceSpi) {
this.swapSpaceSpi = swapSpaceSpi;
@@ -1919,8 +1919,8 @@ public class IgniteConfiguration {
* Sets fully configured instances of {@link IndexingSpi}.
*
* @param indexingSpi Fully configured instance of {@link IndexingSpi}.
- * @return {@code this} for chaining.
* @see IgniteConfiguration#getIndexingSpi()
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setIndexingSpi(IndexingSpi indexingSpi) {
this.indexingSpi = indexingSpi;
@@ -2094,12 +2094,12 @@ public class IgniteConfiguration {
* Gets flag indicating whether cache sanity check is enabled. If enabled, then Ignite
* will perform the following checks and throw an exception if check fails:
* <ul>
- * <li>Cache entry is not externally locked with {@code lock(...)} or {@code lockAsync(...)}
- * methods when entry is enlisted to transaction.</li>
- * <li>Each entry in affinity group-lock transaction has the same affinity key as was specified on
- * affinity transaction start.</li>
- * <li>Each entry in partition group-lock transaction belongs to the same partition as was specified
- * on partition transaction start.</li>
+ * <li>Cache entry is not externally locked with {@code lock(...)} or {@code lockAsync(...)}
+ * methods when entry is enlisted to transaction.</li>
+ * <li>Each entry in affinity group-lock transaction has the same affinity key as was specified on
+ * affinity transaction start.</li>
+ * <li>Each entry in partition group-lock transaction belongs to the same partition as was specified
+ * on partition transaction start.</li>
* </ul>
* <p>
* These checks are not required for cache operation, but help to find subtle bugs. Disabling of this checks
@@ -2117,8 +2117,8 @@ public class IgniteConfiguration {
* Sets cache sanity check flag.
*
* @param cacheSanityCheckEnabled {@code True} if cache sanity check is enabled.
- * @return {@code this} for chaining.
* @see #isCacheSanityCheckEnabled()
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setCacheSanityCheckEnabled(boolean cacheSanityCheckEnabled) {
this.cacheSanityCheckEnabled = cacheSanityCheckEnabled;
@@ -2428,8 +2428,8 @@ public class IgniteConfiguration {
* Sets warmup closure to execute before grid startup.
*
* @param warmupClos Warmup closure to execute.
- * @return {@code this} for chaining.
* @see #getWarmupClosure()
+ * @return {@code this} for chaining.
*/
public IgniteConfiguration setWarmupClosure(IgniteInClosure<IgniteConfiguration> warmupClos) {
this.warmupClos = warmupClos;
http://git-wip-us.apache.org/repos/asf/ignite/blob/091c52b1/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
index f7248fe..b123a4a 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/GridKernalContext.java
@@ -469,7 +469,7 @@ public interface GridKernalContext extends Iterable<GridComponent> {
*
* @param ldr Class loader.
* @return User version for given class loader or empty string if no version
- * was explicitly specified.
+ * was explicitly specified.
*/
public String userVersion(ClassLoader ldr);
@@ -490,7 +490,7 @@ public interface GridKernalContext extends Iterable<GridComponent> {
/**
* @return Thread pool implementation to be used in grid to process job execution
- * requests and user messages sent to the node.
+ * requests and user messages sent to the node.
*/
public ExecutorService getExecutorService();
@@ -506,13 +506,13 @@ public interface GridKernalContext extends Iterable<GridComponent> {
* {@link org.apache.ignite.compute.ComputeJob GridJobs}.
*
* @return Thread pool implementation to be used in grid for internal and Visor
- * jobs processing.
+ * jobs processing.
*/
public ExecutorService getManagementExecutorService();
/**
* @return Thread pool implementation to be used for peer class loading
- * requests handling.
+ * requests handling.
*/
public ExecutorService getPeerClassLoadingExecutorService();
@@ -528,7 +528,7 @@ public interface GridKernalContext extends Iterable<GridComponent> {
* processing of client messages (REST requests).
*
* @return Thread pool implementation to be used for processing of client
- * messages.
+ * messages.
*/
public ExecutorService getRestExecutorService();
http://git-wip-us.apache.org/repos/asf/ignite/blob/091c52b1/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/exception/GridRedisGenericException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/exception/GridRedisGenericException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/exception/GridRedisGenericException.java
index 2e457b6..d45dbbc 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/exception/GridRedisGenericException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/exception/GridRedisGenericException.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.ignite.internal.processors.rest.handlers.redis.exception;
import org.apache.ignite.IgniteCheckedException;
http://git-wip-us.apache.org/repos/asf/ignite/blob/091c52b1/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/exception/GridRedisTypeException.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/exception/GridRedisTypeException.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/exception/GridRedisTypeException.java
index cf24b6d..69f425c 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/exception/GridRedisTypeException.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/redis/exception/GridRedisTypeException.java
@@ -1,3 +1,20 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
package org.apache.ignite.internal.processors.rest.handlers.redis.exception;
import org.apache.ignite.IgniteCheckedException;
http://git-wip-us.apache.org/repos/asf/ignite/blob/091c52b1/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridClientPacketType.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridClientPacketType.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridClientPacketType.java
index b9f3cbf..d861d67 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridClientPacketType.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridClientPacketType.java
@@ -25,7 +25,7 @@ public enum GridClientPacketType {
MEMCACHE,
/** Redis protocol message. */
- RESP,
+ REDIS,
/** Ignite handshake. */
IGNITE_HANDSHAKE,
http://git-wip-us.apache.org/repos/asf/ignite/blob/091c52b1/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java
index 1c7e331..aa852f8 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/GridTcpRestParser.java
@@ -105,7 +105,7 @@ public class GridTcpRestParser implements GridNioParser {
break;
case RESP_REQ_FLAG:
- state.packetType(GridClientPacketType.RESP);
+ state.packetType(GridClientPacketType.REDIS);
break;
@@ -146,7 +146,7 @@ public class GridTcpRestParser implements GridNioParser {
break;
- case RESP:
+ case REDIS:
res = GridRedisProtocolParser.readArray(buf);
break;
http://git-wip-us.apache.org/repos/asf/ignite/blob/091c52b1/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/GridRedisMessage.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/GridRedisMessage.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/GridRedisMessage.java
index 5f9eee1..b5e15d6 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/GridRedisMessage.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/GridRedisMessage.java
@@ -32,7 +32,7 @@ public class GridRedisMessage implements GridClientMessage {
/** */
private static final long serialVersionUID = 0L;
- /** Random UUID used for RESP clients authentication. */
+ /** Random UUID used for REDIS clients authentication. */
private static final UUID RESP_ID = UUID.randomUUID();
/** Request byte. */
http://git-wip-us.apache.org/repos/asf/ignite/blob/091c52b1/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/GridRedisProtocolParser.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/GridRedisProtocolParser.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/GridRedisProtocolParser.java
index 56a0b31..ac422fe 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/GridRedisProtocolParser.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/protocols/tcp/redis/GridRedisProtocolParser.java
@@ -23,7 +23,7 @@ import java.util.Map;
import org.apache.ignite.IgniteCheckedException;
/**
- * Parser to decode/encode Redis protocol (RESP) requests.
+ * Parser to decode/encode Redis protocol (REDIS) requests.
*/
public class GridRedisProtocolParser {
/** + prefix. */
@@ -212,10 +212,10 @@ public class GridRedisProtocolParser {
}
/**
- * Converts an integer result to a RESP integer.
+ * Converts an integer result to a REDIS integer.
*
* @param integer Integer result.
- * @return RESP integer.
+ * @return REDIS integer.
*/
public static ByteBuffer toInteger(String integer) {
byte[] b = integer.getBytes();
@@ -231,10 +231,10 @@ public class GridRedisProtocolParser {
}
/**
- * Converts an integer result to a RESP integer.
+ * Converts an integer result to a REDIS integer.
*
* @param integer Integer result.
- * @return RESP integer.
+ * @return REDIS integer.
*/
public static ByteBuffer toInteger(int integer) {
return toInteger(String.valueOf(integer));