fix: support null value for gremlin test #2061
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -45,12 +45,14 @@ | |
| import org.apache.hugegraph.backend.serializer.BytesBuffer; | ||
| import org.apache.hugegraph.perf.PerfUtil.Watched; | ||
| import org.apache.hugegraph.util.E; | ||
| import org.apache.tinkerpop.gremlin.structure.util.empty.EmptyProperty; | ||
|
|
||
| import com.google.common.collect.ImmutableList; | ||
|
|
||
| public class HugeEdge extends HugeElement implements Edge, Cloneable { | ||
|
|
||
| private Id id; | ||
| private final EdgeLabel label; | ||
| private String name; | ||
|
|
||
| private HugeVertex sourceVertex; | ||
|
|
@@ -200,6 +202,11 @@ public <V> Property<V> property(String key, V value) { | |
| E.checkArgument(this.label.properties().contains(propertyKey.id()), | ||
| "Invalid property '%s' for edge label '%s'", | ||
| key, this.label()); | ||
| if (value == null) { | ||
imbajin marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| this.removeProperty(propertyKey.id()); | ||
|
There was a problem hiding this comment. if remove null value's property, may cause tinkerpop ut failed ? There was a problem hiding this comment. follow the tinkerpop ci action tests with release-1.0.0 |
||
| return EmptyProperty.instance(); | ||
| } | ||
|
|
||
| // Sort-Keys can only be set once | ||
| if (this.schemaLabel().sortKeys().contains(propertyKey.id())) { | ||
| E.checkArgument(!this.hasProperty(propertyKey.id()), | ||
|
|
@@ -279,7 +286,7 @@ public <V> Iterator<Property<V>> properties(String... keys) { | |
|
|
||
| if (keys.length == 0) { | ||
| for (HugeProperty<?> prop : this.getProperties()) { | ||
| assert prop != null; | ||
| props.add((Property<V>) prop); | ||
| } | ||
| } else { | ||
|
|
@@ -295,7 +302,6 @@ public <V> Iterator<Property<V>> properties(String... keys) { | |
| // Not found | ||
| continue; | ||
| } | ||
| props.add((Property<V>) prop); | ||
| } | ||
| } | ||
|
|
@@ -320,8 +326,7 @@ public Object sysprop(HugeKeys key) { | |
| case PROPERTIES: | ||
| return this.getPropertiesMap(); | ||
| default: | ||
| E.checkArgument(false, "Invalid system property '%s' of Edge", key); | ||
| return null; | ||
| } | ||
| } | ||
|
|
@@ -362,6 +367,7 @@ public void vertices(HugeVertex owner, HugeVertex other) { | |
| if (ownerLabel.equals(this.label.sourceLabel())) { | ||
| this.vertices(true, owner, other); | ||
| } else { | ||
| // TODO: why compare the label but ignore the result? | ||
| ownerLabel.equals(this.label.targetLabel()); | ||
| this.vertices(false, owner, other); | ||
| } | ||
|
|
@@ -515,8 +521,7 @@ public static HugeEdge constructEdge(HugeVertex ownerVertex, | |
| ownerVertex.correctVertexLabel(tgtLabel); | ||
| otherVertexLabel = srcLabel; | ||
| } | ||
| HugeVertex otherVertex = new HugeVertex(graph, otherVertexId, otherVertexLabel); | ||
|
|
||
| ownerVertex.propNotLoaded(); | ||
| otherVertex.propNotLoaded(); | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
also update
HugeVertex.property(String key, V value)