From dd7cb2466986b9a2665ee6f3bdc917e76c9f691e Mon Sep 17 00:00:00 2001 From: Cole-Greer Date: Fri, 22 Mar 2024 13:57:16 -0700 Subject: [PATCH] CTR touchup docs and comments --- CHANGELOG.asciidoc | 2 +- .../gremlin/process/traversal/step/map/MergeVertexStep.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc index b813d15ae77..eceb847c172 100644 --- a/CHANGELOG.asciidoc +++ b/CHANGELOG.asciidoc @@ -29,7 +29,7 @@ image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima * Fixed bug in bytecode translation of `g.tx().commit()` and `g.tx().rollback()` in all languages. * Improved error message from `JavaTranslator` by including exception source. * Added missing `short` serialization (`gx:Int16`) to GraphSONV2 and GraphSONV3 in `gremlin-python`. -* Added tests for error handling for GLV's if `tx.commit()`` is called remotely for graphs without transactions support. +* Added tests for error handling for GLV's if `tx.commit()` is called remotely for graphs without transactions support. * Introduced multi-architecture AMD64/ARM64 docker images for gremlin-console. * Fixed bug in `JavaTranslator` where `has(String, null)` could call `has(String, Traversal)` to generate an error. * Fixed issue where server errors weren't being properly parsed when sending bytecode over HTTP. diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStep.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStep.java index 132adf3e7c8..70eca71f649 100644 --- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStep.java +++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/MergeVertexStep.java @@ -93,10 +93,10 @@ protected Iterator flatMap(final Traverser.Admin traverser) { // attach the onMatch properties vertices = IteratorUtils.peek(vertices, v -> { - // override current traverser with the matched Edge so that the option() traversal can operate + // override current traverser with the matched Vertex so that the option() traversal can operate // on it properly. this should only work this way for the start step form to retain the original // behavior for 3.6.0 where you might do g.inject(Map).mergeV() and want that Map to pass through. - // in 4.x this will be rectified such that the edge will always be promoted and you will be forced + // in 4.x this will be rectified such that the vertex will always be promoted and you will be forced // to select() the map if you did want the behavior. if (isStart) traverser.set((S) v);