Skip to content

Commit

Permalink
re-worked approach to #1558
Browse files Browse the repository at this point in the history 
no more locking at all except for the callonce / callSingle flows
if any troublesome value is encountered we throw it out with a log message and the name of the variable
if tests depend on functions from callonce / callSingle or java classes / code they may fail
but thats the fault of the user - the log messages should guide you what to stop doing
and if you switch on TRACE logging you will see more detailed stack traces for diagnosis
  • Loading branch information
@ptrthomas
ptrthomas committed Jun 19, 2021
1 parent e7b3888 commit 86f432b
Show file tree
Hide file tree
Showing 2 changed files with 37 additions and 55 deletions.
88 changes: 34 additions & 54 deletions karate-core/src/main/java/com/intuit/karate/core/ScenarioEngine.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1022,7 +1022,7 @@ public void init() { // not in constructor because it has to be on Runnable.run(
runtime.magicVariables.forEach((k, v) -> {
// even hidden variables may need pre-processing
// for e.g. the __arg may contain functions that originated in a different js context
recurseAndAttach(v, seen);
recurseAndAttach(k, v, seen);
setHiddenVariable(k, v);
});
attachVariables(seen); // re-hydrate any functions from caller or background
Expand All @@ -1048,76 +1048,51 @@ public void init() { // not in constructor because it has to be on Runnable.run(

private void attachVariables(Set<Object> seen) {
vars.forEach((k, v) -> {
switch (v.type) {
case JS_FUNCTION:
Value value = attach(v.getValue());
v = new Variable(value);
vars.put(k, v);
break;
case MAP:
case LIST:
recurseAndAttach(v.getValue(), seen);
break;
case OTHER:
if (v.isJsFunctionWrapper()) {
JsFunction jf = v.getValue();
Value attached = attachSource(jf.source);
v = new Variable(attached);
vars.put(k, v);
}
break;
default:
// do nothing
Object o = recurseAndAttach(k, v.getValue(), seen);
if (o == null) {
o = v.getValue();
} else {
try {
vars.put(k, new Variable(o));
} catch (Exception e) {
logger.debug("[*** attach variables ***] failed to attach graal value: {} - {}", k, e.getMessage());
}
}
JS.put(k, v.getValue());
JS.put(k, o);
});
}

protected Map<String, Variable> detachVariables() {
Set<Object> seen = Collections.newSetFromMap(new IdentityHashMap());
Map<String, Variable> detached = new HashMap(vars.size());
vars.forEach((k, v) -> {
switch (v.type) {
case JS_FUNCTION:
JsFunction jf = new JsFunction(v.getValue());
v = new Variable(jf);
break;
case MAP:
case LIST:
Object o = recurseAndDetachAndDeepClone(v.getValue(), seen);
v = new Variable(o);
break;
default:
// do nothing
}
detached.put(k, v);
Object o = recurseAndDetachAndDeepClone(v.getValue(), seen);
detached.put(k, new Variable(o));
});
return detached;
}

// only called by "call" routine
protected void recurseAndAttach(Object o) {
protected void recurseAndAttach(String name, Object o) {
Set<Object> seen = Collections.newSetFromMap(new IdentityHashMap());
synchronized (runtime.featureRuntime.suite) {
recurseAndAttach(o, seen);
}
recurseAndAttach(name, o, seen);
}

private Object recurseAndAttach(Object o, Set<Object> seen) {
private Object recurseAndAttach(String name, Object o, Set<Object> seen) {
if (o instanceof Value) {
Value value = Value.asValue(o);
try {
if (value.canExecute()) {
if (value.isMetaObject()) { // js function
return attach(value);
} else { // java function
return new JsExecutable(value);
return value;
}
} else { // anything else, including java-type references
return value;
}
} catch (Exception e) {
logger.warn("[attach] failed to attach js value: {}", e.getMessage());
logger.warn("[*** attach ***] failed to attach js value: {} - {}", name, e.getMessage());
return null;
}
} else if (o instanceof JsFunction) {
Expand All @@ -1129,7 +1104,7 @@ private Object recurseAndAttach(Object o, Set<Object> seen) {
int count = list.size();
for (int i = 0; i < count; i++) {
Object child = list.get(i);
Object result = recurseAndAttach(child, seen);
Object result = recurseAndAttach(name + "[" + i + "]", child, seen);
if (result != null) {
list.set(i, result);
}
Expand All @@ -1140,7 +1115,7 @@ private Object recurseAndAttach(Object o, Set<Object> seen) {
if (seen.add(o)) {
Map<String, Object> map = (Map) o;
map.forEach((k, v) -> {
Object result = recurseAndAttach(v, seen);
Object result = recurseAndAttach(name + "." + k, v, seen);
if (result != null) {
map.put(k, result);
}
Expand All @@ -1162,11 +1137,10 @@ protected Object recurseAndAttachAndDeepClone(Object o) {

private Object recurseAndAttachAndDeepClone(Object o, Set<Object> seen) {
if (o instanceof Value) {
// will happen only for java "class" and java functions (static methods)
try {
return Value.asValue(o);
} catch (Exception e) {
logger.warn("[attach deep] failed to attach graal value: {}", e.getMessage());
logger.warn("[*** attach deep ***] failed to attach graal value: {}", e.getMessage());
return null;
}
}
Expand Down Expand Up @@ -1206,20 +1180,20 @@ protected Object recurseAndDetachAndDeepClone(Object o) {

private Object recurseAndDetachAndDeepClone(Object o, Set<Object> seen) {
if (o instanceof Value) {
Value value = Value.asValue(o);
Value value = (Value) o;
try {
if (value.canExecute()) {
if (value.isMetaObject()) { // js function
o = new JsFunction(value);
return new JsFunction(value);
} else { // java function
o = new JsExecutable(value);
return new JsExecutable(value);
}
} else {
// everything else including java-type references that do not need special attach handling
o = value;
o = JsValue.toJava(value);
}
} catch (Exception e) {
logger.warn("[detach] unsupported value in callonce / callSingle: {}", e.getMessage());
logger.warn("[*** detach deep ***] unsupported value in callonce / callSingle: {}", e.getMessage());
return null;
}
}
Expand Down Expand Up @@ -1327,7 +1301,13 @@ public void setVariables(Map<String, Object> map) {
if (map == null) {
return;
}
map.forEach((k, v) -> setVariable(k, v));
map.forEach((k, v) -> {
try {
setVariable(k, v);
} catch (Exception e) {
logger.warn("[*** set variables ***] skipping invalid graal value: {} - {}", k, e.getMessage());
}
});
}

private static Map<String, Variable> copy(Map<String, Variable> source, boolean deep) {
Expand Down Expand Up @@ -1953,7 +1933,7 @@ public Variable call(Variable called, Variable arg, boolean sharedScope) {
case FEATURE:
// will be always a map or a list of maps (loop call result)
Object callResult = callFeature(called.getValue(), arg, -1, sharedScope);
recurseAndAttach(callResult);
recurseAndAttach("", callResult);
return new Variable(callResult);
default:
throw new RuntimeException("not a callable feature or js function: " + called);
Expand Down
4 changes: 3 additions & 1 deletion karate-core/src/main/java/com/intuit/karate/graal/JsValue.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,9 @@ public JsValue(Value v) {
type = Type.OTHER;
}
} catch (Exception e) {
logger.debug("js conversion failed", e);
if (logger.isTraceEnabled()) {
logger.trace("js conversion failed", e);
}
throw e;
}
}
Expand Down

0 comments on commit 86f432b

Please sign in to comment.