You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@s2graph.apache.org by da...@apache.org on 2018/03/30 06:15:24 UTC
[1/3] incubator-s2graph git commit: fix name conflict
Repository: incubator-s2graph
Updated Branches:
refs/heads/master afbd9e691 -> e0b2dc0bc
fix name conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/2af8243b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/2af8243b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/2af8243b
Branch: refs/heads/master
Commit: 2af8243b7830c7bf40db22f7cf0144369c525c67
Parents: 245335a
Author: daewon <da...@apache.org>
Authored: Fri Mar 30 14:46:07 2018 +0900
Committer: daewon <da...@apache.org>
Committed: Fri Mar 30 14:46:07 2018 +0900
----------------------------------------------------------------------
.../graphql/types/S2ManagementType.scala | 4 ++--
.../org/apache/s2graph/graphql/SchemaTest.scala | 22 ++++++++++++--------
2 files changed, 15 insertions(+), 11 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/2af8243b/s2graphql/src/main/scala/org/apache/s2graph/graphql/types/S2ManagementType.scala
----------------------------------------------------------------------
diff --git a/s2graphql/src/main/scala/org/apache/s2graph/graphql/types/S2ManagementType.scala b/s2graphql/src/main/scala/org/apache/s2graph/graphql/types/S2ManagementType.scala
index 7c6ce38..7bb5d29 100644
--- a/s2graphql/src/main/scala/org/apache/s2graph/graphql/types/S2ManagementType.scala
+++ b/s2graphql/src/main/scala/org/apache/s2graph/graphql/types/S2ManagementType.scala
@@ -77,7 +77,7 @@ class S2ManagementType(repo: GraphRepository) {
lazy val serviceColumnOnServiceWithPropInputObjectFields = repo.allServices.map { service =>
InputField(service.serviceName, OptionInputType(InputObjectType(
- s"Input_Column_Props",
+ s"Input_${service.serviceName}_ServiceColumn_Props",
description = "desc here",
fields = List(
InputField("columnName", makeServiceColumnEnumTypeOnService(service)),
@@ -88,7 +88,7 @@ class S2ManagementType(repo: GraphRepository) {
lazy val serviceColumnOnServiceInputObjectFields = repo.allServices.map { service =>
InputField(service.serviceName, OptionInputType(InputObjectType(
- s"Input_Column",
+ s"Input_${service.serviceName}_ServiceColumn",
description = "desc here",
fields = List(
InputField("columnName", makeServiceColumnEnumTypeOnService(service))
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/2af8243b/s2graphql/src/test/scala/org/apache/s2graph/graphql/SchemaTest.scala
----------------------------------------------------------------------
diff --git a/s2graphql/src/test/scala/org/apache/s2graph/graphql/SchemaTest.scala b/s2graphql/src/test/scala/org/apache/s2graph/graphql/SchemaTest.scala
index 0ec8868..fdedfe9 100644
--- a/s2graphql/src/test/scala/org/apache/s2graph/graphql/SchemaTest.scala
+++ b/s2graphql/src/test/scala/org/apache/s2graph/graphql/SchemaTest.scala
@@ -19,9 +19,9 @@
package org.apache.s2graph.graphql
-import com.typesafe.config.{ConfigFactory}
-import org.apache.s2graph.core.utils.logger
+import com.typesafe.config.ConfigFactory
import org.scalatest.{BeforeAndAfterAll, FunSuite, Matchers}
+import org.slf4j.LoggerFactory
import scala.concurrent.Await
import scala.concurrent.duration._
@@ -29,11 +29,11 @@ import scala.concurrent.ExecutionContext.Implicits.global
import sangria.execution.Executor
import sangria.parser.QueryParser
-
import scala.util._
class SchemaTest extends FunSuite with Matchers with BeforeAndAfterAll {
var testGraph: TestGraph = _
+ val logger = LoggerFactory.getLogger(this.getClass)
override def beforeAll = {
val config = ConfigFactory.load()
@@ -64,10 +64,15 @@ class SchemaTest extends FunSuite with Matchers with BeforeAndAfterAll {
Map("data" ->
Map("__schema" ->
Map("types" -> Vector(
+
+ // static s2graph constant types
Map("name" -> "Enum_CompressionAlgorithm"),
Map("name" -> "Enum_Consistency"),
Map("name" -> "Enum_DataType"),
Map("name" -> "Enum_Direction"),
+ Map("name" -> "Enum_Service"),
+ Map("name" -> "Enum_Label"),
+ Map("name" -> "Enum_kakao_ServiceColumn"),
Map("name" -> "MutateLabel"),
Map("name" -> "MutateGraphElement"),
@@ -77,8 +82,6 @@ class SchemaTest extends FunSuite with Matchers with BeforeAndAfterAll {
Map("name" -> "Input_Service"),
Map("name" -> "Input_Index"),
Map("name" -> "Input_Prop"),
- Map("name" -> "Input_Column"),
- Map("name" -> "Input_Column_Props"),
Map("name" -> "ColumnMeta"),
Map("name" -> "LabelMeta"),
@@ -91,16 +94,17 @@ class SchemaTest extends FunSuite with Matchers with BeforeAndAfterAll {
Map("name" -> "Input_Service_ServiceColumn"),
Map("name" -> "Input_Service_ServiceColumn_Props"),
+
+ // dynamic created types
Map("name" -> "Input_label_friends_param"),
Map("name" -> "Input_vertex_kakao_param"),
+ Map("name" -> "Input_kakao_ServiceColumn_Props"),
+ Map("name" -> "Input_kakao_ServiceColumn"),
+
Map("name" -> "Input_kakao_user"),
Map("name" -> "Input_kakao_user_vertex_mutate"),
- Map("name" -> "Enum_Service"),
- Map("name" -> "Enum_Label"),
- Map("name" -> "Enum_kakao_ServiceColumn"),
-
Map("name" -> "Service_kakao"),
Map("name" -> "Label_friends"),
[3/3] incubator-s2graph git commit: [S2GRAPH-192] could not find
service column when creating the label
Posted by da...@apache.org.
[S2GRAPH-192] could not find service column when creating the label
JIRA:
[S2GRAPH-192] https://issues.apache.org/jira/browse/S2GRAPH-192
Pull Request:
Closes #148
Author
daewon <da...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/e0b2dc0b
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/e0b2dc0b
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/e0b2dc0b
Branch: refs/heads/master
Commit: e0b2dc0bc7851a9c5eb553fa3f69fb6189a88e6d
Parents: e8b6202
Author: daewon <da...@apache.org>
Authored: Fri Mar 30 15:12:55 2018 +0900
Committer: daewon <da...@apache.org>
Committed: Fri Mar 30 15:12:55 2018 +0900
----------------------------------------------------------------------
CHANGES | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/e0b2dc0b/CHANGES
----------------------------------------------------------------------
diff --git a/CHANGES b/CHANGES
index 0120ed5..e593b95 100644
--- a/CHANGES
+++ b/CHANGES
@@ -47,6 +47,7 @@ Release Notes - S2Graph - Version 0.2.0
* [S2GRAPH-188] - migrate log4j.properties to log4j2.xml
* [S2GRAPH-189] - graphiql.html file not found
* [S2GRAPH-190] - Remove unnecessary TC JsonBenchmarkSpec
+ * [S2GRAPH-192] - could not find service column when creating the label
** Improvement
* [S2GRAPH-72] - Support Apache TinkerPop and Gremlin
[2/3] incubator-s2graph git commit: Mt erge branch 'S2GRAPH-192'
Posted by da...@apache.org.
Mt erge branch 'S2GRAPH-192'
* S2GRAPH-192:
fix name conflict
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/e8b62025
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/e8b62025
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/e8b62025
Branch: refs/heads/master
Commit: e8b620259308cccae198b9cd3fd82aa3878a2b71
Parents: afbd9e6 2af8243
Author: daewon <da...@apache.org>
Authored: Fri Mar 30 15:12:26 2018 +0900
Committer: daewon <da...@apache.org>
Committed: Fri Mar 30 15:12:26 2018 +0900
----------------------------------------------------------------------
.../graphql/types/S2ManagementType.scala | 4 ++--
.../org/apache/s2graph/graphql/SchemaTest.scala | 22 ++++++++++++--------
2 files changed, 15 insertions(+), 11 deletions(-)
----------------------------------------------------------------------