From commits-return-35299-archive-asf-public=cust-asf.ponee.io@tinkerpop.apache.org Wed Mar 13 16:09:47 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 8E33318064A for ; Wed, 13 Mar 2019 17:09:46 +0100 (CET) Received: (qmail 71762 invoked by uid 500); 13 Mar 2019 16:09:45 -0000 Mailing-List: contact commits-help@tinkerpop.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@tinkerpop.apache.org Delivered-To: mailing list commits@tinkerpop.apache.org Received: (qmail 71753 invoked by uid 99); 13 Mar 2019 16:09:45 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 13 Mar 2019 16:09:45 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 23EDB85253; Wed, 13 Mar 2019 16:09:45 +0000 (UTC) Date: Wed, 13 Mar 2019 16:09:45 +0000 To: "commits@tinkerpop.apache.org" Subject: [tinkerpop] branch tp4 updated: Really cleaned up Beam. We have a TopologyUtil that translates a Compilation into a Beam topology. We also have branch support generalized so union, choose, etc. just work without any special consideration in Beam. I need to get repeat() to be general -- but that is tricky given its recrussive nature. For now, a special repeat()-case exists. MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155249338506.13950.1560521962196254874@gitbox.apache.org> From: okram@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: tinkerpop X-Git-Refname: refs/heads/tp4 X-Git-Reftype: branch X-Git-Oldrev: 9a591aec9bd955cea1b708f6b3d1090cf672124d X-Git-Newrev: 58e761de63ab5c2f89343ed2a5f70fd7a257ed4f X-Git-Rev: 58e761de63ab5c2f89343ed2a5f70fd7a257ed4f X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated 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 58e761d Really cleaned up Beam. We have a TopologyUtil that translates a Compilation into a Beam topology. We also have branch support generalized so union, choose, etc. just work without any special consideration in Beam. I need to get repeat() to be general -- but that is tricky given its recrussive nature. For now, a special repeat()-case exists. 58e761d is described below commit 58e761de63ab5c2f89343ed2a5f70fd7a257ed4f Author: Marko A. Rodriguez AuthorDate: Wed Mar 13 10:09:01 2019 -0600 Really cleaned up Beam. We have a TopologyUtil that translates a Compilation into a Beam topology. We also have branch support generalized so union, choose, etc. just work without any special consideration in Beam. I need to get repeat() to be general -- but that is tricky given its recrussive nature. For now, a special repeat()-case exists. --- .../machine/functions/branch/UnionBranch.java | 3 +- .../machine/traversers/EmptyTraverser.java | 63 +++++++++++ .../org/apache/tinkerpop/machine/beam/Beam.java | 108 ++----------------- .../apache/tinkerpop/machine/beam/BranchFn.java | 6 +- .../apache/tinkerpop/machine/beam/RepeatFn.java | 10 +- .../tinkerpop/machine/beam/util/TopologyUtil.java | 120 +++++++++++++++++++++ .../apache/tinkerpop/machine/beam/BeamTest.java | 13 ++- 7 files changed, 212 insertions(+), 111 deletions(-) diff --git a/java/core/src/main/java/org/apache/tinkerpop/machine/functions/branch/UnionBranch.java b/java/core/src/main/java/org/apache/tinkerpop/machine/functions/branch/UnionBranch.java index f10e22c..3195a40 100644 --- a/java/core/src/main/java/org/apache/tinkerpop/machine/functions/branch/UnionBranch.java +++ b/java/core/src/main/java/org/apache/tinkerpop/machine/functions/branch/UnionBranch.java @@ -52,8 +52,7 @@ public final class UnionBranch extends AbstractFunction> apply(final Traverser traverser) { final MultiIterator> iterator = new MultiIterator<>(); for (final Compilation branch : this.branches.get(Boolean.TRUE)) { - branch.getProcessor().addStart(traverser.clone()); - iterator.addIterator(branch.getProcessor()); + iterator.addIterator(branch.addTraverser(traverser)); } return iterator; } diff --git a/java/core/src/main/java/org/apache/tinkerpop/machine/traversers/EmptyTraverser.java b/java/core/src/main/java/org/apache/tinkerpop/machine/traversers/EmptyTraverser.java new file mode 100644 index 0000000..b2eefb8 --- /dev/null +++ b/java/core/src/main/java/org/apache/tinkerpop/machine/traversers/EmptyTraverser.java @@ -0,0 +1,63 @@ +/* + * 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.traversers; + +import org.apache.tinkerpop.machine.coefficients.Coefficient; +import org.apache.tinkerpop.machine.functions.CFunction; + +/** + * @author Marko A. Rodriguez (http://markorodriguez.com) + */ +public final class EmptyTraverser implements Traverser { + + private static final EmptyTraverser INSTANCE = new EmptyTraverser(); + + private EmptyTraverser() { + // for static instances + } + + @Override + public Coefficient coefficient() { + throw new IllegalStateException(EmptyTraverser.class.getSimpleName() + " does not contain a coefficient"); + } + + @Override + public S object() { + throw new IllegalStateException(EmptyTraverser.class.getSimpleName() + " does not contain an object"); + } + + @Override + public Path path() { + throw new IllegalStateException(EmptyTraverser.class.getSimpleName() + " does not contain a path"); + } + + @Override + public Traverser split(CFunction function, E object) { + return INSTANCE; + } + + @Override + public Traverser clone() { + return INSTANCE; + } + + public static final EmptyTraverser instance() { + return INSTANCE; + } +} diff --git a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/Beam.java b/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/Beam.java index c24f26f..9981082 100644 --- a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/Beam.java +++ b/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/Beam.java @@ -20,134 +20,44 @@ package org.apache.tinkerpop.machine.beam; import org.apache.beam.sdk.Pipeline; import org.apache.beam.sdk.options.PipelineOptions; -import org.apache.beam.sdk.transforms.Combine; import org.apache.beam.sdk.transforms.Create; -import org.apache.beam.sdk.transforms.DoFn; -import org.apache.beam.sdk.transforms.Flatten; import org.apache.beam.sdk.transforms.ParDo; import org.apache.beam.sdk.values.PCollection; -import org.apache.beam.sdk.values.PCollectionList; -import org.apache.beam.sdk.values.PCollectionTuple; -import org.apache.beam.sdk.values.TupleTag; -import org.apache.beam.sdk.values.TupleTagList; import org.apache.tinkerpop.machine.beam.serialization.TraverserCoder; +import org.apache.tinkerpop.machine.beam.util.TopologyUtil; import org.apache.tinkerpop.machine.bytecode.Compilation; -import org.apache.tinkerpop.machine.coefficients.Coefficient; -import org.apache.tinkerpop.machine.coefficients.LongCoefficient; -import org.apache.tinkerpop.machine.functions.BranchFunction; -import org.apache.tinkerpop.machine.functions.CFunction; -import org.apache.tinkerpop.machine.functions.FilterFunction; -import org.apache.tinkerpop.machine.functions.FlatMapFunction; -import org.apache.tinkerpop.machine.functions.InitialFunction; -import org.apache.tinkerpop.machine.functions.MapFunction; -import org.apache.tinkerpop.machine.functions.ReduceFunction; -import org.apache.tinkerpop.machine.functions.branch.RepeatBranch; import org.apache.tinkerpop.machine.processor.Processor; +import org.apache.tinkerpop.machine.traversers.EmptyTraverser; import org.apache.tinkerpop.machine.traversers.Traverser; -import org.apache.tinkerpop.machine.traversers.TraverserFactory; import java.util.ArrayList; import java.util.Iterator; -import java.util.LinkedHashMap; import java.util.List; -import java.util.Map; /** * @author Marko A. Rodriguez (http://markorodriguez.com) */ public class Beam implements Processor { + public static final int MAX_REPETIONS = 10; + private final Pipeline pipeline; public static List OUTPUT = new ArrayList<>(); // FIX THIS! private final List functions = new ArrayList<>(); private Iterator> iterator = null; - private final TraverserCoder coder = new TraverserCoder<>(); - public Beam(final Compilation compilation) { this.pipeline = Pipeline.create(); - PCollection> collection = this.pipeline.apply(Create.of(compilation.getTraverserFactory().create((Coefficient) LongCoefficient.create(), 1L))); - collection.setCoder(this.coder); - for (final CFunction function : compilation.getFunctions()) { - collection = processFunction(collection, compilation.getTraverserFactory(), function, false); - } - collection.apply(ParDo.of(new OutputStep<>())); this.pipeline.getOptions().setRunner(new PipelineOptions.DirectRunner().create(this.pipeline.getOptions())); - } - - private PCollection> processFunction( - PCollection> collection, - final TraverserFactory traverserFactory, - final CFunction function, - final boolean branching) { - DoFn, Traverser> fn = null; - if (function instanceof RepeatBranch) { - final List outputs = new ArrayList<>(); - final TupleTag repeatDone = new TupleTag<>(); - final TupleTag repeatLoop = new TupleTag<>(); - for (int i = 0; i < 10; i++) { - fn = new RepeatFn((RepeatBranch) function, repeatDone, repeatLoop); - PCollectionTuple branches = (PCollectionTuple) collection.apply(ParDo.of(fn).withOutputTags(repeatLoop, TupleTagList.of(repeatDone))); - branches.get(repeatLoop).setCoder(new TraverserCoder()); - branches.get(repeatDone).setCoder(new TraverserCoder()); - outputs.add(branches.get(repeatDone)); - for (final CFunction repeatFunction : ((RepeatBranch) function).getRepeat().getFunctions()) { - collection = this.processFunction(branches.get(repeatLoop), traverserFactory, repeatFunction, true); - } - } - this.functions.add((Fn) fn); - collection = (PCollection) PCollectionList.of((Iterable) outputs).apply(Flatten.pCollections()); - collection.setCoder(new TraverserCoder()); - } else if (function instanceof BranchFunction) { - final BranchFunction branchFunction = (BranchFunction) function; - final Map branches = new LinkedHashMap<>(); - for (final Map.Entry>> b : branchFunction.getBranches().entrySet()) { - branches.put(b.getKey(), new TupleTag()); - } - final BranchFn branchFn = new BranchFn<>(branchFunction, branches); - final List> tags = new ArrayList(branches.values()); - PCollectionTuple collectionTuple = (PCollectionTuple) collection.apply(ParDo.of((DoFn) branchFn).withOutputTags(tags.get(0), TupleTagList.of(tags.subList(1, tags.size())))); - collectionTuple.getAll().values().forEach(c -> c.setCoder(new TraverserCoder())); - final List>> collections = new ArrayList<>(); - for (final Map.Entry>> b : branchFunction.getBranches().entrySet()) { - for (final Compilation compilation : b.getValue()) { - PCollection> branchCollection = collectionTuple.get(branches.get(b.getKey())); - for (final CFunction f : compilation.getFunctions()) { - branchCollection = this.processFunction(branchCollection, traverserFactory, f, true); - } - - collections.add(branchCollection); - } - } - collection = PCollectionList.of(collections).apply(Flatten.pCollections()); - this.functions.add(branchFn); - } else if (function instanceof InitialFunction) { - fn = new InitialFn((InitialFunction) function, traverserFactory); - } else if (function instanceof FilterFunction) { - fn = new FilterFn((FilterFunction) function); - } else if (function instanceof FlatMapFunction) { - fn = new FlatMapFn<>((FlatMapFunction) function); - } else if (function instanceof MapFunction) { - fn = new MapFn<>((MapFunction) function); - } else if (function instanceof ReduceFunction) { - final ReduceFn combine = new ReduceFn<>((ReduceFunction) function, traverserFactory); - collection = (PCollection>) collection.apply(Combine.globally((ReduceFn) combine)); - this.functions.add(combine); - } else - throw new RuntimeException("You need a new step type:" + function); - - if (!(function instanceof ReduceFunction) && !(function instanceof BranchFunction)) { - if (!branching) - this.functions.add((Fn) fn); - collection = (PCollection>) collection.apply(ParDo.of((DoFn) fn)); - } - collection.setCoder(this.coder); - return collection; + final PCollection> source = this.pipeline.apply(Create.of(EmptyTraverser.instance())); + source.setCoder(new TraverserCoder<>()); + final PCollection> sink = TopologyUtil.compile(source, compilation); + sink.apply(ParDo.of(new OutputStep<>())); } @Override public void addStart(final Traverser traverser) { - this.functions.get(0).addStart(traverser); + this.functions.get(0).addStart(traverser); // TODO: use side-inputs } @Override diff --git a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/BranchFn.java b/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/BranchFn.java index 2f55b5e..f5560d3 100644 --- a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/BranchFn.java +++ b/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/BranchFn.java @@ -29,12 +29,12 @@ import java.util.Optional; /** * @author Marko A. Rodriguez (http://markorodriguez.com) */ -public class BranchFn extends AbstractFn { +public class BranchFn extends AbstractFn { - private final Map branches; + private final Map>> branches; private final Selector branchSelector; - public BranchFn(final BranchFunction branchFunction, final Map branches) { + public BranchFn(final BranchFunction branchFunction, final Map>> branches) { super(branchFunction); this.branches = branches; this.branchSelector = branchFunction.getBranchSelector(); diff --git a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatFn.java b/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatFn.java index 8edb581..1f6b006 100644 --- a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatFn.java +++ b/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/RepeatFn.java @@ -32,20 +32,24 @@ public class RepeatFn extends AbstractFn { private final Compilation until; private final TupleTag repeatDone; private final TupleTag repeatLoop; + private final boolean deadEnd; - public RepeatFn(final RepeatBranch repeatBranch, final TupleTag repeatDone, final TupleTag repeatLoop) { + public RepeatFn(final RepeatBranch repeatBranch, final TupleTag repeatDone, final TupleTag repeatLoop, final boolean deadEnd) { super(repeatBranch); this.until = repeatBranch.getUntil(); this.repeatDone = repeatDone; this.repeatLoop = repeatLoop; + this.deadEnd = deadEnd; } @ProcessElement public void processElement(final @DoFn.Element Traverser traverser, final MultiOutputReceiver out) { - if (this.until.filterTraverser(traverser)) + if (this.until.filterTraverser(traverser.clone())) out.get(this.repeatDone).output(traverser.clone()); - else + else if (!this.deadEnd) out.get(this.repeatLoop).output(traverser.clone()); + else + throw new IllegalStateException("There are not enough repetition to account for this traveral"); } } diff --git a/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/util/TopologyUtil.java b/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/util/TopologyUtil.java new file mode 100644 index 0000000..933a853 --- /dev/null +++ b/java/machine/beam/src/main/java/org/apache/tinkerpop/machine/beam/util/TopologyUtil.java @@ -0,0 +1,120 @@ +/* + * 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.beam.util; + +import org.apache.beam.sdk.transforms.Combine; +import org.apache.beam.sdk.transforms.Flatten; +import org.apache.beam.sdk.transforms.ParDo; +import org.apache.beam.sdk.values.PCollection; +import org.apache.beam.sdk.values.PCollectionList; +import org.apache.beam.sdk.values.PCollectionTuple; +import org.apache.beam.sdk.values.TupleTag; +import org.apache.beam.sdk.values.TupleTagList; +import org.apache.tinkerpop.machine.beam.Beam; +import org.apache.tinkerpop.machine.beam.BranchFn; +import org.apache.tinkerpop.machine.beam.FilterFn; +import org.apache.tinkerpop.machine.beam.FlatMapFn; +import org.apache.tinkerpop.machine.beam.InitialFn; +import org.apache.tinkerpop.machine.beam.MapFn; +import org.apache.tinkerpop.machine.beam.ReduceFn; +import org.apache.tinkerpop.machine.beam.RepeatFn; +import org.apache.tinkerpop.machine.beam.serialization.TraverserCoder; +import org.apache.tinkerpop.machine.bytecode.Compilation; +import org.apache.tinkerpop.machine.functions.BranchFunction; +import org.apache.tinkerpop.machine.functions.CFunction; +import org.apache.tinkerpop.machine.functions.FilterFunction; +import org.apache.tinkerpop.machine.functions.FlatMapFunction; +import org.apache.tinkerpop.machine.functions.InitialFunction; +import org.apache.tinkerpop.machine.functions.MapFunction; +import org.apache.tinkerpop.machine.functions.ReduceFunction; +import org.apache.tinkerpop.machine.functions.branch.RepeatBranch; +import org.apache.tinkerpop.machine.traversers.Traverser; +import org.apache.tinkerpop.machine.traversers.TraverserFactory; + +import java.util.ArrayList; +import java.util.LinkedHashMap; +import java.util.List; +import java.util.Map; + +/** + * @author Marko A. Rodriguez (http://markorodriguez.com) + */ +public class TopologyUtil { + + public static PCollection> compile(final PCollection> source, final Compilation compilation) { + final TraverserFactory traverserFactory = compilation.getTraverserFactory(); + PCollection> sink = (PCollection) source; + for (final CFunction function : compilation.getFunctions()) { + sink = TopologyUtil.extend(sink, function, traverserFactory); + } + return sink; + } + + private static PCollection> extend(final PCollection> source, final CFunction function, final TraverserFactory traverserFactory) { + PCollection sink; + if (function instanceof MapFunction) { + sink = source.apply(ParDo.of(new MapFn<>((MapFunction) function))); + } else if (function instanceof FilterFunction) { + sink = source.apply(ParDo.of(new FilterFn<>((FilterFunction) function))); + } else if (function instanceof FlatMapFunction) { + sink = source.apply(ParDo.of(new FlatMapFn<>((FlatMapFunction) function))); + } else if (function instanceof InitialFunction) { + sink = source.apply(ParDo.of(new InitialFn<>((InitialFunction) function, traverserFactory))); + } else if (function instanceof ReduceFunction) { + sink = source.apply(Combine.globally(new ReduceFn<>((ReduceFunction) function, traverserFactory))); + } else if (function instanceof RepeatBranch) { + final RepeatBranch repeatFunction = (RepeatBranch) function; + final List>> repeatSinks = new ArrayList<>(); + final TupleTag> repeatDone = new TupleTag<>(); + final TupleTag> repeatLoop = new TupleTag<>(); + sink = source; + for (int i = 0; i < Beam.MAX_REPETIONS; i++) { + final RepeatFn fn = new RepeatFn<>(repeatFunction, repeatDone, repeatLoop, i == Beam.MAX_REPETIONS - 1); + final PCollectionTuple outputs = (PCollectionTuple) sink.apply(ParDo.of(fn).withOutputTags(repeatLoop, TupleTagList.of(repeatDone))); + outputs.getAll().values().forEach(c -> c.setCoder(new TraverserCoder())); + repeatSinks.add(outputs.get(repeatDone)); + for (final CFunction ff : repeatFunction.getRepeat().getFunctions()) { + sink = TopologyUtil.extend(outputs.get(repeatLoop), ff, traverserFactory); + } + } + sink = PCollectionList.of(repeatSinks).apply(Flatten.pCollections()); + } else if (function instanceof BranchFunction) { + final BranchFunction branchFunction = (BranchFunction) function; + final Map>> selectors = new LinkedHashMap<>(); + for (final Map.Entry>> branch : branchFunction.getBranches().entrySet()) { + selectors.put(branch.getKey(), new TupleTag<>()); + } + final BranchFn fn = new BranchFn<>(branchFunction, selectors); + final List>> tags = new ArrayList<>(selectors.values()); + final PCollectionTuple outputs = source.apply(ParDo.of(fn).withOutputTags(tags.get(0), TupleTagList.of((List) tags.subList(1, tags.size())))); + outputs.getAll().values().forEach(c -> c.setCoder(new TraverserCoder())); + final List>> branchSinks = new ArrayList<>(); + for (final Map.Entry>> branch : branchFunction.getBranches().entrySet()) { + final PCollection> output = outputs.get(selectors.get(branch.getKey())); + for (final Compilation compilation : branch.getValue()) { + branchSinks.add(TopologyUtil.compile(output, compilation)); + } + } + sink = PCollectionList.of(branchSinks).apply(Flatten.pCollections()); + } else + throw new RuntimeException("You need a new step type:" + function); + sink.setCoder(new TraverserCoder<>()); + return sink; + } +} diff --git a/java/machine/beam/src/test/java/org/apache/tinkerpop/machine/beam/BeamTest.java b/java/machine/beam/src/test/java/org/apache/tinkerpop/machine/beam/BeamTest.java index 510b451..b161995 100644 --- a/java/machine/beam/src/test/java/org/apache/tinkerpop/machine/beam/BeamTest.java +++ b/java/machine/beam/src/test/java/org/apache/tinkerpop/machine/beam/BeamTest.java @@ -28,7 +28,6 @@ import org.junit.jupiter.api.Test; import java.util.Arrays; -import static org.apache.tinkerpop.language.__.incr; import static org.apache.tinkerpop.language.__.is; /** @@ -42,18 +41,24 @@ public class BeamTest { .withProcessor(BeamProcessor.class) .withStrategy(IdentityStrategy.class); - Traversal traversal = g.inject(Arrays.asList(2L, 5L, 10L)).unfold().repeat(__.incr().identity().map(__.incr())).until(is(10L)); + Traversal traversal = g.inject(Arrays.asList(2L, 5L, 3L, 10L)).unfold().repeat(__.incr().identity().map(__.incr())).until(is(10L)); System.out.println(TraversalUtil.getBytecode(traversal).getSourceInstructions()); System.out.println(TraversalUtil.getBytecode(traversal)); System.out.println(traversal); System.out.println(traversal.toList()); System.out.println("\n----------\n"); - traversal = g.inject(10L).choose(__.is(7L),__.incr(),__.incr().incr()); + traversal = g.inject(1L, 2L, 3L).repeat(__.incr().incr().incr()).until(is(10L)); + System.out.println(TraversalUtil.getBytecode(traversal).getSourceInstructions()); + System.out.println(TraversalUtil.getBytecode(traversal)); + System.out.println(traversal); + System.out.println(traversal.toList()); + System.out.println("\n----------\n"); + traversal = g.inject(10L).choose(__.is(7L), __.incr(), __.incr().incr()); System.out.println(TraversalUtil.getBytecode(traversal)); System.out.println(traversal); System.out.println(traversal.toList()); System.out.println("\n----------\n"); - traversal = g.inject(7L).union(__.incr(),__.incr().incr().union(__.incr(),__.incr())); + traversal = g.inject(7L).union(__.incr(), __.incr().incr().union(__.incr(), __.incr())); System.out.println(TraversalUtil.getBytecode(traversal)); System.out.println(traversal); System.out.println(traversal.toList());