[11/11] tinkerpop git commit: Merge branch 'tp33'

2018-08-22 Thread spmallette
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/20bc5a3b
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/20bc5a3b
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/20bc5a3b

Branch: refs/heads/master
Commit: 20bc5a3bbe8f5fc3cb79c3de3965776085e2a557
Parents: 0207608 6582056
Author: Stephen Mallette 
Authored: Wed Aug 22 16:17:37 2018 -0400
Committer: Stephen Mallette 
Committed: Wed Aug 22 16:17:37 2018 -0400

--

--




[11/11] tinkerpop git commit: Merge branch 'tp33'

2018-08-09 Thread spmallette
Merge branch 'tp33'

Conflicts:

gremlin-test/src/main/java/org/apache/tinkerpop/gremlin/process/traversal/step/map/PeerPressureTest.java


Project: http://git-wip-us.apache.org/repos/asf/tinkerpop/repo
Commit: http://git-wip-us.apache.org/repos/asf/tinkerpop/commit/f88ace14
Tree: http://git-wip-us.apache.org/repos/asf/tinkerpop/tree/f88ace14
Diff: http://git-wip-us.apache.org/repos/asf/tinkerpop/diff/f88ace14

Branch: refs/heads/master
Commit: f88ace1420be0034108bf5f3c0c5c1d1973009c8
Parents: 9357d6a b12a3fd
Author: Stephen Mallette 
Authored: Thu Aug 9 10:51:01 2018 -0400
Committer: Stephen Mallette 
Committed: Thu Aug 9 10:51:01 2018 -0400

--
 .../gremlin/process/remote/RemoteGraph.java |  17 ---
 .../io/graphson/TraversalSerializersV2d0.java   |   4 -
 .../ModernGraphTypeInformation.cs   |   4 +
 .../DriverRemoteTraversalSideEffects.java   |   3 +-
 .../test/cucumber/feature-steps.js  |  15 ++-
 .../glv/GraphTraversalSource.template   |   2 +-
 .../gremlin_python/process/graph_traversal.py   |   2 +-
 .../RemoteGraphGroovyTranslatorProvider.java|   3 +-
 gremlin-test/features/map/PageRank.feature  | 132 +++
 gremlin-test/features/map/PeerPressure.feature  |  77 +++
 .../process/AbstractGremlinProcessTest.java |  26 ++--
 .../traversal/step/map/PageRankTest.java|  37 +++---
 .../traversal/step/map/PeerPressureTest.java|  24 ++--
 .../TranslationStrategyProcessTest.java |   3 +
 .../gremlin/process/FeatureCoverageTest.java|   6 +-
 15 files changed, 284 insertions(+), 71 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f88ace14/gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
--
diff --cc 
gremlin-javascript/src/main/javascript/gremlin-javascript/test/cucumber/feature-steps.js
index 83dfe22,0cddc02..96eeaaf
--- 
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
@@@ -62,7 -63,18 +63,19 @@@ const ignoreReason = 
  
  const ignoredScenarios = {
// An associative array containing the scenario name as key, for example:
-   // 'g_V_asXa_bX_out_asXcX_path_selectXkeysX': new 
IgnoreError(ignoreReason.embeddedListAssertion),
+   '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_valueMapXname_friendRankX': 
new IgnoreError(ignoreReason.computerNotSupported),
+   
'g_V_hasLabelXpersonX_pageRank_byXpageRankX_order_byXpageRankX_valueMapXname_pageRankX':
 new IgnoreError(ignoreReason.computerNotSupported),
+   'g_V_pageRank_byXpageRankX_asXaX_outXknowsX_pageRank_asXbX_selectXa_bX': 
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),
  };
  
  defineSupportCode(function(methods) {

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f88ace14/gremlin-python/src/main/jython/gremlin_python/process/graph_traversal.py
--

http://git-wip-us.apache.org/repos/asf/tinkerpop/blob/f88ace14/gremlin-test/features/map/PeerPressure.feature
--
diff --cc