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 4c6ff25 cleaned up Compilation methods.
4c6ff25 is described below
commit 4c6ff252218723c520b2f76d579bcb30360a98b8
Author: Marko A. Rodriguez <okramma...@gmail.com>
AuthorDate: Sun Mar 24 12:47:04 2019 -0600
cleaned up Compilation methods.
---
.../tinkerpop/machine/bytecode/compiler/BytecodeArgument.java | 2 +-
.../tinkerpop/machine/bytecode/compiler/Compilation.java | 11 +----------
.../tinkerpop/machine/function/barrier/JoinBarrier.java | 2 +-
.../tinkerpop/machine/function/branch/BranchBranch.java | 4 ++--
.../org/apache/tinkerpop/machine/function/map/PathMap.java | 2 +-
5 files changed, 6 insertions(+), 15 deletions(-)
diff --git
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/bytecode/compiler/BytecodeArgument.java
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/bytecode/compiler/BytecodeArgument.java
index 1daae88..5711ab5 100644
---
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/bytecode/compiler/BytecodeArgument.java
+++
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/bytecode/compiler/BytecodeArgument.java
@@ -29,7 +29,7 @@ public class BytecodeArgument<E> implements Argument<E> {
private final Compilation compilation;
public BytecodeArgument(final Bytecode arg) {
- this.compilation = Compilation.compileOne(arg);
+ this.compilation = Compilation.compile(arg);
}
@Override
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 8474b5a..a60a804 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
@@ -127,7 +127,7 @@ public final class Compilation<C, S, E> implements
Serializable {
return new Compilation<>(bytecode);
}
- public static <C, S, E> Compilation<C, S, E> compileOne(final Object arg) {
+ public static <C, S, E> Compilation<C, S, E> compile(final Object arg) {
return new Compilation<>((Bytecode<C>) arg);
}
@@ -136,13 +136,4 @@ public final class Compilation<C, S, E> implements
Serializable {
new Compilation<>((Bytecode<C>) args[index]) :
null;
}
-
- public static <C, S, E> List<Compilation<C, S, E>> compile(final Object...
args) {
- final List<Compilation<C, S, E>> compilations = new ArrayList<>();
- for (final Object arg : args) {
- if (arg instanceof Bytecode)
- compilations.add(new Compilation<>((Bytecode<C>) arg));
- }
- return compilations;
- }
}
diff --git
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/barrier/JoinBarrier.java
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/barrier/JoinBarrier.java
index ffa3c7b..7dd7779 100644
---
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/barrier/JoinBarrier.java
+++
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/barrier/JoinBarrier.java
@@ -95,7 +95,7 @@ public final class JoinBarrier<C, K, V> extends
AbstractFunction<C> implements B
public static <C, K, V> JoinBarrier<C, K, V> compile(final Instruction<C>
instruction) {
return new JoinBarrier<>(instruction.coefficient(),
instruction.labels(),
CoreCompiler.Symbols.Tokens.valueOf((String)
instruction.args()[0]),
- Compilation.compileOne(instruction.args()[1]),
+ Compilation.compile(instruction.args()[1]),
Argument.create(instruction.args()[2]));
}
diff --git
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/branch/BranchBranch.java
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/branch/BranchBranch.java
index 2113d01..b425e43 100644
---
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/branch/BranchBranch.java
+++
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/branch/BranchBranch.java
@@ -52,8 +52,8 @@ public final class BranchBranch<C, S, E> extends
AbstractFunction<C> implements
final Object[] args = instruction.args();
final Map<Compilation<C, S, ?>, List<Compilation<C, S, E>>> branches =
new HashMap<>();
for (int i = 0; i < args.length; i = i + 2) {
- final Compilation<C, S, ?> predicate =
Symbols.DEFAULT.equals(args[i]) ? null : Compilation.compileOne(args[i]);
- final Compilation<C, S, E> branch = Compilation.compileOne(args[i
+ 1]);
+ final Compilation<C, S, ?> predicate =
Symbols.DEFAULT.equals(args[i]) ? null : Compilation.compile(args[i]);
+ final Compilation<C, S, E> branch = Compilation.compile(args[i +
1]);
List<Compilation<C, S, E>> list = branches.get(predicate);
if (null == list) {
list = new ArrayList<>();
diff --git
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/map/PathMap.java
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/map/PathMap.java
index 949c16e..6628a8a 100644
---
a/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/map/PathMap.java
+++
b/java/machine/machine-core/src/main/java/org/apache/tinkerpop/machine/function/map/PathMap.java
@@ -84,7 +84,7 @@ public final class PathMap<C, S> extends AbstractFunction<C>
implements MapFunct
if (processingLabels)
labels.add((String) arg);
else
- compilations.add(Compilation.compileOne(arg));
+ compilations.add(Compilation.compile(arg));
}
return new PathMap<>(instruction.coefficient(), instruction.labels(),
labels, compilations);
}
