Merge branch 'master' into S2GRAPH-125
Project: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/commit/5d392f54 Tree: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/tree/5d392f54 Diff: http://git-wip-us.apache.org/repos/asf/incubator-s2graph/diff/5d392f54 Branch: refs/heads/master Commit: 5d392f54ca960f5234b3e473eebf38f85be94cb3 Parents: 83ffcd5 b58ba20 Author: DO YUNG YOON <[email protected]> Authored: Thu Nov 10 10:09:45 2016 +0900 Committer: DO YUNG YOON <[email protected]> Committed: Thu Nov 10 10:09:45 2016 +0900 ---------------------------------------------------------------------- CHANGES | 2 + .../loader/subscriber/TransferToHFile.scala | 4 +- .../scala/org/apache/s2graph/core/Edge.scala | 10 +- .../org/apache/s2graph/core/JSONParser.scala | 235 +++++++++++++++++-- .../org/apache/s2graph/core/Management.scala | 3 +- .../org/apache/s2graph/core/PostProcess.scala | 4 +- .../org/apache/s2graph/core/mysqls/Label.scala | 9 +- .../apache/s2graph/core/mysqls/LabelMeta.scala | 4 +- .../s2graph/core/mysqls/ServiceColumn.scala | 2 +- .../s2graph/core/parsers/WhereParser.scala | 6 +- .../s2graph/core/rest/RequestParser.scala | 4 +- .../apache/s2graph/core/JsonParserTest.scala | 3 +- .../org/apache/s2graph/rest/netty/Server.scala | 2 +- .../rest/play/controllers/QueryController.scala | 2 +- 14 files changed, 243 insertions(+), 47 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/5d392f54/s2core/src/main/scala/org/apache/s2graph/core/Edge.scala ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/5d392f54/s2core/src/main/scala/org/apache/s2graph/core/Management.scala ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/5d392f54/s2core/src/main/scala/org/apache/s2graph/core/mysqls/Label.scala ---------------------------------------------------------------------- diff --cc s2core/src/main/scala/org/apache/s2graph/core/mysqls/Label.scala index 7d4eeee,760816e..2734211 --- a/s2core/src/main/scala/org/apache/s2graph/core/mysqls/Label.scala +++ b/s2core/src/main/scala/org/apache/s2graph/core/mysqls/Label.scala @@@ -19,11 -19,13 +19,13 @@@ package org.apache.s2graph.core.mysqls + import org.apache.s2graph.core.GraphExceptions.ModelNotFoundException + import org.apache.s2graph.core.GraphUtil import org.apache.s2graph.core.Management.JsonModel.{Index, Prop} import org.apache.s2graph.core.utils.logger - import org.apache.s2graph.core.{GraphExceptions, GraphUtil, JSONParser} - import play.api.libs.json.{JsValue, JsObject, Json} + import org.apache.s2graph.core.JSONParser._ -import play.api.libs.json.Json ++import play.api.libs.json._ import scalikejdbc._ object Label extends Model[Label] { @@@ -267,8 -264,7 +269,9 @@@ case class Label(id: Option[Int], label isDirected: Boolean = true, serviceName: String, serviceId: Int, consistencyLevel: String = "strong", hTableName: String, hTableTTL: Option[Int], schemaVersion: String, isAsync: Boolean = false, - compressionAlgorithm: String) { + compressionAlgorithm: String, - options: Option[String]) extends JSONParser { ++ options: Option[String]) { ++ def metas = LabelMeta.findAllByLabelId(id.get) def metaSeqsToNames = metas.map(x => (x.seq, x.name)) toMap http://git-wip-us.apache.org/repos/asf/incubator-s2graph/blob/5d392f54/s2core/src/main/scala/org/apache/s2graph/core/rest/RequestParser.scala ----------------------------------------------------------------------
