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 2018/04/24 12:10:49 UTC
[5/6] tinkerpop git commit: TINKERPOP-1595 Changed vertex program
serialization to base64 encoded
TINKERPOP-1595 Changed vertex program serialization to base64 encoded
This approach shows to be faster than writing the bytes as an array of string values and deserializing with regex based parsing.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/318eab50
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/318eab50
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/318eab50
Branch: refs/heads/TINKERPOP-1595
Commit: 318eab50defedf8717220161cde7690ca76bb973
Parents: d61765e
Author: Stephen Mallette <sp...@genoprime.com>
Authored: Tue Apr 24 08:06:56 2018 -0400
Committer: Stephen Mallette <sp...@genoprime.com>
Committed: Tue Apr 24 08:06:56 2018 -0400
----------------------------------------------------------------------
.../process/computer/util/VertexProgramHelper.java | 13 ++++---------
1 file changed, 4 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/318eab50/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/VertexProgramHelper.java
----------------------------------------------------------------------
diff --git a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/VertexProgramHelper.java b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/VertexProgramHelper.java
index bc67866..a1c299d 100644
--- a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/VertexProgramHelper.java
+++ b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/computer/util/VertexProgramHelper.java
@@ -28,7 +28,7 @@ import org.apache.tinkerpop.gremlin.process.traversal.step.map.VertexStep;
import org.apache.tinkerpop.gremlin.util.Serializer;
import java.io.IOException;
-import java.util.Arrays;
+import java.util.Base64;
import java.util.HashSet;
import java.util.Set;
@@ -64,8 +64,7 @@ public final class VertexProgramHelper {
if (configuration instanceof AbstractConfiguration)
((AbstractConfiguration) configuration).setDelimiterParsingDisabled(true);
try {
- final String byteString = Arrays.toString(Serializer.serializeObject(object));
- configuration.setProperty(key, byteString.substring(1, byteString.length() - 1));
+ configuration.setProperty(key, Base64.getEncoder().encodeToString(Serializer.serializeObject(object)));
} catch (final IOException e) {
throw new IllegalArgumentException(e.getMessage(), e);
}
@@ -73,12 +72,8 @@ public final class VertexProgramHelper {
public static <T> T deserialize(final Configuration configuration, final String key) {
try {
- final String[] stringBytes = configuration.getString(key).split(",");
- byte[] bytes = new byte[stringBytes.length];
- for (int i = 0; i < stringBytes.length; i++) {
- bytes[i] = Byte.valueOf(stringBytes[i].trim());
- }
- return (T) Serializer.deserializeObject(bytes);
+
+ return (T) Serializer.deserializeObject(Base64.getDecoder().decode(configuration.getString(key).getBytes()));
} catch (final IOException | ClassNotFoundException e) {
throw new IllegalArgumentException(e.getMessage(), e);
}