Skip to content

open supportCustomIds feature for tinkerpop test #69

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

Merged
Linary merged 1 commit into from
Sep 25, 2018
Merged

open supportCustomIds feature for tinkerpop test #69

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
48 changes: 34 additions & 14 deletions hugegraph-core/src/main/java/com/baidu/hugegraph/structure/HugeFeatures.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,16 @@

package com.baidu.hugegraph.structure;

import java.util.UUID;

import org.apache.commons.configuration.Configuration;
import org.apache.tinkerpop.gremlin.structure.Graph;
import org.apache.tinkerpop.gremlin.structure.VertexProperty;
import org.apache.tinkerpop.gremlin.structure.util.FeatureDescriptor;
import org.apache.tinkerpop.gremlin.structure.util.StringFactory;

import com.baidu.hugegraph.HugeGraph;
import com.baidu.hugegraph.backend.id.Id;
import com.baidu.hugegraph.config.CoreOptions;
import com.baidu.hugegraph.config.HugeConfig;

Expand Down Expand Up @@ -105,15 +108,25 @@ public boolean supportsThreadedTransactions() {
public class HugeElementFeatures implements ElementFeatures {

@Override
public boolean supportsNumericIds() {
return false;
public boolean supportsAddProperty() {
return true;
}

@Override
public boolean supportsRemoveProperty() {
return true;
}

@Override
public boolean supportsStringIds() {
return true;
}

@Override
public boolean supportsNumericIds() {
return false;
}

@Override
public boolean supportsUuidIds() {
return false;
Expand All @@ -126,12 +139,24 @@ public boolean supportsAnyIds() {

@Override
public boolean supportsCustomIds() {
return false;
return true;
}

@Override
public boolean supportsRemoveProperty() {
return true;
public boolean supportsUserSuppliedIds() {
return false;
}

public boolean willAllowId(Object id) {
if(!this.supportsUserSuppliedIds()) {
return false;
} else {
return this.supportsAnyIds() ||
this.supportsCustomIds() && id instanceof Id ||
this.supportsStringIds() && id instanceof String ||
this.supportsNumericIds() && id instanceof Number ||
this.supportsUuidIds() && id instanceof UUID;
}
}
}

Expand Down Expand Up @@ -221,13 +246,13 @@ public class HugeVertexFeatures extends HugeElementFeatures
new HugeVertexPropertyFeatures();

@Override
public VertexPropertyFeatures properties() {
return this.vertexPropertyFeatures;
public boolean supportsUserSuppliedIds() {
return true;
}

@Override
public boolean supportsUserSuppliedIds() {
return true;
public VertexPropertyFeatures properties() {
return this.vertexPropertyFeatures;
}

@Override
Expand Down Expand Up @@ -269,11 +294,6 @@ public class HugeEdgeFeatures extends HugeElementFeatures
private final EdgePropertyFeatures edgePropertyFeatures =
new HugeEdgePropertyFeatures();

@Override
public boolean supportsUserSuppliedIds() {
return false;
}

@Override
public EdgePropertyFeatures properties() {
return this.edgePropertyFeatures;
Expand Down