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:27:55 UTC
[04/46] incubator-s2graph git commit: tmp.
tmp.
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/20b51cef
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/20b51cef
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/20b51cef
Branch: refs/heads/master
Commit: 20b51cef03661db67bd9c10cff9d2429097a3fc9
Parents: 1a15af3
Author: DO YUNG YOON <st...@apache.org>
Authored: Wed Apr 5 00:18:26 2017 +0900
Committer: DO YUNG YOON <st...@apache.org>
Committed: Wed Apr 5 00:18:26 2017 +0900
----------------------------------------------------------------------
s2core/src/main/scala/org/apache/s2graph/core/S2Graph.scala | 6 +++---
s2core/src/main/scala/org/apache/s2graph/core/S2Vertex.scala | 7 ++++---
.../org/apache/s2graph/core/features/S2DataTypeFeatures.scala | 2 +-
.../org/apache/s2graph/core/features/S2ElementFeatures.scala | 5 +++--
4 files changed, 11 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/20b51cef/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 cfd85b1..182b8ed 100644
--- a/s2core/src/main/scala/org/apache/s2graph/core/S2Graph.scala
+++ b/s2core/src/main/scala/org/apache/s2graph/core/S2Graph.scala
@@ -531,11 +531,11 @@ object S2Graph {
@Graph.OptIn(Graph.OptIn.SUITE_STRUCTURE_STANDARD)
@Graph.OptOuts(value = Array(
// passed
-// new Graph.OptOut(test="org.apache.tinkerpop.gremlin.structure.FeatureSupportTest", method="*", reason="no"), // pass
-// new Graph.OptOut(test="org.apache.tinkerpop.gremlin.structure.PropertyTest", method="*", reason="no"), // pass
+ new Graph.OptOut(test="org.apache.tinkerpop.gremlin.structure.FeatureSupportTest", method="*", reason="no"), // pass
+ new Graph.OptOut(test="org.apache.tinkerpop.gremlin.structure.PropertyTest", method="*", reason="no"), // pass
new Graph.OptOut(test="org.apache.tinkerpop.gremlin.structure.VertexPropertyTest", method="*", reason="no"), // pass
- new Graph.OptOut(test="org.apache.tinkerpop.gremlin.structure.VertexTest", method="*", reason="no"), // pss
+// new Graph.OptOut(test="org.apache.tinkerpop.gremlin.structure.VertexTest", method="*", reason="no"), // pss
new Graph.OptOut(test="org.apache.tinkerpop.gremlin.structure.EdgeTest", method="*", reason="no"), // pass
new Graph.OptOut(test="org.apache.tinkerpop.gremlin.structure.GraphConstructionTest", method="*", reason="no"), // pass
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/20b51cef/s2core/src/main/scala/org/apache/s2graph/core/S2Vertex.scala
----------------------------------------------------------------------
diff --git a/s2core/src/main/scala/org/apache/s2graph/core/S2Vertex.scala b/s2core/src/main/scala/org/apache/s2graph/core/S2Vertex.scala
index afee5d9..643b469 100644
--- a/s2core/src/main/scala/org/apache/s2graph/core/S2Vertex.scala
+++ b/s2core/src/main/scala/org/apache/s2graph/core/S2Vertex.scala
@@ -216,9 +216,10 @@ case class S2Vertex(graph: S2Graph,
override def properties[V](keys: String*): util.Iterator[VertexProperty[V]] = {
val ls = new util.ArrayList[VertexProperty[V]]()
if (keys.isEmpty) {
- props.keySet().forEach(new Consumer[String] {
- override def accept(key: String): Unit = {
- if (!ColumnMeta.reservedMetaNamesSet(key)) ls.add(property[V](key))
+ props.forEach(new BiConsumer[String, VertexProperty[_]] {
+ override def accept(key: String, property: VertexProperty[_]): Unit = {
+ if (!ColumnMeta.reservedMetaNamesSet(key) && property.isPresent)
+ ls.add(property.asInstanceOf[VertexProperty[V]])
}
})
} else {
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/20b51cef/s2core/src/main/scala/org/apache/s2graph/core/features/S2DataTypeFeatures.scala
----------------------------------------------------------------------
diff --git a/s2core/src/main/scala/org/apache/s2graph/core/features/S2DataTypeFeatures.scala b/s2core/src/main/scala/org/apache/s2graph/core/features/S2DataTypeFeatures.scala
index a79da46..a94ead3 100644
--- a/s2core/src/main/scala/org/apache/s2graph/core/features/S2DataTypeFeatures.scala
+++ b/s2core/src/main/scala/org/apache/s2graph/core/features/S2DataTypeFeatures.scala
@@ -30,7 +30,7 @@ case class S2DataTypeFeatures() extends Features.DataTypeFeatures {
override def supportsBooleanArrayValues(): Boolean = false
- override def supportsSerializableValues(): Boolean = true
+ override def supportsSerializableValues(): Boolean = false
override def supportsLongArrayValues(): Boolean = false
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/20b51cef/s2core/src/main/scala/org/apache/s2graph/core/features/S2ElementFeatures.scala
----------------------------------------------------------------------
diff --git a/s2core/src/main/scala/org/apache/s2graph/core/features/S2ElementFeatures.scala b/s2core/src/main/scala/org/apache/s2graph/core/features/S2ElementFeatures.scala
index bbb6a79..06f1c68 100644
--- a/s2core/src/main/scala/org/apache/s2graph/core/features/S2ElementFeatures.scala
+++ b/s2core/src/main/scala/org/apache/s2graph/core/features/S2ElementFeatures.scala
@@ -5,7 +5,7 @@ import org.apache.tinkerpop.gremlin.structure.Graph.Features
abstract class S2ElementFeatures extends Features.ElementFeatures {
override def supportsStringIds(): Boolean = true
- override def supportsCustomIds(): Boolean = false
+ override def supportsCustomIds(): Boolean = true
override def supportsUuidIds(): Boolean = false
@@ -15,9 +15,10 @@ abstract class S2ElementFeatures extends Features.ElementFeatures {
override def supportsUserSuppliedIds(): Boolean = true
- override def supportsAnyIds(): Boolean = false
+ override def supportsAnyIds(): Boolean = true
override def supportsNumericIds(): Boolean = false
+ override def willAllowId(id: scala.Any): Boolean = true
// override def willAllowId(id: scala.Any): Boolean = super.willAllowId(id)
}