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:18 UTC
[4/5] incubator-ignite git commit: Merge remote-tracking branch
'remotes/origin/ignite-961-master' into ignite-961
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
----------------------------------------------------------------------