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/06/18 06:15:30 UTC
[3/5] incubator-s2graph git commit: merge master for ci
merge master for ci
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/fa911bbf
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/fa911bbf
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/fa911bbf
Branch: refs/heads/master
Commit: fa911bbfb3dacf2772c13c6069a980352b6b1930
Parents: c13a5e9 70a7c71
Author: daewon <da...@apache.org>
Authored: Fri Jun 15 16:48:24 2018 +0900
Committer: daewon <da...@apache.org>
Committed: Mon Jun 18 14:58:26 2018 +0900
----------------------------------------------------------------------
CHANGES | 2 +
build.sbt | 4 +-
s2core/build.sbt | 2 +-
s2graphql/build.sbt | 4 +-
.../apache/s2graph/graphql/GraphQLServer.scala | 6 +-
.../s2graph/graphql/middleware/Transform.scala | 51 +++++++++++++++
.../s2graph/graphql/types/FieldResolver.scala | 2 +-
.../s2graph/graphql/types/S2Directive.scala | 68 ++++++++++++++++++++
.../s2graph/graphql/types/SchemaDef.scala | 12 +++-
.../apache/s2graph/graphql/DirectiveTest.scala | 53 +++++++++++++++
.../scala/org/apache/s2graph/s2jobs/Job.scala | 11 +++-
.../apache/s2graph/s2jobs/task/Process.scala | 64 +++++++++++++++++-
.../org/apache/s2graph/s2jobs/task/Sink.scala | 6 +-
.../org/apache/s2graph/s2jobs/task/Source.scala | 17 ++++-
.../org/apache/s2graph/s2jobs/task/Task.scala | 3 +-
15 files changed, 285 insertions(+), 20 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/fa911bbf/s2graphql/src/main/scala/org/apache/s2graph/graphql/GraphQLServer.scala
----------------------------------------------------------------------
diff --cc s2graphql/src/main/scala/org/apache/s2graph/graphql/GraphQLServer.scala
index b444213,8ea4c89..b7c0381
--- a/s2graphql/src/main/scala/org/apache/s2graph/graphql/GraphQLServer.scala
+++ b/s2graphql/src/main/scala/org/apache/s2graph/graphql/GraphQLServer.scala
@@@ -116,6 -115,8 +116,8 @@@ object GraphQLServer
newSchema
}
- val transformMiddleWare = new org.apache.s2graph.graphql.middleware.Transform()
++ val TransformMiddleWare = List(org.apache.s2graph.graphql.middleware.Transform())
+
private def executeGraphQLQuery(query: Document, op: Option[String], vars: JsObject)(implicit e: ExecutionContext) = {
val cacheKey = className + "s2Schema"
val s2schema = schemaCache.withCache(cacheKey, broadcast = false)(createNewSchema())
@@@ -123,13 -123,6 +125,13 @@@
import GraphRepository._
val resolver: DeferredResolver[GraphRepository] = DeferredResolver.fetchers(vertexFetcher, edgeFetcher)
+ val includeGrpaph = vars.fields.get("includeGraph").contains(spray.json.JsBoolean(true))
+ val middleWares = if (includeGrpaph) {
- GraphFormatted :: Nil
++ GraphFormatted :: TransformMiddleWare
+ } else {
- Nil
++ TransformMiddleWare
+ }
+
Executor.execute(
s2schema,
query,