You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tinkerpop.apache.org by sp...@apache.org on 2015/09/03 17:33:23 UTC
[03/31] incubator-tinkerpop git commit: minor code cleanup
minor code cleanup
Project: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/commit/7c50e733
Tree: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/tree/7c50e733
Diff: http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/diff/7c50e733
Branch: refs/heads/master
Commit: 7c50e733632b3f0367b731be87bae2753deb7d99
Parents: 048fcdc
Author: Daniel Kuppitz <da...@hotmail.com>
Authored: Mon Aug 24 04:26:08 2015 +0200
Committer: Daniel Kuppitz <da...@hotmail.com>
Committed: Mon Aug 24 04:26:08 2015 +0200
----------------------------------------------------------------------
.../computer/bulkloading/BulkLoader.java | 5 +++
.../bulkloading/BulkLoaderVertexProgram.java | 14 ++++-----
.../computer/bulkloading/DefaultBulkLoader.java | 32 +++++++++++++++++---
.../bulkloading/IncrementalBulkLoader.java | 32 ++++++++++++--------
4 files changed, 59 insertions(+), 24 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7c50e733/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoader.java
index c6a3cc1..268c0cc 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoader.java
@@ -101,5 +101,10 @@ public interface BulkLoader {
return !useUserSuppliedIds();
}
+ /**
+ * Configures the BulkLoader instance.
+ *
+ * @param configuration The BulkLoader configuration.
+ */
public void configure(final Configuration configuration);
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7c50e733/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoaderVertexProgram.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoaderVertexProgram.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoaderVertexProgram.java
index 4fd017e..047455a 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoaderVertexProgram.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/BulkLoaderVertexProgram.java
@@ -40,6 +40,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.io.FileInputStream;
+import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
import java.util.Iterator;
@@ -58,19 +59,18 @@ public class BulkLoaderVertexProgram implements VertexProgram<Tuple> {
private static final String BULK_LOADER_CLASS = BULK_LOADER_VERTEX_PROGRAM_CFG_PREFIX + ".class";
private static final String BULK_LOADER_CFG_PREFIX = BULK_LOADER_VERTEX_PROGRAM_CFG_PREFIX + ".loader";
- public static final String BULK_LOADER_VERTEX_ID = BulkLoaderVertexProgram.class.getCanonicalName() + "bulkloader.vertex-id";
+ public static final String BULK_LOADER_VERTEX_ID = "bulkloader.vertex-id";
- private MessageScope messageScope = MessageScope.Local.of(__::inE);
+ private final MessageScope messageScope;
+ private final Set<String> elementComputeKeys;
private Configuration configuration;
+ private BulkLoader bulkLoader;
private Graph graph;
private GraphTraversalSource g;
- private BulkLoader bulkLoader;
- private Set<String> elementComputeKeys = new HashSet<String>() {{
- add(BULK_LOADER_VERTEX_ID);
- }};
private BulkLoaderVertexProgram() {
-
+ messageScope = MessageScope.Local.of(__::inE);
+ elementComputeKeys = Collections.singleton(BULK_LOADER_VERTEX_ID);
}
@Override
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7c50e733/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/DefaultBulkLoader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/DefaultBulkLoader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/DefaultBulkLoader.java
index a1aaf92..601079d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/DefaultBulkLoader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/DefaultBulkLoader.java
@@ -31,9 +31,15 @@ import org.apache.tinkerpop.gremlin.structure.VertexProperty;
*/
public class DefaultBulkLoader implements BulkLoader {
+ public final static String USE_USER_SUPPLIED_IDS_CFG_KEY = "use-user-supplied-ids";
+ public final static String STORE_ORIGINAL_IDS_CFG_KEY = "store-original-ids";
+
private boolean storeOriginalIds = false;
private boolean useUserSuppliedIds = false;
+ /**
+ * {@inheritDoc}
+ */
@Override
public Vertex getOrCreateVertex(final Vertex vertex, final Graph graph, final GraphTraversalSource g) {
if (useUserSuppliedIds()) {
@@ -46,6 +52,9 @@ public class DefaultBulkLoader implements BulkLoader {
return v;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Edge getOrCreateEdge(final Edge edge, final Vertex outVertex, final Vertex inVertex, final Graph graph, final GraphTraversalSource g) {
final Edge e = outVertex.addEdge(edge.label(), inVertex);
@@ -53,6 +62,9 @@ public class DefaultBulkLoader implements BulkLoader {
return e;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public VertexProperty getOrCreateVertexProperty(final VertexProperty<?> property, final Vertex vertex, final Graph graph, final GraphTraversalSource g) {
final VertexProperty<?> vp = vertex.property(property.key(), property.value());
@@ -60,6 +72,9 @@ public class DefaultBulkLoader implements BulkLoader {
return vp;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Vertex getVertex(final Vertex vertex, final Graph graph, final GraphTraversalSource g) {
return useUserSuppliedIds()
@@ -67,23 +82,32 @@ public class DefaultBulkLoader implements BulkLoader {
: g.V().has(vertex.label(), BulkLoaderVertexProgram.BULK_LOADER_VERTEX_ID, vertex.id()).next();
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean useUserSuppliedIds() {
return useUserSuppliedIds;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean storeOriginalIds() {
return storeOriginalIds;
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void configure(final Configuration configuration) {
- if (configuration.containsKey("use-user-supplied-ids")) {
- useUserSuppliedIds = configuration.getBoolean("use-user-supplied-ids");
+ if (configuration.containsKey(USE_USER_SUPPLIED_IDS_CFG_KEY)) {
+ useUserSuppliedIds = configuration.getBoolean(USE_USER_SUPPLIED_IDS_CFG_KEY);
}
- if (configuration.containsKey("store-original-ids")) {
- storeOriginalIds = configuration.getBoolean("store-original-ids");
+ if (configuration.containsKey(STORE_ORIGINAL_IDS_CFG_KEY)) {
+ storeOriginalIds = configuration.getBoolean(STORE_ORIGINAL_IDS_CFG_KEY);
}
}
}
http://git-wip-us.apache.org/repos/asf/incubator-tinkerpop/blob/7c50e733/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/IncrementalBulkLoader.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/IncrementalBulkLoader.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/IncrementalBulkLoader.java
index 23af2e2..d87df73 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/IncrementalBulkLoader.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/bulkloading/IncrementalBulkLoader.java
@@ -28,7 +28,7 @@ import org.apache.tinkerpop.gremlin.structure.Vertex;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.NoSuchElementException;
+import java.util.Iterator;
/**
* @author Daniel Kuppitz (http://gremlin.guru)
@@ -37,20 +37,20 @@ public class IncrementalBulkLoader extends DefaultBulkLoader {
private static final Logger LOGGER = LoggerFactory.getLogger(IncrementalBulkLoader.class);
+ /**
+ * {@inheritDoc}
+ */
@Override
public Vertex getOrCreateVertex(final Vertex vertex, final Graph graph, final GraphTraversalSource g) {
- if (useUserSuppliedIds()) {
- try {
- return getVertexById(vertex.id(), graph, g);
- } catch (NoSuchElementException ignored) {
- }
- } else {
- final Traversal<Vertex, Vertex> t = g.V().has(vertex.label(), BulkLoaderVertexProgram.BULK_LOADER_VERTEX_ID, vertex.id());
- if (t.hasNext()) return t.next();
- }
- return super.getOrCreateVertex(vertex, graph, g);
+ final Iterator<Vertex> iterator = useUserSuppliedIds()
+ ? graph.vertices(vertex.id())
+ : g.V().has(vertex.label(), BulkLoaderVertexProgram.BULK_LOADER_VERTEX_ID, vertex.id());
+ return iterator.hasNext() ? iterator.next() : super.getOrCreateVertex(vertex, graph, g);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public Edge getOrCreateEdge(final Edge edge, final Vertex outVertex, final Vertex inVertex, final Graph graph, final GraphTraversalSource g) {
final Traversal<Vertex, Edge> t = g.V(outVertex).outE(edge.label()).filter(__.inV().is(inVertex));
@@ -62,17 +62,23 @@ public class IncrementalBulkLoader extends DefaultBulkLoader {
return super.getOrCreateEdge(edge, outVertex, inVertex, graph, g);
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public boolean storeOriginalIds() {
return !useUserSuppliedIds();
}
+ /**
+ * {@inheritDoc}
+ */
@Override
public void configure(final Configuration configuration) {
super.configure(configuration);
- if (configuration.containsKey("store-original-ids")) {
+ if (configuration.containsKey(STORE_ORIGINAL_IDS_CFG_KEY)) {
LOGGER.warn("{} automatically determines whether original identifiers should be stored or not, hence the " +
- "configuration setting 'store-original-ids' will be ignored.", this.getClass());
+ "configuration setting '{}' will be ignored.", this.getClass(), STORE_ORIGINAL_IDS_CFG_KEY);
}
}
}