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/03 16:26:53 UTC
[41/41] incubator-ignite git commit: #ignite-964: revert small
changes.
#ignite-964: revert small changes.
Project: http://git-wip-us.apache.org/repos/asf/incubator-ignite/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-ignite/commit/3d39744e
Tree: http://git-wip-us.apache.org/repos/asf/incubator-ignite/tree/3d39744e
Diff: http://git-wip-us.apache.org/repos/asf/incubator-ignite/diff/3d39744e
Branch: refs/heads/ignite-964-1
Commit: 3d39744e3d09697f325b7250c5ddd71063c3f224
Parents: 4d81938
Author: ivasilinets <iv...@gridgain.com>
Authored: Fri Jul 3 17:25:54 2015 +0300
Committer: ivasilinets <iv...@gridgain.com>
Committed: Fri Jul 3 17:25:54 2015 +0300
----------------------------------------------------------------------
.../scripting/IgniteScriptingCommandHandler.java | 4 +---
.../rest/handlers/scripting/JSONCacheObject.java | 18 ++++++++++++++++--
modules/nodejs/src/test/js/test-cache-api.js | 4 ++--
.../http/jetty/GridJettyRestHandler.java | 2 +-
4 files changed, 20 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d39744e/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
index 795a9b0..5fcbd2b 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/IgniteScriptingCommandHandler.java
@@ -17,8 +17,6 @@
package org.apache.ignite.internal.processors.rest.handlers.scripting;
-
-import net.sf.json.*;
import org.apache.ignite.*;
import org.apache.ignite.cluster.*;
import org.apache.ignite.compute.*;
@@ -179,7 +177,7 @@ public class IgniteScriptingCommandHandler extends GridRestCommandHandlerAdapter
data[i] = results.get(i).getData();
}
- Object o = ctx.scripting().invokeJSFunction(reduceFunc, JSONSerializer.toJSON(data), null);
+ Object o = ctx.scripting().invokeJSFunction(reduceFunc, data, null);
return o;
}
catch (IgniteCheckedException e) {
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d39744e/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/JSONCacheObject.java
----------------------------------------------------------------------
diff --git a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/JSONCacheObject.java b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/JSONCacheObject.java
index b8f7510..51225fd 100644
--- a/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/JSONCacheObject.java
+++ b/modules/core/src/main/java/org/apache/ignite/internal/processors/rest/handlers/scripting/JSONCacheObject.java
@@ -49,11 +49,25 @@ public class JSONCacheObject implements JSObject {
return fields.hashCode();
}
+ /** {@inheritDoc} */
@Override public boolean equals(Object obj) {
if (obj == null || !(obj instanceof JSONCacheObject))
return false;
- return fields.equals(((JSONCacheObject)obj).fields);
+ JSONCacheObject obj0 = (JSONCacheObject) obj;
+
+ if (fields.size() != obj0.fields.size())
+ return false;
+
+ for (Object key : obj0.fields.keySet()) {
+ if (!fields.containsKey(key))
+ return false;
+
+ if (!obj0.getField(key).equals(getField(key)))
+ return false;
+ }
+
+ return true;
}
/**
@@ -97,7 +111,7 @@ public class JSONCacheObject implements JSObject {
for (Object v : o1)
val.add(toSimpleObject(v));
- return val.toArray();
+ return val;
}
return o;
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d39744e/modules/nodejs/src/test/js/test-cache-api.js
----------------------------------------------------------------------
diff --git a/modules/nodejs/src/test/js/test-cache-api.js b/modules/nodejs/src/test/js/test-cache-api.js
index d092d37..947a3f6 100644
--- a/modules/nodejs/src/test/js/test-cache-api.js
+++ b/modules/nodejs/src/test/js/test-cache-api.js
@@ -224,8 +224,8 @@ testGetAndReplaceObject = function() {
testReplaceValueObject = function() {
function replaceValue(cache, entry, next) {
- var newKey = {"key" :"7"};
- cache.replaceValue(entry[0], newKey, entry[1], onReplaceValue.bind(null, cache));
+ var newVal = {"key" :"7"};
+ cache.replaceValue(entry[0], newVal, entry[1], onReplaceValue.bind(null, cache));
function onReplaceValue(cache, err, res) {
assert(err === null, "Get error on get and put [err=" + err + "]");
http://git-wip-us.apache.org/repos/asf/incubator-ignite/blob/3d39744e/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 4b764f2..f9c4685 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
@@ -422,7 +422,7 @@ public class GridJettyRestHandler extends AbstractHandler {
else if (cmd == CACHE_GET_ALL || cmd == CACHE_REMOVE_ALL || cmd == CACHE_CONTAINS_KEYS) {
JSONCacheObject cacheObj = new JSONCacheObject(o);
- Object[] keys = (Object[])cacheObj.getField("keys");
+ List keys = (List)cacheObj.getField("keys");
for (Object key : keys)
map.put(key, null);