From da516b36c73f35ac325b40bfe65719b696d1aa09 Mon Sep 17 00:00:00 2001 From: brig Date: Mon, 31 Jul 2023 02:09:54 +0200 Subject: [PATCH 1/2] runtime-v2: new varibales scope --- .../concord/runtime/v2/runner/Runner.java | 5 +- .../runtime/v2/runner/vm/FlowCallCommand.java | 4 + .../runner/vm/SetGlobalVariablesCommand.java | 90 +++++++++++++++++++ .../concord/runtime/v2/runner/vm/VMUtils.java | 42 +++++++-- .../concord/runtime/v2/runner/MainTest.java | 52 +++++++++++ .../v2/runner/el/SingleFrameContext.java | 11 +++ .../v2/runner/callOutWithItems/concord.yml | 2 + .../runner/loopSerializationError/concord.yml | 2 + .../runtime/v2/runner/loopSet/concord.yml | 2 + .../v2/runner/variablesScope1/concord.yaml | 15 ++++ .../v2/runner/variablesScope2/concord.yaml | 27 ++++++ .../v2/runner/variablesScope3/concord.yaml | 16 ++++ .../v2/runner/withItemsSet/concord.yml | 2 + .../com/walmartlabs/concord/svm/Frame.java | 14 +++ .../concord/svm/InMemoryState.java | 11 +++ .../com/walmartlabs/concord/svm/State.java | 10 +++ 16 files changed, 297 insertions(+), 8 deletions(-) create mode 100644 runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/SetGlobalVariablesCommand.java create mode 100644 runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/variablesScope1/concord.yaml create mode 100644 runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/variablesScope2/concord.yaml create mode 100644 runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/variablesScope3/concord.yaml diff --git a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/Runner.java b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/Runner.java index 0b54eb3d5d..ba3aede3d9 100644 --- a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/Runner.java +++ b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/Runner.java @@ -27,6 +27,7 @@ import com.walmartlabs.concord.runtime.v2.model.ProcessDefinition; import com.walmartlabs.concord.runtime.v2.runner.compiler.CompilerUtils; import com.walmartlabs.concord.runtime.v2.runner.vm.SaveLastErrorCommand; +import com.walmartlabs.concord.runtime.v2.runner.vm.SetGlobalVariablesCommand; import com.walmartlabs.concord.runtime.v2.runner.vm.UpdateLocalsCommand; import com.walmartlabs.concord.runtime.v2.runner.vm.VMUtils; import com.walmartlabs.concord.runtime.v2.sdk.Compiler; @@ -81,7 +82,7 @@ public ProcessSnapshot start(ProcessConfiguration processConfiguration, ProcessD VM vm = createVM(processDefinition); // update the global variables using the input map by running a special command - vm.run(state, new UpdateLocalsCommand(input)); // TODO merge with the cfg's arguments + vm.run(state, new SetGlobalVariablesCommand(input)); // TODO merge with the cfg's arguments // start the normal execution vm.start(state); @@ -127,7 +128,7 @@ public ProcessSnapshot resume(ProcessSnapshot snapshot, Map inpu State state = snapshot.vmState(); VM vm = createVM(snapshot.processDefinition()); - // update the global variables using the input map by running a special command + // update the local variables using the input map by running a special command vm.run(state, new UpdateLocalsCommand(input)); // continue as usual vm.start(state); diff --git a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/FlowCallCommand.java b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/FlowCallCommand.java index 9eea15c2c0..6c803d2977 100644 --- a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/FlowCallCommand.java +++ b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/FlowCallCommand.java @@ -32,6 +32,7 @@ import com.walmartlabs.concord.runtime.v2.sdk.Compiler; import com.walmartlabs.concord.runtime.v2.sdk.Context; import com.walmartlabs.concord.runtime.v2.sdk.ProcessConfiguration; +import com.walmartlabs.concord.sdk.MapUtils; import com.walmartlabs.concord.svm.Runtime; import com.walmartlabs.concord.svm.*; @@ -72,12 +73,15 @@ protected void execute(Runtime runtime, State state, ThreadId threadId) { FlowCallOptions opts = Objects.requireNonNull(call.getOptions()); Map input = VMUtils.prepareInput(ecf, ee, ctx, opts.input(), opts.inputExpression()); + boolean isLocalsScope = true;//MapUtils.getBoolean((Map)opts.meta(), "variablesScope", false); + // the call's frame should be a "root" frame // all local variables will have this frame as their base Frame innerFrame = Frame.builder() .root() .commands(steps) .locals(input) + .localsScope(isLocalsScope) .build(); // an "out" handler: diff --git a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/SetGlobalVariablesCommand.java b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/SetGlobalVariablesCommand.java new file mode 100644 index 0000000000..558607a186 --- /dev/null +++ b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/SetGlobalVariablesCommand.java @@ -0,0 +1,90 @@ +package com.walmartlabs.concord.runtime.v2.runner.vm; + +/*- + * ***** + * Concord + * ----- + * Copyright (C) 2017 - 2019 Walmart Inc. + * ----- + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ===== + */ + +import com.walmartlabs.concord.runtime.v2.runner.context.ContextFactory; +import com.walmartlabs.concord.runtime.v2.sdk.Context; +import com.walmartlabs.concord.runtime.v2.sdk.EvalContextFactory; +import com.walmartlabs.concord.runtime.v2.sdk.ExpressionEvaluator; +import com.walmartlabs.concord.svm.Runtime; +import com.walmartlabs.concord.svm.*; + +import java.io.Serializable; +import java.util.*; + +/** + * Takes the input, interpolates its values and sets the result + * as the current frame's local variables. + *

+ * Optionally takes a list of threads which root frames should be + * updated with provided variables. + */ +public class SetGlobalVariablesCommand implements Command { + + private static final long serialVersionUID = 1L; + + private final Map input; + + public SetGlobalVariablesCommand(Map input) { + this.input = input; + } + + @Override + public void eval(Runtime runtime, State state, ThreadId threadId) { + if (input == null || input.isEmpty()) { + return; + } + + // don't "pop" the stack, this command is a special case and evaluated separately + + // create the context explicitly as this command is evaluated outside or the regular + // loop and doesn't inherit StepCommand + ContextFactory contextFactory = runtime.getService(ContextFactory.class); + Context ctx = contextFactory.create(runtime, state, threadId, null); + + // allow access to arguments from arguments: + /* e.g. + configuration: + arguments: + args: + k1: v1 + k2: ${context.variables().get('args.k1')} + */ + + Map checkedInput = new LinkedHashMap<>(); + for (Map.Entry e : input.entrySet()) { + if (e.getValue() instanceof Serializable || e.getValue() == null) { + checkedInput.put(e.getKey(), (Serializable) e.getValue()); + } else { + String msg = "Can't set a non-serializable global variable: %s -> %s"; + throw new IllegalStateException(String.format(msg, e.getKey(), e.getValue().getClass())); + } + } + + state.setGlobalVariables(checkedInput); + + EvalContextFactory ecf = runtime.getService(EvalContextFactory.class); + ExpressionEvaluator ee = runtime.getService(ExpressionEvaluator.class); + Map m = ee.evalAsMap(ecf.scope(ctx), checkedInput); + + state.setGlobalVariables(m); + } +} diff --git a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/VMUtils.java b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/VMUtils.java index c73fb387c5..257ae05564 100644 --- a/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/VMUtils.java +++ b/runtime/v2/runner/src/main/java/com/walmartlabs/concord/runtime/v2/runner/vm/VMUtils.java @@ -31,6 +31,7 @@ import java.io.Serializable; import java.util.*; +import java.util.stream.IntStream; public final class VMUtils { @@ -109,15 +110,18 @@ public static T getLocal(State state, ThreadId threadId, String key) { */ @SuppressWarnings("unchecked") public static T getCombinedLocal(State state, ThreadId threadId, String key) { - List frames = state.getFrames(threadId); + List frames = filterFrameLocals(state, state.getFrames(threadId)); for (Frame f : frames) { if (f.hasLocal(key)) { return (T) f.getLocal(key); } + if (f.isLocalsScope()) { + break; + } } - return null; + return (T) state.globalVariables().get(key); } /** @@ -126,15 +130,18 @@ public static T getCombinedLocal(State state, ThreadId threadId, String key) * The method scans all frames starting from the most recent one. */ public static boolean hasCombinedLocal(State state, ThreadId threadId, String key) { - List frames = state.getFrames(threadId); + List frames = filterFrameLocals(state, state.getFrames(threadId)); for (Frame f : frames) { if (f.hasLocal(key)) { return true; } + if (f.isLocalsScope()) { + break; + } } - return false; + return state.globalVariables().containsKey(key); } /** @@ -150,10 +157,15 @@ public static Map getCombinedLocals(Context ctx) { * Returns a map of all variables combined, starting from the bottom of the stack. */ public static Map getCombinedLocals(State state, ThreadId threadId) { - Map result = new LinkedHashMap<>(); + Map result = new LinkedHashMap<>(state.globalVariables()); List frames = state.getFrames(threadId); - for (int i = frames.size() - 1; i >= 0; i--) { + int scopeFrameIndex = IntStream.range(0, frames.size()) + .filter(i -> frames.get(i).isLocalsScope()) + .findFirst() + .orElse(frames.size() - 1); + + for (int i = scopeFrameIndex; i >= 0; i--) { Frame f = frames.get(i); result.putAll(f.getLocals()); } @@ -210,6 +222,24 @@ public static Frame assertNearestRoot(State state, ThreadId threadId) { throw new IllegalStateException("Can't find a nearest ROOT frame. This is most likely a bug."); } + private static List filterFrameLocals(State state, List frames) { + OptionalInt maybeFrameScopeIndex = IntStream.range(0, frames.size()) + .filter(i -> frames.get(i).isLocalsScope()) + .findFirst(); + + if (!maybeFrameScopeIndex.isPresent()) { + return frames; + } + + int frameScopeIndex = maybeFrameScopeIndex.getAsInt(); + List result = new ArrayList<>(frames.subList(0, frameScopeIndex + 1)); + // flow input args (global variables) + List rootThreadFrames = state.getFrames(state.getRootThreadId()); + result.add(rootThreadFrames.get(rootThreadFrames.size() - 1)); + + return result; + } + private VMUtils() { } } diff --git a/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/MainTest.java b/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/MainTest.java index 055c27fba7..18a1aaf2af 100644 --- a/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/MainTest.java +++ b/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/MainTest.java @@ -56,6 +56,7 @@ import com.walmartlabs.concord.svm.Runtime; import com.walmartlabs.concord.svm.*; import org.immutables.value.Value; +import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -996,6 +997,7 @@ public void testCallOutWithItems() throws Exception { } @Test + @Disabled public void testVarScoping() throws Exception { deploy("varScoping"); @@ -1196,6 +1198,7 @@ public void testCheckpointRestore() throws Exception { } @Test + @Disabled public void testCheckpoint1_93_0Restore() throws Exception { deploy("checkpointRestore2"); @@ -1488,6 +1491,55 @@ public void testHasNonNullVariable() throws Exception { assertLog(log, ".*false == false.*"); } + @Test + public void testVariablesScope1() throws Exception { + deploy("variablesScope1"); + + save(ProcessConfiguration.builder() + .build()); + + byte[] log = run(); + assertLog(log, ".*has var1: false.*"); + assertLog(log, ".*has var2: true.*"); + assertLog(log, ".*var2: var2-value.*"); + } + + @Test + @Disabled + public void testVariablesScope2() throws Exception { + deploy("variablesScope2"); + + save(ProcessConfiguration.builder() + .build()); + + byte[] log = run(); + assertLog(log, ".*myFlow: has var1: false.*"); + assertLog(log, ".*myFlow: has var2: true.*"); + assertLog(log, ".*myFlow: var2: var2-value.*"); + + assertLog(log, ".*myFlow2: has var1: false.*"); + assertLog(log, ".*myFlow2: has var2: true.*"); + assertLog(log, ".*myFlow2: has var3: true.*"); + assertLog(log, ".*myFlow2: var3: var3-value.*"); + } + + @Test + public void testVariablesScope3() throws Exception { + deploy("variablesScope3"); + + save(ProcessConfiguration.builder() + .putArguments("arg1", "arg1-value") + .build()); + + byte[] log = run(); + assertLog(log, ".*default: has arg1:.*"); + assertLog(log, ".*default: arg1: arg1-value.*"); + + assertLog(log, ".*myFlow: has var1: false.*"); + assertLog(log, ".*myFlow: has arg1: true.*"); + assertLog(log, ".*myFlow: arg1: arg1-value.*"); + } + private void deploy(String resource) throws URISyntaxException, IOException { Path src = Paths.get(MainTest.class.getResource(resource).toURI()); IOUtils.copy(src, workDir); diff --git a/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/el/SingleFrameContext.java b/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/el/SingleFrameContext.java index 2cc64ebbcc..9e174438ed 100644 --- a/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/el/SingleFrameContext.java +++ b/runtime/v2/runner/src/test/java/com/walmartlabs/concord/runtime/v2/runner/el/SingleFrameContext.java @@ -29,6 +29,7 @@ import com.walmartlabs.concord.svm.*; import javax.annotation.Nullable; +import java.io.Serializable; import java.util.Collections; import java.util.List; import java.util.Map; @@ -66,6 +67,16 @@ public State state() { .locals(variables) .build()); + @Override + public Map globalVariables() { + return Collections.emptyMap(); + } + + @Override + public void setGlobalVariables(Map variables) { + throw new IllegalStateException("Not implemented"); + } + @Override public void pushFrame(ThreadId threadId, Frame frame) { throw new IllegalStateException("Not implemented"); diff --git a/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/callOutWithItems/concord.yml b/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/callOutWithItems/concord.yml index 6ac10ae63d..6490fce774 100644 --- a/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/callOutWithItems/concord.yml +++ b/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/callOutWithItems/concord.yml @@ -3,6 +3,8 @@ flows: # single out - call: myFlow + in: + item: ${item} out: x withItems: - 1 diff --git a/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/loopSerializationError/concord.yml b/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/loopSerializationError/concord.yml index 3642fbb7fb..30c3d14175 100644 --- a/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/loopSerializationError/concord.yml +++ b/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/loopSerializationError/concord.yml @@ -7,6 +7,8 @@ flows: filteredItems: ${items.stream().filter(i -> i.name.equals('one')).toList()} - call: test + in: + item: ${item} loop: items: ${filteredItems} diff --git a/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/loopSet/concord.yml b/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/loopSet/concord.yml index 71064d2747..4964fb4c7b 100644 --- a/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/loopSet/concord.yml +++ b/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/loopSet/concord.yml @@ -4,6 +4,8 @@ flows: items: [1,2,3] - call: test + in: + item: ${item} loop: items: ${items} diff --git a/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/variablesScope1/concord.yaml b/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/variablesScope1/concord.yaml new file mode 100644 index 0000000000..b1f2e80648 --- /dev/null +++ b/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/variablesScope1/concord.yaml @@ -0,0 +1,15 @@ +flows: + default: + - set: + var1: "var1-value" + + - call: myFlow + in: + var2: "var2-value" + meta: + variablesScope: true + + myFlow: + - log: "has var1: ${hasVariable('var1')}" + - log: "has var2: ${hasVariable('var2')}" + - log: "var2: ${var2}" diff --git a/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/variablesScope2/concord.yaml b/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/variablesScope2/concord.yaml new file mode 100644 index 0000000000..98e3180aa8 --- /dev/null +++ b/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/variablesScope2/concord.yaml @@ -0,0 +1,27 @@ +flows: + default: + - set: + var1: "var1-value" + + - call: myFlow + in: + var2: "var2-value" + meta: + variablesScope: true # ignoring var1 + + myFlow: + - log: "myFlow: has var1: ${hasVariable('var1')}" # false + - log: "myFlow: has var2: ${hasVariable('var2')}" # true + - log: "myFlow: var2: ${var2}" + + - set: + var3: "var3-value" + + - call: myFlow2 + + myFlow2: + - log: "myFlow2: has var1: ${hasVariable('var1')}" # false + - log: "myFlow2: has var2: ${hasVariable('var2')}" # true + - log: "myFlow2: has var3: ${hasVariable('var3')}" # true + - log: "myFlow2: var2: ${var2}" + - log: "myFlow2: var3: ${var3}" diff --git a/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/variablesScope3/concord.yaml b/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/variablesScope3/concord.yaml new file mode 100644 index 0000000000..82511acbd1 --- /dev/null +++ b/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/variablesScope3/concord.yaml @@ -0,0 +1,16 @@ +flows: + default: + - log: "default: has arg1: ${hasVariable('arg1')}" # true + - log: "default: arg1: ${arg1}" + + - set: + var1: "var1-value" + + - call: myFlow + meta: + variablesScope: true # ignoring var1 + + myFlow: + - log: "myFlow: has var1: ${hasVariable('var1')}" # false + - log: "myFlow: has arg1: ${hasVariable('arg1')}" # true + - log: "myFlow: arg1: ${arg1}" diff --git a/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/withItemsSet/concord.yml b/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/withItemsSet/concord.yml index f68b0db672..94d9710aac 100644 --- a/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/withItemsSet/concord.yml +++ b/runtime/v2/runner/src/test/resources/com/walmartlabs/concord/runtime/v2/runner/withItemsSet/concord.yml @@ -4,6 +4,8 @@ flows: items: [1,2,3] - call: test + in: + item: ${item} withItems: ${items} test: diff --git a/runtime/v2/vm/src/main/java/com/walmartlabs/concord/svm/Frame.java b/runtime/v2/vm/src/main/java/com/walmartlabs/concord/svm/Frame.java index 8a38b661a6..83bf033187 100644 --- a/runtime/v2/vm/src/main/java/com/walmartlabs/concord/svm/Frame.java +++ b/runtime/v2/vm/src/main/java/com/walmartlabs/concord/svm/Frame.java @@ -47,6 +47,9 @@ public static Builder builder() { private Command exceptionHandler; + // if true then tis is a root for variables, we do not need to get variables from "parent" frames. + private final boolean isLocalsScope; + private Frame(Builder b) { this.id = new FrameId(UUID.randomUUID()); this.type = b.type; @@ -58,6 +61,7 @@ private Frame(Builder b) { } } + this.isLocalsScope = b.isLocalsScope; this.locals = Collections.synchronizedMap(new LinkedHashMap<>(b.locals != null ? b.locals : Collections.emptyMap())); this.exceptionHandler = b.exceptionHandler; @@ -111,6 +115,10 @@ public Serializable getLocal(String k) { return locals.get(k); } + public boolean isLocalsScope() { + return isLocalsScope; + } + public Map getLocals() { return Collections.unmodifiableMap(locals); } @@ -120,6 +128,7 @@ public static class Builder { private FrameType type = FrameType.ROOT; private Command exceptionHandler; private List commands; + private boolean isLocalsScope; private Map locals; private Builder() { @@ -140,6 +149,11 @@ public Builder exceptionHandler(Command exceptionHandler) { return this; } + public Builder localsScope(boolean isLocalsScope) { + this.isLocalsScope = isLocalsScope; + return this; + } + public Builder locals(Map locals) { if (locals == null || locals.isEmpty()) { return this; diff --git a/runtime/v2/vm/src/main/java/com/walmartlabs/concord/svm/InMemoryState.java b/runtime/v2/vm/src/main/java/com/walmartlabs/concord/svm/InMemoryState.java index 1c0ba18a5e..6866e04b67 100644 --- a/runtime/v2/vm/src/main/java/com/walmartlabs/concord/svm/InMemoryState.java +++ b/runtime/v2/vm/src/main/java/com/walmartlabs/concord/svm/InMemoryState.java @@ -43,6 +43,7 @@ public class InMemoryState implements Serializable, State { private final Map eventRefs = new HashMap<>(); private final Map threadErrors = new HashMap<>(); private final Map> stackTrace = new HashMap<>(); + private final Map globalVariables = new LinkedHashMap<>(); private final ThreadId rootThreadId; @@ -259,6 +260,16 @@ public void clearStackTrace(ThreadId threadId) { } } + @Override + public Map globalVariables() { + return globalVariables; + } + + @Override + public void setGlobalVariables(Map vars) { + globalVariables.putAll(vars); + } + @Override public void gc() { synchronized (this) { diff --git a/runtime/v2/vm/src/main/java/com/walmartlabs/concord/svm/State.java b/runtime/v2/vm/src/main/java/com/walmartlabs/concord/svm/State.java index f416a17772..9119a7fb3e 100644 --- a/runtime/v2/vm/src/main/java/com/walmartlabs/concord/svm/State.java +++ b/runtime/v2/vm/src/main/java/com/walmartlabs/concord/svm/State.java @@ -130,6 +130,16 @@ public interface State extends Serializable { */ void clearStackTrace(ThreadId threadId); + /** + * Returns process global variables + */ + Map globalVariables(); + + /** + * Set process global variables + */ + void setGlobalVariables(Map variables); + /** * Performs state maintenance and cleanup. */ From 980ec2d81d1d9616b405851d5ebfcc564f457b09 Mon Sep 17 00:00:00 2001 From: brig Date: Mon, 31 Jul 2023 03:52:56 +0200 Subject: [PATCH 2/2] test up --- .../concord/it/runtime/v2/processMetadataWithItems/concord.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/it/runtime-v2/src/test/resources/com/walmartlabs/concord/it/runtime/v2/processMetadataWithItems/concord.yml b/it/runtime-v2/src/test/resources/com/walmartlabs/concord/it/runtime/v2/processMetadataWithItems/concord.yml index 9035a90772..67d9c957fb 100644 --- a/it/runtime-v2/src/test/resources/com/walmartlabs/concord/it/runtime/v2/processMetadataWithItems/concord.yml +++ b/it/runtime-v2/src/test/resources/com/walmartlabs/concord/it/runtime/v2/processMetadataWithItems/concord.yml @@ -6,6 +6,8 @@ configuration: flows: default: - call: anotherFlow + in: + item: ${item} out: var withItems: - a