[1/7] tinkerpop git commit: Aligned versions in io tests better [Forced Update!]
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-2033 410e6d5a7 -> 8761118aa (forced update)
Aligned versions in io tests better
Not sure why the versions were off. Luckily it was of little consequence beause
those serializers didn't really change. CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8ac45770
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8ac45770
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8ac45770
Branch: refs/heads/TINKERPOP-2033
Commit: 8ac45770cdd7356264f541191997a80d615e711f
Parents: a4970a4
Author: Stephen Mallette
Authored: Tue Sep 11 13:53:05 2018 -0400
Committer: Stephen Mallette
Committed: Tue Sep 11 13:53:05 2018 -0400
--
.../gremlin-io-test/scripts/generate-gryo-resources.groovy | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8ac45770/gremlin-tools/gremlin-io-test/scripts/generate-gryo-resources.groovy
--
diff --git
a/gremlin-tools/gremlin-io-test/scripts/generate-gryo-resources.groovy
b/gremlin-tools/gremlin-io-test/scripts/generate-gryo-resources.groovy
index 3f4cf54..97d9911 100644
--- a/gremlin-tools/gremlin-io-test/scripts/generate-gryo-resources.groovy
+++ b/gremlin-tools/gremlin-io-test/scripts/generate-gryo-resources.groovy
@@ -68,14 +68,14 @@ writeSupportedObjects = { mapper, toGryoFunction ->
mapper = GryoMapper.build().
version(GryoVersion.V1_0).
-addRegistry(TinkerIoRegistryV2d0.instance()).
+addRegistry(TinkerIoRegistryV1d0.instance()).
create().createMapper()
writeSupportedObjects(mapper, toGryoV1d0)
mapper = GryoMapper.build().
version(GryoVersion.V3_0).
-addRegistry(TinkerIoRegistryV2d0.instance()).
+addRegistry(TinkerIoRegistryV3d0.instance()).
create().createMapper()
writeSupportedObjects(mapper, toGryoV3d0)
[5/7] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0eeeb0d0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0eeeb0d0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0eeeb0d0
Branch: refs/heads/TINKERPOP-2033
Commit: 0eeeb0d0c79358b346ef0b8859bcdcb2d16ddbd9
Parents: 8ac4577 ec0e685
Author: Stephen Mallette
Authored: Wed Sep 12 10:29:29 2018 -0400
Committer: Stephen Mallette
Committed: Wed Sep 12 10:29:29 2018 -0400
--
CHANGELOG.asciidoc | 2 ++
.../gremlin/structure/io/gryo/GryoVersion.java | 14 -
.../structure/io/gryo/UtilSerializers.java | 33
3 files changed, 48 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0eeeb0d0/CHANGELOG.asciidoc
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0eeeb0d0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
--
diff --cc
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
index 6bb7b34,5f973e3..1cdcde7
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
@@@ -526,33 -310,8 +529,33 @@@ public enum GryoVersion
add(GryoTypeReg.of(RangeGlobalStep.RangeBiOperator.class, 114));
add(GryoTypeReg.of(OrderGlobalStep.OrderBiOperator.class, 118,
new JavaSerializer()));
add(GryoTypeReg.of(ProfileStep.ProfileBiOperator.class, 119));
+
+add(GryoTypeReg.of(ConnectiveStrategy.class, 138));
+add(GryoTypeReg.of(HaltedTraverserStrategy.class, 139));
+add(GryoTypeReg.of(PartitionStrategy.class, 140, new
JavaSerializer()));
+add(GryoTypeReg.of(SubgraphStrategy.class, 141, new
JavaSerializer()));
+add(GryoTypeReg.of(VertexProgramStrategy.class, 142, new
JavaSerializer()));
+add(GryoTypeReg.of(MatchAlgorithmStrategy.class, 143));
+add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 144));
+add(GryoTypeReg.of(AdjacentToIncidentStrategy.class, 145));
+add(GryoTypeReg.of(FilterRankingStrategy.class, 146));
+add(GryoTypeReg.of(IdentityRemovalStrategy.class, 147));
+add(GryoTypeReg.of(IncidentToAdjacentStrategy.class, 148));
+add(GryoTypeReg.of(InlineFilterStrategy.class, 149));
+add(GryoTypeReg.of(LazyBarrierStrategy.class, 150));
+add(GryoTypeReg.of(MatchPredicateStrategy.class, 151));
+add(GryoTypeReg.of(OrderLimitStrategy.class, 152));
+add(GryoTypeReg.of(PathProcessorStrategy.class, 153));
+add(GryoTypeReg.of(PathRetractionStrategy.class, 154));
+add(GryoTypeReg.of(CountStrategy.class, 155));
+add(GryoTypeReg.of(RepeatUnrollStrategy.class, 156));
+add(GryoTypeReg.of(GraphFilterStrategy.class, 157));
+add(GryoTypeReg.of(LambdaRestrictionStrategy.class, 158));
+add(GryoTypeReg.of(ReadOnlyStrategy.class, 159));
+add(GryoTypeReg.of(MatchStep.CountMatchAlgorithm.class, 160));
+add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 167));
// skip 171, 172 to sync with tp33
-
add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173));
// ***LAST ID***
+
add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173));
}};
}
@@@ -608,8 -352,13 +613,15 @@@
} catch (Exception ex) {
throw new RuntimeException("Could not access " + className,
ex);
}
+
+ className = Collections.class.getName() + "$SynchronizedMap";
+ try {
+ COLLECTIONS_SYNCHRONIZED_MAP = Class.forName(className);
+ } catch (Exception ex) {
+ throw new RuntimeException("Could not access " + className,
ex);
+ }
}
+
+private Types() {}
}
}
[3/7] tinkerpop git commit: Removed duplicate dep - CTR
Removed duplicate dep - CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9143ffd3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9143ffd3 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9143ffd3 Branch: refs/heads/TINKERPOP-2033 Commit: 9143ffd363c14667f6d79e50f9f22187d566decc Parents: 76cb2b6 Author: Robert Dale Authored: Wed Sep 12 06:39:57 2018 -0400 Committer: Robert Dale Committed: Wed Sep 12 06:39:57 2018 -0400 -- pom.xml | 5 - 1 file changed, 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9143ffd3/pom.xml -- diff --git a/pom.xml b/pom.xml index dfb5824..4f1f83d 100644 --- a/pom.xml +++ b/pom.xml @@ -693,11 +693,6 @@ limitations under the License. -org.apache.httpcomponents -httpclient -4.5.1 - - commons-httpclient commons-httpclient 3.1
[6/7] tinkerpop git commit: Merge branch 'tp33'
Merge branch 'tp33' Conflicts: gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e914a670 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e914a670 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e914a670 Branch: refs/heads/TINKERPOP-2033 Commit: e914a670f0f169d0abff50363d510384ca57badf Parents: 9143ffd 0eeeb0d Author: Stephen Mallette Authored: Wed Sep 12 11:58:00 2018 -0400 Committer: Stephen Mallette Committed: Wed Sep 12 11:58:00 2018 -0400 -- CHANGELOG.asciidoc| 2 ++ .../gremlin/structure/io/gryo/GryoVersion.java| 12 +++- .../structure/io/gryo/UtilSerializers.java| 18 ++ 3 files changed, 31 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e914a670/CHANGELOG.asciidoc -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e914a670/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java --
[4/7] tinkerpop git commit: TINKERPOP-2034 Registered synchronizedMap() with Gryo CTR
TINKERPOP-2034 Registered synchronizedMap() with Gryo CTR
This has no real effect here, but is relevant to continued compatibility with
Gryo 1.0 in 3.4.0. Also added Triplet to Gryo as it was added in 3.4.0 as part
of repeat() CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ec0e6856
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ec0e6856
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ec0e6856
Branch: refs/heads/TINKERPOP-2033
Commit: ec0e6856e9355b3b46be4c7e104a2b55d57d766d
Parents: c029eef
Author: Stephen Mallette
Authored: Wed Sep 12 10:28:03 2018 -0400
Committer: Stephen Mallette
Committed: Wed Sep 12 10:28:03 2018 -0400
--
CHANGELOG.asciidoc | 2 ++
.../gremlin/structure/io/gryo/GryoVersion.java | 14 -
.../structure/io/gryo/UtilSerializers.java | 33
3 files changed, 48 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec0e6856/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 158cc7a..8e36d6d 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -32,6 +32,8 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Added an system error code for failed plugin installs for Gremlin Server
`-i` option.
* Match numbers in `choose()` options using `NumberHelper` (match values,
ignore data type).
* Added support for GraphSON serialization of `Date` in Javascript.
+* Added synchronized `Map` to Gryo 1.0 registrations.
+* Added `Triple` to Gryo 1.0 registrations.
* Added better internal processing of `Column` in `by(Function)`.
* Added support for additional extended types in Gremlin.Net with `decimal`,
`TimeSpan`, `BigInteger`, `byte`, `byte[]`, `char` and `short`.
* Fixed bug in Java driver where an disorderly shutdown of the server would
cause the client to hang.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec0e6856/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
index 6d5e99a..5f973e3 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
@@ -84,6 +84,7 @@ import
org.apache.tinkerpop.gremlin.util.function.MultiComparator;
import org.apache.tinkerpop.shaded.kryo.KryoSerializable;
import org.apache.tinkerpop.shaded.kryo.serializers.JavaSerializer;
import org.javatuples.Pair;
+import org.javatuples.Triplet;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -191,6 +192,7 @@ public enum GryoVersion {
add(GryoTypeReg.of(Collections.singleton(null).getClass(), 54));
add(GryoTypeReg.of(Collections.singletonList(null).getClass(),
24));
add(GryoTypeReg.of(Collections.singletonMap(null,
null).getClass(), 23));
+add(GryoTypeReg.of(Types.COLLECTIONS_SYNCHRONIZED_MAP, 185, new
UtilSerializers.SynchronizedMapSerializer())); // ***LAST ID***
add(GryoTypeReg.of(Contains.class, 49));
add(GryoTypeReg.of(Currency.class, 40));
add(GryoTypeReg.of(Date.class, 38));
@@ -280,6 +282,7 @@ public enum GryoVersion {
add(GryoTypeReg.of(MapReduce.NullObject.class, 74));
add(GryoTypeReg.of(AtomicLong.class, 79));
add(GryoTypeReg.of(Pair.class, 88, new
UtilSerializers.PairSerializer()));
+add(GryoTypeReg.of(Triplet.class, 183, new
UtilSerializers.TripletSerializer()));
add(GryoTypeReg.of(TraversalExplanation.class, 106, new
JavaSerializer()));
add(GryoTypeReg.of(Duration.class, 93, new
JavaTimeSerializers.DurationSerializer()));
@@ -308,7 +311,7 @@ public enum GryoVersion {
add(GryoTypeReg.of(OrderGlobalStep.OrderBiOperator.class, 118, new
JavaSerializer()));
add(GryoTypeReg.of(ProfileStep.ProfileBiOperator.class, 119));
// skip 171, 172 to sync with tp33
-
add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173));
// ***LAST ID***
+
add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173));
}};
}
@@ -332,6 +335,8 @@ public enum GryoVersion {
private static final Class HASH_MAP_TREE_NODE;
+private static final Class
[2/7] tinkerpop git commit: Merge branch 'tp33'
Merge branch 'tp33' Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/76cb2b60 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/76cb2b60 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/76cb2b60 Branch: refs/heads/TINKERPOP-2033 Commit: 76cb2b602039cf6cc7d675684991e770f792ad37 Parents: a9bc444 8ac4577 Author: Stephen Mallette Authored: Tue Sep 11 13:54:13 2018 -0400 Committer: Stephen Mallette Committed: Tue Sep 11 13:54:13 2018 -0400 -- .../gremlin-io-test/scripts/generate-gryo-resources.groovy | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) --
[7/7] tinkerpop git commit: TINKERPOP-2033 Maintain order in profile() annotations
TINKERPOP-2033 Maintain order in profile() annotations
Used a synchronized map around a LinkedHashMap rather than ConcurrentHashMap.
Not expecting a performance issue with this as its for profile() step which
doesn't have to be "fast" per se as it is a debugging step. Affected gryo more
than graphson - specifically gryo 1.0 which didn't coerce "metrics" to an
interfaces as it does in 3.0. Added a custom serializer to force the
annotations to a regular LinkedHashMap and then back to synchronized
LinkedHashMap during serder to keep compatibility.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/8761118a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/8761118a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/8761118a
Branch: refs/heads/TINKERPOP-2033
Commit: 8761118aac543a5da4f3a990d803fe52fc25ccb5
Parents: e914a67
Author: Stephen Mallette
Authored: Tue Sep 11 12:44:07 2018 -0400
Committer: Stephen Mallette
Committed: Wed Sep 12 12:36:44 2018 -0400
--
CHANGELOG.asciidoc | 1 +
.../process/traversal/util/ImmutableMetrics.java | 3 ++-
.../structure/io/gryo/GryoSerializersV3d0.java | 8 +++-
.../gremlin/structure/io/gryo/GryoVersion.java | 3 ++-
.../gremlin/structure/io/gryo/UtilSerializers.java | 1 +
.../structure/io/gryo/_3_4_0/metrics-v1d0.kryo | Bin 193 -> 197 bytes
6 files changed, 13 insertions(+), 3 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8761118a/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 1d9aa41..16a56e4 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -32,6 +32,7 @@ This release also includes changes from <>.
* Added `GraphFeatures.supportsIoRead()` and `GraphFeatures.supportsIoWrite()`.
* Deprecated `Graph.io()` and related infrastructure.
* `GraphMLReader` better handles edge and vertex properties with the same name.
+* Maintained order of annotations in metrics returned from `profile()`-step.
* Bumped to Netty 4.1.25.
* Bumped to Spark 2.3.1.
* Deprecated two `submit()`-related methods on the Java driver `Client` class.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8761118a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java
index d2b1430..f633322 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.util;
import java.io.Serializable;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -41,7 +42,7 @@ public class ImmutableMetrics implements Metrics,
Serializable {
protected String name;
protected Map counts = new ConcurrentHashMap<>();
protected long durationNs = 0l;
-protected final Map annotations = new
ConcurrentHashMap<>();
+protected final Map annotations =
Collections.synchronizedMap(new LinkedHashMap<>());
protected final Map nested = new
LinkedHashMap<>();
protected ImmutableMetrics() {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/8761118a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java
index 8a57a06..fee9345 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java
@@ -52,6 +52,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@@ -427,7 +428,12 @@ public final class GryoSerializersV3d0 {
output.writeString(object.getName());
output.writeDouble(object.getDuration(TimeUnit.NANOSECONDS) /
100d);
[2/2] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0eeeb0d0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0eeeb0d0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0eeeb0d0
Branch: refs/heads/tp33
Commit: 0eeeb0d0c79358b346ef0b8859bcdcb2d16ddbd9
Parents: 8ac4577 ec0e685
Author: Stephen Mallette
Authored: Wed Sep 12 10:29:29 2018 -0400
Committer: Stephen Mallette
Committed: Wed Sep 12 10:29:29 2018 -0400
--
CHANGELOG.asciidoc | 2 ++
.../gremlin/structure/io/gryo/GryoVersion.java | 14 -
.../structure/io/gryo/UtilSerializers.java | 33
3 files changed, 48 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0eeeb0d0/CHANGELOG.asciidoc
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0eeeb0d0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
--
diff --cc
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
index 6bb7b34,5f973e3..1cdcde7
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
@@@ -526,33 -310,8 +529,33 @@@ public enum GryoVersion
add(GryoTypeReg.of(RangeGlobalStep.RangeBiOperator.class, 114));
add(GryoTypeReg.of(OrderGlobalStep.OrderBiOperator.class, 118,
new JavaSerializer()));
add(GryoTypeReg.of(ProfileStep.ProfileBiOperator.class, 119));
+
+add(GryoTypeReg.of(ConnectiveStrategy.class, 138));
+add(GryoTypeReg.of(HaltedTraverserStrategy.class, 139));
+add(GryoTypeReg.of(PartitionStrategy.class, 140, new
JavaSerializer()));
+add(GryoTypeReg.of(SubgraphStrategy.class, 141, new
JavaSerializer()));
+add(GryoTypeReg.of(VertexProgramStrategy.class, 142, new
JavaSerializer()));
+add(GryoTypeReg.of(MatchAlgorithmStrategy.class, 143));
+add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 144));
+add(GryoTypeReg.of(AdjacentToIncidentStrategy.class, 145));
+add(GryoTypeReg.of(FilterRankingStrategy.class, 146));
+add(GryoTypeReg.of(IdentityRemovalStrategy.class, 147));
+add(GryoTypeReg.of(IncidentToAdjacentStrategy.class, 148));
+add(GryoTypeReg.of(InlineFilterStrategy.class, 149));
+add(GryoTypeReg.of(LazyBarrierStrategy.class, 150));
+add(GryoTypeReg.of(MatchPredicateStrategy.class, 151));
+add(GryoTypeReg.of(OrderLimitStrategy.class, 152));
+add(GryoTypeReg.of(PathProcessorStrategy.class, 153));
+add(GryoTypeReg.of(PathRetractionStrategy.class, 154));
+add(GryoTypeReg.of(CountStrategy.class, 155));
+add(GryoTypeReg.of(RepeatUnrollStrategy.class, 156));
+add(GryoTypeReg.of(GraphFilterStrategy.class, 157));
+add(GryoTypeReg.of(LambdaRestrictionStrategy.class, 158));
+add(GryoTypeReg.of(ReadOnlyStrategy.class, 159));
+add(GryoTypeReg.of(MatchStep.CountMatchAlgorithm.class, 160));
+add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 167));
// skip 171, 172 to sync with tp33
-
add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173));
// ***LAST ID***
+
add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173));
}};
}
@@@ -608,8 -352,13 +613,15 @@@
} catch (Exception ex) {
throw new RuntimeException("Could not access " + className,
ex);
}
+
+ className = Collections.class.getName() + "$SynchronizedMap";
+ try {
+ COLLECTIONS_SYNCHRONIZED_MAP = Class.forName(className);
+ } catch (Exception ex) {
+ throw new RuntimeException("Could not access " + className,
ex);
+ }
}
+
+private Types() {}
}
}
[3/3] tinkerpop git commit: Merge branch 'tp33'
Merge branch 'tp33' Conflicts: gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/e914a670 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/e914a670 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/e914a670 Branch: refs/heads/master Commit: e914a670f0f169d0abff50363d510384ca57badf Parents: 9143ffd 0eeeb0d Author: Stephen Mallette Authored: Wed Sep 12 11:58:00 2018 -0400 Committer: Stephen Mallette Committed: Wed Sep 12 11:58:00 2018 -0400 -- CHANGELOG.asciidoc| 2 ++ .../gremlin/structure/io/gryo/GryoVersion.java| 12 +++- .../structure/io/gryo/UtilSerializers.java| 18 ++ 3 files changed, 31 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e914a670/CHANGELOG.asciidoc -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/e914a670/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java --
tinkerpop git commit: TINKERPOP-2034 Registered synchronizedMap() with Gryo CTR
Repository: tinkerpop
Updated Branches:
refs/heads/tp32 c029eef8e -> ec0e6856e
TINKERPOP-2034 Registered synchronizedMap() with Gryo CTR
This has no real effect here, but is relevant to continued compatibility with
Gryo 1.0 in 3.4.0. Also added Triplet to Gryo as it was added in 3.4.0 as part
of repeat() CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ec0e6856
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ec0e6856
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ec0e6856
Branch: refs/heads/tp32
Commit: ec0e6856e9355b3b46be4c7e104a2b55d57d766d
Parents: c029eef
Author: Stephen Mallette
Authored: Wed Sep 12 10:28:03 2018 -0400
Committer: Stephen Mallette
Committed: Wed Sep 12 10:28:03 2018 -0400
--
CHANGELOG.asciidoc | 2 ++
.../gremlin/structure/io/gryo/GryoVersion.java | 14 -
.../structure/io/gryo/UtilSerializers.java | 33
3 files changed, 48 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec0e6856/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 158cc7a..8e36d6d 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -32,6 +32,8 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Added an system error code for failed plugin installs for Gremlin Server
`-i` option.
* Match numbers in `choose()` options using `NumberHelper` (match values,
ignore data type).
* Added support for GraphSON serialization of `Date` in Javascript.
+* Added synchronized `Map` to Gryo 1.0 registrations.
+* Added `Triple` to Gryo 1.0 registrations.
* Added better internal processing of `Column` in `by(Function)`.
* Added support for additional extended types in Gremlin.Net with `decimal`,
`TimeSpan`, `BigInteger`, `byte`, `byte[]`, `char` and `short`.
* Fixed bug in Java driver where an disorderly shutdown of the server would
cause the client to hang.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec0e6856/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
index 6d5e99a..5f973e3 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
@@ -84,6 +84,7 @@ import
org.apache.tinkerpop.gremlin.util.function.MultiComparator;
import org.apache.tinkerpop.shaded.kryo.KryoSerializable;
import org.apache.tinkerpop.shaded.kryo.serializers.JavaSerializer;
import org.javatuples.Pair;
+import org.javatuples.Triplet;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -191,6 +192,7 @@ public enum GryoVersion {
add(GryoTypeReg.of(Collections.singleton(null).getClass(), 54));
add(GryoTypeReg.of(Collections.singletonList(null).getClass(),
24));
add(GryoTypeReg.of(Collections.singletonMap(null,
null).getClass(), 23));
+add(GryoTypeReg.of(Types.COLLECTIONS_SYNCHRONIZED_MAP, 185, new
UtilSerializers.SynchronizedMapSerializer())); // ***LAST ID***
add(GryoTypeReg.of(Contains.class, 49));
add(GryoTypeReg.of(Currency.class, 40));
add(GryoTypeReg.of(Date.class, 38));
@@ -280,6 +282,7 @@ public enum GryoVersion {
add(GryoTypeReg.of(MapReduce.NullObject.class, 74));
add(GryoTypeReg.of(AtomicLong.class, 79));
add(GryoTypeReg.of(Pair.class, 88, new
UtilSerializers.PairSerializer()));
+add(GryoTypeReg.of(Triplet.class, 183, new
UtilSerializers.TripletSerializer()));
add(GryoTypeReg.of(TraversalExplanation.class, 106, new
JavaSerializer()));
add(GryoTypeReg.of(Duration.class, 93, new
JavaTimeSerializers.DurationSerializer()));
@@ -308,7 +311,7 @@ public enum GryoVersion {
add(GryoTypeReg.of(OrderGlobalStep.OrderBiOperator.class, 118, new
JavaSerializer()));
add(GryoTypeReg.of(ProfileStep.ProfileBiOperator.class, 119));
// skip 171, 172 to sync with tp33
-
add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173));
// ***LAST ID***
+
add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173));
}};
}
@@ -332,6 +335,8 @@ public enum GryoVersion {
private static final Class
[1/3] tinkerpop git commit: TINKERPOP-2034 Registered synchronizedMap() with Gryo CTR
Repository: tinkerpop
Updated Branches:
refs/heads/master 9143ffd36 -> e914a670f
TINKERPOP-2034 Registered synchronizedMap() with Gryo CTR
This has no real effect here, but is relevant to continued compatibility with
Gryo 1.0 in 3.4.0. Also added Triplet to Gryo as it was added in 3.4.0 as part
of repeat() CTR
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/ec0e6856
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/ec0e6856
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/ec0e6856
Branch: refs/heads/master
Commit: ec0e6856e9355b3b46be4c7e104a2b55d57d766d
Parents: c029eef
Author: Stephen Mallette
Authored: Wed Sep 12 10:28:03 2018 -0400
Committer: Stephen Mallette
Committed: Wed Sep 12 10:28:03 2018 -0400
--
CHANGELOG.asciidoc | 2 ++
.../gremlin/structure/io/gryo/GryoVersion.java | 14 -
.../structure/io/gryo/UtilSerializers.java | 33
3 files changed, 48 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec0e6856/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 158cc7a..8e36d6d 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -32,6 +32,8 @@
image::https://raw.githubusercontent.com/apache/tinkerpop/master/docs/static/ima
* Added an system error code for failed plugin installs for Gremlin Server
`-i` option.
* Match numbers in `choose()` options using `NumberHelper` (match values,
ignore data type).
* Added support for GraphSON serialization of `Date` in Javascript.
+* Added synchronized `Map` to Gryo 1.0 registrations.
+* Added `Triple` to Gryo 1.0 registrations.
* Added better internal processing of `Column` in `by(Function)`.
* Added support for additional extended types in Gremlin.Net with `decimal`,
`TimeSpan`, `BigInteger`, `byte`, `byte[]`, `char` and `short`.
* Fixed bug in Java driver where an disorderly shutdown of the server would
cause the client to hang.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/ec0e6856/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
index 6d5e99a..5f973e3 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
@@ -84,6 +84,7 @@ import
org.apache.tinkerpop.gremlin.util.function.MultiComparator;
import org.apache.tinkerpop.shaded.kryo.KryoSerializable;
import org.apache.tinkerpop.shaded.kryo.serializers.JavaSerializer;
import org.javatuples.Pair;
+import org.javatuples.Triplet;
import java.math.BigDecimal;
import java.math.BigInteger;
@@ -191,6 +192,7 @@ public enum GryoVersion {
add(GryoTypeReg.of(Collections.singleton(null).getClass(), 54));
add(GryoTypeReg.of(Collections.singletonList(null).getClass(),
24));
add(GryoTypeReg.of(Collections.singletonMap(null,
null).getClass(), 23));
+add(GryoTypeReg.of(Types.COLLECTIONS_SYNCHRONIZED_MAP, 185, new
UtilSerializers.SynchronizedMapSerializer())); // ***LAST ID***
add(GryoTypeReg.of(Contains.class, 49));
add(GryoTypeReg.of(Currency.class, 40));
add(GryoTypeReg.of(Date.class, 38));
@@ -280,6 +282,7 @@ public enum GryoVersion {
add(GryoTypeReg.of(MapReduce.NullObject.class, 74));
add(GryoTypeReg.of(AtomicLong.class, 79));
add(GryoTypeReg.of(Pair.class, 88, new
UtilSerializers.PairSerializer()));
+add(GryoTypeReg.of(Triplet.class, 183, new
UtilSerializers.TripletSerializer()));
add(GryoTypeReg.of(TraversalExplanation.class, 106, new
JavaSerializer()));
add(GryoTypeReg.of(Duration.class, 93, new
JavaTimeSerializers.DurationSerializer()));
@@ -308,7 +311,7 @@ public enum GryoVersion {
add(GryoTypeReg.of(OrderGlobalStep.OrderBiOperator.class, 118, new
JavaSerializer()));
add(GryoTypeReg.of(ProfileStep.ProfileBiOperator.class, 119));
// skip 171, 172 to sync with tp33
-
add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173));
// ***LAST ID***
+
add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173));
}};
}
@@ -332,6 +335,8 @@ public enum GryoVersion {
private static final Class
[2/3] tinkerpop git commit: Merge branch 'tp32' into tp33
Merge branch 'tp32' into tp33
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/0eeeb0d0
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/0eeeb0d0
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/0eeeb0d0
Branch: refs/heads/master
Commit: 0eeeb0d0c79358b346ef0b8859bcdcb2d16ddbd9
Parents: 8ac4577 ec0e685
Author: Stephen Mallette
Authored: Wed Sep 12 10:29:29 2018 -0400
Committer: Stephen Mallette
Committed: Wed Sep 12 10:29:29 2018 -0400
--
CHANGELOG.asciidoc | 2 ++
.../gremlin/structure/io/gryo/GryoVersion.java | 14 -
.../structure/io/gryo/UtilSerializers.java | 33
3 files changed, 48 insertions(+), 1 deletion(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0eeeb0d0/CHANGELOG.asciidoc
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/0eeeb0d0/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
--
diff --cc
gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
index 6bb7b34,5f973e3..1cdcde7
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoVersion.java
@@@ -526,33 -310,8 +529,33 @@@ public enum GryoVersion
add(GryoTypeReg.of(RangeGlobalStep.RangeBiOperator.class, 114));
add(GryoTypeReg.of(OrderGlobalStep.OrderBiOperator.class, 118,
new JavaSerializer()));
add(GryoTypeReg.of(ProfileStep.ProfileBiOperator.class, 119));
+
+add(GryoTypeReg.of(ConnectiveStrategy.class, 138));
+add(GryoTypeReg.of(HaltedTraverserStrategy.class, 139));
+add(GryoTypeReg.of(PartitionStrategy.class, 140, new
JavaSerializer()));
+add(GryoTypeReg.of(SubgraphStrategy.class, 141, new
JavaSerializer()));
+add(GryoTypeReg.of(VertexProgramStrategy.class, 142, new
JavaSerializer()));
+add(GryoTypeReg.of(MatchAlgorithmStrategy.class, 143));
+add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 144));
+add(GryoTypeReg.of(AdjacentToIncidentStrategy.class, 145));
+add(GryoTypeReg.of(FilterRankingStrategy.class, 146));
+add(GryoTypeReg.of(IdentityRemovalStrategy.class, 147));
+add(GryoTypeReg.of(IncidentToAdjacentStrategy.class, 148));
+add(GryoTypeReg.of(InlineFilterStrategy.class, 149));
+add(GryoTypeReg.of(LazyBarrierStrategy.class, 150));
+add(GryoTypeReg.of(MatchPredicateStrategy.class, 151));
+add(GryoTypeReg.of(OrderLimitStrategy.class, 152));
+add(GryoTypeReg.of(PathProcessorStrategy.class, 153));
+add(GryoTypeReg.of(PathRetractionStrategy.class, 154));
+add(GryoTypeReg.of(CountStrategy.class, 155));
+add(GryoTypeReg.of(RepeatUnrollStrategy.class, 156));
+add(GryoTypeReg.of(GraphFilterStrategy.class, 157));
+add(GryoTypeReg.of(LambdaRestrictionStrategy.class, 158));
+add(GryoTypeReg.of(ReadOnlyStrategy.class, 159));
+add(GryoTypeReg.of(MatchStep.CountMatchAlgorithm.class, 160));
+add(GryoTypeReg.of(MatchStep.GreedyMatchAlgorithm.class, 167));
// skip 171, 172 to sync with tp33
-
add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173));
// ***LAST ID***
+
add(GryoTypeReg.of(IndexedTraverserSet.VertexIndexedTraverserSet.class, 173));
}};
}
@@@ -608,8 -352,13 +613,15 @@@
} catch (Exception ex) {
throw new RuntimeException("Could not access " + className,
ex);
}
+
+ className = Collections.class.getName() + "$SynchronizedMap";
+ try {
+ COLLECTIONS_SYNCHRONIZED_MAP = Class.forName(className);
+ } catch (Exception ex) {
+ throw new RuntimeException("Could not access " + className,
ex);
+ }
}
+
+private Types() {}
}
}
tinkerpop git commit: TINKERPOP-2033 Maintain order in profile() annotations
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-2033 [created] 410e6d5a7
TINKERPOP-2033 Maintain order in profile() annotations
Used a synchronized map around a LinkedHashMap rather than ConcurrentHashMap.
Not expecting a performance issue with this as its for profile() step which
doesn't have to be "fast" per se as it is a debugging step. Affected gryo more
than graphson - specifically gryo 1.0 which didn't coerce "metrics" to an
interfaces as it does in 3.0. Added a custom serializer to force the
annotations to a regular LinkedHashMap and then back to synchronized
LinkedHashMap during serder to keep compatibility.
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/410e6d5a
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/410e6d5a
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/410e6d5a
Branch: refs/heads/TINKERPOP-2033
Commit: 410e6d5a7877a9568ec190624ecd12c81e11418d
Parents: a9bc444
Author: Stephen Mallette
Authored: Tue Sep 11 12:44:07 2018 -0400
Committer: Stephen Mallette
Committed: Wed Sep 12 08:35:11 2018 -0400
--
CHANGELOG.asciidoc | 2 ++
.../traversal/util/ImmutableMetrics.java| 3 ++-
.../structure/io/gryo/GryoSerializersV3d0.java | 8 +++-
.../gremlin/structure/io/gryo/GryoVersion.java | 15 +--
.../structure/io/gryo/UtilSerializers.java | 19 +++
.../structure/io/gryo/_3_4_0/metrics-v1d0.kryo | Bin 193 -> 197 bytes
6 files changed, 43 insertions(+), 4 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/410e6d5a/CHANGELOG.asciidoc
--
diff --git a/CHANGELOG.asciidoc b/CHANGELOG.asciidoc
index 4e00d80..117e6bf 100644
--- a/CHANGELOG.asciidoc
+++ b/CHANGELOG.asciidoc
@@ -32,6 +32,8 @@ This release also includes changes from <>.
* Added `GraphFeatures.supportsIoRead()` and `GraphFeatures.supportsIoWrite()`.
* Deprecated `Graph.io()` and related infrastructure.
* `GraphMLReader` better handles edge and vertex properties with the same name.
+* Maintained order of annotations in metrics returned from `profile()`-step.
+* Added synchronized `Map` to Gryo 1.0 and 3.0 registrations.
* Bumped to Netty 4.1.25.
* Bumped to Spark 2.3.1.
* Deprecated two `submit()`-related methods on the Java driver `Client` class.
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/410e6d5a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java
index d2b1430..f633322 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/util/ImmutableMetrics.java
@@ -20,6 +20,7 @@ package org.apache.tinkerpop.gremlin.process.traversal.util;
import java.io.Serializable;
import java.util.Collection;
+import java.util.Collections;
import java.util.HashMap;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -41,7 +42,7 @@ public class ImmutableMetrics implements Metrics,
Serializable {
protected String name;
protected Map counts = new ConcurrentHashMap<>();
protected long durationNs = 0l;
-protected final Map annotations = new
ConcurrentHashMap<>();
+protected final Map annotations =
Collections.synchronizedMap(new LinkedHashMap<>());
protected final Map nested = new
LinkedHashMap<>();
protected ImmutableMetrics() {
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/410e6d5a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java
--
diff --git
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java
index 8a57a06..fee9345 100644
---
a/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java
+++
b/gremlin-core/src/main/java/org/apache/tinkerpop/gremlin/structure/io/gryo/GryoSerializersV3d0.java
@@ -52,6 +52,7 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.HashMap;
import java.util.Iterator;
+import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.TimeUnit;
@@ -427,7 +428,12 @@ public final class
tinkerpop git commit: Removed duplicate dep - CTR
Repository: tinkerpop Updated Branches: refs/heads/master 76cb2b602 -> 9143ffd36 Removed duplicate dep - CTR Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/9143ffd3 Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/9143ffd3 Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/9143ffd3 Branch: refs/heads/master Commit: 9143ffd363c14667f6d79e50f9f22187d566decc Parents: 76cb2b6 Author: Robert Dale Authored: Wed Sep 12 06:39:57 2018 -0400 Committer: Robert Dale Committed: Wed Sep 12 06:39:57 2018 -0400 -- pom.xml | 5 - 1 file changed, 5 deletions(-) -- http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/9143ffd3/pom.xml -- diff --git a/pom.xml b/pom.xml index dfb5824..4f1f83d 100644 --- a/pom.xml +++ b/pom.xml @@ -693,11 +693,6 @@ limitations under the License. -org.apache.httpcomponents -httpclient -4.5.1 - - commons-httpclient commons-httpclient 3.1
tinkerpop git commit: TINKERPOP-1972 Fix test harness, extract child type in generic params array
Repository: tinkerpop
Updated Branches:
refs/heads/TINKERPOP-1972 [created] 2a2e47ebd
TINKERPOP-1972 Fix test harness, extract child type in generic params array
Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/2a2e47eb
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/2a2e47eb
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/2a2e47eb
Branch: refs/heads/TINKERPOP-1972
Commit: 2a2e47ebdb5342c30ebee2e9a0cca138e07fc58c
Parents: c029eef
Author: Jorge Bay Gondra
Authored: Wed Sep 12 11:17:54 2018 +0200
Committer: Jorge Bay Gondra
Committed: Wed Sep 12 11:17:54 2018 +0200
--
.../Gherkin/GherkinTestRunner.cs| 6 +++---
.../TraversalEvaluation/TraversalParser.cs | 21 ++--
2 files changed, 22 insertions(+), 5 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2a2e47eb/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
--
diff --git
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
index 3802da5..27bbc42 100644
---
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
+++
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/GherkinTestRunner.cs
@@ -38,10 +38,10 @@ namespace Gremlin.Net.IntegrationTest.Gherkin
public class GherkinTestRunner
{
private static readonly IDictionary
IgnoredScenarios =
-new Dictionary()
+new Dictionary
{
-{ "g_injectX1X_chooseXisX1X__constantX10Xfold__foldX",
IgnoreReason.NoReason },
-{ "g_injectX2X_chooseXisX1X__constantX10Xfold__foldX",
IgnoreReason.NoReason }
+// Add here the name of scenarios to ignore and the reason,
e.g.
+// { "g_injectX2X_chooseXisX1X__constantX10Xfold__foldX",
IgnoreReason.NoReason }
};
private static class Keywords
http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/2a2e47eb/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalParser.cs
--
diff --git
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalParser.cs
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalParser.cs
index e3f6a3f..419ce8d 100644
---
a/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalParser.cs
+++
b/gremlin-dotnet/test/Gremlin.Net.IntegrationTest/Gherkin/TraversalEvaluation/TraversalParser.cs
@@ -245,6 +245,14 @@ namespace
Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
// if we have the type of value we have the type of
E2.
genericParameterTypes.Add(info.ParameterType.Name,
tokenParameter.GetParameterType());
}
+else if (IsParamsArray(info) &&
info.ParameterType.GetElementType().IsGenericParameter)
+{
+// Its a method where the type parameter comes from an
params Array
+// e.g., Inject(params S[] value)
+
genericParameterTypes.Add(info.ParameterType.GetElementType().Name,
+tokenParameter.GetParameterType());
+}
+
if (info.ParameterType !=
tokenParameter.GetParameterType() && IsNumeric(info.ParameterType) &&
IsNumeric(tokenParameter.GetParameterType()))
{
@@ -252,6 +260,7 @@ namespace
Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
value = Convert.ChangeType(value, info.ParameterType);
}
}
+
if (IsParamsArray(info))
{
// For `params type[] value` we should provide an empty
array
@@ -264,11 +273,19 @@ namespace
Gremlin.Net.IntegrationTest.Gherkin.TraversalEvaluation
{
// An array with the parameter values
// No more method parameters after this one
-var arr =
Array.CreateInstance(info.ParameterType.GetElementType(),
token.Parameters.Count - i);
+var elementType = info.ParameterType.GetElementType();
+
+if (elementType.IsGenericParameter)
+{
+// The Array element type is generic, so we use
type of the value to specify it
+elementType =
