You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@s2graph.apache.org by st...@apache.org on 2017/07/01 15:28:23 UTC
[32/46] incubator-s2graph git commit: [Branch + Filter] passed most
of them.
[Branch + Filter] passed most of them.
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/bc502615
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/bc502615
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/bc502615
Branch: refs/heads/master
Commit: bc50261593c6c427ced56f40d0bada0f9dc0e2fe
Parents: 38ec51d
Author: DO YUNG YOON <st...@apache.org>
Authored: Wed May 3 09:05:19 2017 +0900
Committer: DO YUNG YOON <st...@apache.org>
Committed: Wed May 3 09:05:19 2017 +0900
----------------------------------------------------------------------
.../scala/org/apache/s2graph/core/S2Graph.scala | 57 ++++++++++++++------
.../apache/s2graph/core/types/VertexId.scala | 2 +-
2 files changed, 42 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/bc502615/s2core/src/main/scala/org/apache/s2graph/core/S2Graph.scala
----------------------------------------------------------------------
diff --git a/s2core/src/main/scala/org/apache/s2graph/core/S2Graph.scala b/s2core/src/main/scala/org/apache/s2graph/core/S2Graph.scala
index a0d8f37..7d673de 100644
--- a/s2core/src/main/scala/org/apache/s2graph/core/S2Graph.scala
+++ b/s2core/src/main/scala/org/apache/s2graph/core/S2Graph.scala
@@ -540,42 +540,67 @@ object S2Graph {
))
@Graph.OptOuts(value = Array(
/** Process */
+ /* branch */
// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.branch.BranchTest$Traversals", method = "*", reason = "no"),
// passed: all
-
// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.branch.ChooseTest$Traversals", method = "*", reason = "no"),
- // passed: , failed: g_V_chooseXlabel_eqXpersonX__outXknowsX__inXcreatedXX_name
-
+ // passed: all
// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.branch.OptionalTest$Traversals", method = "*", reason = "no"),
// passed: all
// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.branch.LocalTest$Traversals", method = "*", reason = "no"),
-// failed: g_V_localXmatchXproject__created_person__person_name_nameX_selectXname_projectX_by_byXnameX,
-// g_V_localXbothEXcreatedX_limitX1XX_otherV_name
-// g_VX4X_localXbothEX1_createdX_limitX1XX
-//g_VX4X_localXbothEXknows_createdX_limitX1XX
+// passed: all, failed: g_VX4X_localXbothEX1_createdX_limitX1XX, g_V_localXbothEXcreatedX_limitX1XX_otherV_name, g_VX4X_localXbothEXknows_createdX_limitX1XX
// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.branch.RepeatTest$Traversals", method = "*", reason = "no"),
-// failed: g_V_repeatXoutX_timesX2X_repeatXinX_timesX2X_name
+// passed: all
// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.branch.UnionTest$Traversals", method = "*", reason = "no"),
-//failed: g_V_chooseXlabel_eq_person__unionX__out_lang__out_nameX__in_labelX_groupCount,
-//g_V_unionXout__inX_name
-//g_V_chooseXlabel_eq_person__unionX__out_lang__out_nameX__in_labelX
-//g_V_unionXrepeatXunionXoutXcreatedX__inXcreatedXX_timesX2X__repeatXunionXinXcreatedX__outXcreatedXX_timesX2XX_label_groupCount
-//g_VX1X_unionXrepeatXoutX_timesX2X__outX_name
+// passed: all
+ /* filter */
// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.AndTest$Traversals", method = "*", reason = "no"),
-// failed: g_V_asXaX_outXknowsX_and_outXcreatedX_inXcreatedX_asXaX_name
+// passed: all
// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.CoinTest$Traversals", method = "*", reason = "no"),
// passed: all
// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.CyclicPathTest$Traversals", method = "*", reason = "no"),
-// failed: all
+// passed: all
+
+// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.DedupTest$Traversals", method = "*", reason = "no"),
+// passed: all, failed: g_V_asXaX_both_asXbX_dedupXa_bX_byXlabelX_selectXa_bX
+
+// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.DropTest$Traversals", method = "*", reason = "no"),
+// passed: all, failed: g_V_properties_drop
+
+// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.FilterTest$Traversals", method = "*", reason = "no"),
+// passed: all
+
+// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.HasTest$Traversals", method = "*", reason = "no"),
+// passed: all
+
+// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.IsTest$Traversals", method = "*", reason = "no"),
+// passed: all
+
+// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.OrTest$Traversals", method = "*", reason = "no"),
+// passed: all
+
+// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.RangeTest$Traversals", method = "*", reason = "no"),
+// passed: all
+
+// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.SampleTest$Traversals", method = "*", reason = "no"),
+// passed: all
+
+// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.SimplePathTest$Traversals", method = "*", reason = "no"),
+// passed: all
+
+// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.TailTest$Traversals", method = "*", reason = "no"),
+// passed: all
- new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.CyclicPathTest$Traversals", method = "*", reason = "no"),
+// new Graph.OptOut(test = "org.apache.tinkerpop.gremlin.process.traversal.step.filter.WhereTest$Traversals", method = "*", reason = "no"),
+// passed: all, failed: g_VX1X_repeatXbothEXcreatedX_whereXwithoutXeXX_aggregateXeX_otherVX_emit_path, g_V_asXaX_outXcreatedX_asXbX_inXcreatedX_asXcX_bothXknowsX_bothXknowsX_asXdX_whereXc__notXeqXaX_orXeqXdXXXX_selectXa_b_c_dX
+ /* map */
/** Structure */
new Graph.OptOut(test="org.apache.tinkerpop.gremlin.structure.EdgeTest$BasicEdgeTest", method="shouldValidateIdEquality", reason="reference equals on EdgeId is not supported."),
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/bc502615/s2core/src/main/scala/org/apache/s2graph/core/types/VertexId.scala
----------------------------------------------------------------------
diff --git a/s2core/src/main/scala/org/apache/s2graph/core/types/VertexId.scala b/s2core/src/main/scala/org/apache/s2graph/core/types/VertexId.scala
index f93df4a..4130fe0 100644
--- a/s2core/src/main/scala/org/apache/s2graph/core/types/VertexId.scala
+++ b/s2core/src/main/scala/org/apache/s2graph/core/types/VertexId.scala
@@ -69,7 +69,7 @@ object VertexId extends HBaseDeserializable {
}
}
-class VertexId (val column: ServiceColumn, val innerId: InnerValLike) extends HBaseSerializable {
+class VertexId (val column: ServiceColumn, val innerId: InnerValLike) extends HBaseSerializable with Comparable[VertexId] {
val storeHash: Boolean = true
val storeColId: Boolean = true
val colId = column.id.get