You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by ok...@apache.org on 2019/03/25 11:30:39 UTC
[tinkerpop] branch tp4 updated: I have worked out the concept of
always submitting Bytecode to a Machine. The Machine is able to precompile
source instructions (e.g. strategies,
database and processor connections). LocalMachine is simple thread safe
machine for use on the local computer. Very neat model.
This is an automated email from the ASF dual-hosted git repository.
okram pushed a commit to branch tp4
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
The following commit(s) were added to refs/heads/tp4 by this push:
new a9fb2e0 I have worked out the concept of always submitting Bytecode to a Machine. The Machine is able to precompile source instructions (e.g. strategies, database and processor connections). LocalMachine is simple thread safe machine for use on the local computer. Very neat model.
a9fb2e0 is described below
commit a9fb2e0db252a2fc08e2e1809c7afd2a80ce8b4d
Author: Marko A. Rodriguez <ok...@gmail.com>
AuthorDate: Mon Mar 25 05:30:29 2019 -0600
I have worked out the concept of always submitting Bytecode to a Machine. The Machine is able to precompile source instructions (e.g. strategies, database and processor connections). LocalMachine is simple thread safe machine for use on the local computer. Very neat model.
---
.../language/gremlin/AbstractTraversal.java | 10 ++--
.../apache/tinkerpop/language/gremlin/Gremlin.java | 6 +-
.../language/gremlin/TraversalSource.java | 23 +++++++-
.../language/gremlin/common/CommonTraversal.java | 7 ++-
.../language/gremlin/core/CoreTraversal.java | 7 ++-
.../org/apache/tinkerpop/machine/LocalMachine.java | 48 ++++++++++++++-
.../java/org/apache/tinkerpop/machine/Machine.java | 4 ++
.../tinkerpop/machine/bytecode/BytecodeUtil.java | 27 ++++-----
.../machine/bytecode/compiler/Compilation.java | 14 ++++-
.../bytecode/compiler/CompositeCompiler.java | 5 ++
.../bytecode/compiler/SourceCompilation.java | 69 ++++++++++++++++++++++
.../strategy/decoration/ExplainStrategy.java | 4 +-
.../CoefficientVerificationStrategy.java | 3 +-
.../tinkerpop/machine/processor/beam/BeamTest.java | 11 +++-
.../machine/processor/pipes/PipesTest.java | 11 +++-
15 files changed, 207 insertions(+), 42 deletions(-)
diff --git a/java/language/gremlin/src/main/java/org/apache/tinkerpop/language/gremlin/AbstractTraversal.java b/java/language/gremlin/src/main/java/org/apache/tinkerpop/language/gremlin/AbstractTraversal.java
index 5c35849..3d2811c 100644
--- a/java/language/gremlin/src/main/java/org/apache/tinkerpop/language/gremlin/AbstractTraversal.java
+++ b/java/language/gremlin/src/main/java/org/apache/tinkerpop/language/gremlin/AbstractTraversal.java
@@ -18,8 +18,8 @@
*/
package org.apache.tinkerpop.language.gremlin;
+import org.apache.tinkerpop.machine.Machine;
import org.apache.tinkerpop.machine.bytecode.Bytecode;
-import org.apache.tinkerpop.machine.bytecode.BytecodeUtil;
import org.apache.tinkerpop.machine.coefficient.Coefficient;
import org.apache.tinkerpop.machine.traverser.Traverser;
@@ -32,8 +32,9 @@ import java.util.List;
*/
public abstract class AbstractTraversal<C, S, E> implements Traversal<C, S, E> {
- protected Coefficient<C> currentCoefficient;
+ private final Machine machine;
protected final Bytecode<C> bytecode;
+ protected Coefficient<C> currentCoefficient;
private Iterator<Traverser<C, E>> traversers = null;
private boolean locked = false;
@@ -41,7 +42,8 @@ public abstract class AbstractTraversal<C, S, E> implements Traversal<C, S, E> {
private long lastCount = 0L;
private E lastObject = null;
- public AbstractTraversal(final Bytecode<C> bytecode, final Coefficient<C> unity) {
+ public AbstractTraversal(final Machine machine, final Bytecode<C> bytecode, final Coefficient<C> unity) {
+ this.machine = machine;
this.bytecode = bytecode;
this.currentCoefficient = unity.clone();
}
@@ -59,7 +61,7 @@ public abstract class AbstractTraversal<C, S, E> implements Traversal<C, S, E> {
private final void prepareTraversal() {
if (!this.locked) {
this.locked = true;
- this.traversers = BytecodeUtil.getMachine(this.bytecode).get().submit(this.bytecode);
+ this.traversers = this.machine.submit(this.bytecode);
}
}
diff --git a/java/language/gremlin/src/main/java/org/apache/tinkerpop/language/gremlin/Gremlin.java b/java/language/gremlin/src/main/java/org/apache/tinkerpop/language/gremlin/Gremlin.java
index fdd4981..b739a16 100644
--- a/java/language/gremlin/src/main/java/org/apache/tinkerpop/language/gremlin/Gremlin.java
+++ b/java/language/gremlin/src/main/java/org/apache/tinkerpop/language/gremlin/Gremlin.java
@@ -18,12 +18,14 @@
*/
package org.apache.tinkerpop.language.gremlin;
+import org.apache.tinkerpop.machine.Machine;
+
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public final class Gremlin {
- public static <C> TraversalSource<C> traversal() {
- return new TraversalSource<>();
+ public static <C> TraversalSource<C> traversal(final Machine machine) {
+ return new TraversalSource<>(machine);
}
}
diff --git a/java/language/gremlin/src/main/java/org/apache/tinkerpop/language/gremlin/TraversalSource.java b/java/language/gremlin/src/main/java/org/apache/tinkerpop/language/gremlin/TraversalSource.java
index a294b48..2eed977 100644
--- a/java/language/gremlin/src/main/java/org/apache/tinkerpop/language/gremlin/TraversalSource.java
+++ b/java/language/gremlin/src/main/java/org/apache/tinkerpop/language/gremlin/TraversalSource.java
@@ -39,12 +39,15 @@ import org.apache.tinkerpop.machine.structure.data.TVertex;
*/
public class TraversalSource<C> implements Cloneable {
+ private final Machine machine;
private Bytecode<C> bytecode;
private Coefficient<C> coefficient = (Coefficient<C>) LongCoefficient.create();
+ private boolean registered = false;
// private Set<Strategy> sortedStrategies (will be more efficient to precompute sort order)
// private Machine machine (will be more efficient for remote connections)
- TraversalSource() {
+ TraversalSource(final Machine machine) {
+ this.machine = machine;
this.bytecode = new Bytecode<>();
this.bytecode.addSourceInstruction(Symbols.WITH_STRATEGY, CoefficientStrategy.class); // TODO: remove when strategies full integrated
this.bytecode.addSourceInstruction(Symbols.WITH_STRATEGY, CoefficientVerificationStrategy.class);
@@ -86,25 +89,39 @@ public class TraversalSource<C> implements Cloneable {
// spawn methods
public <S> Traversal<C, S, S> inject(final S... objects) {
+ this.prepareSourceCode();
final Bytecode<C> bytecode = this.bytecode.clone();
final Coefficient<C> coefficient = this.coefficient.clone();
bytecode.addInstruction(coefficient, Symbols.INITIAL, objects);
- return new CommonTraversal<>(bytecode, coefficient); // TODO
+ return new CommonTraversal<>(this.machine, bytecode, coefficient); // TODO
}
public Traversal<C, TVertex, TVertex> V() {
+ this.prepareSourceCode();
final Bytecode<C> bytecode = this.bytecode.clone();
final Coefficient<C> coefficient = this.coefficient.clone();
bytecode.addInstruction(coefficient, Symbols.V);
- return new CommonTraversal<>(bytecode, coefficient); // TODO
+ return new CommonTraversal<>(this.machine, bytecode, coefficient); // TODO
}
//
+ private final void prepareSourceCode() {
+ if (!this.registered) {
+ this.registered = true;
+ this.bytecode = this.machine.register(this.bytecode);
+ }
+ }
+
+ public void close() {
+ this.machine.close(this.bytecode);
+ }
+
@Override
public TraversalSource<C> clone() {
try {
final TraversalSource<C> clone = (TraversalSource<C>) super.clone();
+ clone.registered = false;
clone.bytecode = this.bytecode.clone();
clone.coefficient = this.coefficient.clone();
return clone;
diff --git a/java/language/gremlin/src/main/java/org/apache/tinkerpop/language/gremlin/common/CommonTraversal.java b/java/language/gremlin/src/main/java/org/apache/tinkerpop/language/gremlin/common/CommonTraversal.java
index a9c2a74..738d1be 100644
--- a/java/language/gremlin/src/main/java/org/apache/tinkerpop/language/gremlin/common/CommonTraversal.java
+++ b/java/language/gremlin/src/main/java/org/apache/tinkerpop/language/gremlin/common/CommonTraversal.java
@@ -22,6 +22,7 @@ import org.apache.tinkerpop.language.gremlin.AbstractTraversal;
import org.apache.tinkerpop.language.gremlin.P;
import org.apache.tinkerpop.language.gremlin.Traversal;
import org.apache.tinkerpop.language.gremlin.TraversalUtil;
+import org.apache.tinkerpop.machine.Machine;
import org.apache.tinkerpop.machine.bytecode.Bytecode;
import org.apache.tinkerpop.machine.bytecode.compiler.CommonCompiler.Symbols;
import org.apache.tinkerpop.machine.bytecode.compiler.Pred;
@@ -38,12 +39,12 @@ public class CommonTraversal<C, S, E> extends AbstractTraversal<C, S, E> {
// used by __
CommonTraversal() {
// TODO: this will cause __ problems
- this(new Bytecode<>(), (Coefficient<C>) LongCoefficient.create());
+ this(null, new Bytecode<>(), (Coefficient<C>) LongCoefficient.create());
}
// used by TraversalSource
- public CommonTraversal(final Bytecode<C> bytecode, final Coefficient<C> unity) {
- super(bytecode, unity);
+ public CommonTraversal(final Machine machine, final Bytecode<C> bytecode, final Coefficient<C> unity) {
+ super(machine, bytecode, unity);
}
@Override
diff --git a/java/language/gremlin/src/main/java/org/apache/tinkerpop/language/gremlin/core/CoreTraversal.java b/java/language/gremlin/src/main/java/org/apache/tinkerpop/language/gremlin/core/CoreTraversal.java
index eec864e..b247a09 100644
--- a/java/language/gremlin/src/main/java/org/apache/tinkerpop/language/gremlin/core/CoreTraversal.java
+++ b/java/language/gremlin/src/main/java/org/apache/tinkerpop/language/gremlin/core/CoreTraversal.java
@@ -22,6 +22,7 @@ import org.apache.tinkerpop.language.gremlin.AbstractTraversal;
import org.apache.tinkerpop.language.gremlin.P;
import org.apache.tinkerpop.language.gremlin.Traversal;
import org.apache.tinkerpop.language.gremlin.TraversalUtil;
+import org.apache.tinkerpop.machine.Machine;
import org.apache.tinkerpop.machine.bytecode.Bytecode;
import org.apache.tinkerpop.machine.bytecode.compiler.CoreCompiler.Symbols;
import org.apache.tinkerpop.machine.bytecode.compiler.Oper;
@@ -41,12 +42,12 @@ public class CoreTraversal<C, S, E> extends AbstractTraversal<C, S, E> {
// used by __
CoreTraversal() {
// TODO: this will cause __ problems
- this(new Bytecode<>(), (Coefficient<C>) LongCoefficient.create());
+ this(null, new Bytecode<>(), (Coefficient<C>) LongCoefficient.create());
}
// used by TraversalSource
- public CoreTraversal(final Bytecode<C> bytecode, final Coefficient<C> unity) {
- super(bytecode, unity);
+ public CoreTraversal(final Machine machine, final Bytecode<C> bytecode, final Coefficient<C> unity) {
+ super(machine, bytecode, unity);
}
@Override
diff --git a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/LocalMachine.java b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/LocalMachine.java
index a15c42d..dd7862f 100644
--- a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/LocalMachine.java
+++ b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/LocalMachine.java
@@ -19,18 +19,64 @@
package org.apache.tinkerpop.machine;
import org.apache.tinkerpop.machine.bytecode.Bytecode;
+import org.apache.tinkerpop.machine.bytecode.BytecodeUtil;
+import org.apache.tinkerpop.machine.bytecode.SourceInstruction;
import org.apache.tinkerpop.machine.bytecode.compiler.Compilation;
+import org.apache.tinkerpop.machine.bytecode.compiler.SourceCompilation;
import org.apache.tinkerpop.machine.traverser.Traverser;
import java.util.Iterator;
+import java.util.Map;
+import java.util.Optional;
+import java.util.UUID;
+import java.util.concurrent.ConcurrentHashMap;
/**
* @author Marko A. Rodriguez (http://markorodriguez.com)
*/
public final class LocalMachine implements Machine {
+ private static final String WITH_SOURCE_CODE = "tp:withSourceCode";
+ private final Map<UUID, SourceCompilation<?>> sources = new ConcurrentHashMap<>();
+
+ @Override
+ public <C> Bytecode<C> register(final Bytecode<C> sourceCode) {
+ final Optional<UUID> id = LocalMachine.getSourceId(sourceCode); // TODO: clone?
+ if (id.isPresent() && this.sources.containsKey(id.get())) {
+ final SourceCompilation<C> source = (SourceCompilation<C>) this.sources.get(id.get());
+ BytecodeUtil.mergeSourceInstructions(source.getSourceCode(), sourceCode);
+ sourceCode.getInstructions().removeIf(i -> i.op().equals(WITH_SOURCE_CODE));
+ }
+ final UUID uuid = id.orElse(UUID.randomUUID());
+ this.sources.put(uuid, new SourceCompilation<>(sourceCode));
+ final Bytecode<C> newSource = new Bytecode<>();
+ newSource.addUniqueSourceInstruction(WITH_SOURCE_CODE, uuid.toString());
+ return newSource;
+ }
+
+ @Override
+ public <C> void close(final Bytecode<C> sourceCode) {
+ LocalMachine.getSourceId(sourceCode).ifPresent(this.sources::remove);
+ }
+
@Override
public <C, E> Iterator<Traverser<C, E>> submit(final Bytecode<C> bytecode) {
- return Compilation.<C, Object, E>compile(bytecode).getProcessor();
+ final UUID sourceId = LocalMachine.getSourceId(bytecode).orElse(null); // TODO: if submitted source has more than one instruction, merge?
+ final SourceCompilation<C> source = null == sourceId ? null : (SourceCompilation<C>) this.sources.get(sourceId);
+ return null == sourceId ?
+ Compilation.<C, Object, E>compile(bytecode).getProcessor() :
+ Compilation.<C, Object, E>compile(source, bytecode).getProcessor();
+ }
+
+ public static Machine open() {
+ return new LocalMachine();
+ }
+
+ private static final <C> Optional<UUID> getSourceId(final Bytecode<C> bytecode) {
+ for (final SourceInstruction sourceInstruction : bytecode.getSourceInstructions()) {
+ if (sourceInstruction.op().equals(WITH_SOURCE_CODE))
+ return Optional.of(UUID.fromString((String) sourceInstruction.args()[0]));
+ }
+ return Optional.empty();
}
}
diff --git a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/Machine.java b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/Machine.java
index 00aa384..34d8403 100644
--- a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/Machine.java
+++ b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/Machine.java
@@ -28,5 +28,9 @@ import java.util.Iterator;
*/
public interface Machine {
+ public <C> Bytecode<C> register(final Bytecode<C> sourceCode);
+
+ public <C> void close(final Bytecode<C> sourceCode);
+
public <C, S> Iterator<Traverser<C, S>> submit(final Bytecode<C> bytecode); // TODO: should return a "ShellTraverser"
}
diff --git a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/bytecode/BytecodeUtil.java b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/bytecode/BytecodeUtil.java
index 637e35d..07d4860 100644
--- a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/bytecode/BytecodeUtil.java
+++ b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/bytecode/BytecodeUtil.java
@@ -18,7 +18,6 @@
*/
package org.apache.tinkerpop.machine.bytecode;
-import org.apache.tinkerpop.machine.Machine;
import org.apache.tinkerpop.machine.bytecode.compiler.BytecodeCompiler;
import org.apache.tinkerpop.machine.bytecode.compiler.CompositeCompiler;
import org.apache.tinkerpop.machine.bytecode.compiler.CoreCompiler.Symbols;
@@ -43,12 +42,16 @@ import java.util.Set;
*/
public final class BytecodeUtil {
- public static <C> void strategize(final Bytecode<C> bytecode) {
- for (final Strategy strategy : BytecodeUtil.getStrategies(bytecode)) {
+ public static <C> void strategize(final Bytecode<C> bytecode, final Set<Strategy<?>> strategies) {
+ for (final Strategy strategy : strategies) {
BytecodeUtil.strategize(bytecode, strategy);
}
}
+ public static <C> void strategize(final Bytecode<C> bytecode) {
+ BytecodeUtil.strategize(bytecode, BytecodeUtil.getStrategies(bytecode));
+ }
+
public static <C> void strategize(final Bytecode<C> bytecode, Strategy strategy) {
strategy.apply(bytecode);
for (final Instruction<C> instruction : bytecode.getInstructions()) {
@@ -128,20 +131,6 @@ public final class BytecodeUtil {
}
}
- public static <C> Optional<Machine> getMachine(final Bytecode<C> bytecode) {
- try {
- Machine machine = null;
- for (final SourceInstruction sourceInstruction : bytecode.getSourceInstructions()) {
- if (sourceInstruction.op().equals(Symbols.WITH_MACHINE)) {
- machine = ((Class<? extends Machine>) sourceInstruction.args()[0]).getConstructor().newInstance();
- }
- }
- return Optional.ofNullable(machine);
- } catch (NoSuchMethodException | IllegalAccessException | InstantiationException | InvocationTargetException e) {
- throw new RuntimeException(e.getMessage(), e);
- }
- }
-
public static boolean hasSourceInstruction(final Bytecode<?> bytecode, final String op) {
for (final SourceInstruction sourceInstruction : bytecode.getSourceInstructions()) {
if (sourceInstruction.op().equals(op))
@@ -156,6 +145,10 @@ public final class BytecodeUtil {
bytecode.getInstructions().add(index, newInstruction);
}
+ public static <C> void mergeSourceInstructions(final Bytecode<C> from, final Bytecode<C> to) {
+ to.getSourceInstructions().addAll(0, from.getSourceInstructions());
+ }
+
public static <C> Optional<TraverserFactory<C>> getTraverserFactory(final Bytecode<C> bytecode) {
// TODO: make this real
for (final Instruction<C> instruction : bytecode.getInstructions()) {
diff --git a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/bytecode/compiler/Compilation.java b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/bytecode/compiler/Compilation.java
index a60a804..c6e6ea3 100644
--- a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/bytecode/compiler/Compilation.java
+++ b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/bytecode/compiler/Compilation.java
@@ -29,7 +29,6 @@ import org.apache.tinkerpop.machine.traverser.Traverser;
import org.apache.tinkerpop.machine.traverser.TraverserFactory;
import java.io.Serializable;
-import java.util.ArrayList;
import java.util.Collections;
import java.util.Iterator;
import java.util.List;
@@ -53,6 +52,15 @@ public final class Compilation<C, S, E> implements Serializable {
this.functions = BytecodeUtil.getCompilers(bytecode).compile(bytecode);
}
+ public Compilation(final SourceCompilation<C> source, final Bytecode<C> bytecode) {
+ BytecodeUtil.mergeSourceInstructions(source.getSourceCode(), bytecode); // TODO: clone?
+ BytecodeUtil.strategize(bytecode, source.getStrategies());
+ this.structureFactory = source.getStructureFactory();
+ this.processorFactory = source.getProcessorFactory();
+ this.traverserFactory = BytecodeUtil.getTraverserFactory(bytecode).get();
+ this.functions = source.getCompilers().compile(bytecode);
+ }
+
public Compilation(final ProcessorFactory processorFactory) {
this.functions = Collections.emptyList(); // TODO: somehow strings for primitive processors
this.structureFactory = null;
@@ -123,6 +131,10 @@ public final class Compilation<C, S, E> implements Serializable {
////////
+ public static <C, S, E> Compilation<C, S, E> compile(final SourceCompilation<C> source, final Bytecode<C> bytecode) {
+ return new Compilation<>(source, bytecode);
+ }
+
public static <C, S, E> Compilation<C, S, E> compile(final Bytecode<C> bytecode) {
return new Compilation<>(bytecode);
}
diff --git a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/bytecode/compiler/CompositeCompiler.java b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/bytecode/compiler/CompositeCompiler.java
index 97e8a90..ce344fb 100644
--- a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/bytecode/compiler/CompositeCompiler.java
+++ b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/bytecode/compiler/CompositeCompiler.java
@@ -62,4 +62,9 @@ public final class CompositeCompiler implements BytecodeCompiler {
public static <C> CompositeCompiler create(final List<BytecodeCompiler> compilers) {
return new CompositeCompiler(compilers);
}
+
+ @Override
+ public String toString() {
+ return this.compilers.toString();
+ }
}
diff --git a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/bytecode/compiler/SourceCompilation.java b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/bytecode/compiler/SourceCompilation.java
new file mode 100644
index 0000000..18d3524
--- /dev/null
+++ b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/bytecode/compiler/SourceCompilation.java
@@ -0,0 +1,69 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you 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.
+ */
+package org.apache.tinkerpop.machine.bytecode.compiler;
+
+import org.apache.tinkerpop.machine.bytecode.Bytecode;
+import org.apache.tinkerpop.machine.bytecode.BytecodeUtil;
+import org.apache.tinkerpop.machine.processor.ProcessorFactory;
+import org.apache.tinkerpop.machine.strategy.Strategy;
+import org.apache.tinkerpop.machine.structure.EmptyStructure;
+import org.apache.tinkerpop.machine.structure.StructureFactory;
+
+import java.util.Set;
+
+/**
+ * @author Marko A. Rodriguez (http://markorodriguez.com)
+ */
+public final class SourceCompilation<C> {
+
+ private final Bytecode<C> originalSource;
+ private final ProcessorFactory processorFactory;
+ private final StructureFactory structureFactory;
+ private final Set<Strategy<?>> strategies;
+ private final CompositeCompiler compilers;
+
+ public SourceCompilation(final Bytecode<C> sourcecode) {
+ this.originalSource = sourcecode;
+ this.processorFactory = BytecodeUtil.getProcessorFactory(sourcecode).get();
+ this.structureFactory = BytecodeUtil.getStructureFactory(sourcecode).orElse(EmptyStructure.instance());
+ this.strategies = BytecodeUtil.getStrategies(sourcecode);
+ this.compilers = BytecodeUtil.getCompilers(sourcecode);
+ }
+
+ public ProcessorFactory getProcessorFactory() {
+ return this.processorFactory;
+ }
+
+ public StructureFactory getStructureFactory() {
+ return this.structureFactory;
+ }
+
+ public Set<Strategy<?>> getStrategies() {
+ return this.strategies;
+ }
+
+ public CompositeCompiler getCompilers() {
+ return this.compilers;
+ }
+
+ public Bytecode<C> getSourceCode() {
+ return this.originalSource;
+ }
+
+}
diff --git a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/strategy/decoration/ExplainStrategy.java b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/strategy/decoration/ExplainStrategy.java
index 1f3ba68..e01bf9e 100644
--- a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/strategy/decoration/ExplainStrategy.java
+++ b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/strategy/decoration/ExplainStrategy.java
@@ -22,6 +22,8 @@ import org.apache.tinkerpop.machine.bytecode.Bytecode;
import org.apache.tinkerpop.machine.bytecode.BytecodeUtil;
import org.apache.tinkerpop.machine.bytecode.compiler.Compilation;
import org.apache.tinkerpop.machine.bytecode.compiler.CoreCompiler.Symbols;
+import org.apache.tinkerpop.machine.coefficient.Coefficient;
+import org.apache.tinkerpop.machine.coefficient.LongCoefficient;
import org.apache.tinkerpop.machine.strategy.AbstractStrategy;
import org.apache.tinkerpop.machine.strategy.Strategy;
@@ -47,7 +49,7 @@ public final class ExplainStrategy extends AbstractStrategy<Strategy.DecorationS
final Bytecode<C> clone = bytecode.clone();
bytecode.getInstructions().clear();
bytecode.addInstruction(
- BytecodeUtil.getCoefficient(clone).get(),
+ (Coefficient<C>) LongCoefficient.create(),
Symbols.INITIAL,
ExplainStrategy.explainBytecode(clone));
}
diff --git a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/strategy/verification/CoefficientVerificationStrategy.java b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/strategy/verification/CoefficientVerificationStrategy.java
index b48f830..7b549cc 100644
--- a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/strategy/verification/CoefficientVerificationStrategy.java
+++ b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/strategy/verification/CoefficientVerificationStrategy.java
@@ -20,9 +20,9 @@ package org.apache.tinkerpop.machine.strategy.verification;
import org.apache.tinkerpop.machine.bytecode.Bytecode;
import org.apache.tinkerpop.machine.bytecode.BytecodeUtil;
+import org.apache.tinkerpop.machine.bytecode.Instruction;
import org.apache.tinkerpop.machine.bytecode.compiler.CompositeCompiler;
import org.apache.tinkerpop.machine.bytecode.compiler.FunctionType;
-import org.apache.tinkerpop.machine.bytecode.Instruction;
import org.apache.tinkerpop.machine.strategy.AbstractStrategy;
import org.apache.tinkerpop.machine.strategy.Strategy;
@@ -41,5 +41,4 @@ public final class CoefficientVerificationStrategy extends AbstractStrategy<Stra
}
}
}
-
}
diff --git a/java/machine/processor/beam/src/test/java/org/apache/tinkerpop/machine/processor/beam/BeamTest.java b/java/machine/processor/beam/src/test/java/org/apache/tinkerpop/machine/processor/beam/BeamTest.java
index 6838142..454917f 100644
--- a/java/machine/processor/beam/src/test/java/org/apache/tinkerpop/machine/processor/beam/BeamTest.java
+++ b/java/machine/processor/beam/src/test/java/org/apache/tinkerpop/machine/processor/beam/BeamTest.java
@@ -24,6 +24,8 @@ import org.apache.tinkerpop.language.gremlin.Traversal;
import org.apache.tinkerpop.language.gremlin.TraversalSource;
import org.apache.tinkerpop.language.gremlin.TraversalUtil;
import org.apache.tinkerpop.language.gremlin.core.__;
+import org.apache.tinkerpop.machine.LocalMachine;
+import org.apache.tinkerpop.machine.Machine;
import org.apache.tinkerpop.machine.coefficient.LongCoefficient;
import org.apache.tinkerpop.machine.strategy.optimization.IdentityStrategy;
import org.apache.tinkerpop.machine.structure.blueprints.BlueprintsStructure;
@@ -41,7 +43,8 @@ public class BeamTest {
@Test
public void doStuff() {
- final TraversalSource<Long> g = Gremlin.<Long>traversal()
+ final Machine machine = LocalMachine.open();
+ final TraversalSource<Long> g = Gremlin.<Long>traversal(machine)
.withCoefficient(LongCoefficient.class)
.withProcessor(BeamProcessor.class)
.withStructure(BlueprintsStructure.class)
@@ -59,11 +62,13 @@ public class BeamTest {
System.out.println(TraversalUtil.getBytecode(traversal));
System.out.println(traversal.next());
System.out.println("\n----------\n");
+ g.close();
}
@Test
public void shouldWork() {
- final TraversalSource<Long> g = Gremlin.<Long>traversal()
+ final Machine machine = LocalMachine.open();
+ final TraversalSource<Long> g = Gremlin.<Long>traversal(machine)
//.withCoefficient(LongCoefficient.class)
.withProcessor(BeamProcessor.class)
.withStrategy(IdentityStrategy.class);
@@ -117,5 +122,7 @@ public class BeamTest {
System.out.println(TraversalUtil.getBytecode(traversal));
System.out.println(traversal);
System.out.println(traversal.toList());
+
+ g.close();
}
}
diff --git a/java/machine/processor/pipes/src/test/java/org/apache/tinkerpop/machine/processor/pipes/PipesTest.java b/java/machine/processor/pipes/src/test/java/org/apache/tinkerpop/machine/processor/pipes/PipesTest.java
index 084bf5f..a41aeed 100644
--- a/java/machine/processor/pipes/src/test/java/org/apache/tinkerpop/machine/processor/pipes/PipesTest.java
+++ b/java/machine/processor/pipes/src/test/java/org/apache/tinkerpop/machine/processor/pipes/PipesTest.java
@@ -24,6 +24,8 @@ import org.apache.tinkerpop.language.gremlin.Traversal;
import org.apache.tinkerpop.language.gremlin.TraversalSource;
import org.apache.tinkerpop.language.gremlin.TraversalUtil;
import org.apache.tinkerpop.language.gremlin.common.__;
+import org.apache.tinkerpop.machine.LocalMachine;
+import org.apache.tinkerpop.machine.Machine;
import org.apache.tinkerpop.machine.coefficient.LongCoefficient;
import org.apache.tinkerpop.machine.strategy.optimization.IdentityStrategy;
import org.apache.tinkerpop.machine.structure.blueprints.BlueprintsStructure;
@@ -42,7 +44,8 @@ public class PipesTest {
@Test
public void doStuff() {
- final TraversalSource<Long> g = Gremlin.<Long>traversal()
+ final Machine machine = LocalMachine.open();
+ final TraversalSource<Long> g = Gremlin.<Long>traversal(machine)
.withCoefficient(LongCoefficient.class)
.withProcessor(PipesProcessor.class)
.withStructure(BlueprintsStructure.class)
@@ -58,7 +61,8 @@ public class PipesTest {
@Test
public void shouldWork() {
- final TraversalSource<Long> g = Gremlin.<Long>traversal()
+ final Machine machine = LocalMachine.open();
+ final TraversalSource<Long> g = Gremlin.<Long>traversal(machine)
.withCoefficient(LongCoefficient.class)
.withProcessor(PipesProcessor.class)
.withStrategy(IdentityStrategy.class);
@@ -124,7 +128,8 @@ public class PipesTest {
@Test
public void shouldWork2() {
- final TraversalSource<Long> g = Gremlin.<Long>traversal()
+ final Machine machine = LocalMachine.open();
+ final TraversalSource<Long> g = Gremlin.<Long>traversal(machine)
.withCoefficient(LongCoefficient.class)
.withProcessor(PipesProcessor.class)
.withStrategy(IdentityStrategy.class);