Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: support null value for gremlin test #2061

Merged
merged 9 commits into from
Jan 16, 2023
Merged

fix: support null value for gremlin test #2061

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
2cf8981
support null value
z7658329 Dec 27, 2022
e68b4d1
Merge branch 'master' into feat/fix_tinkerpop_ut
imbajin Dec 27, 2022
ef0c949
Merge branch 'master' into feat/fix_tinkerpop_ut
imbajin Dec 29, 2022
deefd9d
address comment
imbajin Dec 30, 2022
2987c12
Merge branch 'master' into feat/fix_tinkerpop_ut
imbajin Dec 30, 2022
87108b4
fix(core): adapt HugeVertex.property() with null values
imbajin Dec 30, 2022
dcd846b
Merge branch 'master' into feat/fix_tinkerpop_ut
imbajin Jan 14, 2023
ebaa542
Merge branch 'master' into feat/fix_tinkerpop_ut
imbajin Jan 14, 2023
cba6559
Merge branch 'master' into feat/fix_tinkerpop_ut
imbajin Jan 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeElement.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,9 +430,6 @@ public static final ElementKeys classifyKeys(Object... keyValues) {
throw Element.Exceptions
.providedKeyValuesMustHaveALegalKeyOnEvenIndices();
}
if (val == null) {
throw Property.Exceptions.propertyDoesNotExist();
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

seems need to skip the null value here with continue, also add the comment for why

}
imbajin marked this conversation as resolved.
Show resolved Hide resolved

if (key.equals(T.id)) {
elemKeys.id = val;
Expand Down
3 changes: 1 addition & 2 deletions hugegraph-core/src/main/java/org/apache/hugegraph/structure/HugeProperty.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,11 +39,10 @@ public abstract class HugeProperty<V> implements Property<V>, GraphType {
public HugeProperty(HugeElement owner, PropertyKey pkey, V value) {
E.checkArgument(owner != null, "Property owner can't be null");
E.checkArgument(pkey != null, "Property key can't be null");
E.checkArgument(value != null, "Property value can't be null");

this.owner = owner;
this.pkey = pkey;
this.value = pkey.validValueOrThrow(value);
this.value = pkey.validValue(value);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

we can keep the origin code if the null value is skipped?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

note also need to update HugeEdge.property(String key, V value) to add null value check (the same as HugeVertex.property(String key, V value)):

        if (value == null) {
            this.removeProperty(propertyKey.id());
            return EmptyProperty.instance();
        }

}

public PropertyKey propertyKey() {
Expand Down