You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ignite.apache.org by iv...@apache.org on 2015/07/21 14:26:17 UTC
[1/2] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-961-master' into ignite-961
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-961 2aa05e425 -> a191c8d29
Merge remote-tracking branch 'remotes/origin/ignite-961-master' into ignite-961
Conflicts:
modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java
modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/cache/GridCacheCommandHandler.java
modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/79c1e24c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/79c1e24c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/79c1e24c
Branch: refs/heads/ignite-961
Commit: 79c1e24cdcadafd190caad14b7d8376ca408148a
Parents: 4699dd8
Author: ivasilinets <iv...@gridgain.com>
Authored: Tue Jul 21 15:25:40 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Tue Jul 21 15:25:40 2015 +0300
----------------------------------------------------------------------
.../JettyRestProcessorAbstractSelfTest.java | 2 -
.../handlers/query/QueryCommandHandler.java | 2 +-
.../http/jetty/GridJettyRestHandler.java | 84 +++++---------------
3 files changed, 23 insertions(+), 65 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79c1e24c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
----------------------------------------------------------------------
diff --git a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
index 4734ecc..f013efe 100644
--- a/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
+++ b/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
@@ -385,7 +385,6 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
assertNull(grid(0).cache("testCache"));
}
-
/**
* @throws Exception If failed.
*/
@@ -512,7 +511,6 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
jsonEquals(ret, errorPattern("Failed to find mandatory parameter in request: val"));
}
-
/**
* @throws Exception If failed.
*/
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79c1e24c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
index 1f92bf3..defca37 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/query/QueryCommandHandler.java
@@ -178,7 +178,7 @@ public class QueryCommandHandler extends GridRestCommandHandlerAdapter {
/** {@inheritDoc} */
@Override public GridRestResponse call() throws Exception {
- try {
+ try {
QueryCursor cur = qryCurs.get(req.queryId()).get1();
if (cur == null)
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/79c1e24c/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
----------------------------------------------------------------------
diff --git a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
index ebe2119..ac264c4 100644
--- a/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
+++ b/modules/rest-http/src/main/java/org/apache/ignite/internal/processors/rest/protocols/http/jetty/GridJettyRestHandler.java
@@ -576,63 +576,6 @@ public class GridJettyRestHandler extends AbstractHandler {
break;
}
- case EXECUTE_SQL_QUERY:
- case EXECUTE_SQL_FIELDS_QUERY: {
- RestSqlQueryRequest restReq0 = new RestSqlQueryRequest();
-
- restReq0.sqlQuery((String) params.get("qry"));
-
- restReq0.arguments(values("arg", params).toArray());
-
- restReq0.typeName((String) params.get("type"));
-
- String psz = (String) params.get("psz");
-
- if (psz != null)
- restReq0.pageSize(Integer.parseInt(psz));
-
- restReq0.cacheName((String)params.get("cacheName"));
-
- restReq = restReq0;
-
- break;
- }
-
- case FETCH_SQL_QUERY: {
- RestSqlQueryRequest restReq0 = new RestSqlQueryRequest();
-
- String qryId = (String) params.get("qryId");
-
- if (qryId != null)
- restReq0.queryId(Long.parseLong(qryId));
-
- String psz = (String) params.get("psz");
-
- if (psz != null)
- restReq0.pageSize(Integer.parseInt(psz));
-
- restReq0.cacheName((String)params.get("cacheName"));
-
- restReq = restReq0;
-
- break;
- }
-
- case CLOSE_SQL_QUERY: {
- RestSqlQueryRequest restReq0 = new RestSqlQueryRequest();
-
- String qryId = (String) params.get("qryId");
-
- if (qryId != null)
- restReq0.queryId(Long.parseLong(qryId));
-
- restReq0.cacheName((String)params.get("cacheName"));
-
- restReq = restReq0;
-
- break;
- }
-
case RUN_SCRIPT: {
RestRunScriptRequest restReq0 = new RestRunScriptRequest();
@@ -707,8 +650,13 @@ public class GridJettyRestHandler extends AbstractHandler {
else
restReq0.arguments(values("arg", params).toArray());
- restReq0.typeName((String)params.get("type"));
- restReq0.pageSize(Integer.parseInt((String) params.get("psz")));
+ restReq0.typeName((String) params.get("type"));
+
+ String psz = (String) params.get("psz");
+
+ if (psz != null)
+ restReq0.pageSize(Integer.parseInt(psz));
+
restReq0.cacheName((String)params.get("cacheName"));
restReq = restReq0;
@@ -719,8 +667,16 @@ public class GridJettyRestHandler extends AbstractHandler {
case FETCH_SQL_QUERY: {
RestSqlQueryRequest restReq0 = new RestSqlQueryRequest();
- restReq0.queryId(Long.parseLong((String)params.get("qryId")));
- restReq0.pageSize(Integer.parseInt((String)params.get("psz")));
+ String qryId = (String) params.get("qryId");
+
+ if (qryId != null)
+ restReq0.queryId(Long.parseLong(qryId));
+
+ String psz = (String) params.get("psz");
+
+ if (psz != null)
+ restReq0.pageSize(Integer.parseInt(psz));
+
restReq0.cacheName((String)params.get("cacheName"));
restReq = restReq0;
@@ -731,7 +687,11 @@ public class GridJettyRestHandler extends AbstractHandler {
case CLOSE_SQL_QUERY: {
RestSqlQueryRequest restReq0 = new RestSqlQueryRequest();
- restReq0.queryId(Long.parseLong((String)params.get("qryId")));
+ String qryId = (String) params.get("qryId");
+
+ if (qryId != null)
+ restReq0.queryId(Long.parseLong(qryId));
+
restReq0.cacheName((String)params.get("cacheName"));
restReq = restReq0;
[2/2] incubator-ignite git commit: Merge branch 'ignite-961' of
https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-961
Posted by iv...@apache.org.
Merge branch 'ignite-961' of https://git-wip-us.apache.org/repos/asf/incubator-ignite into ignite-961
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/a191c8d2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/a191c8d2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/a191c8d2
Branch: refs/heads/ignite-961
Commit: a191c8d29fb456cb9cca26f5f72f17c8d11c8178
Parents: 79c1e24 2aa05e4
Author: ivasilinets <iv...@gridgain.com>
Authored: Tue Jul 21 15:26:03 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Tue Jul 21 15:26:03 2015 +0300
----------------------------------------------------------------------
.../java/org/apache/ignite/IgniteCache.java | 3 +-
.../AffinityNodeAddressHashResolver.java | 8 +-
.../affinity/AffinityNodeHashResolver.java | 5 +
.../affinity/AffinityNodeIdHashResolver.java | 6 +
.../rendezvous/RendezvousAffinityFunction.java | 22 +++-
.../configuration/CacheConfiguration.java | 4 +-
.../configuration/IgniteConfiguration.java | 26 +++++
.../apache/ignite/internal/IgniteKernal.java | 3 +
.../ignite/internal/IgniteNodeAttributes.java | 3 +
.../processors/cache/GridCacheAttributes.java | 8 +-
.../processors/cache/GridCacheProcessor.java | 113 ++++++++++++-------
.../processors/cache/IgniteInternalCache.java | 3 +-
.../spi/discovery/tcp/TcpDiscoverySpi.java | 3 +-
.../tcp/internal/TcpDiscoveryNode.java | 18 ++-
...DiscoveryNodeConfigConsistentIdSelfTest.java | 76 +++++++++++++
.../IgniteSpiDiscoverySelfTestSuite.java | 1 +
16 files changed, 244 insertions(+), 58 deletions(-)
----------------------------------------------------------------------