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/23 17:43:15 UTC
[1/5] incubator-ignite git commit: #ignite-961-master: add security
check for rest create and destroy cache.
Repository: incubator-ignite
Updated Branches:
refs/heads/ignite-961 5993321a5 -> 8201b48fe
#ignite-961-master: add security check for rest create and destroy cache.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/9dd00aca
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/9dd00aca
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/9dd00aca
Branch: refs/heads/ignite-961
Commit: 9dd00aca14f38a43ebdc7d6651e5830c6c2f5b6b
Parents: cdf8da8
Author: ivasilinets <iv...@gridgain.com>
Authored: Thu Jul 23 16:04:39 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Thu Jul 23 16:04:39 2015 +0300
----------------------------------------------------------------------
.../ignite/internal/processors/rest/GridRestProcessor.java | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/9dd00aca/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
index 4549db0..bb796d2 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
@@ -581,6 +581,13 @@ public class GridRestProcessor extends GridProcessorAdapter {
break;
+ case GET_OR_CREATE_CACHE:
+ case DESTROY_CACHE:
+ perm = SecurityPermission.ADMIN_CACHE;
+ name = ((GridRestCacheRequest)req).cacheName();
+
+ break;
+
case CACHE_METRICS:
case CACHE_SIZE:
case TOPOLOGY:
@@ -592,8 +599,6 @@ public class GridRestProcessor extends GridProcessorAdapter {
case ATOMIC_DECREMENT:
case NAME:
case LOG:
- case GET_OR_CREATE_CACHE:
- case DESTROY_CACHE:
break;
default:
[4/5] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-961-master' into ignite-961
Posted by iv...@apache.org.
Merge remote-tracking branch 'remotes/origin/ignite-961-master' 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/47ddae7c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/47ddae7c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/47ddae7c
Branch: refs/heads/ignite-961
Commit: 47ddae7c11f720be5c5fcb34f21680ded9daf21b
Parents: 5993321 dde9a4d
Author: ivasilinets <iv...@gridgain.com>
Authored: Thu Jul 23 18:04:30 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Thu Jul 23 18:04:30 2015 +0300
----------------------------------------------------------------------
.../JettyRestProcessorAbstractSelfTest.java | 137 +++++++++++--------
.../processors/rest/GridRestCommand.java | 28 ++--
.../processors/rest/GridRestProcessor.java | 9 +-
3 files changed, 104 insertions(+), 70 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/47ddae7c/modules/clients/src/test/java/org/apache/ignite/internal/processors/rest/JettyRestProcessorAbstractSelfTest.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/47ddae7c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java
----------------------------------------------------------------------
diff --cc modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java
index f5c2546,76a33b1..44dec65
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java
@@@ -130,25 -130,16 +130,25 @@@ public enum GridRestCommand
QUIT("quit"),
/** Get or create cache. */
- GET_OR_CREATE_CACHE("getorcreatecache"),
+ GET_OR_CREATE_CACHE("getorcreate"),
/** Stops dynamically started cache. */
- DESTROY_CACHE("destroycache"),
+ DESTROY_CACHE("destcache"),
+ /** Run script. */
+ RUN_SCRIPT("runscript"),
+
+ /** Affinity run script. */
+ AFFINITY_RUN_SCRIPT("affrun"),
+
+ /** Execute map reduce script. */
+ EXECUTE_MAP_REDUCE_SCRIPT("excmapreduce"),
+
/** Execute sql query. */
- EXECUTE_SQL_QUERY("qryexecute"),
+ EXECUTE_SQL_QUERY("qryexe"),
/** Execute sql fields query. */
- EXECUTE_SQL_FIELDS_QUERY("qryfieldsexecute"),
+ EXECUTE_SQL_FIELDS_QUERY("qryfldexe"),
/** Fetch query results. */
FETCH_SQL_QUERY("qryfetch"),
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/47ddae7c/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestProcessor.java
----------------------------------------------------------------------
[2/5] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/master' into ignite-961-master
Posted by iv...@apache.org.
Merge remote-tracking branch 'remotes/origin/master' into ignite-961-master
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/fb4f38d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/fb4f38d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/fb4f38d3
Branch: refs/heads/ignite-961
Commit: fb4f38d3a02843795174621a40e357b108ffffa7
Parents: 9dd00ac c4a4bd4
Author: ivasilinets <iv...@gridgain.com>
Authored: Thu Jul 23 16:09:19 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Thu Jul 23 16:09:19 2015 +0300
----------------------------------------------------------------------
modules/apache-license-gen/pom.xml | 13 -
.../apache/ignite/IgniteSystemProperties.java | 8 +
.../store/jdbc/CacheJdbcBlobStoreFactory.java | 2 +-
.../processors/cache/GridCacheMvccManager.java | 14 +
.../distributed/dht/GridDhtTxFinishFuture.java | 13 +-
.../GridDhtPartitionsExchangeFuture.java | 10 +-
.../near/GridNearOptimisticTxPrepareFuture.java | 4 +-
.../GridNearPessimisticTxPrepareFuture.java | 2 +-
.../near/GridNearTxFinishFuture.java | 17 +-
.../cache/transactions/IgniteTxManager.java | 5 +-
.../ignite/internal/util/IgniteUtils.java | 6 +-
.../ignite/spi/discovery/tcp/ServerImpl.java | 58 +--
.../cache/GridCachePutAllFailoverSelfTest.java | 3 +
.../GridCacheAbstractNodeRestartSelfTest.java | 9 +
...NearDisabledOptimisticTxNodeRestartTest.java | 31 ++
.../GridCachePartitionedFailoverSelfTest.java | 5 -
...ePartitionedOptimisticTxNodeRestartTest.java | 12 +-
.../tcp/TcpDiscoveryMultiThreadedTest.java | 2 +
.../IgniteCacheFailoverTestSuite2.java | 4 +
.../testsuites/IgniteCacheRestartTestSuite.java | 5 +-
.../processors/query/h2/sql/GridSqlAlias.java | 4 +
.../processors/query/h2/sql/GridSqlColumn.java | 4 +
.../processors/query/h2/sql/GridSqlConst.java | 4 +
.../processors/query/h2/sql/GridSqlElement.java | 40 +-
.../query/h2/sql/GridSqlFunction.java | 2 +
.../processors/query/h2/sql/GridSqlJoin.java | 4 +
.../query/h2/sql/GridSqlOperation.java | 21 +-
.../query/h2/sql/GridSqlOperationType.java | 2 +
.../query/h2/sql/GridSqlParameter.java | 4 +
.../query/h2/sql/GridSqlPlaceholder.java | 4 +
.../processors/query/h2/sql/GridSqlQuery.java | 25 +-
.../query/h2/sql/GridSqlQueryParser.java | 11 +-
.../query/h2/sql/GridSqlQuerySplitter.java | 405 ++++++++++++-------
.../processors/query/h2/sql/GridSqlSelect.java | 91 ++---
.../query/h2/sql/GridSqlSubquery.java | 4 +
.../processors/query/h2/sql/GridSqlTable.java | 4 +
.../processors/query/h2/sql/GridSqlType.java | 10 +-
.../processors/query/h2/sql/GridSqlUnion.java | 11 -
.../cache/GridCacheCrossCacheQuerySelfTest.java | 77 +---
...QueryOffheapEvictsMultiThreadedSelfTest.java | 5 +
.../IgniteCacheQueryNodeRestartSelfTest.java | 5 -
.../org/apache/ignite/spark/IgniteContext.scala | 14 +
42 files changed, 532 insertions(+), 442 deletions(-)
----------------------------------------------------------------------
[5/5] incubator-ignite git commit: #ignite-961: merge commands.
Posted by iv...@apache.org.
#ignite-961: merge commands.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/8201b48f
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/8201b48f
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/8201b48f
Branch: refs/heads/ignite-961
Commit: 8201b48fe9123c641747bf5e2ca4d73b49f8dcc5
Parents: 47ddae7
Author: ivasilinets <iv...@gridgain.com>
Authored: Thu Jul 23 18:43:07 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Thu Jul 23 18:43:07 2015 +0300
----------------------------------------------------------------------
.../JettyRestProcessorAbstractSelfTest.java | 102 ++++++++++---------
modules/nodejs/src/main/js/cache.js | 26 ++---
modules/nodejs/src/main/js/ignite.js | 4 +-
.../http/jetty/GridJettyRestHandler.java | 6 +-
4 files changed, 74 insertions(+), 64 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8201b48f/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 762e496..5a54cd1 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
@@ -24,6 +24,7 @@ import org.apache.ignite.cache.query.*;
import org.apache.ignite.cache.query.annotations.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.configuration.*;
+import org.apache.ignite.internal.processors.json.*;
import org.apache.ignite.internal.processors.rest.handlers.*;
import org.apache.ignite.internal.util.typedef.*;
import org.apache.ignite.testframework.*;
@@ -389,10 +390,10 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
* @throws Exception If failed.
*/
public void testGetPost() throws Exception {
- jcache().put("key0", "val0");
+ jcache().put(new IgniteJsonString("key0"), new IgniteJsonString("val0"));
String val = "{\"key\":\"key0\"}";
- String ret = makePostRequest(F.asMap("cmd", "get"), val);
+ String ret = makePostRequest(F.asMap("cmd", GridRestCommand.CACHE_GET.key()), val);
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -406,10 +407,10 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
* @throws Exception If failed.
*/
public void testReplacePost() throws Exception {
- jcache().put("key0", "val0");
+ jcache().put(new IgniteJsonString("key0"), new IgniteJsonString("val0"));
String val = "{\"key\":\"key0\", \"val\":\"val2\", \"oldVal\":\"val1\"}";
- String ret = makePostRequest(F.asMap("cmd", "repval"), val);
+ String ret = makePostRequest(F.asMap("cmd", GridRestCommand.CACHE_REPLACE_VALUE.key()), val);
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -419,31 +420,32 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
jsonEquals(ret, cachePattern(false, true));
val = "{\"key\":\"key0\", \"val\":\"val2\"}";
- ret = makePostRequest(F.asMap("cmd", "getandreplace"), val);
+ ret = makePostRequest(F.asMap("cmd", GridRestCommand.CACHE_GET_AND_REPLACE.key()),
+ val);
jsonEquals(ret, cachePattern("val0", true));
- assertEquals("val2", grid(0).cache(null).get("key0"));
+ assertEquals(new IgniteJsonString("val2"), grid(0).cache(null).get(new IgniteJsonString("key0")));
val = "{\"key\":\"key0\", \"val\":\"val3\"}";
- ret = makePostRequest(F.asMap("cmd", "rep"), val);
+ ret = makePostRequest(F.asMap("cmd", GridRestCommand.CACHE_REPLACE.key()), val);
assertNotNull(ret);
assertTrue(!ret.isEmpty());
info("Get command result: " + ret);
- assertEquals("val3", grid(0).cache(null).get("key0"));
+ assertEquals(new IgniteJsonString("val3"), grid(0).cache(null).get(new IgniteJsonString("key0")));
}
/**
* @throws Exception If failed.
*/
public void testRemovePost() throws Exception {
- jcache().put("key0", "val0");
+ jcache().put(new IgniteJsonString("key0"), new IgniteJsonString("val0"));
String val = "{\"key\":\"key0\", \"val\":\"val2\"}";
- String ret = makePostRequest(F.asMap("cmd", "rmvvalue"), val);
+ String ret = makePostRequest(F.asMap("cmd", GridRestCommand.CACHE_REMOVE_VALUE.key()), val);
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -452,25 +454,25 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
jsonEquals(ret, cachePattern(false, true));
- assertEquals("val0", grid(0).cache(null).get("key0"));
+ assertEquals(new IgniteJsonString("val0"), grid(0).cache(null).get(new IgniteJsonString("key0")));
val = "{\"key\":\"key0\"}";
- ret = makePostRequest(F.asMap("cmd", "getandrmv"), val);
+ ret = makePostRequest(F.asMap("cmd", GridRestCommand.CACHE_GET_AND_REMOVE.key()), val);
jsonEquals(ret, cachePattern("val0", true));
- assertNull(grid(0).cache(null).get("key0"));
+ assertNull(grid(0).cache(null).get(new IgniteJsonString("key0")));
}
/**
* @throws Exception If failed.
*/
public void testRemoveAllPost() throws Exception {
- jcache().put("key0", "val0");
- jcache().put("key1", "val1");
+ jcache().put(new IgniteJsonString("key0"), new IgniteJsonString("val0"));
+ jcache().put(new IgniteJsonString("key1"), new IgniteJsonString("val1"));
String val = "{\"keys\": [\"key0\", \"key1\"]}";
- String ret = makePostRequest(F.asMap("cmd", "rmvall"), val);
+ String ret = makePostRequest(F.asMap("cmd", GridRestCommand.CACHE_REMOVE_ALL.key()), val);
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -483,15 +485,18 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
*/
public void testPutPost() throws Exception {
String val = "{\"key\":\"key0\",\"val\":\"val0\"}";
- String ret = makePostRequest(F.asMap("cmd", "put"), val);
+ String ret = makePostRequest(F.asMap("cmd", GridRestCommand.CACHE_PUT.key()), val);
assertNotNull(ret);
assertTrue(!ret.isEmpty());
- assertNotNull(grid(0).cache(null).get("key0"));
+ info("Result: " + ret);
+
+ assertEquals(1, grid(0).cache(null).size());
+ assertNotNull(grid(0).cache(null).get(new IgniteJsonString("key0")));
val = "{\"key\":\"key0\"}";
- ret = makePostRequest(F.asMap("cmd", "containskey"), val);
+ ret = makePostRequest(F.asMap("cmd", GridRestCommand.CACHE_CONTAINS_KEY.key()), val);
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -504,7 +509,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
*/
public void testIncorrectPutPost() throws Exception {
String val = "{\"key\":\"key0\"}";
- String ret = makePostRequest(F.asMap("cmd", "put"), val);
+ String ret = makePostRequest(F.asMap("cmd", GridRestCommand.CACHE_PUT.key()), val);
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -516,42 +521,42 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
*/
public void testGetAndPutPost() throws Exception {
String val = "{\"key\":\"key0\", \"val\":\"val0\"}";
- String ret = makePostRequest(F.asMap("cmd", "getandput"), val);
+ String ret = makePostRequest(F.asMap("cmd", GridRestCommand.CACHE_GET_AND_PUT.key()), val);
assertNotNull(ret);
assertTrue(!ret.isEmpty());
jsonEquals(ret, cacheNullPattern(true));
- assertNotNull(grid(0).cache(null).get("key0"));
+ assertNotNull(grid(0).cache(null).get(new IgniteJsonString("key0")));
val = "{\"key\": \"key0\", \"val\":\"val1\"}";
- ret = makePostRequest(F.asMap("cmd", "getandputifabsent"), val);
+ ret = makePostRequest(F.asMap("cmd", GridRestCommand.CACHE_GET_AND_PUT_IF_ABSENT.key()), val);
assertNotNull(ret);
assertTrue(!ret.isEmpty());
jsonEquals(ret, cachePattern("val0", true));
- assertEquals("val0", grid(0).cache(null).get("key0"));
+ assertEquals(new IgniteJsonString("val0"), grid(0).cache(null).get(new IgniteJsonString("key0")));
val = "{\"key\": \"key0\"}";
- ret = makePostRequest(F.asMap("cmd", "rmv"), val);
+ ret = makePostRequest(F.asMap("cmd", GridRestCommand.CACHE_REMOVE.key()), val);
assertNotNull(ret);
assertTrue(!ret.isEmpty());
- assertNull(grid(0).cache(null).get("key0"));
+ assertNull(grid(0).cache(null).get(new IgniteJsonString("key0")));
val = "{\"key\": \"key0\", \"val\":\"val1\"}";
- ret = makePostRequest(F.asMap("cmd", "putifabsent"), val);
+ ret = makePostRequest(F.asMap("cmd", GridRestCommand.CACHE_PUT_IF_ABSENT.key()), val);
assertNotNull(ret);
assertTrue(!ret.isEmpty());
jsonEquals(ret, cachePattern(true, true));
- assertEquals("val1", grid(0).cache(null).get("key0"));
+ assertEquals(new IgniteJsonString("val1"), grid(0).cache(null).get(new IgniteJsonString("key0")));
}
/**
@@ -559,22 +564,22 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
*/
public void testPutAllPost() throws Exception {
String val = "{\"entries\": [{\"key\":\"key0\", \"value\": \"val0\"}, {\"key\":\"key1\", \"value\":\"val1\"}]}";
- String ret = makePostRequest(F.asMap("cmd", "putAll"), val);
+ String ret = makePostRequest(F.asMap("cmd", GridRestCommand.CACHE_PUT_ALL.key()), val);
assertNotNull(ret);
assertTrue(!ret.isEmpty());
- assertNotNull(grid(0).cache(null).get("key0"));
+ assertNotNull(grid(0).cache(null).get(new IgniteJsonString("key0")));
val = "{\"keys\": [\"key0\",\"key1\"]}";
- ret = makePostRequest(F.asMap("cmd", "containskeys"), val);
+ ret = makePostRequest(F.asMap("cmd", GridRestCommand.CACHE_CONTAINS_KEYS.key()), val);
assertNotNull(ret);
assertTrue(!ret.isEmpty());
jsonEquals(ret, cacheBulkPattern(true, true));
- ret = makePostRequest(F.asMap("cmd", "getAll"), val);
+ ret = makePostRequest(F.asMap("cmd", GridRestCommand.CACHE_GET_ALL.key()), val);
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -923,7 +928,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
jsonEquals(ret, cacheBulkPattern(true, true));
- ret = content(F.asMap("cmd", "rmvall"));
+ ret = content(F.asMap("cmd", GridRestCommand.CACHE_REMOVE_ALL.key()));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -1274,7 +1279,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
* @throws Exception If failed.
*/
public void testVersion() throws Exception {
- String ret = content(F.asMap("cmd", "version"));
+ String ret = content(F.asMap("cmd", GridRestCommand.VERSION.key()));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -1437,7 +1442,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
*/
public void testRunScriptPost() throws Exception {
String f = "function(param){return param;}";
- String ret = makePostRequest(F.asMap("cmd", "runscript", "func", URLEncoder.encode(f)), "{\"arg\":\"hello\"}");
+ String ret = makePostRequest(F.asMap("cmd", GridRestCommand.RUN_SCRIPT.key(), "func", URLEncoder.encode(f)), "{\"arg\":\"hello\"}");
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -1450,7 +1455,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
*/
public void testRunScript() throws Exception {
String f = "function(param){return param;}";
- String ret = content(F.asMap("cmd", "runscript", "func", URLEncoder.encode(f), "arg", "hello"));
+ String ret = content(F.asMap("cmd", GridRestCommand.RUN_SCRIPT.key(), "func",
+ URLEncoder.encode(f), "arg", "hello"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -1462,7 +1468,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
* @throws Exception If failed.
*/
public void testRunAffinityScriptPost() throws Exception {
- ClusterNode node = grid(0).affinity(null).mapKeyToNode("key0");
+ ClusterNode node = grid(0).affinity(null).mapKeyToNode(new IgniteJsonString("key0"));
Ignite ignite = null;
@@ -1479,7 +1485,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
"}" +
"return ignite.name();}";
- String ret = makePostRequest(F.asMap("cmd", "affrun", "func", URLEncoder.encode(f)),
+ String ret = makePostRequest(F.asMap("cmd", GridRestCommand.AFFINITY_RUN_SCRIPT.key(),
+ "func", URLEncoder.encode(f)),
"{\"arg\":\"" + "hello" + "\",\"key\":\"key0\"}");
assertNotNull(ret);
@@ -1509,8 +1516,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
"}" +
"return ignite.name();}";
- String ret = content(F.asMap("cmd", "affrun", "func", URLEncoder.encode(f),
- "key", "key0", "arg", "hello"));
+ String ret = content(F.asMap("cmd", GridRestCommand.AFFINITY_RUN_SCRIPT.key(),
+ "func", URLEncoder.encode(f), "key", "key0", "arg", "hello"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -1540,7 +1547,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
"return sum;" +
"};";
- String ret = makePostRequest(F.asMap("cmd", "excmapreduce", "map", URLEncoder.encode(map),
+ String ret = makePostRequest(F.asMap("cmd", GridRestCommand.EXECUTE_MAP_REDUCE_SCRIPT.key(),
+ "map", URLEncoder.encode(map),
"reduce", URLEncoder.encode(reduce)), "{\"arg\": \"Hello world!\"}");
assertNotNull(ret);
@@ -1571,8 +1579,10 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
"return sum;" +
"};";
- String ret = content(F.asMap("cmd", "excmapreduce", "map", URLEncoder.encode(map),
- "reduce", URLEncoder.encode(reduce), "arg", URLEncoder.encode("Hello world!")));
+ String ret = content(F.asMap("cmd", GridRestCommand.EXECUTE_MAP_REDUCE_SCRIPT.key(),
+ "map", URLEncoder.encode(map),
+ "reduce", URLEncoder.encode(reduce),
+ "arg", URLEncoder.encode("Hello world!")));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -1586,9 +1596,9 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
public void testQueryArgsPost() throws Exception {
String qry = "salary > ? and salary <= ?";
- String ret = makePostRequest(F.asMap("cmd", "qryexecute", "type", "Person", "psz", "10", "cacheName", "person",
- "qry", URLEncoder.encode(qry)),
- "{\"arg\": [1000, 2000]}");
+ String ret = makePostRequest(F.asMap("cmd", GridRestCommand.EXECUTE_SQL_QUERY.key(),
+ "type", "Person", "psz", "10", "cacheName", "person",
+ "qry", URLEncoder.encode(qry)), "{\"arg\": [1000, 2000]}");
assertNotNull(ret);
assertTrue(!ret.isEmpty());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8201b48f/modules/nodejs/src/main/js/cache.js
----------------------------------------------------------------------
diff --git a/modules/nodejs/src/main/js/cache.js b/modules/nodejs/src/main/js/cache.js
index 6cae632..a232558 100644
--- a/modules/nodejs/src/main/js/cache.js
+++ b/modules/nodejs/src/main/js/cache.js
@@ -75,7 +75,7 @@ Cache.prototype.put = function(key, value) {
* @param {string} value Value
*/
Cache.prototype.putIfAbsent = function(key, value) {
- return this.__createPromise(this._createCommand("putifabsent").
+ return this.__createPromise(this._createCommand("putifabs").
setPostData(JSON.stringify({"key": key, "val" : value})));
}
@@ -98,7 +98,7 @@ Cache.prototype.remove = function(key, callback) {
* @param value Value
*/
Cache.prototype.removeValue = function(key, value, callback) {
- return this.__createPromise(this._createCommand("rmvvalue").
+ return this.__createPromise(this._createCommand("rmvval").
setPostData(JSON.stringify({"key": key, "val" : value})));
}
@@ -109,7 +109,7 @@ Cache.prototype.removeValue = function(key, value, callback) {
* @param {string} key Key
*/
Cache.prototype.getAndRemove = function(key, callback) {
- return this.__createPromise(this._createCommand("getandrmv").
+ return this.__createPromise(this._createCommand("getrmv").
setPostData(JSON.stringify({"key": key})));
}
@@ -179,7 +179,7 @@ Cache.prototype.getAll = function(keys, callback) {
* @param {Object} key Key
*/
Cache.prototype.containsKey = function(key) {
- return this.__createPromise(this._createCommand("containskey").
+ return this.__createPromise(this._createCommand("conkey").
setPostData(JSON.stringify({"key" : key})));
}
@@ -190,7 +190,7 @@ Cache.prototype.containsKey = function(key) {
* @param {Object[]} keys Keys
*/
Cache.prototype.containsKeys = function(keys, callback) {
- return this.__createPromise(this._createCommand("containskeys").
+ return this.__createPromise(this._createCommand("conkeys").
setPostData(JSON.stringify({"keys" : keys})));
}
@@ -202,7 +202,7 @@ Cache.prototype.containsKeys = function(keys, callback) {
* @param {string} value Value
*/
Cache.prototype.getAndPut = function(key, val) {
- return this.__createPromise(this._createCommand("getandput").
+ return this.__createPromise(this._createCommand("getput").
setPostData(JSON.stringify({"key" : key, "val" : val})));
}
@@ -227,7 +227,7 @@ Cache.prototype.replace = function(key, val, callback) {
* @param oldVal Old value
*/
Cache.prototype.replaceValue = function(key, val, oldVal) {
- return this.__createPromise(this._createCommand("repVal").
+ return this.__createPromise(this._createCommand("repval").
setPostData(JSON.stringify({"key" : key, "val" : val, "oldVal" : oldVal})));
}
@@ -239,7 +239,7 @@ Cache.prototype.replaceValue = function(key, val, oldVal) {
* @param {string} value Value
*/
Cache.prototype.getAndReplace = function(key, val) {
- return this.__createPromise(this._createCommand("getandreplace").
+ return this.__createPromise(this._createCommand("getrep").
setPostData(JSON.stringify({"key" : key, "val" : val})));
}
@@ -251,7 +251,7 @@ Cache.prototype.getAndReplace = function(key, val) {
* @param {string} value Value
*/
Cache.prototype.getAndPutIfAbsent = function(key, val) {
- return this.__createPromise(this._createCommand("getandputifabsent").
+ return this.__createPromise(this._createCommand("getputifabs").
setPostData(JSON.stringify({"key" : key, "val" : val})));
}
@@ -259,7 +259,7 @@ Cache.prototype.getAndPutIfAbsent = function(key, val) {
* @this {Cache}
*/
Cache.prototype.size = function(callback) {
- return this.__createPromise(this._createCommand("cachesize"));
+ return this.__createPromise(this._createCommand("size"));
}
/**
@@ -412,7 +412,7 @@ QueryCursor.prototype.close = function() {
}
var server = this._cache._server;
- var cmd = this._createQueryCommand("qryclose", this._qry).addParam("qryId", this._res.queryId);
+ var cmd = this._createQueryCommand("qrycls", this._qry).addParam("qryId", this._res.queryId);
return new Promise(function(resolve, reject) {
server.runCommand(cmd, function(err, res) {
@@ -455,12 +455,12 @@ QueryCursor.prototype._getQueryCommand = function() {
}
QueryCursor.prototype._sqlFieldsQuery = function(qry) {
- return this._createQueryCommand("qryfieldsexecute", qry).
+ return this._createQueryCommand("qryfldexe", qry).
setPostData(JSON.stringify({"arg" : qry.arguments()}));
}
QueryCursor.prototype._sqlQuery = function(qry) {
- return this._createQueryCommand("qryexecute", qry).addParam("type", qry.returnType()).
+ return this._createQueryCommand("qryexe", qry).addParam("type", qry.returnType()).
setPostData(JSON.stringify({"arg" : qry.arguments()}));
}
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8201b48f/modules/nodejs/src/main/js/ignite.js
----------------------------------------------------------------------
diff --git a/modules/nodejs/src/main/js/ignite.js b/modules/nodejs/src/main/js/ignite.js
index c3d90ac..5b68c23 100644
--- a/modules/nodejs/src/main/js/ignite.js
+++ b/modules/nodejs/src/main/js/ignite.js
@@ -60,7 +60,7 @@ Ignite.prototype.cache = function(cacheName) {
Ignite.prototype.getOrCreateCache = function(cacheName) {
var server = this._server;
return new Promise(function(resolve, reject) {
- server.runCommand(new Command("getorcreatecache").addParam("cacheName", cacheName),
+ server.runCommand(new Command("getorcreate").addParam("cacheName", cacheName),
function(err, res) {
if (err != null) {
reject(err);
@@ -79,7 +79,7 @@ Ignite.prototype.getOrCreateCache = function(cacheName) {
* @param {string} cacheName Cache name to stop
*/
Ignite.prototype.destroyCache = function(cacheName) {
- return this._createPromise(new Command("destroycache").addParam("cacheName", cacheName));
+ return this._createPromise(new Command("destcache").addParam("cacheName", cacheName));
}
/**
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/8201b48f/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 196e680..2cf9988 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
@@ -584,7 +584,7 @@ public class GridJettyRestHandler extends AbstractHandler {
if (req.getHeader("Content-Type") != null && req.getHeader("Content-Type").contains("json")) {
Map o = parseRequest(req);
- restReq0.argument(ctx.scripting().toJavaObject(o.get("arg")));
+ restReq0.argument(ctx.scripting().toScriptObject(o.get("arg")));
}
else
restReq0.argument(params.get("arg"));
@@ -602,7 +602,7 @@ public class GridJettyRestHandler extends AbstractHandler {
if (req.getHeader("Content-Type") != null && req.getHeader("Content-Type").contains("json")) {
Map o = parseRequest(req);
- restReq0.argument(ctx.scripting().toJavaObject(o.get("arg")));
+ restReq0.argument(ctx.scripting().toScriptObject(o.get("arg")));
Object cacheObj = ctx.scripting().toJavaObject(o.get("key"));
restReq0.affinityKey(cacheObj);
@@ -625,7 +625,7 @@ public class GridJettyRestHandler extends AbstractHandler {
if (req.getHeader("Content-Type") != null && req.getHeader("Content-Type").contains("json")) {
Map o = parseRequest(req);
- restReq0.argument(ctx.scripting().toJavaObject(o.get("arg")));
+ restReq0.argument(ctx.scripting().toScriptObject(o.get("arg")));
}
else
restReq0.argument(params.get("arg"));
[3/5] incubator-ignite git commit: #ignite-961: Change commands.
Posted by iv...@apache.org.
#ignite-961: Change commands.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/dde9a4d3
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/dde9a4d3
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/dde9a4d3
Branch: refs/heads/ignite-961
Commit: dde9a4d3879fb78d5a9596c503fa6408df8dcf38
Parents: fb4f38d
Author: ivasilinets <iv...@gridgain.com>
Authored: Thu Jul 23 18:02:55 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Thu Jul 23 18:02:55 2015 +0300
----------------------------------------------------------------------
.../JettyRestProcessorAbstractSelfTest.java | 137 +++++++++++--------
.../processors/rest/GridRestCommand.java | 28 ++--
2 files changed, 97 insertions(+), 68 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dde9a4d3/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 55d60d2..160046c 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
@@ -248,7 +248,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
public void testGet() throws Exception {
jcache().put("getKey", "getVal");
- String ret = content(F.asMap("cmd", "get", "key", "getKey"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_GET.key(), "key", "getKey"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -266,7 +266,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
jcache().put("getKey", "getVal");
- String ret = content(F.asMap("cmd", "cachesize"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_SIZE.key()));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -280,7 +280,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
* @throws Exception If failed.
*/
public void testIgniteName() throws Exception {
- String ret = content(F.asMap("cmd", "name"));
+ String ret = content(F.asMap("cmd", GridRestCommand.NAME.key()));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -294,7 +294,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
* @throws Exception If failed.
*/
public void testGetOrCreateCache() throws Exception {
- String ret = content(F.asMap("cmd", "getorcreatecache", "cacheName", "testCache"));
+ String ret = content(F.asMap("cmd", GridRestCommand.GET_OR_CREATE_CACHE.key(), "cacheName", "testCache"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -303,7 +303,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
grid(0).cache("testCache").put("1", "1");
- ret = content(F.asMap("cmd", "destroycache", "cacheName", "testCache"));
+ ret = content(F.asMap("cmd", GridRestCommand.DESTROY_CACHE.key(), "cacheName", "testCache"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -318,7 +318,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
jcache().put("getKey1", "getVal1");
jcache().put("getKey2", "getVal2");
- String ret = content(F.asMap("cmd", "getall", "k1", "getKey1", "k2", "getKey2"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_GET_ALL.key(), "k1", "getKey1", "k2", "getKey2"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -335,7 +335,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
* @throws Exception If failed.
*/
public void testIncorrectPut() throws Exception {
- String ret = content(F.asMap("cmd", "put", "key", "key0"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_PUT.key(), "key", "key0"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -348,7 +348,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
public void testContainsKey() throws Exception {
grid(0).cache(null).put("key0", "val0");
- String ret = content(F.asMap("cmd", "containskey", "key", "key0"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_CONTAINS_KEY.key(), "key", "key0"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -363,7 +363,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
grid(0).cache(null).put("key0", "val0");
grid(0).cache(null).put("key1", "val1");
- String ret = content(F.asMap("cmd", "containskeys", "k1", "key0", "k2", "key1"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_CONTAINS_KEYS.key(),
+ "k1", "key0", "k2", "key1"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -377,7 +378,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
public void testGetAndPut() throws Exception {
grid(0).cache(null).put("key0", "val0");
- String ret = content(F.asMap("cmd", "getandput", "key", "key0", "val", "val1"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_GET_AND_PUT.key(), "key", "key0", "val", "val1"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -393,7 +394,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
public void testGetAndPutIfAbsent() throws Exception {
grid(0).cache(null).put("key0", "val0");
- String ret = content(F.asMap("cmd", "getandputifabsent", "key", "key0", "val", "val1"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_GET_AND_PUT_IF_ABSENT.key(),
+ "key", "key0", "val", "val1"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -407,7 +409,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
* @throws Exception If failed.
*/
public void testPutIfAbsent2() throws Exception {
- String ret = content(F.asMap("cmd", "putifabsent", "key", "key0", "val", "val1"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_PUT_IF_ABSENT.key(),
+ "key", "key0", "val", "val1"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -423,7 +426,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
public void testRemoveValue() throws Exception {
grid(0).cache(null).put("key0", "val0");
- String ret = content(F.asMap("cmd", "rmvvalue", "key", "key0", "val", "val1"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_REMOVE_VALUE.key(),
+ "key", "key0", "val", "val1"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -432,7 +436,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
assertEquals("val0", grid(0).cache(null).get("key0"));
- ret = content(F.asMap("cmd", "rmvvalue", "key", "key0", "val", "val0"));
+ ret = content(F.asMap("cmd", GridRestCommand.CACHE_REMOVE_VALUE.key(),
+ "key", "key0", "val", "val0"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -448,7 +453,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
public void testGetAndRemove() throws Exception {
grid(0).cache(null).put("key0", "val0");
- String ret = content(F.asMap("cmd", "getandrmv", "key", "key0"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_GET_AND_REMOVE.key(),
+ "key", "key0"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -464,7 +470,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
public void testReplaceValue() throws Exception {
grid(0).cache(null).put("key0", "val0");
- String ret = content(F.asMap("cmd", "repval", "key", "key0", "val", "val1", "val2", "val2"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_REPLACE_VALUE.key(),
+ "key", "key0", "val", "val1", "val2", "val2"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -473,7 +480,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
assertEquals("val0", grid(0).cache(null).get("key0"));
- ret = content(F.asMap("cmd", "repval", "key", "key0", "val", "val1", "val2", "val0"));
+ ret = content(F.asMap("cmd", GridRestCommand.CACHE_REPLACE_VALUE.key(),
+ "key", "key0", "val", "val1", "val2", "val0"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -489,7 +497,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
public void testGetAndReplace() throws Exception {
grid(0).cache(null).put("key0", "val0");
- String ret = content(F.asMap("cmd", "getandreplace", "key", "key0", "val", "val1"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_GET_AND_REPLACE.key(),
+ "key", "key0", "val", "val1"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -503,7 +512,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
* @throws Exception If failed.
*/
public void testPut() throws Exception {
- String ret = content(F.asMap("cmd", "put", "key", "putKey", "val", "putVal"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_PUT.key(),
+ "key", "putKey", "val", "putVal"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -519,7 +529,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
* @throws Exception If failed.
*/
public void testPutWithExpiration() throws Exception {
- String ret = content(F.asMap("cmd", "put", "key", "putKey", "val", "putVal", "exp", "2000"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_PUT.key(),
+ "key", "putKey", "val", "putVal", "exp", "2000"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -539,7 +550,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
public void testAdd() throws Exception {
jcache().put("addKey1", "addVal1");
- String ret = content(F.asMap("cmd", "add", "key", "addKey2", "val", "addVal2"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_ADD.key(),
+ "key", "addKey2", "val", "addVal2"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -554,7 +566,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
* @throws Exception If failed.
*/
public void testAddWithExpiration() throws Exception {
- String ret = content(F.asMap("cmd", "add", "key", "addKey", "val", "addVal", "exp", "2000"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_ADD.key(),
+ "key", "addKey", "val", "addVal", "exp", "2000"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -572,7 +585,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
* @throws Exception If failed.
*/
public void testPutAll() throws Exception {
- String ret = content(F.asMap("cmd", "putall", "k1", "putKey1", "k2", "putKey2",
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_PUT_ALL.key(),
+ "k1", "putKey1", "k2", "putKey2",
"v1", "putVal1", "v2", "putVal2"));
assertNotNull(ret);
@@ -594,7 +608,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
assertEquals("rmvVal", jcache().localPeek("rmvKey", CachePeekMode.ONHEAP));
- String ret = content(F.asMap("cmd", "rmv", "key", "rmvKey"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_REMOVE.key(),
+ "key", "rmvKey"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -620,7 +635,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
assertEquals("rmvVal3", jcache().localPeek("rmvKey3", CachePeekMode.ONHEAP));
assertEquals("rmvVal4", jcache().localPeek("rmvKey4", CachePeekMode.ONHEAP));
- String ret = content(F.asMap("cmd", "rmvall", "k1", "rmvKey1", "k2", "rmvKey2"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_REMOVE_ALL.key(),
+ "k1", "rmvKey1", "k2", "rmvKey2"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -658,7 +674,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
assertEquals("casOldVal", jcache().localPeek("casKey", CachePeekMode.ONHEAP));
- String ret = content(F.asMap("cmd", "cas", "key", "casKey", "val2", "casOldVal", "val1", "casNewVal"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_CAS.key(),
+ "key", "casKey", "val2", "casOldVal", "val1", "casNewVal"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -680,7 +697,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
assertEquals("repOldVal", jcache().localPeek("repKey", CachePeekMode.ONHEAP));
- String ret = content(F.asMap("cmd", "rep", "key", "repKey", "val", "repVal"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_REPLACE.key(),
+ "key", "repKey", "val", "repVal"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -700,7 +718,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
assertEquals("replaceVal", jcache().get("replaceKey"));
- String ret = content(F.asMap("cmd", "rep", "key", "replaceKey", "val", "replaceValNew", "exp", "2000"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_REPLACE.key(),
+ "key", "replaceKey", "val", "replaceValNew", "exp", "2000"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -721,7 +740,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
public void testAppend() throws Exception {
jcache().put("appendKey", "appendVal");
- String ret = content(F.asMap("cmd", "append", "key", "appendKey", "val", "_suffix"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_APPEND.key(),
+ "key", "appendKey", "val", "_suffix"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -737,7 +757,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
public void testPrepend() throws Exception {
jcache().put("prependKey", "prependVal");
- String ret = content(F.asMap("cmd", "prepend", "key", "prependKey", "val", "prefix_"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_PREPEND.key(),
+ "key", "prependKey", "val", "prefix_"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -751,7 +772,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
* @throws Exception If failed.
*/
public void testIncrement() throws Exception {
- String ret = content(F.asMap("cmd", "incr", "key", "incrKey", "init", "2", "delta", "3"));
+ String ret = content(F.asMap("cmd", GridRestCommand.ATOMIC_INCREMENT.key(),
+ "key", "incrKey", "init", "2", "delta", "3"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -760,7 +782,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
assertEquals(5, grid(0).atomicLong("incrKey", 0, true).get());
- ret = content(F.asMap("cmd", "incr", "key", "incrKey", "delta", "10"));
+ ret = content(F.asMap("cmd", GridRestCommand.ATOMIC_INCREMENT.key(), "key", "incrKey", "delta", "10"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -774,7 +796,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
* @throws Exception If failed.
*/
public void testDecrement() throws Exception {
- String ret = content(F.asMap("cmd", "decr", "key", "decrKey", "init", "15", "delta", "10"));
+ String ret = content(F.asMap("cmd", GridRestCommand.ATOMIC_DECREMENT.key(),
+ "key", "decrKey", "init", "15", "delta", "10"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -783,7 +806,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
assertEquals(5, grid(0).atomicLong("decrKey", 0, true).get());
- ret = content(F.asMap("cmd", "decr", "key", "decrKey", "delta", "3"));
+ ret = content(F.asMap("cmd", GridRestCommand.ATOMIC_DECREMENT.key(),
+ "key", "decrKey", "delta", "3"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -801,7 +825,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
assertEquals("casOldVal", jcache().localPeek("casKey", CachePeekMode.ONHEAP));
- String ret = content(F.asMap("cmd", "cas", "key", "casKey", "val2", "casOldVal"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_CAS.key(),
+ "key", "casKey", "val2", "casOldVal"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -819,7 +844,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
public void testPutIfAbsent() throws Exception {
assertNull(jcache().localPeek("casKey", CachePeekMode.ONHEAP));
- String ret = content(F.asMap("cmd", "cas", "key", "casKey", "val1", "casNewVal"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_CAS.key(),
+ "key", "casKey", "val1", "casNewVal"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -839,7 +865,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
assertEquals("casVal", jcache().localPeek("casKey", CachePeekMode.ONHEAP));
- String ret = content(F.asMap("cmd", "cas", "key", "casKey"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_CAS.key(), "key", "casKey"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -855,7 +881,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
* @throws Exception If failed.
*/
public void testMetrics() throws Exception {
- String ret = content(F.asMap("cmd", "cache"));
+ String ret = content(F.asMap("cmd", GridRestCommand.CACHE_METRICS.key()));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -869,7 +895,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
* @throws Exception If failed.
*/
public void testTopology() throws Exception {
- String ret = content(F.asMap("cmd", "top", "attr", "false", "mtr", "false"));
+ String ret = content(F.asMap("cmd", GridRestCommand.TOPOLOGY.key(), "attr", "false", "mtr", "false"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -883,7 +909,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
* @throws Exception If failed.
*/
public void testNode() throws Exception {
- String ret = content(F.asMap("cmd", "node", "attr", "true", "mtr", "true", "id",
+ String ret = content(F.asMap("cmd", GridRestCommand.NODE.key(), "attr", "true", "mtr", "true", "id",
grid(0).localNode().id().toString()));
assertNotNull(ret);
@@ -893,7 +919,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
jsonEquals(ret, pattern("\\{.+\\}", true));
- ret = content(F.asMap("cmd", "node", "attr", "false", "mtr", "false", "ip", LOC_HOST));
+ ret = content(F.asMap("cmd", GridRestCommand.NODE.key(), "attr", "false", "mtr", "false", "ip", LOC_HOST));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -902,7 +928,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
jsonEquals(ret, pattern("\\{.+\\}", true));
- ret = content(F.asMap("cmd", "node", "attr", "false", "mtr", "false", "ip", LOC_HOST, "id",
+ ret = content(F.asMap("cmd", GridRestCommand.NODE.key(), "attr", "false", "mtr", "false", "ip", LOC_HOST, "id",
UUID.randomUUID().toString()));
assertNotNull(ret);
@@ -921,7 +947,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
* @throws Exception If failed.
*/
public void testExe() throws Exception {
- String ret = content(F.asMap("cmd", "exe"));
+ String ret = content(F.asMap("cmd", GridRestCommand.EXE.key()));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -931,7 +957,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
jsonEquals(ret, pattern("null", false));
// Attempt to execute unknown task (UNKNOWN_TASK) will result in exception on server.
- ret = content(F.asMap("cmd", "exe", "name", "UNKNOWN_TASK"));
+ ret = content(F.asMap("cmd", GridRestCommand.EXE.key(), "name", "UNKNOWN_TASK"));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -943,7 +969,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
grid(0).compute().localDeployTask(TestTask1.class, TestTask1.class.getClassLoader());
grid(0).compute().localDeployTask(TestTask2.class, TestTask2.class.getClassLoader());
- ret = content(F.asMap("cmd", "exe", "name", TestTask1.class.getName()));
+ ret = content(F.asMap("cmd", GridRestCommand.EXE.key(), "name", TestTask1.class.getName()));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -952,7 +978,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
jsonEquals(ret, pattern("\\{.+\\}", true));
- ret = content(F.asMap("cmd", "exe", "name", TestTask2.class.getName()));
+ ret = content(F.asMap("cmd", GridRestCommand.EXE.key(), "name", TestTask2.class.getName()));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -961,7 +987,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
jsonEquals(ret, pattern("\\{.+" + TestTask2.RES + ".+\\}", true));
- ret = content(F.asMap("cmd", "res"));
+ ret = content(F.asMap("cmd", GridRestCommand.RESULT.key()));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
@@ -990,7 +1016,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
String qry = "salary > ? and salary <= ?";
Map<String, String> params = new HashMap<>();
- params.put("cmd", "qryexecute");
+ params.put("cmd", GridRestCommand.EXECUTE_SQL_QUERY.key());
params.put("type", "Person");
params.put("psz", "10");
params.put("cacheName", "person");
@@ -1021,7 +1047,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
grid(0).cache(null).put("3", "3");
Map<String, String> params = new HashMap<>();
- params.put("cmd", "qryexecute");
+ params.put("cmd", GridRestCommand.EXECUTE_SQL_QUERY.key());
params.put("type", "String");
params.put("psz", "1");
params.put("qry", URLEncoder.encode("select * from String"));
@@ -1037,7 +1063,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
assertNotNull(qryId);
- ret = content(F.asMap("cmd", "qryfetch", "psz", "1", "qryId", String.valueOf(qryId)));
+ ret = content(F.asMap("cmd", GridRestCommand.FETCH_SQL_QUERY.key(),
+ "psz", "1", "qryId", String.valueOf(qryId)));
json = JSONObject.fromObject(ret);
@@ -1048,7 +1075,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
assertEquals(qryId0, qryId);
assertFalse(last);
- ret = content(F.asMap("cmd", "qryfetch", "psz", "1", "qryId", String.valueOf(qryId)));
+ ret = content(F.asMap("cmd", GridRestCommand.FETCH_SQL_QUERY.key(),
+ "psz", "1", "qryId", String.valueOf(qryId)));
json = JSONObject.fromObject(ret);
@@ -1069,7 +1097,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
String qry = "select concat(firstName, ' ', lastName) from Person";
Map<String, String> params = new HashMap<>();
- params.put("cmd", "qryfieldsexecute");
+ params.put("cmd", GridRestCommand.EXECUTE_SQL_FIELDS_QUERY.key());
params.put("psz", "10");
params.put("cacheName", "person");
params.put("qry", URLEncoder.encode(qry));
@@ -1095,7 +1123,7 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
String qry = "salary > ? and salary <= ?";
Map<String, String> params = new HashMap<>();
- params.put("cmd", "qryexecute");
+ params.put("cmd", GridRestCommand.EXECUTE_SQL_QUERY.key());
params.put("type", "Person");
params.put("psz", "1");
params.put("cacheName", "person");
@@ -1120,7 +1148,8 @@ public abstract class JettyRestProcessorAbstractSelfTest extends AbstractRestPro
assertNotNull(qryId);
- ret = content(F.asMap("cmd", "qryclose", "cacheName", "person", "qryId", String.valueOf(qryId)));
+ ret = content(F.asMap("cmd", GridRestCommand.CLOSE_SQL_QUERY.key(),
+ "cacheName", "person", "qryId", String.valueOf(qryId)));
assertNotNull(ret);
assertTrue(!ret.isEmpty());
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/dde9a4d3/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java
index ab8929f..76a33b1 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/GridRestCommand.java
@@ -34,25 +34,25 @@ public enum GridRestCommand {
CACHE_GET("get"),
/** Contains cached value. */
- CACHE_CONTAINS_KEY("containskey"),
+ CACHE_CONTAINS_KEY("conkey"),
/** Contains cached values. */
- CACHE_CONTAINS_KEYS("containskeys"),
+ CACHE_CONTAINS_KEYS("conkeys"),
/** Get several cached values. */
CACHE_GET_ALL("getall"),
/** Store value in cache and return previous value. */
- CACHE_GET_AND_PUT("getandput"),
+ CACHE_GET_AND_PUT("getput"),
/** Store value in cache and return previous value. */
- CACHE_GET_AND_PUT_IF_ABSENT("getandputifabsent"),
+ CACHE_GET_AND_PUT_IF_ABSENT("getputifabs"),
/** Store value in cache. */
CACHE_PUT("put"),
/** Store value in cache. */
- CACHE_PUT_IF_ABSENT("putifabsent"),
+ CACHE_PUT_IF_ABSENT("putifabs"),
/** Store value in cache if it doesn't exist. */
CACHE_ADD("add"),
@@ -64,10 +64,10 @@ public enum GridRestCommand {
CACHE_REMOVE("rmv"),
/** Remove value from cache. */
- CACHE_REMOVE_VALUE("rmvvalue"),
+ CACHE_REMOVE_VALUE("rmvval"),
/** Remove value from cache. */
- CACHE_GET_AND_REMOVE("getandrmv"),
+ CACHE_GET_AND_REMOVE("getrmv"),
/** Remove several values from cache. */
CACHE_REMOVE_ALL("rmvall"),
@@ -79,7 +79,7 @@ public enum GridRestCommand {
CACHE_REPLACE_VALUE("repval"),
/** Replace cache value only if there is currently a mapping for it. */
- CACHE_GET_AND_REPLACE("getandreplace"),
+ CACHE_GET_AND_REPLACE("getrep"),
/** Compare and set. */
CACHE_CAS("cas"),
@@ -94,7 +94,7 @@ public enum GridRestCommand {
CACHE_METRICS("cache"),
/** Cache size. */
- CACHE_SIZE("cachesize"),
+ CACHE_SIZE("size"),
/** Increment. */
ATOMIC_INCREMENT("incr"),
@@ -130,22 +130,22 @@ public enum GridRestCommand {
QUIT("quit"),
/** Get or create cache. */
- GET_OR_CREATE_CACHE("getorcreatecache"),
+ GET_OR_CREATE_CACHE("getorcreate"),
/** Stops dynamically started cache. */
- DESTROY_CACHE("destroycache"),
+ DESTROY_CACHE("destcache"),
/** Execute sql query. */
- EXECUTE_SQL_QUERY("qryexecute"),
+ EXECUTE_SQL_QUERY("qryexe"),
/** Execute sql fields query. */
- EXECUTE_SQL_FIELDS_QUERY("qryfieldsexecute"),
+ EXECUTE_SQL_FIELDS_QUERY("qryfldexe"),
/** Fetch query results. */
FETCH_SQL_QUERY("qryfetch"),
/** Close query. */
- CLOSE_SQL_QUERY("qryclose");
+ CLOSE_SQL_QUERY("qrycls");
/** Enum values. */
private static final GridRestCommand[] VALS = values();