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 2019/07/05 17:39:54 UTC
[tinkerpop] branch master updated (dce3e65 -> 199c910)
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git.
from dce3e65 Merge pull request #1151 from apache/TINKERPOP-2251
add 060a914 TINKERPOP-2020 Added withComputer() in javascript.
new 2aea5a8 Merge branch 'TINKERPOP-2020' into tp33
new a62dc4f Merge branch 'tp33' into tp34
new 199c910 Merge branch 'tp34'
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.3.x.asciidoc | 8 ++++-
.../glv/GraphTraversalSource.template | 16 +++++++++-
.../lib/process/graph-traversal.js | 16 +++++++++-
.../lib/process/traversal-strategy.js | 28 +++++++++++++++++-
.../lib/structure/io/graph-serializer.js | 2 ++
.../lib/structure/io/type-serializers.js | 16 ++++++++++
.../test/cucumber/feature-steps.js | 34 ++--------------------
8 files changed, 85 insertions(+), 36 deletions(-)
[tinkerpop] 03/03: Merge branch 'tp34'
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 199c9106a76b09652b8f4d9cb76cbed7ac7fd418
Merge: dce3e65 a62dc4f
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Fri Jul 5 13:39:44 2019 -0400
Merge branch 'tp34'
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.3.x.asciidoc | 8 ++++-
.../glv/GraphTraversalSource.template | 16 +++++++++-
.../lib/process/graph-traversal.js | 16 +++++++++-
.../lib/process/traversal-strategy.js | 28 +++++++++++++++++-
.../lib/structure/io/graph-serializer.js | 2 ++
.../lib/structure/io/type-serializers.js | 16 ++++++++++
.../test/cucumber/feature-steps.js | 34 ++--------------------
8 files changed, 85 insertions(+), 36 deletions(-)
[tinkerpop] 01/03: Merge branch 'TINKERPOP-2020' into tp33
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit 2aea5a8699a985008af7519c7d90c0295c08d1f1
Merge: f627cfc 060a914
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Fri Jul 5 09:08:34 2019 -0400
Merge branch 'TINKERPOP-2020' into tp33
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.3.x.asciidoc | 8 ++++++-
.../glv/GraphTraversalSource.template | 16 ++++++++++++-
.../lib/process/graph-traversal.js | 16 ++++++++++++-
.../lib/process/traversal-strategy.js | 28 +++++++++++++++++++++-
.../lib/structure/io/graph-serializer.js | 2 ++
.../lib/structure/io/type-serializers.js | 16 +++++++++++++
.../test/cucumber/feature-steps.js | 13 ----------
8 files changed, 83 insertions(+), 17 deletions(-)
[tinkerpop] 02/03: Merge branch 'tp33' into tp34
Posted by sp...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
spmallette pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tinkerpop.git
commit a62dc4fd7158ad629a311065a2fb74d8d9c2f0a1
Merge: 199da2e 2aea5a8
Author: Stephen Mallette <sp...@genoprime.com>
AuthorDate: Fri Jul 5 13:30:48 2019 -0400
Merge branch 'tp33' into tp34
CHANGELOG.asciidoc | 1 +
docs/src/upgrade/release-3.3.x.asciidoc | 8 ++++-
.../glv/GraphTraversalSource.template | 16 +++++++++-
.../lib/process/graph-traversal.js | 16 +++++++++-
.../lib/process/traversal-strategy.js | 28 ++++++++++++++++-
.../lib/structure/io/graph-serializer.js | 2 ++
.../lib/structure/io/type-serializers.js | 16 ++++++++++
.../test/cucumber/feature-steps.js | 35 ++--------------------
8 files changed, 85 insertions(+), 37 deletions(-)
diff --cc gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js
index c567199,4a7fdf2..ff14320
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/lib/structure/io/graph-serializer.js
@@@ -180,8 -179,8 +181,9 @@@ const serializers =
typeSerializers.DateSerializer,
typeSerializers.BytecodeSerializer,
typeSerializers.TraverserSerializer,
+ typeSerializers.TraversalStrategySerializer,
typeSerializers.PSerializer,
+ typeSerializers.TextPSerializer,
typeSerializers.LambdaSerializer,
typeSerializers.EnumSerializer,
typeSerializers.VertexSerializer,
diff --cc gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
index 22cbe6b,651a6ea..88f5341
--- a/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
+++ b/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
@@@ -57,47 -57,12 +57,14 @@@ const parsers =
const ignoreReason = {
lambdaNotSupported: 'Lambdas are not supported on gremlin-javascript',
- computerNotSupported: "withComputer() is not supported on gremlin-javascript",
+ setNotSupported: "There is no Set support in gremlin-javascript",
needsFurtherInvestigation: '',
};
const ignoredScenarios = {
// An associative array containing the scenario name as key, for example:
- 'g_V_connectedComponent_hasXcomponentX': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_dedup_connectedComponent_hasXcomponentX': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_hasLabelXsoftwareX_connectedComponent_project_byXnameX_byXcomponentX': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_connectedComponent_withXEDGES_bothEXknowsXX_withXPROPERTY_NAME_clusterX_project_byXnameX_byXclusterX': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_pageRank_hasXpageRankX': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_outXcreatedX_pageRank_byXbothEX_byXprojectRankX_timesX0X_valueMapXname_projectRankX': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_pageRank_order_byXpageRank_decrX_byXnameX_name': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_pageRank_order_byXpageRank_decrX_name_limitX2X': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_pageRank_byXoutEXknowsXX_byXfriendRankX_project_byXnameX_byXvaluesXfriendRankX_mathX': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_hasLabelXpersonX_pageRank_byXpageRankX_project_byXnameX_byXvaluesXpageRankX_mathX': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_pageRank_byXpageRankX_asXaX_outXknowsX_pageRank_asXbX_selectXa_bX_by_byXmathX': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_hasLabelXsoftwareX_hasXname_rippleX_pageRankX1X_byXinEXcreatedXX_timesX1X_byXpriorsX_inXcreatedX_unionXboth__identityX_valueMapXname_priorsX': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_outXcreatedX_groupXmX_byXlabelX_pageRankX1X_byXpageRankX_byXinEX_timesX1X_inXcreatedX_groupXmX_byXpageRankX_capXmX': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_peerPressure_hasXclusterX': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_peerPressure_byXclusterX_byXoutEXknowsXX_pageRankX1X_byXrankX_byXoutEXknowsXX_timesX2X_group_byXclusterX_byXrank_sumX_limitX100X': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_hasXname_rippleX_inXcreatedX_peerPressure_byXoutEX_byXclusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_hasXname_rippleX_inXcreatedX_peerPressure_withXEDGES_outEX_withXPROPERTY_NAME_clusterX_repeatXunionXidentity__bothX_timesX2X_dedup_valueMapXname_clusterX': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_shortestPath': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_both_dedup_shortestPath': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_shortestPath_edgesIncluded': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_shortestPath_directionXINX': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_shortestPath_edgesXoutEX': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_shortestPath_edgesIncluded_edgesXoutEX': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_hasXname_markoX_shortestPath': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_shortestPath_targetXhasXname_markoXX': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_shortestPath_targetXvaluesXnameX_isXmarkoXX': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_hasXname_markoX_shortestPath_targetXhasLabelXsoftwareXX': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_hasXname_markoX_shortestPath_targetXhasXname_joshXX_distanceXweightX': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_hasXname_danielX_shortestPath_targetXhasXname_stephenXX_edgesXbothEXusesXX': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_hasXsong_name_MIGHT_AS_WELLX_shortestPath_targetXhasXsong_name_MAYBE_YOU_KNOW_HOW_I_FEELXX_edgesXoutEXfollowedByXX_distanceXweightX': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_hasXname_markoX_shortestPath_maxDistanceX1X': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_V_hasXname_vadasX_shortestPath_distanceXweightX_maxDistanceX1_3X': new IgnoreError(ignoreReason.computerNotSupported),
- 'g_withSideEffectXa_setX_V_both_name_storeXaX_capXaX': new IgnoreError(ignoreReason.needsFurtherInvestigation),
+ 'g_withSideEffectXa_setX_V_both_name_storeXaX_capXaX': new IgnoreError(ignoreReason.setNotSupported),
+ 'g_withSideEffectXa_setX_V_both_name_aggregateXlocal_aX_capXaX': new IgnoreError(ignoreReason.setNotSupported),
'g_V_both_groupCountXaX_out_capXaX_selectXkeysX_unfold_both_groupCountXaX_capXaX': new IgnoreError(ignoreReason.needsFurtherInvestigation),
'g_V_group_byXoutE_countX_byXnameX': new IgnoreError(ignoreReason.needsFurtherInvestigation),
};
@@@ -239,6 -201,6 +206,8 @@@ function getSandbox(g, parameters)
}
function translate(traversalText) {
++ // clean up trailing period/spaces so that it's easier to match newline with() to convert to with_() below
++ traversalText = traversalText.replace(/\)\.\s*/g, ').');
// Remove escaped chars
traversalText = traversalText.replace(/\\"/g, '"');
// Replace long suffix with Long instance