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 2017/08/03 03:29:32 UTC
[2/5] incubator-s2graph git commit: fix compile error.
fix compile error.
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/030cd2d5
Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/030cd2d5
Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/030cd2d5
Branch: refs/heads/master
Commit: 030cd2d52e7efc338336ce9c9d1fd6ce02d24203
Parents: ea36eda
Author: DO YUNG YOON <st...@apache.org>
Authored: Tue Aug 1 19:22:05 2017 +0900
Committer: DO YUNG YOON <st...@apache.org>
Committed: Tue Aug 1 19:32:32 2017 +0900
----------------------------------------------------------------------
.../s2graph/core/rest/RequestParser.scala | 4 ++--
.../core/Integrate/IntegrateCommon.scala | 3 +--
.../apache/s2graph/core/ManagementTest.scala | 24 ++++++++++----------
.../rest/play/controllers/AdminController.scala | 3 +--
4 files changed, 16 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/030cd2d5/s2core/src/main/scala/org/apache/s2graph/core/rest/RequestParser.scala
----------------------------------------------------------------------
diff --git a/s2core/src/main/scala/org/apache/s2graph/core/rest/RequestParser.scala b/s2core/src/main/scala/org/apache/s2graph/core/rest/RequestParser.scala
index 62d1e40..a2f5c47 100644
--- a/s2core/src/main/scala/org/apache/s2graph/core/rest/RequestParser.scala
+++ b/s2core/src/main/scala/org/apache/s2graph/core/rest/RequestParser.scala
@@ -629,7 +629,7 @@ class RequestParser(graph: S2Graph) {
pk ++ both ++ in ++ out
}
- def toLabelElements(jsValue: JsValue) = Try {
+ def toLabelElements(jsValue: JsValue): Try[Label] = {
val labelName = parse[String](jsValue, "label")
val srcServiceName = parse[String](jsValue, "srcServiceName")
val tgtServiceName = parse[String](jsValue, "tgtServiceName")
@@ -653,7 +653,7 @@ class RequestParser(graph: S2Graph) {
val compressionAlgorithm = (jsValue \ "compressionAlgorithm").asOpt[String].getOrElse(DefaultCompressionAlgorithm)
val options = (jsValue \ "options").asOpt[JsValue].map(_.toString())
- (labelName, srcServiceName, srcColumnName, srcColumnType,
+ graph.management.createLabel(labelName, srcServiceName, srcColumnName, srcColumnType,
tgtServiceName, tgtColumnName, tgtColumnType, isDirected, serviceName,
indices, allProps, consistencyLevel, hTableName, hTableTTL, schemaVersion, isAsync, compressionAlgorithm, options)
}
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/030cd2d5/s2core/src/test/scala/org/apache/s2graph/core/Integrate/IntegrateCommon.scala
----------------------------------------------------------------------
diff --git a/s2core/src/test/scala/org/apache/s2graph/core/Integrate/IntegrateCommon.scala b/s2core/src/test/scala/org/apache/s2graph/core/Integrate/IntegrateCommon.scala
index fd496ee..c720b9f 100644
--- a/s2core/src/test/scala/org/apache/s2graph/core/Integrate/IntegrateCommon.scala
+++ b/s2core/src/test/scala/org/apache/s2graph/core/Integrate/IntegrateCommon.scala
@@ -83,8 +83,7 @@ trait IntegrateCommon extends FunSuite with Matchers with BeforeAndAfterAll {
logger.info(s">> Create Label")
logger.info(create)
val tryRes = for {
- labelArgs <- parser.toLabelElements(json)
- label <- (management.createLabel _).tupled(labelArgs)
+ label <- parser.toLabelElements(json)
} yield label
tryRes.get
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/030cd2d5/s2core/src/test/scala/org/apache/s2graph/core/ManagementTest.scala
----------------------------------------------------------------------
diff --git a/s2core/src/test/scala/org/apache/s2graph/core/ManagementTest.scala b/s2core/src/test/scala/org/apache/s2graph/core/ManagementTest.scala
index afc9aea..b2c1113 100644
--- a/s2core/src/test/scala/org/apache/s2graph/core/ManagementTest.scala
+++ b/s2core/src/test/scala/org/apache/s2graph/core/ManagementTest.scala
@@ -20,10 +20,8 @@
package org.apache.s2graph.core
import org.apache.s2graph.core.Integrate.IntegrateCommon
-import org.apache.s2graph.core.mysqls.{Model, Label, Service}
-
-import scala.util.{Failure, Success}
-import play.api.libs.json.{JsValue, Json}
+import org.apache.s2graph.core.mysqls.Label
+import play.api.libs.json.Json
class ManagementTest extends IntegrateCommon {
@@ -52,10 +50,11 @@ class ManagementTest extends IntegrateCommon {
copiedLabel.indices().sortBy(m => m.id.get).map(m => m.metaSeqs) should be(originalLabel.indices().sortBy(m => m.id.get).map(m => m.metaSeqs))
}
- def checkLabelTTL(labelName:String, serviceName:String, setTTL:Option[Int], checkTTL:Option[Int]) = {
+ def checkLabelTTL(labelName: String, serviceName: String, setTTL: Option[Int], checkTTL: Option[Int]) = {
Management.deleteLabel(labelName)
- val ttlOption = if(setTTL.isDefined) s""", "hTableTTL": ${setTTL.get}""" else ""
- val createLabelJson = s"""{
+ val ttlOption = if (setTTL.isDefined) s""", "hTableTTL": ${setTTL.get}""" else ""
+ val createLabelJson =
+ s"""{
"label": "$labelName",
"srcServiceName": "$serviceName",
"srcColumnName": "id",
@@ -69,17 +68,18 @@ class ManagementTest extends IntegrateCommon {
$ttlOption
}"""
val labelOpts = parser.toLabelElements(Json.parse(createLabelJson))
- val tryLabel = (management.createLabel _).tupled(labelOpts.get)
- assert(tryLabel.isSuccess)
- val label = tryLabel.get
- label.hTableTTL should be(checkTTL)
+
+ labelOpts.foreach { label =>
+ label.hTableTTL should be(checkTTL)
+ }
+
}
test("copy label test") {
val labelToCopy = s"${TestUtil.testLabelName}_copied"
Label.findByName(labelToCopy) match {
case None =>
- //
+ //
case Some(oldLabel) =>
Label.delete(oldLabel.id.get)
http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/030cd2d5/s2rest_play/app/org/apache/s2graph/rest/play/controllers/AdminController.scala
----------------------------------------------------------------------
diff --git a/s2rest_play/app/org/apache/s2graph/rest/play/controllers/AdminController.scala b/s2rest_play/app/org/apache/s2graph/rest/play/controllers/AdminController.scala
index 087e12e..ecea304 100644
--- a/s2rest_play/app/org/apache/s2graph/rest/play/controllers/AdminController.scala
+++ b/s2rest_play/app/org/apache/s2graph/rest/play/controllers/AdminController.scala
@@ -218,8 +218,7 @@ object AdminController extends Controller {
def createLabelInner(json: JsValue) = for {
- labelArgs <- requestParser.toLabelElements(json)
- label <- (management.createLabel _).tupled(labelArgs)
+ label <- requestParser.toLabelElements(json)
} yield label
/**